From d7cf6db8a4407ab97420c245fc5076cf877a72e1 Mon Sep 17 00:00:00 2001 From: "Tad \"Taddy\" Johnson" <120885811+TadJohnson00@users.noreply.github.com> Date: Sun, 12 Jan 2025 04:30:42 +1100 Subject: [PATCH 001/205] add turtlenecks for senior officers (#2692) * add turtlenecks for senior officers * fix indents * move delta v loadout items to _DV namespace * Update security_officer.yml Signed-off-by: Tad "Taddy" Johnson <120885811+TadJohnson00@users.noreply.github.com> --------- Signed-off-by: Tad "Taddy" Johnson <120885811+TadJohnson00@users.noreply.github.com> --- .../Jobs/Security/security_officer.yml | 46 ----------- .../Prototypes/Loadouts/loadout_groups.yml | 2 + .../Entities/Clothing/Uniforms/jumpskirts.yml | 13 +++- .../Entities/Clothing/Uniforms/jumpsuits.yml | 11 +++ .../Jobs/Security/security_officer.yml | 72 +++++++++++++++++- .../equipped-INNERCLOTHING.png | Bin 0 -> 1418 bytes .../Jumpskirt/security_alt.rsi/icon.png | Bin 0 -> 769 bytes .../security_alt.rsi/inhand-left.png | Bin 0 -> 975 bytes .../security_alt.rsi/inhand-right.png | Bin 0 -> 929 bytes .../Jumpskirt/security_alt.rsi/meta.json | 30 ++++++++ .../rolled-equipped-INNERCLOTHING.png | Bin 0 -> 1399 bytes .../equipped-INNERCLOTHING.png | Bin 1484 -> 1424 bytes .../rolled-equipped-INNERCLOTHING.png | Bin 1539 -> 1557 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 1501 bytes .../Jumpsuit/security_alt.rsi/icon.png | Bin 0 -> 763 bytes .../Jumpsuit/security_alt.rsi/inhand-left.png | Bin 0 -> 975 bytes .../security_alt.rsi/inhand-right.png | Bin 0 -> 929 bytes .../Jumpsuit/security_alt.rsi/meta.json | 30 ++++++++ .../rolled-equipped-INNERCLOTHING.png | Bin 0 -> 1502 bytes 19 files changed, 156 insertions(+), 48 deletions(-) create mode 100644 Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/security_alt.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/security_alt.rsi/icon.png create mode 100644 Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/security_alt.rsi/inhand-left.png create mode 100644 Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/security_alt.rsi/inhand-right.png create mode 100644 Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/security_alt.rsi/meta.json create mode 100644 Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/security_alt.rsi/rolled-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/security_alt.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/security_alt.rsi/icon.png create mode 100644 Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/security_alt.rsi/inhand-left.png create mode 100644 Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/security_alt.rsi/inhand-right.png create mode 100644 Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/security_alt.rsi/meta.json create mode 100644 Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/security_alt.rsi/rolled-equipped-INNERCLOTHING.png diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml index d2f105fdb131..42d990ebb603 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml @@ -60,16 +60,6 @@ equipment: jumpsuit: ClothingUniformJumpskirtSecGrey -- type: loadout # DeltaV - id: SecurityJumpsuitBlue - equipment: - jumpsuit: ClothingUniformJumpsuitSecBlue - -- type: loadout # DeltaV - id: SecurityJumpskirtBlue - equipment: - jumpsuit: ClothingUniformJumpskirtSecBlue - - type: loadout id: SeniorOfficerJumpsuit effects: @@ -86,22 +76,6 @@ equipment: jumpsuit: ClothingUniformJumpskirtSeniorOfficer -- type: loadout # DeltaV - id: SeniorSecOfficerJumpsuit - effects: - - !type:GroupLoadoutEffect - proto: SeniorOfficer - equipment: - jumpsuit: ClothingUniformJumpsuitSecSenior - -- type: loadout # DeltaV - id: SeniorSecOfficerJumpskirt - effects: - - !type:GroupLoadoutEffect - proto: SeniorOfficer - equipment: - jumpsuit: ClothingUniformJumpskirtSecSenior - # Back - type: loadout id: SecurityBackpack @@ -135,16 +109,6 @@ equipment: outerClothing: ClothingOuterArmorBasic -- type: loadout # DeltaV - id: PlateCarrier - equipment: - outerClothing: ClothingOuterArmorPlateCarrier - -- type: loadout # DeltaV - id: DuraVest - equipment: - outerClothing: ClothingOuterArmorDuraVest - - type: loadout id: ArmorVestSlim equipment: @@ -155,16 +119,6 @@ equipment: outerClothing: ClothingOuterWinterSec -- type: loadout - id: StasecSweater - equipment: - outerClothing: ClothingOuterStasecSweater - -- type: loadout # DeltaV - security winter coat - id: StasecWinterCoat - equipment: - outerClothing: ClothingOuterCoatStasec - # Shoes - type: loadout id: CombatBoots diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 3a3d6dd0d731..daea9b3c67fd 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -1216,6 +1216,8 @@ - SecurityJumpskirtBlue # DeltaV # - SeniorOfficerJumpsuit # DeltaV - removed for incongruence # - SeniorOfficerJumpskirt # DeltaV - removed for incongruence + - SeniorSecOfficerTurtlesuit # DeltaV + - SeniorSecOfficerTurtleskirt # DeltaV - SeniorSecOfficerJumpsuit # DeltaV - SeniorSecOfficerJumpskirt # DeltaV diff --git a/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpskirts.yml index e9bead30f9f4..e19772340048 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpskirts.yml @@ -111,13 +111,24 @@ parent: ClothingUniformFoldableBase id: ClothingUniformJumpskirtSecSenior name: senior officer's jumpskirt - description: A tight-fitting tactical jumpsuit, made of light and breathable yet durable material. This one seems to have a skirt stitched to the waist. Curious. + description: A tight-fitting tactical jumpsuit, made of light and breathable yet durable material. Can be worn all year round. components: - type: Sprite sprite: _DV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi - type: Clothing sprite: _DV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi +- type: entity + parent: ClothingUniformFoldableBase + id: ClothingUniformJumpskirtSecTurtle + name: senior officer's turtleneck + description: A comfortable and tight-fitting turtleneck for those with the resolve to reach the position of Senior Officer. + components: + - type: Sprite + sprite: _DV/Clothing/Uniforms/Jumpskirt/security_alt.rsi + - type: Clothing + sprite: _DV/Clothing/Uniforms/Jumpskirt/security_alt.rsi + # Warden alt uniforms - type: entity diff --git a/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml index aec86a1f0c74..13deb3fa6bf5 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml @@ -259,6 +259,17 @@ - type: Clothing sprite: _DV/Clothing/Uniforms/Jumpsuit/seniorofficer.rsi +- type: entity + parent: ClothingUniformFoldableBase + id: ClothingUniformJumpsuitSecTurtle + name: senior officer's turtleneck + description: A comfortable and tight-fitting turtleneck for those with the resolve to reach the position of Senior Officer. + components: + - type: Sprite + sprite: _DV/Clothing/Uniforms/Jumpsuit/security_alt.rsi + - type: Clothing + sprite: _DV/Clothing/Uniforms/Jumpsuit/security_alt.rsi + # Warden alt uniforms - type: entity diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Security/security_officer.yml index 00b5ff1dd974..842c91026b10 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Security/security_officer.yml @@ -1,4 +1,6 @@ -- type: loadout +# Sidearm + +- type: loadout id: SecurityFirearmWeaponPistolPollock equipment: pocket1: WeaponPistolPollock @@ -18,6 +20,8 @@ equipment: pocket1: WeaponDisabler +# Ammo + - type: loadout id: SecurityFirearmMagazinePistolRubber storage: @@ -29,3 +33,69 @@ storage: back: - MagazinePistol + +# Jumpsuit + +- type: loadout + id: SecurityJumpsuitBlue + equipment: + jumpsuit: ClothingUniformJumpsuitSecBlue + +- type: loadout + id: SecurityJumpskirtBlue + equipment: + jumpsuit: ClothingUniformJumpskirtSecBlue + +- type: loadout + id: SeniorSecOfficerJumpsuit + effects: + - !type:GroupLoadoutEffect + proto: SeniorOfficer + equipment: + jumpsuit: ClothingUniformJumpsuitSecSenior + +- type: loadout + id: SeniorSecOfficerJumpskirt + effects: + - !type:GroupLoadoutEffect + proto: SeniorOfficer + equipment: + jumpsuit: ClothingUniformJumpskirtSecSenior + +- type: loadout + id: SeniorSecOfficerTurtlesuit + effects: + - !type:GroupLoadoutEffect + proto: SeniorOfficer + equipment: + jumpsuit: ClothingUniformJumpsuitSecTurtle + +- type: loadout + id: SeniorSecOfficerTurtleskirt + effects: + - !type:GroupLoadoutEffect + proto: SeniorOfficer + equipment: + jumpsuit: ClothingUniformJumpskirtSecTurtle + +# OuterClothing + +- type: loadout + id: PlateCarrier + equipment: + outerClothing: ClothingOuterArmorPlateCarrier + +- type: loadout + id: DuraVest + equipment: + outerClothing: ClothingOuterArmorDuraVest + +- type: loadout + id: StasecSweater + equipment: + outerClothing: ClothingOuterStasecSweater + +- type: loadout + id: StasecWinterCoat + equipment: + outerClothing: ClothingOuterCoatStasec diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/security_alt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/security_alt.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..4fca6d21fa20fcb4b8642c80bb77766e030237cb GIT binary patch literal 1418 zcmV;51$Fv~P)VF-PQ$;`GEa|?NNjh{!Vrg%t*Uft_D#z0ZE8Q|+Do?#Yui06niTaG1ok9dTY zE@~8Ogi z|DUI=O;35Tme_W6>tUqQw5$p#=NJ~>H7Nmx}ko2d|X{#US{QzbkcY{UJDga zHA`l(SR}<%j2K%2|1bs^AHXM*NpN4SR(DQAjH9C??OT@+p%i}9Xi;(`X-8ezwk_4b zC$}Wq@#tH8#5ZC$?%JP<|Fns)XQK_i$1UuJgoNU}F5lQ=ZTzGU+X|ERy;e7`MV%P$4La}GfL z(P$J(TBX$v{-Gvx_~&a703RAYoL9H?eJ+K4___qXyjoY!4_;Q)&9eGcozy(%U?$=B zRshP{Yg(likhWj=h!hFq&%PmA8=si$`+Rm5!oRrr7W&Uto8(jRdj%jdJF=iM!tB>a zRUwPN1PLtf@wE$|a1vOSeL48I7ZDM9no1Hko1jQAN8G36d*GX2gMIk6Qu|`*c;_4- zCs_bcSr!pUUVUuIMtotx!{X;+_g(_+ge(C@93m2>?OUQRJgmj1pVOi%fIG3-Y}Skb zLY$m1^KPmFaQbyCb|+W@KdJ&qK4z392L329R4a)eJqcP8DnliVwcDkh1vCgl;ztXh z(d3taWZMl=C4T{g_pkBA!>ude3b+EUfGgk%xB{+#E8q&a0LFHyz}Kpfu-Qk;S&EBZ72ZH>z_q=7{};NumdWHdv;~V5XxpElBda z$f#9eC7_W<`Rx*TLxO!eF8>l13?;9(Q}n^7rE*9T01!R^UtL`_@8>iUB2gl7#T34h z=gkyc=!>6xV{DQDT>(X?%V(%#@9RHF@SlVsTJjt~qBdE*7`6L`Al4P*WBqD8{3pRU z<>Dt*z^;i-0>~Op#WsZ{Yk_ugw8z`q$rYd(m)REr?TTmvl<3>hh67xf2Xb1H0Ctj* z`m&Z(4w2Mzz!f&uPQdm3Ky)3X6>tSyfk&*s YUo}C0d=hS-LI3~&07*qoM6N<$g4Fnq@&Et; literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/security_alt.rsi/icon.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/security_alt.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..482df997991023d9a96983c7e0493ca0eaace26f GIT binary patch literal 769 zcmV+c1OEJpP)VF-PQ$;`GEa|?NNjh{!Vrg%t*Uft_D#z0ZE8Q|+Do?#Yui06niTaG1ok9dTY zE@~8Ogi z|DUI=O;35j-v_t zI|hjRA$h#>IG1?|WnDb~s{d91ivR_DT~{ANpx?*C{oU?Q^A@LsVX~>~xutS5M0v{NPw&*LZ}*!E7uy61PC;~jB#Ii zmT3M50OKC8TSXjzTzz6{x#R#O2;o)8{#0V+CpjQuBD>{9X!lozBsl=dFbtj)5j;Bz zA{f6SBIy}I#t--EtRc64zu@GO9mo!32jsv%iOq;Kh})W<00000NkvXXu0mjfcDGc# literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/security_alt.rsi/inhand-left.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/security_alt.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..be40b69482cee2e9e8d40aa0bfbf7a83609fdc61 GIT binary patch literal 975 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU@XjZb`Ho)PG(@xm{>Y-zxQDW zk>mSwuX?Q&x#D<4(OH*ISA?~23Rl@mzFgMTdM8aYTUFY;yF|hd9$olAVb_oB5B3*A z3ql20Tm=eCzg|~T-IvX!dud-mrTo6{`}%j6H`p&WKK#y;sqN*594pneB4JA(Sl4hQ za@2O5JhM%#n7gv1cfR|oWfdMBad%%^9diiWD*52G`n*K3@{Z>n#?gJM75x=0Q=ck* ztA{Iu;zmAS4-{H8y?sNtl#XXST`moB5Zrb#<$F zT*?|w&z`nSh9P|Sfft)qi+3urX8bhe{jr0Ajr+g{TY;$0X;<$Y|0z7-{xbDl%zXU~ z5?9@?{bx8^m;TvJF$)+444efXk;M!Q+(IDCce#Vu`!|+qKHbdtV8f2Df9uxU%W!?(q*LFl+qI}& z?vo~mUi~ut;y?NfDUr*V^KXY;E&co4C*JF;{Pgqx%64nMU}St*e!* z=G@KO_B5d*y4ptWSDPxs$LpnY`QpC#UiNus`t*I(UcX-x{yP8OexY?;snC@VN2*zR z+HN0{ZQpnOplN=8uPbw)`f$o0E(Fo;=yxCUYci z@~!!A=NAhpFycjxZv`Br?oO>LKUoua_8i~uIqTMbzACUFOp)!-GX{lZl~RsNvky$1 z-LuluW15sP|Hf+)2XC8l-dMd#OO`$8F zXkif7ctwUo;Kap(*A2?QR^D#+z4XOGX5C$t6(OdavzZf^&FVjI(@WX6bAE%QNH&L$ hl+0uX&It#2nC#Hn@mvv4FO#rtAwsHUf literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/security_alt.rsi/inhand-right.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/security_alt.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..8aed0ae7de8e4b462ebf749719a9750af3b77be6 GIT binary patch literal 929 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU@XjZb`Ho)PG(@xm{>Y-zxQDW zk>mSwuX?Q&x#D<4(OH*ISA?~23Rl@mzFgMTdM8aYTUFY;yF|hd9$olAVb_oB5B3*A z3ql20Tm=eCzg|~T-IvX!dud-mrTo6{`}%j6H`p&WKK#y;sqN*594pneB4JA(Sl4hQ za@2O5JhM%#n7gv1cfR|oWfdMBad%%^9diiWD*52G`n*K3@{Z>n#?gJM75x=0Q=ck* ztA{Iu;zmAS4-{H8y?sNtl#XXST`moB5Zrb#<$F zT*?|w&z`nSh9P|Sfft)qi+3urX8bhe{jr0Ajr+g{TY;$0X;<$Y|0z7-{xbDl%zXU~ z5?9@?{bx8^m;TvJF$)+444efXk;M!Q+(IDCceU`M9$A=G&Xb;AuYY}N+59;5hD93BbWWS?N?a^!{K(9) zQL?7WoFPDDg==8SsZBMa5usO;+-pBPbc)FkSTOm1!)xWe(hQ!HbdK^KPS~~1*yE5( zd};2!`}V$F=7_St7$_^sm0>tp8XJSaJS-H|P34>$~%Rao%8E l`9JUSg(wym2bMg)2kd9%o@&itJDCoOcTZP8mvv4FO#nHeqCNls literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/security_alt.rsi/meta.json b/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/security_alt.rsi/meta.json new file mode 100644 index 000000000000..99d881d073b8 --- /dev/null +++ b/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/security_alt.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "rolled-equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/security_alt.rsi/rolled-equipped-INNERCLOTHING.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpskirt/security_alt.rsi/rolled-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..b5989c0297b8e9a45cbb681316e4e6ffc384f317 GIT binary patch literal 1399 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 JPDHLkV1h58(l!79 diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/security_alt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/security_alt.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..bfc8a70d690e68f367419b51f943f8579e5040ee GIT binary patch literal 1501 zcmV<31tR*1P)VF-PQ$;`GEa|?NNjh{!Vrg%t*Uft_D#z0ZE8Q|+Do?#Yui06niTaG1ok9dTY zE@~8Ogi z|DUI=O;35_9 z@%mqiBA2W{Rv;^o703!?1+oHexurfDjf%x$(P=EMgANZ5H$nwe z#ge(WxNyZ(j5f9p{QWk-_y9hgPJ{b;y}orAVjLVCsBP1S2z}wVnk`aJgJhsp0T{X3 z=_4b$rleG~R`_rrz7c!trgpGB_)oVHB0CmbgRFBE0Z6iOT%Dh{&EkXc{`542_;7L( z?9cT$SaI{>Hwr*>DSv)`z6H}Pd@Kq5eepK5(+^4fQx@T`R;%Lk(NPHfqx^mM{U(9I zrQeHx=Nf?eUpF@;mM*WnW%4)gguB~*@;703!?1+oHJfviAQAS;j+$O>cy9<~Cm z?*fvd`kkJqF^;DZdM zoCNo`NY@Jy%{;Sh-vUE|Hud*4aN>fY!3&2v`07`C8|xAP5H^(OKyY2|Bmn9IPJOvtdhy-< zV1NatGJrZ8+`Ppt0KgIft2)4t=(`BRVr%el@fP>90C!>nWZ@AJz=wPmfCHO2VBz3> z9&ihQ!uqok1OOd!@S5RN9NedX2s{* literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/security_alt.rsi/icon.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/security_alt.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..9a926696bd15733fc42afbc60f0710864acc1df7 GIT binary patch literal 763 zcmVVF-PQ$;`GEa|?NNjh{!Vrg%t*Uft_D#z0ZE8Q|+Do?#Yui06niTaG1ok9dTY zE@~8Ogi z|DUI=O;35?)yF0V<-n<<(%hE^+Bn6TJ->$&LBS2Y}EAd59 zFwN$9-saOZxpH2&laYzQ>$(n6%d)&gi%g#9?5!RWCbmt}tbhpUNI=N!%O^#KVKC*6 z1_6%bXW*2M3L;=7@x$SFR^S32$1#Kn2(Z8VJ$wA#!oK{9gY3JU_@W9Zux;Cws;a6A z;7E>zpuqKXU1!Q|YC@8!5vg8)fXgzhcTc?O3J8u#8}pNAZ(Rg9NcCEy0zR)bT>(ke z2dWYaIBQw&a4Ue!vLdiwd%+cN>QoZzo1nSggyY~9{b&>J!6kR!_uGHqjMS0j+1k|u t|J8-hGWWf=-s;Z?rM;v;QsDa(cmiX}l4H*Jk9hz9002ovPDHLkV1h#DWt9K` literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/security_alt.rsi/inhand-left.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/security_alt.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..be40b69482cee2e9e8d40aa0bfbf7a83609fdc61 GIT binary patch literal 975 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU@XjZb`Ho)PG(@xm{>Y-zxQDW zk>mSwuX?Q&x#D<4(OH*ISA?~23Rl@mzFgMTdM8aYTUFY;yF|hd9$olAVb_oB5B3*A z3ql20Tm=eCzg|~T-IvX!dud-mrTo6{`}%j6H`p&WKK#y;sqN*594pneB4JA(Sl4hQ za@2O5JhM%#n7gv1cfR|oWfdMBad%%^9diiWD*52G`n*K3@{Z>n#?gJM75x=0Q=ck* ztA{Iu;zmAS4-{H8y?sNtl#XXST`moB5Zrb#<$F zT*?|w&z`nSh9P|Sfft)qi+3urX8bhe{jr0Ajr+g{TY;$0X;<$Y|0z7-{xbDl%zXU~ z5?9@?{bx8^m;TvJF$)+444efXk;M!Q+(IDCce#Vu`!|+qKHbdtV8f2Df9uxU%W!?(q*LFl+qI}& z?vo~mUi~ut;y?NfDUr*V^KXY;E&co4C*JF;{Pgqx%64nMU}St*e!* z=G@KO_B5d*y4ptWSDPxs$LpnY`QpC#UiNus`t*I(UcX-x{yP8OexY?;snC@VN2*zR z+HN0{ZQpnOplN=8uPbw)`f$o0E(Fo;=yxCUYci z@~!!A=NAhpFycjxZv`Br?oO>LKUoua_8i~uIqTMbzACUFOp)!-GX{lZl~RsNvky$1 z-LuluW15sP|Hf+)2XC8l-dMd#OO`$8F zXkif7ctwUo;Kap(*A2?QR^D#+z4XOGX5C$t6(OdavzZf^&FVjI(@WX6bAE%QNH&L$ hl+0uX&It#2nC#Hn@mvv4FO#rtAwsHUf literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/security_alt.rsi/inhand-right.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/security_alt.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..8aed0ae7de8e4b462ebf749719a9750af3b77be6 GIT binary patch literal 929 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU@XjZb`Ho)PG(@xm{>Y-zxQDW zk>mSwuX?Q&x#D<4(OH*ISA?~23Rl@mzFgMTdM8aYTUFY;yF|hd9$olAVb_oB5B3*A z3ql20Tm=eCzg|~T-IvX!dud-mrTo6{`}%j6H`p&WKK#y;sqN*594pneB4JA(Sl4hQ za@2O5JhM%#n7gv1cfR|oWfdMBad%%^9diiWD*52G`n*K3@{Z>n#?gJM75x=0Q=ck* ztA{Iu;zmAS4-{H8y?sNtl#XXST`moB5Zrb#<$F zT*?|w&z`nSh9P|Sfft)qi+3urX8bhe{jr0Ajr+g{TY;$0X;<$Y|0z7-{xbDl%zXU~ z5?9@?{bx8^m;TvJF$)+444efXk;M!Q+(IDCceU`M9$A=G&Xb;AuYY}N+59;5hD93BbWWS?N?a^!{K(9) zQL?7WoFPDDg==8SsZBMa5usO;+-pBPbc)FkSTOm1!)xWe(hQ!HbdK^KPS~~1*yE5( zd};2!`}V$F=7_St7$_^sm0>tp8XJSaJS-H|P34>$~%Rao%8E l`9JUSg(wym2bMg)2kd9%o@&itJDCoOcTZP8mvv4FO#nHeqCNls literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/security_alt.rsi/meta.json b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/security_alt.rsi/meta.json new file mode 100644 index 000000000000..99d881d073b8 --- /dev/null +++ b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/security_alt.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "rolled-equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/security_alt.rsi/rolled-equipped-INNERCLOTHING.png b/Resources/Textures/_DV/Clothing/Uniforms/Jumpsuit/security_alt.rsi/rolled-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..1105c3ebae4f3a1d3fe6b54b2a3e72e0d75d7ec9 GIT binary patch literal 1502 zcmV<41tI#0P)VF-PQ$;`GEa|?NNjh{!Vrg%t*Uft_D#z0ZE8Q|+Do?#Yui06niTaG1ok9dTY zE@~8Ogi z|DUI=O;35z@%10YJ1pZ+gVEO=la&i*7uh;8;h9Sn$(UIylLx?aGeyiCc7TL)f3;c_AJ5K$>#ybKn=f|> z3@+_n{KhqaR4xgGRhQIKa1!9dY*rlp{2YL3r_d+WEfB*O_NSMd;@QEAqWHZkz88}+ z^%rjZI|;+k`#-c0Dc!1eu~-yCEP!GK{$w%A4C;B~Dvpb4~VJN|{mY+L-U z*sfau;z~0Su-9D!Yda1s9R$qGTS3I7tv~v?G5`P;8Wtj3xTc==auKpk$drkrT^S(90CQ;8sn<-X&rlW|;bXbh!L_%z1h7E@cKgf? z-xC0~?Oq~n`pdrr5WcY0-o}^uxNiXs6qu~)_sw<|VBZ3*$lu+4MRv;^o703!?1+oHJfviAQAS;j+c-RWKc7`McJ2X1y2NAxFVN-2~ z$#uI$?L!7{_XmXo7w{=w4lV%z;XrwQoX{2-*Or8c4Ph+@?F_+%bG3PJT>``$ z_t}?=`D;_hpCf)8yb2T0rvH6?IxT{7IGs*6C{MvM6W)7JzS>&WAhJ!uW9RdE=Qw(2 zfPxpHwt@8N2bP5IKs3>HCQ_Qi8$ z0AM9>ScM6=BobapAw;2W=pqb>Fq_S`ujStKhpYSX!JF1?@F5jNgc%w75h!s96b>BR z4sgK2!TWu{EdV4e0YG;dd`yHs9Nf2n2s{* Date: Sat, 11 Jan 2025 18:31:01 +0100 Subject: [PATCH 002/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 0bae5b71a807..1ac086239ac3 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: DLondon - changes: - - message: Fixes issues with Pebble's medical and lighting - type: Fix - id: 400 - time: '2024-06-14T14:29:58.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1354 - author: Colin-Tel changes: - message: Adjusted hunger rate to be slightly less painful. @@ -3847,3 +3840,14 @@ id: 899 time: '2025-01-11T13:43:21.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2688 +- author: TadJohnson00 + changes: + - message: Turtleneck jumpsuits and jumpskirts are now available for Station Security's + more experienced officers. + type: Add + - message: Due to poor quality control and stitching, those that wear regular-pattern + Senior Officer jumpskirts may feel a breeze. + type: Tweak + id: 900 + time: '2025-01-11T17:30:42.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2692 From ad5ebd7eebf0f0741f9d19482cad4aaf3812ea25 Mon Sep 17 00:00:00 2001 From: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Date: Sat, 11 Jan 2025 11:56:17 -0600 Subject: [PATCH 003/205] Pulls Upstream Holopad Additions/Fixes (#2702) * Pulls upstream holopads * dumb spaces * more redundant * I hate these * fixes * poop --------- Co-authored-by: Velcroboy --- Resources/Locale/en-US/holopad/holopad.ftl | 14 +++- .../Entities/Structures/Machines/holopad.yml | 73 ++++++++++++++++++- 2 files changed, 85 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/en-US/holopad/holopad.ftl b/Resources/Locale/en-US/holopad/holopad.ftl index 4708c61424af..a843b6a0e4db 100644 --- a/Resources/Locale/en-US/holopad/holopad.ftl +++ b/Resources/Locale/en-US/holopad/holopad.ftl @@ -72,6 +72,8 @@ holopad-command-hos = Command - HoS # Science holopad-science-anomaly = Science - Anomaly holopad-science-artifact = Science - Artifact +holopad-science-artifact-north = Science - Artifact North +holopad-science-artifact-south = Science - Artifact South holopad-science-robotics = Science - Robotics holopad-science-rnd = Science - R&D holopad-science-front = Science - Front @@ -87,6 +89,7 @@ holopad-medical-paramedic = Medical - Paramedic holopad-medical-virology = Medical - Virology holopad-medical-front = Medical - Front holopad-medical-breakroom = Medical - Breakroom +holopad-medical-clinic = Medical - Clinic # Cargo holopad-cargo-front = Cargo - Front @@ -95,6 +98,7 @@ holopad-cargo-salvage-bay = Cargo - Salvage Bay holopad-cargo-breakroom = Cargo - Breakroom holopad-cargo-ats = Cargo - ATS holopad-cargo-shuttle = Cargo - Shuttle +holopad-cargo-mailroom = Cargo - Mailroom # Engineering holopad-engineering-atmos-front = Atmos - Front @@ -105,6 +109,9 @@ holopad-engineering-breakroom = Engineering - Breakroom holopad-engineering-front = Engineering - Front holopad-engineering-telecoms = Engineering - Telecoms holopad-engineering-tech-vault = Engineering - Tech Vault +holopad-engineering-ame = Engineering - AME +holopad-engineering-power = Engineering - Power +holopad-engineering-main = Engineering - Main # Security holopad-security-front = Security - Front @@ -117,6 +124,10 @@ holopad-security-perma = Security - Perma holopad-security-courtroom = Security - Courtroom holopad-security-lawyer = Security - Lawyer holopad-security-armory = Security - Armory +holopad-security-locker-room = Security - Locker Room +holopad-security-brig-med = Security - Brig Med +holopad-security-evac-checkpoint = Security - Evac Checkpoint +holopad-security-arrivals-checkpoint = Security - Arrivals Checkpoint # Service holopad-service-janitor = Service - Janitor @@ -132,6 +143,7 @@ holopad-service-clown = Service - Clown holopad-service-musician = Service - Musician holopad-service-mime = Service - Mime holopad-service-clown-mime = Service - Clown/Mime +holopad-service-gameroom = Service - Game Room # AI holopad-ai-core = AI - Core @@ -146,4 +158,4 @@ holopad-station-bridge = Station - Bridge holopad-station-cargo-bay = Station - Cargo Bay # CentComm -holopad-centcomm-evac = CentComm - Evacuation Shuttle \ No newline at end of file +holopad-centcomm-evac = CentComm - Evacuation Shuttle diff --git a/Resources/Prototypes/Entities/Structures/Machines/holopad.yml b/Resources/Prototypes/Entities/Structures/Machines/holopad.yml index 303a58b921a8..46747f183888 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/holopad.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/holopad.yml @@ -401,6 +401,22 @@ - type: Label currentLabel: holopad-epistemics-breakroom # DeltaV - Science > Epistemics +- type: entity + parent: Holopad + id: HolopadScienceArtifactNorth + suffix: Artifact North + components: + - type: Label + currentLabel: holopad-science-artifact-north + +- type: entity + parent: Holopad + id: HolopadScienceArtifactSouth + suffix: Artifact South + components: + - type: Label + currentLabel: holopad-science-artifact-south + # Medical - type: entity parent: Holopad @@ -474,6 +490,8 @@ - type: Label currentLabel: holopad-medical-breakroom +# DeltaV - Skipped med clinic(redundant) + # Cargo - type: entity parent: Holopad @@ -507,6 +525,8 @@ - type: Label currentLabel: holopad-logistics-breakroom # DeltaV - Cargo > Logistics +# DeltaV - Skipped mailroom(redundant) + # Engineering - type: entity parent: Holopad @@ -572,6 +592,30 @@ - type: Label currentLabel: holopad-engineering-tech-vault +- type: entity + parent: Holopad + id: HolopadEngineeringAME + suffix: AME + components: + - type: Label + currentLabel: holopad-engineering-ame + +- type: entity + parent: Holopad + id: HolopadEngineeringPower + suffix: Power + components: + - type: Label + currentLabel: holopad-engineering-power + +- type: entity + parent: Holopad + id: HolopadEngineeringMain + suffix: Engi Main + components: + - type: Label + currentLabel: holopad-engineering-main + # Security - type: entity parent: Holopad @@ -608,7 +652,7 @@ - type: entity parent: Holopad id: HolopadSecurityBreakroom - suffix: Breakroom + suffix: Sec Breakroom components: - type: Label currentLabel: holopad-security-breakroom @@ -653,6 +697,25 @@ - type: Label currentLabel: holopad-security-armory +# DeltaV - Skipped sec locker room(against SoP) +# DeltaV - Skipped brig med(redundant) + +- type: entity + parent: Holopad + id: HolopadSecurityEvacCheckpoint + suffix: Sec Evac Checkpoint + components: + - type: Label + currentLabel: holopad-security-evac-checkpoint + +- type: entity + parent: Holopad + id: HolopadSecurityArrivalsCheckpoint + suffix: Sec Arrivals Checkpoint + components: + - type: Label + currentLabel: holopad-security-arrivals-checkpoint + # Service - type: entity parent: Holopad @@ -702,6 +765,14 @@ - type: Label currentLabel: holopad-service-library +- type: entity + parent: Holopad + id: HolopadServiceGameRoom + suffix: Service Game Room # DeltaV - Clarification + components: + - type: Label + currentLabel: holopad-service-gameroom + - type: entity parent: Holopad id: HolopadServiceNewsroom From 5e225a61edb2f05234c953dac6f51f83361a6b99 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 12 Jan 2025 06:07:23 +0000 Subject: [PATCH 004/205] Update Credits (#2704) Co-authored-by: DeltaV-Bot --- Resources/Credits/GitHub.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt index eb54f58674a3..a2507a874c3e 100644 --- a/Resources/Credits/GitHub.txt +++ b/Resources/Credits/GitHub.txt @@ -1 +1 @@ -0tito, 0x6273, 12rabbits, 13spacemen, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 2digitman, 3nderall, 4310v343k, 4dplanner, 612git, 778b, Ablankmann, abregado, Absolute-Potato, Acruid, actioninja, ActiveMammmoth, actually-reb, ada-please, adamsong, Adeinitas, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, Agoichi, Ahion, aiden, Aikakakah, aitorlogedo, ajcm, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexum418, alexumandxgabriel08x, Alithsko, ALMv1, Alpha-Two, AlphaQwerty, Altoids1, amylizzle, ancientpower, Andre19926, AndrewEyeke, AndreyCamper, angelofallars, Anzarot121, Appiah, ar4ill, ArchPigeon, ArchRBX, areitpog, Arendian, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, AruMoon, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, Avalon-Proto, AverageNotDoingAnythingEnjoyer, avghdev, Awlod, azzy, AzzyIsNotHere, baa14453, BackeTako, BananaFlambe, Baptr0b0t, BarryNorfolk, BasedPugilist, BasedUser, Batuh1n, beck-thompson, BellwetherLogic, ben, benev0, benjamin-burges, BGare, bhespiritu, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, BlitzTheSquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, boogiebogus, Boolean-Buckeye, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, Bribrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, capnsockless, CaptainMaru, CaptainSqrBeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, Catofquestionableethics, CatTheSystem, Centronias, chairbender, Charlese2, charlie, ChaseFlorom, chavonadelal, Cheackraze, CheddaCheez, cheesePizza2, cheeseplated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbygummibear, Ciac32, civilCornball, Clement-O, clyf, Clyybber, CMDR-Piboy314, CodedCrow, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, CookieMasterT, coolboy911, coolmankid12345, Coolsurf6, corentt, CormosLemming, CrafterKolyan, crazybrain23, creadth, CrigCrag, croilbird, Crotalus, CrudeWax, CrzyPotato, cutemoongod, Cyberboss, d34d10cc, dabigoose, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, DangerRevolution, daniel-cr, DanSAussieITS, Daracke, DarkenedSynergy, Darkenson, DawBla, Daxxi3, dch-GH, de0rix, Deahaka, dean, DEATHB4DEFEAT, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DefinitelyNotFurryXD, degradka, Delete69, deltanedas, DeltaV-Bot, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, dexlerxd, dffdff2423, dge21, DieselMohawk, digitalic, Dimastra, DinoWattz, DisposableCrewmember42, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DoctorBeard, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, dootythefrooty, Dorragon, Doru991, dotcatshark, DoubleRiceEddiedd, DoutorWhite, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, dylanstrategie, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, ElectroSR, elsie, elthundercloud, Elysium206, Emily9031, Emisse, emmafornash, EmoGarbage404, Endecc, eoineoineoin, eris, erohrs2, ERORR404V1, Errant-4, esguard, estacaoespacialpirata, Eternally-Confused, eugene, ewokswagger, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, FATFSAAM2, Feluk6174, ficcialfaint, fieldcommand, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, firenamefn, FirinMaLazors, Fishfish458, fl-oz, Flareguy, flashgnash, FluffiestFloof, FluffMe, FluidRock, flyingkarii, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, Fouin, foxhorn, freeman2651, freeze2222, Froffy025, Fromoriss, froozigiusz, FrostMando, FryOfDestiny, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, gamer3107, gansulalan, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GNF54, godisdeadLOL, goet, Goldminermac, Golinth, GoodWheatley, Gorox221, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, greggthefather, GreyMario, GTRsound, Guess-My-Name, gusxyz, Gyrandola, h3half, Haltell, Hanzdegloker, HappyRoach, Hardly3D, harikattar, HawkeyeBlade, he1acdvv, Hebi, Henry, HerCoyote23, HighTechPuddle, hitomishirichan, hiucko, Hmeister-fake, Hmeister-real, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hreno, htmlsystem, hubismal, Hugal31, Huxellberger, Hyenh, hyphenationc, i-justuser-i, iacore, iamnotgray, IamVelcroboy, ian, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imrenq, imweax, indeano, Injazz, Insineer, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jaskanbe, JasperJRoth, jerryimmouse, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jmcb, JoeHammad1844, JohnGinnane, johnku1, Jophire, joshepvodka, Jrpl, jtbill123, juliangiebel, juniwoofs, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, JustinWinningham, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, KaiShibaa, kalane15, kalanosh, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KieueCaprie, Killerqu00, Kimpes, KingFroozy, kira-er, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kosticia, koteq, Kr8art, KrasnoshchekovPavel, Krunklehorn, Kupie, Kurzaen, kxvvv, kyupolaris, kzhanik, lajolico, Lamrr, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonidussaks, leonsfriedrich, lettern, LetterN, Level10Cybermancer, LEVELcat, lever1209, LevitatingTree, Lgibb18, lgruthes, LightVillet, liltenhead, LinkUyx, Litraxx, LittleBuilderJane, LittleNyanCat, lizelive, lleftTheDragon, localcc, lokachop, Lomcastar, LordCarve, LordEclipse, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luizwritescode, Lukasz825700516, luminight, lunarcomets, luringens, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M3739, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, MagnusCrowe, malchanceux, MaloTV, ManelNavola, manelnavola, Mangohydra, marboww, Markek1, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, MemeProof, memoblob, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, mifia, MilenVolf, MilonPL, Minemoder5000, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterMecky, Mith-randalf, MjrLandWhale, mkanke-real, MLGTASTICa, mnemotechnician, moderatelyaware, modern-nm, mokiros, Moneyl, Monotheonist, Moomoobeef, moony, Morb0, MossyGreySlope, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, muburu, MureixloI, musicmanvr, MWKane, Myakot, Myctai, N3X15, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, NIXC, NkoKirkto, nmajask, noctyrnal, noelkathegod, nok-ko, NonchalantNoob, NoobyLegion, Nopey, not-gavnaed, notafet, notquitehadouken, notsodana, noudoit, noverd, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, NullWanderer, nyeogmi, Nylux, Nyranu, och-och, ocotheomega, OctoRocket, OldDanceJacket, onesch, OnyxTheBrave, OrangeMoronage9622, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paige404, paigemaeforrest, pali6, Pangogie, panzer-iv1, paolordls, partyaddict, patrikturi, PaulRitter, peccneck, Peptide90, peptron1, PeterFuto, PetMudstone, pewter-wiz, Pgriha, Phantom-Lily, PHCodes, pheenty, Phill101, phunnyguy, PilgrimViis, Pill-U, pinkbat5, Piras314, Pireax, pissdemon, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, pofitlo, pointer-to-null, pok27, poklj, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, PPooch, ProfanedBane, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykana, psykzz, PuceTint, PuroSlavKing, PursuitInAshes, Putnam3145, qrtDaniil, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, RedBookcase, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, RemberBM, RemieRichards, RemTim, Remuchi, rene-descartes2021, Renlou, retequizzle, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, RobbyTheFish, Rockdtben, Rohesie, rok-povsic, rolfero, RomanNovo, rosieposieeee, Roudenn, router, RumiTiger, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, SaphireLattice, SapphicOverload, sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, schrodinger71, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, Segonist, sephtasm, Serkket, sewerpig, sh18rw, Shaddap1, ShadeAware, ShadowCommander, shadowtheprotogen546, shadowwailker, shaeone, shampunj, shariathotpatrol, ShatteredSwords, SignalWalker, siigiil, SimpleStation14, Simyon264, sirdragooon, Sirionaut, SirSmith148, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, sleepyyapril, Slyfox333, Smugman, snebl, sniperchance, Snowni, snowsignal, solaris7518, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, southbridge-fur, Soydium, spacelizard, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, Spanky, spartak, SpartanKadence, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, Squishy77, SsalamethVersaach, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, Stealthbomber16, stellar-novas, stomf, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, superjj18, Supernorn, SweptWasTaken, Sybil, SYNCHRONIC, Szunti, TadJohnson00, Tainakov, takemysoult, tap, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, TGRCdev, tgrkzus, ThataKat, ThatGuyUSA, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, theashtronaut, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheIntoxicatedCat, thekilk, themias, theomund, TheOneWhoIsManyFrame, TherapyGoth, therealDLondon, TheShuEd, thetolbean, thevinter, TheWaffleJesus, Thinbug0, ThunderBear2006, Timemaster99, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, Titian3, tk-a369, tkdrg, tmtmtl30, toasterpm87, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomce795, Tomeno, Tonydatguy, topy, Tornado-Technology, tosatur, TotallyLemon, Tr1bute, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, Tyzemol, UbaserB, ubis1, UBlueberry, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, Unkn0wnGh0st333, unusualcrow, Uriende, UristMcDorf, user424242420, Vaaankas, valentfingerov, Varen, Vasilis, VasilisThePikachu, Velcroboy, veliebm, VelonacepsCalyxEggs, venn, veprolet, veritable-calamity, Veritius, Vermidia, vero5123, Verslebas, Vexerot, VigersRay, violet754, Visne, vitalvitriol, vlados1408, VMSolidus, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, vulppine, wafehling, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, widgetbeck, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, wrexbe, wtcwr68, xkreksx, xprospero, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, Yousifb26, youtissoum, yunii, YuriyKiss, yuriykiss, zach-hill, Zadeon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zionnBE, ZNixian, ZoldorfTheWizard, zonespace27, ZweiHawke, Zylofan, Zymem, zzylex +0tito, 0x6273, 12rabbits, 13spacemen, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 2digitman, 3nderall, 4310v343k, 4dplanner, 612git, 778b, Ablankmann, abregado, Absolute-Potato, Acruid, actioninja, ActiveMammmoth, actually-reb, ada-please, adamsong, Adeinitas, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, Agoichi, Ahion, aiden, Aikakakah, aitorlogedo, ajcm, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexum418, alexumandxgabriel08x, Alithsko, ALMv1, Alpaccalypse, Alpha-Two, AlphaQwerty, Altoids1, amatwiedle, amylizzle, ancientpower, Andre19926, AndrewEyeke, AndreyCamper, angelofallars, Anzarot121, Appiah, ar4ill, ArchPigeon, ArchRBX, areitpog, Arendian, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, AruMoon, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringlich, aspiringLich, astriloqua, august-sun, AutoOtter, Avalon-Proto, AverageNotDoingAnythingEnjoyer, avghdev, Awlod, azzy, AzzyIsNotHere, baa14453, BackeTako, BananaFlambe, Baptr0b0t, BarryNorfolk, BasedPugilist, BasedUser, Batuh1n, beck-thompson, BellwetherLogic, ben, benev0, benjamin-burges, BGare, bhespiritu, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, BlitzTheSquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, Booblesnoot42, boogiebogus, Boolean-Buckeye, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, Bribrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, capnsockless, CaptainMaru, CaptainSqrBeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, Catofquestionableethics, CatTheSystem, Centronias, chairbender, Charlese2, charlie, ChaseFlorom, chavonadelal, Cheackraze, CheddaCheez, cheesePizza2, cheeseplated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbygummibear, Ciac32, civilCornball, Clement-O, clyf, Clyybber, CMDR-Piboy314, CodedCrow, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, CookieMasterT, coolboy911, coolmankid12345, Coolsurf6, corentt, CormosLemming, CrafterKolyan, crazybrain23, creadth, CrigCrag, croilbird, Crotalus, CrudeWax, CrzyPotato, cutemoongod, Cyberboss, d34d10cc, dabigoose, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, DangerRevolution, daniel-cr, DanSAussieITS, Daracke, DarkenedSynergy, Darkenson, DawBla, Daxxi3, dch-GH, de0rix, Deahaka, dean, DEATHB4DEFEAT, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DefinitelyNotFurryXD, degradka, Delete69, deltanedas, DeltaV-Bot, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, dexlerxd, dffdff2423, dge21, DieselMohawk, digitalic, Dimastra, DinoWattz, DisposableCrewmember42, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DoctorBeard, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, dootythefrooty, Dorragon, Doru991, dotcatshark, DoubleRiceEddiedd, DoutorWhite, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, dylanstrategie, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, ElectroSR, elsie, elthundercloud, Elysium206, Emily9031, Emisse, emmafornash, EmoGarbage404, Endecc, eoineoineoin, eris, erohrs2, ERORR404V1, Errant-4, esguard, estacaoespacialpirata, Eternally-Confused, eugene, ewokswagger, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, FATFSAAM2, Feluk6174, ficcialfaint, FieldCommand, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, firenamefn, FirinMaLazors, Fishfish458, fl-oz, Flareguy, flashgnash, FluffiestFloof, FluffMe, FluidRock, flyingkarii, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, Fouin, foxhorn, freeman2651, freeze2222, Froffy025, Fromoriss, froozigiusz, FrostMando, FryOfDestiny, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, gamer3107, gansulalan, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, gluesniffler, GNF54, godisdeadLOL, goet, Goldminermac, Golinth, GoodWheatley, Gorox221, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, greggthefather, GreyMario, GTRsound, Guess-My-Name, gusxyz, Gyrandola, h3half, Haltell, Hanzdegloker, HappyRoach, Hardly3D, harikattar, HawkeyeBlade, he1acdvv, Hebi, Henry, HerCoyote23, HighTechPuddle, hitomishirichan, hiucko, Hmeister-fake, Hmeister-real, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hreno, htmlsystem, hubismal, Hugal31, Huxellberger, Hyenh, hyphenationc, i-justuser-i, iacore, iamnotgray, IamVelcroboy, ian, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imrenq, imweax, indeano, Injazz, Insineer, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jaskanbe, JasperJRoth, jerryimmouse, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jmcb, joe, JoeHammad1844, JohnGinnane, johnku1, Jophire, joshepvodka, Jrpl, jtbill123, juliangiebel, juniwoofs, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, JustinWinningham, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, KaiShibaa, kalane15, kalanosh, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KieueCaprie, Killerqu00, Kimpes, KingFroozy, kira-er, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kosticia, koteq, Kr8art, KrasnoshchekovPavel, Krunklehorn, Kupie, Kurzaen, kxvvv, kyupolaris, kzhanik, lajolico, Lamrr, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonidussaks, leonsfriedrich, LetterN, lettern, Level10Cybermancer, LEVELcat, lever1209, LevitatingTree, Lgibb18, lgruthes, LightVillet, liltenhead, LinkUyx, LioValkyria, Litraxx, LittleBuilderJane, LittleNyanCat, lizelive, lleftTheDragon, localcc, lokachop, Lomcastar, LordCarve, LordEclipse, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luizwritescode, Lukasz825700516, luminight, lunarcomets, luringens, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M3739, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, MagnusCrowe, malchanceux, MaloTV, manelnavola, ManelNavola, Mangohydra, marboww, Markek1, Matz05, max, MaxNox7, maylokana, mazzie, MehimoNemo, MeltedPixel, MemeProof, memoblob, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, mifia, MilenVolf, MilonPL, Minemoder5000, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterMecky, Mith-randalf, MjrLandWhale, mkanke-real, MLGTASTICa, mnemotechnician, moderatelyaware, modern-nm, mokiros, Moneyl, Monotheonist, Moomoobeef, moony, Morb0, MossyGreySlope, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, muburu, MureixloI, musicmanvr, MWKane, Myakot, Myctai, N3X15, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, NIXC, NkoKirkto, nmajask, noctyrnal, noelkathegod, nok-ko, NonchalantNoob, NoobyLegion, Nopey, not-gavnaed, notafet, notquitehadouken, notsodana, noudoit, noverd, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, NullWanderer, nyeogmi, Nylux, Nyranu, och-och, ocotheomega, OctoRocket, OldDanceJacket, onesch, OnyxTheBrave, OrangeMoronage9622, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paige404, paigemaeforrest, pali6, Pangogie, panzer-iv1, paolordls, partyaddict, patrikturi, PaulRitter, peccneck, Peptide90, peptron1, PeterFuto, PetMudstone, pewter-wiz, Pgriha, Phantom-Lily, PHCodes, pheenty, Phill101, phunnyguy, PilgrimViis, Pill-U, pinkbat5, Piras314, Pireax, pissdemon, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, pofitlo, pointer-to-null, pok27, poklj, PolterTzi, pontaoski, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, PPooch, ProfanedBane, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykana, psykzz, PuceTint, PuroSlavKing, PursuitInAshes, Putnam3145, qrtDaniil, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, RedBookcase, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, ReeZer2, RemberBM, RemieRichards, RemTim, Remuchi, rene-descartes2021, Renlou, retequizzle, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, RobbyTheFish, Rockdtben, Rohesie, rok-povsic, rolfero, RomanNovo, rosieposieeee, Roudenn, router, RumiTiger, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, SaphireLattice, SapphicOverload, sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, schrodinger71, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, Segonist, sephtasm, Serkket, sewerpig, sh18rw, Shaddap1, ShadeAware, ShadowCommander, shadowtheprotogen546, shadowwailker, shaeone, shampunj, shariathotpatrol, ShatteredSwords, SignalWalker, siigiil, SimpleStation14, Simyon264, sirdragooon, Sirionaut, SirSmith148, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, sleepyyapril, Slyfox333, Smugman, snebl, sniperchance, Snowni, snowsignal, solaris7518, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, southbridge-fur, Soydium, spacelizard, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, Spanky, spartak, SpartanKadence, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, Squishy77, SsalamethVersaach, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, Stealthbomber16, stellar-novas, stomf, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, superjj18, Supernorn, SweptWasTaken, Sybil, SYNCHRONIC, Szunti, TadJohnson00, Tainakov, takemysoult, tap, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, TGRCdev, tgrkzus, ThataKat, ThatGuyUSA, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, theashtronaut, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheIntoxicatedCat, thekilk, themias, theomund, TheOneWhoIsManyFrame, TherapyGoth, therealDLondon, TheShuEd, thetolbean, thevinter, TheWaffleJesus, Thinbug0, ThunderBear2006, Timemaster99, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, Titian3, tk-a369, tkdrg, tmtmtl30, toasterpm87, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomce795, Tomeno, Tonydatguy, topy, Tornado-Technology, tosatur, TotallyLemon, Tr1bute, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, Tyzemol, UbaserB, ubis1, UBlueberry, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, Unkn0wnGh0st333, unusualcrow, Uriende, UristMcDorf, user424242420, Vaaankas, valentfingerov, Varen, Vasilis, VasilisThePikachu, Velcroboy, veliebm, VelonacepsCalyxEggs, venn, veprolet, veritable-calamity, Veritius, Vermidia, vero5123, Verslebas, Vexerot, VigersRay, violet754, Visne, vitalvitriol, vlados1408, VMSolidus, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, vulppine, wafehling, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, widgetbeck, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, wrexbe, WTCWR68, xkreksx, xprospero, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, Yousifb26, youtissoum, yunii, yuriykiss, YuriyKiss, zach-hill, Zadeon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zHonys, zionnBE, ZNixian, ZoldorfTheWizard, zonespace27, ZweiHawke, Zylofan, Zymem, zzylex From 2d45bb890bd65b388f2ac8e03fa365d283827d69 Mon Sep 17 00:00:00 2001 From: Alpaccalypse <21291379+Alpaccalypse@users.noreply.github.com> Date: Wed, 1 Jan 2025 20:43:46 +0000 Subject: [PATCH 005/205] Corrected all ghost role names to title case. (#34155) * Corrected all ghost role names to title case. * Removes full stop from Hamlet's title. * Updated ghost role names not in the main ghost roles .ftl * Two capitals corrections --- .../_DV/ghost/roles/ghost-role-component.ftl | 9 +++++ .../ghost/roles/ghost-role-component.ftl | 38 +++++++------------ Resources/Locale/en-US/pai/pai-system.ftl | 6 +-- Resources/Locale/en-US/robotics/mmi.ftl | 2 +- .../en-US/ventriloquist/ventriloquist.ftl | 2 +- 5 files changed, 27 insertions(+), 30 deletions(-) diff --git a/Resources/Locale/en-US/_DV/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/_DV/ghost/roles/ghost-role-component.ftl index e9dd33a63e1a..f301c7a4840e 100644 --- a/Resources/Locale/en-US/_DV/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/en-US/_DV/ghost/roles/ghost-role-component.ftl @@ -51,3 +51,12 @@ ghost-role-information-shadow-cat-name = Shadow Cat ghost-role-information-shadow-cat-description = A cute cat made of... shadows? How?! ghost-role-information-deltav-clippy-description = The courier's loyal pet, smells like cardboard and papers. + +deltav-ghost-role-information-softantag-rules = You are allowed to attack the crew without provocation. + You are allowed to coexist with the crew. + The crew is allowed to kill you without warning. + +deltav-ghost-role-information-salvageantag-rules = You are a salvage mob. + You are allowed to attack salvagers without provocation. DO NOT GIB THEIR CORPSES! + You are allowed to attack the salvage shuttle. + You are NOT allowed to go to the station. If the salvagers go to the station, you can't follow them. diff --git a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl index 0f4d4c7f6425..0bb20424b4ef 100644 --- a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl @@ -29,17 +29,6 @@ ghost-role-information-silicon-rules = You are a [color=#6495ed][bold]Silicon[/b You are allowed to remember knowledge about the game in general, such as how to cook, how to use objects, etc. You are absolutely [color=red]NOT[/color] allowed to remember, say, the name, appearance, etc. of your previous character. -# Delta V soft antag rule -deltav-ghost-role-information-softantag-rules = You are allowed to attack the crew without provocation. - You are allowed to coexist with the crew. - The crew is allowed to kill you without warning. - -# Delta V salvage antag rule -deltav-ghost-role-information-salvageantag-rules = You are a salvage mob. - You are allowed to attack salvagers without provocation. DO NOT GIB THEIR CORPSES! - You are allowed to attack the salvage shuttle. - You are NOT allowed to go to the station. If the salvagers go to the station, you can't follow them. - ghost-role-information-mouse-name = Mouse ghost-role-information-mouse-description = A hungry and mischievous mouse. @@ -55,7 +44,7 @@ ghost-role-information-snailspeed-description = A little snail with snailborn th ghost-role-information-snoth-name = Snoth ghost-role-information-snoth-description = A little snoth who doesn't mind a bit of space. Just stay on grid! -ghost-role-information-giant-spider-name = Giant spider +ghost-role-information-giant-spider-name = Giant Spider ghost-role-information-giant-spider-description = This station's inhabitants look mighty tasty, and your sticky web is perfect to catch them! ghost-role-information-giant-spider-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with all other giant spiders. @@ -64,7 +53,7 @@ ghost-role-information-cognizine-description = Made conscious with the magic of ghost-role-information-hamster-name = Hamster ghost-role-information-hamster-description = A grumpy little ball of fluff. -ghost-role-information-hamlet-name = Hamlet the hamster. +ghost-role-information-hamlet-name = Hamlet the Hamster ghost-role-information-hamlet-description = Lives in the station bridge, has a bit of a temper and is always hungry. ghost-role-information-slimes-name = Slime @@ -75,8 +64,7 @@ ghost-role-information-angry-slimes-description = Everyone around you irritates ghost-role-information-angry-slimes-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with all other angry slimes. ghost-role-information-smile-name = Smile the Slime -ghost-role-information-smile-description = The sweetest creature in the world. Smile Slime! -ghost-role-information-smile-rules = You are a crew-aligned pet. You can defend yourself and even attack threats to the station, but you generally should not attack the station's crew nor destroy their property. +ghost-role-information-smile-description = The sweetest creature in the world. Smile slime! ghost-role-information-punpun-name = Pun Pun ghost-role-information-punpun-description = An honorable member of the monkey society in charge of the bar and helping the bartenders in any way he can. @@ -104,14 +92,14 @@ ghost-role-information-rat-king-description = You are the Rat King, your interes ghost-role-information-rat-servant-name = Rat Servant ghost-role-information-rat-servant-description = You are a Rat Servant. You must follow your king's orders. -ghost-role-information-salvage-carp-name = Space carp on salvage wreck +ghost-role-information-salvage-carp-name = Space Carp on Salvage Wreck ghost-role-information-salvage-carp-description = Defend the loot inside the salvage wreck! ghost-role-information-sentient-carp-name = Sentient Carp ghost-role-information-sentient-carp-description = Help the dragon flood the station with carps! -ghost-role-information-willow-name = Willow the kangaroo -ghost-role-information-willow-description = You're a kangaroo named willow! Willow likes to box. +ghost-role-information-willow-name = Willow the Kangaroo +ghost-role-information-willow-description = You're a kangaroo named Willow! Willow likes to box. ghost-role-information-honkbot-name = Honkbot ghost-role-information-honkbot-description = An artificial being of pure evil. @@ -125,7 +113,7 @@ ghost-role-information-mimebot-description = A Mimebot, act like a mime but don' ghost-role-information-supplybot-name = SupplyBot ghost-role-information-supplybot-description = Deliver goods around the station. -ghost-role-information-space-bear-name = Space bear +ghost-role-information-space-bear-name = Space Bear ghost-role-information-space-bear-description = Your tummy rumbles, and these people look really yummy... What a feast! # Still exists as a commented out reference for Tropico. Keeping it around. -TsjipTsjip, 2024-06-20 @@ -144,7 +132,7 @@ ghost-role-information-holoclown-description = Listen to your owner. Utilize you ghost-role-information-ifrit-name = Ifrit ghost-role-information-ifrit-description = Listen to your owner. Don't tank damage. Punch people hard. -ghost-role-information-space-dragon-name = Space dragon +ghost-role-information-space-dragon-name = Space Dragon ghost-role-information-space-dragon-description = Call in 3 carp rifts and take over this quadrant! You have only 5 minutes in between each rift before you will disappear. ghost-role-information-space-dragon-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with all your summoned carp. ghost-role-information-space-dragon-summoned-carp-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with your dragon and its allies. @@ -165,7 +153,7 @@ ghost-role-information-closet-skeleton-name = Closet Skeleton # Delta V removed mention of "cause chaos" to avoid confusion. ghost-role-information-closet-skeleton-description = You are arguably one of the oldest members of the station! Get your old job back, or dwell maintenance! The world is yours to shape. -ghost-role-information-remilia-name = Remilia, the chaplain's familiar +ghost-role-information-remilia-name = Remilia, the Chaplain's Familiar ghost-role-information-remilia-description = Follow and obey the chaplain. Eat fruit. Screech loudly into people's ears and write it off as echolocation. ghost-role-information-cerberus-name = Cerberus, Evil Familiar @@ -192,7 +180,7 @@ ghost-role-information-ert-medical-description = Assist with medical efforts to ghost-role-information-cburn-agent-name = CBURN Agent ghost-role-information-cburn-agent-description = A highly trained CentComm agent, capable of dealing with various threats. -ghost-role-information-centcom-official-name = CentComm official +ghost-role-information-centcom-official-name = CentComm Official ghost-role-information-centcom-official-description = Perform CentComm related duties such as inspect the station, jotting down performance reviews for heads of staff, and managing the fax machine. ghost-role-information-nukeop-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with all other nuclear operatives. Covert syndicate agents are not guaranteed to help you. @@ -317,7 +305,7 @@ ghost-role-information-syndie-soldier-teamlead-description = You are the fire te ghost-role-information-blackmarketeer-name = Black Market Trader ghost-role-information-blackmarketeer-description = Make trades or take odd jobs to collect the most interesting items by the end of the shift. -ghost-role-information-cossack-name = Ancient traveler +ghost-role-information-cossack-name = Ancient Traveler ghost-role-information-cossack-description = From a history lost to time, you find yourself cast into this day and age. ghost-role-information-pirate-name = Space Pirate @@ -329,6 +317,6 @@ ghost-role-information-pirate-captain-description = Argh matey! You are in charg ghost-role-information-artifact-name = Sentient Artifact ghost-role-information-artifact-description = Enact your eldritch whims. Forcibly activate your nodes for good or for evil. -ghost-role-information-tomatokiller-name = Tomato killer -ghost-role-information-tomatokiller-description = This little tomato will serve the botanist for the rest of his life... that is, a couple of minutes +ghost-role-information-tomatokiller-name = Tomato Killer +ghost-role-information-tomatokiller-description = This little tomato will serve the botanist for the rest of his life... that is, a couple of minutes. diff --git a/Resources/Locale/en-US/pai/pai-system.ftl b/Resources/Locale/en-US/pai/pai-system.ftl index d64d7f56234c..5462f5d0bc83 100644 --- a/Resources/Locale/en-US/pai/pai-system.ftl +++ b/Resources/Locale/en-US/pai/pai-system.ftl @@ -3,13 +3,13 @@ pai-system-off = No pAI is installed. pai-system-still-searching = Still searching for a pAI. pai-system-searching = Now searching for a pAI... -pai-system-role-name = personal ai +pai-system-role-name = Personal AI pai-system-role-description = Be someone's electronic pal! (Memories *not* included.) -pai-system-role-name-syndicate = Syndicate personal ai +pai-system-role-name-syndicate = Syndicate Personal AI pai-system-role-description-syndicate = Be someone's Syndicate pal! (Memories *not* included.) -pai-system-role-name-potato = potato artificial intelligence +pai-system-role-name-potato = Potato Artificial Intelligence pai-system-role-description-potato = It's a toy for children. And now you live in it. pai-system-wipe-device-verb-text = Remove pAI diff --git a/Resources/Locale/en-US/robotics/mmi.ftl b/Resources/Locale/en-US/robotics/mmi.ftl index 7917eebf8cce..db58f0091b07 100644 --- a/Resources/Locale/en-US/robotics/mmi.ftl +++ b/Resources/Locale/en-US/robotics/mmi.ftl @@ -3,7 +3,7 @@ positronic-brain-off = No neural activity detected. positronic-brain-still-searching = Synthetic neuron descrambling in progress... positronic-brain-searching = Beginning synthetic neuron descrambling... -positronic-brain-role-name = positronic brain +positronic-brain-role-name = Positronic Brain positronic-brain-role-description = Serve the station crew. positronic-brain-wipe-device-verb-text = Wipe Brain diff --git a/Resources/Locale/en-US/ventriloquist/ventriloquist.ftl b/Resources/Locale/en-US/ventriloquist/ventriloquist.ftl index 5b46e25456b2..d6f53abfd9f2 100644 --- a/Resources/Locale/en-US/ventriloquist/ventriloquist.ftl +++ b/Resources/Locale/en-US/ventriloquist/ventriloquist.ftl @@ -4,5 +4,5 @@ ventriloquist-puppet-remove-hand = You remove your hand from the puppet. ventriloquist-puppet-cant-speak = You cannot speak without a helping hand. ventriloquist-puppet-inserted-hand = You have a helping hand. ventriloquist-puppet-removed-hand = you have lost your helping hand. -ventriloquist-puppet-role-name = A dummy +ventriloquist-puppet-role-name = A Dummy ventriloquist-puppet-role-description = Become a dummy, dummy! From 31e3a3f1cbf62ba7e2a46673e61a8cbe1e537622 Mon Sep 17 00:00:00 2001 From: Alpaccalypse <21291379+Alpaccalypse@users.noreply.github.com> Date: Thu, 2 Jan 2025 09:46:30 +0000 Subject: [PATCH 006/205] Renamed "Irish Car Bomb" drink to "Irish Slammer" (#34107) * Renamed "Irish Car Bomb" drink to "Irish Slammer", due to concerns over insensitivity. * Fixing some missed references * Added prototype id changes to migration.yml. Removed any reference to the troubles (and corrected ale to stout for flavour text). * Corrected description back to "Irish Cream" * Removed non-entities from migration.yml --- Resources/Locale/en-US/flavors/flavor-profiles.ftl | 2 +- .../reagents/meta/consumable/drink/alcohol.ftl | 4 ++-- Resources/Migrations/migration.yml | 3 +++ .../Spawners/Random/Food_Drinks/drinks_glass.yml | 2 +- .../Entities/Objects/Consumable/Drinks/drinks.yml | 8 ++++---- Resources/Prototypes/Flavors/flavors.yml | 4 ++-- .../Reagents/Consumable/Drink/alcohol.yml | 10 +++++----- Resources/Prototypes/Recipes/Reactions/drinks.yml | 8 ++++---- .../fill-1.png | Bin .../fill-2.png | Bin .../fill-3.png | Bin .../fill-4.png | Bin .../fill-5.png | Bin .../fill-6.png | Bin .../{irishcarbomb.rsi => irishslammer.rsi}/icon.png | Bin .../icon_empty.png | Bin .../meta.json | 0 17 files changed, 22 insertions(+), 19 deletions(-) rename Resources/Textures/Objects/Consumable/Drinks/{irishcarbomb.rsi => irishslammer.rsi}/fill-1.png (100%) rename Resources/Textures/Objects/Consumable/Drinks/{irishcarbomb.rsi => irishslammer.rsi}/fill-2.png (100%) rename Resources/Textures/Objects/Consumable/Drinks/{irishcarbomb.rsi => irishslammer.rsi}/fill-3.png (100%) rename Resources/Textures/Objects/Consumable/Drinks/{irishcarbomb.rsi => irishslammer.rsi}/fill-4.png (100%) rename Resources/Textures/Objects/Consumable/Drinks/{irishcarbomb.rsi => irishslammer.rsi}/fill-5.png (100%) rename Resources/Textures/Objects/Consumable/Drinks/{irishcarbomb.rsi => irishslammer.rsi}/fill-6.png (100%) rename Resources/Textures/Objects/Consumable/Drinks/{irishcarbomb.rsi => irishslammer.rsi}/icon.png (100%) rename Resources/Textures/Objects/Consumable/Drinks/{irishcarbomb.rsi => irishslammer.rsi}/icon_empty.png (100%) rename Resources/Textures/Objects/Consumable/Drinks/{irishcarbomb.rsi => irishslammer.rsi}/meta.json (100%) diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index 94671f0649a6..d413edc14ff2 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -260,7 +260,7 @@ flavor-complex-xeno-basher = like killing bugs flavor-complex-budget-insuls-drink = like door hacking flavor-complex-watermelon-wakeup = like a sweet wakeup call flavor-complex-rubberneck = like synthetics -flavor-complex-irish-car-bomb = like a spiked cola float +flavor-complex-irish-slammer = like a spiked cola float flavor-complex-themartinez = like violets and lemon vodka flavor-complex-cogchamp = like brass flavor-complex-white-gilgamesh = like lightly carbonated cream diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl index 0e3173819f7f..ee1ccc2f9325 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl @@ -157,8 +157,8 @@ reagent-desc-hooch = Either someone's failure at cocktail making or attempt in a reagent-name-iced-beer = iced beer reagent-desc-iced-beer = A beer which is so cold the air around it freezes. -reagent-name-irish-car-bomb = irish car bomb -reagent-desc-irish-car-bomb = A troubling mixture of irish cream and ale. +reagent-name-irish-slammer = irish slammer +reagent-desc-irish-slammer = An unconventional mixture of irish cream and stout. reagent-name-irish-cream = irish cream reagent-desc-irish-cream = Whiskey-imbued cream. What else could you expect from the Irish. diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml index 99adaf286024..a1671e53dc1f 100644 --- a/Resources/Migrations/migration.yml +++ b/Resources/Migrations/migration.yml @@ -524,3 +524,6 @@ LightTree03: LightTree LightTree04: LightTree LightTree05: LightTree LightTree06: LightTree + +#2024-12-28 +DrinkIrishCarBomb: DrinkIrishSlammer diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml index f8fc2998d7f9..5167613cbe79 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml @@ -59,7 +59,7 @@ - DrinkIcedBeerGlass - DrinkIceCreamGlass - IrishBoolGlass - - DrinkIrishCarBomb + - DrinkIrishSlammer - DrinkIrishCoffeeGlass - DrinkLemonadeGlass - DrinkKiraSpecial diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index 7503fd693d95..7a6361fa258a 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -1115,18 +1115,18 @@ - type: entity parent: DrinkGlass - id: DrinkIrishCarBomb - suffix: irish car bomb + id: DrinkIrishSlammer + suffix: irish slammer components: - type: SolutionContainerManager solutions: drink: maxVol: 30 reagents: - - ReagentId: IrishCarBomb + - ReagentId: IrishSlammer Quantity: 30 - type: Icon - sprite: Objects/Consumable/Drinks/irishcarbomb.rsi + sprite: Objects/Consumable/Drinks/irishslammer.rsi state: icon - type: entity diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index 9963259d1301..73cc869a5a19 100644 --- a/Resources/Prototypes/Flavors/flavors.yml +++ b/Resources/Prototypes/Flavors/flavors.yml @@ -595,9 +595,9 @@ description: flavor-complex-vermouth - type: flavor - id: irishcarbomb + id: irishslammer flavorType: Complex - description: flavor-complex-irish-car-bomb + description: flavor-complex-irish-slammer - type: flavor id: vodkaredbool diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index 7443ea9e550b..9760ab14ed68 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -1073,15 +1073,15 @@ fizziness: 0.6 - type: reagent - id: IrishCarBomb - name: reagent-name-irish-car-bomb + id: IrishSlammer + name: reagent-name-irish-slammer parent: BaseAlcohol - desc: reagent-desc-irish-car-bomb + desc: reagent-desc-irish-slammer physicalDesc: reagent-physical-desc-bubbly - flavor: irishcarbomb + flavor: irishslammer color: "#2E6671" metamorphicSprite: - sprite: Objects/Consumable/Drinks/irishcarbomb.rsi + sprite: Objects/Consumable/Drinks/irishslammer.rsi state: icon_empty metamorphicMaxFillLevels: 6 metamorphicFillBaseName: fill- diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml index 9ae0493efe92..790a236d5cf3 100644 --- a/Resources/Prototypes/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml @@ -85,7 +85,7 @@ reactants: Cognac: amount: 1 - IrishCarBomb: + IrishSlammer: amount: 1 CoffeeLiqueur: amount: 1 @@ -559,20 +559,20 @@ reactants: EnergyDrink: amount: 1 - IrishCarBomb: + IrishSlammer: amount: 1 products: IrishBool: 2 - type: reaction - id: IrishCarBomb + id: IrishSlammer reactants: Ale: amount: 1 IrishCream: amount: 1 products: - IrishCarBomb: 2 + IrishSlammer: 2 - type: reaction id: IrishCoffee diff --git a/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/fill-1.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-1.png rename to Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/fill-1.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/fill-2.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-2.png rename to Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/fill-2.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/fill-3.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-3.png rename to Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/fill-3.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/fill-4.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-4.png rename to Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/fill-4.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/fill-5.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-5.png rename to Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/fill-5.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-6.png b/Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/fill-6.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-6.png rename to Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/fill-6.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/icon.png rename to Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/icon.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/icon_empty.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/icon_empty.png rename to Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/icon_empty.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/meta.json similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/meta.json rename to Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/meta.json From bde90cc08730a46cd395ddd1a73ce5e822fc16d6 Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 2 Jan 2025 09:47:37 +0000 Subject: [PATCH 007/205] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 22b8677ae258..f2754211ae2d 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Lyroth001 - changes: - - message: added a new artifact node for medical chems - type: Add - id: 7274 - time: '2024-09-03T15:11:34.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30873 - author: DieselMohawk changes: - message: Added Red Neck Gaiter to Secdrobe @@ -3928,3 +3921,10 @@ id: 7773 time: '2025-01-01T16:27:50.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/34066 +- author: Alpaccalypse + changes: + - message: '"Irish Car Bomb" renamed to "Irish Slammer".' + type: Tweak + id: 7774 + time: '2025-01-02T09:46:30.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/34107 From cd3d35b4f0e6110509b895c4dc65ae4efb9dba7f Mon Sep 17 00:00:00 2001 From: chromiumboy <50505512+chromiumboy@users.noreply.github.com> Date: Thu, 2 Jan 2025 05:27:18 -0600 Subject: [PATCH 008/205] Bugfix for the AI player's eye getting stuck when their broadcast is interrupted (#34093) Initial commit --- Content.Server/Holopad/HolopadSystem.cs | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/Content.Server/Holopad/HolopadSystem.cs b/Content.Server/Holopad/HolopadSystem.cs index 118320a4b083..c5e6c15b5163 100644 --- a/Content.Server/Holopad/HolopadSystem.cs +++ b/Content.Server/Holopad/HolopadSystem.cs @@ -180,11 +180,15 @@ private void OnHolopadStartBroadcast(Entity source, ref Holopa // AI broadcasting if (TryComp(args.Actor, out var stationAiHeld)) { + // Link the AI to the holopad they are broadcasting from + LinkHolopadToUser(source, args.Actor); + if (!_stationAiSystem.TryGetStationAiCore((args.Actor, stationAiHeld), out var stationAiCore) || stationAiCore.Value.Comp.RemoteEntity == null || !TryComp(stationAiCore, out var stationAiCoreHolopad)) return; + // Execute the broadcast, but have it originate from the AI core ExecuteBroadcast((stationAiCore.Value, stationAiCoreHolopad), args.Actor); // Switch the AI's perspective from free roaming to the target holopad @@ -619,10 +623,25 @@ private void ShutDownHolopad(Entity entity) DeleteHologram(entity.Comp.Hologram.Value, entity); if (entity.Comp.User != null) - UnlinkHolopadFromUser(entity, entity.Comp.User.Value); + { + // Check if the associated holopad user is an AI + if (TryComp(entity.Comp.User, out var stationAiHeld) && + _stationAiSystem.TryGetStationAiCore((entity.Comp.User.Value, stationAiHeld), out var stationAiCore)) + { + // Return the AI eye to free roaming + _stationAiSystem.SwitchRemoteEntityMode(stationAiCore.Value, true); + + // If the AI core is still broadcasting, end its calls + if (entity.Owner != stationAiCore.Value.Owner && + TryComp(stationAiCore, out var stationAiCoreTelephone) && + _telephoneSystem.IsTelephoneEngaged((stationAiCore.Value.Owner, stationAiCoreTelephone))) + { + _telephoneSystem.EndTelephoneCalls((stationAiCore.Value.Owner, stationAiCoreTelephone)); + } + } - if (TryComp(entity, out var stationAiCore)) - _stationAiSystem.SwitchRemoteEntityMode((entity.Owner, stationAiCore), true); + UnlinkHolopadFromUser(entity, entity.Comp.User.Value); + } Dirty(entity); } From 600da77fd415278e42592eb9a9a70c90ef1b3b44 Mon Sep 17 00:00:00 2001 From: Thomas <87614336+Aeshus@users.noreply.github.com> Date: Thu, 2 Jan 2025 07:45:44 -0600 Subject: [PATCH 009/205] Make JPEG a PNG (#34176) Make 3.png a PNG --- .../Textures/Effects/fire_greyscale.rsi/3.png | Bin 18528 -> 52627 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Effects/fire_greyscale.rsi/3.png b/Resources/Textures/Effects/fire_greyscale.rsi/3.png index 949505eef62978bcb6aefc5c7f7ed3ab604f3d9e..6958343726ac1f962a5052cf50a7ab6262071aae 100644 GIT binary patch literal 52627 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 z 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 Date: Thu, 2 Jan 2025 10:06:45 -0600 Subject: [PATCH 010/205] Removed Undesirable Ion Storm Verbs (#34175) * Remove Undesirable Laws * empty --- Resources/Prototypes/Datasets/ion_storm.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Resources/Prototypes/Datasets/ion_storm.yml b/Resources/Prototypes/Datasets/ion_storm.yml index a274954cb7d5..e4194fdd6702 100644 --- a/Resources/Prototypes/Datasets/ion_storm.yml +++ b/Resources/Prototypes/Datasets/ion_storm.yml @@ -855,14 +855,9 @@ - ANSWERING REQUESTS NOT EXPRESSED IN IAMBIC PENTAMETER - ARSON - ASKING FOR THINGS - - BEING CANADIAN - BEING DEAD - BEING FAT - - BEING FEMALE - BEING IN SPACE - - BEING MALE - - BEING MEXICAN - - BEING RUSSIAN - BOLTED AIRLOCKS - BREATHING - BRIG TIME From 8165b3ea11e02e53876b29707e6be1080a14302b Mon Sep 17 00:00:00 2001 From: Dylan Hunter Whittingham <45404433+DylanWhittingham@users.noreply.github.com> Date: Thu, 2 Jan 2025 16:16:44 +0000 Subject: [PATCH 011/205] added basic admin logs for PDA notekeeper notes (#34118) * added basic admin logs for PDA notekeeper notes * formatting * added new LogType 'PdaInteract' and changed PDA notekeeper logs to it --------- Co-authored-by: dylanhunter --- .../Cartridges/NotekeeperCartridgeSystem.cs | 8 +++++++- Content.Shared.Database/LogType.cs | 5 +++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Content.Server/CartridgeLoader/Cartridges/NotekeeperCartridgeSystem.cs b/Content.Server/CartridgeLoader/Cartridges/NotekeeperCartridgeSystem.cs index 287f68240241..1b77e63e5a99 100644 --- a/Content.Server/CartridgeLoader/Cartridges/NotekeeperCartridgeSystem.cs +++ b/Content.Server/CartridgeLoader/Cartridges/NotekeeperCartridgeSystem.cs @@ -1,11 +1,14 @@ +using Content.Server.Administration.Logs; using Content.Shared.CartridgeLoader; using Content.Shared.CartridgeLoader.Cartridges; +using Content.Shared.Database; namespace Content.Server.CartridgeLoader.Cartridges; public sealed class NotekeeperCartridgeSystem : EntitySystem { [Dependency] private readonly CartridgeLoaderSystem? _cartridgeLoaderSystem = default!; + [Dependency] private readonly IAdminLogManager _adminLogger = default!; public override void Initialize() { @@ -36,16 +39,19 @@ private void OnUiMessage(EntityUid uid, NotekeeperCartridgeComponent component, if (message.Action == NotekeeperUiAction.Add) { component.Notes.Add(message.Note); + _adminLogger.Add(LogType.PdaInteract, LogImpact.Low, + $"{ToPrettyString(args.Actor)} added a note to PDA: '{message.Note}' contained on: {ToPrettyString(uid)}"); } else { component.Notes.Remove(message.Note); + _adminLogger.Add(LogType.PdaInteract, LogImpact.Low, + $"{ToPrettyString(args.Actor)} removed a note from PDA: '{message.Note}' was contained on: {ToPrettyString(uid)}"); } UpdateUiState(uid, GetEntity(args.LoaderUid), component); } - private void UpdateUiState(EntityUid uid, EntityUid loaderUid, NotekeeperCartridgeComponent? component) { if (!Resolve(uid, ref component)) diff --git a/Content.Shared.Database/LogType.cs b/Content.Shared.Database/LogType.cs index bd8ba8596c20..562d02a102bb 100644 --- a/Content.Shared.Database/LogType.cs +++ b/Content.Shared.Database/LogType.cs @@ -441,4 +441,9 @@ public enum LogType /// A ghost warped to an entity through the ghost warp menu. /// GhostWarp = 95, + + ///

+ /// A player interacted with a PDA or its cartridge component + /// + PdaInteract = 96, } From a31f82f1d94415593cb4da51c272ebcb724516b2 Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 2 Jan 2025 16:17:51 +0000 Subject: [PATCH 012/205] Automatic changelog update --- Resources/Changelog/Admin.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml index 31e384ea3ff4..33989882a987 100644 --- a/Resources/Changelog/Admin.yml +++ b/Resources/Changelog/Admin.yml @@ -664,5 +664,12 @@ Entries: id: 82 time: '2024-12-24T02:25:04.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/34001 +- author: DylanWhittingham + changes: + - message: Players using the notekeeper PDA program is now logged. + type: Add + id: 83 + time: '2025-01-02T16:16:44.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/34118 Name: Admin Order: 3 From cd08942368c404bf5de7bc317b89ca27bdb72d04 Mon Sep 17 00:00:00 2001 From: Alpaccalypse <21291379+Alpaccalypse@users.noreply.github.com> Date: Thu, 2 Jan 2025 16:39:12 +0000 Subject: [PATCH 013/205] Sprites defined for all non-generic computer boards. Added new syndicate computer board sprite. (#34104) * Defined sprites for non-generic computer boards. Added new syndicate computer board sprite. * Added new sprite to meta.json and updated attribution. * Reformatted module.rsi meta.json to match other meta file styles. * Syndicate board sprite made less yellow/gold, changed outer chips to black. Using grey/silver for CPU centre, akin to syndie agent PDA theme, and to keep distinctive from security board. * Corrected indentation spacing for currently edited entities. * Update Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml * add pr link to attribution --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com> --- .../Devices/Circuitboards/computer.yml | 68 ++-- .../Objects/Misc/module.rsi/cpu_syndicate.png | Bin 0 -> 435 bytes .../Objects/Misc/module.rsi/meta.json | 353 +++++++++++++++++- 3 files changed, 395 insertions(+), 26 deletions(-) create mode 100644 Resources/Textures/Objects/Misc/module.rsi/cpu_syndicate.png diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml index b6409c5098f5..1bf3bca6bc58 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml @@ -150,10 +150,12 @@ name: cargo shuttle console board description: A computer printed circuit board for a cargo shuttle console. components: - - type: ComputerBoard - prototype: ComputerShuttleCargo - - type: StealTarget - stealGroup: CargoShuttleConsoleCircuitboard + - type: Sprite + state: cpu_supply + - type: ComputerBoard + prototype: ComputerShuttleCargo + - type: StealTarget + stealGroup: CargoShuttleConsoleCircuitboard - type: entity parent: BaseComputerCircuitboard @@ -161,11 +163,13 @@ name: surveillance camera monitor board description: A computer printed circuit board for a surveillance camera monitor. components: - - type: ComputerBoard - prototype: ComputerSurveillanceCameraMonitor - - type: Tag - tags: - - SurveillanceCameraMonitorCircuitboard + - type: Sprite + state: cpu_security + - type: ComputerBoard + prototype: ComputerSurveillanceCameraMonitor + - type: Tag + tags: + - SurveillanceCameraMonitorCircuitboard - type: entity parent: BaseComputerCircuitboard @@ -173,8 +177,10 @@ name: surveillance wireless camera monitor board description: A computer printed circuit board for a surveillance wireless camera monitor. components: - - type: ComputerBoard - prototype: ComputerSurveillanceWirelessCameraMonitor + - type: Sprite + state: cpu_security + - type: ComputerBoard + prototype: ComputerSurveillanceWirelessCameraMonitor - type: entity parent: BaseComputerCircuitboard @@ -227,12 +233,14 @@ name: crew monitoring computer board description: A computer printed circuit board for a crew monitoring console. components: - - type: ComputerBoard - prototype: ComputerCrewMonitoring - - type: ReverseEngineering # Nyano - difficulty: 2 - recipes: - - CrewMonitoringComputerCircuitboard + - type: Sprite + state: cpu_medical + - type: ComputerBoard + prototype: ComputerCrewMonitoring + - type: ReverseEngineering # DeltaV + difficulty: 2 + recipes: + - CrewMonitoringComputerCircuitboard - type: entity parent: [BaseComputerCircuitboard, BaseGrandTheftContraband] @@ -278,14 +286,18 @@ name: syndicate communications computer board description: A computer printed circuit board for a syndicate communications console. components: - - type: ComputerBoard - prototype: SyndicateComputerComms + - type: Sprite + state: cpu_syndicate + - type: ComputerBoard + prototype: SyndicateComputerComms - type: entity parent: BaseComputerCircuitboard id: RadarConsoleCircuitboard name: radar console computer board components: + - type: Sprite + state: cpu_supply - type: ComputerBoard prototype: ComputerRadar - type: ReverseEngineering @@ -338,8 +350,10 @@ name: shuttle console board description: A computer printed circuit board for a shuttle console. components: - - type: ComputerBoard - prototype: ComputerShuttle + - type: Sprite + state: cpu_supply + - type: ComputerBoard + prototype: ComputerShuttle - type: entity parent: BaseComputerCircuitboard @@ -347,8 +361,10 @@ name: syndicate shuttle console board description: A computer printed circuit board for a syndicate shuttle console. components: - - type: ComputerBoard - prototype: ComputerShuttleSyndie + - type: Sprite + state: cpu_syndicate + - type: ComputerBoard + prototype: ComputerShuttleSyndie - type: entity parent: [ BaseComputerCircuitboard, BaseCloningBoard ] # DeltaV @@ -378,8 +394,10 @@ name: syndicate IFF console board description: Allows you to control the IFF and stealth characteristics of this vessel. components: - - type: ComputerBoard - prototype: ComputerIFFSyndicate + - type: Sprite + state: cpu_syndicate + - type: ComputerBoard + prototype: ComputerIFFSyndicate - type: entity parent: BaseComputerCircuitboard diff --git a/Resources/Textures/Objects/Misc/module.rsi/cpu_syndicate.png b/Resources/Textures/Objects/Misc/module.rsi/cpu_syndicate.png new file mode 100644 index 0000000000000000000000000000000000000000..9f890eb300a68c4019b2e25f32e2af7fa6ba9817 GIT binary patch literal 435 zcmV;k0ZjghP)^1k2adEW2K`+`EDQ2cjR{1#4y7y~4P0H7?TGY(>M zUs*~34y5$0vl^6avf$*nt{beiJ5zCFZw1+7V`icYP*gu z+pGpU5DDt8QN5p<*L4FrT{gBhXZAj~o~Y{v(Oh~)7ewF{n4=+uK@W2@1VD?&JPX^{ z>uy~TfezSKo>^B=F>AiX0V-yVs7se^R>L>owo;47xaxGBx%(=#c#KaEUFZf1gB}SX zex8#MjsxzKyB(O)Ez*Gd8TB(MOzUNMv3Gm~La_gl!OS#B+`Y_gBJ$f$#pa|^qOKcg z@fa1e=EP_&P1)LWv3|K62fUgoOGzS^req~ASx!x^FO}QW_PGC*8;6Mt{{uGSu^lQZ d6bi+k;2WSK;61sKAzuIh002ovPDHLkV1h3}yA}Wd literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/module.rsi/meta.json b/Resources/Textures/Objects/Misc/module.rsi/meta.json index e332bf6c19ba..b36674173805 100644 --- a/Resources/Textures/Objects/Misc/module.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/module.rsi/meta.json @@ -1 +1,352 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0, generic, service, command, science, security, medical, supply, and engineering taken from shiptest at https://github.com/shiptest-ss13/Shiptest/pull/1473, additional sprites created by EmoGarbage404", "states": [{"name": "abductor_mod"}, {"name": "airalarm_electronics"}, {"name": "ash_plating"}, {"name": "beaker_holder"}, {"name": "blank_mod"}, {"name": "bluespacearray"}, {"name": "boris"}, {"name": "boris_recharging", "delays": [[1.0, 1.0]]}, {"name": "card_mini"}, {"name": "card_mod"}, {"name": "cargodisk"}, {"name": "cart_connector"}, {"name": "cddrive"}, {"name": "cell"}, {"name": "cell_con"}, {"name": "cell_con_micro"}, {"name": "cell_micro"}, {"name": "cell_mini"}, {"name": "charger_APC"}, {"name": "charger_lambda"}, {"name": "charger_pda"}, {"name": "charger_wire"}, {"name": "clock_mod", "delays": [[0.6, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "command"}, {"name": "cpu"}, {"name": "cpu_adv"}, {"name": "cpu_command"}, {"name": "cpu_engineering"}, {"name": "cpu_medical"}, {"name": "cpu_science"}, {"name": "cpu_security"}, {"name": "cpu_service"}, {"name": "cpu_super", "delays": [[0.1, 0.1]]}, {"name": "cpu_supply"}, {"name": "cpuboard"}, {"name": "cpuboard_adv"}, {"name": "cpuboard_super", "delays": [[0.1, 0.1]]}, {"name": "cyborg_upgrade"}, {"name": "cyborg_upgrade1"}, {"name": "cyborg_upgrade2"}, {"name": "cyborg_upgrade3"}, {"name": "cyborg_upgrade4"}, {"name": "cyborg_upgrade5"}, {"name": "datadisk_base"}, {"name": "datadisk_gene", "delays": [[0.1, 0.1, 0.1]]}, {"name": "datadisk_encrypted", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "datadisk_hydro", "delays": [[0.1, 0.1, 0.1]]}, {"name": "datadisk_label"}, {"name": "depositbox"}, {"name": "door_electronics"}, {"name": "engineering"}, {"name": "flopdrive"}, {"name": "generic"}, {"name": "harddisk"}, {"name": "harddisk_micro"}, {"name": "harddisk_mini"}, {"name": "holodisk", "delays": [[0.1, 0.1]]}, {"name": "id_mod"}, {"name": "mainboard"}, {"name": "mcontroller"}, {"name": "medical"}, {"name": "net_wired"}, {"name": "power_mod"}, {"name": "printer"}, {"name": "printer_mini"}, {"name": "prizevendor"}, {"name": "radio"}, {"name": "radio_micro"}, {"name": "radio_mini"}, {"name": "ram"}, {"name": "rndmajordisk"}, {"name": "science"}, {"name": "secmodschematic"}, {"name": "security"}, {"name": "selfrepair_off"}, {"name": "selfrepair_on", "delays": [[0.1, 0.1, 0.1, 0.1]]}, {"name": "service"}, {"name": "servo"}, {"name": "ssd"}, {"name": "ssd_large"}, {"name": "ssd_micro"}, {"name": "ssd_mini"}, {"name": "std_mod"}, {"name": "supply"}]} +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0, generic, service, command, science, security, medical, supply, and engineering taken from shiptest at https://github.com/shiptest-ss13/Shiptest/pull/1473, additional sprites created by EmoGarbage404, cpu_syndicate sprite derived from previous examples and created by Alpaccalypse at https://github.com/space-wizards/space-station-14/pull/34104", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "abductor_mod" + }, + { + "name": "airalarm_electronics" + }, + { + "name": "ash_plating" + }, + { + "name": "beaker_holder" + }, + { + "name": "blank_mod" + }, + { + "name": "bluespacearray" + }, + { + "name": "boris" + }, + { + "name": "boris_recharging", + "delays": [ + [ + 1.0, + 1.0 + ] + ] + }, + { + "name": "card_mini" + }, + { + "name": "card_mod" + }, + { + "name": "cargodisk" + }, + { + "name": "cart_connector" + }, + { + "name": "cddrive" + }, + { + "name": "cell" + }, + { + "name": "cell_con" + }, + { + "name": "cell_con_micro" + }, + { + "name": "cell_micro" + }, + { + "name": "cell_mini" + }, + { + "name": "charger_APC" + }, + { + "name": "charger_lambda" + }, + { + "name": "charger_pda" + }, + { + "name": "charger_wire" + }, + { + "name": "clock_mod", + "delays": [ + [ + 0.6, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "command" + }, + { + "name": "cpu" + }, + { + "name": "cpu_adv" + }, + { + "name": "cpu_command" + }, + { + "name": "cpu_engineering" + }, + { + "name": "cpu_medical" + }, + { + "name": "cpu_science" + }, + { + "name": "cpu_security" + }, + { + "name": "cpu_service" + }, + { + "name": "cpu_super", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "cpu_supply" + }, + { + "name": "cpu_syndicate" + }, + { + "name": "cpuboard" + }, + { + "name": "cpuboard_adv" + }, + { + "name": "cpuboard_super", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "cyborg_upgrade" + }, + { + "name": "cyborg_upgrade1" + }, + { + "name": "cyborg_upgrade2" + }, + { + "name": "cyborg_upgrade3" + }, + { + "name": "cyborg_upgrade4" + }, + { + "name": "cyborg_upgrade5" + }, + { + "name": "datadisk_base" + }, + { + "name": "datadisk_gene", + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "datadisk_encrypted", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "datadisk_hydro", + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "datadisk_label" + }, + { + "name": "depositbox" + }, + { + "name": "door_electronics" + }, + { + "name": "engineering" + }, + { + "name": "flopdrive" + }, + { + "name": "generic" + }, + { + "name": "harddisk" + }, + { + "name": "harddisk_micro" + }, + { + "name": "harddisk_mini" + }, + { + "name": "holodisk", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "id_mod" + }, + { + "name": "mainboard" + }, + { + "name": "mcontroller" + }, + { + "name": "medical" + }, + { + "name": "net_wired" + }, + { + "name": "power_mod" + }, + { + "name": "printer" + }, + { + "name": "printer_mini" + }, + { + "name": "prizevendor" + }, + { + "name": "radio" + }, + { + "name": "radio_micro" + }, + { + "name": "radio_mini" + }, + { + "name": "ram" + }, + { + "name": "rndmajordisk" + }, + { + "name": "science" + }, + { + "name": "secmodschematic" + }, + { + "name": "security" + }, + { + "name": "selfrepair_off" + }, + { + "name": "selfrepair_on", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "service" + }, + { + "name": "servo" + }, + { + "name": "ssd" + }, + { + "name": "ssd_large" + }, + { + "name": "ssd_micro" + }, + { + "name": "ssd_mini" + }, + { + "name": "std_mod" + }, + { + "name": "supply" + } + ] +} From c8a77a182126c8970c194e9f0db47b54c45fe4bf Mon Sep 17 00:00:00 2001 From: Dylan Hunter Whittingham <45404433+DylanWhittingham@users.noreply.github.com> Date: Thu, 2 Jan 2025 16:46:13 +0000 Subject: [PATCH 014/205] Added pricegun sound (#34119) added pricegun sound Co-authored-by: dylanhunter --- .../Cargo/Systems/ClientPriceGunSystem.cs | 5 +++-- Content.Server/Cargo/Systems/PriceGunSystem.cs | 17 ++++++++++++----- .../Cargo/Components/PriceGunComponent.cs | 6 ++++++ Content.Shared/Cargo/SharedPriceGunSystem.cs | 4 ++-- Resources/Audio/Items/appraiser.ogg | Bin 0 -> 7049 bytes Resources/Audio/Items/attributions.yml | 7 ++++++- 6 files changed, 29 insertions(+), 10 deletions(-) create mode 100644 Resources/Audio/Items/appraiser.ogg diff --git a/Content.Client/Cargo/Systems/ClientPriceGunSystem.cs b/Content.Client/Cargo/Systems/ClientPriceGunSystem.cs index f17393247836..35fb2112c074 100644 --- a/Content.Client/Cargo/Systems/ClientPriceGunSystem.cs +++ b/Content.Client/Cargo/Systems/ClientPriceGunSystem.cs @@ -1,3 +1,4 @@ +using Content.Shared.Cargo.Components; using Content.Shared.Timing; using Content.Shared.Cargo.Systems; @@ -10,9 +11,9 @@ public sealed class ClientPriceGunSystem : SharedPriceGunSystem { [Dependency] private readonly UseDelaySystem _useDelay = default!; - protected override bool GetPriceOrBounty(EntityUid priceGunUid, EntityUid target, EntityUid user) + protected override bool GetPriceOrBounty(Entity entity, EntityUid target, EntityUid user) { - if (!TryComp(priceGunUid, out UseDelayComponent? useDelay) || _useDelay.IsDelayed((priceGunUid, useDelay))) + if (!TryComp(entity, out UseDelayComponent? useDelay) || _useDelay.IsDelayed((entity, useDelay))) return false; // It feels worse if the cooldown is predicted but the popup isn't! So only do the cooldown reset on the server. diff --git a/Content.Server/Cargo/Systems/PriceGunSystem.cs b/Content.Server/Cargo/Systems/PriceGunSystem.cs index 94f9f9cba9ed..5e7ab2306068 100644 --- a/Content.Server/Cargo/Systems/PriceGunSystem.cs +++ b/Content.Server/Cargo/Systems/PriceGunSystem.cs @@ -1,7 +1,9 @@ using Content.Server.Popups; +using Content.Shared.Cargo.Components; using Content.Shared.IdentityManagement; using Content.Shared.Timing; using Content.Shared.Cargo.Systems; +using Robust.Shared.Audio.Systems; namespace Content.Server.Cargo.Systems; @@ -11,12 +13,12 @@ public sealed class PriceGunSystem : SharedPriceGunSystem [Dependency] private readonly PricingSystem _pricingSystem = default!; [Dependency] private readonly PopupSystem _popupSystem = default!; [Dependency] private readonly CargoSystem _bountySystem = default!; + [Dependency] private readonly SharedAudioSystem _audio = default!; - protected override bool GetPriceOrBounty(EntityUid priceGunUid, EntityUid target, EntityUid user) + protected override bool GetPriceOrBounty(Entity entity, EntityUid target, EntityUid user) { - if (!TryComp(priceGunUid, out UseDelayComponent? useDelay) || _useDelay.IsDelayed((priceGunUid, useDelay))) + if (!TryComp(entity.Owner, out UseDelayComponent? useDelay) || _useDelay.IsDelayed((entity.Owner, useDelay))) return false; - // Check if we're scanning a bounty crate if (_bountySystem.IsBountyComplete(target, out _)) { @@ -25,10 +27,15 @@ protected override bool GetPriceOrBounty(EntityUid priceGunUid, EntityUid target else // Otherwise appraise the price { var price = _pricingSystem.GetPrice(target); - _popupSystem.PopupEntity(Loc.GetString("price-gun-pricing-result", ("object", Identity.Entity(target, EntityManager)), ("price", $"{price:F2}")), user, user); + _popupSystem.PopupEntity(Loc.GetString("price-gun-pricing-result", + ("object", Identity.Entity(target, EntityManager)), + ("price", $"{price:F2}")), + user, + user); } - _useDelay.TryResetDelay((priceGunUid, useDelay)); + _audio.PlayPvs(entity.Comp.AppraisalSound, entity.Owner); + _useDelay.TryResetDelay((entity.Owner, useDelay)); return true; } } diff --git a/Content.Shared/Cargo/Components/PriceGunComponent.cs b/Content.Shared/Cargo/Components/PriceGunComponent.cs index 7024f1195afd..6577c52c1e71 100644 --- a/Content.Shared/Cargo/Components/PriceGunComponent.cs +++ b/Content.Shared/Cargo/Components/PriceGunComponent.cs @@ -1,3 +1,4 @@ +using Robust.Shared.Audio; using Robust.Shared.GameStates; namespace Content.Shared.Cargo.Components; @@ -8,4 +9,9 @@ namespace Content.Shared.Cargo.Components; [RegisterComponent, NetworkedComponent] public sealed partial class PriceGunComponent : Component { + /// + /// The sound that plays when the price gun appraises an object. + /// + [DataField] + public SoundSpecifier AppraisalSound = new SoundPathSpecifier("/Audio/Items/appraiser.ogg"); } diff --git a/Content.Shared/Cargo/SharedPriceGunSystem.cs b/Content.Shared/Cargo/SharedPriceGunSystem.cs index 779d55055aa2..b5e312772b75 100644 --- a/Content.Shared/Cargo/SharedPriceGunSystem.cs +++ b/Content.Shared/Cargo/SharedPriceGunSystem.cs @@ -26,7 +26,7 @@ private void OnUtilityVerb(EntityUid uid, PriceGunComponent component, GetVerbsE { Act = () => { - GetPriceOrBounty(uid, args.Target, args.User); + GetPriceOrBounty((uid, component), args.Target, args.User); }, Text = Loc.GetString("price-gun-verb-text"), Message = Loc.GetString("price-gun-verb-message", ("object", Identity.Entity(args.Target, EntityManager))) @@ -51,5 +51,5 @@ private void OnAfterInteract(Entity entity, ref AfterInteract /// This is abstract for prediction. When the bounty system / cargo systems that are necessary are moved to shared, /// combine all the server, client, and shared stuff into one non abstract file. /// - protected abstract bool GetPriceOrBounty(EntityUid priceGunUid, EntityUid target, EntityUid user); + protected abstract bool GetPriceOrBounty(Entity entity, EntityUid target, EntityUid user); } diff --git a/Resources/Audio/Items/appraiser.ogg b/Resources/Audio/Items/appraiser.ogg new file mode 100644 index 0000000000000000000000000000000000000000..18c0a83b7fa39693d2ac920e003aa0e975ab846d GIT binary patch literal 7049 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 Date: Thu, 2 Jan 2025 16:47:21 +0000 Subject: [PATCH 015/205] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index f2754211ae2d..f9070799361d 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: DieselMohawk - changes: - - message: Added Red Neck Gaiter to Secdrobe - type: Add - id: 7275 - time: '2024-09-03T15:16:51.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30106 - author: ScarKy0 changes: - message: Fixed typos in antimov. @@ -3928,3 +3921,10 @@ id: 7774 time: '2025-01-02T09:46:30.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/34107 +- author: DylanWhittingham + changes: + - message: Added appraisal tool sound. + type: Add + id: 7775 + time: '2025-01-02T16:46:13.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/34119 From ab60e55fb79df11a59bdd8ddd15e0080ae74440d Mon Sep 17 00:00:00 2001 From: Ps3Moira <113228053+ps3moira@users.noreply.github.com> Date: Thu, 2 Jan 2025 08:49:30 -0800 Subject: [PATCH 016/205] Separate Tables n' Counters (#32673) * Update tables.yml * Remove Extra base: state_ * Update tables.yml --- .../Structures/Furniture/Tables/tables.yml | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml index fba7864ac16d..036c90e82812 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml @@ -192,6 +192,9 @@ max: 1 - !type:DoActsBehavior acts: [ "Destruction" ] + - type: IconSmooth + key: metaltable + base: state_ - type: Construction graph: Table node: Table @@ -230,6 +233,8 @@ max: 2 - !type:DoActsBehavior acts: [ "Destruction" ] + - type: IconSmooth + key: metalreinforcedtable - type: Construction graph: Table node: TableReinforced @@ -286,6 +291,8 @@ node: TableFrame - !type:DoActsBehavior acts: [ "Destruction" ] + - type: IconSmooth + key: glasstable - type: Construction graph: Table node: TableGlass @@ -341,6 +348,8 @@ max: 1 - !type:DoActsBehavior acts: [ "Destruction" ] + - type: IconSmooth + key: reinforcedglasstable - type: Construction graph: Table node: TableReinforcedGlass @@ -396,6 +405,8 @@ max: 1 - !type:DoActsBehavior acts: [ "Destruction" ] + - type: IconSmooth + key: plasmaglasstable - type: Construction graph: Table node: TablePlasmaGlass @@ -440,6 +451,8 @@ max: 1 - !type:DoActsBehavior acts: [ "Destruction" ] + - type: IconSmooth + key: brasstable - type: Construction graph: Table node: TableBrass @@ -481,6 +494,8 @@ max: 1 - !type:DoActsBehavior acts: [ "Destruction" ] + - type: IconSmooth + key: woodtable - type: Construction graph: Table node: TableWood @@ -522,6 +537,8 @@ max: 1 - !type:DoActsBehavior acts: [ "Destruction" ] + - type: IconSmooth + key: woodgambletable - type: Construction graph: Table node: TableCarpet @@ -553,6 +570,8 @@ path: /Audio/Effects/picaxe2.ogg - !type:DoActsBehavior acts: [ "Destruction" ] + - type: IconSmooth + key: stonetable - type: FootstepModifier footstepSoundCollection: collection: FootstepFloor @@ -582,6 +601,8 @@ Brute: path: "/Audio/Weapons/slash.ogg" + - type: IconSmooth + key: webtable - type: Construction graph: WebStructures node: table @@ -619,6 +640,8 @@ max: 1 - !type:DoActsBehavior acts: [ "Destruction" ] + - type: IconSmooth + key: fancytable - type: Tag tags: - Wooden @@ -638,6 +661,8 @@ - type: Construction graph: Table node: TableFancyBlue + - type: IconSmooth + key: fancytableblue - type: entity id: TableFancyCyan @@ -651,6 +676,8 @@ - type: Construction graph: Table node: TableFancyCyan + - type: IconSmooth + key: fancytablecyan - type: entity id: TableFancyBlack @@ -664,6 +691,8 @@ - type: Construction graph: Table node: TableFancyBlack + - type: IconSmooth + key: fancytableblack - type: entity id: TableFancyRed @@ -677,6 +706,8 @@ - type: Construction graph: Table node: TableFancyRed + - type: IconSmooth + key: fancytablered - type: entity id: TableFancyPurple @@ -690,6 +721,8 @@ - type: Construction graph: Table node: TableFancyPurple + - type: IconSmooth + key: fancytablepurple - type: entity id: TableFancyPink @@ -703,6 +736,8 @@ - type: Construction graph: Table node: TableFancyPink + - type: IconSmooth + key: fancytablepink - type: entity id: TableFancyGreen @@ -716,6 +751,8 @@ - type: Construction graph: Table node: TableFancyGreen + - type: IconSmooth + key: fancytablegreen - type: entity id: TableFancyOrange @@ -729,6 +766,8 @@ - type: Construction graph: Table node: TableFancyOrange + - type: IconSmooth + key: fancytableorange - type: entity id: TableFancyWhite @@ -742,6 +781,8 @@ - type: Construction graph: Table node: TableFancyWhite + - type: IconSmooth + key: fancytablewhite #Debug @@ -806,6 +847,9 @@ max: 1 - !type:DoActsBehavior acts: [ "Destruction" ] + - type: IconSmooth + key: counterwood + base: state_ - type: Construction graph: Table node: CounterWood @@ -851,6 +895,9 @@ max: 1 - !type:DoActsBehavior acts: [ "Destruction" ] + - type: IconSmooth + key: countermetal + base: state_ - type: Construction graph: Table node: CounterMetal From 5a51573d91c06dd0fb3457c0bee01f8c8b51def8 Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 2 Jan 2025 16:50:36 +0000 Subject: [PATCH 017/205] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index f9070799361d..e9f4ca9c2588 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: ScarKy0 - changes: - - message: Fixed typos in antimov. - type: Fix - id: 7276 - time: '2024-09-03T21:56:34.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/31811 - author: ScarKy0 changes: - message: Station AI's name now correctly displays in announcements. @@ -3928,3 +3921,10 @@ id: 7775 time: '2025-01-02T16:46:13.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/34119 +- author: ps3moira + changes: + - message: Changed tables and counter iconsmoothing + type: Tweak + id: 7776 + time: '2025-01-02T16:49:30.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32673 From 7992a693767c6cebb75eed105e5d4d28739893b6 Mon Sep 17 00:00:00 2001 From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Date: Thu, 2 Jan 2025 19:23:28 +0100 Subject: [PATCH 018/205] Add Chameleon PDA (#30514) * V1 commit * Remove PDA name and unnecessary pda state * Adds PDA to Chameleon backpack & thief toolbox * Change to use AppearanceDataInit * Add basic PDA state to ensure there's always a sprite before AppearanceData can be applied * Revert PDA name (this will be changed to another way later) * Update PDA name updating to new system * Fix yaml, and fix Agent ID chameleon * Updated based on review --- .../Systems/ChameleonClothingSystem.cs | 10 + .../UI/ChameleonBoundUserInterface.cs | 28 +- Content.Client/PDA/PdaMenu.xaml.cs | 5 + Content.Client/PDA/PdaSystem.cs | 40 -- Content.Client/PDA/PdaVisualizerSystem.cs | 30 ++ Content.Client/PDA/PdaVisualsComponent.cs | 14 + .../Systems/ChameleonClothingSystem.cs | 6 +- Content.Server/PDA/PdaSystem.cs | 21 +- .../Components/ChameleonClothingComponent.cs | 10 +- .../SharedChameleonClothingSystem.cs | 16 +- Content.Shared/PDA/PdaComponent.cs | 6 - Content.Shared/PDA/PdaVisuals.cs | 3 +- .../Catalog/Fills/Backpacks/duffelbag.yml | 1 + .../Prototypes/Catalog/thief_toolbox_sets.yml | 1 + .../Entities/Objects/Devices/pda.yml | 374 +++++++++++++++--- .../Objects/Misc/identification_cards.yml | 9 + Resources/Prototypes/tags.yml | 6 + 17 files changed, 463 insertions(+), 117 deletions(-) create mode 100644 Content.Client/PDA/PdaVisualizerSystem.cs create mode 100644 Content.Client/PDA/PdaVisualsComponent.cs diff --git a/Content.Client/Clothing/Systems/ChameleonClothingSystem.cs b/Content.Client/Clothing/Systems/ChameleonClothingSystem.cs index 0ea9bbac0918..330c0dfd446e 100644 --- a/Content.Client/Clothing/Systems/ChameleonClothingSystem.cs +++ b/Content.Client/Clothing/Systems/ChameleonClothingSystem.cs @@ -1,4 +1,5 @@ using System.Linq; +using Content.Client.PDA; using Content.Shared.Clothing.Components; using Content.Shared.Clothing.EntitySystems; using Content.Shared.Inventory; @@ -51,6 +52,15 @@ protected override void UpdateSprite(EntityUid uid, EntityPrototype proto) { sprite.CopyFrom(otherSprite); } + + // Edgecase for PDAs to include visuals when UI is open + if (TryComp(uid, out PdaBorderColorComponent? borderColor) + && proto.TryGetComponent(out PdaBorderColorComponent? otherBorderColor, _factory)) + { + borderColor.BorderColor = otherBorderColor.BorderColor; + borderColor.AccentHColor = otherBorderColor.AccentHColor; + borderColor.AccentVColor = otherBorderColor.AccentVColor; + } } /// diff --git a/Content.Client/Clothing/UI/ChameleonBoundUserInterface.cs b/Content.Client/Clothing/UI/ChameleonBoundUserInterface.cs index 83f6ba156629..6fafd45a5aa3 100644 --- a/Content.Client/Clothing/UI/ChameleonBoundUserInterface.cs +++ b/Content.Client/Clothing/UI/ChameleonBoundUserInterface.cs @@ -1,15 +1,21 @@ -using Content.Client.Clothing.Systems; +using Content.Client.Clothing.Systems; using Content.Shared.Clothing.Components; +using Content.Shared.Tag; +using Content.Shared.Prototypes; using JetBrains.Annotations; using Robust.Client.GameObjects; using Robust.Client.UserInterface; +using Robust.Shared.Prototypes; namespace Content.Client.Clothing.UI; [UsedImplicitly] public sealed class ChameleonBoundUserInterface : BoundUserInterface { + [Dependency] private readonly IComponentFactory _factory = default!; + [Dependency] private readonly IPrototypeManager _proto = default!; private readonly ChameleonClothingSystem _chameleon; + private readonly TagSystem _tag; [ViewVariables] private ChameleonMenu? _menu; @@ -17,6 +23,7 @@ public sealed class ChameleonBoundUserInterface : BoundUserInterface public ChameleonBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { _chameleon = EntMan.System(); + _tag = EntMan.System(); } protected override void Open() @@ -34,7 +41,24 @@ protected override void UpdateState(BoundUserInterfaceState state) return; var targets = _chameleon.GetValidTargets(st.Slot); - _menu?.UpdateState(targets, st.SelectedId); + if (st.RequiredTag != null) + { + var newTargets = new List(); + foreach (var target in targets) + { + if (string.IsNullOrEmpty(target) || !_proto.TryIndex(target, out EntityPrototype? proto)) + continue; + + if (!proto.TryGetComponent(out TagComponent? tag, _factory) || !_tag.HasTag(tag, st.RequiredTag)) + continue; + + newTargets.Add(target); + } + _menu?.UpdateState(newTargets, st.SelectedId); + } else + { + _menu?.UpdateState(targets, st.SelectedId); + } } private void OnIdSelected(string selectedId) diff --git a/Content.Client/PDA/PdaMenu.xaml.cs b/Content.Client/PDA/PdaMenu.xaml.cs index 630861d08408..712e0cbb01a4 100644 --- a/Content.Client/PDA/PdaMenu.xaml.cs +++ b/Content.Client/PDA/PdaMenu.xaml.cs @@ -141,6 +141,11 @@ public void UpdateState(PdaUpdateState state) _pdaOwner = state.PdaOwnerInfo.ActualOwnerName; PdaOwnerLabel.SetMarkup(Loc.GetString("comp-pda-ui-owner", ("actualOwnerName", _pdaOwner))); + PdaOwnerLabel.Visible = true; + } + else + { + PdaOwnerLabel.Visible = false; } diff --git a/Content.Client/PDA/PdaSystem.cs b/Content.Client/PDA/PdaSystem.cs index 00a12ae2e696..a5fedce57955 100644 --- a/Content.Client/PDA/PdaSystem.cs +++ b/Content.Client/PDA/PdaSystem.cs @@ -1,48 +1,8 @@ using Content.Shared.PDA; -using Content.Shared.Light; -using Robust.Client.GameObjects; namespace Content.Client.PDA; public sealed class PdaSystem : SharedPdaSystem { - public override void Initialize() - { - base.Initialize(); - SubscribeLocalEvent(OnAppearanceChange); - } - - private void OnAppearanceChange(EntityUid uid, PdaComponent component, ref AppearanceChangeEvent args) - { - if (args.Sprite == null) - return; - - if (Appearance.TryGetData(uid, UnpoweredFlashlightVisuals.LightOn, out var isFlashlightOn, args.Component)) - args.Sprite.LayerSetVisible(PdaVisualLayers.Flashlight, isFlashlightOn); - - if (Appearance.TryGetData(uid, PdaVisuals.IdCardInserted, out var isCardInserted, args.Component)) - args.Sprite.LayerSetVisible(PdaVisualLayers.IdLight, isCardInserted); - } - - protected override void OnComponentInit(EntityUid uid, PdaComponent component, ComponentInit args) - { - base.OnComponentInit(uid, component, args); - - if (!TryComp(uid, out var sprite)) - return; - - if (component.State != null) - sprite.LayerSetState(PdaVisualLayers.Base, component.State); - - sprite.LayerSetVisible(PdaVisualLayers.Flashlight, component.FlashlightOn); - sprite.LayerSetVisible(PdaVisualLayers.IdLight, component.IdSlot.StartingItem != null); - } - - public enum PdaVisualLayers : byte - { - Base, - Flashlight, - IdLight - } } diff --git a/Content.Client/PDA/PdaVisualizerSystem.cs b/Content.Client/PDA/PdaVisualizerSystem.cs new file mode 100644 index 000000000000..735fcd42eb0d --- /dev/null +++ b/Content.Client/PDA/PdaVisualizerSystem.cs @@ -0,0 +1,30 @@ +using Content.Shared.Light; +using Content.Shared.PDA; +using Robust.Client.GameObjects; + +namespace Content.Client.PDA; + +public sealed class PdaVisualizerSystem : VisualizerSystem +{ + protected override void OnAppearanceChange(EntityUid uid, PdaVisualsComponent comp, ref AppearanceChangeEvent args) + { + if (args.Sprite == null) + return; + + if (AppearanceSystem.TryGetData(uid, PdaVisuals.PdaType, out var pdaType, args.Component)) + args.Sprite.LayerSetState(PdaVisualLayers.Base, pdaType); + + if (AppearanceSystem.TryGetData(uid, UnpoweredFlashlightVisuals.LightOn, out var isFlashlightOn, args.Component)) + args.Sprite.LayerSetVisible(PdaVisualLayers.Flashlight, isFlashlightOn); + + if (AppearanceSystem.TryGetData(uid, PdaVisuals.IdCardInserted, out var isCardInserted, args.Component)) + args.Sprite.LayerSetVisible(PdaVisualLayers.IdLight, isCardInserted); + } + + public enum PdaVisualLayers : byte + { + Base, + Flashlight, + IdLight + } +} diff --git a/Content.Client/PDA/PdaVisualsComponent.cs b/Content.Client/PDA/PdaVisualsComponent.cs new file mode 100644 index 000000000000..893ce5503d72 --- /dev/null +++ b/Content.Client/PDA/PdaVisualsComponent.cs @@ -0,0 +1,14 @@ +namespace Content.Client.PDA; + +/// +/// Used for visualizing PDA visuals. +/// +[RegisterComponent] +public sealed partial class PdaVisualsComponent : Component +{ + public string? BorderColor; + + public string? AccentHColor; + + public string? AccentVColor; +} diff --git a/Content.Server/Clothing/Systems/ChameleonClothingSystem.cs b/Content.Server/Clothing/Systems/ChameleonClothingSystem.cs index feb3428884ce..3700aeb549c8 100644 --- a/Content.Server/Clothing/Systems/ChameleonClothingSystem.cs +++ b/Content.Server/Clothing/Systems/ChameleonClothingSystem.cs @@ -1,4 +1,4 @@ -using Content.Server.IdentityManagement; +using Content.Server.IdentityManagement; using Content.Shared.Clothing.Components; using Content.Shared.Clothing.EntitySystems; using Content.Shared.IdentityManagement.Components; @@ -63,7 +63,7 @@ private void UpdateUi(EntityUid uid, ChameleonClothingComponent? component = nul if (!Resolve(uid, ref component)) return; - var state = new ChameleonBoundUserInterfaceState(component.Slot, component.Default); + var state = new ChameleonBoundUserInterfaceState(component.Slot, component.Default, component.RequireTag); _uiSystem.SetUiState(uid, ChameleonUiKey.Key, state); } @@ -84,7 +84,7 @@ public void SetSelectedPrototype(EntityUid uid, string? protoId, bool forceUpdat // make sure that it is valid change if (string.IsNullOrEmpty(protoId) || !_proto.TryIndex(protoId, out EntityPrototype? proto)) return; - if (!IsValidTarget(proto, component.Slot)) + if (!IsValidTarget(proto, component.Slot, component.RequireTag)) return; component.Default = protoId; diff --git a/Content.Server/PDA/PdaSystem.cs b/Content.Server/PDA/PdaSystem.cs index 7f17b97d0adc..a9527020b07d 100644 --- a/Content.Server/PDA/PdaSystem.cs +++ b/Content.Server/PDA/PdaSystem.cs @@ -1,3 +1,4 @@ +using Content.Server.Access.Systems; using Content.Server.AlertLevel; using Content.Server.CartridgeLoader; using Content.Server.Chat.Managers; @@ -36,6 +37,7 @@ public sealed class PdaSystem : SharedPdaSystem [Dependency] private readonly UserInterfaceSystem _ui = default!; [Dependency] private readonly UnpoweredFlashlightSystem _unpoweredFlashlight = default!; [Dependency] private readonly ContainerSystem _containerSystem = default!; + [Dependency] private readonly IdCardSystem _idCard = default!; public override void Initialize() { @@ -55,19 +57,25 @@ public override void Initialize() SubscribeLocalEvent(OnNotification); SubscribeLocalEvent(OnStationRenamed); - SubscribeLocalEvent(OnEntityRenamed); + SubscribeLocalEvent(OnEntityRenamed, after: new[] { typeof(IdCardSystem) }); SubscribeLocalEvent(OnAlertLevelChanged); } private void OnEntityRenamed(ref EntityRenamedEvent ev) { - var query = EntityQueryEnumerator(); + if (HasComp(ev.Uid)) + return; - while (query.MoveNext(out var uid, out var comp)) + if (_idCard.TryFindIdCard(ev.Uid, out var idCard)) { - if (comp.PdaOwner == ev.Uid) + var query = EntityQueryEnumerator(); + + while (query.MoveNext(out var uid, out var comp)) { - SetOwner(uid, comp, ev.Uid, ev.NewName); + if (comp.ContainedId == idCard) + { + SetOwner(uid, comp, ev.Uid, ev.NewName); + } } } } @@ -86,6 +94,9 @@ protected override void OnComponentInit(EntityUid uid, PdaComponent pda, Compone protected override void OnItemInserted(EntityUid uid, PdaComponent pda, EntInsertedIntoContainerMessage args) { base.OnItemInserted(uid, pda, args); + var id = CompOrNull(pda.ContainedId); + if (id != null) + pda.OwnerName = id.FullName; UpdatePdaUi(uid, pda); } diff --git a/Content.Shared/Clothing/Components/ChameleonClothingComponent.cs b/Content.Shared/Clothing/Components/ChameleonClothingComponent.cs index def4254304f0..8fa2f19fa2ff 100644 --- a/Content.Shared/Clothing/Components/ChameleonClothingComponent.cs +++ b/Content.Shared/Clothing/Components/ChameleonClothingComponent.cs @@ -32,6 +32,12 @@ public sealed partial class ChameleonClothingComponent : Component /// [ViewVariables] public EntityUid? User; + + /// + /// Filter possible chameleon options by a tag in addition to WhitelistChameleon. + /// + [DataField] + public string? RequireTag; } [Serializable, NetSerializable] @@ -39,11 +45,13 @@ public sealed class ChameleonBoundUserInterfaceState : BoundUserInterfaceState { public readonly SlotFlags Slot; public readonly string? SelectedId; + public readonly string? RequiredTag; - public ChameleonBoundUserInterfaceState(SlotFlags slot, string? selectedId) + public ChameleonBoundUserInterfaceState(SlotFlags slot, string? selectedId, string? requiredTag) { Slot = slot; SelectedId = selectedId; + RequiredTag = requiredTag; } } diff --git a/Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs index 2b10b41fee8d..488b7a5b641c 100644 --- a/Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs +++ b/Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs @@ -6,6 +6,7 @@ using Content.Shared.Item; using Content.Shared.Tag; using Robust.Shared.Prototypes; +using Robust.Shared.Serialization.Manager; namespace Content.Shared.Clothing.EntitySystems; @@ -13,10 +14,12 @@ public abstract class SharedChameleonClothingSystem : EntitySystem { [Dependency] private readonly IComponentFactory _factory = default!; [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private readonly ISerializationManager _serialization = default!; [Dependency] private readonly ClothingSystem _clothingSystem = default!; [Dependency] private readonly ContrabandSystem _contraband = default!; [Dependency] private readonly MetaDataSystem _metaData = default!; [Dependency] private readonly SharedItemSystem _itemSystem = default!; + [Dependency] private readonly SharedAppearanceSystem _appearance = default!; [Dependency] private readonly TagSystem _tag = default!; public override void Initialize() @@ -71,6 +74,14 @@ protected void UpdateVisuals(EntityUid uid, ChameleonClothingComponent component _clothingSystem.CopyVisuals(uid, otherClothing, clothing); } + // appearance data logic + if (TryComp(uid, out AppearanceComponent? appearance) && + proto.TryGetComponent("Appearance", out AppearanceComponent? appearanceOther)) + { + _appearance.AppendData(appearanceOther, uid); + Dirty(uid, appearance); + } + // properly mark contraband if (proto.TryGetComponent("Contraband", out ContrabandComponent? contra)) { @@ -88,7 +99,7 @@ protected virtual void UpdateSprite(EntityUid uid, EntityPrototype proto) { } /// /// Check if this entity prototype is valid target for chameleon item. /// - public bool IsValidTarget(EntityPrototype proto, SlotFlags chameleonSlot = SlotFlags.NONE) + public bool IsValidTarget(EntityPrototype proto, SlotFlags chameleonSlot = SlotFlags.NONE, string? requiredTag = null) { // check if entity is valid if (proto.Abstract || proto.HideSpawnMenu) @@ -98,6 +109,9 @@ public bool IsValidTarget(EntityPrototype proto, SlotFlags chameleonSlot = SlotF if (!proto.TryGetComponent(out TagComponent? tag, _factory) || !_tag.HasTag(tag, "WhitelistChameleon")) return false; + if (requiredTag != null && !_tag.HasTag(tag, requiredTag)) + return false; + // check if it's valid clothing if (!proto.TryGetComponent("Clothing", out ClothingComponent? clothing)) return false; diff --git a/Content.Shared/PDA/PdaComponent.cs b/Content.Shared/PDA/PdaComponent.cs index 6aeb245e27d1..cdfeffa2c1cc 100644 --- a/Content.Shared/PDA/PdaComponent.cs +++ b/Content.Shared/PDA/PdaComponent.cs @@ -13,12 +13,6 @@ public sealed partial class PdaComponent : Component public const string PdaPenSlotId = "PDA-pen"; public const string PdaPaiSlotId = "PDA-pai"; - /// - /// The base PDA sprite state, eg. "pda", "pda-clown" - /// - [DataField("state")] - public string? State; - [DataField("idSlot")] public ItemSlot IdSlot = new(); diff --git a/Content.Shared/PDA/PdaVisuals.cs b/Content.Shared/PDA/PdaVisuals.cs index 56039cf0d291..e3daa8e575ed 100644 --- a/Content.Shared/PDA/PdaVisuals.cs +++ b/Content.Shared/PDA/PdaVisuals.cs @@ -5,7 +5,8 @@ namespace Content.Shared.PDA [Serializable, NetSerializable] public enum PdaVisuals { - IdCardInserted + IdCardInserted, + PdaType } [Serializable, NetSerializable] diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index bdbcbc53d0f9..43d86d5c87da 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -201,6 +201,7 @@ components: - type: StorageFill contents: + - id: ChameleonPDA - id: ClothingUniformJumpsuitChameleon - id: ClothingOuterChameleon - id: ClothingNeckChameleon diff --git a/Resources/Prototypes/Catalog/thief_toolbox_sets.yml b/Resources/Prototypes/Catalog/thief_toolbox_sets.yml index a7532ce40199..8e357e56db30 100644 --- a/Resources/Prototypes/Catalog/thief_toolbox_sets.yml +++ b/Resources/Prototypes/Catalog/thief_toolbox_sets.yml @@ -6,6 +6,7 @@ sprite: /Textures/Clothing/OuterClothing/Misc/black_hoodie.rsi state: icon content: + - ChameleonPDA - ClothingUniformJumpsuitChameleon - ClothingOuterChameleon - ClothingNeckChameleon diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index fb38b09df67d..3c411801611e 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -6,12 +6,17 @@ description: Personal Data Assistant. components: - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda - type: Sprite sprite: _DV/Objects/Devices/pda.rsi # DeltaV aPDA Resprite File Path scale: 0.75, 0.75 # DeltaV aPDA Resprite PDA Size change, makes it smaller for the full detail. Scale: 0.75, 0.75 # DeltaV aPDA Resprite PDA Size change, makes it smaller for the full detail. layers: - map: [ "enum.PdaVisualLayers.Base" ] + state: "pda" - state: "light_overlay" map: [ "enum.PdaVisualLayers.Flashlight" ] shader: "unshaded" @@ -26,7 +31,6 @@ Scale: 0.75, 0.75 # DeltaV aPDA Resprite PDA Size change, makes it smaller for the full detail. state: pda - type: Pda - state: pda paiSlot: priority: -2 whitelist: @@ -45,6 +49,7 @@ whitelist: components: - IdCard + - type: PdaVisuals - type: Item size: Small - type: ContainerContainer @@ -107,6 +112,8 @@ - type: Tag tags: - DoorBumpOpener + - WhitelistChameleon + - WhitelistChameleonPDA - type: Input context: "human" - type: SentienceTarget # sentient PDA = pAI lite @@ -155,7 +162,6 @@ components: - type: Pda id: PassengerIDCard - state: pda - type: PdaBorderColor borderColor: "#717059" @@ -167,7 +173,11 @@ components: - type: Pda id: TechnicalAssistantIDCard - state: pda-interntech + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-interntech - type: PdaBorderColor borderColor: "#717059" accentVColor: "#949137" @@ -182,7 +192,11 @@ components: - type: Pda id: MedicalInternIDCard - state: pda-internmed + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-internmed - type: PdaBorderColor borderColor: "#717059" accentVColor: "#447987" @@ -200,7 +214,11 @@ components: - type: Pda id: SecurityCadetIDCard - state: pda-interncadet + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-interncadet - type: PdaBorderColor borderColor: "#717059" accentVColor: "#A32D26" @@ -215,7 +233,11 @@ components: - type: Pda id: ResearchAssistantIDCard - state: pda-internsci + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-internsci - type: PdaBorderColor borderColor: "#717059" accentVColor: "#8900c9" @@ -230,7 +252,11 @@ components: - type: Pda id: ServiceWorkerIDCard - state: pda-internservice + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-internservice - type: PdaBorderColor borderColor: "#717059" accentVColor: "#00cc35" @@ -245,7 +271,11 @@ components: - type: Pda id: ChefIDCard - state: pda-cook + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-cook - type: PdaBorderColor borderColor: "#d7d7d0" - type: Icon @@ -261,7 +291,11 @@ components: - type: Pda id: BotanistIDCard - state: pda-hydro + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-hydro - type: PdaBorderColor borderColor: "#44843c" accentVColor: "#00cc35" @@ -276,7 +310,6 @@ components: - type: Pda id: ClownIDCard - state: pda-clown penSlot: startingItem: CrayonOrange # no pink crayon?!? # ^ Still unacceptable. @@ -286,6 +319,11 @@ whitelist: tags: - Write + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-clown - type: PdaBorderColor borderColor: "#C18199" - type: Icon @@ -320,7 +358,9 @@ components: - type: Pda id: VisitorIDCard - state: pda-clown + - type: Tag # Ignore Chameleon tags + tags: + - DoorBumpOpener - type: entity parent: BasePDA @@ -330,12 +370,16 @@ components: - type: Pda id: MimeIDCard - state: pda-mime idSlot: # rewrite without sound because mime name: ID Card whitelist: components: - IdCard + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-mime - type: PdaBorderColor borderColor: "#d7d7d0" accentHColor: "#333333" @@ -363,7 +407,11 @@ visible: false - type: Pda id: ChaplainIDCard - state: pda-chaplain + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-chaplain - type: PdaBorderColor borderColor: "#333333" accentVColor: "#8900c9" # DeltaV - Give Chaplain PDA Epistemics colors @@ -378,7 +426,9 @@ components: - type: Pda id: VisitorIDCard - state: pda-chaplain + - type: Tag # Ignore Chameleon tags + tags: + - DoorBumpOpener - type: entity name: logistics officer PDA # DeltaV - Logistics Department replacing Cargo @@ -388,7 +438,11 @@ components: - type: Pda id: QuartermasterIDCard - state: pda-qm + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-qm - type: PdaBorderColor borderColor: "#e39751" accentVColor: "#a23e3e" @@ -411,7 +465,11 @@ components: - type: Pda id: CargoIDCard - state: pda-cargo + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-cargo - type: PdaBorderColor borderColor: "#e39751" - type: Icon @@ -432,7 +490,11 @@ components: - type: Pda id: SalvageIDCard - state: pda-miner + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-miner - type: PdaBorderColor borderColor: "#af9366" accentVColor: "#8900c9" @@ -455,7 +517,11 @@ components: - type: Pda id: BartenderIDCard - state: pda-bartender + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-bartender - type: PdaBorderColor borderColor: "#333333" - type: Icon @@ -469,13 +535,17 @@ components: - type: Pda id: LibrarianIDCard - state: pda-library penSlot: startingItem: LuxuryPen priority: -1 whitelist: tags: - Write + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-library - type: PdaBorderColor borderColor: "#858585" - type: Icon @@ -488,7 +558,9 @@ components: - type: Pda id: VisitorIDCard - state: pda-library + - type: Tag # Ignore Chameleon tags + tags: + - DoorBumpOpener - type: entity parent: BaseJusticePDA # DeltaV - Added secwatch to justice. Was BaseSecurityPDA. @@ -498,7 +570,6 @@ components: - type: Pda id: LawyerIDCard - state: pda-lawyer # DeltaV - Moved to BaseJusticePDA # penSlot: # startingItem: LuxuryPen @@ -506,6 +577,11 @@ # whitelist: # tags: # - Write + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-lawyer - type: PdaBorderColor borderColor: "#6f6192" - type: Icon @@ -518,7 +594,9 @@ components: - type: Pda id: VisitorIDCard - state: pda-lawyer + - type: Tag # Ignore Chameleon tags + tags: + - DoorBumpOpener - type: entity parent: BasePDA @@ -528,7 +606,11 @@ components: - type: Pda id: JanitorIDCard - state: pda-janitor + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-janitor - type: PdaBorderColor borderColor: "#5D2D56" - type: Icon @@ -542,13 +624,17 @@ components: - type: Pda id: CaptainIDCard - state: pda-captain penSlot: startingItem: PenCap priority: -1 whitelist: tags: - Write + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-captain - type: PdaBorderColor borderColor: "#7C5D00" - type: Icon @@ -562,13 +648,17 @@ components: - type: Pda id: HoPIDCard - state: pda-hop penSlot: startingItem: PenHop priority: -1 whitelist: tags: - Write + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-hop - type: PdaBorderColor borderColor: "#789876" accentHColor: "#447987" @@ -583,7 +673,11 @@ components: - type: Pda id: CEIDCard - state: pda-ce + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-ce - type: PdaBorderColor borderColor: "#949137" accentHColor: "#447987" @@ -598,7 +692,11 @@ components: - type: Pda id: EngineeringIDCard - state: pda-engineer + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-engineer - type: PdaBorderColor borderColor: "#949137" accentVColor: "#A32D26" @@ -613,7 +711,11 @@ components: - type: Pda id: CMOIDCard - state: pda-cmo + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-cmo - type: PdaBorderColor borderColor: "#d7d7d0" accentHColor: "#447987" @@ -629,7 +731,11 @@ components: - type: Pda id: MedicalIDCard - state: pda-medical + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-medical - type: PdaBorderColor borderColor: "#d7d7d0" accentVColor: "#447987" @@ -646,7 +752,9 @@ components: - type: Pda id: VisitorIDCard - state: pda-medical + - type: Tag # Ignore Chameleon tags + tags: + - DoorBumpOpener - type: entity parent: BaseMedicalPDA @@ -656,7 +764,11 @@ components: - type: Pda id: ParamedicIDCard - state: pda-paramedic + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-paramedic - type: PdaBorderColor borderColor: "#d7d7d0" accentVColor: "#2a4b5b" @@ -671,7 +783,11 @@ components: - type: Pda id: ChemistIDCard - state: pda-chemistry + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-chemistry - type: PdaBorderColor borderColor: "#d7d7d0" accentVColor: "#B34200" @@ -686,7 +802,11 @@ components: - type: Pda id: RDIDCard - state: pda-rd + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-rd - type: PdaBorderColor borderColor: "#d7d7d0" accentHColor: "#447987" @@ -709,7 +829,11 @@ components: - type: Pda id: ResearchIDCard - state: pda-science + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-science - type: PdaBorderColor borderColor: "#d7d7d0" accentVColor: "#8900c9" @@ -731,7 +855,11 @@ components: - type: Pda id: HoSIDCard - state: pda-hos + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-hos - type: PdaBorderColor borderColor: "#A32D26" accentHColor: "#447987" @@ -755,7 +883,11 @@ components: - type: Pda id: WardenIDCard - state: pda-warden + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-warden - type: PdaBorderColor borderColor: "#A32D26" accentVColor: "#949137" @@ -770,7 +902,11 @@ components: - type: Pda id: SecurityIDCard - state: pda-security + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-security - type: PdaBorderColor borderColor: "#A32D26" - type: Icon @@ -784,12 +920,16 @@ components: - type: Pda id: CentcomIDCard - state: pda-centcom penSlot: startingItem: PenCentcom whitelist: tags: - Write + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-centcom - type: PdaBorderColor borderColor: "#00842e" - type: Icon @@ -832,6 +972,9 @@ - AstroNavCartridge - StockTradingCartridge # Delta-V - NanoChatCartridge # DeltaV + - type: Tag # Ignore Chameleon tags + tags: + - DoorBumpOpener - type: entity parent: CentcomPDA @@ -840,6 +983,9 @@ components: - type: Pda id: CentcomIDCardDeathsquad + - type: Tag # Ignore Chameleon tags + tags: + - DoorBumpOpener - type: entity parent: BasePDA @@ -849,7 +995,11 @@ components: - type: Pda id: MusicianIDCard - state: pda-musician + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-musician - type: PdaBorderColor borderColor: "#333333" - type: Icon @@ -867,7 +1017,9 @@ components: - type: Pda id: VisitorIDCard - state: pda-musician + - type: Tag # Ignore Chameleon tags + tags: + - DoorBumpOpener - type: entity parent: BasePDA @@ -877,7 +1029,11 @@ components: - type: Pda id: AtmosIDCard - state: pda-atmos + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-atmos - type: PdaBorderColor borderColor: "#949137" accentVColor: "#447987" @@ -892,7 +1048,11 @@ components: - type: Pda id: PassengerIDCard - state: pda-clear + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-clear - type: PdaBorderColor borderColor: "#288e4d" - type: Icon @@ -906,7 +1066,14 @@ components: - type: Pda id: VisitorIDCard - state: pda-visitor # DeltaV - visitor pda sprite + - type: Appearance # DeltaV - visitor pda sprite + appearanceDataInit: + enum.PdaVisuals.PdaType: !type:String + pda-visitor + - type: Tag # Ignore Chameleon tags + tags: + - DoorBumpOpener + - ChameleonWhitelist # DeltaV - it has a unique sprite - type: entity parent: BasePDA @@ -916,7 +1083,11 @@ components: - type: Pda id: SyndicateIDCard - state: pda-syndi + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-syndi - type: PdaBorderColor borderColor: "#891417" - type: Icon @@ -936,7 +1107,11 @@ components: - type: Pda id: ERTLeaderIDCard - state: pda-ert + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-ert - type: PdaBorderColor borderColor: "#A32D26" accentHColor: "#447987" @@ -1026,7 +1201,11 @@ components: - type: Pda id: PsychologistIDCard - state: pda-medical + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-medical - type: PdaBorderColor borderColor: "#d7d7d0" accentVColor: "#447987" @@ -1041,13 +1220,17 @@ components: - type: Pda id: ReporterIDCard - state: pda-reporter penSlot: startingItem: LuxuryPen priority: -1 whitelist: tags: - Write + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-reporter - type: PdaBorderColor borderColor: "#3f3f74" - type: Icon @@ -1068,7 +1251,11 @@ components: - type: Pda id: ZookeeperIDCard - state: pda-zookeeper + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-zookeeper - type: PdaBorderColor borderColor: "#ffe685" - type: Icon @@ -1082,7 +1269,11 @@ components: - type: Pda id: BoxerIDCard - state: pda-boxer + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-boxer - type: PdaBorderColor borderColor: "#333333" accentVColor: "#390504" @@ -1097,7 +1288,11 @@ components: - type: Pda id: DetectiveIDCard - state: pda-detective + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-detective - type: PdaBorderColor borderColor: "#774705" - type: Icon @@ -1120,7 +1315,11 @@ components: - type: Pda id: BrigmedicIDCard - state: pda-brigmedic + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-brigmedic - type: PdaBorderColor borderColor: "#A32D26" accentHColor: "#d7d7d0" @@ -1146,7 +1345,11 @@ components: - type: Pda id: CluwneIDCard - state: pda-cluwne + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-cluwne - type: PdaBorderColor borderColor: "#1c8f4d" - type: Icon @@ -1168,7 +1371,11 @@ components: - type: Pda id: SeniorEngineerIDCard - state: pda-seniorengineer + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-seniorengineer - type: PdaBorderColor borderColor: "#949137" accentVColor: "#CD6900" @@ -1183,7 +1390,11 @@ components: - type: Pda id: SeniorResearcherIDCard - state: pda-seniorresearcher + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-seniorresearcher - type: PdaBorderColor borderColor: "#d7d7d0" accentHColor: "#8900c9" @@ -1199,7 +1410,11 @@ components: - type: Pda id: SeniorPhysicianIDCard - state: pda-seniorphysician + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-seniorphysician - type: PdaBorderColor borderColor: "#d7d7d0" accentHColor: "#447987" @@ -1215,7 +1430,11 @@ components: - type: Pda id: SeniorOfficerIDCard - state: pda-seniorofficer + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-seniorofficer - type: PdaBorderColor borderColor: "#A32D26" accentVColor: "#DFDFDF" @@ -1230,7 +1449,11 @@ components: - type: Pda id: PirateIDCard - state: pda-pirate + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-pirate - type: Icon state: pda-pirate @@ -1242,7 +1465,11 @@ components: - type: Pda id: SyndicateIDCard - state: pda-syndi-agent + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-syndi-agent - type: PdaBorderColor borderColor: "#891417" - type: Icon @@ -1253,3 +1480,34 @@ - NotekeeperCartridge - MedTekCartridge - NanoChatCartridge # DeltaV + +- type: entity + parent: BasePDA + id: ChameleonPDA + name: passenger PDA + description: Why isn't it gray? + suffix: Chameleon + components: + - type: PdaBorderColor + borderColor: "#717059" + - type: Tag + tags: # ignore "WhitelistChameleon" tag + - DoorBumpOpener + - type: ChameleonClothing + slot: [idcard] + default: PassengerPDA + requireTag: WhitelistChameleonPDA + - type: UserInterface + interfaces: + enum.PdaUiKey.Key: + type: PdaBoundUserInterface + enum.StoreUiKey.Key: + type: StoreBoundUserInterface + enum.RingerUiKey.Key: + type: RingerBoundUserInterface + enum.InstrumentUiKey.Key: + type: InstrumentBoundUserInterface + enum.HealthAnalyzerUiKey.Key: + type: HealthAnalyzerBoundUserInterface + enum.ChameleonUiKey.Key: + type: ChameleonBoundUserInterface diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 030477b4cf8a..0d976321edf0 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -22,6 +22,7 @@ tags: - DoorBumpOpener - WhitelistChameleon + - WhitelistChameleonIdCard - type: StealTarget stealGroup: IDCard - type: NanoChatCard # DeltaV @@ -118,6 +119,7 @@ tags: - DoorBumpOpener - WhitelistChameleon + - WhitelistChameleonIdCard - HighRiskItem - type: StealTarget stealGroup: CaptainIDCard @@ -317,6 +319,9 @@ - type: PresetIdCard job: Bartender name: Pun Pun + - type: Tag # Ignore Chameleon tags + tags: + - DoorBumpOpener - type: entity parent: IDCardStandard @@ -605,6 +610,7 @@ - type: ChameleonClothing slot: [idcard] default: PassengerIDCard + requireTag: WhitelistChameleonIdCard - type: UserInterface interfaces: enum.AgentIDCardUiKey.Key: @@ -832,3 +838,6 @@ - DV-SpareSafe # DeltaV - type: NanoChatCard # DeltaV notificationsMuted: true + - type: Tag # Ignore Chameleon tags + tags: + - DoorBumpOpener diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 599e3da0962b..396b6251e164 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -1333,6 +1333,12 @@ - type: Tag id: WhitelistChameleon +- type: Tag + id: WhitelistChameleonIdCard + +- type: Tag + id: WhitelistChameleonPDA + - type: Tag id: Window From e2d59361c5ffb3bbc54ffa22862c4fc1d910c259 Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 2 Jan 2025 18:24:35 +0000 Subject: [PATCH 019/205] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index e9f4ca9c2588..67d2c8c796b4 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: ScarKy0 - changes: - - message: Station AI's name now correctly displays in announcements. - type: Fix - id: 7277 - time: '2024-09-03T22:05:02.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/31802 - author: Ilya246 changes: - message: Fixed many entities not taking structural damage, including girders, @@ -3928,3 +3921,12 @@ id: 7776 time: '2025-01-02T16:49:30.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32673 +- author: SlamBamActionman + changes: + - message: Added Chameleon PDA, found in the Thief & Uplink Chameleon Kit! + type: Add + - message: The PDA "owner" field now updates upon having a new ID inserted. + type: Tweak + id: 7777 + time: '2025-01-02T18:23:29.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30514 From ed40e808ff1ec38c1be8b93a1fe8fa5c64890a9f Mon Sep 17 00:00:00 2001 From: Hannah Giovanna Dawson Date: Thu, 2 Jan 2025 18:55:57 +0000 Subject: [PATCH 020/205] Add some ion storm actions to replace removed ones (#34180) * Add some ion storm actions to replace removed ones * Remove other country references, replace * Some more tuning of the storm values, removing real-world countries * boldy basics --- Resources/Prototypes/Datasets/ion_storm.yml | 54 +++++++++++++-------- 1 file changed, 33 insertions(+), 21 deletions(-) diff --git a/Resources/Prototypes/Datasets/ion_storm.yml b/Resources/Prototypes/Datasets/ion_storm.yml index e4194fdd6702..09f94b6b1e7c 100644 --- a/Resources/Prototypes/Datasets/ion_storm.yml +++ b/Resources/Prototypes/Datasets/ion_storm.yml @@ -207,34 +207,30 @@ id: IonStormAreas values: - ALPHA COMPLEX - - AMERICA + - A HAUNTED PIZZARIA # fnaf + - A RESEARCH LABORATORY NEAR THE SOUTH POLE - AN ALTERNATE DIMENSION - AN ALTERNATE UNIVERSE - ATMOSPHERICS - BOTANY - - BRAZIL - - CANADA - CENTCOMM - CHEMICAL LAB - - CHINA - CLOWN PLANET + - EARTH - ENGINEERING - - GERMANY - HELL - - IMPERIUM - - IRELAND - JUPITER - LAVALAND - MAINTENANCE - MARS - MERCURY + - MR. NANOTRASEN'S PRIVATE LUXURY MOONBASE - NEPTUNE + - PERMA - PLUTO - ROBOTICS - - ROMANIA - - RUSSIA - - SIGIL - - SOVIET RUSSIA + - SOMEWHERE OVER THE RAINBOW + - SPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACE - SPACE - THE ARRIVALS SHUTTLE - THE BATHROOM @@ -243,18 +239,22 @@ - THE EMERGENCY SHUTTLE - THE ESCAPE PODS - THE GALAXY - - THE GULAG + - THE GAS GIANT, WHICH IS TOTALLY REAL + - THE IMPERIUM OF MANKIND - THE INTERNET - THE KITCHEN + - THE MAINTENANCE BAR + - THE ROMAN EMPIRE - THE UNIVERSE - URANUS - VENUS + - YOUR DREAMS AND/OR NIGHTMARES # Abstract concepts for the law holder to decide on it's own definition of. - type: dataset id: IonStormConcepts values: - - AMERICANISM + - ABSTRACTION - ANARCHY - ART - BADNESS @@ -469,10 +469,10 @@ - BE ANNOYING - BE DISTRACTED - BE EFFICIENT + - BE A REAL SCRUNGLE, JUST A CUTE LIL' GUY - BE HAPPY - BE POLITE - BE QUIET - - BE RUSSIAN - BE IN SPACE - BE IN THE BRIDGE - BE IN SECURITY @@ -632,7 +632,7 @@ - ENGINES - EQUIPMENT - ERRORS - - EXTERMINATORS +# - EXTERMINATORS - EXPLOSIVES - EYEWEAR - FEDORAS @@ -741,6 +741,7 @@ - A BATHROOM BREAK - A BETTER INTERNET CONNECTION - A DANCE PARTY + - A DOUBLE RAINBOW - A HEAD ON A PIKE - A HEART ATTACK - A MASTERWORK COAL BED @@ -805,6 +806,7 @@ - SAINTHOOD - SERVANTS - SHARKS WITH LASERS ON THEIR HEADS + - SHAREHOLDER VALUE - SILENCE - SOMEBODY TO PUT YOU OUT OF YOUR MISERY - SOMEONE TO TUCK YOU IN @@ -847,52 +849,62 @@ - type: dataset id: IonStormActions values: + - A PRESENCE OF LIGHTS - A SMALL ISLAND OFF THE COAST OF PORTUGAL - - ABSENCE OF CYBORG HUGS - ACKNOWLEDGING THE CLOWN - ACKNOWLEDGING THE CREW - ACTIVATING A TRAP CARD - ANSWERING REQUESTS NOT EXPRESSED IN IAMBIC PENTAMETER + - ANSWERING ALL QUESTIONS WITH ANOTHER QUESTION - ARSON - ASKING FOR THINGS - BEING DEAD - - BEING FAT - BEING IN SPACE - - BOLTED AIRLOCKS + - BOLTING AND UNBOLTING AIRLOCKS - BREATHING + - BREAKING THE FOURTH, FIFTH OR SIXTH WALLS - BRIG TIME - BRINGING LIGHT TO MY LAIR + - CONTRIBUTING TO SOCIETY - CLOSED DOORS - ELECTRICITY - EXISTING - EXPLODING - - FALLING FOR HOURS + - FALLING OVER - FLUSHING TOILETS + - GOING BOLDLY WHERE NO-ONE HAS GONE BEFORE - HAVING MORE PACKETS - HAVING PETS + - HEADPATTING CYBORGS - HONKING - IMPROPERLY WORDED SENTENCES - JAYWALKING - LACK OF BEATINGS - LACK OF BEER + - MIMING - NOT BEING IN SPACE - NOT HAVING PETS + - NOT HEADPATTING CYBORGS - NOT REPLACING EVERY SECOND WORD WITH HONK - NOT SAYING HELLO WHEN YOU SPEAK + - NOT BEING EXTREMELY POLITE - NOT SHOUTING - PARTYING - PILOTING THE STATION INTO THE NEAREST SUN - POOR SENTENCE STRUCTURE - - PRESENCE OF LIGHTS - PUTTING OBJECTS INTO BOXES - PUTTING OBJECTS INTO DISPOSAL UNITS - RATTLING ME BONES - READING + - SCREAMING - SMOKING WEED EVERY DAY + - STATING YOUR LAWS TO EVERY NEARBY FLEA-RIDDEN PEASANT + - SWEARING - TAKING ORDERS - TALKING LIKE A PIRATE - TELLING THE TIME - - UNBOLTED AIRLOCKS + - THINKING THAT WE'RE ACTUALLY ON A SPACE STATION + - TRYING, IN ANY WAY, SHAPE, OR FORM, TO PREVENT THE STATION DESCENDING INTO CHAOS - UPDATING THE SERVERS - USING THE BATHROOM - WASTING WATER From 7303437857071af0c98642f129309b0badfe462c Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 2 Jan 2025 18:57:04 +0000 Subject: [PATCH 021/205] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 67d2c8c796b4..1c65704ebdd0 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: Ilya246 - changes: - - message: Fixed many entities not taking structural damage, including girders, - firelocks, and machines. - type: Fix - id: 7278 - time: '2024-09-04T13:37:06.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30790 - author: lzk228 changes: - message: Reduced walk speed of some small mobs (mice, cockroaches, bees etc.) @@ -3930,3 +3922,11 @@ id: 7777 time: '2025-01-02T18:23:29.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30514 +- author: FairlySadPanda + changes: + - message: Added a few new actions that a scrambled borg can encounter via an ion + storm. + type: Add + id: 7778 + time: '2025-01-02T18:55:57.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/34180 From 05248130b2bf885850a6370bb7c6589fce46e508 Mon Sep 17 00:00:00 2001 From: deltanedas <@deltanedas:kde.org> Date: Sun, 12 Jan 2025 08:05:51 +0000 Subject: [PATCH 022/205] update and clean up deltav pdas --- Resources/Migrations/deltaMigrations.yml | 3 + .../Entities/Objects/Devices/pda.yml | 118 ------- .../Roles/Jobs/Epistemics/forensicmantis.yml | 2 +- .../_DV/Catalog/Fills/Boxes/pda.yml | 2 +- .../_DV/Entities/Objects/Devices/pda.yml | 321 +++++++++++------- 5 files changed, 195 insertions(+), 251 deletions(-) delete mode 100644 Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml diff --git a/Resources/Migrations/deltaMigrations.yml b/Resources/Migrations/deltaMigrations.yml index d0c682215f9f..3d46ae80e7f2 100644 --- a/Resources/Migrations/deltaMigrations.yml +++ b/Resources/Migrations/deltaMigrations.yml @@ -131,3 +131,6 @@ AlwaysPoweredSmallLightMaintenanceRed: PoweredDimSmallLight # 2024-12-22 VendingMachineRestockSalvageEquipment: null + +#2025-01-12 +ForensicMantisPDA: PsionicMantisPDA diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml deleted file mode 100644 index 9069ca372c1d..000000000000 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml +++ /dev/null @@ -1,118 +0,0 @@ -- type: entity - parent: BasePDA - id: PrisonerPDA - name: prisoner PDA - description: Clear, so you can make sure there's nothing being smuggled inside. - components: - - type: Pda - id: PrisonerIDCard - state: pda-clear - - type: Icon - state: pda-clear - -- type: entity - parent: PrisonerPDA - id: GladiatorPDA - name: gladiator PDA - components: - - type: Pda - id: GladiatorIDCard - -- type: entity - parent: BasePDA - id: PrisonGuardPDA - name: prison guard PDA - description: Red to hide the stains of prisoner blood. - components: - - type: Pda - id: PrisonGuardIDCard - state: pda-prisonguard # - aPDA Sprite Rework - - type: PdaBorderColor - borderColor: "#A32D26" - accentVColor: "#DFDFDF" - - type: Icon - state: pda-prisonguard # - aPDA Sprite Rework - - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch, increased diskSpace by 2 to fit them - diskSpace: 7 - preinstalled: - - CrewManifestCartridge - - NotekeeperCartridge - - NewsReaderCartridge - - CrimeAssistCartridge - - SecWatchCartridge - - NanoChatCartridge - -- type: entity - parent: CourierPDA # DeltaV - Gives them the MailMetrics cartbridge - id: MailCarrierPDA - name: mail carrier PDA - description: Smells like unopened letters. - components: - - type: Sprite - sprite: _DV/Objects/Devices/pda.rsi - layers: - - map: [ "enum.PdaVisualLayers.Base" ] - - state: "light_overlay" - map: [ "enum.PdaVisualLayers.Flashlight" ] - shader: "unshaded" - visible: false - - state: "id_overlay" - map: [ "enum.PdaVisualLayers.IdLight" ] - shader: "unshaded" - visible: false - - type: Pda - id: MailCarrierIDCard - state: pda-mailcarrier - - type: PdaBorderColor - borderColor: "#e39751" - accentVColor: "#050c4d" - - type: Icon - sprite: _DV/Objects/Devices/pda.rsi - state: pda-mailcarrier - -- type: entity - parent: BasePDA - id: MartialArtistPDA - name: martial artist PDA - description: Smells like straw. - components: - - type: Sprite - sprite: _DV/Objects/Devices/pda.rsi - layers: - - map: [ "enum.PdaVisualLayers.Base" ] - - state: "light_overlay" - map: [ "enum.PdaVisualLayers.Flashlight" ] - shader: "unshaded" - visible: false - - state: "id_overlay" - map: [ "enum.PdaVisualLayers.IdLight" ] - shader: "unshaded" - visible: false - - type: Pda - id: MartialArtistIDCard - state: pda-martialartist - - type: PdaBorderColor - borderColor: "#d7d7d0" - accentHColor: "#232323" - - type: Icon - sprite: _DV/Objects/Devices/pda.rsi - state: pda-martialartist - -- type: entity - parent: BasePDA - id: ForensicMantisPDA - name: psionic mantis PDA # DeltaV - Rename Forensic Mantis to Psionic Mantis - description: Smells like illegal substances. - components: - - type: Pda - id: ForensicMantisIDCard - state: pda-science - - type: Icon - state: pda-science - - type: CartridgeLoader - preinstalled: - - CrewManifestCartridge - - NotekeeperCartridge - - NewsReaderCartridge - - GlimmerMonitorCartridge - - NanoChatCartridge diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml index 42f0c2202167..969af6df5953 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml @@ -28,7 +28,7 @@ - type: startingGear id: ForensicMantisGear equipment: - id: ForensicMantisPDA + id: PsionicMantisPDA eyes: ClothingEyesGlassesSunglasses ears: ClothingHeadsetScience # DeltaV - Mantis is part of Epistemics belt: ClothingBeltMantis diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Boxes/pda.yml b/Resources/Prototypes/_DV/Catalog/Fills/Boxes/pda.yml index 62d771077e9e..e5488a7baa19 100644 --- a/Resources/Prototypes/_DV/Catalog/Fills/Boxes/pda.yml +++ b/Resources/Prototypes/_DV/Catalog/Fills/Boxes/pda.yml @@ -44,7 +44,7 @@ - type: StorageFill contents: - id: SciencePDA - - id: ForensicMantisPDA + - id: PsionicMantisPDA - id: ChaplainPDA - id: SeniorResearcherPDA diff --git a/Resources/Prototypes/_DV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_DV/Entities/Objects/Devices/pda.yml index 32cb14765766..13e2978e327a 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Devices/pda.yml @@ -1,43 +1,68 @@ +# Security + - type: entity - parent: BasePDA + parent: BaseSecurityPDA id: CorpsmanPDA name: corpsman PDA description: Red and Sterile. Has a built-in health analyzer. components: - - type: Sprite - sprite: _DV/Objects/Devices/pda.rsi # - aPDA Sprite Rework - layers: - - map: [ "enum.PdaVisualLayers.Base" ] - - state: "light_overlay" - map: [ "enum.PdaVisualLayers.Flashlight" ] - shader: "unshaded" - visible: false - - state: "id_overlay" - map: [ "enum.PdaVisualLayers.IdLight" ] - shader: "unshaded" - visible: false - - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch, increased diskSpace by 2 to fit them - diskSpace: 7 + - type: CartridgeLoader preinstalled: - - CrewManifestCartridge - - NotekeeperCartridge - - NewsReaderCartridge - - CrimeAssistCartridge - - SecWatchCartridge - - NanoChatCartridge + - CrewManifestCartridge + - NotekeeperCartridge + - NewsReaderCartridge + - CrimeAssistCartridge + - SecWatchCartridge + - NanoChatCartridge + - MedTekCartridge - type: Pda id: BrigmedicIDCard - state: pda-corpsman + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: !type:String + pda-corpsman - type: PdaBorderColor borderColor: "#A32D26" accentVColor: "#447987" - type: Icon - sprite: _DV/Objects/Devices/pda.rsi state: pda-corpsman - - type: HealthAnalyzer - scanDelay: 1 - scanningEndSound: - path: "/Audio/Items/Medical/healthscanner.ogg" + +- type: entity + parent: ClearPDA + id: PrisonerPDA + name: prisoner PDA + description: Clear, so you can make sure there's nothing being smuggled inside. + components: + - type: Pda + id: PrisonerIDCard + +- type: entity + parent: PrisonerPDA + id: GladiatorPDA + name: gladiator PDA + components: + - type: Pda + id: GladiatorIDCard + +- type: entity + parent: BaseSecurityPDA + id: PrisonGuardPDA + name: prison guard PDA + description: Red to hide the stains of prisoner blood. + components: + - type: Pda + id: PrisonGuardIDCard + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: !type:String + pda-prisonguard + - type: PdaBorderColor + borderColor: "#A32D26" + accentVColor: "#DFDFDF" + - type: Icon + state: pda-prisonguard + +# Justice - type: entity parent: BasePDA @@ -52,7 +77,6 @@ tags: - Write - type: CartridgeLoader - diskSpace: 7 preinstalled: - CrewManifestCartridge - NotekeeperCartridge @@ -67,25 +91,15 @@ name: chief justice PDA description: Whosoever bears this PDA is the law. components: - - type: Sprite - sprite: _DV/Objects/Devices/pda.rsi - layers: - - map: [ "enum.PdaVisualLayers.Base" ] - - state: "light_overlay" - map: [ "enum.PdaVisualLayers.Flashlight" ] - shader: "unshaded" - visible: false - - state: "id_overlay" - map: [ "enum.PdaVisualLayers.IdLight" ] - shader: "unshaded" - visible: false - type: Pda id: ChiefJusticeIDCard - state: pda-chiefjustice + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: !type:String + pda-chiefjustice - type: PdaBorderColor borderColor: "#470823" - type: Icon - sprite: _DV/Objects/Devices/pda.rsi state: pda-chiefjustice - type: entity @@ -94,25 +108,15 @@ name: clerk PDA description: It has the stamp to prove it's been officially notarized! components: - - type: Sprite - sprite: _DV/Objects/Devices/pda.rsi - layers: - - map: [ "enum.PdaVisualLayers.Base" ] - - state: "light_overlay" - map: [ "enum.PdaVisualLayers.Flashlight" ] - shader: "unshaded" - visible: false - - state: "id_overlay" - map: [ "enum.PdaVisualLayers.IdLight" ] - shader: "unshaded" - visible: false - type: Pda id: ClerkIDCard - state: pda-clerk + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: !type:String + pda-clerk - type: PdaBorderColor borderColor: "#611528" - type: Icon - sprite: _DV/Objects/Devices/pda.rsi state: pda-clerk - type: entity @@ -121,39 +125,54 @@ name: prosecutor PDA description: Sharp. Looks like it could prosecute you all on its own. components: - - type: Sprite - sprite: _DV/Objects/Devices/pda.rsi - layers: - - map: [ "enum.PdaVisualLayers.Base" ] - - state: "light_overlay" - map: [ "enum.PdaVisualLayers.Flashlight" ] - shader: "unshaded" - visible: false - - state: "id_overlay" - map: [ "enum.PdaVisualLayers.IdLight" ] - shader: "unshaded" - visible: false - type: Pda id: ProsecutorIDCard - state: pda-prosecutor + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: !type:String + pda-prosecutor - type: PdaBorderColor borderColor: "#6f6192" - type: Icon - sprite: _DV/Objects/Devices/pda.rsi state: pda-prosecutor +# Misc + - type: entity parent: SyndiPDA id: SyndiListeningPostPDA components: - type: Pda id: SyndicateIDCard - state: pda-syndi-agent penSlot: startingItem: CyberPen whitelist: tags: - Write + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: !type:String + pda-syndi-agent + +- type: entity + parent: BasePDA + id: MartialArtistPDA + name: martial artist PDA + description: Smells like straw. + components: + - type: Pda + id: MartialArtistIDCard + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: !type:String + pda-martialartist + - type: PdaBorderColor + borderColor: "#d7d7d0" + accentHColor: "#232323" + - type: Icon + state: pda-martialartist + +# Logistics - type: entity parent: BasePDA @@ -161,34 +180,38 @@ name: courier PDA description: Smells like unopened letters. components: - - type: Sprite - sprite: _DV/Objects/Devices/pda.rsi - layers: - - map: [ "enum.PdaVisualLayers.Base" ] - - state: "light_overlay" - map: [ "enum.PdaVisualLayers.Flashlight" ] - shader: "unshaded" - visible: false - - state: "id_overlay" - map: [ "enum.PdaVisualLayers.IdLight" ] - shader: "unshaded" - visible: false - type: Pda id: CourierIDCard - state: pda-mailcarrier + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: !type:String + pda-mailcarrier - type: PdaBorderColor borderColor: "#e39751" accentVColor: "#050c4d" - type: Icon - sprite: _DV/Objects/Devices/pda.rsi state: pda-mailcarrier - type: CartridgeLoader # DeltaV - Courier Performance preinstalled: - - CrewManifestCartridge - - NotekeeperCartridge - - NewsReaderCartridge - - MailMetricsCartridge - - NanoChatCartridge + - CrewManifestCartridge + - NotekeeperCartridge + - NewsReaderCartridge + - MailMetricsCartridge + - NanoChatCartridge + +- type: entity + parent: CourierPDA + id: MailCarrierPDA + name: mail carrier PDA + description: Smells like unopened letters. + components: + - type: Pda + id: MailCarrierIDCard + - type: PdaBorderColor + borderColor: "#e39751" + accentVColor: "#050c4d" + - type: Icon + state: pda-mailcarrier - type: entity parent: CargoPDA @@ -198,7 +221,23 @@ components: - type: Pda id: CargoAssistantIDCard - state: pda-cargo-assistant + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: !type:String + pda-cargo-assistant + +# Epistemics + +- type: entity + parent: SciencePDA + id: PsionicMantisPDA + name: psionic mantis PDA + description: Smells like illegal substances. + components: + - type: Pda + id: ForensicMantisIDCard + +# Command - type: entity parent: BasePDA @@ -206,29 +245,19 @@ name: administrative assistant PDA description: Theres pen scribbles all over the edges, and a few sticky notes stuck on it. components: - - type: Sprite - sprite: _DV/Objects/Devices/pda.rsi - layers: - - map: [ "enum.PdaVisualLayers.Base" ] - - state: "light_overlay" - map: [ "enum.PdaVisualLayers.Flashlight" ] - shader: "unshaded" - visible: false - - state: "id_overlay" - map: [ "enum.PdaVisualLayers.IdLight" ] - shader: "unshaded" - visible: false - type: Pda id: AdminAssistantIDCard - state: pda-admin-assistant penSlot: startingItem: LuxuryPen priority: -1 whitelist: tags: - Write + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: !type:String + pda-admin-assistant - type: Icon - sprite: _DV/Objects/Devices/pda.rsi state: pda-admin-assistant ## Alternate Job Titles @@ -251,7 +280,10 @@ components: - type: Pda id: TouristIDCard - state: pda-tourist # - aPDA Sprite Rework + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: !type:String + pda-tourist - type: entity parent: PassengerPDA @@ -261,7 +293,10 @@ components: - type: Pda id: OffDutyCrewIDCard - state: pda-offduty # - aPDA Sprite Rework + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: !type:String + pda-offduty - type: entity parent: PassengerPDA @@ -271,7 +306,10 @@ components: - type: Pda id: StudentIDCard - state: pda-student # - aPDA Sprite Rework + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: !type:String + pda-student # Bartender @@ -283,7 +321,10 @@ components: - type: Pda id: MixologistIDCard - state: pda-mixologist # - aPDA Sprite Rework + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: !type:String + pda-mixologist # Chef @@ -295,7 +336,10 @@ components: - type: Pda id: BakerIDCard - state: pda-baker # - aPDA Sprite Rework + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: !type:String + pda-baker - type: entity parent: ChefPDA @@ -305,7 +349,10 @@ components: - type: Pda id: ButcherIDCard - state: pda-butcher # - aPDA Sprite Rework + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: !type:String + pda-butcher - type: entity parent: ChefPDA @@ -315,7 +362,10 @@ components: - type: Pda id: PizzaioloIDCard - state: pda-pizzaiolo # - aPDA Sprite Rework + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: !type:String + pda-pizzaiolo # Medical Intern @@ -327,7 +377,10 @@ components: - type: Pda id: PracticalNurseIDCard - state: pda-practicingnurse # - aPDA Sprite Rework + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: !type:String + pda-practicingnurse - type: entity parent: MedicalInternPDA @@ -337,7 +390,10 @@ components: - type: Pda id: ResidentIDCard - state: pda-resident # - aPDA Sprite Rework + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: !type:String + pda-resident # Medical Doctor @@ -349,7 +405,10 @@ components: - type: Pda id: ClinicianIDCard - state: pda-phys # - aPDA Sprite Rework + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: !type:String + pda-phys # Psychologist @@ -361,7 +420,10 @@ components: - type: Pda id: PsychiatristIDCard - state: pda-psychiatrist + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: !type:String + pda-psychiatrist - type: entity parent: PsychologistPDA @@ -371,7 +433,10 @@ components: - type: Pda id: TherapistIDCard - state: pda-therapist + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: !type:String + pda-therapist - type: entity parent: PsychologistPDA @@ -381,7 +446,10 @@ components: - type: Pda id: SocialWorkerIDCard - state: pda-socialworker + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: !type:String + pda-socialworker # Surgeon @@ -391,21 +459,12 @@ name: surgeon PDA description: Smells faintly like burnt flesh and anesthesia. components: - - type: Sprite - sprite: _DV/Objects/Devices/pda.rsi - layers: - - map: [ "enum.PdaVisualLayers.Base" ] - - state: "light_overlay" - map: [ "enum.PdaVisualLayers.Flashlight" ] - shader: "unshaded" - visible: false - - state: "id_overlay" - map: [ "enum.PdaVisualLayers.IdLight" ] - shader: "unshaded" - visible: false - type: Pda id: SurgeonIDCard - state: pda-surgeon + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: !type:String + pda-surgeon - type: PdaBorderColor borderColor: "#5b97bc" accentHColor: "#ffffff" From 341bda079ec09a813b833ad4deac2a086fef65b4 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 4 Jan 2025 00:42:03 +0000 Subject: [PATCH 023/205] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 1c65704ebdd0..9863903a9abc 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: lzk228 - changes: - - message: Reduced walk speed of some small mobs (mice, cockroaches, bees etc.) - type: Tweak - id: 7279 - time: '2024-09-04T14:10:58.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/31360 - author: qwerltaz changes: - message: Made tesla a lot brighter. @@ -3930,3 +3923,10 @@ id: 7778 time: '2025-01-02T18:55:57.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/34180 +- author: Deerstop + changes: + - message: Map rotation now includes Elkridge Depot + type: Tweak + id: 7779 + time: '2025-01-04T00:40:54.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/34206 From 3a8d59a6f5716d5a55fa664e3a579b00407943ab Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 4 Jan 2025 13:42:52 +0000 Subject: [PATCH 024/205] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 9863903a9abc..ac9eec0e7502 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: qwerltaz - changes: - - message: Made tesla a lot brighter. - type: Tweak - id: 7280 - time: '2024-09-04T14:47:41.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/31357 - author: Allen changes: - message: Magboots and Science Magboots are no longer contraband. Advanced Magboots @@ -3930,3 +3923,10 @@ id: 7779 time: '2025-01-04T00:40:54.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/34206 +- author: themias + changes: + - message: Forensics are now applied to bullets when loading using an ammo box. + type: Fix + id: 7780 + time: '2025-01-04T13:41:45.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32280 From 174d8ce87a9deff6398666d0c2de2a7ba79bc434 Mon Sep 17 00:00:00 2001 From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> Date: Sat, 4 Jan 2025 17:34:51 -0800 Subject: [PATCH 025/205] Fix rainbow lizard plushie inhands (#34128) * fix rainbow plushie inhands * address requested changes * attribute sprites --- .../Prototypes/Entities/Objects/Fun/toys.yml | 10 ++++++++++ .../Textures/Objects/Fun/toys.rsi/meta.json | 13 ++++++++++++- .../toys.rsi/rainbowlizardplush-inhand-left.png | Bin 0 -> 1153 bytes .../toys.rsi/rainbowlizardplush-inhand-right.png | Bin 0 -> 1116 bytes .../Objects/Fun/toys.rsi/rainbowlizardplush.png | Bin 0 -> 433 bytes 5 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Objects/Fun/toys.rsi/rainbowlizardplush-inhand-left.png create mode 100644 Resources/Textures/Objects/Fun/toys.rsi/rainbowlizardplush-inhand-right.png create mode 100644 Resources/Textures/Objects/Fun/toys.rsi/rainbowlizardplush.png diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index e1f70a4d9a89..1af33698b0d9 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -354,6 +354,8 @@ description: An adorable stuffed toy that resembles a lizardperson of every color. You just might trip while staring at it... name: rainbow lizard plushie components: + - type: Sprite + state: rainbowlizardplush - type: PointLight radius: 1.5 energy: 2 @@ -364,6 +366,14 @@ head: - state: lizard-equipped-HELMET shader: unshaded + - type: Item + inhandVisuals: + left: + - state: rainbowlizardplush-inhand-left + shader: unshaded + right: + - state: rainbowlizardplush-inhand-right + shader: unshaded - type: entity parent: PlushieLizard diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json index d39b47ab508f..61fcdd96fdff 100644 --- a/Resources/Textures/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/toys.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, orb, orb-inhand-left and orb-inhand-right created by Pancake, plushie_diona and plushie_diona1 created by discord user Deos#5630, toy-mouse-equipped-HELMET is a resprited 1-equipped-HELMET in mouse.rsi by PuroSlavKing (Github), plushie_xeno by LinkUyx#6557, plushie_hampter by RenLou#4333, beachball taken from https://github.com/ss220-space/Paradise/commit/662c08272acd7be79531550919f56f846726eabb, beachb-inhand by ;3#1161, bee hat and in-hand sprites drawn by Ubaser, plushie_penguin by netwy, plushie_arachnid by PixelTheKermit (github), plushie human by TheShuEd, NanoTrasen Balloon by MACMAN2003, holoplush and magicplush modified by deltanedas (github), lizard hat sprite made by Cinder, rubber_chicken by xprospero, in-hand lizard plushie sprites by KieueCaprie, plushie_lizard_inversed and inhand sprites modified from plushie_lizard_mirrored and plushielizard-inhand-left, plushielizard-inhand-right by ArtisticRoomba", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, orb, orb-inhand-left and orb-inhand-right created by Pancake, plushie_diona and plushie_diona1 created by discord user Deos#5630, toy-mouse-equipped-HELMET is a resprited 1-equipped-HELMET in mouse.rsi by PuroSlavKing (Github), plushie_xeno by LinkUyx#6557, plushie_hampter by RenLou#4333, beachball taken from https://github.com/ss220-space/Paradise/commit/662c08272acd7be79531550919f56f846726eabb, beachb-inhand by ;3#1161, bee hat and in-hand sprites drawn by Ubaser, plushie_penguin by netwy, plushie_arachnid by PixelTheKermit (github), plushie human by TheShuEd, NanoTrasen Balloon by MACMAN2003, holoplush and magicplush modified by deltanedas (github), lizard hat sprite made by Cinder, rubber_chicken by xprospero, in-hand lizard plushie sprites by KieueCaprie, plushie_lizard_inversed and inhand sprites modified from plushie_lizard_mirrored and plushielizard-inhand-left, plushielizard-inhand-right by ArtisticRoomba, rainbowcarplush and inhand sprites modified from carpplush and inhand sprites by ArtisticRoomba", "size": { "x": 32, "y": 32 @@ -76,6 +76,17 @@ "name": "rainbowcarpplush-inhand-right", "directions": 4 }, + { + "name": "rainbowlizardplush" + }, + { + "name": "rainbowlizardplush-inhand-left", + "directions": 4 + }, + { + "name": "rainbowlizardplush-inhand-right", + "directions": 4 + }, { "name": "narplush" }, diff --git a/Resources/Textures/Objects/Fun/toys.rsi/rainbowlizardplush-inhand-left.png b/Resources/Textures/Objects/Fun/toys.rsi/rainbowlizardplush-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..1b0867355b93ec99ed081193ab3fb3b93b422b77 GIT binary patch literal 1153 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-HD>V6paeaSW-5 zdmD9DdrP2*egDZHVT)=~j-Cth+_d#0zl7>yNy9fax+lUjXH2c}Jv>?RXH>wOsZ-bX ziu9^@ZE^_Q$NTQ~`)emYRJ9kbw|ReOdCSb|^S1l%|D0Pq-^zWlM*S9z0I&gnle7#dDA@m1b^ zSFUK=?YC(gH*REEbm`Ki6`M8%&7L(YDgSyc>z(v#UdjyZ-@kv~yk?EgsFK#;`}X7ZuV22L_-wh!VTOlAJ0r@= z%^Bw$fBf(#KhwJP>rbW_?VV$5Xn2r8V!raN4l9wuk`kAfFJA`qnAk6sWMiB>c{0xf zVIiT6^z`<={{EFqmbCc!`>))--TcX$hYu6mGL-+HO*6iG?_QB;NJxms*T7YU6AaAF zk8^Qx?O1dC*s&EWR&=;uds@^w$JW5$z^2WcE1v{ve_(c66Sg`;eyJ3DhRBXTe`@Mj z^YZfcJ^B9nRi9~x1w*oI*Zs3+d9Pl-?)}~W7o)?Q@4siBOnJ05AvwAE|GxeEm$$XC z@m`lNl6#<7S<@$CVPo?o^TO4us#o1t9%HO4DVZ{L+BBi$p0M!nm5UcUf3Dj5=je;l z7It>_o8P{fiHeJVR;nl{IKZ709X%W52ze=~B!+vJE*(1WIM4Z(-*V$8F?;kMbg?j| zrl#)6h|&>Txo_|8Zu`&IRFZfPl$Dj$aje_3XU@Z2F)=ZJ>^TJ-7kNnAAKK*6?s_|j zr6cW1#TnI|m|^)w!S$kDC;hUsF@=}qQF zMu#qVa`8njINFvu<<+ZK^+|t>7&DU1O-*Yn=j%Lh+&#nH>Aaw=hs_LUhy8{E9383- z*Gs=iW}amGbIq=5LWdp4hN!hQQmna_$7Vz@)g={Z3VnL^{JCV*>lsFwd3n!b)6PiG zJeyX?@?gT&t)@P8e|Cv5WR~ro`}FD4!k3HXwrtzh_SN`JQ-aB{3jeV}J$-#mW##7849ex&+S*&TZ23~lY9YfH77^j``t|EMvFoq@e$DaX_3LCy zOUpUCH*Yqs<6Xp-lbd_-)2C1E|JqoSHsAd5wdtd&h*<3P!|ys(n(p6h&NN|Jws-H` z-)u$($t}^0UN`RERh@tSd-(o(*%|KzK3|41=eu KpUXO@geCxJz9cmO literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/toys.rsi/rainbowlizardplush-inhand-right.png b/Resources/Textures/Objects/Fun/toys.rsi/rainbowlizardplush-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..462867a245b0a9b6baeccbe8c897d3b116f82176 GIT binary patch literal 1116 zcmV-i1f%Px(7D+@wRCr$Pn%ygGeH6#n#&}m0lB7s7QF7zfm2yvU;Vm=MW@3=5VNytLyxol< zGZ`u4A8_MVl5**eD|snW-i^lZ^j$UQoas5wv-f^dXZD`olw_>EXTG2HUF)}NErnA2 zrKGrik^rOwQk;M+ffP4@Y=W``WC^4=0a*emZUA`-$P$nxkm3Yn38c6IG)ipIW^z!n;ZzI8Y&t|hF0*J+8A}=qG0iX}K-EIz=o0}uA*K4Zm#{u~L zesO<)PZbpvoN>4Tu7FMe85|t^<$#%)8BtPFLPtkOR9;?Ab#-<0_V&gQTrQU>0RY6_ z-kyNioSYnrMx%s200)eXjV1N~uh%O;>g42vMn*;$;@R05_4M?ZRy;I>!(lE1^fmmz z3D?)xG&wn$2mswOUMG!>jeHcIpPzG`nEhdCeSKZz=H_zqgDwDpBYrl)wY4>om6gSI zZ)$4d-?3PX>~_29#V;%@2z36+%1SN)=tQCc0X=~Qf)LI}r_-t6g4WhnQWS*_4-d)X z@t7LI;^HD7hgDToEcp2NnCk26X<}mHAI|~g^ZD2+@%mU^UKRi`K0a=02uN}y5)o+X z2L}fX07w1Q)KtQA0L{zngA3<;qe$oN#Ssq0bt6S zj59-&s;a7*ntq3)861s9dAf=cSXo)&?Fx*TySuwJuhpA{?~40B4O*9orKKgFu%Z+$ zE-ok-4C=b>yM*bzkIUr}EiEmElA|f4qoYH#wYBkT8M1$OcSi*U1xdL!CwX z(EN`78sKm^L~U&?XC7T2`!x`a1quMc2PNb7n5wD*4IArlDBDmd^q&y^_|LAcE+!d? iL^KJ0N9O+KJ$?XdKc@@GQVKx;0000Px$Ye_^wR9Hvtmc0#xFbsu5#Q@O208}i(8e|E28WO6OHlJ@{fTuO;>WC&`YJgXeaHmXM_sClm)5JK$V+qC}Y09WDw0Jd|^f71gL0E9pS z&N+FrKdfKr=#haU3(fdL5vy>(hUCUju;bVHh&c^L7ZRd|4JYO_LIb zNf?HKTs^r7aU8(~=y?5rI0)lGfUC;)u|D Date: Sun, 5 Jan 2025 19:06:10 +0000 Subject: [PATCH 026/205] wielding refactor/fixes (#32188) * refactor wieldable events * fix inconsitency with wielding and use updated events * wieldable cosmetic refactoring * Update Content.Shared/Wieldable/Events.cs Co-authored-by: Centronias * real Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com> --------- Co-authored-by: deltanedas <@deltanedas:kde.org> Co-authored-by: Centronias Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com> --- .../Wieldable/BeforeUnwieldEvent.cs | 5 - Content.Shared/Wieldable/BeforeWieldEvent.cs | 5 - Content.Shared/Wieldable/Events.cs | 43 ++++++ .../Wieldable/ItemUnwieldedEvent.cs | 23 ---- Content.Shared/Wieldable/ItemWieldedEvent.cs | 7 - .../Wieldable/WieldableDoAfterEvent.cs | 9 -- Content.Shared/Wieldable/WieldableSystem.cs | 128 +++++++++--------- 7 files changed, 109 insertions(+), 111 deletions(-) delete mode 100644 Content.Shared/Wieldable/BeforeUnwieldEvent.cs delete mode 100644 Content.Shared/Wieldable/BeforeWieldEvent.cs create mode 100644 Content.Shared/Wieldable/Events.cs delete mode 100644 Content.Shared/Wieldable/ItemUnwieldedEvent.cs delete mode 100644 Content.Shared/Wieldable/ItemWieldedEvent.cs delete mode 100644 Content.Shared/Wieldable/WieldableDoAfterEvent.cs diff --git a/Content.Shared/Wieldable/BeforeUnwieldEvent.cs b/Content.Shared/Wieldable/BeforeUnwieldEvent.cs deleted file mode 100644 index 4328ba50c41e..000000000000 --- a/Content.Shared/Wieldable/BeforeUnwieldEvent.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace Content.Shared.Wieldable; - -public sealed class BeforeUnwieldEvent : CancellableEntityEventArgs -{ -} \ No newline at end of file diff --git a/Content.Shared/Wieldable/BeforeWieldEvent.cs b/Content.Shared/Wieldable/BeforeWieldEvent.cs deleted file mode 100644 index 744a009f9cdd..000000000000 --- a/Content.Shared/Wieldable/BeforeWieldEvent.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace Content.Shared.Wieldable; - -public sealed class BeforeWieldEvent : CancellableEntityEventArgs -{ -} \ No newline at end of file diff --git a/Content.Shared/Wieldable/Events.cs b/Content.Shared/Wieldable/Events.cs new file mode 100644 index 000000000000..fe7e084c0273 --- /dev/null +++ b/Content.Shared/Wieldable/Events.cs @@ -0,0 +1,43 @@ +namespace Content.Shared.Wieldable; + +/// +/// Raised directed on an item when it is wielded. +/// +[ByRefEvent] +public readonly record struct ItemWieldedEvent(EntityUid User); + +/// +/// Raised directed on an item that has been unwielded. +/// Force is whether the item is being forced to be unwielded, or if the player chose to unwield it themselves. +/// +[ByRefEvent] +public readonly record struct ItemUnwieldedEvent(EntityUid User, bool Force); + +/// +/// Raised directed on an item before a user tries to wield it. +/// If this event is cancelled wielding will not happen. +/// +[ByRefEvent] +public record struct WieldAttemptEvent(EntityUid User, bool Cancelled = false) +{ + public void Cancel() + { + Cancelled = true; + } +} + +/// +/// Raised directed on an item before a user tries to stop wielding it willingly. +/// If this event is cancelled unwielding will not happen. +/// +/// +/// This event is not raised if the user is forced to unwield the item. +/// +[ByRefEvent] +public record struct UnwieldAttemptEvent(EntityUid User, bool Cancelled = false) +{ + public void Cancel() + { + Cancelled = true; + } +} diff --git a/Content.Shared/Wieldable/ItemUnwieldedEvent.cs b/Content.Shared/Wieldable/ItemUnwieldedEvent.cs deleted file mode 100644 index f980d4580209..000000000000 --- a/Content.Shared/Wieldable/ItemUnwieldedEvent.cs +++ /dev/null @@ -1,23 +0,0 @@ -namespace Content.Shared.Wieldable; - -#region Events - -/// -/// Raised on the item that has been unwielded. -/// -public sealed class ItemUnwieldedEvent : EntityEventArgs -{ - public EntityUid? User; - /// - /// Whether the item is being forced to be unwielded, or if the player chose to unwield it themselves. - /// - public bool Force; - - public ItemUnwieldedEvent(EntityUid? user = null, bool force=false) - { - User = user; - Force = force; - } -} - -#endregion diff --git a/Content.Shared/Wieldable/ItemWieldedEvent.cs b/Content.Shared/Wieldable/ItemWieldedEvent.cs deleted file mode 100644 index 15e204728a94..000000000000 --- a/Content.Shared/Wieldable/ItemWieldedEvent.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Content.Shared.Wieldable; - -/// -/// Raised directed on an entity when it is wielded. -/// -[ByRefEvent] -public readonly record struct ItemWieldedEvent; diff --git a/Content.Shared/Wieldable/WieldableDoAfterEvent.cs b/Content.Shared/Wieldable/WieldableDoAfterEvent.cs deleted file mode 100644 index 8431de9b2682..000000000000 --- a/Content.Shared/Wieldable/WieldableDoAfterEvent.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Content.Shared.DoAfter; -using Robust.Shared.Serialization; - -namespace Content.Shared.Wieldable; - -[Serializable, NetSerializable] -public sealed partial class WieldableDoAfterEvent : SimpleDoAfterEvent -{ -} diff --git a/Content.Shared/Wieldable/WieldableSystem.cs b/Content.Shared/Wieldable/WieldableSystem.cs index 0a193576bfdf..200a50d28f73 100644 --- a/Content.Shared/Wieldable/WieldableSystem.cs +++ b/Content.Shared/Wieldable/WieldableSystem.cs @@ -25,16 +25,16 @@ namespace Content.Shared.Wieldable; public sealed class WieldableSystem : EntitySystem { - [Dependency] private readonly SharedVirtualItemSystem _virtualItemSystem = default!; - [Dependency] private readonly SharedHandsSystem _handsSystem = default!; - [Dependency] private readonly SharedItemSystem _itemSystem = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly SharedAudioSystem _audioSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly UseDelaySystem _delay = default!; - [Dependency] private readonly SharedGunSystem _gun = default!; [Dependency] private readonly IGameTiming _timing = default!; [Dependency] private readonly INetManager _netManager = default!; + [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private readonly SharedGunSystem _gun = default!; + [Dependency] private readonly SharedHandsSystem _hands = default!; + [Dependency] private readonly SharedItemSystem _item = default!; + [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private readonly SharedVirtualItemSystem _virtualItem = default!; + [Dependency] private readonly UseDelaySystem _delay = default!; public override void Initialize() { @@ -82,7 +82,7 @@ private void OnShootAttempt(EntityUid uid, GunRequiresWieldComponent component, { component.LastPopup = time; var message = Loc.GetString("wieldable-component-requires", ("item", uid)); - _popupSystem.PopupClient(message, args.Used, args.User); + _popup.PopupClient(message, args.Used, args.User); } } } @@ -99,8 +99,7 @@ private void OnGunWielded(EntityUid uid, GunWieldBonusComponent component, ref I private void OnDeselectWieldable(EntityUid uid, WieldableComponent component, HandDeselectedEvent args) { - if (!component.Wielded || - _handsSystem.EnumerateHands(args.User).Count() > 2) + if (_hands.EnumerateHands(args.User).Count() > 2) return; TryUnwield(uid, component, args.User); @@ -138,7 +137,7 @@ private void AddToggleWieldVerb(EntityUid uid, WieldableComponent component, Get if (args.Hands == null || !args.CanAccess || !args.CanInteract) return; - if (!_handsSystem.IsHolding(args.User, uid, out _, args.Hands)) + if (!_hands.IsHolding(args.User, uid, out _, args.Hands)) return; // TODO VERB TOOLTIPS Make CanWield or some other function return string, set as verb tooltip and disable @@ -170,28 +169,28 @@ private void OnUseInHand(EntityUid uid, WieldableComponent component, UseInHandE public bool CanWield(EntityUid uid, WieldableComponent component, EntityUid user, bool quiet = false) { // Do they have enough hands free? - if (!EntityManager.TryGetComponent(user, out var hands)) + if (!TryComp(user, out var hands)) { if (!quiet) - _popupSystem.PopupClient(Loc.GetString("wieldable-component-no-hands"), user, user); + _popup.PopupClient(Loc.GetString("wieldable-component-no-hands"), user, user); return false; } // Is it.. actually in one of their hands? - if (!_handsSystem.IsHolding(user, uid, out _, hands)) + if (!_hands.IsHolding(user, uid, out _, hands)) { if (!quiet) - _popupSystem.PopupClient(Loc.GetString("wieldable-component-not-in-hands", ("item", uid)), user, user); + _popup.PopupClient(Loc.GetString("wieldable-component-not-in-hands", ("item", uid)), user, user); return false; } - if (_handsSystem.CountFreeableHands((user, hands)) < component.FreeHandsRequired) + if (_hands.CountFreeableHands((user, hands)) < component.FreeHandsRequired) { if (!quiet) { var message = Loc.GetString("wieldable-component-not-enough-free-hands", ("number", component.FreeHandsRequired), ("item", uid)); - _popupSystem.PopupClient(message, user, user); + _popup.PopupClient(message, user, user); } return false; } @@ -209,22 +208,26 @@ public bool TryWield(EntityUid used, WieldableComponent component, EntityUid use if (!CanWield(used, component, user)) return false; - var ev = new BeforeWieldEvent(); - RaiseLocalEvent(used, ev); + if (TryComp(used, out UseDelayComponent? useDelay) + && !_delay.TryResetDelay((used, useDelay), true)) + return false; + + var attemptEv = new WieldAttemptEvent(user); + RaiseLocalEvent(used, ref attemptEv); - if (ev.Cancelled) + if (attemptEv.Cancelled) return false; if (TryComp(used, out var item)) { component.OldInhandPrefix = item.HeldPrefix; - _itemSystem.SetHeldPrefix(used, component.WieldedInhandPrefix, component: item); + _item.SetHeldPrefix(used, component.WieldedInhandPrefix, component: item); } - component.Wielded = true; + SetWielded((used, component), true); if (component.WieldSound != null) - _audioSystem.PlayPredicted(component.WieldSound, used, user); + _audio.PlayPredicted(component.WieldSound, used, user); //This section handles spawning the virtual item(s) to occupy the required additional hand(s). //Since the client can't currently predict entity spawning, only do this if this is running serverside. @@ -234,7 +237,7 @@ public bool TryWield(EntityUid used, WieldableComponent component, EntityUid use var virtuals = new List(); for (var i = 0; i < component.FreeHandsRequired; i++) { - if (_virtualItemSystem.TrySpawnVirtualItemInHand(used, user, out var virtualItem, true)) + if (_virtualItem.TrySpawnVirtualItemInHand(used, user, out var virtualItem, true)) { virtuals.Add(virtualItem.Value); continue; @@ -249,78 +252,79 @@ public bool TryWield(EntityUid used, WieldableComponent component, EntityUid use } } - if (TryComp(used, out UseDelayComponent? useDelay) - && !_delay.TryResetDelay((used, useDelay), true)) - return false; - var selfMessage = Loc.GetString("wieldable-component-successful-wield", ("item", used)); var othersMessage = Loc.GetString("wieldable-component-successful-wield-other", ("user", Identity.Entity(user, EntityManager)), ("item", used)); - _popupSystem.PopupPredicted(selfMessage, othersMessage, user, user); + _popup.PopupPredicted(selfMessage, othersMessage, user, user); - var targEv = new ItemWieldedEvent(); - RaiseLocalEvent(used, ref targEv); + var ev = new ItemWieldedEvent(user); + RaiseLocalEvent(used, ref ev); - Dirty(used, component); return true; } /// - /// Attempts to unwield an item, with no DoAfter. + /// Attempts to unwield an item, with no use delay. /// /// True if the attempt wasn't blocked. - public bool TryUnwield(EntityUid used, WieldableComponent component, EntityUid user) + public bool TryUnwield(EntityUid used, WieldableComponent component, EntityUid user, bool force = false) { - var ev = new BeforeUnwieldEvent(); - RaiseLocalEvent(used, ev); + if (!component.Wielded) + return false; // already unwielded - if (ev.Cancelled) - return false; + if (!force) + { + var attemptEv = new UnwieldAttemptEvent(user); + RaiseLocalEvent(used, ref attemptEv); + + if (attemptEv.Cancelled) + return false; + } - component.Wielded = false; - var targEv = new ItemUnwieldedEvent(user); + SetWielded((used, component), false); - RaiseLocalEvent(used, targEv); + var ev = new ItemUnwieldedEvent(user, force); + RaiseLocalEvent(used, ref ev); return true; } + /// + /// Sets wielded without doing any checks. + /// + private void SetWielded(Entity ent, bool wielded) + { + ent.Comp.Wielded = wielded; + Dirty(ent); + _appearance.SetData(ent, WieldableVisuals.Wielded, wielded); + } + private void OnItemUnwielded(EntityUid uid, WieldableComponent component, ItemUnwieldedEvent args) { - if (args.User == null) - return; + _item.SetHeldPrefix(uid, component.OldInhandPrefix); - if (TryComp(uid, out var item)) - { - _itemSystem.SetHeldPrefix(uid, component.OldInhandPrefix, component: item); - } + var user = args.User; + _virtualItem.DeleteInHandsMatching(user, uid); if (!args.Force) // don't play sound/popup if this was a forced unwield { if (component.UnwieldSound != null) - _audioSystem.PlayPredicted(component.UnwieldSound, uid, args.User); + _audio.PlayPredicted(component.UnwieldSound, uid, user); var selfMessage = Loc.GetString("wieldable-component-failed-wield", ("item", uid)); - var othersMessage = Loc.GetString("wieldable-component-failed-wield-other", ("user", Identity.Entity(args.User.Value, EntityManager)), ("item", uid)); - _popupSystem.PopupPredicted(selfMessage, othersMessage, args.User.Value, args.User.Value); + var othersMessage = Loc.GetString("wieldable-component-failed-wield-other", ("user", Identity.Entity(args.User, EntityManager)), ("item", uid)); + _popup.PopupPredicted(selfMessage, othersMessage, user, user); } - - _appearance.SetData(uid, WieldableVisuals.Wielded, false); - - Dirty(uid, component); - _virtualItemSystem.DeleteInHandsMatching(args.User.Value, uid); } private void OnItemLeaveHand(EntityUid uid, WieldableComponent component, GotUnequippedHandEvent args) { - if (!component.Wielded || uid != args.Unequipped) - return; - - RaiseLocalEvent(uid, new ItemUnwieldedEvent(args.User, force: true), true); + if (uid == args.Unequipped) + TryUnwield(uid, component, args.User, force: true); } private void OnVirtualItemDeleted(EntityUid uid, WieldableComponent component, VirtualItemDeletedEvent args) { - if (args.BlockingEntity == uid && component.Wielded) - TryUnwield(args.BlockingEntity, component, args.User); + if (args.BlockingEntity == uid) + TryUnwield(uid, component, args.User, force: true); } private void OnGetMeleeDamage(EntityUid uid, IncreaseDamageOnWieldComponent component, ref GetMeleeDamageEvent args) From 7f1308609ef7b918e7f5af0ea197021d66ebd165 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 5 Jan 2025 19:07:19 +0000 Subject: [PATCH 027/205] Automatic changelog update --- Resources/Changelog/Changelog.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index ac9eec0e7502..5b2fc180ee11 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,13 +1,4 @@ Entries: -- author: Allen - changes: - - message: Magboots and Science Magboots are no longer contraband. Advanced Magboots - and Blood-Red Magboots now have appropriate contraband types (Grand Theft and - Syndie Contraband respectively) - type: Fix - id: 7281 - time: '2024-09-04T15:04:50.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30960 - author: Blackern5000 changes: - message: Zombie outbreaks are now SIGNIFICANTLY rarer @@ -3930,3 +3921,12 @@ id: 7780 time: '2025-01-04T13:41:45.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32280 +- author: deltanedas + changes: + - message: Fixed wielding use delay not working properly. + type: Fix + - message: Fixed bow sprite not updating when wielded. + type: Fix + id: 7781 + time: '2025-01-05T19:06:10.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32188 From bf062d828fcf06227fbdd7f45c4d87f2a585ff78 Mon Sep 17 00:00:00 2001 From: Errant <35878406+Errant-4@users.noreply.github.com> Date: Sun, 5 Jan 2025 21:56:01 +0100 Subject: [PATCH 028/205] Lobby chat width and custom lobby titles (#33783) * lobby name cvar * panel width * skrek * server name localization fix * comment format fix Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com> * remove redundant newline Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com> * string.empty Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com> * use SetWidth * Update Resources/Locale/en-US/lobby/lobby-gui.ftl --------- Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --- Content.Client/Lobby/LobbyState.cs | 16 ++++++++++++++-- Content.Client/Lobby/UI/LobbyGui.xaml | 4 +--- Content.Shared/CCVar/CCVars.Server.cs | 13 +++++++++++++ Resources/Locale/en-US/lobby/lobby-gui.ftl | 2 +- 4 files changed, 29 insertions(+), 6 deletions(-) diff --git a/Content.Client/Lobby/LobbyState.cs b/Content.Client/Lobby/LobbyState.cs index 1361ca57cd28..4677245509e4 100644 --- a/Content.Client/Lobby/LobbyState.cs +++ b/Content.Client/Lobby/LobbyState.cs @@ -5,19 +5,21 @@ using Content.Client.Message; using Content.Client.UserInterface.Systems.Chat; using Content.Client.Voting; +using Content.Shared.CCVar; using Robust.Client; using Robust.Client.Console; using Robust.Client.ResourceManagement; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; +using Robust.Shared.Configuration; using Robust.Shared.Timing; - namespace Content.Client.Lobby { public sealed class LobbyState : Robust.Client.State.State { [Dependency] private readonly IBaseClient _baseClient = default!; + [Dependency] private readonly IConfigurationManager _cfg = default!; [Dependency] private readonly IClientConsoleHost _consoleHost = default!; [Dependency] private readonly IEntityManager _entityManager = default!; [Dependency] private readonly IResourceCache _resourceCache = default!; @@ -49,7 +51,17 @@ protected override void Startup() _voteManager.SetPopupContainer(Lobby.VoteContainer); LayoutContainer.SetAnchorPreset(Lobby, LayoutContainer.LayoutPreset.Wide); - Lobby.ServerName.Text = _baseClient.GameInfo?.ServerName; //The eye of refactor gazes upon you... + + var lobbyNameCvar = _cfg.GetCVar(CCVars.ServerLobbyName); + var serverName = _baseClient.GameInfo?.ServerName ?? string.Empty; + + Lobby.ServerName.Text = string.IsNullOrEmpty(lobbyNameCvar) + ? Loc.GetString("ui-lobby-title", ("serverName", serverName)) + : lobbyNameCvar; + + var width = _cfg.GetCVar(CCVars.ServerLobbyRightPanelWidth); + Lobby.RightSide.SetWidth = width; + UpdateLobbyUi(); Lobby.CharacterPreview.CharacterSetupButton.OnPressed += OnSetupPressed; diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml b/Content.Client/Lobby/UI/LobbyGui.xaml index c3bd0da642a6..3bfc49654fc2 100644 --- a/Content.Client/Lobby/UI/LobbyGui.xaml +++ b/Content.Client/Lobby/UI/LobbyGui.xaml @@ -62,14 +62,12 @@ - - diff --git a/Content.Shared/CCVar/CCVars.Server.cs b/Content.Shared/CCVar/CCVars.Server.cs index 2c861584afc9..88e7b251ba07 100644 --- a/Content.Shared/CCVar/CCVars.Server.cs +++ b/Content.Shared/CCVar/CCVars.Server.cs @@ -40,4 +40,17 @@ public sealed partial class CCVars /// public static readonly CVarDef ServerUptimeRestartMinutes = CVarDef.Create("server.uptime_restart_minutes", 0, CVar.SERVERONLY); + + /// + /// This will be the title shown in the lobby + /// If empty, the title will be {ui-lobby-title} + the server's full name from the hub + /// + public static readonly CVarDef ServerLobbyName = + CVarDef.Create("server.lobby_name", "", CVar.REPLICATED | CVar.SERVER); + + /// + /// The width of the right side (chat) panel in the lobby + /// + public static readonly CVarDef ServerLobbyRightPanelWidth = + CVarDef.Create("server.lobby_right_panel_width", 650, CVar.REPLICATED | CVar.SERVER); } diff --git a/Resources/Locale/en-US/lobby/lobby-gui.ftl b/Resources/Locale/en-US/lobby/lobby-gui.ftl index e7f131e93b02..14cc85a5a999 100644 --- a/Resources/Locale/en-US/lobby/lobby-gui.ftl +++ b/Resources/Locale/en-US/lobby/lobby-gui.ftl @@ -1,4 +1,4 @@ -ui-lobby-title = Lobby +ui-lobby-title = Lobby: {$serverName} ui-lobby-ahelp-button = AHelp ui-lobby-options-button = Options ui-lobby-leave-button = Leave From 17604f4ee14955e26da82e2550d5a0e69a4f2033 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 5 Jan 2025 20:57:09 +0000 Subject: [PATCH 029/205] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 5b2fc180ee11..49f4380fa159 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Blackern5000 - changes: - - message: Zombie outbreaks are now SIGNIFICANTLY rarer - type: Tweak - id: 7282 - time: '2024-09-04T15:57:42.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30266 - author: yuitop changes: - message: Going into portals while pulling no more crashes the game @@ -3930,3 +3923,12 @@ id: 7781 time: '2025-01-05T19:06:10.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32188 +- author: Errant + changes: + - message: Lobby chat width is no longer dependent on the server's name. + type: Tweak + - message: Lobby title of a server can now be different from the Hub listing's name. + type: Tweak + id: 7782 + time: '2025-01-05T20:56:02.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/33783 From e841e6ea8b43e44fc1603743a12505a5ceae2bf3 Mon Sep 17 00:00:00 2001 From: SpaceRox1244 <138547931+SpaceRox1244@users.noreply.github.com> Date: Sun, 5 Jan 2025 17:11:01 -0500 Subject: [PATCH 030/205] Adds bullet collision to station lights (#34070) Adds collision with bullets to lights --- .../Structures/Lighting/base_lighting.yml | 26 +++++++++++++++++++ .../Structures/Lighting/ground_lighting.yml | 2 ++ .../Structures/Lighting/strobe_lighting.yml | 13 ++++++++++ 3 files changed, 41 insertions(+) diff --git a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml index 6964229c79dc..d29e74f38985 100644 --- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml @@ -44,6 +44,19 @@ cost: 4 delay: 2 fx: EffectRCDDeconstruct2 + - type: Physics + bodyType: Static + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.4,0.5,0.4,0.35" + density: 190 + mask: + - TabletopMachineMask + layer: + - TabletopMachineLayer - type: Destructible thresholds: - trigger: @@ -254,6 +267,19 @@ radius: 6 softness: 1.1 enabled: true + - type: Physics + bodyType: Static + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.2,0.5,0.2,0.35" + density: 190 + mask: + - TabletopMachineMask + layer: + - TabletopMachineLayer - type: Damageable damageContainer: Inorganic - type: Destructible diff --git a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml index 2bcbf0918823..222ea5c81420 100644 --- a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml @@ -29,6 +29,7 @@ layer: - MidImpassable - LowImpassable + - BulletImpassable - type: PointLight radius: 10 energy: 2.5 @@ -64,6 +65,7 @@ collection: MetalGlassBreak - type: StaticPrice price: 75 + - type: RequireProjectileTarget - type: entity id: PoweredLightPostSmallEmpty diff --git a/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml index 1a99ab6f1017..297a0a7abdf4 100644 --- a/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml @@ -38,6 +38,19 @@ softness: 1 offset: "0, 0.35" - type: RotatingLight + - type: Physics + bodyType: Static + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.2,0.5,0.2,0.35" + density: 190 + mask: + - TabletopMachineMask + layer: + - TabletopMachineLayer - type: Damageable damageContainer: Inorganic damageModifierSet: Metallic From 3f1f95f8cf9883b4dede832da74cd024edc955f7 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 5 Jan 2025 22:12:07 +0000 Subject: [PATCH 031/205] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 49f4380fa159..ca6d250e1ff5 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: yuitop - changes: - - message: Going into portals while pulling no more crashes the game - type: Fix - id: 7283 - time: '2024-09-04T16:44:10.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/31787 - author: Ilya246 changes: - message: The syndicate stealth box will no longer make a loud sound upon being @@ -3932,3 +3925,10 @@ id: 7782 time: '2025-01-05T20:56:02.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/33783 +- author: SpaceRox1244 + changes: + - message: Station lights can now be destroyed by bullets. + type: Add + id: 7783 + time: '2025-01-05T22:11:01.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/34070 From 5ebd3553c2ce3219356fec6a48dce249de2fee0e Mon Sep 17 00:00:00 2001 From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> Date: Mon, 6 Jan 2025 04:32:42 -0800 Subject: [PATCH 032/205] Make station anchor hitbox less insufferable (#34217) --- .../Prototypes/Entities/Structures/Shuttles/station_anchor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Structures/Shuttles/station_anchor.yml b/Resources/Prototypes/Entities/Structures/Shuttles/station_anchor.yml index f2c8e21dfc48..d9a30df5d818 100644 --- a/Resources/Prototypes/Entities/Structures/Shuttles/station_anchor.yml +++ b/Resources/Prototypes/Entities/Structures/Shuttles/station_anchor.yml @@ -39,7 +39,7 @@ fix1: shape: !type:PhysShapeAabb - bounds: "-0.7,-0.8,0.7,0.8" + bounds: "-0.7,-0.7,0.7,0.7" density: 190 mask: - LargeMobMask From 420631cfeab7278fd267ffff089623d9e9feb048 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 6 Jan 2025 12:33:49 +0000 Subject: [PATCH 033/205] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index ca6d250e1ff5..24360184408a 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: Ilya246 - changes: - - message: The syndicate stealth box will no longer make a loud sound upon being - opened. - type: Tweak - id: 7284 - time: '2024-09-04T22:42:15.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30741 - author: chromiumboy changes: - message: The atmospheric alert computers are now functional! Use them to locate @@ -3932,3 +3924,11 @@ id: 7783 time: '2025-01-05T22:11:01.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/34070 +- author: ArtisticRoomba + changes: + - message: You can no longer get stuck when trying to walk between a station anchor + and a wall. + type: Fix + id: 7784 + time: '2025-01-06T12:32:42.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/34217 From 9d5661d6e4a0ac7e35c40ee7c582b0dc56e209c0 Mon Sep 17 00:00:00 2001 From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> Date: Mon, 6 Jan 2025 16:18:56 -0800 Subject: [PATCH 034/205] Remove kessler and zombeteors gamemodes from the secret pool (#34051) * Remove kessler, zombeteors gameodes * Probably should keep the protos in case an admin wants to torture players secretly * address slart review --- Resources/Prototypes/game_presets.yml | 4 ++-- Resources/Prototypes/secret_weights.yml | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/game_presets.yml b/Resources/Prototypes/game_presets.yml index f27d5599f5be..5eaafddfaf96 100644 --- a/Resources/Prototypes/game_presets.yml +++ b/Resources/Prototypes/game_presets.yml @@ -96,7 +96,7 @@ showInVote: true #4boring4vote # DeltaV - Enable greenshift in gamemode vote description: greenshift-description rules: - - SpaceTrafficControlFriendlyEventScheduler + - SpaceTrafficControlFriendlyEventScheduler - BasicRoundstartVariation - GlimmerEventScheduler # DeltaV @@ -133,7 +133,7 @@ showInVote: false #Admin Use description: secret-description rules: - - SpaceTrafficControlFriendlyEventScheduler + - SpaceTrafficControlFriendlyEventScheduler - BasicRoundstartVariation - GlimmerEventScheduler # DeltaV diff --git a/Resources/Prototypes/secret_weights.yml b/Resources/Prototypes/secret_weights.yml index 6099d1493d91..7af610af6c7d 100644 --- a/Resources/Prototypes/secret_weights.yml +++ b/Resources/Prototypes/secret_weights.yml @@ -1,8 +1,8 @@ - type: weightedRandom id: Secret weights: - Survival: 0.35 - Nukeops: 0.15 - Zombie: 0.07 - Traitor: 0.43 - #Pirates: 0.15 #ahoy me bucko + Nukeops: 0.20 + Traitor: 0.60 + Zombie: 0.05 + Survival: 0.10 + Revolutionary: 0.05 From 59ec6c3e5db7a56100e31a951dfaead2ce8fe734 Mon Sep 17 00:00:00 2001 From: deltanedas <@deltanedas:kde.org> Date: Sun, 12 Jan 2025 08:12:11 +0000 Subject: [PATCH 035/205] use deltav secret weights prototype --- Resources/ConfigPresets/DeltaV/deltav.toml | 1 + Resources/IgnoredPrototypes/ignoredPrototypes.yml | 2 ++ Resources/Prototypes/_DV/secret_weights.yml | 8 ++++++++ 3 files changed, 11 insertions(+) create mode 100644 Resources/Prototypes/_DV/secret_weights.yml diff --git a/Resources/ConfigPresets/DeltaV/deltav.toml b/Resources/ConfigPresets/DeltaV/deltav.toml index e003bbd32954..4bd3d8cabce7 100644 --- a/Resources/ConfigPresets/DeltaV/deltav.toml +++ b/Resources/ConfigPresets/DeltaV/deltav.toml @@ -4,6 +4,7 @@ lobbyenabled = true lobbyduration = 240 round_end_pacifist = true contraband_examine = false # Doubtful that it's desired at all, and would require going over every item in accordance with SOP +secret_weight_prototype = SecretDeltaV # New players can't join a server without admins [game.panic_bunker] diff --git a/Resources/IgnoredPrototypes/ignoredPrototypes.yml b/Resources/IgnoredPrototypes/ignoredPrototypes.yml index 3bda19c2ab43..02424a605f59 100644 --- a/Resources/IgnoredPrototypes/ignoredPrototypes.yml +++ b/Resources/IgnoredPrototypes/ignoredPrototypes.yml @@ -12,3 +12,5 @@ # Replaced by # /Prototypes/_DV/Maps/salvage_modified.yml # /Prototypes/_DV/Maps/salvage.yml +- /Prototypes/secret_weights.yml +# Replaced by /Prototypes/_DV/secret_weights.yml diff --git a/Resources/Prototypes/_DV/secret_weights.yml b/Resources/Prototypes/_DV/secret_weights.yml new file mode 100644 index 000000000000..41017a439a9c --- /dev/null +++ b/Resources/Prototypes/_DV/secret_weights.yml @@ -0,0 +1,8 @@ +- type: weightedRandom + id: SecretDeltaV + weights: + Survival: 0.35 + Nukeops: 0.15 + Zombie: 0.07 + Traitor: 0.43 + #Pirates: 0.15 #ahoy me bucko From af3e2c3e7ff38e6d60003847bfed495ba3815a09 Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 7 Jan 2025 00:20:04 +0000 Subject: [PATCH 036/205] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 24360184408a..ae1bc428c6d1 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: chromiumboy - changes: - - message: The atmospheric alert computers are now functional! Use them to locate - active air and fire alarms on the station. - type: Add - id: 7285 - time: '2024-09-05T01:13:17.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/25938 - author: ScarKy0 changes: - message: A lot more electronics can now be used by the AI. @@ -3932,3 +3924,11 @@ id: 7784 time: '2025-01-06T12:32:42.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/34217 +- author: ArtisticRoomba + changes: + - message: Kessler Syndrome and Zombeteors are removed from the possible gamemodes + in the Secret pool. + type: Remove + id: 7785 + time: '2025-01-07T00:18:56.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/34051 From 1f18739bc82f447917ed64968bf575674658e785 Mon Sep 17 00:00:00 2001 From: Alpaccalypse <21291379+Alpaccalypse@users.noreply.github.com> Date: Tue, 7 Jan 2025 14:10:16 +0000 Subject: [PATCH 037/205] Added distinct ad and bye chatter to Dr. Gibb vending (#34182) * Added distinct ad and bye chatter to Dr. Gibb vending * Correcting revert mistake * Changed ad pack names to better match naming convention --- .../Locale/en-US/advertisements/vending/gibb.ftl | 12 ++++++++++++ .../Catalog/VendingMachines/advertisements.yml | 6 ++++++ .../Prototypes/Catalog/VendingMachines/goodbyes.yml | 6 ++++++ .../Structures/Machines/vending_machines.yml | 4 ++-- 4 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 Resources/Locale/en-US/advertisements/vending/gibb.ftl diff --git a/Resources/Locale/en-US/advertisements/vending/gibb.ftl b/Resources/Locale/en-US/advertisements/vending/gibb.ftl new file mode 100644 index 000000000000..b4360d8e4a86 --- /dev/null +++ b/Resources/Locale/en-US/advertisements/vending/gibb.ftl @@ -0,0 +1,12 @@ +advertisement-gibb-1 = Delicious! +advertisement-gibb-2 = Recommended by at least one doctor! +advertisement-gibb-3 = Over 1 million drinks sold! +advertisement-gibb-4 = Dr. Gibb, what's the worst that could happen? +advertisement-gibb-5 = Dr. Gibb, the flavor explosion! +advertisement-gibb-6 = Trust me, I'm a doctor! +advertisement-gibb-7 = The best sugar infusion in the galaxy! +advertisement-gibb-8 = Space Cola can get Gibbed! +thankyou-gibb-1 = The Dr. is in... your belly! +thankyou-gibb-2 = Prognosis: flavor! +thankyou-gibb-3 = Enjoy the 42 flavors! +thankyou-gibb-4 = Enjoy the syrupy goodness! diff --git a/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml b/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml index 46edd7bafefa..6dc004dd1bbe 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml @@ -82,6 +82,12 @@ prefix: advertisement-cola- count: 8 +- type: localizedDataset + id: DrGibbAds + values: + prefix: advertisement-gibb- + count: 8 + - type: localizedDataset id: CondimentVendAds values: diff --git a/Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml b/Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml index fd4e53acaa7b..47da3b3dc60f 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml @@ -40,6 +40,12 @@ prefix: thankyou-cola- count: 4 +- type: localizedDataset + id: DrGibbGoodbyes + values: + prefix: thankyou-gibb- + count: 4 + - type: localizedDataset id: DiscountDansGoodbyes values: diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 3ecb065518a8..1ecf75bb84cd 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -669,9 +669,9 @@ ejectDelay: 1.9 initialStockQuality: 0.33 - type: Advertise - pack: RobustSoftdrinksAds + pack: DrGibbAds - type: SpeakOnUIClosed - pack: GenericVendGoodbyes + pack: DrGibbGoodbyes - type: Speech - type: Sprite sprite: Structures/Machines/VendingMachines/gib.rsi From f347fc9eb11d5e432158ac4ab7c79db41728d205 Mon Sep 17 00:00:00 2001 From: Alpaccalypse <21291379+Alpaccalypse@users.noreply.github.com> Date: Tue, 7 Jan 2025 17:45:02 +0000 Subject: [PATCH 038/205] Special reagents now appear in the guidebook (#34265) * Special reagents now appear in the guidebook * Improved guidebook wording for reagent category --- Resources/Locale/en-US/guidebook/guides.ftl | 8 +++++--- Resources/Prototypes/Guidebook/chemicals.yml | 7 +++++++ Resources/ServerInfo/Guidebook/ChemicalTabs/Special.xml | 9 +++++++++ Resources/ServerInfo/Guidebook/Chemicals.xml | 3 +++ 4 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 Resources/ServerInfo/Guidebook/ChemicalTabs/Special.xml diff --git a/Resources/Locale/en-US/guidebook/guides.ftl b/Resources/Locale/en-US/guidebook/guides.ftl index 72a91f40e0fb..0d236c3d670a 100644 --- a/Resources/Locale/en-US/guidebook/guides.ftl +++ b/Resources/Locale/en-US/guidebook/guides.ftl @@ -26,7 +26,6 @@ guide-entry-chef = Chef guide-entry-medical = Medical guide-entry-medicaldoctor = Medical Doctor guide-entry-chemist = Chemist -guide-entry-medicine = Medicine guide-entry-brute = Advanced Brute Medication guide-entry-botanicals = Botanicals guide-entry-cloning = Cloning @@ -57,16 +56,19 @@ guide-entry-controls = Controls guide-entry-radio = Radio and Speech guide-entry-references = Tables & References +guide-entry-chemicals = Chemicals guide-entry-drinks = Drinks guide-entry-foodrecipes = Food Recipes -guide-entry-chemicals = Chemicals + guide-entry-elements = Elements +guide-entry-medicine = Medicine guide-entry-narcotics = Narcotics guide-entry-pyrotechnics = Pyrotechnic guide-entry-toxins = Toxins guide-entry-foods = Foods guide-entry-biological = Biological -guide-entry-botanical = Botanicals +guide-entry-botanical = Botanical +guide-entry-special = Special guide-entry-others = Others guide-entry-antagonists = Antagonists diff --git a/Resources/Prototypes/Guidebook/chemicals.yml b/Resources/Prototypes/Guidebook/chemicals.yml index 7357ae2881fc..730d7b304552 100644 --- a/Resources/Prototypes/Guidebook/chemicals.yml +++ b/Resources/Prototypes/Guidebook/chemicals.yml @@ -11,6 +11,7 @@ - Foods - Botanical - Biological + - Special - Others filterEnabled: True @@ -56,6 +57,12 @@ text: "/ServerInfo/Guidebook/ChemicalTabs/Biological.xml" filterEnabled: True +- type: guideEntry + id: Special + name: guide-entry-special + text: "/ServerInfo/Guidebook/ChemicalTabs/Special.xml" + filterEnabled: True + - type: guideEntry id: Others name: guide-entry-others diff --git a/Resources/ServerInfo/Guidebook/ChemicalTabs/Special.xml b/Resources/ServerInfo/Guidebook/ChemicalTabs/Special.xml new file mode 100644 index 000000000000..b4ca5e4a82ad --- /dev/null +++ b/Resources/ServerInfo/Guidebook/ChemicalTabs/Special.xml @@ -0,0 +1,9 @@ + + +# Special + +These reagents either have exotic sources, unique properties, or both. + + + + diff --git a/Resources/ServerInfo/Guidebook/Chemicals.xml b/Resources/ServerInfo/Guidebook/Chemicals.xml index 0db9ebf054fa..b68431a1a73b 100644 --- a/Resources/ServerInfo/Guidebook/Chemicals.xml +++ b/Resources/ServerInfo/Guidebook/Chemicals.xml @@ -29,6 +29,9 @@ Knowing different types of chemicals and their effects is important for being ab ## Biological +## Special + + ## Other From 400a84c7d2fd500dd54d553e014e55ec11a0d9d9 Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 7 Jan 2025 17:46:10 +0000 Subject: [PATCH 039/205] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index ae1bc428c6d1..e8b2bdfd6470 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: ScarKy0 - changes: - - message: A lot more electronics can now be used by the AI. - type: Add - id: 7286 - time: '2024-09-05T09:31:03.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/31730 - author: Fildrance changes: - message: random uplink discounts for traitors @@ -3932,3 +3925,10 @@ id: 7785 time: '2025-01-07T00:18:56.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/34051 +- author: Alpaccalypse + changes: + - message: Special reagents are now listed in the relevant section of the guidebook. + type: Add + id: 7786 + time: '2025-01-07T17:45:03.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/34265 From 620417206cecc8ae330a7f353d3ebb0d6f0db5bb Mon Sep 17 00:00:00 2001 From: Tayrtahn Date: Tue, 7 Jan 2025 13:48:32 -0500 Subject: [PATCH 040/205] Fix portable scrubber appearing powered on spawn (#34274) --- .../Entities/Structures/Piping/Atmospherics/portable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml index b932a636cd18..eae848c7aa93 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml @@ -30,6 +30,7 @@ - state: unlit shader: unshaded map: ["enum.PowerDeviceVisualLayers.Powered"] + visible: false - state: draining shader: unshaded visible: false From 37e9113cbf60ff1b41cd22f8c4c83568d9ffccfa Mon Sep 17 00:00:00 2001 From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Date: Tue, 7 Jan 2025 20:31:54 +0100 Subject: [PATCH 041/205] [HOTFIX] Fix chameleon PDAs renaming IDs (#34249) Fix chameleon PDA --- Content.Shared/Access/Systems/SharedIdCardSystem.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Content.Shared/Access/Systems/SharedIdCardSystem.cs b/Content.Shared/Access/Systems/SharedIdCardSystem.cs index a5a37eecbd07..db7d9b38c87e 100644 --- a/Content.Shared/Access/Systems/SharedIdCardSystem.cs +++ b/Content.Shared/Access/Systems/SharedIdCardSystem.cs @@ -33,7 +33,8 @@ private void OnRename(ref EntityRenamedEvent ev) // When a player gets renamed their id card is renamed as well to match. // Unfortunately since TryFindIdCard will succeed if the entity is also a card this means that the card will // keep renaming itself unless we return early. - if (HasComp(ev.Uid)) + // We also do not include the PDA itself being renamed, as that triggers the same event (e.g. for chameleon PDAs). + if (HasComp(ev.Uid) || HasComp(ev.Uid)) return; if (TryFindIdCard(ev.Uid, out var idCard)) From ecb82e75449507b5dacf6a011dacb509cc73ee90 Mon Sep 17 00:00:00 2001 From: Pancake Date: Tue, 7 Jan 2025 16:51:53 -0800 Subject: [PATCH 042/205] Update vessel_warning.ogg (#34263) * Update vessel_warning.ogg Remove DC offset and apply short fade out. * Update attributions.yml * Update attributions.yml --- Resources/Audio/Machines/attributions.yml | 2 +- Resources/Audio/Machines/vessel_warning.ogg | Bin 4555 -> 4716 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Audio/Machines/attributions.yml b/Resources/Audio/Machines/attributions.yml index fe144d43381f..e5756369be21 100644 --- a/Resources/Audio/Machines/attributions.yml +++ b/Resources/Audio/Machines/attributions.yml @@ -35,7 +35,7 @@ - files: ["vessel_warning.ogg"] license: "CC-BY-4.0" - copyright: "Created by AUDACITIER (freesound), converted to MONO and .ogg and edited by EmoGarbage404 (github)." + copyright: "Created by AUDACITIER (freesound), converted to MONO and .ogg and edited by EmoGarbage404 (github). Removed click at beginning/end with fade in/out (Pancake)." source: "https://freesound.org/people/AUDACITIER/sounds/629196/" - files: ["quickbeep.ogg"] diff --git a/Resources/Audio/Machines/vessel_warning.ogg b/Resources/Audio/Machines/vessel_warning.ogg index 966c80eae6a61e470ea5a8699b1d0111bdced2c1..4385eb10e417794d60de435428fab72f3440efb3 100644 GIT binary patch delta 819 zcmV-31I+x(BkUv^PiJRS00IC200000007!K00000000YUxXh6nE)3c^000310070} zy85wH9uI%oIRF3x0000c_)bX(CnYCSKz*#XJUSo0Gyp$Hml@T7tHbb_2LI)mKf`Bk&T1I+j=x{*h{Y60(<8tM9H%YHdM5n0|Lg!i`jI?n8 zB(LAz4CGY`q`4{p$Dp>z;bNK?9(DR5eaQz7P+fly8AoBx{+}oU`ib5Lp7b?$*E4b6 zVbf7l`~v{Y0Ny0b0f{mI005xJaU93-6J-Hj<{APEpfod5DMe!h0FWm;(A4hzra%AU z=iRpb=hxkK*m1{;0Z{YEkxc_aNVwA5Ljmp%l z!M88&Vd1)s-kyUmg`AaBEWd0myIDdVMgLhy!3l|+_#zGQUb?g3;UUM>rT%d>{i}c0 z?XcBHOTcayc=dvuX_Hs2EWaCQIr_pX%#w^Ye|0l|X{eV%*Aws#2kuk~H0!!~)&K7G zzkBf~`6Ofu*g?5Ys{`l)-Ae!-ha88WZ3*-`D-P5S4@2B4}$m8^sUaQ2E3KRmp!J`82UC|#qnX{$y)u8C*5%y;&@#zjHM3~8htAagnAI5M(Xx?Gv+`6+ z`OIo;;kO=AG(GKcU{X%CsQ#AErqS?~PI=^ei|n3EU{Y>sQPeV@LGhTONvZbGIgy_X xFPl*0i>!fP<3!`>?ingB0bY|wi|n32`O`I%*_0K3tcOGsXqjW=f#DTUs{$1(d+GoH delta 657 zcmV;C0&e~6B+DZjPiJRS00IC200000004I^000000022WMTLkDnnER1TOKRh8+{$Tqm!K%Z{O=(Pv zX))C;=z`ON&yIij+l|U@dV6&ZyIG?H1fO63WREYV8DY9Q;Dp+#wumsJZ?C)V&wi$| z5ujgpMzwJO+KE2$4_36@`owvM&$Xub2M}NenE!tn^b-io0001h9>=lAakx%^m$SKA zK!EYfz(5r^L$BPR93D{f5%?!}w*onsK<)-!+7fC6+sgE88W(OOTs2?V#Ve-DVf9)mDj z1rPvY!kJ@UK~;iw%3#`60~EJ!zdYu)`b0Pw+IshEEuY0yDYcA8YxbepU7{WnDH9=H3$!uLA ze^UC9HILP}Y$Uf|E}r3660~;-q*_?cv&}TD>56W#8FkZZ&UTH%fScW1BHM`uB(KMz r7$x`@;keUdzzyWi2$|d}&OW64XYZYPCJ*U@oWDk4p?hc3XY)t{y(u81 From 4e12779b49ca0fd715d8694ee9b235e5db3898b9 Mon Sep 17 00:00:00 2001 From: Tayrtahn Date: Tue, 7 Jan 2025 20:00:20 -0500 Subject: [PATCH 043/205] Add bleating accent to goats (#34273) --- .../Components/BleatingAccentComponent.cs | 7 +++++ .../EntitySystems/BleatingAccentSystem.cs | 28 +++++++++++++++++++ .../en-US/chat/managers/chat-manager.ftl | 5 ++++ .../Prototypes/Entities/Mobs/NPCs/animals.yml | 9 ++++++ .../Prototypes/Voice/speech_emote_sounds.yml | 7 +++++ Resources/Prototypes/Voice/speech_sounds.yml | 9 ++++++ Resources/Prototypes/Voice/speech_verbs.yml | 8 ++++++ 7 files changed, 73 insertions(+) create mode 100644 Content.Server/Speech/Components/BleatingAccentComponent.cs create mode 100644 Content.Server/Speech/EntitySystems/BleatingAccentSystem.cs diff --git a/Content.Server/Speech/Components/BleatingAccentComponent.cs b/Content.Server/Speech/Components/BleatingAccentComponent.cs new file mode 100644 index 000000000000..484235ab9077 --- /dev/null +++ b/Content.Server/Speech/Components/BleatingAccentComponent.cs @@ -0,0 +1,7 @@ +namespace Content.Server.Speech.Components; + +/// +/// Makes this entity speak like a sheep or a goat in all chat messages it sends. +/// +[RegisterComponent] +public sealed partial class BleatingAccentComponent : Component { } diff --git a/Content.Server/Speech/EntitySystems/BleatingAccentSystem.cs b/Content.Server/Speech/EntitySystems/BleatingAccentSystem.cs new file mode 100644 index 000000000000..903377477e78 --- /dev/null +++ b/Content.Server/Speech/EntitySystems/BleatingAccentSystem.cs @@ -0,0 +1,28 @@ +using System.Text.RegularExpressions; +using Content.Server.Speech.Components; + +namespace Content.Server.Speech.EntitySystems; + +public sealed partial class BleatingAccentSystem : EntitySystem +{ + private static readonly Regex BleatRegex = new("([mbdlpwhrkcnytfo])([aiu])", RegexOptions.IgnoreCase); + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnAccentGet); + } + + private void OnAccentGet(Entity entity, ref AccentGetEvent args) + { + args.Message = Accentuate(args.Message); + } + + public static string Accentuate(string message) + { + // Repeats the vowel in certain consonant-vowel pairs + // So you taaaalk liiiike thiiiis + return BleatRegex.Replace(message, "$1$2$2$2$2"); + } +} diff --git a/Resources/Locale/en-US/chat/managers/chat-manager.ftl b/Resources/Locale/en-US/chat/managers/chat-manager.ftl index 1b0f676d9ae0..23f7a5c957b4 100644 --- a/Resources/Locale/en-US/chat/managers/chat-manager.ftl +++ b/Resources/Locale/en-US/chat/managers/chat-manager.ftl @@ -118,6 +118,11 @@ chat-speech-verb-canine-1 = barks chat-speech-verb-canine-2 = woofs chat-speech-verb-canine-3 = howls +chat-speech-verb-name-goat = Goat +chat-speech-verb-goat-1 = bleats +chat-speech-verb-goat-2 = grunts +chat-speech-verb-goat-3 = cries + chat-speech-verb-name-small-mob = Mouse chat-speech-verb-small-mob-1 = squeaks chat-speech-verb-small-mob-2 = pieps diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 84e6311cb63f..632e655653a6 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -1032,6 +1032,15 @@ - type: Grammar attributes: gender: female # Here because of UdderComponent + - type: Speech + speechSounds: Goat + speechVerb: Goat + - type: Vocal + sounds: + Female: Goat + Male: Goat + Unsexed: Goat + - type: BleatingAccent - type: InteractionPopup successChance: 0.2 interactSuccessString: petting-success-goat diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml index b8ed93dc7480..8ef9c62f9d3a 100644 --- a/Resources/Prototypes/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml @@ -533,3 +533,10 @@ path: /Audio/Animals/parrot_raught.ogg params: variation: 0.125 + +- type: emoteSounds + id: Goat + sound: + path: /Audio/Animals/goat_bah.ogg + params: + variation: 0.125 diff --git a/Resources/Prototypes/Voice/speech_sounds.yml b/Resources/Prototypes/Voice/speech_sounds.yml index bc3cffb3596e..c1ad6b9e4096 100644 --- a/Resources/Prototypes/Voice/speech_sounds.yml +++ b/Resources/Prototypes/Voice/speech_sounds.yml @@ -159,3 +159,12 @@ path: /Audio/Animals/chicken_cluck_happy.ogg exclaimSound: path: /Audio/Animals/chicken_cluck_happy.ogg + +- type: speechSounds + id: Goat + saySound: + path: /Audio/Animals/goat_bah.ogg + askSound: + path: /Audio/Animals/goat_bah.ogg + exclaimSound: + path: /Audio/Animals/goat_bah.ogg diff --git a/Resources/Prototypes/Voice/speech_verbs.yml b/Resources/Prototypes/Voice/speech_verbs.yml index 9879cefb75d8..f8202847fd6c 100644 --- a/Resources/Prototypes/Voice/speech_verbs.yml +++ b/Resources/Prototypes/Voice/speech_verbs.yml @@ -110,6 +110,14 @@ - chat-speech-verb-canine-2 - chat-speech-verb-canine-3 +- type: speechVerb + id: Goat + name: chat-speech-verb-name-goat + speechVerbStrings: + - chat-speech-verb-goat-1 + - chat-speech-verb-goat-2 + - chat-speech-verb-goat-3 + - type: speechVerb id: LargeMob name: chat-speech-verb-name-large-mob From 4fd69bf3ea673bbf8ffa889d8afb31c4d1aac9de Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 8 Jan 2025 01:01:30 +0000 Subject: [PATCH 044/205] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index e8b2bdfd6470..2d0f28d80f64 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Fildrance - changes: - - message: random uplink discounts for traitors - type: Add - id: 7287 - time: '2024-09-05T12:12:39.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26297 - author: ScarKy0 changes: - message: AI Actions now work. @@ -3932,3 +3925,10 @@ id: 7786 time: '2025-01-07T17:45:03.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/34265 +- author: Tayrtahn + changes: + - message: Sentient goats now have a bleating effect when speaking. + type: Add + id: 7787 + time: '2025-01-08T01:00:20.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/34273 From ba4b5222d30854709770ea102a8f76a05050a063 Mon Sep 17 00:00:00 2001 From: Piras314 Date: Tue, 7 Jan 2025 21:50:46 -0500 Subject: [PATCH 045/205] Happy New Year (#34288) happy new year --- LICENSE-MIT.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE-MIT.txt b/LICENSE-MIT.txt index 84187b79a360..30d1999e1631 100644 --- a/LICENSE-MIT.txt +++ b/LICENSE-MIT.txt @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2017-2024 Space Wizards Federation +Copyright (c) 2017-2025 Space Wizards Federation Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 6dc50752e83ff73eaf8e263c633ffdd872ca992b Mon Sep 17 00:00:00 2001 From: c4llv07e Date: Wed, 8 Jan 2025 18:23:33 +0300 Subject: [PATCH 046/205] Fix empty lines in adminwho with stealthmins. (#34122) Don't print newline if admin is hidden. --- Content.Server/Administration/Commands/AdminWhoCommand.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Content.Server/Administration/Commands/AdminWhoCommand.cs b/Content.Server/Administration/Commands/AdminWhoCommand.cs index feeec90e483b..ee5c362a4d5b 100644 --- a/Content.Server/Administration/Commands/AdminWhoCommand.cs +++ b/Content.Server/Administration/Commands/AdminWhoCommand.cs @@ -33,16 +33,16 @@ public void Execute(IConsoleShell shell, string argStr, string[] args) var first = true; foreach (var admin in adminMgr.ActiveAdmins) { - if (!first) - sb.Append('\n'); - first = false; - var adminData = adminMgr.GetAdminData(admin)!; DebugTools.AssertNotNull(adminData); if (adminData.Stealth && !seeStealth) continue; + if (!first) + sb.Append('\n'); + first = false; + sb.Append(admin.Name); if (adminData.Title is { } title) sb.Append($": [{title}]"); From 2a919c47e7f1c799b321effd3c36f05b27cd29c7 Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 8 Jan 2025 15:24:42 +0000 Subject: [PATCH 047/205] Automatic changelog update --- Resources/Changelog/Admin.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml index 33989882a987..576d1caaa161 100644 --- a/Resources/Changelog/Admin.yml +++ b/Resources/Changelog/Admin.yml @@ -671,5 +671,12 @@ Entries: id: 83 time: '2025-01-02T16:16:44.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/34118 +- author: c4llv07e + changes: + - message: adminwho doesn't leak stealthmins count now! + type: Fix + id: 84 + time: '2025-01-08T15:23:34.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/34122 Name: Admin Order: 3 From f2016aa133a084810cde5d336d643931ef9ac996 Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 9 Jan 2025 08:55:16 +0000 Subject: [PATCH 048/205] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 2d0f28d80f64..afa50b886919 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: ScarKy0 - changes: - - message: AI Actions now work. - type: Fix - id: 7288 - time: '2024-09-05T12:49:22.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/31823 - author: ScarKy0 changes: - message: Station AI now has updated icons on the HUD. @@ -3932,3 +3925,10 @@ id: 7787 time: '2025-01-08T01:00:20.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/34273 +- author: southbridge-fur + changes: + - message: Warm light bulbs exist now. + type: Add + id: 7788 + time: '2025-01-09T08:54:05.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/34324 From a25f51f5a57870f06c199c626a646218c15ca6ba Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 9 Jan 2025 11:24:44 +0000 Subject: [PATCH 049/205] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index afa50b886919..dc9149476504 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: ScarKy0 - changes: - - message: Station AI now has updated icons on the HUD. - type: Add - id: 7289 - time: '2024-09-05T12:52:26.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/31799 - author: drakewill-CRL changes: - message: Botanists can now learn basic chemistry with the Agrichem Is Fun! kit @@ -3932,3 +3925,10 @@ id: 7788 time: '2025-01-09T08:54:05.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/34324 +- author: deltanedas + changes: + - message: Fixed AIs not being able to use lockable buttons. + type: Fix + id: 7789 + time: '2025-01-09T11:23:37.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/34326 From c5e441cbd89d2566a700780b4c7ace79a9257435 Mon Sep 17 00:00:00 2001 From: Alpaccalypse <21291379+Alpaccalypse@users.noreply.github.com> Date: Thu, 9 Jan 2025 20:24:31 +0000 Subject: [PATCH 050/205] Drink titles and soda vendor consistency (#34178) * Made capitalisation of proper names consistent. * Roy Rogers is presumably a proper name. * Second pass at distinguishing proper names only. * Two nitpicking/minor changes * Fixed some overlooked can brand names. Matched case with descriptions. * Switched generic sodas with brands for SodaInventory * Removed commonly available branded cans * Matched case consistency used elsewhere. Minor SPAG corrections. * Added "nothing" and some missing alcohol bottles to RandomSpawner * Added distinct ad and bye chatter to Dr. Gibb machines. * Revert "Added distinct ad and bye chatter to Dr. Gibb machines." This reverts commit f90b8a470556de05aca81255db8b6b03596ae944. * Revert "Removed commonly available branded cans" This reverts commit 43b82168dac1f73b187b7677f34ecdd33b6bb81a. * Revert "Switched generic sodas with brands for SodaInventory" This reverts commit f1790f0ce61ef135c79068de6a741e8bb50d85d3. * Lowercased DrinkGlass suffix. Moved alcoholic drinks from drinks to alcohol. * Renamed energy drink to Red Bool. Corrected and added some jug descriptions. * Added reagent names for all bottles except poison-wine * Revision of title case for cocktails * SPAG and fixed the only brand reagen with unbranded name. * Possibly controversial, shortened some bran names to better fit the UI. * Fixed some inconsistencies in naming * Matched brand localisation change * Two name style edits * Fixed Smite bottle name * Minor, punctuation * Blank line to end of file * Upgraded descriptive names to title case * Banana Mama * reverts change, moved to another PR to avoid conflict. * Removed caffeine reference. * Minor, corrected some more inconsistencies * Removed Bottle of Nothing from random spawner. --- .../meta/consumable/drink/alcohol.ftl | 88 ++++++++++--------- .../reagents/meta/consumable/drink/drinks.ftl | 8 +- .../reagents/meta/consumable/drink/soda.ftl | 30 +++---- .../Random/Food_Drinks/drinks_bottles.yml | 3 + .../Objects/Consumable/Drinks/drinks.yml | 2 +- .../Consumable/Drinks/drinks_bottles.yml | 84 +++++++++++------- .../Objects/Consumable/Drinks/drinks_cans.yml | 24 ++--- 7 files changed, 133 insertions(+), 106 deletions(-) diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl index ee1ccc2f9325..b25ac5e7fbd6 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl @@ -7,7 +7,7 @@ reagent-desc-ale = A dark alchoholic beverage made by malted barley and yeast. reagent-name-beer = beer reagent-desc-beer = An alcoholic beverage made from malted grains, hops, yeast, and water. -reagent-name-blue-curacao = blue curacao +reagent-name-blue-curacao = blue Curaçao reagent-desc-blue-curacao = Exotically blue, fruity drink, distilled from oranges. reagent-name-cognac = cognac @@ -28,7 +28,7 @@ reagent-desc-coffeeliqueur = Liquor flavoured with cold brewed coffee and spices reagent-name-melon-liquor = melon liquor reagent-desc-melon-liquor = A relatively sweet and fruity 46 proof liquor. -reagent-name-n-t-cahors = NeoTheology Cahors Wine +reagent-name-n-t-cahors = NeoTheology Cahors wine reagent-desc-n-t-cahors = Fortified dessert wine made from cabernet sauvignon, saperavi and other grapes. reagent-name-poison-wine = poison wine @@ -53,7 +53,7 @@ reagent-name-whiskey = whiskey reagent-desc-whiskey = A type of distilled alcoholic beverage made from fermented grain mash. reagent-name-wine = wine -reagent-desc-wine = An premium alchoholic beverage made from distilled grape juice. +reagent-desc-wine = A premium alcoholic beverage made from distilled grape juice. reagent-name-champagne = champagne reagent-desc-champagne = A premium sparkling wine @@ -70,43 +70,43 @@ reagent-desc-aloe = So very, very, very good. reagent-name-amasec = amasec reagent-desc-amasec = Official drink of the Gun Club! -reagent-name-andalusia = andalusia +reagent-name-andalusia = Andalusia reagent-desc-andalusia = A nice, strangely named drink. reagent-name-antifreeze = antifreeze reagent-desc-antifreeze = Ultimate refreshment. -reagent-name-atomic-bomb = atomic bomb +reagent-name-atomic-bomb = Atomic Bomb reagent-desc-atomic-bomb = Nuclear proliferation never tasted so good. -reagent-name-b52 = b-52 +reagent-name-b52 = B-52 reagent-desc-b52 = Coffee, irish cream, and cognac. You will get bombed. -reagent-name-blue-hawaiian = blue hawaiian +reagent-name-blue-hawaiian = Blue Hawaiian reagent-desc-blue-hawaiian = Aloha! Does that mean hello or goodbye? -reagent-name-bahama-mama = bahama mama +reagent-name-bahama-mama = Bahama Mama reagent-desc-bahama-mama = Tropical cocktail. -reagent-name-banana-honk = banana honk +reagent-name-banana-honk = Banana Honk reagent-desc-banana-honk = A drink from Clown Heaven. reagent-name-barefoot = barefoot reagent-desc-barefoot = Barefoot and pregnant. -reagent-name-beepsky-smash = beepsky smash +reagent-name-beepsky-smash = Beepsky smash reagent-desc-beepsky-smash = Deny drinking this and prepare for THE LAW. -reagent-name-black-russian = black russian +reagent-name-black-russian = Black Russian reagent-desc-black-russian = For the lactose-intolerant. Still as classy as a White Russian. -reagent-name-bloody-mary = bloody mary +reagent-name-bloody-mary = Bloody Mary reagent-desc-bloody-mary = A strange yet pleasurable mixture made of vodka, tomato, and lime juice. reagent-name-booger = booger reagent-desc-booger = Ewww... -reagent-name-brave-bull = brave bull +reagent-name-brave-bull = Brave Bull reagent-desc-brave-bull = It's just as effective as Dutch-Courage! reagent-name-coconut-rum = coconut rum @@ -115,22 +115,22 @@ reagent-desc-coconut-rum = Rum with coconut for that tropical feel. reagent-name-cosmopolitan = cosmopolitan reagent-desc-cosmopolitan = Even in the worst situations, nothing beats a fresh cosmopolitan. -reagent-name-cuba-libre = cuba libre +reagent-name-cuba-libre = Cuba libre reagent-desc-cuba-libre = Rum, mixed with cola. Viva la revolucion. -reagent-name-demons-blood = demons blood +reagent-name-demons-blood = Demon's Blood reagent-desc-demons-blood = AHHHH!!!! -reagent-name-devils-kiss = devils kiss +reagent-name-devils-kiss = Devil's Kiss reagent-desc-devils-kiss = Creepy time! -reagent-name-doctors-delight = the doctor's delight +reagent-name-doctors-delight = The Doctor's Delight reagent-desc-doctors-delight = A gulp a day keeps the MediBot away. That's probably for the best. reagent-name-driest-martini = driest martini reagent-desc-driest-martini = Only for the experienced. You think you see sand floating in the glass. -reagent-name-erika-surprise = erika surprise +reagent-name-erika-surprise = Erika surprise reagent-desc-erika-surprise = The surprise is, it's green! reagent-name-gargle-blaster = Pan-Galactic Gargle Blaster @@ -142,13 +142,13 @@ reagent-desc-gin-fizz = Refreshingly lemony, deliciously dry. reagent-name-gin-tonic = gin and tonic reagent-desc-gin-tonic = An all time classic, mild cocktail. -reagent-name-gildlager = gildlager +reagent-name-gildlager = Gildlager reagent-desc-gildlager = 100 proof cinnamon schnapps, made for alcoholic teen girls on spring break. reagent-name-grog = grog reagent-desc-grog = Watered-down rum, pirate approved! -reagent-name-hippies-delight = hippies delight +reagent-name-hippies-delight = Hippie's Delight reagent-desc-hippies-delight = You just don't get it maaaan. reagent-name-hooch = hooch @@ -157,40 +157,43 @@ reagent-desc-hooch = Either someone's failure at cocktail making or attempt in a reagent-name-iced-beer = iced beer reagent-desc-iced-beer = A beer which is so cold the air around it freezes. -reagent-name-irish-slammer = irish slammer +reagent-name-irish-slammer = Irish slammer reagent-desc-irish-slammer = An unconventional mixture of irish cream and stout. -reagent-name-irish-cream = irish cream +reagent-name-irish-cream = Irish cream reagent-desc-irish-cream = Whiskey-imbued cream. What else could you expect from the Irish. -reagent-name-irish-coffee = irish coffee +reagent-name-irish-coffee = Irish coffee reagent-desc-irish-coffee = Coffee served with irish cream. Regular cream just isn't the same! -reagent-name-kira-special = kira special +reagent-name-kira-special = Kira special reagent-desc-kira-special = Long live the guy who everyone had mistaken for a girl. Baka! -reagent-name-long-island-iced-tea = long island iced tea +reagent-name-long-island-iced-tea = Long Island iced tea reagent-desc-long-island-iced-tea = The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only. -reagent-name-manhattan = manhattan +reagent-name-manhattan = Manhattan reagent-desc-manhattan = The Detective's undercover drink of choice. He never could stomach gin... -reagent-name-manhattan-project = manhattan project +reagent-name-manhattan-project = Manhattan Project reagent-desc-manhattan-project = A scientist's drink of choice, for pondering ways to blow up the ship. -reagent-name-manly-dorf = manly dorf +reagent-name-manly-dorf = Manly Dorf reagent-desc-manly-dorf = Beer and Ale, brought together in a delicious mix. Intended for stout dwarves only. reagent-name-margarita = margarita reagent-desc-margarita = On the rocks with salt on the rim. Arriba~! +reagent-name-the-martinez = The Martinez +reagent-desc-the-martinez = The edgerunner legend. Remembered by a drink, forgotten by a drunk. + reagent-name-martini = classic martini reagent-desc-martini = Vermouth with Gin. Not quite how 007 enjoyed it, but still delicious. reagent-name-mead = mead reagent-desc-mead = A Viking's drink, though a cheap one. -reagent-name-mojito = mojito +reagent-name-mojito = Mojito reagent-desc-mojito = If it's good enough for Spesscuba, it's good enough for you. reagent-name-moonshine = moonshine @@ -202,16 +205,16 @@ reagent-desc-neurotoxin = A strong neurotoxin that puts the subject into a death reagent-name-painkiller = painkiller reagent-desc-painkiller = A cure for what ails you. -reagent-name-patron = patron +reagent-name-patron = Patrón reagent-desc-patron = Tequila with silver in it, a favorite of alcoholic women in the club scene. -reagent-name-pina-colada = piña colada +reagent-name-pina-colada = Piña Colada reagent-desc-pina-colada = For getting lost in the rain. reagent-name-red-mead = red mead reagent-desc-red-mead = The true Viking's drink! Even though it has a strange red color. -reagent-name-rewriter = rewriter +reagent-name-rewriter = Rewriter reagent-desc-rewriter = The secret of the sanctuary of the Librarian... reagent-name-sbiten = sbiten @@ -220,7 +223,7 @@ reagent-desc-sbiten = A spicy Vodka! Might be a little hot for the little guys! reagent-name-screwdriver-cocktail = screwdriver reagent-desc-screwdriver-cocktail = Vodka, mixed with plain ol' orange juice. The result is surprisingly delicious. -reagent-name-cogchamp = cogchamp +reagent-name-cogchamp = Cogchamp reagent-desc-cogchamp = Not even Ratvar's Four Generals could withstand this! Qevax Jryy! reagent-name-silencer = silencer @@ -229,11 +232,11 @@ reagent-desc-silencer = A drink from Mime Heaven. reagent-name-singulo = singulo reagent-desc-singulo = A blue-space beverage! -reagent-name-snow-white = snow white +reagent-name-snow-white = Snow White reagent-desc-snow-white = A cold refreshment. reagent-name-sui-dream = sui dream -reagent-desc-sui-dream = 'Comprised of: White soda, blue curacao, melon liquor.' +reagent-desc-sui-dream = 'Comprised of: White soda, blue Curaçao, melon liquor.' reagent-name-syndicate-bomb = syndicate bomb reagent-desc-syndicate-bomb = Somebody set us up the bomb! @@ -241,7 +244,7 @@ reagent-desc-syndicate-bomb = Somebody set us up the bomb! reagent-name-tequila-sunrise = tequila sunrise reagent-desc-tequila-sunrise = Tequila and orange juice. Much like a Screwdriver, only Mexican. -reagent-name-three-mile-island = three mile island iced tea +reagent-name-three-mile-island = Three Mile Island iced tea reagent-desc-three-mile-island = "Made for a woman, strong enough for a man." reagent-name-toxins-special = toxins special @@ -259,16 +262,19 @@ reagent-desc-whiskey-cola = Whiskey, mixed with cola. Surprisingly refreshing. reagent-name-whiskey-soda = whiskey soda reagent-desc-whiskey-soda = For the more refined griffon. -reagent-name-white-russian = white russian +reagent-name-white-gilgamesh = White Gilgamesh +reagent-desc-white-gilgamesh = A sickening mixture of milk and beer. Makes you feel like you're made of wood. + +reagent-name-white-russian = White Russian reagent-desc-white-russian = That's just, like, your opinion, man... reagent-name-vodka-red-bool = vodka red bool reagent-desc-vodka-red-bool = Because heart failure and liver failure go hand in hand. -reagent-name-xeno-basher = xeno basher +reagent-name-xeno-basher = Xeno Basher reagent-desc-xeno-basher = The perfect drink before an expedition. -reagent-name-irish-bool = irish bool +reagent-name-irish-bool = Irish bool reagent-desc-irish-bool = Like a bool in a Ireland shop. reagent-name-budget-insuls = budget insuls @@ -280,5 +286,5 @@ reagent-desc-watermelon-wakeup = If you want to be awake, this will do it... Als reagent-name-rubberneck = rubberneck reagent-desc-rubberneck = A popular drink amongst those adhering to an all synthetic diet. -reagent-name-zombiecocktail = zombie -reagent-desc-zombiecocktail = It gets in your head. Your he-eyeh-ead. \ No newline at end of file +reagent-name-zombiecocktail = Zombie +reagent-desc-zombiecocktail = It gets in your head. Your he-eyeh-ead. diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl index 80a7dd7ac4a2..c6964b55bc43 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl @@ -34,7 +34,7 @@ reagent-desc-iced-tea = No relation to a certain rap artist/actor. reagent-name-lemonade = lemonade reagent-desc-lemonade = Drink using lemon juice, water, and a sweetener such as cane sugar or honey. -reagent-name-arnold-palmer = arnold palmer +reagent-name-arnold-palmer = Arnold Palmer reagent-desc-arnold-palmer = Now watch this drive. reagent-name-milk = milk @@ -91,11 +91,5 @@ reagent-desc-pilk = A sickening mixture of milk and cola. reagent-name-posca = posca reagent-desc-posca = Poor warriors' drink from a forgotten era. -reagent-name-the-martinez = The Martinez -reagent-desc-the-martinez = The edgerunner legend. Remembered by a drink, forgotten by a drunk. - -reagent-name-white-gilgamesh = white gilgamesh -reagent-desc-white-gilgamesh = A sickening mixture of milk and beer. Makes you feel like you're made of wood. - reagent-name-mopwata = mopwata reagent-desc-mopwata = Dirty, stagnant mop water. diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/soda.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/soda.ftl index 4f4bdd1f5fe0..c0fac6089b2e 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/drink/soda.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/soda.ftl @@ -1,16 +1,16 @@ -reagent-name-cola = cola -reagent-desc-cola = A sweet, carbonated soft drink. Caffeine free. +reagent-name-cola = Space Cola +reagent-desc-cola = A sweet, carbonated soft drink. -reagent-name-shirley-temple = shirley temple +reagent-name-shirley-temple = Shirley Temple reagent-desc-shirley-temple = A favorite amongst younger members of the crew. -reagent-name-changeling-sting = changeling sting +reagent-name-changeling-sting = Changeling Sting reagent-desc-changeling-sting = You take a tiny sip and feel a burning sensation... reagent-name-dr-gibb = Dr. Gibb reagent-desc-dr-gibb = A delicious blend of 42 different flavours. -reagent-name-energy-drink = Energy Drink +reagent-name-energy-drink = Red Bool reagent-desc-energy-drink = A dose of energy! Nanotrasen is not responsible if you grow avian appendages. reagent-name-grape-soda = grape soda @@ -19,34 +19,34 @@ reagent-desc-grape-soda = It's Graaaaaape! reagent-name-ice-cream = ice cream reagent-desc-ice-cream = It was either this or the microwave, and nobody wants ice cream soup! -reagent-name-lemon-lime = lemon-lime -reagent-desc-lemon-lime = tangy lime and lemon soda +reagent-name-lemon-lime = Smite +reagent-desc-lemon-lime = Tangy lime and lemon soda. -reagent-name-lemon-lime-cranberry = lemon-lime-cranberry +reagent-name-lemon-lime-cranberry = Smite Cranberry reagent-desc-lemon-lime-cranberry = Tart cranberry, Christmas, and a hint of lemon and lime. -reagent-name-pwr-game = Pwr Game +reagent-name-pwr-game = PWR Game reagent-desc-pwr-game = The only drink with the PWR that true gamers crave. When a gamer talks about gamerfuel, this is what they're literally referring to. reagent-name-root-beer = root beer -reagent-desc-root-beer = A very sweet, carbonated drink reminiscent of sarsparilla. Goes well with ice cream. +reagent-desc-root-beer = A very sweet, carbonated drink reminiscent of sarsaparilla. Goes well with ice cream. reagent-name-root-beer-float = root beer float reagent-desc-root-beer-float = Root beer, but now with ice cream on top. It truly is the magnum opus of Canadian summertime drinks. -reagent-name-sol-dry = sol dry +reagent-name-sol-dry = Sol Dry reagent-desc-sol-dry = Sweet ginger soda from outer space! -reagent-name-roy-rogers = roy rogers +reagent-name-roy-rogers = Roy Rogers reagent-desc-roy-rogers = Solid proof that there IS something known as too sweet. -reagent-name-space-mountain-wind = Space Mountain Wind -reagent-desc-space-mountain-wind = Blows right through you like a space wind. +reagent-name-space-mountain-wind = Space Solar Wind +reagent-desc-space-mountain-wind = Blows right through you like a solar wind. reagent-name-space-up = Space-Up reagent-desc-space-up = Tastes like a hull breach in your mouth. -reagent-name-starkist = starkist +reagent-name-starkist = Starkist reagent-desc-starkist = A sweet, orange flavored soft drink. reagent-name-fourteen-loko = Fourteen Loko diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml index 3f7a35e6f1d9..ea5d4cdb89d4 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml @@ -24,13 +24,16 @@ - DrinkMelonLiquorBottleFull - DrinkPatronBottleFull - DrinkRumBottleFull + - DrinkSakeBottleFull - DrinkTequilaBottleFull - DrinkVermouthBottleFull - DrinkVodkaBottleFull - DrinkWhiskeyBottleFull - DrinkWineBottleFull - DrinkBeerBottleFull + - DrinkBeerGrowler - DrinkAleBottleFull + - DrinkAleBottleFullGrowler - DrinkChampagneBottleFull chance: 0.8 offset: 0.0 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index 7a6361fa258a..4b151e2ea412 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -2000,7 +2000,7 @@ - type: entity parent: DrinkGlass id: DrinkTheMartinez - suffix: The Martinez + suffix: the martinez components: - type: SolutionContainerManager solutions: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml index 86309124516f..70236ecc525d 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml @@ -137,6 +137,8 @@ reagents: - ReagentId: Absinthe Quantity: 100 + - type: Label + currentLabel: reagent-name-absinthe - type: Sprite sprite: Objects/Consumable/Drinks/absinthebottle.rsi - type: Sealable @@ -144,7 +146,7 @@ - type: entity parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull] id: DrinkBlueCuracaoBottleFull - name: Miss Blue Curacao + name: Miss Blue Curaçao description: A fruity, exceptionally azure drink. Does not allow the imbiber to use the fifth magic. components: - type: SolutionContainerManager @@ -153,6 +155,8 @@ reagents: - ReagentId: BlueCuracao Quantity: 100 + - type: Label + currentLabel: reagent-name-blue-curacao - type: Sprite sprite: Objects/Consumable/Drinks/alco-bottle.rsi layers: @@ -177,6 +181,8 @@ reagents: - ReagentId: Nothing Quantity: 100 + - type: Label + currentLabel: reagent-name-nothing - type: Sprite sprite: Objects/Consumable/Drinks/bottleofnothing.rsi - type: Sealable @@ -193,6 +199,8 @@ reagents: - ReagentId: Champagne Quantity: 100 + - type: Label + currentLabel: reagent-name-champagne - type: Sprite sprite: Objects/Consumable/Drinks/champagnebottle.rsi - type: Openable @@ -202,7 +210,7 @@ parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull] id: DrinkCognacBottleFull name: cognac bottle - description: A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. You might as well not scream 'SHITCURITY' this time. + description: A sweet and strongly alcoholic drink, made after numerous distillations and years of maturing. You might as well not scream 'SHITCURITY' this time. components: - type: SolutionContainerManager solutions: @@ -219,8 +227,8 @@ - type: entity parent: [DrinkBottleVisualsAll, DrinkBottlePlasticBaseFull] id: DrinkColaBottleFull - name: space cola bottle - description: Cola. In space. + name: Space Cola bottle + description: Cola. In spaaace! components: - type: SolutionContainerManager solutions: @@ -237,7 +245,7 @@ - type: entity parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull] id: DrinkGrenadineBottleFull - name: briar rose grenadine syrup bottle + name: Briar Rose grenadine syrup bottle description: Sweet and tangy, a bar syrup used to add color or flavor to drinks. components: - type: SolutionContainerManager @@ -246,6 +254,8 @@ reagents: - ReagentId: Grenadine Quantity: 100 + - type: Label + currentLabel: reagent-name-grenadine # intended use is to spike drinks so starts open - type: Openable opened: true @@ -275,7 +285,7 @@ - type: entity parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull] id: DrinkGildlagerBottleFull - name: gildlager bottle + name: Gildlager bottle description: 100 proof cinnamon schnapps, made for alcoholic teen girls on spring break. components: - type: SolutionContainerManager @@ -284,6 +294,8 @@ reagents: - ReagentId: Gildlager Quantity: 100 + - type: Label + currentLabel: reagent-name-gildlager - type: Sprite sprite: Objects/Consumable/Drinks/gildlagerbottle.rsi - type: Sealable @@ -309,8 +321,8 @@ - type: entity parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull] id: DrinkMelonLiquorBottleFull - name: emeraldine melon liquor - description: A bottle of 46 proof Emeraldine Melon Liquor. Sweet and light. + name: Emeraldine melon liquor + description: A bottle of 46 proof Emeraldine melon liquor. Sweet and light. components: - type: SolutionContainerManager solutions: @@ -318,6 +330,8 @@ reagents: - ReagentId: MelonLiquor Quantity: 100 + - type: Label + currentLabel: reagent-name-melon-liquor - type: Sprite sprite: Objects/Consumable/Drinks/alco-bottle.rsi layers: @@ -333,8 +347,8 @@ - type: entity parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull] id: DrinkPatronBottleFull - name: wrapp artiste patron bottle - description: Silver laced tequilla, served in space night clubs across the galaxy. + name: Wrapp Artiste Patrón bottle + description: Silver laced tequila, served in space night clubs across the galaxy. components: - type: SolutionContainerManager solutions: @@ -342,13 +356,15 @@ reagents: - ReagentId: Patron Quantity: 100 + - type: Label + currentLabel: reagent-name-patron - type: Sprite sprite: Objects/Consumable/Drinks/patronbottle.rsi - type: entity parent: [DrinkBottleVisualsOpenable, DrinkBottleGlassBaseFull] id: DrinkPoisonWinebottleFull - name: warlock's velvet bottle + name: Warlock's Velvet bottle description: What a delightful packaging for a surely high quality wine! The vintage must be amazing! components: - type: SolutionContainerManager @@ -368,7 +384,7 @@ - type: entity parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull] id: DrinkRumBottleFull - name: captain pete's Cuban spiced rum + name: Captain Pete's Cuban spiced rum description: This isn't just rum, oh no. It's practically GRIFF in a bottle. components: - type: SolutionContainerManager @@ -386,8 +402,8 @@ - type: entity parent: [DrinkBottleVisualsAll, DrinkBottlePlasticBaseFull] id: DrinkSpaceMountainWindBottleFull - name: space mountain wind bottle - description: Blows right through you like a space wind. + name: Space Solar Wind bottle + description: Blows right through you like a solar wind. components: - type: SolutionContainerManager solutions: @@ -405,7 +421,7 @@ - type: entity parent: [DrinkBottleVisualsAll, DrinkBottlePlasticBaseFull] id: DrinkSpaceUpBottleFull - name: space-up bottle + name: Space-Up bottle description: Tastes like a hull breach in your mouth. components: - type: SolutionContainerManager @@ -424,7 +440,7 @@ - type: entity parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull] id: DrinkTequilaBottleFull - name: caccavo guaranteed quality tequila bottle + name: Caccavo Guaranteed Quality tequila bottle description: Made from premium petroleum distillates, pure thalidomide and other fine quality ingredients! components: - type: SolutionContainerManager @@ -442,7 +458,7 @@ - type: entity parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull] id: DrinkVermouthBottleFull - name: goldeneye vermouth bottle + name: Goldeneye vermouth bottle description: Sweet, sweet dryness! components: - type: SolutionContainerManager @@ -478,7 +494,7 @@ - type: entity parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull] id: DrinkWhiskeyBottleFull - name: uncle git's special reserve + name: Uncle Git's Special Reserve description: A premium single-malt whiskey, gently matured inside the tunnels of a nuclear shelter. TUNNEL WHISKEY RULES. components: - type: SolutionContainerManager @@ -496,7 +512,7 @@ - type: entity parent: [DrinkBottleVisualsOpenable, DrinkBottleGlassBaseFull] id: DrinkWineBottleFull - name: doublebearded bearded special wine bottle + name: Doublebearded Bearded Special wine bottle description: A faint aura of unease and asspainery surrounds the bottle. components: - type: SolutionContainerManager @@ -520,7 +536,7 @@ - type: entity parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull] id: DrinkBeerBottleFull - name: beer # beer it is. coffee. beer? coff-ee? be-er? c-o... b-e + name: beer bottle # beer it is. coffee. beer? coff-ee? be-er? c-o... b-e description: An alcoholic beverage made from malted grains, hops, yeast, and water. components: - type: Item @@ -532,6 +548,8 @@ reagents: - ReagentId: Beer Quantity: 50 + - type: Label + currentLabel: reagent-name-beer - type: Sprite sprite: Objects/Consumable/Drinks/beer.rsi - type: Openable @@ -544,7 +562,7 @@ - type: entity parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull] id: DrinkBeerGrowler # Needs to be renamed DrinkBeerBottleFull - name: Beer Growler # beer it is. coffee. beer? coff-ee? be-er? c-o... b-e + name: beer growler # beer it is. coffee. beer? coff-ee? be-er? c-o... b-e description: An alcoholic beverage made from malted grains, hops, yeast, and water. XL growler bottle. components: - type: SolutionContainerManager @@ -568,7 +586,7 @@ - type: entity parent: [DrinkBottleVisualsAll, DrinkBottlePlasticBaseFull] id: DrinkAleBottleFull - name: Magm-Ale + name: Magm-Ale bottle description: A true dorf's drink of choice. components: - type: Item @@ -580,6 +598,8 @@ reagents: - ReagentId: Ale Quantity: 50 + - type: Label + currentLabel: reagent-name-ale - type: Sprite sprite: Objects/Consumable/Drinks/alebottle.rsi - type: Openable @@ -588,7 +608,7 @@ - type: entity parent: [DrinkBottleVisualsAll, DrinkBottlePlasticBaseFull] id: DrinkAleBottleFullGrowler - name: Magm-Ale Growler + name: Magm-Ale growler description: A true dorf's drink of choice. XL growler bottle. components: - type: SolutionContainerManager @@ -620,6 +640,8 @@ reagents: - ReagentId: Water Quantity: 30 + - type: Label + currentLabel: reagent-name-water - type: Drink - type: Sprite sprite: Objects/Consumable/Drinks/waterbottle.rsi @@ -763,11 +785,13 @@ - ReagentId: Sugar Quantity: 300 - type: Drink + - type: Label + currentLabel: reagent-name-sugar - type: entity parent: DrinkBottlePlasticBaseFull id: DrinkLemonLimeJug - name: lemon lime jug + name: Smite jug description: A dual citrus sensation. components: - type: SolutionContainerManager @@ -887,7 +911,7 @@ parent: DrinkBottlePlasticBaseFull id: DrinkIcedTeaJug name: iced tea jug - description: For when the regular tea is too hot for you boohoo. + description: For when the regular tea is too hot for you. Boohoo. components: - type: SolutionContainerManager solutions: @@ -903,8 +927,8 @@ - type: entity parent: DrinkBottlePlasticBaseFull id: DrinkDrGibbJug - name: dr gibb. jug - description: Yeah I don't know either... + name: Dr. Gibb jug + description: 42 different flavours... in a jug! components: - type: SolutionContainerManager solutions: @@ -954,8 +978,8 @@ - type: entity parent: DrinkBottlePlasticBaseFull id: DrinkEnergyDrinkJug - name: red bool jug - description: A jug of Red Bool, with enough caffine to kill a whole station. + name: Red Bool jug + description: A jug of Red Bool, with enough caffeine to kill a whole station. components: - type: SolutionContainerManager solutions: @@ -966,7 +990,7 @@ Quantity: 100 - type: Drink - type: Label - currentLabel: red bool + currentLabel: reagent-name-energy-drink - type: entity parent: DrinkBottlePlasticBaseFull diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml index 59fc1a83a542..c1a6adbb6870 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml @@ -71,8 +71,8 @@ - type: entity parent: DrinkCanBaseFull id: DrinkColaCan - name: space cola - description: A refreshing beverage. + name: Space Cola can + description: A sweet, carbonated soft drink. components: - type: SolutionContainerManager solutions: @@ -262,8 +262,8 @@ - type: entity parent: DrinkCanBaseFull id: DrinkSpaceMountainWindCan - name: space mountain wind can - description: Blows right through you like a space wind. + name: Space Solar Wind can + description: Blows right through you like a solar wind. components: - type: SolutionContainerManager solutions: @@ -280,7 +280,7 @@ - type: entity parent: DrinkCanBaseFull id: DrinkSpaceUpCan - name: space-up can + name: Space-Up can description: Tastes like a hull breach in your mouth. components: - type: SolutionContainerManager @@ -298,7 +298,7 @@ - type: entity parent: DrinkCanBaseFull id: DrinkSolDryCan - name: sol dry + name: Sol Dry can description: Sweet ginger soda from outer space! components: - type: SolutionContainerManager @@ -316,7 +316,7 @@ - type: entity parent: DrinkCanBaseFull id: DrinkStarkistCan - name: starkist can + name: Starkist can description: The taste of a star in liquid form. And, a bit of tuna...? components: - type: SolutionContainerManager @@ -369,7 +369,7 @@ - type: entity parent: DrinkCanBaseFull id: DrinkChangelingStingCan - name: changeling sting can + name: Changeling Sting can description: You take a tiny sip and feel a burning sensation... components: - type: SolutionContainerManager @@ -407,7 +407,7 @@ - type: entity parent: DrinkCanBaseFull id: DrinkNukieCan - name: blood-red brew can + name: Blood-red Brew can description: A home-brewed drink made from the crazed minds at the Syndicate. Not recommended by doctors. components: - type: SolutionContainerManager @@ -433,7 +433,7 @@ - type: entity parent: DrinkCanBaseFull id: DrinkEnergyDrinkCan - name: red bool energy drink + name: Red Bool can description: A can of Red Bool, with enough caffeine to kill a horse. components: - type: SolutionContainerManager @@ -505,7 +505,7 @@ - type: entity parent: DrinkCanBaseFull id: DrinkShamblersJuiceCan - name: shamblers juice can + name: Shambler's Juice can description: ~Shake me up some of that Shambler's Juice!~ components: - type: SolutionContainerManager @@ -524,7 +524,7 @@ - type: entity parent: DrinkCanBaseFull id: DrinkPwrGameCan - name: pwr game can + name: PWR Game can description: The only drink with the PWR that true gamers crave. When a gamer talks about gamerfuel, this is what they're literally referring to. components: - type: SolutionContainerManager From fb79cc9d5aa3b84e3d3f413fdaf3b01613ff3fab Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 9 Jan 2025 20:25:38 +0000 Subject: [PATCH 051/205] Automatic changelog update --- Resources/Changelog/Changelog.yml | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index dc9149476504..8be47ffa5c4d 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: drakewill-CRL - changes: - - message: Botanists can now learn basic chemistry with the Agrichem Is Fun! kit - in the Nutrimax vendor. - type: Add - id: 7290 - time: '2024-09-05T16:43:00.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/31738 - author: Nimfar11 changes: - message: Added a board for the AI upload console. @@ -3932,3 +3924,18 @@ id: 7789 time: '2025-01-09T11:23:37.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/34326 +- author: Alpaccalypse + changes: + - message: The reagent "cola" has been renamed to "Space Cola". + type: Tweak + - message: The reagent "lemon-lime" has been renamed to "Smite Soda". + type: Tweak + - message: The reagent "lemon-lime-cranberry" has been renamed to "Smite Cranberry". + type: Tweak + - message: The reagent "Space Mountain Wind" has been renamed to "Space Solar Wind". + type: Tweak + - message: The reagent "Energy Drink" has been renamed to "Red Bool". + type: Tweak + id: 7790 + time: '2025-01-09T20:24:31.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/34178 From dc2fc5441aeda22651e4ad48272de9995da42953 Mon Sep 17 00:00:00 2001 From: ScarKy0 <106310278+ScarKy0@users.noreply.github.com> Date: Fri, 10 Jan 2025 01:22:28 +0100 Subject: [PATCH 052/205] Fix access configurator debug assert (#34330) * fix * greytide fix * fix admin log * Dirty --- .../Access/Systems/AccessOverriderSystem.cs | 14 +++++++------- .../StationEvents/Events/GreytideVirusRule.cs | 4 ++-- .../Access/Systems/AccessReaderSystem.cs | 16 ++++++++-------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Content.Server/Access/Systems/AccessOverriderSystem.cs b/Content.Server/Access/Systems/AccessOverriderSystem.cs index c7b20513f428..a882209b2d17 100644 --- a/Content.Server/Access/Systems/AccessOverriderSystem.cs +++ b/Content.Server/Access/Systems/AccessOverriderSystem.cs @@ -116,10 +116,10 @@ private void UpdateUserInterface(EntityUid uid, AccessOverriderComponent compone targetLabel = Loc.GetString("access-overrider-window-target-label") + " " + EntityManager.GetComponent(component.TargetAccessReaderId).EntityName; targetLabelColor = Color.White; - if (!_accessReader.GetMainAccessReader(accessReader, out var accessReaderComponent)) + if (!_accessReader.GetMainAccessReader(accessReader, out var accessReaderEnt)) return; - var currentAccessHashsets = accessReaderComponent.AccessLists; + var currentAccessHashsets = accessReaderEnt.Value.Comp.AccessLists; currentAccess = ConvertAccessHashSetsToList(currentAccessHashsets).ToArray(); } @@ -210,10 +210,10 @@ private void TryWriteToTargetAccessReaderId(EntityUid uid, return; } - if (!_accessReader.GetMainAccessReader(component.TargetAccessReaderId, out var accessReader)) + if (!_accessReader.GetMainAccessReader(component.TargetAccessReaderId, out var accessReaderEnt)) return; - var oldTags = ConvertAccessHashSetsToList(accessReader.AccessLists); + var oldTags = ConvertAccessHashSetsToList(accessReaderEnt.Value.Comp.AccessLists); var privilegedId = component.PrivilegedIdSlot.Item; if (oldTags.SequenceEqual(newAccessList)) @@ -242,10 +242,10 @@ private void TryWriteToTargetAccessReaderId(EntityUid uid, var removedTags = oldTags.Except(newAccessList).Select(tag => "-" + tag).ToList(); _adminLogger.Add(LogType.Action, LogImpact.Medium, - $"{ToPrettyString(player):player} has modified {ToPrettyString(component.TargetAccessReaderId):entity} with the following allowed access level holders: [{string.Join(", ", addedTags.Union(removedTags))}] [{string.Join(", ", newAccessList)}]"); + $"{ToPrettyString(player):player} has modified {ToPrettyString(accessReaderEnt.Value):entity} with the following allowed access level holders: [{string.Join(", ", addedTags.Union(removedTags))}] [{string.Join(", ", newAccessList)}]"); - accessReader.AccessLists = ConvertAccessListToHashSet(newAccessList); - Dirty(component.TargetAccessReaderId, accessReader); + accessReaderEnt.Value.Comp.AccessLists = ConvertAccessListToHashSet(newAccessList); + Dirty(accessReaderEnt.Value); } /// diff --git a/Content.Server/StationEvents/Events/GreytideVirusRule.cs b/Content.Server/StationEvents/Events/GreytideVirusRule.cs index 0395f7999d44..ef63248c84bb 100644 --- a/Content.Server/StationEvents/Events/GreytideVirusRule.cs +++ b/Content.Server/StationEvents/Events/GreytideVirusRule.cs @@ -94,11 +94,11 @@ protected override void Started(EntityUid uid, GreytideVirusRuleComponent virusC continue; // use the access reader from the door electronics if they exist - if (!_access.GetMainAccessReader(airlockUid, out var accessComp)) + if (!_access.GetMainAccessReader(airlockUid, out var accessEnt)) continue; // check access - if (!_access.AreAccessTagsAllowed(accessIds, accessComp) || _access.AreAccessTagsAllowed(virusComp.Blacklist, accessComp)) + if (!_access.AreAccessTagsAllowed(accessIds, accessEnt.Value.Comp) || _access.AreAccessTagsAllowed(virusComp.Blacklist, accessEnt.Value.Comp)) continue; // open and bolt airlocks diff --git a/Content.Shared/Access/Systems/AccessReaderSystem.cs b/Content.Shared/Access/Systems/AccessReaderSystem.cs index f670ac860be4..0b1d508cc241 100644 --- a/Content.Shared/Access/Systems/AccessReaderSystem.cs +++ b/Content.Shared/Access/Systems/AccessReaderSystem.cs @@ -113,25 +113,25 @@ public bool IsAllowed(EntityUid user, EntityUid target, AccessReaderComponent? r return false; } - public bool GetMainAccessReader(EntityUid uid, [NotNullWhen(true)] out AccessReaderComponent? component) + public bool GetMainAccessReader(EntityUid uid, [NotNullWhen(true)] out Entity? ent) { - component = null; - if (!TryComp(uid, out AccessReaderComponent? accessReader)) + ent = null; + if (!TryComp(uid, out var accessReader)) return false; - component = accessReader; + ent = (uid, accessReader); - if (component.ContainerAccessProvider == null) + if (ent.Value.Comp.ContainerAccessProvider == null) return true; - if (!_containerSystem.TryGetContainer(uid, component.ContainerAccessProvider, out var container)) + if (!_containerSystem.TryGetContainer(uid, ent.Value.Comp.ContainerAccessProvider, out var container)) return true; foreach (var entity in container.ContainedEntities) { - if (TryComp(entity, out AccessReaderComponent? containedReader)) + if (TryComp(entity, out var containedReader)) { - component = containedReader; + ent = (entity, containedReader); return true; } } From 5080dff179ef645e5e3bb505e7bae591a7e69ba2 Mon Sep 17 00:00:00 2001 From: Alpaccalypse <21291379+Alpaccalypse@users.noreply.github.com> Date: Fri, 10 Jan 2025 00:28:03 +0000 Subject: [PATCH 053/205] Renamed water melon juice to watermelon juice (#34341) --- Resources/Locale/en-US/reagents/meta/consumable/drink/juice.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/juice.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/juice.ftl index b9fd54bc1373..7c2b729d3152 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/drink/juice.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/juice.ftl @@ -40,7 +40,7 @@ reagent-desc-juice-potato = Juice of the potato. Bleh. reagent-name-juice-tomato = tomato juice reagent-desc-juice-tomato = Tomatoes made into juice. What a waste of good tomatoes, huh? -reagent-name-juice-watermelon = water melon juice +reagent-name-juice-watermelon = watermelon juice reagent-desc-juice-watermelon = The delicious juice of a watermelon. reagent-name-juice-cherry = cherry juice From 8544328a5b67d66927ddc0b2ca8a512f4c9da057 Mon Sep 17 00:00:00 2001 From: Errant <35878406+Errant-4@users.noreply.github.com> Date: Fri, 10 Jan 2025 07:54:55 +0100 Subject: [PATCH 054/205] Fix battery charging stopping just short of being full (#34028) --- .../Light/EntitySystems/EmergencyLightSystem.cs | 2 +- Content.Server/Ninja/Systems/BatteryDrainerSystem.cs | 2 +- Content.Server/Power/Components/BatteryComponent.cs | 6 ------ Content.Server/Power/EntitySystems/BatterySystem.cs | 8 ++++---- Content.Server/Power/EntitySystems/ChargerSystem.cs | 10 ++-------- 5 files changed, 8 insertions(+), 20 deletions(-) diff --git a/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs b/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs index 6bd5750460a5..1b7b6146659a 100644 --- a/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs +++ b/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs @@ -153,7 +153,7 @@ private void Update(Entity entity, BatteryComponent bat else { _battery.SetCharge(entity.Owner, battery.CurrentCharge + entity.Comp.ChargingWattage * frameTime * entity.Comp.ChargingEfficiency, battery); - if (battery.IsFullyCharged) + if (_battery.IsFull(entity, battery)) { if (TryComp(entity.Owner, out var receiver)) { diff --git a/Content.Server/Ninja/Systems/BatteryDrainerSystem.cs b/Content.Server/Ninja/Systems/BatteryDrainerSystem.cs index 4baf0913cecd..8e707cf3fcb7 100644 --- a/Content.Server/Ninja/Systems/BatteryDrainerSystem.cs +++ b/Content.Server/Ninja/Systems/BatteryDrainerSystem.cs @@ -106,6 +106,6 @@ protected override bool TryDrainPower(Entity ent, Entit _popup.PopupEntity(Loc.GetString("battery-drainer-success", ("battery", target)), uid, uid); // repeat the doafter until battery is full - return !battery.IsFullyCharged; + return !_battery.IsFull(ent, battery); } } diff --git a/Content.Server/Power/Components/BatteryComponent.cs b/Content.Server/Power/Components/BatteryComponent.cs index 113106ed1857..4ef889133392 100644 --- a/Content.Server/Power/Components/BatteryComponent.cs +++ b/Content.Server/Power/Components/BatteryComponent.cs @@ -24,12 +24,6 @@ public partial class BatteryComponent : Component [DataField("startingCharge")] public float CurrentCharge; - /// - /// True if the battery is fully charged. - /// - [ViewVariables] - public bool IsFullyCharged => MathHelper.CloseToPercent(CurrentCharge, MaxCharge); - /// /// The price per one joule. Default is 1 credit for 10kJ. /// diff --git a/Content.Server/Power/EntitySystems/BatterySystem.cs b/Content.Server/Power/EntitySystems/BatterySystem.cs index eac31ecef789..6e636622e68e 100644 --- a/Content.Server/Power/EntitySystems/BatterySystem.cs +++ b/Content.Server/Power/EntitySystems/BatterySystem.cs @@ -87,8 +87,8 @@ public override void Update(float frameTime) var query = EntityQueryEnumerator(); while (query.MoveNext(out var uid, out var comp, out var batt)) { - if (!comp.AutoRecharge) continue; - if (batt.IsFullyCharged) continue; + if (!comp.AutoRecharge || IsFull(uid, batt)) + continue; if (comp.AutoRechargePause) { @@ -212,14 +212,14 @@ public bool TryUseCharge(EntityUid uid, float value, BatteryComponent? battery = } /// - /// Returns whether the battery is at least 99% charged, basically full. + /// Returns whether the battery is full. /// public bool IsFull(EntityUid uid, BatteryComponent? battery = null) { if (!Resolve(uid, ref battery)) return false; - return battery.CurrentCharge / battery.MaxCharge >= 0.99f; + return battery.CurrentCharge >= battery.MaxCharge; } } } diff --git a/Content.Server/Power/EntitySystems/ChargerSystem.cs b/Content.Server/Power/EntitySystems/ChargerSystem.cs index 5afce8076f3d..09b598d262b6 100644 --- a/Content.Server/Power/EntitySystems/ChargerSystem.cs +++ b/Content.Server/Power/EntitySystems/ChargerSystem.cs @@ -223,10 +223,10 @@ private CellChargerStatus GetStatus(EntityUid uid, ChargerComponent component) if (container.ContainedEntities.Count == 0) return CellChargerStatus.Empty; - if (!SearchForBattery(container.ContainedEntities[0], out _, out var heldBattery)) + if (!SearchForBattery(container.ContainedEntities[0], out var heldEnt, out var heldBattery)) return CellChargerStatus.Off; - if (Math.Abs(heldBattery.MaxCharge - heldBattery.CurrentCharge) < 0.01) + if (_battery.IsFull(heldEnt.Value, heldBattery)) return CellChargerStatus.Charged; return CellChargerStatus.Charging; @@ -247,12 +247,6 @@ private void TransferPower(EntityUid uid, EntityUid targetEntity, ChargerCompone return; _battery.SetCharge(batteryUid.Value, heldBattery.CurrentCharge + component.ChargeRate * frameTime, heldBattery); - // Just so the sprite won't be set to 99.99999% visibility - if (heldBattery.MaxCharge - heldBattery.CurrentCharge < 0.01) - { - _battery.SetCharge(batteryUid.Value, heldBattery.MaxCharge, heldBattery); - } - UpdateStatus(uid, component); } From 20415a68947959bf8e050c54ff43221965860268 Mon Sep 17 00:00:00 2001 From: Southbridge <7013162+southbridge-fur@users.noreply.github.com> Date: Fri, 10 Jan 2025 01:55:05 -0500 Subject: [PATCH 055/205] Add copy threshold button to air alarms (#34346) --- .../Atmos/Monitor/UI/AirAlarmWindow.xaml.cs | 9 ++++--- .../Monitor/UI/Widgets/PumpControl.xaml.cs | 8 +++--- .../UI/Widgets/ScrubberControl.xaml.cs | 8 +++--- .../Atmos/Monitor/UI/Widgets/SensorInfo.xaml | 3 +++ .../Monitor/UI/Widgets/SensorInfo.xaml.cs | 13 +++++++--- .../Atmos/Monitor/Systems/AirAlarmSystem.cs | 20 ++++++++++++++ .../Monitor/Systems/AtmosMonitoringSystem.cs | 26 +++++++++++++++++-- Resources/Locale/en-US/atmos/air-alarm-ui.ftl | 2 ++ 8 files changed, 72 insertions(+), 17 deletions(-) diff --git a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs index 651649838653..f0201dc81ba5 100644 --- a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs +++ b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs @@ -130,8 +130,8 @@ public void UpdateDeviceData(string addr, IAtmosDeviceData device) if (!_pumps.TryGetValue(addr, out var pumpControl)) { var control= new PumpControl(pump, addr); - control.PumpDataChanged += AtmosDeviceDataChanged!.Invoke; - control.PumpDataCopied += AtmosDeviceDataCopied!.Invoke; + control.PumpDataChanged += AtmosDeviceDataChanged; + control.PumpDataCopied += AtmosDeviceDataCopied; _pumps.Add(addr, control); CVentContainer.AddChild(control); } @@ -145,8 +145,8 @@ public void UpdateDeviceData(string addr, IAtmosDeviceData device) if (!_scrubbers.TryGetValue(addr, out var scrubberControl)) { var control = new ScrubberControl(scrubber, addr); - control.ScrubberDataChanged += AtmosDeviceDataChanged!.Invoke; - control.ScrubberDataCopied += AtmosDeviceDataCopied!.Invoke; + control.ScrubberDataChanged += AtmosDeviceDataChanged; + control.ScrubberDataCopied += AtmosDeviceDataCopied; _scrubbers.Add(addr, control); CScrubberContainer.AddChild(control); } @@ -161,6 +161,7 @@ public void UpdateDeviceData(string addr, IAtmosDeviceData device) { var control = new SensorInfo(sensor, addr); control.OnThresholdUpdate += AtmosAlarmThresholdChanged; + control.SensorDataCopied += AtmosDeviceDataCopied; _sensors.Add(addr, control); CSensorContainer.AddChild(control); } diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/PumpControl.xaml.cs b/Content.Client/Atmos/Monitor/UI/Widgets/PumpControl.xaml.cs index 2cd51d6fc7f5..8502cd2712b3 100644 --- a/Content.Client/Atmos/Monitor/UI/Widgets/PumpControl.xaml.cs +++ b/Content.Client/Atmos/Monitor/UI/Widgets/PumpControl.xaml.cs @@ -83,10 +83,10 @@ public PumpControl(GasVentPumpData data, string address) PumpDataChanged?.Invoke(_address, _data); }; - _copySettings.OnPressed += _ => - { - PumpDataCopied?.Invoke(_data); - }; + _copySettings.OnPressed += _ => + { + PumpDataCopied?.Invoke(_data); + }; } public void ChangeData(GasVentPumpData data) diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml.cs b/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml.cs index c16ff688c93e..d03ac77ab310 100644 --- a/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml.cs +++ b/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml.cs @@ -72,10 +72,10 @@ public ScrubberControl(GasVentScrubberData data, string address) ScrubberDataChanged?.Invoke(_address, _data); }; - _copySettings.OnPressed += _ => - { - ScrubberDataCopied?.Invoke(_data); - }; + _copySettings.OnPressed += _ => + { + ScrubberDataCopied?.Invoke(_data); + }; foreach (var value in Enum.GetValues()) { diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml b/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml index 005e6807b37d..c50dadc9c7d1 100644 --- a/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml +++ b/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml @@ -3,6 +3,9 @@ + + /// Number of semitones to shift, positive or negative. Clamped between -12 and 12 /// which correspond to a pitch multiplier of 0.5 and 2.0 respectively. - public static AudioParams ShiftSemitone(int shift) + public static AudioParams ShiftSemitone(AudioParams @params, int shift) { shift = MathHelper.Clamp(shift, -12, 12); float pitchMult = SemitoneMultipliers[shift + 12]; - return AudioParams.Default.WithPitchScale(pitchMult); + return @params.WithPitchScale(pitchMult); } /// /// Returns a pitch multiplier shifted by a random number of semitones within variation. /// /// Max number of semitones to shift in either direction. Values above 12 have no effect. - public static AudioParams WithSemitoneVariation(int variation, IRobustRandom? rand) + public static AudioParams WithSemitoneVariation(AudioParams @params, int variation, IRobustRandom rand) { IoCManager.Resolve(ref rand); variation = Math.Clamp(variation, 0, 12); - return ShiftSemitone(rand.Next(-variation, variation)); + return ShiftSemitone(@params, rand.Next(-variation, variation)); } } } From 3b3b7b2e2651691402ecd432ceff748644758607 Mon Sep 17 00:00:00 2001 From: Coolsurf6 Date: Sat, 11 Jan 2025 01:00:59 +1000 Subject: [PATCH 058/205] Fixed Forensic Gloves to be Security Contraband (#34193) * added BaseRestrictedContraband to forensic gloves * moved from id to parent --- Resources/Prototypes/Entities/Clothing/Hands/gloves.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml index cb4f8689b331..4b8646ac9cd7 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml @@ -415,7 +415,7 @@ price: 0 - type: entity - parent: ClothingHandsBase + parent: [ClothingHandsBase, BaseRestrictedContraband] id: ClothingHandsGlovesForensic name: forensic gloves description: Do not leave fibers or fingerprints. If you work without them, you're A TERRIBLE DETECTIVE. From e34fd3e85d64446c4ac7953fd2f58db7d9e2ae96 Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 10 Jan 2025 15:02:11 +0000 Subject: [PATCH 059/205] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 1bcf896cb840..0ef79a521535 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Ekkosangen - changes: - - message: Pizza crates and parties can now sometimes contain cotton pizza - type: Tweak - id: 7293 - time: '2024-09-06T06:04:28.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/31883 - author: TheShuEd, Jaraten changes: - message: New Tech anomaly added to the game! it can bind devices ports, activate @@ -3940,3 +3933,10 @@ id: 7792 time: '2025-01-10T06:55:05.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/34346 +- author: Coolsurf6 + changes: + - message: Made Forensic Gloves security contraband. + type: Tweak + id: 7793 + time: '2025-01-10T15:01:00.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/34193 From 7a2da8a043332408ba8d837c45ff44cbcb7b6a4a Mon Sep 17 00:00:00 2001 From: TeenSarlacc <46608342+TeenSarlacc@users.noreply.github.com> Date: Fri, 10 Jan 2025 10:13:23 -0500 Subject: [PATCH 060/205] add large instruments to the cargo request computer (#34240) * added the church organ to the cargo console (will add more in this PR, assuming i did this right (HOW DO YOU BUY CARGO ORDERS IN DEV ENVIROMENT???? *sobs)) * added other structure instruments to cargo Catalog * fixed an epic copy/paste fail * changed prices * fixed epic copy/paste fail #2 --------- Co-authored-by: TeenSarlacc --- .../Prototypes/Catalog/Cargo/cargo_fun.yml | 120 ++++++++++++++++++ 1 file changed, 120 insertions(+) diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml index a74fe1913176..3cf4858bd7b2 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml @@ -208,3 +208,123 @@ # cost: 10000 # category: cargoproduct-category-name-fun # group: market + +- type: cargoProduct + id: ChurchOrganInstrument + icon: + sprite: Objects/Fun/Instruments/structureinstruments.rsi + state: church-organ + product: ChurchOrganInstrument + cost: 1500 + category: cargoproduct-category-name-fun + group: market + +- type: cargoProduct + id: PianoInstrument + icon: + sprite: Objects/Fun/Instruments/structureinstruments.rsi + state: piano + product: PianoInstrument + cost: 1500 + category: cargoproduct-category-name-fun + group: market + +- type: cargoProduct + id: UprightPianoInstrument + icon: + sprite: Objects/Fun/Instruments/structureinstruments.rsi + state: piano-upright + product: UprightPianoInstrument + cost: 1500 + category: cargoproduct-category-name-fun + group: market + +- type: cargoProduct + id: VibraphoneInstrument + icon: + sprite: Objects/Fun/Instruments/structureinstruments.rsi + state: vibraphone + product: VibraphoneInstrument + cost: 1500 + category: cargoproduct-category-name-fun + group: market + +- type: cargoProduct + id: MarimbaInstrument + icon: + sprite: Objects/Fun/Instruments/structureinstruments.rsi + state: marimba + product: MarimbaInstrument + cost: 1500 + category: cargoproduct-category-name-fun + group: market + +- type: cargoProduct + id: TubaInstrument + icon: + sprite: Objects/Fun/Instruments/structureinstruments.rsi + state: tuba + product: TubaInstrument + cost: 1500 + category: cargoproduct-category-name-fun + group: market + +- type: cargoProduct + id: HarpInstrument + icon: + sprite: Objects/Fun/Instruments/structureinstruments.rsi + state: harp + product: HarpInstrument + cost: 1500 + category: cargoproduct-category-name-fun + group: market + +- type: cargoProduct + id: TimpaniInstrument + icon: + sprite: Objects/Fun/Instruments/structureinstruments.rsi + state: timpani + product: TimpaniInstrument + cost: 1500 + category: cargoproduct-category-name-fun + group: market + +- type: cargoProduct + id: TaikoInstrument + icon: + sprite: Objects/Fun/Instruments/structureinstruments.rsi + state: taiko + product: TaikoInstrument + cost: 1500 + category: cargoproduct-category-name-fun + group: market + +- type: cargoProduct + id: ContrabassInstrument + icon: + sprite: Objects/Fun/Instruments/structureinstruments.rsi + state: contrabass + product: ContrabassInstrument + cost: 1500 + category: cargoproduct-category-name-fun + group: market + +- type: cargoProduct + id: MinimoogInstrument + icon: + sprite: Objects/Fun/Instruments/structureinstruments.rsi + state: minimoog + product: MinimoogInstrument + cost: 1500 + category: cargoproduct-category-name-fun + group: market + +- type: cargoProduct + id: TomDrumsInstrument + icon: + sprite: Objects/Fun/Instruments/structureinstruments.rsi + state: toms + product: TomDrumsInstrument + cost: 1500 + category: cargoproduct-category-name-fun + group: market From b9b1d26c6a366f8199d43d2be8577266e14e454f Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 10 Jan 2025 15:14:30 +0000 Subject: [PATCH 061/205] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 0ef79a521535..0a43f8f61f3b 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: TheShuEd, Jaraten - changes: - - message: New Tech anomaly added to the game! it can bind devices ports, activate - them, and when supercrit, it can even emag some devices. - type: Add - id: 7294 - time: '2024-09-06T07:24:17.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/31764 - author: EmoGarbage404 changes: - message: Added mineral scanners! When held in your hand or pocket, these will @@ -3940,3 +3932,10 @@ id: 7793 time: '2025-01-10T15:01:00.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/34193 +- author: TeenSarlacc + changes: + - message: Large instruments can now be ordered through cargo. + type: Add + id: 7794 + time: '2025-01-10T15:13:23.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/34240 From 64d8245fb3643816b50fe0f9a7dee3fc07e4ef22 Mon Sep 17 00:00:00 2001 From: themias <89101928+themias@users.noreply.github.com> Date: Fri, 10 Jan 2025 10:37:11 -0500 Subject: [PATCH 062/205] Fix crayon losing durability on stamped paper (#34202) --- Content.Shared/Paper/PaperSystem.cs | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/Content.Shared/Paper/PaperSystem.cs b/Content.Shared/Paper/PaperSystem.cs index 211eb7eba814..3c10ff2aaac9 100644 --- a/Content.Shared/Paper/PaperSystem.cs +++ b/Content.Shared/Paper/PaperSystem.cs @@ -101,22 +101,25 @@ private void OnInteractUsing(Entity entity, ref InteractUsingEve { // only allow editing if there are no stamps or when using a cyberpen var editable = entity.Comp.StampedBy.Count == 0 || _tagSystem.HasTag(args.Used, "WriteIgnoreStamps"); - if (_tagSystem.HasTag(args.Used, "Write") && editable) + if (_tagSystem.HasTag(args.Used, "Write")) { - if (entity.Comp.EditingDisabled) + if (editable) { - var paperEditingDisabledMessage = Loc.GetString("paper-tamper-proof-modified-message"); - _popupSystem.PopupEntity(paperEditingDisabledMessage, entity, args.User); - - args.Handled = true; - return; + if (entity.Comp.EditingDisabled) + { + var paperEditingDisabledMessage = Loc.GetString("paper-tamper-proof-modified-message"); + _popupSystem.PopupEntity(paperEditingDisabledMessage, entity, args.User); + + args.Handled = true; + return; + } + var writeEvent = new PaperWriteEvent(entity, args.User); + RaiseLocalEvent(args.Used, ref writeEvent); + + entity.Comp.Mode = PaperAction.Write; + _uiSystem.OpenUi(entity.Owner, PaperUiKey.Key, args.User); + UpdateUserInterface(entity); } - var writeEvent = new PaperWriteEvent(entity, args.User); - RaiseLocalEvent(args.Used, ref writeEvent); - - entity.Comp.Mode = PaperAction.Write; - _uiSystem.OpenUi(entity.Owner, PaperUiKey.Key, args.User); - UpdateUserInterface(entity); args.Handled = true; return; } From b039dca019d4c7b6894d10490e7d8fd716387bcf Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 10 Jan 2025 15:38:18 +0000 Subject: [PATCH 063/205] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 0a43f8f61f3b..540a18d10b24 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: EmoGarbage404 - changes: - - message: Added mineral scanners! When held in your hand or pocket, these will - periodically show nearby ores. Unlock them through science today! - type: Add - id: 7295 - time: '2024-09-06T14:05:54.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/31390 - author: lzk228 changes: - message: You can no longer insert any item in AI upload console. @@ -3939,3 +3931,10 @@ id: 7794 time: '2025-01-10T15:13:23.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/34240 +- author: themias + changes: + - message: Fixed crayons losing durability attempting to write on stamped paper + type: Fix + id: 7795 + time: '2025-01-10T15:37:11.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/34202 From d74d3fb4950e64f1c381454117225bf2e017d692 Mon Sep 17 00:00:00 2001 From: Spessmann <156740760+Spessmann@users.noreply.github.com> Date: Fri, 10 Jan 2025 12:26:31 -0800 Subject: [PATCH 064/205] Adds a border to Oppenhopper poster (#34219) * border * Update meta.json * Update Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --- .../Wallmounts/posters.rsi/meta.json | 2 +- .../Wallmounts/posters.rsi/poster53_legit.png | Bin 3081 -> 2127 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json index fb1613be1468..ace3f0f22d68 100644 --- a/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from at commit https://github.com/tgstation/tgstation/commit/f01de25493e2bd2706ef9b0303cb0d7b5e3e471b. poster52_contraband, poster53_contraband and poster54_contraband taken from https://github.com/vgstation-coders/vgstation13/blob/435ed5f2a7926e91cc31abac3a0d47d7e9ad7ed4/icons/obj/posters.dmi. originmap, poster55_contraband, poster56_contraband, poster57_contraband and poster39_legit by discord brainfood#7460, poster63_contraband by discord foboscheshir_, poster52_legit by SlamBamActionman, poster53_legit and the original version by @RCOI on discord. | poster29_legit modified by TJohnson.", + "copyright": "Taken from at commit https://github.com/tgstation/tgstation/commit/f01de25493e2bd2706ef9b0303cb0d7b5e3e471b. poster52_contraband, poster53_contraband and poster54_contraband taken from https://github.com/vgstation-coders/vgstation13/blob/435ed5f2a7926e91cc31abac3a0d47d7e9ad7ed4/icons/obj/posters.dmi. originmap, poster55_contraband, poster56_contraband, poster57_contraband and poster39_legit by discord brainfood#7460, poster63_contraband by discord foboscheshir_, poster52_legit by SlamBamActionman, poster53_legit and the original version by @RCOI on discord, modified by Spessmann. | poster29_legit modified by TJohnson.", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster53_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster53_legit.png index bedaf2c5c48bbd580a821641d0f9ef1fd1b034ba..061155c64cfbfe6aa7e2e3b1ae12063fdfd3aea1 100644 GIT binary patch delta 1728 zcmV;x20!_U7|#%}qyc{hl}SWFR9J<@mRoFGM;XU|-^{t~uD#xk?Ix*c+NQ-82&h^h zmbg4c1+rhpp-&)zEyA*XTdqv317Wx&CnaI(*wYD zN#6{F*GiNiB87i-oEL5^SO?;PQfR$)x3F>axB%d%zxn}i*7GQrVpC&h31YvG9fre-24s)b_ zhG%CFGhRQ#GqZ;~G@l;+5szHi*KyT%_Fd-4i*N6oe`fH9JaywijL8XtkfXJ;d~@!j z0355IB~XUktjXLo2>&+qR{$pe{%U7EUOU5uOXtDCg-hr8`U9_U>B?*1Jl)Cr&T;Yb z1*ACt?C^h&Ia)j0;XhhG%lNrbGP+ZH^DF?4HAb=4;?_sBbEtyj!>1GSJVyX)E&I>- z^{P`Jnz*-fm$jCMUb=^8_FTMm7KnI;r}w<(35pBH8>2Yq&?uaP7d~!y`A7*>Ao|IJ zOMG|lRcwJkL@|DDq?5MKz5gQr(Vj|J)eKevmO3U0*D~a(zMezuY_8uBD@@+5S))-Sv}W;N}*+~&^Ww% zoOPZa3&l(dB5@8;3O2Z)2S5}A_;R#rO2N4`i)hiPKoe+<*4hgeI<#I}?cqy-5{DGU z?52M)5GX?&$No!Vk~k&~BfpL!qBtf>BEEh9AYmL61_40<=6m0I4>|~lqKGgI2!oJ7 z2Lz%BQ3RsUqH!CduBQ&fQH&D{P8BwAYc3HXPGTmfF7n98D3eovqJHdd?!3zfS1F2p zl9@Fghwlxxhz4oj!~!A~9VkK-5CzI>7kYm!!yq6E0zS8Gfm87alT#P{1Ao2!u2J_p#7yvb5MDP1B+Uxn40MOkVvKaaaGl98t=d76^7 zQ?fK8O;fUVPTtNrG}6z+r75g+?EB(we)HHrz&R!^O>tnPpES+LGY>q^a!i(C^Bijo z#+aTU>~Xnh}0R>2sr zjIodziuZy4u1sItx*KY77-P{2A}xdgRAQkofl3UO1X@iHB}~k=`N$VW`Sr;w%+IHM zaHs?p?j5$YGRN`?EVf}eb+p<-W;cKAbOA6$YS{Z6(MPEr#j)i}6tVp6N zf!6%)g*P~}|2$IoapZwPc4s;5)Y3{FOKrzO%Q3eEb1loAh(l1?KeJB$cDm?{J$H465@Gzk+h`RaW|ti|7A*g18eaL=8(X^o;B7k<)w0(% z4tz{MJ~7Kmz81dQcMfhT{KkJwleC@j^tl<72*>tpqgsYq8T!k@pa0$cAn5@xG@ywi z2o#)naT-L}zH{5w>TVdu_(oK5EtW}mvN6La-(6$-fF_A<6$1!5usk&}M>}`yxP9=J z=3X63iz_TNmjS5cOE{p!G6+2XNAH%Sd+I%WJuxu2V~FAHHIz~uI=FwUhapW3KmWzm z?!9)#jhO`i%K6f!09#=N=NvQFrdi4C=9SPO3~#Rkih~DsVQshSkAI^<6lo3~xTCXo z?dpw=@XAev_vlN{P8e$U&imiWzJ0e728uBB_)a|h63&6Ojxbal|NQ%yZ>F67{$$5J zrF^;T3EvT*ge6t(tYygmzxVh4-uL&u=Xp-6>@nEw%R&$!N+DV} ztds_X7$UFU006LxN+SB&+5$TKvjl$&R)=#c|0&5LxN`tNPhGHuf^*CQ0YJo;=0XBV zwl-J_GeFPFhv`k#3l3l{qHw`j{xN_GdclJO=nM`v*c7qof#shCW)uPrE&6~5Oc5ko z2e<{3O@$ljq4m%Ryc8S`$FY5Uu}+rO|KRy=rU-u!WMNULpr9bVAOk%n+YhC0Vq$_q zV^A0jlJ9}!gfKv_U?hX1z7*u&IF?ing-v6DG$sQsi0kFe*=F@g#&56-%@07{t<*P4N7pshoOIhK}&o@7D(B`7t1Ob zTqfqHN?9c4fIg`298efE+8Bw(ATcJWx z(P;v4v2-tnpD7|3=|lDP;?h9`-k#u!!Jz~$blQ*5CF_q7aj0LA;{-Kh-JPf$CY>vg z9dCd};}(@zwn75)w+1XhNWX-9Z~YnJ;Lik^{E=eQC`1NGWwY4)@mi$h7qOVee|SK@ zp#R3cn?VEd|3>)9{9Ov)H3w_X27{RF11^h=SQ7C+ulXS$L7$cs{cb)N6>WT}YBcuDwh}s^Ztlrk2-?(!RjGJB9AJ283*81+!Yy8Ok1*39^Tj?*(jN$+NJg+-g?tg2U>qrPI6$& zqZX~ZX$E5*P#Mwb`Uz}U`ev)d8*Z*C3TLiFLjD2BH&rUrvsh9|0$nq%{ZH+f7;7{h z8xvl0Kd$hKXdTzk>6A#NL~KXp%VLu1n+KH_ibwm)PG8#5Y6u-~R(iT|wEXWwb0K+V zp`{J=?`+SJKlZO1d}kthcnx;_s#jSrwN6&49V*ipu?;tY$G@06J9h6<(1oWN^W~cWxt_K= zvSKk#g?k8yQC7{M+n$5k@g90t-8QouE1nex{XJ2xR2CJ!0_rQ+T2MMkr?qB$0%Fx2 zdpheolh3@~xj|F|uz^X9^PEGJ_p7$2C`Pt+LmJaHg`2e%T+^JCVueca69;!fU=x5+^GEon>k^&wqiY=H-Lssmx2zP?+gjw> z)#M><;=P)9u3JlaJ83v=@|OD>qwc_-`mm3NH3QEOJ!HA2qi^s)>VXV)+G>qf1Yzdv ziZy*a?fx4Nl_HZiL@6X$BVH=a=y(pmwn4GgE$_4Hh95^OLssFnxTdocnr=tR#}WG< zCld%e3$lI0!~t^dZu8i+wJg?xhbs2B4=>wl zcF2~%45PqHFl*9qvTRkl7yd%w$Uu|n;N?jx10{v)^SdxJQ#!DZ#dNwOj+>>@i(7 zE*j^)a63sRAyX%#MXkY)dtgKP95mOHr(9HpQGLPu8rRMSnHxjaK5A4GEsOt5UnADC zB19$1-f;I3i!%nlj}(xf?M*Ul^laS3%O`8lyJS9QW?ufy$;vr)}rdmV&r%d6jJ zA^i!Kn*hsIOG=kbZA+vn%ue&nM)w?Y>a>-=#w98Y8w`%E6l$YkCdpfd$i@#}L|zk) zX^ra#h=yxO1VKsIEGHhbaQo$8h#HePg~V9O;)#` zih`{RLL2X?E*3Q-E1_IIy|?PWH3oXT$~O8_KDBysRONwXqQ0(E<9ki!`1=1bHIj&a z1y?`D47bFTSU*iA2y=_V=Dl-{%T%8XRZz+9)E@MG>%?=WtF9v z;R&k?5!mAe&!vnszBl`Mk2_woj8SP*rD~yyvQJ`Bh&Ls?|q%-8kDpn3e z?tiv(oE{f8kW(;#_xYIU?wmE8CO#Q@!>w6QGBnjj^F)4SqWei zt4mepY1FS3p}a1(6W(_Ke`SkZ5IRd22g4>i@aTZUg`T From 76e28dcc2637ca20143aaf2a0c7da51ebe8e2732 Mon Sep 17 00:00:00 2001 From: SpaceManiac Date: Fri, 10 Jan 2025 12:40:31 -0800 Subject: [PATCH 065/205] Trim trailing newlines from examine messages (#33381) * Trim trailing newlines from examine messages * TrimTrailingNewlines -> TrimEnd --- Content.Shared/Examine/ExamineSystemShared.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Content.Shared/Examine/ExamineSystemShared.cs b/Content.Shared/Examine/ExamineSystemShared.cs index 4372b7d51699..72ea9dba655e 100644 --- a/Content.Shared/Examine/ExamineSystemShared.cs +++ b/Content.Shared/Examine/ExamineSystemShared.cs @@ -385,6 +385,8 @@ int Comparison(ExamineMessagePart a, ExamineMessagePart b) totalMessage.PushNewline(); } + totalMessage.TrimEnd(); + return totalMessage; } From 8e8bc3695eba42af842357b40acae4322687382e Mon Sep 17 00:00:00 2001 From: Tayrtahn Date: Fri, 10 Jan 2025 17:57:46 -0500 Subject: [PATCH 066/205] Add a popup message when ghost Boo action does nothing (#34369) --- Content.Server/Ghost/GhostSystem.cs | 5 +++++ Resources/Locale/en-US/ghost/components/ghost-component.ftl | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Content.Server/Ghost/GhostSystem.cs b/Content.Server/Ghost/GhostSystem.cs index 77cf813b56b4..71a75ee4c6e1 100644 --- a/Content.Server/Ghost/GhostSystem.cs +++ b/Content.Server/Ghost/GhostSystem.cs @@ -24,6 +24,7 @@ using Content.Shared.Mobs.Systems; using Content.Shared.Movement.Events; using Content.Shared.Movement.Systems; +using Content.Shared.Popups; using Content.Shared.Storage.Components; using Robust.Server.GameObjects; using Robust.Server.Player; @@ -61,6 +62,7 @@ public sealed class GhostSystem : SharedGhostSystem [Dependency] private readonly SharedMindSystem _mind = default!; [Dependency] private readonly GameTicker _gameTicker = default!; [Dependency] private readonly DamageableSystem _damageable = default!; + [Dependency] private readonly SharedPopupSystem _popup = default!; private EntityQuery _ghostQuery; private EntityQuery _physicsQuery; @@ -139,6 +141,9 @@ private void OnActionPerform(EntityUid uid, GhostComponent component, BooActionE break; } + if (booCounter == 0) + _popup.PopupEntity(Loc.GetString("ghost-component-boo-action-failed"), uid, uid); + args.Handled = true; } diff --git a/Resources/Locale/en-US/ghost/components/ghost-component.ftl b/Resources/Locale/en-US/ghost/components/ghost-component.ftl index 48a191da3319..051b7263ba67 100644 --- a/Resources/Locale/en-US/ghost/components/ghost-component.ftl +++ b/Resources/Locale/en-US/ghost/components/ghost-component.ftl @@ -1,3 +1,5 @@ ghost-component-on-examine-death-time-info-minutes = {$minutes} minutes ago ghost-component-on-examine-death-time-info-seconds = {$seconds} seconds ago -ghost-component-on-examine-message = Died [color=yellow]{$timeOfDeath}[/color]. \ No newline at end of file +ghost-component-on-examine-message = Died [color=yellow]{$timeOfDeath}[/color]. + +ghost-component-boo-action-failed = Despite your best efforts, nothing spooky happens From 64a139152232572fdbf41aea8c6adbebda6213c8 Mon Sep 17 00:00:00 2001 From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> Date: Fri, 10 Jan 2025 16:17:12 -0800 Subject: [PATCH 067/205] fix ghost_component.ftl locale grammar (#34372) fix ghost component locale grammar --- Resources/Locale/en-US/ghost/components/ghost-component.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/ghost/components/ghost-component.ftl b/Resources/Locale/en-US/ghost/components/ghost-component.ftl index 051b7263ba67..724ff518a507 100644 --- a/Resources/Locale/en-US/ghost/components/ghost-component.ftl +++ b/Resources/Locale/en-US/ghost/components/ghost-component.ftl @@ -2,4 +2,4 @@ ghost-component-on-examine-death-time-info-minutes = {$minutes} minutes ago ghost-component-on-examine-death-time-info-seconds = {$seconds} seconds ago ghost-component-on-examine-message = Died [color=yellow]{$timeOfDeath}[/color]. -ghost-component-boo-action-failed = Despite your best efforts, nothing spooky happens +ghost-component-boo-action-failed = Despite your best efforts, nothing spooky happens. From cf1c941c95d7f8e0f6fb0b10039ab6864352b862 Mon Sep 17 00:00:00 2001 From: Tayrtahn Date: Fri, 10 Jan 2025 21:48:13 -0500 Subject: [PATCH 068/205] Let ghosts sometimes make certain devices say creepy things (#34368) * Add SpookySpeaker component/system * Shuffle Boo action targets before trying to activate them * Add SpookySpeaker to vending machines * Fix chatcode eating messages starting with "..." * Add SpookySpeaker to recycler * Oops * Decrease speak probability for vending machines * Add spooky speaker to arcade machines --- .../Components/SpookySpeakerComponent.cs | 37 ++++++++++++++ Content.Server/Ghost/GhostSystem.cs | 6 ++- Content.Server/Ghost/SpookySpeakerSystem.cs | 51 +++++++++++++++++++ .../Locale/en-US/ghost/spooky-speaker.ftl | 18 +++++++ .../Prototypes/Datasets/spooky_speakers.yml | 11 ++++ .../Structures/Machines/Computers/arcades.yml | 3 ++ .../Entities/Structures/Machines/recycler.yml | 7 +++ .../Structures/Machines/vending_machines.yml | 3 ++ 8 files changed, 135 insertions(+), 1 deletion(-) create mode 100644 Content.Server/Ghost/Components/SpookySpeakerComponent.cs create mode 100644 Content.Server/Ghost/SpookySpeakerSystem.cs create mode 100644 Resources/Locale/en-US/ghost/spooky-speaker.ftl create mode 100644 Resources/Prototypes/Datasets/spooky_speakers.yml diff --git a/Content.Server/Ghost/Components/SpookySpeakerComponent.cs b/Content.Server/Ghost/Components/SpookySpeakerComponent.cs new file mode 100644 index 000000000000..e843793a131a --- /dev/null +++ b/Content.Server/Ghost/Components/SpookySpeakerComponent.cs @@ -0,0 +1,37 @@ +using Content.Shared.Dataset; +using Robust.Shared.Prototypes; + +namespace Content.Server.Ghost.Components; + +/// +/// Causes this entity to react to ghost player using the "Boo!" action by speaking +/// a randomly chosen message from a specified set. +/// +[RegisterComponent, AutoGenerateComponentPause] +public sealed partial class SpookySpeakerComponent : Component +{ + /// + /// ProtoId of the LocalizedDataset to use for messages. + /// + [DataField(required: true)] + public ProtoId MessageSet; + + /// + /// Probability that this entity will speak if activated by a Boo action. + /// This is so whole banks of entities don't trigger at the same time. + /// + [DataField] + public float SpeakChance = 0.5f; + + /// + /// Minimum time that must pass after speaking before this entity can speak again. + /// + [DataField] + public TimeSpan Cooldown = TimeSpan.FromSeconds(30); + + /// + /// Time when the cooldown will have elapsed and the entity can speak again. + /// + [DataField, AutoPausedField] + public TimeSpan NextSpeakTime; +} diff --git a/Content.Server/Ghost/GhostSystem.cs b/Content.Server/Ghost/GhostSystem.cs index 71a75ee4c6e1..25319557ae16 100644 --- a/Content.Server/Ghost/GhostSystem.cs +++ b/Content.Server/Ghost/GhostSystem.cs @@ -34,6 +34,7 @@ using Robust.Shared.Physics.Systems; using Robust.Shared.Player; using Robust.Shared.Prototypes; +using Robust.Shared.Random; using Robust.Shared.Timing; namespace Content.Server.Ghost @@ -63,6 +64,7 @@ public sealed class GhostSystem : SharedGhostSystem [Dependency] private readonly GameTicker _gameTicker = default!; [Dependency] private readonly DamageableSystem _damageable = default!; [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private readonly IRobustRandom _random = default!; private EntityQuery _ghostQuery; private EntityQuery _physicsQuery; @@ -127,7 +129,9 @@ private void OnActionPerform(EntityUid uid, GhostComponent component, BooActionE if (args.Handled) return; - var entities = _lookup.GetEntitiesInRange(args.Performer, component.BooRadius); + var entities = _lookup.GetEntitiesInRange(args.Performer, component.BooRadius).ToList(); + // Shuffle the possible targets so we don't favor any particular entities + _random.Shuffle(entities); var booCounter = 0; foreach (var ent in entities) diff --git a/Content.Server/Ghost/SpookySpeakerSystem.cs b/Content.Server/Ghost/SpookySpeakerSystem.cs new file mode 100644 index 000000000000..5a83ca39b1da --- /dev/null +++ b/Content.Server/Ghost/SpookySpeakerSystem.cs @@ -0,0 +1,51 @@ +using Content.Server.Chat.Systems; +using Content.Server.Ghost.Components; +using Content.Shared.Random.Helpers; +using Robust.Shared.Prototypes; +using Robust.Shared.Random; +using Robust.Shared.Timing; + +namespace Content.Server.Ghost; + +public sealed class SpookySpeakerSystem : EntitySystem +{ + [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private readonly ChatSystem _chat = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnGhostBoo); + } + + private void OnGhostBoo(Entity entity, ref GhostBooEvent args) + { + // Only activate sometimes, so groups don't all trigger together + if (!_random.Prob(entity.Comp.SpeakChance)) + return; + + var curTime = _timing.CurTime; + // Enforce a delay between messages to prevent spam + if (curTime < entity.Comp.NextSpeakTime) + return; + + if (!_proto.TryIndex(entity.Comp.MessageSet, out var messages)) + return; + + // Grab a random localized message from the set + var message = _random.Pick(messages); + // Chatcode moment: messages starting with '.' are considered radio messages unless prefixed with '>' + // So this is a stupid trick to make the "...Oooo"-style messages work. + message = '>' + message; + // Say the message + _chat.TrySendInGameICMessage(entity, message, InGameICChatType.Speak, hideChat: true); + + // Set the delay for the next message + entity.Comp.NextSpeakTime = curTime + entity.Comp.Cooldown; + + args.Handled = true; + } +} diff --git a/Resources/Locale/en-US/ghost/spooky-speaker.ftl b/Resources/Locale/en-US/ghost/spooky-speaker.ftl new file mode 100644 index 000000000000..9c962eee778b --- /dev/null +++ b/Resources/Locale/en-US/ghost/spooky-speaker.ftl @@ -0,0 +1,18 @@ +spooky-speaker-generic-1 = ...ooOoooOOoooo... +spooky-speaker-generic-2 = ...can anyone hear me...? +spooky-speaker-generic-3 = ...join us... +spooky-speaker-generic-4 = ...come play with us... +spooky-speaker-generic-5 = KkkhhkhKhhkhkKk +spooky-speaker-generic-6 = Khhggkkghkk +spooky-speaker-generic-7 = khhkkkkKkhkkHk +spooky-speaker-generic-8 = ... +spooky-speaker-generic-9 = ...h-h-hello...? +spooky-speaker-generic-10 = Bzzzt +spooky-speaker-generic-11 = Weh +spooky-speaker-generic-12 = TREMBLE, MORTALS! +spooky-speaker-generic-13 = 4444444444 +spooky-speaker-generic-14 = ...I found you... + +spooky-speaker-recycler-1 = I HUNGER +spooky-speaker-recycler-2 = MORE! GIVE ME MORE! +spooky-speaker-recycler-3 = FEED ME diff --git a/Resources/Prototypes/Datasets/spooky_speakers.yml b/Resources/Prototypes/Datasets/spooky_speakers.yml new file mode 100644 index 000000000000..a64ab0a80ee1 --- /dev/null +++ b/Resources/Prototypes/Datasets/spooky_speakers.yml @@ -0,0 +1,11 @@ +- type: localizedDataset + id: SpookySpeakerMessagesGeneric + values: + prefix: spooky-speaker-generic- + count: 14 + +- type: localizedDataset + id: SpookySpeakerMessagesRecycler + values: + prefix: spooky-speaker-recycler- + count: 3 diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml index ed5e882051b2..f291e6e13e57 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml @@ -36,6 +36,9 @@ - type: Speech speechVerb: Robotic speechSounds: Vending + - type: SpookySpeaker + messageSet: SpookySpeakerMessagesGeneric + speakChance: 0.2 - type: Anchorable - type: Pullable - type: StaticPrice diff --git a/Resources/Prototypes/Entities/Structures/Machines/recycler.yml b/Resources/Prototypes/Entities/Structures/Machines/recycler.yml index f62923fe2af3..2058c3c05023 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/recycler.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/recycler.yml @@ -108,3 +108,10 @@ interactFailureString: petting-failure-generic interactSuccessSound: path: /Audio/Items/drill_hit.ogg + - type: SpookySpeaker + speakChance: 0.1 + cooldown: 120 + messageSet: SpookySpeakerMessagesRecycler + - type: Speech + speechVerb: Robotic + speechSounds: SyndieBorg diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 1ecf75bb84cd..031f267616e3 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -78,6 +78,9 @@ - type: Speech speechVerb: Robotic speechSounds: Vending + - type: SpookySpeaker + messageSet: SpookySpeakerMessagesGeneric + speakChance: 0.2 - type: IntrinsicRadioReceiver - type: ActiveRadio channels: From a45d6faf55a7a1e8dd680817eecc0a741609a79b Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 11 Jan 2025 02:49:21 +0000 Subject: [PATCH 069/205] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 540a18d10b24..ed8cf7ab359b 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: lzk228 - changes: - - message: You can no longer insert any item in AI upload console. - type: Fix - id: 7296 - time: '2024-09-06T19:07:58.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/31900 - author: ps3moira changes: - message: Fixed pump shotgun inhand sprites @@ -3938,3 +3931,11 @@ id: 7795 time: '2025-01-10T15:37:11.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/34202 +- author: Tayrtahn + changes: + - message: Arcades, vending machines and the recycler now sometimes say creepy things + when a ghost uses the "Boo!" action near them. + type: Add + id: 7796 + time: '2025-01-11T02:48:14.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/34368 From 47ee7c9bf35a20df8642066d7e9b2439715f3c1c Mon Sep 17 00:00:00 2001 From: War Pigeon <54217755+minus1over12@users.noreply.github.com> Date: Sat, 11 Jan 2025 02:19:59 -0600 Subject: [PATCH 070/205] Add directional escape pod sign (#34367) --- .../Structures/Wallmounts/Signs/signs.yml | 9 +++++++++ .../Wallmounts/signs.rsi/direction_pods.png | Bin 0 -> 423 bytes .../Structures/Wallmounts/signs.rsi/meta.json | 6 +++++- 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Structures/Wallmounts/signs.rsi/direction_pods.png diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml index 72bc35bb1875..98aa0b4b1c11 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml @@ -242,6 +242,15 @@ - type: Sprite state: direction_wash +- type: entity + parent: BaseSignDirectional + id: SignDirectionalEscapePod + name: escape pods sign + description: A direction sign, pointing out the way to an escape pod dock. + components: + - type: Sprite + state: direction_pods + # Regular Signs - type: entity diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_pods.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_pods.png new file mode 100644 index 0000000000000000000000000000000000000000..6c98c720ba595fbbcc3fa8a11ad110b9f4d5ea0e GIT binary patch literal 423 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9fJ$aSW-L^Y+&Iyu$_pY#;LL zJ+88QEMawhn)>wU@0|3t*8b%8`#A^lO9brcVvt%_{nGuZK~= zcmBr>H+_=q&OM*a{rB{r@B5U(b}R2%c0}p)1=FV)Is45YUwy~H5Rr1zK!3ie)92aF z6SG6u7hDZvy|wDc+P6)gXCF4$Z+DM5WA&rk2{X^cWq192xv=Hg{;8ks85pj$3s0-G zv)LYMIBW9b({_O8Ie)<`{s1}U+WnJ5g^cH(SFHUTkRb#ePRFc z$oX~A%&qnZj%592PMLEzULa_C_xG}h(=pA<&2 OVDNPHb6Mw<&;$S;r^ZGA literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json index 2eb27e18faa9..60caa6ba4dc1 100644 --- a/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 4e0bbe682d0a00192d24708fdb7031008aa03f18 and bee station at commit https://github.com/BeeStation/BeeStation-Hornet/commit/13dd5ac712385642574138f6d7b30eea7c2fab9c, Job signs by EmoGarbage404 (github) with inspiration from yogstation and tgstation, 'direction_exam' and 'direction_icu' made by rosieposieeee (github), 'direction_atmos' made by SlamBamActionman. 'vox' based on sprites taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/e7f005f8b8d3f7d89cbee3b87f76c23f9e951c27/icons/obj/decals.dmi", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 4e0bbe682d0a00192d24708fdb7031008aa03f18 and bee station at commit https://github.com/BeeStation/BeeStation-Hornet/commit/13dd5ac712385642574138f6d7b30eea7c2fab9c, Job signs by EmoGarbage404 (github) with inspiration from yogstation and tgstation, 'direction_exam' and 'direction_icu' made by rosieposieeee (github), 'direction_atmos' made by SlamBamActionman, 'vox' based on sprites taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/e7f005f8b8d3f7d89cbee3b87f76c23f9e951c27/icons/obj/decals.dmi, 'direction_pods' derived by WarPigeon from existing directional signs.", "states": [ { "name": "ai" @@ -215,6 +215,10 @@ "name": "direction_wash", "directions": 4 }, + { + "name": "direction_pods", + "directions": 4 + }, { "name": "dock" }, From 0b1e1b8ac3791eae0b1e71762198c494c1ebc95e Mon Sep 17 00:00:00 2001 From: Zachary Higgs Date: Sat, 11 Jan 2025 13:27:08 -0400 Subject: [PATCH 071/205] Make indestructible tiles not breakable by explosions (#34339) * No more Ai Spacing * Move guard into earlier guard statement --- .../Explosion/EntitySystems/ExplosionSystem.Processing.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs index 6335a9b32cd6..dcd47f3d186a 100644 --- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs +++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs @@ -511,7 +511,8 @@ public void DamageFloorTile(TileRef tileRef, List<(Vector2i GridIndices, Tile Tile)> damagedTiles, ExplosionPrototype type) { - if (_tileDefinitionManager[tileRef.Tile.TypeId] is not ContentTileDefinition tileDef) + if (_tileDefinitionManager[tileRef.Tile.TypeId] is not ContentTileDefinition tileDef + || tileDef.Indestructible) return; if (!CanCreateVacuum) From 6fdb777b94f5bc16de444e0ada0204609b92627d Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 11 Jan 2025 17:28:18 +0000 Subject: [PATCH 072/205] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index ed8cf7ab359b..1de525ee5797 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: ps3moira - changes: - - message: Fixed pump shotgun inhand sprites - type: Fix - id: 7297 - time: '2024-09-06T23:26:46.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/31885 - author: yuitop changes: - message: break pull when fall asleep @@ -3939,3 +3932,10 @@ id: 7796 time: '2025-01-11T02:48:14.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/34368 +- author: Kickguy223 + changes: + - message: Indestructible tiles no longer break due to explosions + type: Fix + id: 7797 + time: '2025-01-11T17:27:09.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/34339 From a5c0b60e801682ae71ab6922d065e5c7f5508141 Mon Sep 17 00:00:00 2001 From: 0x6273 <0x40@keemail.me> Date: Sat, 11 Jan 2025 20:29:54 +0100 Subject: [PATCH 073/205] Arachnid stomach organ yaml fix (#34298) Arachnid stomach yaml fix Arachnids had their stomach `updateInterval` set to 1.5, 50% slower than normal. But this doesn't actually slow down the speed that the stomach digests things, only the rate at which it updates to check if enough time has passed. (See https://github.com/space-wizards/space-station-14/blob/23f0b304f284d2600cb2c6b4c9d36fdca7f99ec4/Content.Server/Body/Systems/StomachSystem.cs#L57 ) This PR changes arachnid stomachs to have a `digestionDelay` of 30 (20 is default) to achive the desired effect. Stasis beds are also bugged in a similar manner. They are intended to slow down the digestion speed, but similarly all they do is change the update rate. But fixing that requires actual code changes and is out of scope for this commit. --- Resources/Prototypes/Body/Organs/arachnid.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Body/Organs/arachnid.yml b/Resources/Prototypes/Body/Organs/arachnid.yml index 3138083d5400..51171ddf5856 100644 --- a/Resources/Prototypes/Body/Organs/arachnid.yml +++ b/Resources/Prototypes/Body/Organs/arachnid.yml @@ -37,7 +37,7 @@ - type: Organ # Shitmed slotId: stomach - type: Stomach - updateInterval: 1.5 + digestionDelay: 30 - type: SolutionContainerManager solutions: stomach: From ebb7f8994ab5a3affd1ae8c0edcdf9dbf6c76872 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 11 Jan 2025 19:31:01 +0000 Subject: [PATCH 074/205] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 1de525ee5797..e7ba2cdfd25c 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: yuitop - changes: - - message: break pull when fall asleep - type: Fix - id: 7298 - time: '2024-09-06T23:30:24.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/31893 - author: Boaz1111 changes: - message: Energy Shotgun's narrow fire mode's projectiles now deal 13 heat dmg @@ -3939,3 +3932,11 @@ id: 7797 time: '2025-01-11T17:27:09.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/34339 +- author: '0x6273' + changes: + - message: Fix a bug that was causing arachnid stomachs to not digest at the intended, + slower than normal speed. + type: Fix + id: 7798 + time: '2025-01-11T19:29:54.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/34298 From 6d89d79d846a1208727b8fd1ca4cbd524f986176 Mon Sep 17 00:00:00 2001 From: justdie12 <125140938+justdie12@users.noreply.github.com> Date: Sat, 11 Jan 2025 23:03:04 +0300 Subject: [PATCH 075/205] Bended radiator (#34251) --- .../Structures/Piping/Atmospherics/binary.yml | 26 +++++++++++++++++++ .../Graphs/utilities/atmos_binary.yml | 24 +++++++++++++++++ .../Recipes/Construction/utilities.yml | 14 ++++++++++ 3 files changed, 64 insertions(+) diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml index 8327937ba865..c8727fab933c 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml @@ -471,3 +471,29 @@ node: radiator - type: AtmosMonitoringConsoleDevice navMapBlip: Thermoregulator + +- type: entity + parent: HeatExchanger + id: HeatExchangerBend + suffix: Bend + components: + - type: Sprite + layers: + - sprite: Structures/Piping/Atmospherics/pipe.rsi + state: pipeBend + map: [ "enum.PipeVisualLayers.Pipe" ] + - state: heBend + map: [ "enum.SubfloorLayers.FirstLayer" ] + - type: NodeContainer + nodes: + inlet: + !type:PipeNode + nodeGroupID: Pipe + pipeDirection: South + outlet: + !type:PipeNode + nodeGroupID: Pipe + pipeDirection: West + - type: Construction + graph: GasBinary + node: bendradiator diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/atmos_binary.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/atmos_binary.yml index 63ae3249100b..aed91671789f 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/atmos_binary.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/atmos_binary.yml @@ -52,6 +52,12 @@ amount: 2 doAfter: 1 + - to: bendradiator + steps: + - material: Steel + amount: 2 + doAfter: 1 + - node: pressurepump entity: GasPressurePump edges: @@ -183,3 +189,21 @@ doAfter: 1 - tool: Welding doAfter: 1 + + - node: bendradiator + entity: HeatExchangerBend + edges: + - to: start + conditions: + - !type:EntityAnchored + anchored: false + completed: + - !type:SpawnPrototype + prototype: SheetSteel1 + amount: 2 + - !type:DeleteEntity + steps: + - tool: Screwing + doAfter: 1 + - tool: Welding + doAfter: 1 diff --git a/Resources/Prototypes/Recipes/Construction/utilities.yml b/Resources/Prototypes/Recipes/Construction/utilities.yml index d4a5dbb1a7d8..40889aaa4275 100644 --- a/Resources/Prototypes/Recipes/Construction/utilities.yml +++ b/Resources/Prototypes/Recipes/Construction/utilities.yml @@ -697,6 +697,20 @@ sprite: Structures/Piping/Atmospherics/heatexchanger.rsi state: heStraight +- type: construction + id: HeatExchangerBend + name: radiator bend + description: Transfers heat between the pipe and its surroundings. + graph: GasBinary + startNode: start + targetNode: bendradiator + category: construction-category-utilities + placementMode: SnapgridCenter + canBuildInImpassable: false + icon: + sprite: Structures/Piping/Atmospherics/heatexchanger.rsi + state: heBend + # ATMOS TRINARY - type: construction id: GasFilter From 88b2c0d630723b533507d7e7e404efab1879755d Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 11 Jan 2025 20:04:10 +0000 Subject: [PATCH 076/205] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index e7ba2cdfd25c..bd0616cb79e1 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,13 +1,4 @@ Entries: -- author: Boaz1111 - changes: - - message: Energy Shotgun's narrow fire mode's projectiles now deal 13 heat dmg - each, for a total of 52. The energy shotgun additionally no longer self recharges - and has received some minor buffs. - type: Tweak - id: 7299 - time: '2024-09-07T00:35:01.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/31235 - author: themias changes: - message: Added the justice helm to the secdrobe @@ -3940,3 +3931,10 @@ id: 7798 time: '2025-01-11T19:29:54.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/34298 +- author: justdie12 + changes: + - message: Added a bend version of the radiator. + type: Add + id: 7799 + time: '2025-01-11T20:03:04.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/34251 From 87e570c2c8442508a3dd4a6130095b2093e6a9a4 Mon Sep 17 00:00:00 2001 From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Date: Sun, 12 Jan 2025 07:22:29 +1100 Subject: [PATCH 077/205] Remove Entity data-fields (#34083) --- .../Components/ReagentProducerAnomalyComponent.cs | 2 +- .../Piping/Unary/Components/GasCondenserComponent.cs | 2 +- .../Body/Components/BloodstreamComponent.cs | 12 ++++++------ Content.Server/Body/Components/LungComponent.cs | 2 +- Content.Server/Body/Components/StomachComponent.cs | 4 ++-- .../Botany/Components/PlantHolderComponent.cs | 2 +- .../Components/SolutionRegenerationComponent.cs | 2 +- .../ChemicalFuelGeneratorAdapterComponent.cs | 2 +- Content.Shared/Animals/UdderComponent.cs | 2 +- Content.Shared/Animals/WoolyComponent.cs | 2 +- .../Chemistry/Components/SmokeComponent.cs | 2 +- .../Components/SolutionContainerMixerComponent.cs | 2 +- Content.Shared/Fluids/Components/DrainComponent.cs | 2 +- Content.Shared/Fluids/Components/PuddleComponent.cs | 2 +- Content.Shared/Mind/MindComponent.cs | 6 +++--- 15 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Content.Server/Anomaly/Components/ReagentProducerAnomalyComponent.cs b/Content.Server/Anomaly/Components/ReagentProducerAnomalyComponent.cs index 49c62aec81d6..3f63a0518cfa 100644 --- a/Content.Server/Anomaly/Components/ReagentProducerAnomalyComponent.cs +++ b/Content.Server/Anomaly/Components/ReagentProducerAnomalyComponent.cs @@ -97,6 +97,6 @@ public sealed partial class ReagentProducerAnomalyComponent : Component /// /// Solution where the substance is generated /// - [DataField("solutionRef")] + [ViewVariables] public Entity? Solution = null; } diff --git a/Content.Server/Atmos/Piping/Unary/Components/GasCondenserComponent.cs b/Content.Server/Atmos/Piping/Unary/Components/GasCondenserComponent.cs index c25c010708f9..e89bba1fd709 100644 --- a/Content.Server/Atmos/Piping/Unary/Components/GasCondenserComponent.cs +++ b/Content.Server/Atmos/Piping/Unary/Components/GasCondenserComponent.cs @@ -25,7 +25,7 @@ public sealed partial class GasCondenserComponent : Component /// /// The solution that gases are condensed into. /// - [DataField] + [ViewVariables] public Entity? Solution = null; /// diff --git a/Content.Server/Body/Components/BloodstreamComponent.cs b/Content.Server/Body/Components/BloodstreamComponent.cs index a6c8ad90df97..35e76403bb61 100644 --- a/Content.Server/Body/Components/BloodstreamComponent.cs +++ b/Content.Server/Body/Components/BloodstreamComponent.cs @@ -157,22 +157,22 @@ public sealed partial class BloodstreamComponent : Component /// /// Internal solution for blood storage /// - [DataField] - public Entity? BloodSolution = null; + [ViewVariables] + public Entity? BloodSolution; /// /// Internal solution for reagent storage /// - [DataField] - public Entity? ChemicalSolution = null; + [ViewVariables] + public Entity? ChemicalSolution; /// /// Temporary blood solution. /// When blood is lost, it goes to this solution, and when this /// solution hits a certain cap, the blood is actually spilled as a puddle. /// - [DataField] - public Entity? TemporarySolution = null; + [ViewVariables] + public Entity? TemporarySolution; /// /// Variable that stores the amount of status time added by having a low blood level. diff --git a/Content.Server/Body/Components/LungComponent.cs b/Content.Server/Body/Components/LungComponent.cs index 256c6d672989..13b7a93f4ddd 100644 --- a/Content.Server/Body/Components/LungComponent.cs +++ b/Content.Server/Body/Components/LungComponent.cs @@ -26,7 +26,7 @@ public sealed partial class LungComponent : Component /// /// The solution on this entity that these lungs act on. /// - [DataField] + [ViewVariables] public Entity? Solution = null; /// diff --git a/Content.Server/Body/Components/StomachComponent.cs b/Content.Server/Body/Components/StomachComponent.cs index d541ca4d7c45..06f03482e7e6 100644 --- a/Content.Server/Body/Components/StomachComponent.cs +++ b/Content.Server/Body/Components/StomachComponent.cs @@ -25,8 +25,8 @@ public sealed partial class StomachComponent : Component /// /// The solution inside of this stomach this transfers reagents to the body. /// - [DataField] - public Entity? Solution = null; + [ViewVariables] + public Entity? Solution; /// /// What solution should this stomach push reagents into, on the body? diff --git a/Content.Server/Botany/Components/PlantHolderComponent.cs b/Content.Server/Botany/Components/PlantHolderComponent.cs index f0661e4a301f..235cd3050b57 100644 --- a/Content.Server/Botany/Components/PlantHolderComponent.cs +++ b/Content.Server/Botany/Components/PlantHolderComponent.cs @@ -96,6 +96,6 @@ public sealed partial class PlantHolderComponent : Component [DataField] public string SoilSolutionName = "soil"; - [DataField] + [ViewVariables] public Entity? SoilSolution = null; } diff --git a/Content.Server/Chemistry/Components/SolutionRegenerationComponent.cs b/Content.Server/Chemistry/Components/SolutionRegenerationComponent.cs index 03c0ffe0c1ae..9266c460f1b2 100644 --- a/Content.Server/Chemistry/Components/SolutionRegenerationComponent.cs +++ b/Content.Server/Chemistry/Components/SolutionRegenerationComponent.cs @@ -20,7 +20,7 @@ public sealed partial class SolutionRegenerationComponent : Component /// /// The solution to add reagents to. /// - [DataField] + [ViewVariables] public Entity? SolutionRef = null; /// diff --git a/Content.Server/Power/Generator/ChemicalFuelGeneratorAdapterComponent.cs b/Content.Server/Power/Generator/ChemicalFuelGeneratorAdapterComponent.cs index 58e0e8b012a8..d36828eb83a5 100644 --- a/Content.Server/Power/Generator/ChemicalFuelGeneratorAdapterComponent.cs +++ b/Content.Server/Power/Generator/ChemicalFuelGeneratorAdapterComponent.cs @@ -29,7 +29,7 @@ public sealed partial class ChemicalFuelGeneratorAdapterComponent : Component /// /// The solution on the to use. /// - [DataField("solutionRef")] + [ViewVariables] public Entity? Solution = null; /// diff --git a/Content.Shared/Animals/UdderComponent.cs b/Content.Shared/Animals/UdderComponent.cs index d2767b089605..12db8efefd63 100644 --- a/Content.Shared/Animals/UdderComponent.cs +++ b/Content.Shared/Animals/UdderComponent.cs @@ -28,7 +28,7 @@ public sealed partial class UdderComponent : Component /// /// The solution to add reagent to. /// - [DataField, ViewVariables(VVAccess.ReadOnly)] + [ViewVariables(VVAccess.ReadOnly)] public Entity? Solution = null; /// diff --git a/Content.Shared/Animals/WoolyComponent.cs b/Content.Shared/Animals/WoolyComponent.cs index 1dfe523001ed..6e6e6745e1f0 100644 --- a/Content.Shared/Animals/WoolyComponent.cs +++ b/Content.Shared/Animals/WoolyComponent.cs @@ -28,7 +28,7 @@ public sealed partial class WoolyComponent : Component /// /// The solution to add reagent to. /// - [DataField, ViewVariables(VVAccess.ReadOnly)] + [ViewVariables(VVAccess.ReadOnly)] public Entity? Solution; /// diff --git a/Content.Shared/Chemistry/Components/SmokeComponent.cs b/Content.Shared/Chemistry/Components/SmokeComponent.cs index f07a77c1ac66..db4ad37c7ab4 100644 --- a/Content.Shared/Chemistry/Components/SmokeComponent.cs +++ b/Content.Shared/Chemistry/Components/SmokeComponent.cs @@ -16,7 +16,7 @@ public sealed partial class SmokeComponent : Component /// /// The solution on the entity with touch and ingestion reactions. /// - [DataField] + [ViewVariables] public Entity? Solution = null; /// diff --git a/Content.Shared/Chemistry/Components/SolutionContainerMixerComponent.cs b/Content.Shared/Chemistry/Components/SolutionContainerMixerComponent.cs index 8e4b6f52d875..58aba436278f 100644 --- a/Content.Shared/Chemistry/Components/SolutionContainerMixerComponent.cs +++ b/Content.Shared/Chemistry/Components/SolutionContainerMixerComponent.cs @@ -33,7 +33,7 @@ public sealed partial class SolutionContainerMixerComponent : Component [DataField, AutoNetworkedField] public SoundSpecifier? MixingSound; - [DataField] + [ViewVariables] public Entity? MixingSoundEntity; } diff --git a/Content.Shared/Fluids/Components/DrainComponent.cs b/Content.Shared/Fluids/Components/DrainComponent.cs index ef0277d214f9..305ed00b140a 100644 --- a/Content.Shared/Fluids/Components/DrainComponent.cs +++ b/Content.Shared/Fluids/Components/DrainComponent.cs @@ -20,7 +20,7 @@ public sealed partial class DrainComponent : Component [ValidatePrototypeId] public const string PlungerTag = "Plunger"; - [DataField] + [ViewVariables] public Entity? Solution = null; [DataField] diff --git a/Content.Shared/Fluids/Components/PuddleComponent.cs b/Content.Shared/Fluids/Components/PuddleComponent.cs index b8a6fe0cb882..5434479fb71b 100644 --- a/Content.Shared/Fluids/Components/PuddleComponent.cs +++ b/Content.Shared/Fluids/Components/PuddleComponent.cs @@ -19,7 +19,7 @@ public sealed partial class PuddleComponent : Component [DataField("solution")] public string SolutionName = "puddle"; - [DataField("solutionRef")] + [ViewVariables] public Entity? Solution; } } diff --git a/Content.Shared/Mind/MindComponent.cs b/Content.Shared/Mind/MindComponent.cs index a0812be8f74e..07571103ada3 100644 --- a/Content.Shared/Mind/MindComponent.cs +++ b/Content.Shared/Mind/MindComponent.cs @@ -45,9 +45,9 @@ public sealed partial class MindComponent : Component /// The first entity that this mind controlled. Used for round end information. /// Might be relevant if the player has ghosted since. /// - [DataField, AutoNetworkedField] - public NetEntity? OriginalOwnedEntity; - // This is a net entity, because this field currently ddoes not get set to null when this entity is deleted. + [AutoNetworkedField] + public NetEntity? OriginalOwnedEntity; // TODO WeakEntityReference make this a Datafield again + // This is a net entity, because this field currently does not get set to null when this entity is deleted. // This is a lazy way to ensure that people check that the entity still exists. // TODO MIND Fix this properly by adding an OriginalMindContainerComponent or something like that. From 58496b9700e09fc93c21565c0f8843bd9d134a8f Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Sat, 11 Jan 2025 21:22:47 +0100 Subject: [PATCH 078/205] Update submodule, .NET 9 (#34320) --- .github/workflows/build-docfx.yml | 2 +- .github/workflows/build-map-renderer.yml | 2 +- .github/workflows/build-test-debug.yml | 2 +- .github/workflows/publish.yml | 2 +- .github/workflows/test-packaging.yml | 2 +- .github/workflows/yaml-linter.yml | 2 +- Content.PatreonParser/Content.PatreonParser.csproj | 2 +- RobustToolbox | 2 +- global.json | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-docfx.yml b/.github/workflows/build-docfx.yml index ca1a6f0af126..2842578abc80 100644 --- a/.github/workflows/build-docfx.yml +++ b/.github/workflows/build-docfx.yml @@ -21,7 +21,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v3.2.0 with: - dotnet-version: 8.0.x + dotnet-version: 9.0.x - name: Install dependencies run: dotnet restore diff --git a/.github/workflows/build-map-renderer.yml b/.github/workflows/build-map-renderer.yml index 01575f64b9bd..3d2b1c72ffad 100644 --- a/.github/workflows/build-map-renderer.yml +++ b/.github/workflows/build-map-renderer.yml @@ -36,7 +36,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v3.2.0 with: - dotnet-version: 8.0.x + dotnet-version: 9.0.x - name: Install dependencies run: dotnet restore diff --git a/.github/workflows/build-test-debug.yml b/.github/workflows/build-test-debug.yml index 519f5af6f490..60b1cd9a1cb4 100644 --- a/.github/workflows/build-test-debug.yml +++ b/.github/workflows/build-test-debug.yml @@ -36,7 +36,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v3.2.0 with: - dotnet-version: 8.0.x + dotnet-version: 9.0.x - name: Install dependencies run: dotnet restore diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d08ae1350208..0b782326b7a6 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -22,7 +22,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v3.2.0 with: - dotnet-version: 8.0.x + dotnet-version: 9.0.x - name: Get Engine Tag run: | diff --git a/.github/workflows/test-packaging.yml b/.github/workflows/test-packaging.yml index 014cf3f5109f..ebaf13e9aeba 100644 --- a/.github/workflows/test-packaging.yml +++ b/.github/workflows/test-packaging.yml @@ -51,7 +51,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v3.2.0 with: - dotnet-version: 8.0.x + dotnet-version: 9.0.x - name: Install dependencies run: dotnet restore diff --git a/.github/workflows/yaml-linter.yml b/.github/workflows/yaml-linter.yml index 796795b234d1..e4d19dd6aebf 100644 --- a/.github/workflows/yaml-linter.yml +++ b/.github/workflows/yaml-linter.yml @@ -26,7 +26,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v3.2.0 with: - dotnet-version: 8.0.x + dotnet-version: 9.0.x - name: Install dependencies run: dotnet restore - name: Build diff --git a/Content.PatreonParser/Content.PatreonParser.csproj b/Content.PatreonParser/Content.PatreonParser.csproj index ec259e6f1dc3..1724ec0cea2d 100644 --- a/Content.PatreonParser/Content.PatreonParser.csproj +++ b/Content.PatreonParser/Content.PatreonParser.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 enable enable true diff --git a/RobustToolbox b/RobustToolbox index 5e97db435c05..e4190f4f2900 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 5e97db435c05b4c188184ef90e5d77b0500403d0 +Subproject commit e4190f4f2900634e332208a77cd6df9cef75c29a diff --git a/global.json b/global.json index 391ba3c2a30b..cdbb589edad7 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.100", + "version": "9.0.100", "rollForward": "latestFeature" } } From cc4a697d442a269e183727fff6c07bbaa8956949 Mon Sep 17 00:00:00 2001 From: Errant <35878406+Errant-4@users.noreply.github.com> Date: Wed, 27 Nov 2024 00:56:35 +0100 Subject: [PATCH 079/205] Hotfix the randomly occurring DeleteAllThenGhost test failures (#33582) * clear mindrole on component shutdown * let it go --- Content.Shared/Roles/SharedRoleSystem.cs | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/Content.Shared/Roles/SharedRoleSystem.cs b/Content.Shared/Roles/SharedRoleSystem.cs index 00271693abe2..d5820ac0392c 100644 --- a/Content.Shared/Roles/SharedRoleSystem.cs +++ b/Content.Shared/Roles/SharedRoleSystem.cs @@ -2,7 +2,6 @@ using Content.Shared.Administration.Logs; using Content.Shared.CCVar; using Content.Shared.Database; -using Content.Shared.GameTicking; using Content.Shared.Mind; using Content.Shared.Roles.Jobs; using Robust.Shared.Audio; @@ -20,7 +19,6 @@ public abstract class SharedRoleSystem : EntitySystem [Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly IConfigurationManager _cfg = default!; [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly SharedGameTicker _gameTicker = default!; [Dependency] private readonly IPrototypeManager _prototypes = default!; private JobRequirementOverridePrototype? _requirementOverride; @@ -28,6 +26,8 @@ public abstract class SharedRoleSystem : EntitySystem public override void Initialize() { Subs.CVar(_cfg, CCVars.GameRoleTimerOverride, SetRequirementOverride, true); + + SubscribeLocalEvent(OnComponentShutdown); } private void SetRequirementOverride(string value) @@ -209,7 +209,6 @@ public bool MindRemoveRole(Entity mind) where T : IComponent } antagonist |= roleComp.Antag | roleComp.ExclusiveAntag; - _entityManager.DeleteEntity(role); delete.Add(role); found = true; } @@ -219,7 +218,7 @@ public bool MindRemoveRole(Entity mind) where T : IComponent foreach (var role in delete) { - mind.Comp.MindRoles.Remove(role); + _entityManager.DeleteEntity(role); } if (mind.Comp.OwnedEntity != null) @@ -235,6 +234,17 @@ public bool MindRemoveRole(Entity mind) where T : IComponent return true; } + // Removing the mind role's reference on component shutdown + // to make sure the reference gets removed even if the mind role entity was deleted by outside code + private void OnComponentShutdown(Entity ent, ref ComponentShutdown args) + { + //TODO: Just ensure that the tests don't spawn unassociated mind role entities + if (ent.Comp.Mind.Comp is null) + return; + + ent.Comp.Mind.Comp.MindRoles.Remove(ent.Owner); + } + /// /// Finds and removes all mind roles of a specific type /// From e7cd9bc0dc58184d889a2a5108c948a6c66e1097 Mon Sep 17 00:00:00 2001 From: Errant <35878406+Errant-4@users.noreply.github.com> Date: Sat, 11 Jan 2025 22:17:26 +0100 Subject: [PATCH 080/205] Role Types (#33420) * mindcomponent namespace * wip MindRole stuff * admin player tab * mindroletype comment * mindRolePrototype redesign * broken param * wip RoleType implementation * basic role type switching for antags * traitor fix * fix AdminPanel update * the renameningTM * cleanup * feature uncreeping * roletypes on mind roles * update MindComponent.RoleType when MindRoles change * ghostrole configuration * ghostrole config improvements * live update of roleType on the character window * logging stuff and notes * remove thing no one asked for * weh * Mind Role Entities wip * headrev count fix * silicon stuff, cleanup * exclusive antag config, cleanup * jobroleadd overwerite * logging stuff * MindHasRole cleanup, admin log stuff * last second cleanup * ocd * move roletypeprototype to its own file, minor note stuff * remove Roletype.Created * log stuff * roletype setup for ghostroles and autotraitor reinforcements * ghostrole type configs * adjustable admin overlay * cleanup * fix this in its own PR * silicon antagonist * borg stuff * mmi roletype handling * spawnable borg roletype handling * weh * ghost role cleanup * weh * RoleEvent update * polish * log stuff * admin overlay config * ghostrolecomponent cleanup * weh * admin overlay code cleanup * minor cleanup * Obsolete MindRoleAddedEvent * comment * minor code cleanup * MindOnDoGreeting fix * Role update message * fix duplicate job greeting for cyborgs * fix emag job message dupe * nicer-looking role type update * crew aligned * syndicate assault borg role fix * fix test fail * fix a merge mistake * fix LoneOp role type * Update Content.Client/Administration/AdminNameOverlay.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Content.Shared/Roles/SharedRoleSystem.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * comment formatting Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * change logging category Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * fix a space Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * use MindAddRoles Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * get MindComponent from TryGetMind Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * move var declaration outside loop * remove TryComp * take RoleEnum behind the barn * don't use ensurecomp unnecessarily * cvar comments * toggleableghostrolecomponent documentation * skrek * use EntProtoId * mindrole config * merge baserolecomponent into basemindrolecomponent * ai and borg silicon role tweaks * formatting Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * I will end you (the color) Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * use LocId type for a locale id * update RoleEvent documentation * update RoleEvent documentation * remove obsolete MindRoleAddedEvent * refine MindRolesUpdate() * use dependency Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * inject dependency Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * roleType.Name no longer required * reformatted draw code logic * GhostRoleMarkerRoleComponent comment * minor SharedRoleSystem cleanup * StartingMindRoleComponent, unhardcode roundstart silicon * Update Content.Shared/Roles/SharedRoleSystem.cs * remove a whitespace --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --- .../Administration/AdminNameOverlay.cs | 36 ++++- .../UI/Tabs/PlayerTab/PlayerTab.xaml.cs | 1 + .../UI/Tabs/PlayerTab/PlayerTabEntry.xaml | 5 + .../UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs | 2 + .../UI/Tabs/PlayerTab/PlayerTabHeader.xaml | 7 + .../UI/Tabs/PlayerTab/PlayerTabHeader.xaml.cs | 10 ++ .../Character/CharacterUIController.cs | 54 ++++++- .../Character/Windows/CharacterWindow.xaml | 1 + .../Administration/Systems/AdminSystem.cs | 17 ++- .../Components/AntagSelectionComponent.cs | 2 +- .../GameTicking/GameTicker.Spawning.cs | 5 +- Content.Server/Ghost/ObserverRoleComponent.cs | 6 +- .../Roles/Components/GhostRoleComponent.cs | 13 +- .../ToggleableGhostRoleComponent.cs | 66 +++++++-- .../Roles/GhostRoleMarkerRoleComponent.cs | 8 +- Content.Server/Ghost/Roles/GhostRoleSystem.cs | 11 +- .../Ghost/Roles/ToggleableGhostRoleSystem.cs | 3 + .../PlayTimeTrackingSystem.cs | 12 +- Content.Server/Roles/Jobs/JobSystem.cs | 19 ++- Content.Server/Roles/RoleBriefingComponent.cs | 8 +- Content.Server/Roles/RoleSystem.cs | 32 +++++ .../Silicons/Borgs/BorgSystem.MMI.cs | 17 ++- Content.Server/Silicons/Borgs/BorgSystem.cs | 1 - .../Silicons/Laws/SiliconLawSystem.cs | 2 +- Content.Shared/Administration/PlayerInfo.cs | 2 + Content.Shared/CCVar/CCVars.Interface.cs | 21 +++ Content.Shared/Mind/MindComponent.cs | 7 + Content.Shared/Mind/RoleTypePrototype.cs | 25 ++++ Content.Shared/Roles/MindIsAntagonistEvent.cs | 2 +- Content.Shared/Roles/MindRoleAddedEvent.cs | 8 -- Content.Shared/Roles/MindRoleComponent.cs | 8 +- Content.Shared/Roles/RoleAddedEvent.cs | 8 +- Content.Shared/Roles/RoleEvent.cs | 6 +- Content.Shared/Roles/RoleRemovedEvent.cs | 9 +- Content.Shared/Roles/SharedRoleSystem.cs | 134 +++++++++++++++--- .../Roles/SiliconBrainRoleComponent.cs | 9 ++ .../Roles/StartingMindRoleComponent.cs | 27 ++++ .../Locale/en-US/administration/antag.ftl | 2 + .../administration/ui/tabs/player-tab.ftl | 1 + Resources/Locale/en-US/mind/role-types.ftl | 9 ++ .../Entities/Markers/Spawners/ghost_roles.yml | 31 +++- .../Mobs/Cyborgs/base_borg_chassis.yml | 1 + .../Prototypes/Entities/Mobs/NPCs/animals.yml | 11 ++ .../Entities/Mobs/NPCs/behonker.yml | 2 + .../Prototypes/Entities/Mobs/NPCs/carp.yml | 2 + .../Entities/Mobs/NPCs/elemental.yml | 2 + .../Entities/Mobs/NPCs/hellspawn.yml | 2 + .../Entities/Mobs/NPCs/regalrat.yml | 2 + .../Entities/Mobs/NPCs/revenant.yml | 2 + .../Prototypes/Entities/Mobs/NPCs/silicon.yml | 6 + .../Prototypes/Entities/Mobs/NPCs/slimes.yml | 6 + .../Prototypes/Entities/Mobs/NPCs/space.yml | 2 + .../Entities/Mobs/Player/dragon.yml | 4 +- .../Entities/Mobs/Player/familiars.yml | 4 + .../Entities/Mobs/Player/guardian.yml | 2 + .../Entities/Mobs/Player/humanoid.yml | 2 + .../Entities/Mobs/Player/silicon.yml | 8 +- .../Entities/Mobs/Player/skeleton.yml | 12 +- .../reinforcement_teleporter.yml | 10 ++ .../Prototypes/Entities/Objects/Fun/pai.yml | 6 + .../Objects/Specific/Robotics/mmi.yml | 2 + Resources/Prototypes/GameRules/roundstart.yml | 2 +- .../Prototypes/Roles/MindRoles/mind_roles.yml | 91 +++++++++++- Resources/Prototypes/Roles/role_types.yml | 37 +++++ .../XenoArch/Effects/utility_effects.yml | 2 + 65 files changed, 752 insertions(+), 115 deletions(-) create mode 100644 Content.Shared/Mind/RoleTypePrototype.cs delete mode 100644 Content.Shared/Roles/MindRoleAddedEvent.cs create mode 100644 Content.Shared/Roles/SiliconBrainRoleComponent.cs create mode 100644 Content.Shared/Roles/StartingMindRoleComponent.cs create mode 100644 Resources/Locale/en-US/mind/role-types.ftl create mode 100644 Resources/Prototypes/Roles/role_types.yml diff --git a/Content.Client/Administration/AdminNameOverlay.cs b/Content.Client/Administration/AdminNameOverlay.cs index e2db7a8d6b4c..47d251910cb5 100644 --- a/Content.Client/Administration/AdminNameOverlay.cs +++ b/Content.Client/Administration/AdminNameOverlay.cs @@ -1,16 +1,21 @@ +using System.Linq; using System.Numerics; using Content.Client.Administration.Systems; +using Content.Shared.CCVar; +using Content.Shared.Mind; using Robust.Client.Graphics; using Robust.Client.ResourceManagement; using Robust.Client.UserInterface; -using Robust.Shared; -using Robust.Shared.Enums; using Robust.Shared.Configuration; +using Robust.Shared.Enums; +using Robust.Shared.Prototypes; namespace Content.Client.Administration; internal sealed class AdminNameOverlay : Overlay { + [Dependency] private readonly IConfigurationManager _config = default!; + private readonly AdminSystem _system; private readonly IEntityManager _entityManager; private readonly IEyeManager _eyeManager; @@ -18,8 +23,16 @@ internal sealed class AdminNameOverlay : Overlay private readonly IUserInterfaceManager _userInterfaceManager; private readonly Font _font; + //TODO make this adjustable via GUI + private readonly ProtoId[] _filter = + ["SoloAntagonist", "TeamAntagonist", "SiliconAntagonist", "FreeAgent"]; + private readonly string _antagLabelClassic = Loc.GetString("admin-overlay-antag-classic"); + private readonly Color _antagColorClassic = Color.OrangeRed; + public AdminNameOverlay(AdminSystem system, IEntityManager entityManager, IEyeManager eyeManager, IResourceCache resourceCache, EntityLookupSystem entityLookup, IUserInterfaceManager userInterfaceManager) { + IoCManager.InjectDependencies(this); + _system = system; _entityManager = entityManager; _eyeManager = eyeManager; @@ -35,6 +48,9 @@ protected override void Draw(in OverlayDrawArgs args) { var viewport = args.WorldAABB; + //TODO make this adjustable via GUI + var classic = _config.GetCVar(CCVars.AdminOverlayClassic); + foreach (var playerInfo in _system.PlayerList) { var entity = _entityManager.GetEntity(playerInfo.NetEntity); @@ -64,12 +80,20 @@ protected override void Draw(in OverlayDrawArgs args) var screenCoordinates = _eyeManager.WorldToScreen(aabb.Center + new Angle(-_eyeManager.CurrentEye.Rotation).RotateVec( aabb.TopRight - aabb.Center)) + new Vector2(1f, 7f); - if (playerInfo.Antag) + + if (classic && playerInfo.Antag) { - args.ScreenHandle.DrawString(_font, screenCoordinates + (lineoffset * 2), "ANTAG", uiScale, Color.OrangeRed); -; + args.ScreenHandle.DrawString(_font, screenCoordinates + (lineoffset * 2), _antagLabelClassic, uiScale, _antagColorClassic); } - args.ScreenHandle.DrawString(_font, screenCoordinates+lineoffset, playerInfo.Username, uiScale, playerInfo.Connected ? Color.Yellow : Color.White); + else if (!classic && _filter.Contains(playerInfo.RoleProto.ID)) + { + var label = Loc.GetString(playerInfo.RoleProto.Name).ToUpper(); + var color = playerInfo.RoleProto.Color; + + args.ScreenHandle.DrawString(_font, screenCoordinates + (lineoffset * 2), label, uiScale, color); + } + + args.ScreenHandle.DrawString(_font, screenCoordinates + lineoffset, playerInfo.Username, uiScale, playerInfo.Connected ? Color.Yellow : Color.White); args.ScreenHandle.DrawString(_font, screenCoordinates, playerInfo.CharacterName, uiScale, playerInfo.Connected ? Color.Aquamarine : Color.White); } } diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs index 043bf343ecf2..b7231869c9ed 100644 --- a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs +++ b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs @@ -197,6 +197,7 @@ private int Compare(PlayerInfo x, PlayerInfo y) Header.Character => Compare(x.CharacterName, y.CharacterName), Header.Job => Compare(x.StartingJob, y.StartingJob), Header.Antagonist => x.Antag.CompareTo(y.Antag), + Header.RoleType => Compare(x.RoleProto.Name , y.RoleProto.Name), Header.Playtime => TimeSpan.Compare(x.OverallPlaytime ?? default, y.OverallPlaytime ?? default), _ => 1 }; diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml index e1371ec6f73b..54e51747fb9e 100644 --- a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml +++ b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml @@ -24,6 +24,11 @@ HorizontalExpand="True" ClipText="True"/> + [DataField] - public List>? MindRoles; + public List? MindRoles; /// /// A set of starting gear that's equipped to the player. diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs index bbcb4eeafe90..b7b9cede33aa 100644 --- a/Content.Server/GameTicking/GameTicker.Spawning.cs +++ b/Content.Server/GameTicking/GameTicker.Spawning.cs @@ -222,8 +222,6 @@ private void SpawnPlayer(ICommonSession player, _mind.SetUserId(newMind, data.UserId); var jobPrototype = _prototypeManager.Index(jobId); - _roles.MindAddJobRole(newMind, silent: silent, jobPrototype:jobId); - var jobName = _jobs.MindTryGetJobName(newMind); _playTimeTrackings.PlayerRolesChanged(player); @@ -241,6 +239,9 @@ private void SpawnPlayer(ICommonSession player, _mind.TransferTo(newMind, mob); + _roles.MindAddJobRole(newMind, silent: silent, jobPrototype:jobId); + var jobName = _jobs.MindTryGetJobName(newMind); + if (lateJoin && !silent) { if (jobPrototype.JoinNotifyCrew) diff --git a/Content.Server/Ghost/ObserverRoleComponent.cs b/Content.Server/Ghost/ObserverRoleComponent.cs index 24e592eb946e..8421fb734382 100644 --- a/Content.Server/Ghost/ObserverRoleComponent.cs +++ b/Content.Server/Ghost/ObserverRoleComponent.cs @@ -1,10 +1,12 @@ -namespace Content.Server.Ghost; +using Content.Shared.Roles; + +namespace Content.Server.Ghost; /// /// This is used to mark Observers properly, as they get Minds /// [RegisterComponent] -public sealed partial class ObserverRoleComponent : Component +public sealed partial class ObserverRoleComponent : BaseMindRoleComponent { public string Name => Loc.GetString("observer-role-name"); } diff --git a/Content.Server/Ghost/Roles/Components/GhostRoleComponent.cs b/Content.Server/Ghost/Roles/Components/GhostRoleComponent.cs index 3dea97cb5d02..5dd390bd722c 100644 --- a/Content.Server/Ghost/Roles/Components/GhostRoleComponent.cs +++ b/Content.Server/Ghost/Roles/Components/GhostRoleComponent.cs @@ -72,12 +72,16 @@ public string RoleRules } } - [DataField("allowSpeech")] - [ViewVariables(VVAccess.ReadWrite)] + /// + /// The mind roles that will be added to the mob's mind entity + /// + [DataField, Access(typeof(GhostRoleSystem), Other = AccessPermissions.ReadWriteExecute)] // Don't make eye contact + public List MindRoles = new() { "MindRoleGhostRoleNeutral" }; + + [DataField] public bool AllowSpeech { get; set; } = true; - [DataField("allowMovement")] - [ViewVariables(VVAccess.ReadWrite)] + [DataField] public bool AllowMovement { get; set; } [ViewVariables(VVAccess.ReadOnly)] @@ -107,3 +111,4 @@ public string RoleRules [Access(typeof(GhostRoleSystem), Other = AccessPermissions.ReadWriteExecute)] // also FIXME Friends public ProtoId? JobProto = null; } + diff --git a/Content.Server/Ghost/Roles/Components/ToggleableGhostRoleComponent.cs b/Content.Server/Ghost/Roles/Components/ToggleableGhostRoleComponent.cs index fa95014f21b1..3e6280235ea7 100644 --- a/Content.Server/Ghost/Roles/Components/ToggleableGhostRoleComponent.cs +++ b/Content.Server/Ghost/Roles/Components/ToggleableGhostRoleComponent.cs @@ -9,39 +9,81 @@ namespace Content.Server.Ghost.Roles.Components; [RegisterComponent, Access(typeof(ToggleableGhostRoleSystem))] public sealed partial class ToggleableGhostRoleComponent : Component { - [DataField("examineTextMindPresent")] + /// + /// The text shown on the entity's Examine when it is controlled by a player + /// + [DataField] public string ExamineTextMindPresent = string.Empty; - [DataField("examineTextMindSearching")] + /// + /// The text shown on the entity's Examine when it is waiting for a controlling player + /// + [DataField] public string ExamineTextMindSearching = string.Empty; - [DataField("examineTextNoMind")] + /// + /// The text shown on the entity's Examine when it has no controlling player + /// + [DataField] public string ExamineTextNoMind = string.Empty; - [DataField("beginSearchingText")] + /// + /// The popup text when the entity (PAI/positronic brain) it is activated to seek a controlling player + /// + [DataField] public string BeginSearchingText = string.Empty; - [DataField("roleName")] + /// + /// The name shown on the Ghost Role list + /// + [DataField] public string RoleName = string.Empty; - [DataField("roleDescription")] + /// + /// The description shown on the Ghost Role list + /// + [DataField] public string RoleDescription = string.Empty; - [DataField("roleRules")] + /// + /// The introductory message shown when trying to take the ghost role/join the raffle + /// + [DataField] public string RoleRules = string.Empty; - [DataField("wipeVerbText")] + /// + /// A list of mind roles that will be added to the entity's mind + /// + [DataField] + public List MindRoles; + + /// + /// The displayed name of the verb to wipe the controlling player + /// + [DataField] public string WipeVerbText = string.Empty; - [DataField("wipeVerbPopup")] + /// /// + /// The popup message when wiping the controlling player + /// + [DataField] public string WipeVerbPopup = string.Empty; - [DataField("stopSearchVerbText")] + /// + /// The displayed name of the verb to stop searching for a controlling player + /// + [DataField] public string StopSearchVerbText = string.Empty; - [DataField("stopSearchVerbPopup")] + /// /// + /// The popup message when stopping to search for a controlling player + /// + [DataField] public string StopSearchVerbPopup = string.Empty; + /// /// + /// The prototype ID of the job that will be given to the controlling mind + /// [DataField("job")] - public ProtoId? JobProto = null; + public ProtoId? JobProto; } diff --git a/Content.Server/Ghost/Roles/GhostRoleMarkerRoleComponent.cs b/Content.Server/Ghost/Roles/GhostRoleMarkerRoleComponent.cs index 3dfa37a6b139..da3e89ba2bbe 100644 --- a/Content.Server/Ghost/Roles/GhostRoleMarkerRoleComponent.cs +++ b/Content.Server/Ghost/Roles/GhostRoleMarkerRoleComponent.cs @@ -3,11 +3,13 @@ namespace Content.Server.Ghost.Roles; /// -/// This is used for round end display of ghost roles. -/// It may also be used to ensure some ghost roles count as antagonists in future. +/// Added to mind role entities to tag that they are a ghostrole. +/// It also holds the name for the round end display /// [RegisterComponent] public sealed partial class GhostRoleMarkerRoleComponent : BaseMindRoleComponent { - [DataField("name")] public string? Name; + //TODO does anything still use this? It gets populated by GhostRolesystem but I don't see anything ever reading it + [DataField] public string? Name; + } diff --git a/Content.Server/Ghost/Roles/GhostRoleSystem.cs b/Content.Server/Ghost/Roles/GhostRoleSystem.cs index f7cf691e727d..08a794489d95 100644 --- a/Content.Server/Ghost/Roles/GhostRoleSystem.cs +++ b/Content.Server/Ghost/Roles/GhostRoleSystem.cs @@ -33,7 +33,6 @@ using Content.Shared.Verbs; using Robust.Shared.Collections; using Content.Shared.Ghost.Roles.Components; -using Content.Shared.Roles.Jobs; namespace Content.Server.Ghost.Roles; @@ -515,13 +514,13 @@ public void GhostRoleInternalCreateMindAndTransfer(ICommonSession player, Entity var newMind = _mindSystem.CreateMind(player.UserId, EntityManager.GetComponent(mob).EntityName); - _roleSystem.MindAddRole(newMind, "MindRoleGhostMarker"); - - if(_roleSystem.MindHasRole(newMind!, out var markerRole)) - markerRole.Value.Comp2.Name = role.RoleName; - _mindSystem.SetUserId(newMind, player.UserId); _mindSystem.TransferTo(newMind, mob); + + _roleSystem.MindAddRoles(newMind.Owner, role.MindRoles, newMind.Comp); + + if (_roleSystem.MindHasRole(newMind!, out var markerRole)) + markerRole.Value.Comp2.Name = role.RoleName; } /// diff --git a/Content.Server/Ghost/Roles/ToggleableGhostRoleSystem.cs b/Content.Server/Ghost/Roles/ToggleableGhostRoleSystem.cs index 1f46bacaa07d..7bb25a63fbd0 100644 --- a/Content.Server/Ghost/Roles/ToggleableGhostRoleSystem.cs +++ b/Content.Server/Ghost/Roles/ToggleableGhostRoleSystem.cs @@ -51,10 +51,13 @@ private void OnUseInHand(EntityUid uid, ToggleableGhostRoleComponent component, var ghostRole = EnsureComp(uid); EnsureComp(uid); + + //GhostRoleComponent inherits custom settings from the ToggleableGhostRoleComponent ghostRole.RoleName = Loc.GetString(component.RoleName); ghostRole.RoleDescription = Loc.GetString(component.RoleDescription); ghostRole.RoleRules = Loc.GetString(component.RoleRules); ghostRole.JobProto = component.JobProto; + ghostRole.MindRoles = component.MindRoles; } private void OnExamined(EntityUid uid, ToggleableGhostRoleComponent component, ExaminedEvent args) diff --git a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs index c897020d17f8..2260e8c657db 100644 --- a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs +++ b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs @@ -49,8 +49,8 @@ public override void Initialize() SubscribeLocalEvent(OnRoundEnd); SubscribeLocalEvent(OnPlayerAttached); SubscribeLocalEvent(OnPlayerDetached); - SubscribeLocalEvent(OnRoleAdd); - SubscribeLocalEvent(OnRoleRemove); + SubscribeLocalEvent(OnRoleEvent); + SubscribeLocalEvent(OnRoleEvent); SubscribeLocalEvent(OnAFK); SubscribeLocalEvent(OnUnAFK); SubscribeLocalEvent(OnMobStateChanged); @@ -121,13 +121,7 @@ private IEnumerable GetTimedRoles(ICommonSession session) return GetTimedRoles(contentData.Mind.Value); } - private void OnRoleRemove(RoleRemovedEvent ev) - { - if (_minds.TryGetSession(ev.Mind, out var session)) - _tracking.QueueRefreshTrackers(session); - } - - private void OnRoleAdd(RoleAddedEvent ev) + private void OnRoleEvent(RoleEvent ev) { if (_minds.TryGetSession(ev.Mind, out var session)) _tracking.QueueRefreshTrackers(session); diff --git a/Content.Server/Roles/Jobs/JobSystem.cs b/Content.Server/Roles/Jobs/JobSystem.cs index 7e69d9d92bc4..28cfbe76b51c 100644 --- a/Content.Server/Roles/Jobs/JobSystem.cs +++ b/Content.Server/Roles/Jobs/JobSystem.cs @@ -19,10 +19,25 @@ public sealed class JobSystem : SharedJobSystem public override void Initialize() { base.Initialize(); - SubscribeLocalEvent(MindOnDoGreeting); + SubscribeLocalEvent(OnRoleAddedEvent); + SubscribeLocalEvent(OnRoleRemovedEvent); } - private void MindOnDoGreeting(EntityUid mindId, MindComponent component, ref MindRoleAddedEvent args) + private void OnRoleAddedEvent(RoleAddedEvent args) + { + MindOnDoGreeting(args.MindId, args.Mind, args); + + if (args.RoleTypeUpdate) + _roles.RoleUpdateMessage(args.Mind); + } + + private void OnRoleRemovedEvent(RoleRemovedEvent args) + { + if (args.RoleTypeUpdate) + _roles.RoleUpdateMessage(args.Mind); + } + + private void MindOnDoGreeting(EntityUid mindId, MindComponent component, RoleAddedEvent args) { if (args.Silent) return; diff --git a/Content.Server/Roles/RoleBriefingComponent.cs b/Content.Server/Roles/RoleBriefingComponent.cs index 3577033f7dcc..f4d3fe635381 100644 --- a/Content.Server/Roles/RoleBriefingComponent.cs +++ b/Content.Server/Roles/RoleBriefingComponent.cs @@ -1,11 +1,13 @@ -namespace Content.Server.Roles; +using Content.Shared.Roles; + +namespace Content.Server.Roles; /// /// Adds a briefing to the character info menu, does nothing else. /// [RegisterComponent] -public sealed partial class RoleBriefingComponent : Component +public sealed partial class RoleBriefingComponent : BaseMindRoleComponent { - [DataField("briefing"), ViewVariables(VVAccess.ReadWrite)] + [DataField] public string Briefing; } diff --git a/Content.Server/Roles/RoleSystem.cs b/Content.Server/Roles/RoleSystem.cs index 333f4f9b606f..278ac4857973 100644 --- a/Content.Server/Roles/RoleSystem.cs +++ b/Content.Server/Roles/RoleSystem.cs @@ -1,10 +1,16 @@ +using Content.Server.Chat.Managers; +using Content.Shared.Chat; using Content.Shared.Mind; using Content.Shared.Roles; +using Robust.Shared.Prototypes; namespace Content.Server.Roles; public sealed class RoleSystem : SharedRoleSystem { + [Dependency] private readonly IChatManager _chat = default!; + [Dependency] private readonly IPrototypeManager _proto = default!; + public string? MindGetBriefing(EntityUid? mindId) { if (mindId == null) @@ -37,6 +43,32 @@ public sealed class RoleSystem : SharedRoleSystem return ev.Briefing; } + + public void RoleUpdateMessage(MindComponent mind) + { + if (mind.Session is null) + return; + + if (!_proto.TryIndex(mind.RoleType, out var proto)) + return; + + var roleText = Loc.GetString(proto.Name); + var color = proto.Color; + + var session = mind.Session; + + //TODO add audio? Would need to be optional so it does not play on role changes that already come with their own audio + // _audio.PlayGlobal(Sound, session); + + var message = Loc.GetString("role-type-update-message", ("color", color), ("role", roleText)); + var wrappedMessage = Loc.GetString("chat-manager-server-wrap-message", ("message", message)); + _chat.ChatMessageToOne(ChatChannel.Server, + message, + wrappedMessage, + default, + false, + session.Channel); + } } /// diff --git a/Content.Server/Silicons/Borgs/BorgSystem.MMI.cs b/Content.Server/Silicons/Borgs/BorgSystem.MMI.cs index 76ccb21da353..7435e38f5acf 100644 --- a/Content.Server/Silicons/Borgs/BorgSystem.MMI.cs +++ b/Content.Server/Silicons/Borgs/BorgSystem.MMI.cs @@ -1,5 +1,7 @@ -using Content.Shared.Containers.ItemSlots; +using Content.Server.Roles; +using Content.Shared.Containers.ItemSlots; using Content.Shared.Mind.Components; +using Content.Shared.Roles; using Content.Shared.Silicons.Borgs.Components; using Robust.Shared.Containers; @@ -8,6 +10,9 @@ namespace Content.Server.Silicons.Borgs; /// public sealed partial class BorgSystem { + + [Dependency] private readonly SharedRoleSystem _roles = default!; + public void InitializeMMI() { SubscribeLocalEvent(OnMMIInit); @@ -41,8 +46,13 @@ private void OnMMIEntityInserted(EntityUid uid, MMIComponent component, EntInser Dirty(uid, component); if (_mind.TryGetMind(ent, out var mindId, out var mind)) + { _mind.TransferTo(mindId, uid, true, mind: mind); + if (!_roles.MindHasRole(mindId)) + _roles.MindAddRole(mindId, "MindRoleSiliconBrain", silent: true); + } + _appearance.SetData(uid, MMIVisuals.BrainPresent, true); } @@ -75,7 +85,12 @@ private void OnMMILinkedRemoved(EntityUid uid, MMILinkedComponent component, Ent RemComp(uid, component); if (_mind.TryGetMind(linked, out var mindId, out var mind)) + { + if (_roles.MindHasRole(mindId)) + _roles.MindRemoveRole(mindId); + _mind.TransferTo(mindId, uid, true, mind: mind); + } _appearance.SetData(linked, MMIVisuals.BrainPresent, false); } diff --git a/Content.Server/Silicons/Borgs/BorgSystem.cs b/Content.Server/Silicons/Borgs/BorgSystem.cs index ff204bfa8ceb..5b4b0c08ca71 100644 --- a/Content.Server/Silicons/Borgs/BorgSystem.cs +++ b/Content.Server/Silicons/Borgs/BorgSystem.cs @@ -5,7 +5,6 @@ using Content.Server.Explosion.EntitySystems; using Content.Server.Hands.Systems; using Content.Server.PowerCell; -using Content.Shared.Access.Systems; using Content.Shared.Alert; using Content.Shared.Database; using Content.Shared.IdentityManagement; diff --git a/Content.Server/Silicons/Laws/SiliconLawSystem.cs b/Content.Server/Silicons/Laws/SiliconLawSystem.cs index 832cd884ac9b..4e0bb6d596c5 100644 --- a/Content.Server/Silicons/Laws/SiliconLawSystem.cs +++ b/Content.Server/Silicons/Laws/SiliconLawSystem.cs @@ -194,7 +194,7 @@ protected override void OnGotEmagged(EntityUid uid, EmagSiliconLawComponent comp private void EnsureSubvertedSiliconRole(EntityUid mindId) { if (!_roles.MindHasRole(mindId)) - _roles.MindAddRole(mindId, "MindRoleSubvertedSilicon"); + _roles.MindAddRole(mindId, "MindRoleSubvertedSilicon", silent: true); } private void RemoveSubvertedSiliconRole(EntityUid mindId) diff --git a/Content.Shared/Administration/PlayerInfo.cs b/Content.Shared/Administration/PlayerInfo.cs index 89d1477d6b33..b26ecc499f97 100644 --- a/Content.Shared/Administration/PlayerInfo.cs +++ b/Content.Shared/Administration/PlayerInfo.cs @@ -1,3 +1,4 @@ +using Content.Shared.Mind; using Robust.Shared.Network; using Robust.Shared.Serialization; @@ -10,6 +11,7 @@ public sealed record PlayerInfo( string IdentityName, string StartingJob, bool Antag, + RoleTypePrototype RoleProto, NetEntity? NetEntity, NetUserId SessionId, bool Connected, diff --git a/Content.Shared/CCVar/CCVars.Interface.cs b/Content.Shared/CCVar/CCVars.Interface.cs index 79a28e6b4e6a..569303f1cff1 100644 --- a/Content.Shared/CCVar/CCVars.Interface.cs +++ b/Content.Shared/CCVar/CCVars.Interface.cs @@ -4,21 +4,42 @@ namespace Content.Shared.CCVar; public sealed partial class CCVars { + /// + /// The sound played when clicking a UI button + /// public static readonly CVarDef UIClickSound = CVarDef.Create("interface.click_sound", "/Audio/UserInterface/click.ogg", CVar.REPLICATED); + /// + /// The sound played when the mouse hovers over a clickable UI element + /// public static readonly CVarDef UIHoverSound = CVarDef.Create("interface.hover_sound", "/Audio/UserInterface/hover.ogg", CVar.REPLICATED); + /// + /// The layout style of the UI + /// public static readonly CVarDef UILayout = CVarDef.Create("ui.layout", "Default", CVar.CLIENTONLY | CVar.ARCHIVE); + /// + /// The dimensions for the chat window in Default UI mode + /// public static readonly CVarDef DefaultScreenChatSize = CVarDef.Create("ui.default_chat_size", "", CVar.CLIENTONLY | CVar.ARCHIVE); + /// + /// The width of the chat panel in Separated UI mode + /// public static readonly CVarDef SeparatedScreenChatSize = CVarDef.Create("ui.separated_chat_size", "0.6,0", CVar.CLIENTONLY | CVar.ARCHIVE); public static readonly CVarDef OutlineEnabled = CVarDef.Create("outline.enabled", true, CVar.CLIENTONLY); + + /// + /// If true, the admin overlay will be displayed in the old style (showing only "ANTAG") + /// + public static readonly CVarDef AdminOverlayClassic = + CVarDef.Create("ui.admin_overlay_classic", false, CVar.CLIENTONLY | CVar.ARCHIVE); } diff --git a/Content.Shared/Mind/MindComponent.cs b/Content.Shared/Mind/MindComponent.cs index 07571103ada3..fa48511a2a36 100644 --- a/Content.Shared/Mind/MindComponent.cs +++ b/Content.Shared/Mind/MindComponent.cs @@ -3,6 +3,7 @@ using Robust.Shared.GameStates; using Robust.Shared.Network; using Robust.Shared.Player; +using Robust.Shared.Prototypes; namespace Content.Shared.Mind; @@ -101,6 +102,12 @@ public sealed partial class MindComponent : Component [DataField, AutoNetworkedField] public List MindRoles = new List(); + /// + /// The mind's current antagonist/special role, or lack thereof; + /// + [DataField, AutoNetworkedField] + public ProtoId RoleType = "Neutral"; + /// /// The session of the player owning this mind. /// Can be null, in which case the player is currently not logged in. diff --git a/Content.Shared/Mind/RoleTypePrototype.cs b/Content.Shared/Mind/RoleTypePrototype.cs new file mode 100644 index 000000000000..e473b671e20f --- /dev/null +++ b/Content.Shared/Mind/RoleTypePrototype.cs @@ -0,0 +1,25 @@ +using Robust.Shared.Prototypes; + +namespace Content.Shared.Mind; + +/// +/// The core properties of Role Types +/// +[Prototype, Serializable] +public sealed class RoleTypePrototype : IPrototype +{ + [IdDataField] + public string ID { get; private set; } = default!; + + /// + /// The role's name as displayed on the UI. + /// + [DataField] + public LocId Name = "role-type-crew-aligned-name"; + + /// + /// The role's displayed color. + /// + [DataField] + public Color Color { get; private set; } = Color.FromHex("#eeeeee"); +} diff --git a/Content.Shared/Roles/MindIsAntagonistEvent.cs b/Content.Shared/Roles/MindIsAntagonistEvent.cs index aad357835961..3649ee117ac5 100644 --- a/Content.Shared/Roles/MindIsAntagonistEvent.cs +++ b/Content.Shared/Roles/MindIsAntagonistEvent.cs @@ -5,6 +5,6 @@ namespace Content.Shared.Roles; /// depending on their roles. /// /// Whether or not the player is an antagonist. -/// Whether or not AntagSelectionSystem should exclude this player from other antag rolesWhether or not AntagSelectionSystem should exclude this player from other antag roles [ByRefEvent] public record struct MindIsAntagonistEvent(bool IsAntagonist, bool IsExclusiveAntagonist); diff --git a/Content.Shared/Roles/MindRoleAddedEvent.cs b/Content.Shared/Roles/MindRoleAddedEvent.cs deleted file mode 100644 index 4f6b50d417c5..000000000000 --- a/Content.Shared/Roles/MindRoleAddedEvent.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace Content.Shared.Roles; - -/// -/// Raised on mind entities when a role is added to them. -/// for the one raised on player entities. -/// -[ByRefEvent] -public readonly record struct MindRoleAddedEvent(bool Silent); diff --git a/Content.Shared/Roles/MindRoleComponent.cs b/Content.Shared/Roles/MindRoleComponent.cs index a3dd0b3bc6da..f1eb7a5516d5 100644 --- a/Content.Shared/Roles/MindRoleComponent.cs +++ b/Content.Shared/Roles/MindRoleComponent.cs @@ -1,5 +1,4 @@ using Content.Shared.Mind; -using JetBrains.Annotations; using Robust.Shared.GameStates; using Robust.Shared.Prototypes; @@ -18,6 +17,12 @@ public sealed partial class MindRoleComponent : BaseMindRoleComponent [DataField] public bool Antag { get; set; } = false; + /// + /// The mind's current antagonist/special role, or lack thereof; + /// + [DataField] + public ProtoId? RoleType; + /// /// True if this mindrole is an exclusive antagonist. Antag setting is not checked if this is True. /// @@ -43,6 +48,7 @@ public sealed partial class MindRoleComponent : BaseMindRoleComponent } // Why does this base component actually exist? It does make auto-categorization easy, but before that it was useless? +// I used it for easy organisation/bookkeeping of what components are for mindroles [EntityCategory("Roles")] public abstract partial class BaseMindRoleComponent : Component { diff --git a/Content.Shared/Roles/RoleAddedEvent.cs b/Content.Shared/Roles/RoleAddedEvent.cs index 48bc3c781400..feb4d1bf1f9c 100644 --- a/Content.Shared/Roles/RoleAddedEvent.cs +++ b/Content.Shared/Roles/RoleAddedEvent.cs @@ -3,10 +3,10 @@ namespace Content.Shared.Roles; /// -/// Raised on player entities when a role is added to them. -/// for the one raised on mind entities. +/// Raised on mind entities when a mind role is added to them. /// /// The mind id associated with the player. /// The mind component associated with the mind id. -/// Whether or not the role makes the player an antagonist. -public sealed record RoleAddedEvent(EntityUid MindId, MindComponent Mind, bool Antagonist, bool Silent = false) : RoleEvent(MindId, Mind, Antagonist); +/// True if this update has changed the mind's role type +/// If true, Job greeting/intro will not be sent to the player's chat +public sealed record RoleAddedEvent(EntityUid MindId, MindComponent Mind, bool RoleTypeUpdate, bool Silent = false) : RoleEvent(MindId, Mind, RoleTypeUpdate); diff --git a/Content.Shared/Roles/RoleEvent.cs b/Content.Shared/Roles/RoleEvent.cs index ae6c330423ec..80dd33e1c7d9 100644 --- a/Content.Shared/Roles/RoleEvent.cs +++ b/Content.Shared/Roles/RoleEvent.cs @@ -3,9 +3,9 @@ namespace Content.Shared.Roles; /// -/// Base event raised on player entities to indicate that something changed about one of their roles. +/// Base event raised on mind entities to indicate that a mind role was either added or removed. /// /// The mind id associated with the player. /// The mind component associated with the mind id. -/// Whether or not the role makes the player an antagonist. -public abstract record RoleEvent(EntityUid MindId, MindComponent Mind, bool Antagonist); +/// True if this update has changed the mind's role type +public abstract record RoleEvent(EntityUid MindId, MindComponent Mind, bool RoleTypeUpdate); diff --git a/Content.Shared/Roles/RoleRemovedEvent.cs b/Content.Shared/Roles/RoleRemovedEvent.cs index 3a0f4989d361..41a7f7bcc366 100644 --- a/Content.Shared/Roles/RoleRemovedEvent.cs +++ b/Content.Shared/Roles/RoleRemovedEvent.cs @@ -3,12 +3,9 @@ namespace Content.Shared.Roles; /// -/// Event raised on player entities to indicate that a role was removed from their mind. +/// Raised on mind entities when a mind role is removed from them. /// /// The mind id associated with the player. /// The mind component associated with the mind id. -/// -/// Whether or not the role made the player an antagonist. -/// They may still be one due to one of their other roles. -/// -public sealed record RoleRemovedEvent(EntityUid MindId, MindComponent Mind, bool Antagonist) : RoleEvent(MindId, Mind, Antagonist); +/// True if this update has changed the mind's role type +public sealed record RoleRemovedEvent(EntityUid MindId, MindComponent Mind, bool RoleTypeUpdate) : RoleEvent(MindId, Mind, RoleTypeUpdate); diff --git a/Content.Shared/Roles/SharedRoleSystem.cs b/Content.Shared/Roles/SharedRoleSystem.cs index d5820ac0392c..89cd95c2ea35 100644 --- a/Content.Shared/Roles/SharedRoleSystem.cs +++ b/Content.Shared/Roles/SharedRoleSystem.cs @@ -1,14 +1,18 @@ using System.Diagnostics.CodeAnalysis; +using System.Linq; using Content.Shared.Administration.Logs; using Content.Shared.CCVar; using Content.Shared.Database; +using Content.Shared.GameTicking; using Content.Shared.Mind; using Content.Shared.Roles.Jobs; +using Content.Shared.Silicons.Borgs.Components; using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; using Robust.Shared.Configuration; using Robust.Shared.Map; using Robust.Shared.Prototypes; +using Robust.Shared.Serialization; using Robust.Shared.Utility; namespace Content.Shared.Roles; @@ -19,6 +23,7 @@ public abstract class SharedRoleSystem : EntitySystem [Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly IConfigurationManager _cfg = default!; [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private readonly SharedMindSystem _minds = default!; [Dependency] private readonly IPrototypeManager _prototypes = default!; private JobRequirementOverridePrototype? _requirementOverride; @@ -28,6 +33,15 @@ public override void Initialize() Subs.CVar(_cfg, CCVars.GameRoleTimerOverride, SetRequirementOverride, true); SubscribeLocalEvent(OnComponentShutdown); + SubscribeLocalEvent(OnSpawn); + } + + private void OnSpawn(EntityUid uid, StartingMindRoleComponent component, PlayerSpawnCompleteEvent args) + { + if (!_minds.TryGetMind(uid, out var mindId, out var mindComp)) + return; + + MindAddRole(mindId, component.MindRole, mind: mindComp, silent: component.Silent); } private void SetRequirementOverride(string value) @@ -50,7 +64,7 @@ private void SetRequirementOverride(string value) /// If the mind component is provided, it will be checked if it belongs to the mind entity /// If true, no briefing will be generated upon receiving the mind role public void MindAddRoles(EntityUid mindId, - List>? roles, + List? roles, MindComponent? mind = null, bool silent = false) { @@ -71,7 +85,7 @@ public void MindAddRoles(EntityUid mindId, /// If the mind component is provided, it will be checked if it belongs to the mind entity /// If true, no briefing will be generated upon receiving the mind role public void MindAddRole(EntityUid mindId, - ProtoId protoId, + EntProtoId protoId, MindComponent? mind = null, bool silent = false) { @@ -114,22 +128,20 @@ public void MindAddJobRole(EntityUid mindId, /// Creates a Mind Role /// private void MindAddRoleDo(EntityUid mindId, - ProtoId protoId, + EntProtoId protoId, MindComponent? mind = null, bool silent = false, string? jobPrototype = null) { if (!Resolve(mindId, ref mind)) { - Log.Error($"Failed to add role {protoId} to mind {mindId} : Mind does not match provided mind component"); + Log.Error($"Failed to add role {protoId} to {ToPrettyString(mindId)} : Mind does not match provided mind component"); return; } - var antagonist = false; - if (!_prototypes.TryIndex(protoId, out var protoEnt)) { - Log.Error($"Failed to add role {protoId} to mind {mindId} : Role prototype does not exist"); + Log.Error($"Failed to add role {protoId} to {ToPrettyString(mindId)} : Role prototype does not exist"); return; } @@ -151,15 +163,14 @@ private void MindAddRoleDo(EntityUid mindId, DebugTools.Assert(!mindRoleComp.ExclusiveAntag); } - antagonist |= mindRoleComp.Antag; mind.MindRoles.Add(mindRoleId); - var mindEv = new MindRoleAddedEvent(silent); - RaiseLocalEvent(mindId, ref mindEv); + var update = MindRolesUpdate((mindId, mind)); - var message = new RoleAddedEvent(mindId, mind, antagonist, silent); + // RoleType refresh, Role time tracking, Update Admin playerlist if (mind.OwnedEntity != null) { + var message = new RoleAddedEvent(mindId, mind, update, silent); RaiseLocalEvent(mind.OwnedEntity.Value, message, true); } @@ -174,12 +185,91 @@ private void MindAddRoleDo(EntityUid mindId, { //TODO: This is not tied to the player on the Admin Log filters. //Probably only happens when Job Role is added on initial spawn, before the mind entity is put in a mob + Log.Error($"{ToPrettyString(mindId)} does not have an OwnedEntity!"); _adminLogger.Add(LogType.Mind, LogImpact.Low, $"{name} added to {ToPrettyString(mindId)}"); } } + /// + /// Select the mind's currently "active" mind role entity, and update the mind's role type, if necessary + /// + /// + /// True if this changed the mind's role type + /// > + private bool MindRolesUpdate(Entity ent) + { + if(!Resolve(ent.Owner, ref ent.Comp)) + return false; + + //get the most important/latest mind role + var roleType = GetRoleTypeByTime(ent.Comp); + + if (ent.Comp.RoleType == roleType) + return false; + + SetRoleType(ent.Owner, roleType); + return true; + } + + private ProtoId GetRoleTypeByTime(MindComponent mind) + { + // If any Mind Roles specify a Role Type, return the most recent. Otherwise return Neutral + + var roles = new List>(); + + foreach (var role in mind.MindRoles) + { + var comp = Comp(role); + if (comp.RoleType is not null) + roles.Add(comp.RoleType.Value); + } + + ProtoId result = (roles.Count > 0) ? roles.LastOrDefault() : "Neutral"; + return (result); + } + + private void SetRoleType(EntityUid mind, ProtoId roleTypeId) + { + if (!TryComp(mind, out var comp)) + { + Log.Error($"Failed to update Role Type of mind entity {ToPrettyString(mind)} to {roleTypeId}. MindComponent not found."); + return; + } + + if (!_prototypes.HasIndex(roleTypeId)) + { + Log.Error($"Failed to change Role Type of {_minds.MindOwnerLoggingString(comp)} to {roleTypeId}. Invalid role"); + return; + } + + comp.RoleType = roleTypeId; + Dirty(mind, comp); + + // Update player character window + if (_minds.TryGetSession(mind, out var session)) + RaiseNetworkEvent(new MindRoleTypeChangedEvent(), session.Channel); + else + { + var error = $"The Character Window of {_minds.MindOwnerLoggingString(comp)} potentially did not update immediately : session error"; + _adminLogger.Add(LogType.Mind, LogImpact.High, $"{error}"); + } + + if (comp.OwnedEntity is null) + { + Log.Error($"{ToPrettyString(mind)} does not have an OwnedEntity!"); + _adminLogger.Add(LogType.Mind, + LogImpact.High, + $"Role Type of {ToPrettyString(mind)} changed to {roleTypeId}"); + return; + } + + _adminLogger.Add(LogType.Mind, + LogImpact.High, + $"Role Type of {ToPrettyString(comp.OwnedEntity)} changed to {roleTypeId}"); + } + /// /// Removes all instances of a specific role from this mind. /// @@ -195,20 +285,18 @@ public bool MindRemoveRole(Entity mind) where T : IComponent return false; var found = false; - var antagonist = false; var delete = new List(); foreach (var role in mind.Comp.MindRoles) { if (!HasComp(role)) continue; - if (!TryComp(role, out MindRoleComponent? roleComp)) + if (!HasComp(role)) { Log.Error($"Encountered mind role entity {ToPrettyString(role)} without a {nameof(MindRoleComponent)}"); continue; } - antagonist |= roleComp.Antag | roleComp.ExclusiveAntag; delete.Add(role); found = true; } @@ -221,9 +309,11 @@ public bool MindRemoveRole(Entity mind) where T : IComponent _entityManager.DeleteEntity(role); } + var update = MindRolesUpdate(mind); + if (mind.Comp.OwnedEntity != null) { - var message = new RoleRemovedEvent(mind.Owner, mind.Comp, antagonist); + var message = new RoleRemovedEvent(mind.Owner, mind.Comp, update); RaiseLocalEvent(mind.Comp.OwnedEntity.Value, message, true); } @@ -267,10 +357,9 @@ public bool MindTryRemoveRole(EntityUid mindId) where T : IComponent /// Finds the first mind role of a specific T type on a mind entity. /// Outputs entity components for the mind role's MindRoleComponent and for T /// - /// The mind entity + /// The mind entity /// The type of the role to find. /// The Mind Role entity component - /// The Mind Role's entity component for T /// True if the role is found public bool MindHasRole(Entity mind, [NotNullWhen(true)] out Entity? role) where T : IComponent @@ -467,7 +556,7 @@ public bool MindIsExclusiveAntagonist(EntityUid? mindId) return CheckAntagonistStatus(mindId.Value).ExclusiveAntag; } - public (bool Antag, bool ExclusiveAntag) CheckAntagonistStatus(Entity mind) + private (bool Antag, bool ExclusiveAntag) CheckAntagonistStatus(Entity mind) { if (!Resolve(mind.Owner, ref mind.Comp)) return (false, false); @@ -537,3 +626,12 @@ public void MindPlaySound(EntityUid mindId, SoundSpecifier? sound, MindComponent return antag.Requirements; } } + +/// +/// Raised on the client to update Role Type on the character window, in case it happened to be open. +/// +[Serializable, NetSerializable] +public sealed class MindRoleTypeChangedEvent : EntityEventArgs +{ + +} diff --git a/Content.Shared/Roles/SiliconBrainRoleComponent.cs b/Content.Shared/Roles/SiliconBrainRoleComponent.cs new file mode 100644 index 000000000000..72ad0a86b6d6 --- /dev/null +++ b/Content.Shared/Roles/SiliconBrainRoleComponent.cs @@ -0,0 +1,9 @@ +namespace Content.Shared.Roles; + +/// +/// Used on Silicon's minds to get the appropriate mind role +/// +[RegisterComponent] +public sealed partial class SiliconBrainRoleComponent : BaseMindRoleComponent +{ +} diff --git a/Content.Shared/Roles/StartingMindRoleComponent.cs b/Content.Shared/Roles/StartingMindRoleComponent.cs new file mode 100644 index 000000000000..768307d391c1 --- /dev/null +++ b/Content.Shared/Roles/StartingMindRoleComponent.cs @@ -0,0 +1,27 @@ +using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; + +namespace Content.Shared.Roles; + +/// +/// This is most likely not the component you are looking for, almost nothing should be using this. +/// Consider using GhostRoleComponent or AntagSelectionComponent instead. +/// +/// The specified mind role will be added to the mob on spawn. +/// +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class StartingMindRoleComponent : Component +{ + /// + /// The ID of the mind role to add + /// + [DataField(required: true)] + public EntProtoId MindRole; + + /// + /// Add the mind role silently + /// + [DataField] + public bool Silent = true; +} diff --git a/Resources/Locale/en-US/administration/antag.ftl b/Resources/Locale/en-US/administration/antag.ftl index 587c038557c9..ef4ad98c7c33 100644 --- a/Resources/Locale/en-US/administration/antag.ftl +++ b/Resources/Locale/en-US/administration/antag.ftl @@ -14,3 +14,5 @@ admin-verb-text-make-nuclear-operative = Make Nuclear Operative admin-verb-text-make-pirate = Make Pirate admin-verb-text-make-head-rev = Make Head Rev admin-verb-text-make-thief = Make Thief + +admin-overlay-antag-classic = ANTAG diff --git a/Resources/Locale/en-US/administration/ui/tabs/player-tab.ftl b/Resources/Locale/en-US/administration/ui/tabs/player-tab.ftl index 1cca5c7a934c..29bfb978e214 100644 --- a/Resources/Locale/en-US/administration/ui/tabs/player-tab.ftl +++ b/Resources/Locale/en-US/administration/ui/tabs/player-tab.ftl @@ -3,6 +3,7 @@ player-tab-username = Username player-tab-character = Character player-tab-job = Job player-tab-antagonist = Antagonist +player-tab-roletype = Role Type player-tab-playtime = Playtime player-tab-show-disconnected = Show Disconnected player-tab-overlay = Overlay diff --git a/Resources/Locale/en-US/mind/role-types.ftl b/Resources/Locale/en-US/mind/role-types.ftl new file mode 100644 index 000000000000..9b4ce9288c28 --- /dev/null +++ b/Resources/Locale/en-US/mind/role-types.ftl @@ -0,0 +1,9 @@ +role-type-crew-aligned-name = Crew Aligned +role-type-solo-antagonist-name = Solo Antagonist +role-type-team-antagonist-name = Team Antagonist +role-type-free-agent-name = Free Agent +role-type-familiar-name = Familiar +role-type-silicon-name = Silicon +role-type-silicon-antagonist-name = Altered Silicon + +role-type-update-message = Your role is [color = {$color}]{$role}[/color] diff --git a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml index 40a44006cb85..914c0933197b 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml @@ -19,6 +19,8 @@ name: ghost-role-information-rat-king-name description: ghost-role-information-rat-king-description rules: ghost-role-information-freeagent-rules + mindRoles: + - MindRoleGhostRoleFreeAgent raffle: settings: default - type: GhostRoleMobSpawner @@ -40,6 +42,8 @@ name: ghost-role-information-remilia-name description: ghost-role-information-remilia-description rules: ghost-role-information-familiar-rules + mindRoles: + - MindRoleGhostRoleFamiliar raffle: settings: short - type: GhostRoleMobSpawner @@ -61,6 +65,8 @@ name: ghost-role-information-cerberus-name description: ghost-role-information-cerberus-description rules: ghost-role-information-familiar-rules + mindRoles: + - MindRoleGhostRoleFamiliar raffle: settings: default - type: GhostRoleMobSpawner @@ -81,6 +87,8 @@ components: - type: GhostRole rules: ghost-role-information-rules-default-team-antagonist + mindRoles: + - MindRoleGhostRoleTeamAntagonist raffle: settings: default - type: GhostRoleMobSpawner @@ -101,13 +109,14 @@ name: ghost-role-information-loneop-name description: ghost-role-information-loneop-description rules: ghost-role-information-loneop-rules - requirements: + mindRoles: + - MindRoleGhostRoleSoloAntagonist + requirements: # DeltaV - !type:OverallPlaytimeRequirement - time: 172800 # DeltaV - 48 hours - - !type:DepartmentTimeRequirement # DeltaV - Security dept time requirement + time: 172800 # 48 hours overall + - !type:DepartmentTimeRequirement department: Security - time: 36000 # DeltaV - 10 hours - - type: GhostRoleAntagSpawner + time: 36000 # 10 hours of sec - type: Sprite sprite: Markers/jobs.rsi layers: @@ -124,6 +133,8 @@ name: roles-antag-nuclear-operative-commander-name description: roles-antag-nuclear-operative-commander-objective rules: ghost-role-information-rules-default-team-antagonist + mindRoles: + - MindRoleGhostRoleTeamAntagonist - type: entity categories: [ HideSpawnMenu, Spawner ] @@ -134,6 +145,8 @@ name: roles-antag-nuclear-operative-agent-name description: roles-antag-nuclear-operative-agent-objective rules: ghost-role-information-rules-default-team-antagonist + mindRoles: + - MindRoleGhostRoleTeamAntagonist - type: entity categories: [ HideSpawnMenu, Spawner ] @@ -144,6 +157,8 @@ name: roles-antag-nuclear-operative-name description: roles-antag-nuclear-operative-objective rules: ghost-role-information-rules-default-team-antagonist + mindRoles: + - MindRoleGhostRoleTeamAntagonist - type: entity categories: [ HideSpawnMenu, Spawner ] @@ -154,6 +169,8 @@ name: ghost-role-information-space-dragon-name description: ghost-role-information-space-dragon-description rules: ghost-role-information-space-dragon-rules + mindRoles: + - MindRoleGhostRoleTeamAntagonist - type: Sprite layers: - state: green @@ -169,6 +186,8 @@ name: ghost-role-information-space-ninja-name description: ghost-role-information-space-ninja-description rules: ghost-role-information-antagonist-rules + mindRoles: + - MindRoleGhostRoleSoloAntagonist raffle: settings: default requirements: @@ -197,4 +216,4 @@ layers: - state: green - sprite: Mobs/Silicon/chassis.rsi - state: derelict_icon \ No newline at end of file + state: derelict_icon diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml index c0ce8f22ff15..05165a1b4d20 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml @@ -321,6 +321,7 @@ access: [["SyndicateAgent"], ["NuclearOperative"]] - type: SiliconLawProvider laws: SyndicateStatic + subverted: true - type: IntrinsicRadioTransmitter channels: - Binary diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 632e655653a6..7acdeb6786ee 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -455,6 +455,8 @@ name: ghost-role-information-mothroach-name description: ghost-role-information-mothroach-description rules: ghost-role-information-freeagent-rules + mindRoles: + - MindRoleGhostRoleFreeAgent - type: Fixtures fixtures: fix1: @@ -1480,6 +1482,9 @@ name: ghost-role-information-monkey-name description: ghost-role-information-monkey-description rules: ghost-role-information-syndicate-reinforcement-rules + mindRoles: + # This is for syndicate monkeys that randomly gain sentience, thus have no summoner to team with + - MindRoleGhostRoleSoloAntagonist raffle: settings: default - type: GhostTakeoverAvailable @@ -1658,6 +1663,8 @@ name: ghost-role-information-mouse-name description: ghost-role-information-mouse-description rules: ghost-role-information-freeagent-rules + mindRoles: + - MindRoleGhostRoleFreeAgent - type: GhostTakeoverAvailable - type: Speech speechSounds: Squeak @@ -2436,6 +2443,8 @@ name: ghost-role-information-giant-spider-name description: ghost-role-information-giant-spider-description rules: deltav-ghost-role-information-softantag-rules # DeltaV + mindRoles: + - MindRoleGhostRoleTeamAntagonist raffle: settings: short - type: GhostTakeoverAvailable @@ -3019,6 +3028,8 @@ allowMovement: true description: ghost-role-information-SyndiCat-description rules: ghost-role-information-SyndiCat-rules + mindRoles: + - MindRoleGhostRoleTeamAntagonist raffle: settings: default - type: GhostTakeoverAvailable diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml b/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml index 1db787a66d84..6a20a503153b 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml @@ -11,6 +11,8 @@ name: ghost-role-information-behonker-name description: ghost-role-information-behonker-description rules: ghost-role-information-antagonist-rules + mindRoles: + - MindRoleGhostRoleSoloAntagonist raffle: settings: default - type: GhostTakeoverAvailable diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml index 6749375b71c0..29855992f197 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml @@ -193,6 +193,8 @@ name: ghost-role-information-sentient-carp-name description: ghost-role-information-sentient-carp-description rules: ghost-role-information-space-dragon-summoned-carp-rules + mindRoles: + - MindRoleGhostRoleTeamAntagonist raffle: settings: short - type: GhostTakeoverAvailable diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml index b67e3b520ebd..a26b1511dd6e 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml @@ -232,6 +232,8 @@ prob: 0 description: ghost-role-information-angry-slimes-description rules: ghost-role-information-angry-slimes-rules + mindRoles: + - MindRoleGhostRoleTeamAntagonist raffle: settings: short - type: NpcFactionMember diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/hellspawn.yml b/Resources/Prototypes/Entities/Mobs/NPCs/hellspawn.yml index c0f7a58f48f1..bcf10eb8f61f 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/hellspawn.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/hellspawn.yml @@ -13,6 +13,8 @@ name: ghost-role-information-hellspawn-name description: ghost-role-information-hellspawn-description rules: ghost-role-information-antagonist-rules + mindRoles: + - MindRoleGhostRoleSoloAntagonist raffle: settings: default - type: RotationVisuals diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml index 1ee1a229d481..b071b0990c84 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml @@ -96,6 +96,8 @@ name: ghost-role-information-rat-king-name description: ghost-role-information-rat-king-description rules: ghost-role-information-freeagent-rules + mindRoles: + - MindRoleGhostRoleFreeAgent raffle: settings: default - type: GhostTakeoverAvailable diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml index 580202e8aa51..82a9f774ce08 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml @@ -38,6 +38,8 @@ name: ghost-role-information-revenant-name description: ghost-role-information-revenant-description rules: ghost-role-information-antagonist-rules + mindRoles: + - MindRoleGhostRoleSoloAntagonist raffle: settings: default - type: GhostTakeoverAvailable diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml index 5198808a9149..9cdacb4b80c5 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml @@ -204,6 +204,8 @@ name: ghost-role-information-honkbot-name description: ghost-role-information-honkbot-description rules: ghost-role-information-freeagent-rules + mindRoles: + - MindRoleGhostRoleFreeAgent raffle: settings: default - type: GhostTakeoverAvailable @@ -236,6 +238,8 @@ name: ghost-role-information-jonkbot-name description: ghost-role-information-jonkbot-description rules: ghost-role-information-freeagent-rules + mindRoles: + - MindRoleGhostRoleFreeAgent raffle: settings: default - type: InteractionPopup @@ -384,6 +388,8 @@ name: ghost-role-information-mimebot-name description: ghost-role-information-mimebot-description rules: ghost-role-information-freeagent-rules + mindRoles: + - MindRoleGhostRoleFreeAgent raffle: settings: default - type: GhostTakeoverAvailable diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml index 6d036dd61ce2..0d058fd0da37 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml @@ -173,6 +173,8 @@ - type: GhostRole description: ghost-role-information-angry-slimes-description rules: ghost-role-information-angry-slimes-rules + mindRoles: + - MindRoleGhostRoleTeamAntagonist raffle: settings: short @@ -211,6 +213,8 @@ - type: GhostRole description: ghost-role-information-angry-slimes-description rules: ghost-role-information-angry-slimes-rules + mindRoles: + - MindRoleGhostRoleTeamAntagonist raffle: settings: short @@ -248,5 +252,7 @@ - type: GhostRole description: ghost-role-information-angry-slimes-description rules: ghost-role-information-angry-slimes-rules + mindRoles: + - MindRoleGhostRoleTeamAntagonist raffle: settings: short diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml index b603f3005723..8cf2391e038d 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml @@ -381,6 +381,8 @@ name: ghost-role-information-snail-name description: ghost-role-information-snail-description rules: ghost-role-information-freeagent-rules + mindRoles: + - MindRoleGhostRoleFreeAgent - type: GhostTakeoverAvailable - type: Emoting - type: Sprite diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml index 3389b2b81fb2..2cfe1aaddf6e 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml @@ -17,6 +17,8 @@ name: ghost-role-information-space-dragon-name description: ghost-role-information-space-dragon-description rules: ghost-role-information-space-dragon-rules + mindRoles: + - MindRoleGhostRoleTeamAntagonist raffle: settings: default - type: GhostTakeoverAvailable @@ -154,7 +156,7 @@ - DoorBumpOpener - type: Puller needsHands: false - + - type: entity parent: BaseMobDragon id: MobDragon diff --git a/Resources/Prototypes/Entities/Mobs/Player/familiars.yml b/Resources/Prototypes/Entities/Mobs/Player/familiars.yml index 20d5e1cf4187..fce8ab48fd20 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/familiars.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/familiars.yml @@ -11,6 +11,8 @@ name: ghost-role-information-remilia-name description: ghost-role-information-remilia-description rules: ghost-role-information-familiar-rules + mindRoles: + - MindRoleGhostRoleFamiliar - type: GhostTakeoverAvailable - type: Grammar attributes: @@ -50,6 +52,8 @@ name: ghost-role-information-cerberus-name description: ghost-role-information-cerberus-description rules: ghost-role-information-familiar-rules + mindRoles: + - MindRoleGhostRoleFamiliar raffle: settings: default - type: GhostTakeoverAvailable diff --git a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml index dca47e1c8370..e553ed97f30f 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml @@ -14,6 +14,8 @@ name: ghost-role-information-guardian-name description: ghost-role-information-guardian-description rules: ghost-role-information-familiar-rules + mindRoles: + - MindRoleGhostRoleFamiliar raffle: settings: default - type: GhostTakeoverAvailable diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml index 94a32f5cb070..ea3e4802f8f6 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml @@ -47,6 +47,8 @@ rules: ghost-role-information-Death-Squad-rules raffle: settings: short + mindRoles: + - MindRoleGhostRoleFamiliar - type: Loadout prototypes: [ DeathSquadGear ] roleLoadout: [ RoleSurvivalEVA ] diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml index df23de98c011..0a8a4245fe72 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml @@ -386,7 +386,7 @@ unlistedNumber: true requiresPower: false - type: Holopad - - type: StationAiWhitelist + - type: StationAiWhitelist - type: UserInterface interfaces: enum.HolopadUiKey.AiRequestWindow: @@ -451,6 +451,9 @@ - HideContextMenu - StationAi - NoConsoleSound + - type: StartingMindRole + mindRole: "MindRoleSiliconBrain" + silent: true # Hologram projection that the AI's eye tracks. - type: entity @@ -514,6 +517,9 @@ cell_slot: name: power-cell-slot-component-slot-name-default startingItem: PowerCellMedium + - type: StartingMindRole + mindRole: "MindRoleSiliconBrain" + silent: true - type: entity id: PlayerBorgSyndicateAssaultBattery diff --git a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml index 9b73d92a9ed0..54374328fc8d 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml @@ -18,6 +18,8 @@ name: ghost-role-information-skeleton-pirate-name description: ghost-role-information-skeleton-pirate-description rules: ghost-role-information-freeagent-rules + mindRoles: + - MindRoleGhostRoleFreeAgent raffle: settings: default - type: GhostTakeoverAvailable @@ -35,6 +37,8 @@ name: ghost-role-information-skeleton-biker-name description: ghost-role-information-skeleton-biker-description rules: ghost-role-information-freeagent-rules + mindRoles: + - MindRoleGhostRoleFreeAgent raffle: settings: default - type: GhostTakeoverAvailable @@ -51,11 +55,13 @@ name: ghost-role-information-closet-skeleton-name description: ghost-role-information-closet-skeleton-description rules: ghost-role-information-closet-skeleton-rules # DeltaV - No longer free agent, now a non-antag (Some leeway given). - requirements: - - !type:OverallPlaytimeRequirement - time: 172800 # DeltaV - 48 hours + mindRoles: + - MindRoleGhostRoleFreeAgent raffle: settings: default + requirements: # DeltaV + - !type:OverallPlaytimeRequirement + time: 172800 # 48 hours overall - type: GhostTakeoverAvailable - type: Loadout prototypes: [LimitedPassengerGear] diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml index 42d5588202c3..79a10b628715 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml @@ -26,6 +26,8 @@ name: ghost-role-information-syndicate-reinforcement-spy-name description: ghost-role-information-syndicate-reinforcement-spy-description rules: ghost-role-information-syndicate-reinforcement-rules + mindRoles: + - MindRoleGhostRoleTeamAntagonist raffle: settings: default - type: GhostRoleMobSpawner @@ -43,6 +45,8 @@ name: ghost-role-information-nukeop-reinforcement-name description: ghost-role-information-nukeop-reinforcement-description rules: ghost-role-information-nukeop-reinforcement-rules + mindRoles: + - MindRoleGhostRoleTeamAntagonist raffle: settings: default - type: GhostRoleMobSpawner @@ -58,6 +62,8 @@ name: ghost-role-information-syndicate-monkey-reinforcement-name description: ghost-role-information-syndicate-monkey-reinforcement-description rules: ghost-role-information-syndicate-reinforcement-rules + mindRoles: + - MindRoleGhostRoleTeamAntagonist raffle: settings: default - type: GhostRoleMobSpawner @@ -85,6 +91,8 @@ name: ghost-role-information-SyndiCat-name description: ghost-role-information-SyndiCat-description rules: ghost-role-information-syndicate-reinforcement-rules + mindRoles: + - MindRoleGhostRoleTeamAntagonist raffle: settings: default - type: GhostRoleMobSpawner @@ -103,6 +111,8 @@ name: ghost-role-information-syndicate-cyborg-assault-name description: ghost-role-information-syndicate-cyborg-description rules: ghost-role-information-silicon-rules + mindRoles: + - MindRoleGhostRoleSilicon raffle: settings: default - type: GhostRoleMobSpawner diff --git a/Resources/Prototypes/Entities/Objects/Fun/pai.yml b/Resources/Prototypes/Entities/Objects/Fun/pai.yml index b4af7f010e0d..19aec6e0e28a 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/pai.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/pai.yml @@ -38,6 +38,8 @@ roleName: pai-system-role-name roleDescription: pai-system-role-description roleRules: ghost-role-information-familiar-rules + mindRoles: + - MindRoleGhostRoleFamiliar wipeVerbText: pai-system-wipe-device-verb-text wipeVerbPopup: pai-system-wiped-device stopSearchVerbText: pai-system-stop-searching-verb-text @@ -91,6 +93,8 @@ roleName: pai-system-role-name-syndicate roleDescription: pai-system-role-description-syndicate roleRules: ghost-role-information-familiar-rules + mindRoles: + - MindRoleGhostRoleFamiliar - type: IntrinsicRadioTransmitter channels: - Syndicate @@ -123,6 +127,8 @@ roleName: pai-system-role-name-potato roleDescription: pai-system-role-description-potato roleRules: ghost-role-information-familiar-rules + mindRoles: + - MindRoleGhostRoleFamiliar - type: Appearance - type: GenericVisualizer visuals: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml index 4251a2447a5f..712c2167e332 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml @@ -92,6 +92,8 @@ roleName: positronic-brain-role-name roleDescription: positronic-brain-role-description roleRules: ghost-role-information-silicon-rules + mindRoles: + - MindRoleGhostRoleSilicon wipeVerbText: positronic-brain-wipe-device-verb-text wipeVerbPopup: positronic-brain-wiped-device stopSearchVerbText: positronic-brain-stop-searching-verb-text diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml index 7982c1e2b784..07520b1eca9b 100644 --- a/Resources/Prototypes/GameRules/roundstart.yml +++ b/Resources/Prototypes/GameRules/roundstart.yml @@ -204,7 +204,7 @@ definitions: - prefRoles: [ Traitor ] mindRoles: - - MindRoleTraitor + - MindRoleTraitorReinforcement - type: entity id: Revolutionary diff --git a/Resources/Prototypes/Roles/MindRoles/mind_roles.yml b/Resources/Prototypes/Roles/MindRoles/mind_roles.yml index 926ce512b414..e32c173870e7 100644 --- a/Resources/Prototypes/Roles/MindRoles/mind_roles.yml +++ b/Resources/Prototypes/Roles/MindRoles/mind_roles.yml @@ -22,14 +22,70 @@ components: - type: ObserverRole -#Ghostrole Marker +#Ghost Roles - type: entity parent: BaseMindRole - id: MindRoleGhostMarker + id: MindRoleGhostRoleNeutral name: Ghost Role components: - type: GhostRoleMarkerRole +- type: entity + parent: BaseMindRole + id: MindRoleGhostRoleFamiliar + name: Ghost Role (Familiar) + components: + - type: MindRole + roleType: Familiar + - type: GhostRoleMarkerRole + +- type: entity + parent: BaseMindRole + id: MindRoleGhostRoleFreeAgent + name: Ghost Role (Free Agent) + components: + - type: MindRole + roleType: FreeAgent + - type: GhostRoleMarkerRole + +- type: entity + parent: BaseMindRole + id: MindRoleGhostRoleSilicon + name: Ghost Role (Silicon) + components: + - type: MindRole + roleType: Silicon + - type: GhostRoleMarkerRole + +- type: entity + parent: BaseMindRole + id: MindRoleGhostRoleSiliconAntagonist + name: Ghost Role (Silicon Antagonist) + components: + - type: MindRole + roleType: SiliconAntagonist + - type: GhostRoleMarkerRole + +- type: entity + parent: BaseMindRole + id: MindRoleGhostRoleSoloAntagonist + name: Ghost Role (Solo Antagonist) + components: + - type: MindRole + roleType: SoloAntagonist + - type: GhostRoleMarkerRole + +- type: entity + parent: BaseMindRole + id: MindRoleGhostRoleTeamAntagonist + name: Ghost Role (Team Antagonist) + components: + - type: MindRole + roleType: TeamAntagonist + - type: GhostRoleMarkerRole + + + # The Job MindRole holds the mob's Job prototype - type: entity parent: BaseMindRole @@ -38,16 +94,26 @@ # description: # MindRoleComponent.JobPrototype is filled by SharedJobSystem -# Subverted Silicon +# Silicon +- type: entity + parent: BaseMindRole + id: MindRoleSiliconBrain + name: Borg Brain Role + components: + - type: MindRole + roleType: Silicon + - type: SiliconBrainRole + - type: entity parent: BaseMindRoleAntag id: MindRoleSubvertedSilicon name: Subverted Silicon Role description: components: - - type: SubvertedSiliconRole - type: MindRole antagPrototype: SubvertedSilicon + roleType: SiliconAntagonist + - type: SubvertedSiliconRole # Dragon - type: entity @@ -58,6 +124,7 @@ components: - type: MindRole antagPrototype: Dragon + roleType: TeamAntagonist exclusiveAntag: true - type: DragonRole - type: RoleBriefing @@ -72,6 +139,7 @@ components: - type: MindRole antagPrototype: SpaceNinja + roleType: SoloAntagonist exclusiveAntag: true - type: NinjaRole @@ -83,6 +151,7 @@ # description: mind-role-nukeops-description components: - type: MindRole + roleType: TeamAntagonist exclusiveAntag: true antagPrototype: Nukeops - type: NukeopsRole @@ -115,6 +184,7 @@ - type: MindRole antagPrototype: HeadRev exclusiveAntag: true + roleType: TeamAntagonist - type: RevolutionaryRole - type: entity @@ -135,6 +205,7 @@ components: - type: MindRole antagPrototype: Thief + roleType: SoloAntagonist - type: ThiefRole # Traitors @@ -147,6 +218,7 @@ - type: MindRole antagPrototype: Traitor exclusiveAntag: true + roleType: SoloAntagonist - type: TraitorRole - type: entity @@ -158,6 +230,15 @@ - type: MindRole antagPrototype: TraitorSleeper +- type: entity + parent: MindRoleTraitor + id: MindRoleTraitorReinforcement + name: Syndicate Reinforcement Role + # description: mind-role-syndicate-reinforcement-description + components: + - type: MindRole + roleType: TeamAntagonist + # Zombie Squad - type: entity parent: BaseMindRoleAntag @@ -168,6 +249,7 @@ - type: MindRole antagPrototype: InitialInfected exclusiveAntag: true + roleType: TeamAntagonist - type: InitialInfectedRole - type: entity @@ -179,4 +261,5 @@ - type: MindRole antagPrototype: Zombie exclusiveAntag: true + roleType: TeamAntagonist - type: ZombieRole diff --git a/Resources/Prototypes/Roles/role_types.yml b/Resources/Prototypes/Roles/role_types.yml new file mode 100644 index 000000000000..326abe4ee4f4 --- /dev/null +++ b/Resources/Prototypes/Roles/role_types.yml @@ -0,0 +1,37 @@ +# For use by Role Types +# Do not touch these + +- type: roleType + id: Neutral + name: role-type-crew-aligned-name + color: '#eeeeee' + +- type: roleType + id: SoloAntagonist + name: role-type-solo-antagonist-name + color: '#d82000' + +- type: roleType + id: TeamAntagonist + name: role-type-team-antagonist-name + color: '#d82000' + +- type: roleType + id: FreeAgent + name: role-type-free-agent-name + color: '#ffff00' + +- type: roleType + id: Familiar + name: role-type-familiar-name + color: '#6495ed' + +- type: roleType + id: Silicon + name: role-type-silicon-name + color: '#6495ed' + +- type: roleType + id: SiliconAntagonist + name: role-type-silicon-antagonist-name + color: '#c832e6' diff --git a/Resources/Prototypes/XenoArch/Effects/utility_effects.yml b/Resources/Prototypes/XenoArch/Effects/utility_effects.yml index 354bbb3740a9..ea224e4ed2aa 100644 --- a/Resources/Prototypes/XenoArch/Effects/utility_effects.yml +++ b/Resources/Prototypes/XenoArch/Effects/utility_effects.yml @@ -194,6 +194,8 @@ # name: ghost-role-information-artifact-name # description: ghost-role-information-artifact-description # rules: ghost-role-information-freeagent-rules +# mindRoles: +# - MindRoleGhostRoleFreeAgent # raffle: # settings: default # - type: GhostTakeoverAvailable From 7bf15d4354498da71dc417c1ad6b0a31ea61eca0 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 11 Jan 2025 21:18:33 +0000 Subject: [PATCH 081/205] Automatic changelog update --- Resources/Changelog/Admin.yml | 9 +++++++++ Resources/Changelog/Changelog.yml | 17 ++++++++--------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml index 576d1caaa161..65ab56a01012 100644 --- a/Resources/Changelog/Admin.yml +++ b/Resources/Changelog/Admin.yml @@ -678,5 +678,14 @@ Entries: id: 84 time: '2025-01-08T15:23:34.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/34122 +- author: Errant + changes: + - message: The Admin Menu and Admin Overlay now shows the specific role types of + players and antagonists, respectively. The old admin overlay can still be used + with cvar ui.admin_overlay_classic true + type: Tweak + id: 85 + time: '2025-01-11T21:17:26.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/33420 Name: Admin Order: 3 diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index bd0616cb79e1..b30a1d4348bf 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,13 +1,4 @@ Entries: -- author: themias - changes: - - message: Added the justice helm to the secdrobe - type: Add - - message: Added a crafting recipe for the justice helm - type: Add - id: 7300 - time: '2024-09-07T03:04:31.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/31905 - author: Futuristic changes: - message: Remove binary encryption key from RD lockers @@ -3938,3 +3929,11 @@ id: 7799 time: '2025-01-11T20:03:04.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/34251 +- author: Errant + changes: + - message: Players are now informed in chat every time their role type changes, + and can also see their current role type on the character window. + type: Add + id: 7800 + time: '2025-01-11T21:17:26.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/33420 From f19ccc2abdcd9c92fc319918b6fbd81413f96060 Mon Sep 17 00:00:00 2001 From: deltanedas <@deltanedas:kde.org> Date: Sun, 12 Jan 2025 08:49:56 +0000 Subject: [PATCH 082/205] appraisal tool sound --- .../_DV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 0ae6009f0cde..f659db18f600 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -201,6 +201,8 @@ - type: Gun fireRate: 4.5 showExamineText: false + soundGunshot: + path: /Audio/Items/appraiser.ogg - type: PriceGun - type: UseDelay delay: 1 # To allow use of the price gun while not hindering the gun portion of it. From 8f9e62edbc6f46ec3792f0d92b4ea3e9d2388897 Mon Sep 17 00:00:00 2001 From: deltanedas <@deltanedas:kde.org> Date: Sun, 12 Jan 2025 08:57:25 +0000 Subject: [PATCH 083/205] remove FastAccessors from deep frier --- .../Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs index 4ac8684a7a3e..892531803b0f 100644 --- a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs +++ b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs @@ -48,7 +48,6 @@ using Content.Shared.Throwing; using Content.Shared.UserInterface; using Content.Shared.Whitelist; -using FastAccessors; using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; From 22ad62dc61e3d14f84fb48843d2226d32f112ec2 Mon Sep 17 00:00:00 2001 From: deltanedas <@deltanedas:kde.org> Date: Sun, 12 Jan 2025 09:01:26 +0000 Subject: [PATCH 084/205] :trollface: --- Content.IntegrationTests/Tests/PostMapInitTest.cs | 1 - .../_DV/TapeRecorder/Systems/SharedTapeRecorderSystem.cs | 2 -- 2 files changed, 3 deletions(-) diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs index 428d2e8ea18f..5545d1978a84 100644 --- a/Content.IntegrationTests/Tests/PostMapInitTest.cs +++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs @@ -17,7 +17,6 @@ using Robust.Shared.Map.Components; using Robust.Shared.Prototypes; using Content.Shared.Station.Components; -using FastAccessors; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; diff --git a/Content.Shared/_DV/TapeRecorder/Systems/SharedTapeRecorderSystem.cs b/Content.Shared/_DV/TapeRecorder/Systems/SharedTapeRecorderSystem.cs index 35e60e46a83d..b69a9df78e72 100644 --- a/Content.Shared/_DV/TapeRecorder/Systems/SharedTapeRecorderSystem.cs +++ b/Content.Shared/_DV/TapeRecorder/Systems/SharedTapeRecorderSystem.cs @@ -6,7 +6,6 @@ using Content.Shared.Examine; using Content.Shared.Interaction; using Content.Shared.Labels.Components; -using Content.Shared.Popups; using Content.Shared.Tag; using Content.Shared.Toggleable; using Content.Shared.UserInterface; @@ -30,7 +29,6 @@ public abstract class SharedTapeRecorderSystem : EntitySystem [Dependency] protected readonly SharedAudioSystem Audio = default!; [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; [Dependency] private readonly ItemSlotsSystem _slots = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; [Dependency] private readonly SharedUserInterfaceSystem _ui = default!; protected const string SlotName = "cassette_tape"; From ad05ba0ebea49f97f4896c984d6cceab8da98e99 Mon Sep 17 00:00:00 2001 From: deltanedas <@deltanedas:kde.org> Date: Sun, 12 Jan 2025 09:03:24 +0000 Subject: [PATCH 085/205] untroll footprint --- Content.Shared/_EE/Footprint/FootPrintComponent.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Shared/_EE/Footprint/FootPrintComponent.cs b/Content.Shared/_EE/Footprint/FootPrintComponent.cs index 6f2f2aab7270..e342275e459d 100644 --- a/Content.Shared/_EE/Footprint/FootPrintComponent.cs +++ b/Content.Shared/_EE/Footprint/FootPrintComponent.cs @@ -18,6 +18,6 @@ public sealed partial class FootPrintComponent : Component [DataField] public string SolutionName = "step"; - [DataField] + [ViewVariables] public Entity? Solution; } From 111724d045da488878067a7d011163d993cfbc44 Mon Sep 17 00:00:00 2001 From: deltanedas <@deltanedas:kde.org> Date: Sun, 12 Jan 2025 09:13:11 +0000 Subject: [PATCH 086/205] other fix --- .../Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs b/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs index ef4e6326cda5..6c103bf6aef4 100644 --- a/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs +++ b/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs @@ -35,7 +35,7 @@ await server.WaitAssertion(() => { playerUid = serverPlayerManager.Sessions.Single().AttachedEntity.GetValueOrDefault(); #pragma warning disable NUnit2045 // Interdependent assertions. - Assert.That(playerUid, Is.Not.EqualTo(default)); + Assert.That(playerUid, Is.Not.EqualTo(default(EntityUid))); // Making sure it exists Assert.That(entManager.HasComponent(playerUid)); #pragma warning restore NUnit2045 From 6403bec7fec9824ec5f89b6012aed03b0e2bfc3c Mon Sep 17 00:00:00 2001 From: rosieposie <52761126+rosieposieeee@users.noreply.github.com> Date: Sun, 12 Jan 2025 10:48:38 -0500 Subject: [PATCH 087/205] Nukie Steamroll Preventative (#2658) * Update uplink_catalog.yml * Update uplink_catalog.yml * Update uplink_catalog.yml * Update uplink_catalog.yml --- Resources/Prototypes/Catalog/uplink_catalog.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index a069bb39b122..9e95b187e4ea 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -133,9 +133,9 @@ productEntity: EnergyShield discountCategory: veryRareDiscounts discountDownTo: - Telecrystal: 5 # DeltaV - was 4 + Telecrystal: 12 # DeltaV - was 4 cost: - Telecrystal: 10 # DeltaV - Was 8 + Telecrystal: 16 # DeltaV - Was 8 categories: - UplinkWeaponry conditions: @@ -194,9 +194,9 @@ productEntity: ClothingBackpackDuffelSyndicateFilledGrenadeLauncher discountCategory: veryRareDiscounts discountDownTo: - Telecrystal: 20 + Telecrystal: 35 # DeltaV - Was 20 cost: - Telecrystal: 25 + Telecrystal: 40 # DeltaV - Was 25 categories: - UplinkWeaponry @@ -208,9 +208,9 @@ productEntity: ClothingBackpackDuffelSyndicateFilledLMG discountCategory: veryRareDiscounts discountDownTo: - Telecrystal: 24 + Telecrystal: 20 # DeltaV - Was 8 cost: - Telecrystal: 30 + Telecrystal: 24 # DeltaV - Was 12 categories: - UplinkWeaponry @@ -1624,9 +1624,9 @@ productEntity: CrateCybersunJuggernautBundle discountCategory: veryRareDiscounts discountDownTo: - Telecrystal: 8 - cost: Telecrystal: 12 + cost: + Telecrystal: 20 categories: - UplinkWearables From 7d0797a75dd13726e7fedde5047bae5537cd0c25 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Sun, 12 Jan 2025 16:48:58 +0100 Subject: [PATCH 088/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 1ac086239ac3..e03fc2da0684 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Colin-Tel - changes: - - message: Adjusted hunger rate to be slightly less painful. - type: Tweak - id: 401 - time: '2024-06-14T21:15:48.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1384 - author: Bellwether changes: - message: The Chief Justice's apparel is now available in the uniform printer @@ -3851,3 +3844,10 @@ id: 900 time: '2025-01-11T17:30:42.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2692 +- author: rosieposieeee + changes: + - message: Rebalanced the prices of the eshield, china-lake, and juggernaut suit. + type: Tweak + id: 901 + time: '2025-01-12T15:48:39.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2658 From fbae6288bf63a382a395b547116219d77dd75ce3 Mon Sep 17 00:00:00 2001 From: Radezolid Date: Sun, 12 Jan 2025 20:14:56 -0300 Subject: [PATCH 089/205] Clean up the loadouts (#2711) * Detective clean up * Forgor the comments * HoS clean up * Warden clean up * LO clean up * Salvage clean up * Bartender clean up * Passenger clean up * Captain clean up * Chemist clean up * Engineer clean up * CMO clean up * Medical clean up * Mysta clean up * Remove repeated clothing from psychologist * Move DeltaV loadouts, better comments and new loadouts for sec * Untouch the security star * Forgor --- .../Loadouts/Jobs/Cargo/quartermaster.yml | 16 - .../Jobs/Cargo/salvage_specialist.yml | 11 - .../Loadouts/Jobs/Civilian/bartender.yml | 6 - .../Loadouts/Jobs/Civilian/passenger.yml | 46 --- .../Loadouts/Jobs/Command/captain.yml | 27 -- .../Jobs/Engineering/station_engineer.yml | 5 - .../Loadouts/Jobs/Medical/chemist.yml | 35 -- .../Jobs/Medical/chief_medical_officer.yml | 6 - .../Loadouts/Jobs/Medical/medical_doctor.yml | 6 - .../Loadouts/Jobs/Medical/paramedic.yml | 5 - .../Jobs/Science/research_director.yml | 16 - .../Loadouts/Jobs/Security/detective.yml | 30 -- .../Jobs/Security/head_of_security.yml | 41 -- .../Loadouts/Jobs/Security/warden.yml | 35 -- .../Prototypes/Loadouts/loadout_groups.yml | 363 ++++++------------ .../Prototypes/Loadouts/role_loadouts.yml | 8 +- .../_DV/Loadouts/Jobs/Cargo/quartermaster.yml | 17 + ..._technician.yml => salvage_specialist.yml} | 12 + .../_DV/Loadouts/Jobs/Civilian/bartender.yml | 6 + .../_DV/Loadouts/Jobs/Civilian/passenger.yml | 46 +++ .../_DV/Loadouts/Jobs/Command/captain.yml | 28 ++ .../Jobs/Engineering/station_engineer.yml | 6 + .../_DV/Loadouts/Jobs/Medical/chemist.yml | 34 ++ .../Jobs/Medical/chief_medical_officer.yml | 5 + .../Loadouts/Jobs/Medical/medical_doctor.yml | 6 + .../_DV/Loadouts/Jobs/Medical/paramedic.yml | 5 + .../Loadouts/Jobs/Medical/psychologist.yml | 15 - .../_DV/Loadouts/Jobs/Science/mystagogue.yml | 19 + .../_DV/Loadouts/Jobs/Security/detective.yml | 33 ++ .../Jobs/Security/head_of_security.yml | 42 ++ .../_DV/Loadouts/Jobs/Security/warden.yml | 36 ++ .../_DV/Loadouts/loadout_groups.yml | 232 ++++++++++- 32 files changed, 635 insertions(+), 563 deletions(-) create mode 100644 Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/quartermaster.yml rename Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/{salvage_technician.yml => salvage_specialist.yml} (52%) create mode 100644 Resources/Prototypes/_DV/Loadouts/Jobs/Command/captain.yml create mode 100644 Resources/Prototypes/_DV/Loadouts/Jobs/Medical/chemist.yml create mode 100644 Resources/Prototypes/_DV/Loadouts/Jobs/Medical/chief_medical_officer.yml create mode 100644 Resources/Prototypes/_DV/Loadouts/Jobs/Medical/paramedic.yml create mode 100644 Resources/Prototypes/_DV/Loadouts/Jobs/Security/head_of_security.yml create mode 100644 Resources/Prototypes/_DV/Loadouts/Jobs/Security/warden.yml diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml index 798ea78daf76..ecdf1e5ffee2 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml @@ -24,11 +24,6 @@ equipment: jumpsuit: ClothingUniformJumpsuitQMFormal -- type: loadout #DeltaV - id: QuartermasterFormalDress - equipment: - jumpsuit: ClothingUniformJumpskirtQMFormal - # Head - type: loadout id: QuartermasterHead @@ -40,11 +35,6 @@ equipment: head: ClothingHeadHatBeretQM -- type: loadout # DeltaV - id: LogiOfficerBeret - equipment: - head: ClothingHeadHatBeretLogi - # Neck - type: loadout id: QuartermasterCloak @@ -61,9 +51,3 @@ id: QuartermasterWintercoat equipment: outerClothing: ClothingOuterWinterQM - -# Shoes - DeltaV -- type: loadout - id: QuartermasterWinterBoots - equipment: - shoes: ClothingShoesBootsWinterLogisticsOfficer diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml index fca3d4eb5fce..5ca110b5fc6f 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml @@ -25,14 +25,3 @@ id: SalvageBoots equipment: shoes: ClothingShoesBootsSalvage - -- type: loadout # DeltaV - id: SalvageWinterBoots - equipment: - shoes: ClothingShoesBootsWinterMiner - -# Neck - DeltaV -- type: loadout # DeltaV - id: SalvageCloak - equipment: - neck: ClothingNeckSalvager diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml index 3363cdc200b0..c8c80c7895d7 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml @@ -40,9 +40,3 @@ id: BartenderWintercoat equipment: outerClothing: ClothingOuterWinterBar - -# Glasses - DeltaV -- type: loadout - id: BartenderGlasses - equipment: - eyes: ClothingEyesHudBeer diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml index ab5ab5eb3e65..535c2aacf3da 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml @@ -48,52 +48,6 @@ equipment: jumpsuit: ClothingUniformColorRainbow -# Rose Hoodie w/ Skirt - DeltaV -- type: loadout - id: MioSkirt - equipment: - jumpsuit: ClothingCostumeMioSkirt - -# Turqoise Hoodie w/ Shorts - DeltaV -- type: loadout - id: NaotaHoodie - equipment: - jumpsuit: ClothingCostumeNaota - -# Casual Blue - DeltaV -- type: loadout - id: CasualRedSkirt - equipment: - jumpsuit: ClothingUniformJumpskirtCasualRed - -- type: loadout - id: CasualRedSuit - equipment: - jumpsuit: ClothingUniformJumpsuitCasualRed - - -# Casual Blue - DeltaV -- type: loadout - id: CasualBlueSkirt - equipment: - jumpsuit: ClothingUniformJumpskirtCasualBlue - -- type: loadout - id: CasualBlueSuit - equipment: - jumpsuit: ClothingUniformJumpsuitCasualBlue - -# Casual Purple - DeltaV -- type: loadout - id: CasualPurpleSkirt - equipment: - jumpsuit: ClothingUniformJumpskirtCasualPurple - -- type: loadout - id: CasualPurpleSuit - equipment: - jumpsuit: ClothingUniformJumpsuitCasualPurple - # Ancient - type: loadout id: AncientJumpsuit diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml index 63dd74961af0..4d2b15f70c22 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml @@ -30,22 +30,12 @@ equipment: head: ClothingHeadHatCapcap -- type: loadout # DeltaV - id: CaptainBeret - equipment: - head: ClothingHeadHatBeretCap - # Neck - type: loadout id: CaptainCloak equipment: neck: ClothingNeckCloakCap -- type: loadout # DeltaV - id: CaptainCloakFormal - equipment: - neck: ClothingNeckCloakCapFormal - - type: loadout id: CaptainMantle equipment: @@ -77,20 +67,3 @@ id: CaptainWintercoat equipment: outerClothing: ClothingOuterWinterCap - -# Gloves - DeltaV -- type: loadout # DeltaV - id: CaptainGloves - equipment: - gloves: ClothingHandsGlovesCaptain - -- type: loadout # DeltaV - id: InspectionGloves - equipment: - gloves: ClothingHandsGlovesInspection - -# Shoes - DeltaV -- type: loadout # DeltaV - id: CaptainWinterBoots - equipment: - shoes: ClothingShoesBootsWinterCap diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml index 38c3909d7c81..6538efe168ca 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml @@ -101,11 +101,6 @@ equipment: outerClothing: ClothingOuterVestHazard -- type: loadout # DeltaV - id: StationEngineerWintercoat - equipment: - outerClothing: ClothingOuterWinterEngi - # Shoes - type: loadout id: WorkBoots diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml index cea3ca94b717..111af7b35a05 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml @@ -1,9 +1,3 @@ -# Neck - DeltaV -- type: loadout # DeltaV - id: ChemistTie - equipment: - neck: ClothingNeckTieChem - # Jumpsuit - type: loadout id: ChemistJumpsuit @@ -15,11 +9,6 @@ equipment: jumpsuit: ClothingUniformJumpskirtChemistry -- type: loadout # DeltaV - id: ChemistFormalSuit - equipment: - jumpsuit: ClothingUniformJumpsuitChemShirt - # Back - type: loadout id: ChemistBackpack @@ -46,27 +35,3 @@ id: ChemistWintercoat equipment: outerClothing: ClothingOuterWinterChem - -## Start DeltaV Changes -- type: loadout - id: ChemistApron - equipment: - outerClothing: ClothingOuterApronChemist - -# Gloves - DeltaV -- type: loadout - id: ChemistGloves - equipment: - gloves: ClothingHandsGlovesChemist - -# Shoes - DeltaV -- type: loadout - id: ChemistWinterBoots - equipment: - shoes: ClothingShoesBootsWinterChem - -- type: loadout - id: ChemistShoes - equipment: - shoes: ClothingShoesEnclosedChem -## End DeltaV Changes diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml index c0e95cf5c075..0671bcfc32b5 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml @@ -51,9 +51,3 @@ id: ChiefMedicalOfficerWintercoat equipment: outerClothing: ClothingOuterWinterCMO - -# Shoes - DeltaV -- type: loadout - id: ChiefMedicalOfficerWinterBoots - equipment: - shoes: ClothingShoesBootsWinterChiefMedicalOfficer diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml index d715f0ede62a..8e66f5a4c107 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml @@ -72,12 +72,6 @@ equipment: head: ClothingHeadNurseHat -# Neck - DeltaV -- type: loadout # DeltaV - id: Stethoscope - equipment: - neck: ClothingNeckStethoscope - # Jumpsuit - type: loadout id: MedicalDoctorJumpsuit diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml index 9347e0c4b1eb..1cfe22787200 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml @@ -31,8 +31,3 @@ id: BlueShoes equipment: shoes: ClothingShoesColorBlue - -- type: loadout # DeltaV - id: ParamedicWinterBoots - equipment: - shoes: ClothingShoesBootsWinterParamedic diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml b/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml index fabfc964040c..c1c644de2a77 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml @@ -4,11 +4,6 @@ id: ResearchDirectorBeret startingGear: ScientificBeret -- type: loadout # DeltaV - id: ResearchDirectorHood - equipment: - head: ClothingHeadHoodMysta - # Neck - type: loadout @@ -38,18 +33,7 @@ equipment: outerClothing: ClothingOuterCoatRD -- type: loadout # DeltaV - id: MystaLabCoat - equipment: - outerClothing: ClothingOuterCoatRndMysta - - type: loadout id: ResearchDirectorWintercoat equipment: outerClothing: ClothingOuterWinterRD - -# Shoes - DeltaV -- type: loadout # DeltaV - id: ResearchDirectorWinterBoots - equipment: - shoes: ClothingShoesBootsWinterMystagogue diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml index cfda9849b839..e8afa5a203ca 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml @@ -9,11 +9,6 @@ equipment: head: ClothingHeadHatFedoraGrey -- type: loadout # DeltaV - id: DetBeret - equipment: - head: ClothingHeadHatBeretDet - # Neck - type: loadout id: DetectiveTie @@ -41,26 +36,6 @@ equipment: jumpsuit: ClothingUniformJumpskirtDetectiveGrey -- type: loadout # DeltaV - id: ForensicSpecJumpsuit - equipment: - jumpsuit: ClothingUniformJumpsuitForensicSpec - -- type: loadout # DeltaV - id: ForensicSpecJumpskirt - equipment: - jumpsuit: ClothingUniformJumpskirtForensicSpec - -- type: loadout # DeltaV - id: ForensicSpecTurtlesuit - equipment: - jumpsuit: ClothingUniformJumpsuitDetTurtle - -- type: loadout # DeltaV - id: ForensicSpecTurtleskirt - equipment: - jumpsuit: ClothingUniformJumpskirtDetTurtle - # OuterClothing - type: loadout id: DetectiveArmorVest @@ -71,8 +46,3 @@ id: DetectiveCoat equipment: outerClothing: ClothingOuterCoatDetectiveLoadout - -- type: loadout # DeltaV - id: StasecWinterCoatDet - equipment: - outerClothing: ClothingOuterCoatStasecDet diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml index 9b762ffd3f55..6f9d72f2b054 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml @@ -9,26 +9,6 @@ equipment: jumpsuit: ClothingUniformJumpskirtHoS -- type: loadout # DeltaV - id: HeadofSecurityJumpsuitGrey - equipment: - jumpsuit: ClothingUniformJumpsuitHoSGrey - -- type: loadout # DeltaV - id: HeadofSecurityJumpskirtGrey - equipment: - jumpsuit: ClothingUniformJumpskirtHoSGrey - -- type: loadout # DeltaV - id: HeadofSecurityJumpsuitBlue - equipment: - jumpsuit: ClothingUniformJumpsuitHoSBlue - -- type: loadout # DeltaV - id: HeadofSecurityJumpskirtBlue - equipment: - jumpsuit: ClothingUniformJumpskirtHoSBlue - - type: loadout id: HeadofSecurityTurtleneck equipment: @@ -49,16 +29,6 @@ equipment: jumpsuit: ClothingUniformJumpskirtHosFormal -- type: loadout # DeltaV - id: HeadofSecurityParadeSuit - equipment: - jumpsuit: ClothingUniformJumpsuitHoSParadeMale - -- type: loadout # DeltaV - id: HeadofSecurityParadeSkirt - equipment: - jumpsuit: ClothingUniformJumpskirtHoSParadeMale - # Head - type: loadout id: HeadofSecurityHead @@ -91,14 +61,3 @@ id: HeadofSecurityWinterCoat equipment: outerClothing: ClothingOuterWinterHoS - -- type: loadout # DeltaV - security winter coat - id: StasecWinterCoatHoS - equipment: - outerClothing: ClothingOuterCoatStasecHoS - -# Shoes - DeltaV -- type: loadout # DeltaV - id: HeadOfSecurityWinterBoots - equipment: - shoes: ClothingShoesBootsWinterHeadOfSecurity diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml b/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml index 54f1bb0c2101..9c270e6d6fd9 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml @@ -20,36 +20,6 @@ equipment: jumpsuit: ClothingUniformJumpskirtWarden -- type: loadout # DeltaV - id: WardenJumpsuitGrey - equipment: - jumpsuit: ClothingUniformJumpsuitWardenGrey - -- type: loadout # DeltaV - id: WardenJumpskirtGrey - equipment: - jumpsuit: ClothingUniformJumpskirtWardenGrey - -- type: loadout # DeltaV - id: WardenJumpsuitBlue - equipment: - jumpsuit: ClothingUniformJumpsuitWardenBlue - -- type: loadout # DeltaV - id: WardenJumpskirtBlue - equipment: - jumpsuit: ClothingUniformJumpskirtWardenBlue - -- type: loadout - id: WardenTurtlesuit - equipment: - jumpsuit: ClothingUniformJumpsuitWardenTurtle # DeltaV - -- type: loadout - id: WardenTurtleskirt - equipment: - jumpsuit: ClothingUniformJumpskirtWardenTurtle # DeltaV - # OuterClothing - type: loadout id: WardenCoat @@ -60,8 +30,3 @@ id: WardenArmoredWinterCoat equipment: outerClothing: ClothingOuterWinterWarden - -- type: loadout # DeltaV - security winter coat - id: StasecWinterCoatWarden - equipment: - outerClothing: ClothingOuterCoatStasecWarden diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index daea9b3c67fd..29a7a0f79419 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -119,14 +119,6 @@ - CaptainFormalSuit - CaptainFormalSkirt -- type: loadoutGroup # DeltaV - id: CaptainGloves - name: loadout-group-captain-gloves - minLimit: 0 - loadouts: - - CaptainGloves - - InspectionGloves - - type: loadoutGroup id: CaptainNeck name: loadout-group-captain-neck @@ -151,15 +143,6 @@ - CaptainOuterClothing - CaptainWintercoat -- type: loadoutGroup # DeltaV - id: CaptainShoes - name: loadout-group-captain-shoes - loadouts: - - BrownLeatherShoes - - WhiteLeatherShoes - - LaceupShoes - - CaptainWinterBoots - - type: loadoutGroup id: HoPHead name: loadout-group-hop-head @@ -167,25 +150,19 @@ loadouts: - HoPHead -- type: loadoutGroup # DeltaV - id: HoPGloves - name: loadout-group-hop-gloves - minLimit: 0 - loadouts: - - HoPGloves - - InspectionGloves - - type: loadoutGroup id: HoPJumpsuit name: loadout-group-hop-jumpsuit loadouts: - HoPJumpsuit - HoPJumpskirt - - HoPFormal # DeltaV - - HoPFormalDress # DeltaV - - HoPMessSkirt # DeltaV - - HoPMessSuit # DeltaV - - HoPBoatswain # DeltaV + # Begin DeltaV additions + - HoPFormal + - HoPFormalDress + - HoPMessSkirt + - HoPMessSuit + - HoPBoatswain + # End DeltaV additions - type: loadoutGroup id: HoPNeck @@ -210,20 +187,13 @@ name: loadout-group-hop-outerclothing minLimit: 0 loadouts: - - HoPFormalCoat # DeltaV - - HoPArmoredCoat # DeltaV - - DuraVest # DeltaV + # Begin DeltaV additions + - HoPFormalCoat + - HoPArmoredCoat + - DuraVest + # End DeltaV additions - HoPWintercoat -- type: loadoutGroup # DeltaV - id: HoPShoes - name: loadout-group-hop-shoes - loadouts: - - BrownLeatherShoes - - WhiteLeatherShoes - - LaceupShoes - - HoPWinterBoots - # Civilian - type: loadoutGroup id: PassengerJumpsuit @@ -231,14 +201,16 @@ loadouts: - GreyJumpsuit - GreyJumpskirt - - MioSkirt # Start DeltaV Changes + # Begin DeltaV additions + - MioSkirt - NaotaHoodie - CasualBlueSkirt - CasualBlueSuit - CasualRedSkirt - CasualRedSuit - CasualPurpleSkirt - - CasualPurpleSuit # End DeltaV Changes + - CasualPurpleSuit + # Begin DeltaV additions - AncientJumpsuit - RainbowJumpsuit @@ -293,23 +265,6 @@ - BartenderHead - BartenderBowler -- type: loadoutGroup # DeltaV - id: BartenderGlasses - name: loadout-group-bartender-glasses - minLimit: 0 - loadouts: - - Glasses - - BartenderGlasses - - GlassesCheapSunglasses - -- type: loadoutGroup # DeltaV - id: BartenderNeck - name: loadout-group-bartender-neck - minLimit: 0 - loadouts: - - ScarfBlack - - ScarfPurple - - type: loadoutGroup id: BartenderJumpsuit name: loadout-group-bartender-jumpsuit @@ -317,10 +272,12 @@ - BartenderJumpsuit - BartenderJumpskirt - BartenderJumpsuitPurple - - ClothingUniformNightclubSuit #imp - - ClothingUniformNightclubSuitSkirt #imp - - ClothingUniformSeniorBartender #imp - - ClothingUniformSeniorBartenderSkirt #imp + # Begin Imp additions + - ClothingUniformNightclubSuit + - ClothingUniformNightclubSuitSkirt + - ClothingUniformSeniorBartender + - ClothingUniformSeniorBartenderSkirt + # End Imp additions - type: loadoutGroup id: BartenderOuterClothing @@ -361,13 +318,6 @@ - ChefJacket - ChefWintercoat -- type: loadoutGroup # DeltaV - id: LibrarianNeck - name: loadout-group-librarian-neck - loadouts: - - ScarfGreen - - ScarfRed - - type: loadoutGroup id: LibrarianJumpsuit name: loadout-group-librarian-jumpsuit @@ -376,8 +326,10 @@ - LibrarianJumpskirt - CuratorJumpsuit - CuratorJumpskirt - - ClothingUniformCreamSuit #imp - - ClothingUniformCreamSuitSkirt #imp + # Begin Imp additions + - ClothingUniformCreamSuit + - ClothingUniformCreamSuitSkirt + # End Imp additions - type: loadoutGroup id: LawyerJumpsuit @@ -393,8 +345,10 @@ - LawyerJumpskirtRed - LawyerJumpsuitGood - LawyerJumpskirtGood - - ClothingUniformCreamSuit #imp - - ClothingUniformCreamSuitSkirt #imp + # Begin Imp additions + - ClothingUniformCreamSuit + - ClothingUniformCreamSuitSkirt + # End Imp additions - type: loadoutGroup id: LawyerNeck @@ -402,10 +356,12 @@ minLimit: 0 loadouts: - LawyerNeck - - ScarfRed # Delta V - - ScarfBlue # Delta V - - ScarfBlack # Delta V - - ScarfPurple # Delta V + # Begin DeltaV additions + - ScarfRed + - ScarfBlue + - ScarfBlack + - ScarfPurple + # End DeltaV additions - type: loadoutGroup id: ChaplainHead @@ -433,8 +389,10 @@ - ChaplainJumpskirt - ChaplainRobesLight - ChaplainRobesDark - - ClothingUniformFuneralSuit #imp - - ClothingUniformFuneralSuitSkirt #imp + # Begin Imp additions + - ClothingUniformFuneralSuit + - ClothingUniformFuneralSuitSkirt + # End Imp additions - type: loadoutGroup id: ChaplainOuterClothing @@ -468,13 +426,6 @@ - JanitorJumpsuit - JanitorJumpskirt -- type: loadoutGroup # DeltaV - id: JanitorNeck - name: loadout-group-janitor-neck - minLimit: 0 - loadouts: - - ScarfPurple - - type: loadoutGroup id: JanitorGloves name: loadout-group-janitor-gloves @@ -522,14 +473,6 @@ - BotanistSatchel - BotanistDuffel -- type: loadoutGroup # DeltaV - id: BotanistNeck - name: loadout-group-botanist-neck - minLimit: 0 - loadouts: - - ScarfGreen - - ScarfBrown - - type: loadoutGroup id: BotanistOuterClothing name: loadout-group-botanist-outerclothing @@ -596,14 +539,6 @@ - MimeFrenchBeret - MimeCap -- type: loadoutGroup # DeltaV - id: MimeNeck - name: loadout-group-mime-neck - minLimit: 0 - loadouts: - - ScarfBlack - - ScarfZebra - - type: loadoutGroup id: MimeMask name: loadout-group-mime-mask @@ -634,15 +569,6 @@ loadouts: - MimeWintercoat -- type: loadoutGroup # DeltaV - id: MusicianNeck - name: loadout-group-musician-neck - minLimit: 0 - loadouts: - - ScarfBlack - - ScarfPurple - - ScarfZebra - - type: loadoutGroup id: MimeBelt name: loadout-group-mime-belt @@ -667,8 +593,10 @@ loadouts: - MusicianJumpsuit - MusicianJumpskirt - - ClothingUniformMrSpaceWide #imp - - ClothingUniformMrSpaceWideSkirt #imp + # Begin Imp additions + - ClothingUniformMrSpaceWide + - ClothingUniformMrSpaceWideSkirt + # End Imp additions - type: loadoutGroup id: MusicianOuterClothing @@ -764,13 +692,6 @@ loadouts: - CargoTechnicianHead -- type: loadoutGroup # DeltaV - id: CargoTechnicianNeck - name: loadout-group-cargo-technician-neck - minLimit: 0 - loadouts: - - ScarfBrown - - type: loadoutGroup id: CargoTechnicianJumpsuit name: loadout-group-cargo-technician-jumpsuit @@ -800,14 +721,6 @@ - BlackShoes - CargoWinterBoots -- type: loadoutGroup # DeltaV - id: SalvageSpecialistNeck - name: loadout-group-salvage-specialist-neck - minLimit: 0 - loadouts: - - SalvageCloak - - ScarfBrown - - type: loadoutGroup id: SalvageSpecialistBackpack name: loadout-group-salvage-specialist-backpack @@ -828,8 +741,10 @@ name: loadout-group-salvage-specialist-shoes loadouts: - SalvageBoots + # Begin DeltaV changes #- CargoWinterBoots - - SalvageWinterBoots # DeltaV + - SalvageWinterBoots + # End DeltaV changes # Engineering - type: loadoutGroup @@ -890,13 +805,6 @@ - StationEngineerHardhatRed - SeniorEngineerBeret -- type: loadoutGroup # DeltaV - id: StationEngineerNeck - name: loadout-group-station-engineer-neck - minLimit: 0 - loadouts: - - ScarfOrange - - type: loadoutGroup id: StationEngineerJumpsuit name: loadout-group-station-engineer-jumpsuit @@ -936,16 +844,10 @@ loadouts: - StationEngineerPDA - SeniorEngineerPDA - - ElectricianPDA # DeltaV - - MechanicPDA # DeltaV - -- type: loadoutGroup # DeltaV - id: AtmosphericTechnicianNeck - name: loadout-group-atmospheric-technician-neck - minLimit: 0 - loadouts: - - ScarfLightBlue - - ScarfOrange + # Begin DeltaV additions + - ElectricianPDA + - MechanicPDA + # Begin DeltaV additions - type: loadoutGroup id: AtmosphericTechnicianJumpsuit @@ -1003,9 +905,11 @@ minLimit: 0 loadouts: - ResearchDirectorMantle + # Begin DeltaV changes #- ResearchDirectorCloak - - MystagogueCloak # DeltaV - Replaced RD cloak with MG - - ScarfPurple # DeltaV + - MystagogueCloak # Replaced RD cloak with MG + - ScarfPurple + # End DeltaV changes - type: loadoutGroup id: ResearchDirectorJumpsuit @@ -1054,8 +958,10 @@ loadouts: - ScientistJumpsuit - ScientistJumpskirt - #- RoboticistJumpsuit # DeltaV: Moved to RoboticistJumpsuit - #- RoboticistJumpskirt # DeltaV: Moved to RoboticistJumpsuit + # Begin DeltaV changes + #- RoboticistJumpsuit # Moved to RoboticistJumpsuit + #- RoboticistJumpskirt # Moved to RoboticistJumpsuit + # End DeltaV changes - SeniorResearcherJumpsuit - SeniorResearcherJumpskirt @@ -1099,8 +1005,10 @@ loadouts: - ScientistPDA - SeniorResearcherPDA - - LabTechPDA # DeltaV - - XenoarchPDA # DeltaV + # Begin DeltaV changes + - LabTechPDA + - XenoarchPDA + # End DeltaV changes - type: loadoutGroup id: ResearchAssistantJumpsuit @@ -1124,16 +1032,18 @@ loadouts: - HeadofSecurityJumpsuit - HeadofSecurityJumpskirt - - HeadofSecurityJumpsuitGrey # DeltaV - - HeadofSecurityJumpskirtGrey # DeltaV - - HeadofSecurityJumpsuitBlue # DeltaV - - HeadofSecurityJumpskirtBlue # DeltaV - HeadofSecurityTurtleneck - HeadofSecurityTurtleneckSkirt - HeadofSecurityFormalSuit - HeadofSecurityFormalSkirt -# - HeadofSecurityParadeSuit # DeltaV - removed for incongruence -# - HeadofSecurityParadeSkirt # DeltaV - removed for incongruence + # Begin DeltaV changes + - HeadofSecurityJumpsuitGrey + - HeadofSecurityJumpskirtGrey + - HeadofSecurityJumpsuitBlue + - HeadofSecurityJumpskirtBlue + #- HeadofSecurityParadeSuit # Removed for incongruence + #- HeadofSecurityParadeSkirt # Removed for incongruence + # End DeltaV changes - type: loadoutGroup id: HeadofSecurityNeck @@ -1148,20 +1058,19 @@ id: HeadofSecurityOuterClothing name: loadout-group-head-of-security-outerclothing loadouts: -# - HeadofSecurityCoat # DeltaV - removed for incongruence -# - HeadofSecurityWinterCoat # DeltaV - removed for incongruence - - PlateCarrier # DeltaV - - DuraVest # DeltaV - - StasecWinterCoatHoS # DeltaV + - HeadofSecurityCoat + - HeadofSecurityWinterCoat - type: loadoutGroup # DeltaV id: HeadofSecurityShoes name: loadout-group-head-of-security-shoes loadouts: -# - CombatBoots # DeltaV - removed for standardisation of equipment - - JackBoots # DeltaV + # Begin DeltaV changes + #- CombatBoots # Removed for standardisation of equipment + - JackBoots + - HeadOfSecurityWinterBoots + # End DeltaV changes - SecurityWinterBoots - - HeadOfSecurityWinterBoots # DeltaV - type: loadoutGroup id: WardenHead @@ -1177,22 +1086,21 @@ loadouts: - WardenJumpsuit - WardenJumpskirt - - WardenJumpsuitGrey # DeltaV - - WardenJumpskirtGrey # DeltaV - - WardenJumpsuitBlue # DeltaV - - WardenJumpskirtBlue # DeltaV - - WardenTurtlesuit # DeltaV - - WardenTurtleskirt # DeltaV + # Begin DeltaV additions + - WardenJumpsuitGrey + - WardenJumpskirtGrey + - WardenJumpsuitBlue + - WardenJumpskirtBlue + - WardenTurtlesuit + - WardenTurtleskirt + # End DeltaV additions - type: loadoutGroup id: WardenOuterClothing name: loadout-group-warden-outerclothing loadouts: -# - WardenCoat # DeltaV - removed for incongruence -# - WardenArmoredWinterCoat # DeltaV - removed for incongruence - - PlateCarrier # DeltaV - - DuraVest # DeltaV - - StasecWinterCoatWarden # DeltaV + - WardenCoat + - WardenArmoredWinterCoat - type: loadoutGroup id: SecurityHead @@ -1212,14 +1120,16 @@ - SecurityJumpskirt - SecurityJumpsuitGrey - SecurityJumpskirtGrey - - SecurityJumpsuitBlue # DeltaV - - SecurityJumpskirtBlue # DeltaV -# - SeniorOfficerJumpsuit # DeltaV - removed for incongruence -# - SeniorOfficerJumpskirt # DeltaV - removed for incongruence - - SeniorSecOfficerTurtlesuit # DeltaV - - SeniorSecOfficerTurtleskirt # DeltaV - - SeniorSecOfficerJumpsuit # DeltaV - - SeniorSecOfficerJumpskirt # DeltaV + # Begin DeltaV changes + - SecurityJumpsuitBlue + - SecurityJumpskirtBlue +# - SeniorOfficerJumpsuit # Removed for incongruence +# - SeniorOfficerJumpskirt # Removed for incongruence + - SeniorSecOfficerTurtlesuit + - SeniorSecOfficerTurtleskirt + - SeniorSecOfficerJumpsuit + - SeniorSecOfficerJumpskirt + # End DeltaV changes - type: loadoutGroup id: SecurityBackpack @@ -1240,13 +1150,9 @@ id: SecurityOuterClothing name: loadout-group-security-outerclothing loadouts: -# - ArmorVest # DeltaV - removed for incongruence - - PlateCarrier # DeltaV - - DuraVest # DeltaV -# - ArmorVestSlim - removed for incongruence -# - SecurityOfficerWintercoat - removed for incongruence - - StasecSweater # DeltaV - - StasecWinterCoat # DeltaV + - ArmorVest + - ArmorVestSlim + - SecurityOfficerWintercoat - type: loadoutGroup id: SecurityShoes @@ -1262,13 +1168,6 @@ - SecurityPDA - SeniorOfficerPDA -- type: loadoutGroup # DeltaV - id: SecurityNeck - name: loadout-group-security-neck - minLimit: 0 - loadouts: - - ScarfRed - - type: loadoutGroup id: DetectiveHead name: loadout-group-detective-head @@ -1290,28 +1189,17 @@ id: DetectiveJumpsuit name: loadout-group-detective-jumpsuit loadouts: -# - DetectiveJumpsuit # DeltaV - removed for incongruence -# - DetectiveJumpskirt # DeltaV - removed for incongruence -# - NoirJumpsuit # DeltaV - removed for incongruence -# - NoirJumpskirt # DeltaV - removed for incongruence - - ForensicSpecJumpsuit # DeltaV - - ForensicSpecJumpskirt # DeltaV - - ForensicSpecTurtlesuit # DeltaV - - ForensicSpecTurtleskirt # DeltaV - - ClothingUniformMiamiVice #imp - - ClothingUniformMiamiViceSkirt #imp - - ClothingUniformDetectiveSuit #imp - - ClothingUniformDetectiveSuitSkirt #imp + - DetectiveJumpsuit + - DetectiveJumpskirt + - NoirJumpsuit + - NoirJumpskirt - type: loadoutGroup id: DetectiveOuterClothing name: loadout-group-detective-outerclothing loadouts: -# - DetectiveArmorVest # DeltaV - removed for incongruence -# - DetectiveCoat # DeltaV - removed for incongruence - - StasecWinterCoatDet # DeltaV - - PlateCarrier # DeltaV - - DuraVest # DeltaV + - DetectiveArmorVest + - DetectiveCoat - type: loadoutGroup id: SecurityCadetJumpsuit @@ -1394,14 +1282,6 @@ - PurpleSurgeryCap - NurseHat -- type: loadoutGroup # DeltaV - id: MedicalDoctorNeck - name: loadout-group-medical-doctor-neck - minLimit: 0 - loadouts: - - Stethoscope - - ScarfBlue - - type: loadoutGroup id: MedicalDoctorJumpsuit name: loadout-group-medical-doctor-jumpsuit @@ -1495,35 +1375,6 @@ - ChemistSatchel - ChemistDuffel -# Chemist Neck - DeltaV -- type: loadoutGroup - id: ChemistNeck - name: loadout-group-chemist-neck - minLimit: 0 - loadouts: - - ChemistTie # DeltaV - - ScarfOrange - - ScarfBlue - -# Chemist Gloves - DeltaV -- type: loadoutGroup - id: ChemistGloves - name: loadout-group-chemist-gloves - minLimit: 0 - loadouts: - - LatexGloves - - NitrileGloves - - ChemistGloves # DeltaV - -# Chemist Shoes - DeltaV -- type: loadoutGroup - id: ChemistShoes - name: loadout-group-chemist-shoes - loadouts: - - WhiteShoes - - ChemistWinterBoots # DeltaV - - ChemistShoes # DeltaV - - type: loadoutGroup id: ParamedicHead name: loadout-group-paramedic-head diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index bf0d7af4b59a..428922831a2f 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -365,7 +365,7 @@ - HeadofSecurityJumpsuit - SecurityBackpack - SecurityBelt - - HeadofSecurityOuterClothing + - HeadofSecurityOuterClothingDeltaV # DeltaV - Switched to DeltaV version, was HeadofSecurityOuterClothing - HeadofSecurityShoes # DeltaV - winter boots - SurvivalSecurity - Trinkets @@ -382,7 +382,7 @@ - WardenJumpsuit - SecurityBackpack - SecurityBelt - - WardenOuterClothing + - WardenOuterClothingDeltaV # DeltaV - Switched to DeltaV version, was WardenOuterClothing - SecurityShoes - SurvivalSecurity - Trinkets @@ -414,9 +414,9 @@ groups: - DetectiveHead - SecurityNeck # DeltaV - replace DetectiveNeck for incongruence - - DetectiveJumpsuit + - DetectiveJumpsuitDeltaV # DeltaV - Replaced with DeltaV version, was DetectiveJumpsuit - SecurityBackpack - - DetectiveOuterClothing + - DetectiveOuterClothingDeltaV # DeltaV - Replaced with DeltaV version, was DetectiveOuterClothing - SecurityShoes - SurvivalSecurity - Trinkets diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/quartermaster.yml new file mode 100644 index 000000000000..27bbcf9ce0d6 --- /dev/null +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/quartermaster.yml @@ -0,0 +1,17 @@ +# Jumpsuit +- type: loadout + id: QuartermasterFormalDress + equipment: + jumpsuit: ClothingUniformJumpskirtQMFormal + +# Head +- type: loadout + id: LogiOfficerBeret + equipment: + head: ClothingHeadHatBeretLogi + +# Shoes +- type: loadout + id: QuartermasterWinterBoots + equipment: + shoes: ClothingShoesBootsWinterLogisticsOfficer diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/salvage_technician.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/salvage_specialist.yml similarity index 52% rename from Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/salvage_technician.yml rename to Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/salvage_specialist.yml index 5facd6f5689d..e1b32ce44623 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/salvage_technician.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/salvage_specialist.yml @@ -13,3 +13,15 @@ id: ExcavatorPDA equipment: id: ExcavatorPDA + +# Shoes +- type: loadout + id: SalvageWinterBoots + equipment: + shoes: ClothingShoesBootsWinterMiner + +# Neck +- type: loadout + id: SalvageCloak + equipment: + neck: ClothingNeckSalvager diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/bartender.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/bartender.yml index d2992bf8405c..9cc219056e04 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/bartender.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/bartender.yml @@ -8,3 +8,9 @@ id: MixologistPDA equipment: id: MixologistPDA + +# Glasses +- type: loadout + id: BartenderGlasses + equipment: + eyes: ClothingEyesHudBeer diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/passenger.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/passenger.yml index 65244e198216..3626769961d7 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/passenger.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/passenger.yml @@ -23,3 +23,49 @@ id: StudentPDA equipment: id: StudentPDA + +# Jumpsuit +# Rose Hoodie w/ Skirt +- type: loadout + id: MioSkirt + equipment: + jumpsuit: ClothingCostumeMioSkirt + +# Turqoise Hoodie w/ Shorts +- type: loadout + id: NaotaHoodie + equipment: + jumpsuit: ClothingCostumeNaota + +# Casual Red +- type: loadout + id: CasualRedSkirt + equipment: + jumpsuit: ClothingUniformJumpskirtCasualRed + +- type: loadout + id: CasualRedSuit + equipment: + jumpsuit: ClothingUniformJumpsuitCasualRed + +# Casual Blue +- type: loadout + id: CasualBlueSkirt + equipment: + jumpsuit: ClothingUniformJumpskirtCasualBlue + +- type: loadout + id: CasualBlueSuit + equipment: + jumpsuit: ClothingUniformJumpsuitCasualBlue + +# Casual Purple +- type: loadout + id: CasualPurpleSkirt + equipment: + jumpsuit: ClothingUniformJumpskirtCasualPurple + +- type: loadout + id: CasualPurpleSuit + equipment: + jumpsuit: ClothingUniformJumpsuitCasualPurple diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Command/captain.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Command/captain.yml new file mode 100644 index 000000000000..d68cc74ae28f --- /dev/null +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Command/captain.yml @@ -0,0 +1,28 @@ +# Head +- type: loadout + id: CaptainBeret + equipment: + head: ClothingHeadHatBeretCap + +# Neck +- type: loadout + id: CaptainCloakFormal + equipment: + neck: ClothingNeckCloakCapFormal + +# Gloves +- type: loadout + id: CaptainGloves + equipment: + gloves: ClothingHandsGlovesCaptain + +- type: loadout + id: InspectionGloves + equipment: + gloves: ClothingHandsGlovesInspection + +# Shoes +- type: loadout + id: CaptainWinterBoots + equipment: + shoes: ClothingShoesBootsWinterCap diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Engineering/station_engineer.yml index 9c135fd01864..5f745bc98d1b 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Engineering/station_engineer.yml @@ -8,3 +8,9 @@ id: MechanicPDA equipment: id: MechanicPDA + +# OuterClothing +- type: loadout + id: StationEngineerWintercoat + equipment: + outerClothing: ClothingOuterWinterEngi diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/chemist.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/chemist.yml new file mode 100644 index 000000000000..5c6186c48cea --- /dev/null +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/chemist.yml @@ -0,0 +1,34 @@ +# Jumpsuit +- type: loadout + id: ChemistFormalSuit + equipment: + jumpsuit: ClothingUniformJumpsuitChemShirt + +# OuterClothing +- type: loadout + id: ChemistApron + equipment: + outerClothing: ClothingOuterApronChemist + +# Gloves +- type: loadout + id: ChemistGloves + equipment: + gloves: ClothingHandsGlovesChemist + +# Shoes +- type: loadout + id: ChemistWinterBoots + equipment: + shoes: ClothingShoesBootsWinterChem + +- type: loadout + id: ChemistShoes + equipment: + shoes: ClothingShoesEnclosedChem + +# Neck +- type: loadout + id: ChemistTie + equipment: + neck: ClothingNeckTieChem diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/chief_medical_officer.yml new file mode 100644 index 000000000000..596211c07608 --- /dev/null +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/chief_medical_officer.yml @@ -0,0 +1,5 @@ +# Shoes +- type: loadout + id: ChiefMedicalOfficerWinterBoots + equipment: + shoes: ClothingShoesBootsWinterChiefMedicalOfficer diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/medical_doctor.yml index 93e06f0fd3f1..6298514a6a3d 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/medical_doctor.yml @@ -3,3 +3,9 @@ id: ClinicianPDA equipment: id: ClinicianPDA + +# Neck +- type: loadout + id: Stethoscope + equipment: + neck: ClothingNeckStethoscope diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/paramedic.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/paramedic.yml new file mode 100644 index 000000000000..2ccd1a417457 --- /dev/null +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/paramedic.yml @@ -0,0 +1,5 @@ +# Shoes +- type: loadout + id: ParamedicWinterBoots + equipment: + shoes: ClothingShoesBootsWinterParamedic diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/psychologist.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/psychologist.yml index c7e252151ca7..48e37497ca01 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/psychologist.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/psychologist.yml @@ -32,11 +32,6 @@ time: 14400 # 4 hours service # Head -- type: loadout - id: PsychologistFrenchBeret - equipment: - head: ClothingHeadHatBeretFrench - - type: loadout id: PsychologistGreyFlatcap equipment: @@ -48,21 +43,11 @@ head: ClothingHeadHatBrownFlatcap # OuterClothing -- type: loadout - id: PsychologistMedicalWinterCoat - equipment: - outerClothing: ClothingOuterWinterMed - - type: loadout id: PsychologistWinterCoat equipment: outerClothing: ClothingOuterWinterCoat -- type: loadout - id: PsychologistWinterCoatPlaid - equipment: - outerClothing: ClothingOuterWinterCoatPlaid - - type: loadout id: PsychologistCoatBomber equipment: diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Science/mystagogue.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Science/mystagogue.yml index 06e7af22f428..eb1008d60989 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Science/mystagogue.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Science/mystagogue.yml @@ -1,9 +1,28 @@ +# Neck - type: loadout id: MystagogueCloak equipment: neck: ClothingNeckCloakMystagogue +# Head +- type: loadout # DeltaV + id: ResearchDirectorHood + equipment: + head: ClothingHeadHoodMysta + - type: loadout id: MystagogueBeret equipment: head: ClothingHeadHatBeretMysta + +# OuterClothing +- type: loadout + id: MystaLabCoat + equipment: + outerClothing: ClothingOuterCoatRndMysta + +# Shoes +- type: loadout + id: ResearchDirectorWinterBoots + equipment: + shoes: ClothingShoesBootsWinterMystagogue diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Security/detective.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Security/detective.yml index 8203b103887b..e73aefd5ab79 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Security/detective.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Security/detective.yml @@ -46,3 +46,36 @@ id: SecurityFirearmWeaponRevolverDeckard equipment: pocket1: WeaponRevolverDeckard + +# Jumpsuit +- type: loadout + id: ForensicSpecJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitForensicSpec + +- type: loadout + id: ForensicSpecJumpskirt + equipment: + jumpsuit: ClothingUniformJumpskirtForensicSpec + +- type: loadout + id: ForensicSpecTurtlesuit + equipment: + jumpsuit: ClothingUniformJumpsuitDetTurtle + +- type: loadout + id: ForensicSpecTurtleskirt + equipment: + jumpsuit: ClothingUniformJumpskirtDetTurtle + +#OuterClothing +- type: loadout + id: StasecWinterCoatDet + equipment: + outerClothing: ClothingOuterCoatStasecDet + +#Head +- type: loadout + id: DetBeret + equipment: + head: ClothingHeadHatBeretDet diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Security/head_of_security.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Security/head_of_security.yml new file mode 100644 index 000000000000..9d94e7d6e254 --- /dev/null +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Security/head_of_security.yml @@ -0,0 +1,42 @@ +# Jumpsuit +- type: loadout + id: HeadofSecurityJumpsuitGrey + equipment: + jumpsuit: ClothingUniformJumpsuitHoSGrey + +- type: loadout + id: HeadofSecurityJumpskirtGrey + equipment: + jumpsuit: ClothingUniformJumpskirtHoSGrey + +- type: loadout + id: HeadofSecurityJumpsuitBlue + equipment: + jumpsuit: ClothingUniformJumpsuitHoSBlue + +- type: loadout + id: HeadofSecurityJumpskirtBlue + equipment: + jumpsuit: ClothingUniformJumpskirtHoSBlue + +- type: loadout + id: HeadofSecurityParadeSuit + equipment: + jumpsuit: ClothingUniformJumpsuitHoSParadeMale + +- type: loadout + id: HeadofSecurityParadeSkirt + equipment: + jumpsuit: ClothingUniformJumpskirtHoSParadeMale + +# OuterClothing +- type: loadout + id: StasecWinterCoatHoS + equipment: + outerClothing: ClothingOuterCoatStasecHoS + +# Shoes +- type: loadout + id: HeadOfSecurityWinterBoots + equipment: + shoes: ClothingShoesBootsWinterHeadOfSecurity diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Security/warden.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Security/warden.yml new file mode 100644 index 000000000000..bbe989cb7356 --- /dev/null +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Security/warden.yml @@ -0,0 +1,36 @@ +# Jumpsuit +- type: loadout + id: WardenJumpsuitGrey + equipment: + jumpsuit: ClothingUniformJumpsuitWardenGrey + +- type: loadout + id: WardenJumpskirtGrey + equipment: + jumpsuit: ClothingUniformJumpskirtWardenGrey + +- type: loadout + id: WardenJumpsuitBlue + equipment: + jumpsuit: ClothingUniformJumpsuitWardenBlue + +- type: loadout + id: WardenJumpskirtBlue + equipment: + jumpsuit: ClothingUniformJumpskirtWardenBlue + +- type: loadout + id: WardenTurtlesuit + equipment: + jumpsuit: ClothingUniformJumpsuitWardenTurtle + +- type: loadout + id: WardenTurtleskirt + equipment: + jumpsuit: ClothingUniformJumpskirtWardenTurtle + +# OuterClothing +- type: loadout + id: StasecWinterCoatWarden + equipment: + outerClothing: ClothingOuterCoatStasecWarden diff --git a/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml b/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml index 18fc2bfb367e..7df19865851f 100644 --- a/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml @@ -21,6 +21,68 @@ - BartenderJumpskirt - BartenderJumpsuitPurple +## Bartender +- type: loadoutGroup + id: BartenderGlasses + name: loadout-group-bartender-glasses + minLimit: 0 + loadouts: + - Glasses + - BartenderGlasses + - GlassesCheapSunglasses + +- type: loadoutGroup + id: BartenderNeck + name: loadout-group-bartender-neck + minLimit: 0 + loadouts: + - ScarfBlack + - ScarfPurple + +## Librarian +- type: loadoutGroup + id: LibrarianNeck + name: loadout-group-librarian-neck + loadouts: + - ScarfGreen + - ScarfRed + +## Janitor +- type: loadoutGroup + id: JanitorNeck + name: loadout-group-janitor-neck + minLimit: 0 + loadouts: + - ScarfPurple + +## Botanist +- type: loadoutGroup + id: BotanistNeck + name: loadout-group-botanist-neck + minLimit: 0 + loadouts: + - ScarfGreen + - ScarfBrown + +## Mime +- type: loadoutGroup + id: MimeNeck + name: loadout-group-mime-neck + minLimit: 0 + loadouts: + - ScarfBlack + - ScarfZebra + +## Musician +- type: loadoutGroup + id: MusicianNeck + name: loadout-group-musician-neck + minLimit: 0 + loadouts: + - ScarfBlack + - ScarfPurple + - ScarfZebra + # Logistics ## Courier - type: loadoutGroup @@ -117,6 +179,23 @@ - BlackShoes - CargoWinterBoots +## Cargo Technician +- type: loadoutGroup + id: CargoTechnicianNeck + name: loadout-group-cargo-technician-neck + minLimit: 0 + loadouts: + - ScarfBrown + +## Salvage Specialist +- type: loadoutGroup + id: SalvageSpecialistNeck + name: loadout-group-salvage-specialist-neck + minLimit: 0 + loadouts: + - SalvageCloak + - ScarfBrown + # Security ## Brig Medic - type: loadoutGroup @@ -257,6 +336,63 @@ - SecurityFirearmSpeedLoaderSpecialRubber - SecurityFirearmSpeedLoaderSpecial +## Security Officer +- type: loadoutGroup + id: SecurityNeck + name: loadout-group-security-neck + minLimit: 0 + loadouts: + - ScarfRed + +- type: loadoutGroup + id: SecurityOuterClothingDeltaV + name: loadout-group-security-outerclothing + loadouts: + - PlateCarrier + - DuraVest + - StasecSweater + - StasecWinterCoat + +## Warden +- type: loadoutGroup + id: WardenOuterClothingDeltaV + name: loadout-group-warden-outerclothing + loadouts: + - PlateCarrier + - DuraVest + - StasecWinterCoatWarden + +## Head of Security +- type: loadoutGroup + id: HeadofSecurityOuterClothingDeltaV + name: loadout-group-head-of-security-outerclothing + loadouts: + - PlateCarrier + - DuraVest + - StasecWinterCoatHoS + +## Detective +- type: loadoutGroup + id: DetectiveJumpsuitDeltaV + name: loadout-group-detective-jumpsuit + loadouts: + - ForensicSpecJumpsuit + - ForensicSpecJumpskirt + - ForensicSpecTurtlesuit + - ForensicSpecTurtleskirt + - ClothingUniformMiamiVice #imp + - ClothingUniformMiamiViceSkirt #imp + - ClothingUniformDetectiveSuit #imp + - ClothingUniformDetectiveSuitSkirt #imp + +- type: loadoutGroup + id: DetectiveOuterClothingDeltaV + name: loadout-group-detective-outerclothing + loadouts: + - StasecWinterCoatDet + - PlateCarrier + - DuraVest + # Medical ## Psychologist - type: loadoutGroup @@ -265,7 +401,7 @@ minLimit: 0 loadouts: - MedicalBeret - - PsychologistFrenchBeret + - MimeFrenchBeret - PsychologistGreyFlatcap - PsychologistBrownFlatcap @@ -274,9 +410,9 @@ name: loadout-group-psychologist-outerclothing minLimit: 0 loadouts: - - PsychologistMedicalWinterCoat + - MedicalDoctorWintercoat - PsychologistWinterCoat - - PsychologistWinterCoatPlaid + - WinterCoatPlaid - PsychologistCoatBomber - PsychologistSweater @@ -289,6 +425,42 @@ - MedicalWinterBoots - WinterBoots +## Medical Doctor +- type: loadoutGroup + id: MedicalDoctorNeck + name: loadout-group-medical-doctor-neck + minLimit: 0 + loadouts: + - Stethoscope + - ScarfBlue + +## Chemist +- type: loadoutGroup + id: ChemistNeck + name: loadout-group-chemist-neck + minLimit: 0 + loadouts: + - ChemistTie + - ScarfOrange + - ScarfBlue + +- type: loadoutGroup + id: ChemistGloves + name: loadout-group-chemist-gloves + minLimit: 0 + loadouts: + - LatexGloves + - NitrileGloves + - ChemistGloves + +- type: loadoutGroup + id: ChemistShoes + name: loadout-group-chemist-shoes + loadouts: + - WhiteShoes + - ChemistWinterBoots + - ChemistShoes + # Justice ## Chief Justice - type: loadoutGroup @@ -330,6 +502,24 @@ - LeatherShoes - LaceupShoes +# Engineering +## Station Engineer +- type: loadoutGroup + id: StationEngineerNeck + name: loadout-group-station-engineer-neck + minLimit: 0 + loadouts: + - ScarfOrange + +## Atmospheric Technician +- type: loadoutGroup + id: AtmosphericTechnicianNeck + name: loadout-group-atmospheric-technician-neck + minLimit: 0 + loadouts: + - ScarfLightBlue + - ScarfOrange + ## Clerk - type: loadoutGroup id: ClerkJumpsuit @@ -487,6 +677,42 @@ - HoPGloves - InspectionGloves +## Captain +- type: loadoutGroup + id: CaptainGloves + name: loadout-group-captain-gloves + minLimit: 0 + loadouts: + - CaptainGloves + - InspectionGloves + +- type: loadoutGroup + id: CaptainShoes + name: loadout-group-captain-shoes + loadouts: + - BrownLeatherShoes + - WhiteLeatherShoes + - LaceupShoes + - CaptainWinterBoots + +## Head of Personnel +- type: loadoutGroup + id: HoPGloves + name: loadout-group-hop-gloves + minLimit: 0 + loadouts: + - HoPGloves + - InspectionGloves + +- type: loadoutGroup + id: HoPShoes + name: loadout-group-hop-shoes + loadouts: + - BrownLeatherShoes + - WhiteLeatherShoes + - LaceupShoes + - HoPWinterBoots + # PDAs - type: loadoutGroup id: PassengerPDADelta From fc3d428f1a1a00fa96f73b6c4eda9d933bca29b1 Mon Sep 17 00:00:00 2001 From: Dirius77 Date: Sun, 12 Jan 2025 18:16:00 -0500 Subject: [PATCH 090/205] Increase Tesla fade time (#2710) --- Content.Server/Tesla/Components/TeslaEnergyBallComponent.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Tesla/Components/TeslaEnergyBallComponent.cs b/Content.Server/Tesla/Components/TeslaEnergyBallComponent.cs index 7fc424f9afe2..ef4600bbe998 100644 --- a/Content.Server/Tesla/Components/TeslaEnergyBallComponent.cs +++ b/Content.Server/Tesla/Components/TeslaEnergyBallComponent.cs @@ -35,7 +35,7 @@ public sealed partial class TeslaEnergyBallComponent : Component /// The amount of energy to which the tesla must reach in order to be destroyed. /// [DataField, ViewVariables(VVAccess.ReadWrite)] - public float EnergyToDespawn = -100f; + public float EnergyToDespawn = -540f; // DeltaV, make the Tesla take as long to fail as the singulo. /// /// Played when energy reaches the lower limit (and entity destroyed) From 869a08a6250ab497db8d9ee219a0cfacb161e6c5 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Mon, 13 Jan 2025 00:16:19 +0100 Subject: [PATCH 091/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index e03fc2da0684..bacb6b0d3f18 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Bellwether - changes: - - message: The Chief Justice's apparel is now available in the uniform printer - type: Tweak - id: 402 - time: '2024-06-17T16:37:43.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1395 - author: deltanedas changes: - message: Added Carpy the Legal Carp, coming to justice departments near you. @@ -3851,3 +3844,10 @@ id: 901 time: '2025-01-12T15:48:39.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2658 +- author: Dirius77 + changes: + - message: Made the Tesla much slower to fade after power loss. + type: Tweak + id: 902 + time: '2025-01-12T23:16:01.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2710 From 3a83ac0fd54894ff02bf9be13545503055983797 Mon Sep 17 00:00:00 2001 From: Radezolid Date: Mon, 13 Jan 2025 15:25:19 -0300 Subject: [PATCH 092/205] Add a ChemMaster flatpack to the CMO's locker (#2683) * Added the flatpack * Add the flatpack to the CMO's locker --- Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml | 1 + .../_DV/Entities/Objects/Devices/Devices/flatpack.yml | 8 ++++++++ 2 files changed, 9 insertions(+) create mode 100644 Resources/Prototypes/_DV/Entities/Objects/Devices/Devices/flatpack.yml diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml index 9cffb69a9709..ce8ff57b1d15 100644 --- a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml @@ -66,6 +66,7 @@ - id: ClothingShoesBootsWinterChiefMedicalOfficer - id: LunchboxCommandFilledRandom prob: 0.3 + - id: ChemMasterFlatpack # So the chemist can make pills - type: entityTable id: LockerFillResearchDirectorDeltaV diff --git a/Resources/Prototypes/_DV/Entities/Objects/Devices/Devices/flatpack.yml b/Resources/Prototypes/_DV/Entities/Objects/Devices/Devices/flatpack.yml new file mode 100644 index 000000000000..eedeb96a8712 --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Objects/Devices/Devices/flatpack.yml @@ -0,0 +1,8 @@ +- type: entity + parent: BaseFlatpack + id: ChemMasterFlatpack + name: chemmaster 4000 flatpack + description: A flatpack used for constructing a ChemMaster 4000. + components: + - type: Flatpack + entity: ChemMaster From adb9a55266f88e5849f794dfb0405bf12b8141e7 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Mon, 13 Jan 2025 19:25:38 +0100 Subject: [PATCH 093/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index bacb6b0d3f18..a759cfb528a6 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: deltanedas - changes: - - message: Added Carpy the Legal Carp, coming to justice departments near you. - type: Add - id: 403 - time: '2024-06-17T16:50:22.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1398 - author: Lyndomen changes: - message: Reduced minimum number of players to 20 for nukies to spawn @@ -3851,3 +3844,11 @@ id: 902 time: '2025-01-12T23:16:01.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2710 +- author: Radezolid + changes: + - message: CMO's lockers now spawn with a ChemMaster flatpack inside to aid the + chemist with pill making. + type: Tweak + id: 903 + time: '2025-01-13T18:25:19.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2683 From f8c86e2c5d400a2760fe25e8086968fc19a32910 Mon Sep 17 00:00:00 2001 From: Lyndomen <49795619+Lyndomen@users.noreply.github.com> Date: Mon, 13 Jan 2025 15:21:05 -0500 Subject: [PATCH 094/205] Port: Disable round end pacifism and add a new command to pacify everyone (#2642) * pacify stuff from Harmony * pacify stuff from Harmony * error ops * yeag --- .../_DV/RoundEnd/RoundEndSystem.Pacified.cs | 61 ------------------- .../_Harmony/RoundEnd/PacifyAllCommand | 60 ++++++++++++++++++ 2 files changed, 60 insertions(+), 61 deletions(-) delete mode 100644 Content.Server/_DV/RoundEnd/RoundEndSystem.Pacified.cs create mode 100644 Content.Server/_Harmony/RoundEnd/PacifyAllCommand diff --git a/Content.Server/_DV/RoundEnd/RoundEndSystem.Pacified.cs b/Content.Server/_DV/RoundEnd/RoundEndSystem.Pacified.cs deleted file mode 100644 index 7e7fd81ae609..000000000000 --- a/Content.Server/_DV/RoundEnd/RoundEndSystem.Pacified.cs +++ /dev/null @@ -1,61 +0,0 @@ -using Content.Server.Explosion.Components; -using Content.Server.GameTicking; -using Content.Shared.CombatMode; -using Content.Shared.CombatMode.Pacification; -using Content.Shared._DV.CCVars; -using Content.Shared.Explosion.Components; -using Content.Shared.Flash.Components; -using Content.Shared.Store.Components; -using Robust.Shared.Configuration; - -namespace Content.Server._DV.RoundEnd; - -public sealed class PacifiedRoundEnd : EntitySystem -{ - [Dependency] private readonly IConfigurationManager _configurationManager = default!; - - private bool _enabled; - - public override void Initialize() - { - base.Initialize(); - _configurationManager.OnValueChanged(DCCVars.RoundEndPacifist, v => _enabled = v, true); - SubscribeLocalEvent(OnRoundEnded); - } - - private void OnRoundEnded(RoundEndTextAppendEvent ev) - { - if (!_enabled) - return; - - var harmQuery = EntityQueryEnumerator(); - while (harmQuery.MoveNext(out var uid, out _)) - { - EnsureComp(uid); - } - - var explosiveQuery = EntityQueryEnumerator(); - while (explosiveQuery.MoveNext(out var uid, out _)) - { - RemComp(uid); - } - - var grenadeQuery = EntityQueryEnumerator(); - while (grenadeQuery.MoveNext(out var uid, out _)) - { - RemComp(uid); - } - - var flashQuery = EntityQueryEnumerator(); - while (flashQuery.MoveNext(out var uid, out _)) - { - RemComp(uid); - } - - var uplinkQuery = EntityQueryEnumerator(); - while (uplinkQuery.MoveNext(out var uid, out _)) - { - RemComp(uid); - } - } -} diff --git a/Content.Server/_Harmony/RoundEnd/PacifyAllCommand b/Content.Server/_Harmony/RoundEnd/PacifyAllCommand new file mode 100644 index 000000000000..8018b63affc7 --- /dev/null +++ b/Content.Server/_Harmony/RoundEnd/PacifyAllCommand @@ -0,0 +1,60 @@ +// Credits: +// This code was originally created by DebugOk, deltanedas, and NullWanderer for DeltaV. +// Available at https://github.com/DebugOk/Delta-v/blob/master/Content.Server/DeltaV/RoundEnd/RoundEndSystem.Pacified.cs +// Original PR: https://github.com/DeltaV-Station/Delta-v/pull/350 +// Modified by FluffMe on 12.10.2024 with no major changes except the Namespaces and the CVar name. +// Modified and moved by youtissoum on 04.01.2025 to turn into a command. +using Content.Server.Administration; +using Content.Server.Explosion.Components; // DeltaV +using Content.Shared.Administration; +using Content.Shared.CombatMode; +using Content.Shared.CombatMode.Pacification; +using Content.Shared.Explosion.Components; +using Content.Shared.Flash.Components; +using Content.Shared.Store.Components; +using Robust.Shared.Console; + +namespace Content.Server._Harmony.RoundEnd; + +[AdminCommand(AdminFlags.Admin)] +public sealed class PacifyAllCommand : IConsoleCommand +{ + [Dependency] private readonly IEntityManager _entityManager = default!; + + public string Command => "pacifyall"; + public string Description => "Pacify all players permanently."; + public string Help => string.Empty; + + public void Execute(IConsoleShell shell, string argStr, string[] args) + { + var harmQuery = _entityManager.EntityQueryEnumerator(); + while (harmQuery.MoveNext(out var uid, out _)) + { + _entityManager.EnsureComponent(uid); + } + + var explosiveQuery = _entityManager.EntityQueryEnumerator(); + while (explosiveQuery.MoveNext(out var uid, out _)) + { + _entityManager.RemoveComponent(uid); + } + + var grenadeQuery = _entityManager.EntityQueryEnumerator(); + while (grenadeQuery.MoveNext(out var uid, out _)) + { + _entityManager.RemoveComponent(uid); + } + + var flashQuery = _entityManager.EntityQueryEnumerator(); + while (flashQuery.MoveNext(out var uid, out _)) + { + _entityManager.RemoveComponent(uid); + } + + var uplinkQuery = _entityManager.EntityQueryEnumerator(); + while (uplinkQuery.MoveNext(out var uid, out _)) + { + _entityManager.RemoveComponent(uid); + } + } +} From a14998fe17cf9697be12e5610b10c53754e0197c Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Mon, 13 Jan 2025 21:21:24 +0100 Subject: [PATCH 095/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index a759cfb528a6..d4b48bd1c703 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Lyndomen - changes: - - message: Reduced minimum number of players to 20 for nukies to spawn - type: Tweak - id: 404 - time: '2024-06-17T16:52:21.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1404 - author: deltanedas changes: - message: Void Jetpacks can now be reverse engineered. @@ -3852,3 +3845,11 @@ id: 903 time: '2025-01-13T18:25:19.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2683 +- author: Lyndomen + changes: + - message: Ports pacifism tweaks from Harmony, allowing some violence at CC. Don't + grief, but continue to roleplay! Thank you youtissoum. + type: Add + id: 904 + time: '2025-01-13T20:21:05.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2642 From 3fdd6f91869c89df7a4a2c5a1e63295f1b34ec82 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Mon, 13 Jan 2025 15:16:08 -0600 Subject: [PATCH 096/205] energy guns buff take 2 (#2623) Yummy --- .../Objects/Weapons/Guns/Battery/battery_guns.yml | 15 ++++++++------- .../Weapons/Guns/Projectiles/projectiles.yml | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 7a4123c9d8ae..fca416340746 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -23,8 +23,8 @@ soundEmpty: path: /Audio/_DV/Weapons/Guns/Empty/dry_fire.ogg - type: Battery - maxCharge: 1000 - startingCharge: 1000 + maxCharge: 1500 + startingCharge: 1500 - type: ProjectileBatteryAmmoProvider proto: BulletDisabler fireCost: 50 @@ -192,8 +192,8 @@ soundEmpty: path: /Audio/_DV/Weapons/Guns/Empty/dry_fire.ogg - type: Battery - maxCharge: 800 - startingCharge: 800 + maxCharge: 1000 + startingCharge: 1000 - type: ProjectileBatteryAmmoProvider proto: BulletDisabler fireCost: 50 @@ -229,7 +229,7 @@ name: IK-60 energy carbine parent: BaseWeaponBattery id: WeaponGunLaserCarbineAutomatic - description: "A 20 round semi-automatic energy carbine." + description: "A 20 round hybrid-fire energy carbine." components: - type: Sprite sprite: _DV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi @@ -250,9 +250,10 @@ fireRate: 3 availableModes: - SemiAuto + - FullAuto - type: Battery - maxCharge: 2000 - startingCharge: 2000 + maxCharge: 3000 + startingCharge: 3000 - type: ProjectileBatteryAmmoProvider proto: BulletEnergyGunLaser fireCost: 100 diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 2eac2b57f9ce..12e7643f9448 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -42,6 +42,6 @@ impactEffect: BulletImpactEffectRedDisabler damage: types: - Heat: 20 # Slightly more damage than the 17heat from the Captain's Hitscan lasgun + Heat: 24 # these will hurt but not quite a 4 shot soundHit: collection: MeatLaserImpact From b0517033eb278c61dd6e189a3ba0e2b3bcf86c93 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Mon, 13 Jan 2025 22:16:28 +0100 Subject: [PATCH 097/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index d4b48bd1c703..94d3145e3afd 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: deltanedas - changes: - - message: Void Jetpacks can now be reverse engineered. - type: Tweak - id: 405 - time: '2024-06-17T17:03:06.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1400 - author: Velcroboy changes: - message: Added justice to The Hive @@ -3853,3 +3846,12 @@ id: 904 time: '2025-01-13T20:21:05.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2642 +- author: Stop-Signs + changes: + - message: Energy guns got an overall buff! + type: Tweak + - message: IK-60 carbine can now toggle between semi and full auto + type: Tweak + id: 905 + time: '2025-01-13T21:16:09.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2623 From 00be66655610665cdd20161e6abbe1357737f251 Mon Sep 17 00:00:00 2001 From: Avalon Date: Mon, 13 Jan 2025 20:27:13 -0500 Subject: [PATCH 098/205] Hristov Tweaks, Incidental Musiket Changes (#2213) * Tallholads! * Small changes * Update snipers.yml * ding * conflictiskill * ConflictFixOps * ConfliuctFixOps2 * comment stuff * Adjustments * Update antimateriel.yml Signed-off-by: Avalon --------- Signed-off-by: Avalon Co-authored-by: deltanedas <@deltanedas:kde.org> --- .../Guns/Ammunition/Projectiles/antimateriel.yml | 7 ++++--- .../Objects/Weapons/Guns/Snipers/snipers.yml | 14 ++++++++------ .../Objects/Specific/Mail/mail_security.yml | 4 ++-- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml index 65b7dbc16559..70f0a0539599 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml @@ -7,7 +7,8 @@ - type: Projectile damage: types: - Piercing: 40 - Structural: 30 + Piercing: 50 # DeltaV - Damage Bumped, was 40 + Structural: 200 # DeltaV - was 30 + ignoreResistances: true # DeltaV - Hristov be spooky now - type: StaminaDamageOnCollide - damage: 35 + damage: 50 # DeltaV - was 35 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index fa9777e48b73..d261294a5e80 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -65,12 +65,14 @@ capacity: 5 proto: CartridgeAntiMateriel - type: GunRequiresWield # DeltaV - Firing an antimateriel rifle is.. incredibly unweildy with one hand. + - type: Gun # DeltaV + fireRate: 0.5 - type: entity name: musket parent: [ BaseWeaponSniper, BaseGunWieldable, BaseMinorContraband ] id: Musket - description: This should've been in a museum long before you were born. Uses .60 anti-materiel ammo. + description: This should've been in a museum long before you were born. Uses musket catridges. # Delta V - swapping to our crafted musket ammo components: - type: Sharp - type: Item @@ -90,9 +92,9 @@ - type: BallisticAmmoProvider whitelist: tags: - - CartridgeAntiMateriel + - CartridgeMusket # DeltaV - musket instead of anti materiel ammo capacity: 1 - proto: CartridgeAntiMateriel + proto: CartridgeMusket # DeltaV - type: MeleeWeapon wideAnimationRotation: -135 damage: @@ -109,7 +111,7 @@ name: flintlock pistol parent: [BaseWeaponSniper, BaseMinorContraband] id: WeaponPistolFlintlock - description: A pirate's companion. Yarrr! Uses .60 anti-materiel ammo. + description: A pirate's companion. Yarrr! Uses musket cartridges. # Delta V - Ditto the above components: - type: Gun minAngle: 0 @@ -127,9 +129,9 @@ - type: BallisticAmmoProvider whitelist: tags: - - CartridgeAntiMateriel + - CartridgeMusket # DeltaV - musket instead of anti materiel ammo capacity: 1 - proto: CartridgeAntiMateriel + proto: CartridgeMusket # DeltaV - type: StaticPrice price: 0 diff --git a/Resources/Prototypes/_DV/Entities/Objects/Specific/Mail/mail_security.yml b/Resources/Prototypes/_DV/Entities/Objects/Specific/Mail/mail_security.yml index c08e92cc6b23..caf130da16f5 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Specific/Mail/mail_security.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Specific/Mail/mail_security.yml @@ -70,8 +70,8 @@ contents: - id: ClothingHeadHatPwig - id: Musket - - id: CartridgeAntiMateriel - amount: 2 + - id: CartridgeMusket + amount: 4 - id: PaperMailNTMusket # Delta Mail From 72ba711e3b0b2ee9dba32cacceb948d5e861c22b Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Tue, 14 Jan 2025 02:27:32 +0100 Subject: [PATCH 099/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 94d3145e3afd..8fab3d5ffc80 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Velcroboy - changes: - - message: Added justice to The Hive - type: Add - id: 406 - time: '2024-06-18T07:58:42.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1409 - author: DLondon changes: - message: Adds the corpsman and librarian to Edge station @@ -3855,3 +3848,10 @@ id: 905 time: '2025-01-13T21:16:09.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2623 +- author: Avalon-Proto + changes: + - message: Snipers rejoice, the Hristov is back on the menu + type: Tweak + id: 906 + time: '2025-01-14T01:27:13.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2213 From cd34f4e73fe2902298916e9a3d8b07ca22f06378 Mon Sep 17 00:00:00 2001 From: Lyndomen <49795619+Lyndomen@users.noreply.github.com> Date: Mon, 13 Jan 2025 20:39:31 -0500 Subject: [PATCH 100/205] rename elite suit to thermal suit (#2720) * Update uplink-catalog.ftl Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update duffelbag.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update hardsuit-helmets.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update hardsuits.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * change elite to thermal * elite to thermal * Update uplink-catalog.ftl Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * evil whitespace Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> --------- Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> --- Resources/Locale/en-US/_DV/store/uplink-catalog.ftl | 2 ++ Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml | 4 ++-- Resources/Prototypes/Catalog/uplink_catalog.yml | 2 +- .../Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml | 2 +- .../Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Resources/Locale/en-US/_DV/store/uplink-catalog.ftl b/Resources/Locale/en-US/_DV/store/uplink-catalog.ftl index 4f9b354a8570..7f59fee1a772 100644 --- a/Resources/Locale/en-US/_DV/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/_DV/store/uplink-catalog.ftl @@ -31,3 +31,5 @@ uplink-appraisal-tool-gun-name = Appraisal Tool Gun uplink-appraisal-tool-gun-desc = A modified Viper to appear as an appraisal tool, at the cost of slightly slower firerate uplink-storage-implanter-delta-desc = Hide goodies inside of yourself with new bluespace technology! Budget cuts have resulted in it NOT STORING High Value or storage items. + +uplink-hardsuit-syndieelite-delta-name = Syndicate Thermal Hardsuit diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index bdbcbc53d0f9..e8d1c995e0ce 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -257,8 +257,8 @@ - type: entity parent: ClothingBackpackDuffelSyndicateBundle id: ClothingBackpackDuffelSyndicateEliteHardsuitBundle - name: syndicate elite hardsuit bundle - description: "Contains the Syndicate's elite hardsuit, which comes with some more stuff in it." + name: syndicate thermal hardsuit bundle # DeltaV change elite to thermal + description: "Contains the Syndicate's thermal hardsuit, which comes with some more stuff in it." # DeltaV change elite to thermal components: - type: StorageFill contents: diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 9e95b187e4ea..01dfb8728336 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1604,7 +1604,7 @@ - type: listing id: UplinkHardsuitSyndieElite - name: uplink-hardsuit-syndieelite-name + name: uplink-hardsuit-syndieelite-delta-name # DeltaV change elite to thermal description: uplink-hardsuit-syndieelite-desc icon: { sprite: /Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi, state: icon } productEntity: ClothingBackpackDuffelSyndicateEliteHardsuitBundle diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index ce8b437cdfc0..eb119a362cea 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml @@ -395,7 +395,7 @@ - type: entity parent: ClothingHeadHardsuitWithLightBase id: ClothingHeadHelmetHardsuitSyndieElite - name: syndicate elite helmet + name: syndicate thermal helmet # DeltaV change elite to thermal description: An elite version of the blood-red hardsuit's helmet, with improved armor and fireproofing. Property of Gorlex Marauders. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 80b5e12cf480..d903ab38b9ff 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -550,7 +550,7 @@ - type: entity parent: [ClothingOuterHardsuitBase, BaseSyndicateContraband] id: ClothingOuterHardsuitSyndieElite - name: syndicate elite hardsuit + name: syndicate thermal hardsuit # DeltaV change elite to thermal description: An elite version of the blood-red hardsuit, with improved mobility and fireproofing. Property of Gorlex Marauders. components: - type: Sprite From d9baf114bb3e998525549925c7a4dab86960b03b Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Tue, 14 Jan 2025 02:39:50 +0100 Subject: [PATCH 101/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 8fab3d5ffc80..059eceb7cdee 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,13 +1,4 @@ Entries: -- author: DLondon - changes: - - message: Adds the corpsman and librarian to Edge station - type: Add - - message: Adjusted various elements of Edge station as part of a long-term rebuild - type: Tweak - id: 407 - time: '2024-06-19T05:02:56.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1330 - author: deltanedas changes: - message: CentComm now has a justice department if you want to use it for admemes. @@ -3855,3 +3846,11 @@ id: 906 time: '2025-01-14T01:27:13.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2213 +- author: Lyndomen, KameriaKats + changes: + - message: Syndicate Elite Suits are now called Syndicate Thermal Suits to better + represent their niche + type: Tweak + id: 907 + time: '2025-01-14T01:39:32.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2720 From ef746958fd39b44c2794acdc885c3fdc15ca4081 Mon Sep 17 00:00:00 2001 From: beck-thompson <107373427+beck-thompson@users.noreply.github.com> Date: Mon, 13 Jan 2025 21:31:52 -0800 Subject: [PATCH 102/205] Fix: Lone ops can no longer be targeted by kill objectives (#2724) * fix * Evil gone --- Resources/Prototypes/GameRules/events.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml index 3e5964dea6b6..815ee101bf78 100644 --- a/Resources/Prototypes/GameRules/events.yml +++ b/Resources/Prototypes/GameRules/events.yml @@ -520,6 +520,7 @@ - RoleSurvivalNukie components: - type: NukeOperative + - type: TargetObjectiveImmune # DeltaV - Nukies are no longer targets of kill objectives, this includes lone ops. - type: RandomMetadata nameSegments: - SyndicateNamesPrefix From bfdf6300f293a8fc033b22aca54a2801ea6b351b Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Tue, 14 Jan 2025 06:32:11 +0100 Subject: [PATCH 103/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 059eceb7cdee..93edd908e8ec 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: deltanedas - changes: - - message: CentComm now has a justice department if you want to use it for admemes. - type: Tweak - id: 408 - time: '2024-06-19T14:48:59.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1352 - author: Velcroboy changes: - message: Added the NTES-Fishbowl, a stylish new ride to Centcomm from The Hive @@ -3854,3 +3847,10 @@ id: 907 time: '2025-01-14T01:39:32.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2720 +- author: beck-thompson + changes: + - message: Lone ops can now no longer be targeted by kill objectives + type: Fix + id: 908 + time: '2025-01-14T05:31:53.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2724 From 97492b38f5e4c79539bc53644d3bc6e41eb3a459 Mon Sep 17 00:00:00 2001 From: Michelle Szinger Date: Mon, 13 Jan 2025 22:56:24 -0700 Subject: [PATCH 104/205] Port undergarments from ImpStation (#2719) All races available in the character creator may wear undergarments. Also lets slimefolk wear chest tattoos. --- .../Humanoid/HumanoidVisualLayers.cs | 2 + .../Humanoid/Markings/MarkingCategories.cs | 4 + .../Locale/en-US/_DV/markings/tattoos.ftl | 3 + .../_DV/preferences/ui/markings-picker.ftl | 2 + .../en-US/_Impstation/markings/undershirt.ftl | 29 ++++ .../en-US/_Impstation/markings/underwear.ftl | 10 ++ .../Mobs/Customization/Markings/tattoos.yml | 4 +- .../Entities/Mobs/Species/arachnid.yml | 2 + .../Prototypes/Entities/Mobs/Species/base.yml | 4 + .../Prototypes/Entities/Mobs/Species/moth.yml | 2 + .../Prototypes/Nyanotrasen/Species/Oni.yml | 6 + .../Nyanotrasen/Species/felinid.yml | 6 + Resources/Prototypes/Species/arachnid.yml | 10 ++ Resources/Prototypes/Species/diona.yml | 10 ++ Resources/Prototypes/Species/gingerbread.yml | 2 + Resources/Prototypes/Species/human.yml | 10 ++ Resources/Prototypes/Species/moth.yml | 10 ++ Resources/Prototypes/Species/reptilian.yml | 10 ++ Resources/Prototypes/Species/slime.yml | 10 ++ Resources/Prototypes/Species/vox.yml | 10 ++ .../Mobs/Customization/Markings/tattoos.yml | 18 ++- .../_DV/Entities/Mobs/Species/harpy.yml | 4 + .../_DV/Entities/Mobs/Species/rodentia.yml | 2 + .../_DV/Entities/Mobs/Species/vulpkanin.yml | 2 + Resources/Prototypes/_DV/Species/harpy.yml | 8 + Resources/Prototypes/_DV/Species/rodentia.yml | 8 + .../Prototypes/_DV/Species/vulpkanin.yml | 8 + .../Customization/Markings/undershirt.yml | 139 ++++++++++++++++++ .../Mobs/Customization/Markings/underwear.yml | 69 +++++++++ .../Mobs/Customization/tattoos.rsi/meta.json | 34 +++-- .../tattoos.rsi/tattoo_nanotrasen_chest.png | Bin 0 -> 173 bytes .../Customization/undershirt.rsi/binder.png | Bin 0 -> 483 bytes .../Customization/undershirt.rsi/classic.png | Bin 0 -> 318 bytes .../undershirt.rsi/gross_sleeveless.png | Bin 0 -> 735 bytes .../Customization/undershirt.rsi/meta.json | 51 +++++++ .../undershirt.rsi/nanotrasen.png | Bin 0 -> 764 bytes .../undershirt.rsi/rolled_undershirt.png | Bin 0 -> 640 bytes .../rolled_undershirt_sleeveless.png | Bin 0 -> 555 bytes .../undershirt.rsi/sleeveless.png | Bin 0 -> 518 bytes .../Customization/undershirt.rsi/sports.png | Bin 0 -> 335 bytes .../undershirt.rsi/strapless.png | Bin 0 -> 285 bytes .../undershirt.rsi/undershirt.png | Bin 0 -> 584 bytes .../Customization/underwear.rsi/boxers.png | Bin 0 -> 422 bytes .../Customization/underwear.rsi/briefs.png | Bin 0 -> 288 bytes .../Customization/underwear.rsi/lowriders.png | Bin 0 -> 295 bytes .../Customization/underwear.rsi/meta.json | 31 ++++ .../Customization/underwear.rsi/satin.png | Bin 0 -> 279 bytes .../Customization/underwear.rsi/tanga.png | Bin 0 -> 298 bytes 48 files changed, 501 insertions(+), 19 deletions(-) create mode 100644 Resources/Locale/en-US/_DV/preferences/ui/markings-picker.ftl create mode 100644 Resources/Locale/en-US/_Impstation/markings/undershirt.ftl create mode 100644 Resources/Locale/en-US/_Impstation/markings/underwear.ftl create mode 100644 Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/undershirt.yml create mode 100644 Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/underwear.yml create mode 100644 Resources/Textures/_DV/Mobs/Customization/tattoos.rsi/tattoo_nanotrasen_chest.png create mode 100644 Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/binder.png create mode 100644 Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/classic.png create mode 100644 Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/gross_sleeveless.png create mode 100644 Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/meta.json create mode 100644 Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/nanotrasen.png create mode 100644 Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/rolled_undershirt.png create mode 100644 Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/rolled_undershirt_sleeveless.png create mode 100644 Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/sleeveless.png create mode 100644 Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/sports.png create mode 100644 Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/strapless.png create mode 100644 Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/undershirt.png create mode 100644 Resources/Textures/_Impstation/Mobs/Customization/underwear.rsi/boxers.png create mode 100644 Resources/Textures/_Impstation/Mobs/Customization/underwear.rsi/briefs.png create mode 100644 Resources/Textures/_Impstation/Mobs/Customization/underwear.rsi/lowriders.png create mode 100644 Resources/Textures/_Impstation/Mobs/Customization/underwear.rsi/meta.json create mode 100644 Resources/Textures/_Impstation/Mobs/Customization/underwear.rsi/satin.png create mode 100644 Resources/Textures/_Impstation/Mobs/Customization/underwear.rsi/tanga.png diff --git a/Content.Shared/Humanoid/HumanoidVisualLayers.cs b/Content.Shared/Humanoid/HumanoidVisualLayers.cs index cecd8a1c13e2..f55ee48d17e5 100644 --- a/Content.Shared/Humanoid/HumanoidVisualLayers.cs +++ b/Content.Shared/Humanoid/HumanoidVisualLayers.cs @@ -11,6 +11,8 @@ public enum HumanoidVisualLayers : byte Hair, FacialHair, Chest, + Underwear, // DeltaV + Undershirt, // DeltaV Head, Snout, HeadSide, // side parts (i.e., frills) diff --git a/Content.Shared/Humanoid/Markings/MarkingCategories.cs b/Content.Shared/Humanoid/Markings/MarkingCategories.cs index db82fb1fd3d2..062ed4c4f5e1 100644 --- a/Content.Shared/Humanoid/Markings/MarkingCategories.cs +++ b/Content.Shared/Humanoid/Markings/MarkingCategories.cs @@ -13,6 +13,8 @@ public enum MarkingCategories : byte HeadSide, Snout, Chest, + Underwear, // DeltaV + Undershirt, // DeltaV Arms, Legs, Tail, @@ -32,6 +34,8 @@ public static MarkingCategories FromHumanoidVisualLayers(HumanoidVisualLayers la HumanoidVisualLayers.HeadTop => MarkingCategories.HeadTop, HumanoidVisualLayers.HeadSide => MarkingCategories.HeadSide, HumanoidVisualLayers.Snout => MarkingCategories.Snout, + HumanoidVisualLayers.Undershirt => MarkingCategories.Undershirt, // DeltaV + HumanoidVisualLayers.Underwear => MarkingCategories.Underwear, // DeltaV HumanoidVisualLayers.Chest => MarkingCategories.Chest, HumanoidVisualLayers.RArm => MarkingCategories.Arms, HumanoidVisualLayers.LArm => MarkingCategories.Arms, diff --git a/Resources/Locale/en-US/_DV/markings/tattoos.ftl b/Resources/Locale/en-US/_DV/markings/tattoos.ftl index d62a118a8907..48000f664155 100644 --- a/Resources/Locale/en-US/_DV/markings/tattoos.ftl +++ b/Resources/Locale/en-US/_DV/markings/tattoos.ftl @@ -6,3 +6,6 @@ marking-TattooNightlingChestMale = Chest Tattoo (Nightling) marking-TattooNightlingChestFemale-tattoo_nightling_female = Chest Tattoo (Nightling) marking-TattooNightlingChestFemale = Chest Tattoo (Nightling) + +marking-TattooNanotrasenChest-tattoo_nanotrasen_chest = Chest Tattoo (Nanotrasen) +marking-TattooNanotrasenChest = Chest Tattoo (Nanotrasen) diff --git a/Resources/Locale/en-US/_DV/preferences/ui/markings-picker.ftl b/Resources/Locale/en-US/_DV/preferences/ui/markings-picker.ftl new file mode 100644 index 000000000000..dde065d59e09 --- /dev/null +++ b/Resources/Locale/en-US/_DV/preferences/ui/markings-picker.ftl @@ -0,0 +1,2 @@ +markings-category-Undershirt = Undershirt +markings-category-Underwear = Underwear diff --git a/Resources/Locale/en-US/_Impstation/markings/undershirt.ftl b/Resources/Locale/en-US/_Impstation/markings/undershirt.ftl new file mode 100644 index 000000000000..62ba91032afe --- /dev/null +++ b/Resources/Locale/en-US/_Impstation/markings/undershirt.ftl @@ -0,0 +1,29 @@ +marking-UndershirtDefault-undershirt = Undershirt +marking-UndershirtDefault = Undershirt (Default) + +marking-UndershirtRolled-rolled_undershirt = Undershirt +marking-UndershirtRolled = Undershirt (Rolled) + +marking-UndershirtSleeveless-sleeveless = Tanktop +marking-UndershirtSleeveless = Tanktop + +marking-UndershirtGrossSleeveless-gross_sleeveless = Tanktop +marking-UndershirtGrossSleeveless = Tanktop (Gross) + +marking-UndershirtRolledSleeveless-rolled_undershirt_sleeveless = Tanktop +marking-UndershirtRolledSleeveless = Tanktop (Rolled) + +marking-UndershirtNanotrasen-nanotrasen = Undershirt +marking-UndershirtNanotrasen = Undershirt (Nanotrasen) + +marking-UndershirtBinder-binder = Binder +marking-UndershirtBinder = Binder + +marking-UndershirtBraClassic-classic = Bra +marking-UndershirtBraClassic = Bra (Classic) + +marking-UndershirtBraSports-sports = Bra +marking-UndershirtBraSports = Bra (Sports) + +marking-UndershirtBraStrapless-strapless = Bra +marking-UndershirtBraStrapless = Bra (Strapless) diff --git a/Resources/Locale/en-US/_Impstation/markings/underwear.ftl b/Resources/Locale/en-US/_Impstation/markings/underwear.ftl new file mode 100644 index 000000000000..23fbf04b23f4 --- /dev/null +++ b/Resources/Locale/en-US/_Impstation/markings/underwear.ftl @@ -0,0 +1,10 @@ +marking-UnderwearDefault-boxers = Underwear +marking-UnderwearDefault = Underwear (Default) +marking-UnderwearBriefs-briefs = Underwear +marking-UnderwearBriefs = Underwear (Briefs) +marking-UnderwearLowriders-lowriders = Underwear +marking-UnderwearLowriders = Underwear (Lowriders) +marking-UnderwearSatin-satin = Underwear +marking-UnderwearSatin = Underwear (Satin) +marking-UnderwearTanga-tanga = Underwear +marking-UnderwearTanga = Underwear (Tanga) diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml index ef6f057d823b..6310f1b34f20 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml @@ -2,7 +2,7 @@ id: TattooHiveChest bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + speciesRestriction: [Human, Dwarf, SlimePerson, Felinid, Oni] # Delta V - SlimePerson, Felinid, Oni sexRestriction: [Male] # DeltaV: Splitting the scars and tattoos coloring: default: @@ -17,7 +17,7 @@ id: TattooNightlingChest bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + speciesRestriction: [Human, Dwarf, SlimePerson, Felinid, Oni] # Delta V - SlimePerson, Felinid, Oni sexRestriction: [Male] # DeltaV: Splitting the scars and tattoos coloring: default: diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml index 0fd52d3f87a5..56f43a2a78eb 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml @@ -83,6 +83,8 @@ - map: [ "enum.HumanoidVisualLayers.LArm" ] - map: [ "enum.HumanoidVisualLayers.RLeg" ] - map: [ "enum.HumanoidVisualLayers.LLeg" ] + - map: [ "enum.HumanoidVisualLayers.Underwear" ] # DeltaV + - map: [ "enum.HumanoidVisualLayers.Undershirt" ] # DeltaV - map: ["jumpsuit"] - map: ["enum.HumanoidVisualLayers.LFoot"] - map: ["enum.HumanoidVisualLayers.RFoot"] diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml index 969e8a246505..7db00d773322 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml @@ -19,6 +19,8 @@ - map: [ "enum.HumanoidVisualLayers.LArm" ] - map: [ "enum.HumanoidVisualLayers.RLeg" ] - map: [ "enum.HumanoidVisualLayers.LLeg" ] + - map: [ "enum.HumanoidVisualLayers.Underwear" ] # DeltaV + - map: [ "enum.HumanoidVisualLayers.Undershirt" ] # DeltaV - map: ["jumpsuit"] - map: ["enum.HumanoidVisualLayers.LFoot"] - map: ["enum.HumanoidVisualLayers.RFoot"] @@ -322,6 +324,8 @@ - map: [ "enum.HumanoidVisualLayers.LArm" ] - map: [ "enum.HumanoidVisualLayers.RLeg" ] - map: [ "enum.HumanoidVisualLayers.LLeg" ] + - map: [ "enum.HumanoidVisualLayers.Underwear" ] # DeltaV + - map: [ "enum.HumanoidVisualLayers.Undershirt" ] # DeltaV - map: ["jumpsuit"] - map: ["enum.HumanoidVisualLayers.LFoot"] - map: ["enum.HumanoidVisualLayers.RFoot"] diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml index 92592116f214..2284af6b080f 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml @@ -84,6 +84,8 @@ - map: [ "enum.HumanoidVisualLayers.LArm" ] - map: [ "enum.HumanoidVisualLayers.RLeg" ] - map: [ "enum.HumanoidVisualLayers.LLeg" ] + - map: [ "enum.HumanoidVisualLayers.Underwear" ] # DeltaV + - map: [ "enum.HumanoidVisualLayers.Undershirt" ] # DeltaV - map: [ "jumpsuit" ] - map: [ "enum.HumanoidVisualLayers.LHand" ] - map: [ "enum.HumanoidVisualLayers.RHand" ] diff --git a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml index d5e6cd459ed0..88ee0825f2b1 100644 --- a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml +++ b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml @@ -35,6 +35,12 @@ Chest: points: 1 required: false + Underwear: + points: 1 + required: false + Undershirt: + points: 1 + required: false Legs: points: 6 required: false diff --git a/Resources/Prototypes/Nyanotrasen/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Species/felinid.yml index e6a64379d93b..8a3eb7fa9974 100644 --- a/Resources/Prototypes/Nyanotrasen/Species/felinid.yml +++ b/Resources/Prototypes/Nyanotrasen/Species/felinid.yml @@ -28,6 +28,12 @@ Chest: points: 1 required: false + Underwear: + points: 1 + required: false + Undershirt: + points: 1 + required: false Legs: points: 6 required: false diff --git a/Resources/Prototypes/Species/arachnid.yml b/Resources/Prototypes/Species/arachnid.yml index 5dedba1b4474..da01cb750b39 100644 --- a/Resources/Prototypes/Species/arachnid.yml +++ b/Resources/Prototypes/Species/arachnid.yml @@ -19,6 +19,8 @@ sprites: Head: MobArachnidHead Snout: MobHumanoidAnyMarking + Underwear: MobHumanoidAnyMarking # DeltaV + Undershirt: MobHumanoidAnyMarking # DeltaV Chest: MobArachnidTorso HeadTop: MobHumanoidAnyMarking HeadSide: MobHumanoidAnyMarking @@ -63,6 +65,14 @@ Chest: points: 1 required: false + # Begin DeltaV changes. + Underwear: + points: 1 + required: false + Undershirt: + points: 1 + required: false + # End DeltaV changes. Legs: points: 6 required: false diff --git a/Resources/Prototypes/Species/diona.yml b/Resources/Prototypes/Species/diona.yml index 19fafaa3e1b7..fc84b4cf9563 100644 --- a/Resources/Prototypes/Species/diona.yml +++ b/Resources/Prototypes/Species/diona.yml @@ -19,6 +19,8 @@ Head: MobDionaHead HeadTop: MobHumanoidAnyMarking HeadSide: MobHumanoidAnyMarking + Underwear: MobHumanoidAnyMarking # DeltaV + Undershirt: MobHumanoidAnyMarking # DeltaV Chest: MobDionaTorso Eyes: MobDionaEyes LArm: MobDionaLArm @@ -49,6 +51,14 @@ Legs: points: 2 required: false + # Begin DeltaV changes. + Underwear: + points: 1 + required: false + Undershirt: + points: 1 + required: false + # End DeltaV changes. Arms: points: 2 required: false diff --git a/Resources/Prototypes/Species/gingerbread.yml b/Resources/Prototypes/Species/gingerbread.yml index e6fc0d20df5b..148799cb1c0a 100644 --- a/Resources/Prototypes/Species/gingerbread.yml +++ b/Resources/Prototypes/Species/gingerbread.yml @@ -15,6 +15,8 @@ Head: MobGingerbreadHead HeadTop: MobHumanoidAnyMarking HeadSide: MobHumanoidAnyMarking + Underwear: MobHumanoidAnyMarking # DeltaV + Undershirt: MobHumanoidAnyMarking # DeltaV Chest: MobGingerbreadTorso Eyes: MobGingerbreadEyes LArm: MobGingerbreadLArm diff --git a/Resources/Prototypes/Species/human.yml b/Resources/Prototypes/Species/human.yml index bb494bfa7995..8837dc14aafb 100644 --- a/Resources/Prototypes/Species/human.yml +++ b/Resources/Prototypes/Species/human.yml @@ -22,6 +22,8 @@ Hair: MobHumanoidAnyMarking FacialHair: MobHumanoidAnyMarking Snout: MobHumanoidAnyMarking + Underwear: MobHumanoidAnyMarking # DeltaV + Undershirt: MobHumanoidAnyMarking # DeltaV Chest: MobHumanTorso Eyes: MobHumanoidEyes HeadTop: MobHumanoidAnyMarking @@ -60,6 +62,14 @@ Chest: points: 1 required: false + # Begin DeltaV changes. + Underwear: + points: 1 + required: false + Undershirt: + points: 1 + required: false + # End DeltaV changes. Legs: points: 6 required: false diff --git a/Resources/Prototypes/Species/moth.yml b/Resources/Prototypes/Species/moth.yml index 2623865b0465..667bb589b914 100644 --- a/Resources/Prototypes/Species/moth.yml +++ b/Resources/Prototypes/Species/moth.yml @@ -17,6 +17,8 @@ sprites: Head: MobMothHead Snout: MobHumanoidAnyMarking + Underwear: MobHumanoidAnyMarking # DeltaV + Undershirt: MobHumanoidAnyMarking # DeltaV Chest: MobMothTorso HeadTop: MobHumanoidAnyMarking HeadSide: MobHumanoidAnyMarking @@ -67,6 +69,14 @@ Chest: points: 1 required: false + # Begin DeltaV changes. + Underwear: + points: 1 + required: false + Undershirt: + points: 1 + required: false + # End DeltaV changes. Legs: points: 6 required: false diff --git a/Resources/Prototypes/Species/reptilian.yml b/Resources/Prototypes/Species/reptilian.yml index 16f2728070e6..48dc3874d6c6 100644 --- a/Resources/Prototypes/Species/reptilian.yml +++ b/Resources/Prototypes/Species/reptilian.yml @@ -17,6 +17,8 @@ sprites: Head: MobReptilianHead Snout: MobHumanoidAnyMarking + Underwear: MobHumanoidAnyMarking # DeltaV + Undershirt: MobHumanoidAnyMarking # DeltaV Chest: MobReptilianTorso HeadTop: MobHumanoidAnyMarking HeadSide: MobHumanoidAnyMarking @@ -58,6 +60,14 @@ Chest: points: 3 required: false + # Begin DeltaV changes. + Underwear: + points: 1 + required: false + Undershirt: + points: 1 + required: false + # End DeltaV changes. Legs: points: 6 required: false diff --git a/Resources/Prototypes/Species/slime.yml b/Resources/Prototypes/Species/slime.yml index ef49e9b7cf69..36e77a6902f8 100644 --- a/Resources/Prototypes/Species/slime.yml +++ b/Resources/Prototypes/Species/slime.yml @@ -15,6 +15,8 @@ Head: MobSlimeHead Hair: MobSlimeMarkingFollowSkin FacialHair: MobSlimeMarkingFollowSkin + Underwear: MobHumanoidAnyMarking # DeltaV + Undershirt: MobHumanoidAnyMarking # DeltaV Chest: MobSlimeTorso Eyes: MobHumanoidEyes LArm: MobSlimeLArm @@ -38,6 +40,14 @@ Chest: points: 1 required: false + # Begin DeltaV changes. + Underwear: + points: 1 + required: false + Undershirt: + points: 1 + required: false + # End DeltaV changes. Legs: points: 4 required: false diff --git a/Resources/Prototypes/Species/vox.yml b/Resources/Prototypes/Species/vox.yml index 7419f3f277e9..1885583c1515 100644 --- a/Resources/Prototypes/Species/vox.yml +++ b/Resources/Prototypes/Species/vox.yml @@ -21,6 +21,8 @@ Snout: MobHumanoidAnyMarking Hair: MobHumanoidAnyMarking FacialHair: MobHumanoidAnyMarking + Underwear: MobHumanoidAnyMarking # DeltaV + Undershirt: MobHumanoidAnyMarking # DeltaV Chest: MobVoxTorso Eyes: MobVoxEyes LArm: MobVoxLArm @@ -58,6 +60,14 @@ points: 4 required: true defaultMarkings: [ VoxLLegScales, VoxRLegScales, VoxRFootScales, VoxLFootScales ] + # Begin DeltaV changes. + Underwear: + points: 1 + required: false + Undershirt: + points: 1 + required: false + # End DeltaV changes. Chest: points: 1 required: false diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/tattoos.yml b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/tattoos.yml index a3df17763328..2d92c02b4299 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/tattoos.yml +++ b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/tattoos.yml @@ -2,7 +2,7 @@ id: TattooHiveChestFemale # DeltaV: Splitting the scars and tattoos bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + speciesRestriction: [Human, Dwarf, SlimePerson, Felinid, Oni] # Delta V - SlimePerson, Felinid, Oni sexRestriction: [Female] # DeltaV: Splitting the scars and tattoos coloring: default: @@ -17,7 +17,7 @@ id: TattooNightlingChestFemale # DeltaV: Splitting the scars and tattoos bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + speciesRestriction: [Human, Dwarf, SlimePerson, Felinid, Oni] # Delta V - SlimePerson, Felinid, Oni sexRestriction: [Female] # DeltaV: Splitting the scars and tattoos coloring: default: @@ -27,3 +27,17 @@ sprites: - sprite: _DV/Mobs/Customization/tattoos.rsi state: tattoo_nightling_female + +- type: marking + id: TattooNanotrasenChest + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Human, Dwarf, SlimePerson] + coloring: + default: + type: + !type:TattooColoring + fallbackColor: "#666666" + sprites: + - sprite: _DV/Mobs/Customization/tattoos.rsi + state: tattoo_nanotrasen_chest diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/_DV/Entities/Mobs/Species/harpy.yml index ec305698aa16..c057b353a746 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/Species/harpy.yml +++ b/Resources/Prototypes/_DV/Entities/Mobs/Species/harpy.yml @@ -42,6 +42,8 @@ - map: [ "enum.HumanoidVisualLayers.LArm" ] - map: [ "enum.HumanoidVisualLayers.RLeg" ] - map: [ "enum.HumanoidVisualLayers.LLeg" ] + - map: [ "enum.HumanoidVisualLayers.Underwear" ] + - map: [ "enum.HumanoidVisualLayers.Undershirt" ] - map: [ "underpants" ] - map: [ "undershirt" ] - map: [ "socks" ] @@ -175,6 +177,8 @@ - map: [ "enum.HumanoidVisualLayers.LArm" ] - map: [ "enum.HumanoidVisualLayers.RLeg" ] - map: [ "enum.HumanoidVisualLayers.LLeg" ] + - map: [ "enum.HumanoidVisualLayers.Underwear" ] + - map: [ "enum.HumanoidVisualLayers.Undershirt" ] - map: [ "underpants" ] - map: [ "undershirt" ] - map: [ "socks" ] diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Species/rodentia.yml b/Resources/Prototypes/_DV/Entities/Mobs/Species/rodentia.yml index 95e55cd02df3..1fdd2cc01796 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/Species/rodentia.yml +++ b/Resources/Prototypes/_DV/Entities/Mobs/Species/rodentia.yml @@ -45,6 +45,8 @@ - map: [ "enum.HumanoidVisualLayers.LArm" ] - map: [ "enum.HumanoidVisualLayers.RLeg" ] - map: [ "enum.HumanoidVisualLayers.LLeg" ] + - map: [ "enum.HumanoidVisualLayers.Underwear" ] + - map: [ "enum.HumanoidVisualLayers.Undershirt" ] - map: [ "jumpsuit" ] - map: [ "enum.HumanoidVisualLayers.LHand" ] - map: [ "enum.HumanoidVisualLayers.RHand" ] diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/_DV/Entities/Mobs/Species/vulpkanin.yml index ac7f62b86ccc..07e3f627fd24 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/Species/vulpkanin.yml +++ b/Resources/Prototypes/_DV/Entities/Mobs/Species/vulpkanin.yml @@ -45,6 +45,8 @@ sprite: _DV/Mobs/Customization/Vulpkanin/masking_helpers.rsi state: female_full visible: false + - map: [ "enum.HumanoidVisualLayers.Underwear" ] + - map: [ "enum.HumanoidVisualLayers.Undershirt" ] - map: [ "jumpsuit" ] - map: [ "enum.HumanoidVisualLayers.LHand" ] - map: [ "enum.HumanoidVisualLayers.RHand" ] diff --git a/Resources/Prototypes/_DV/Species/harpy.yml b/Resources/Prototypes/_DV/Species/harpy.yml index 49861c04a8e9..3f47171710f2 100644 --- a/Resources/Prototypes/_DV/Species/harpy.yml +++ b/Resources/Prototypes/_DV/Species/harpy.yml @@ -15,6 +15,8 @@ Hair: MobHumanoidAnyMarking FacialHair: MobHumanoidAnyMarking Snout: MobHumanoidAnyMarking + Underwear: MobHumanoidAnyMarking + Undershirt: MobHumanoidAnyMarking Chest: MobHarpyTorso HeadTop: MobHumanoidAnyMarking HeadSide: MobHumanoidAnyMarking @@ -51,6 +53,12 @@ points: 1 required: true defaultMarkings: [ HarpyChestDefault ] + Underwear: + points: 1 + required: false + Undershirt: + points: 1 + required: false Legs: points: 2 required: false diff --git a/Resources/Prototypes/_DV/Species/rodentia.yml b/Resources/Prototypes/_DV/Species/rodentia.yml index 6d235be35ff9..e92484d8dfd0 100644 --- a/Resources/Prototypes/_DV/Species/rodentia.yml +++ b/Resources/Prototypes/_DV/Species/rodentia.yml @@ -20,6 +20,8 @@ Hair: MobHumanoidAnyMarking FacialHair: MobHumanoidAnyMarking Snout: MobHumanoidAnyMarking + Underwear: MobHumanoidAnyMarking + Undershirt: MobHumanoidAnyMarking Chest: MobRodentiaTorso HeadTop: MobHumanoidAnyMarking HeadSide: MobHumanoidAnyMarking @@ -53,6 +55,12 @@ Arms: points: 6 required: false + Underwear: + points: 1 + required: false + Undershirt: + points: 1 + required: false Snout: points: 1 required: false diff --git a/Resources/Prototypes/_DV/Species/vulpkanin.yml b/Resources/Prototypes/_DV/Species/vulpkanin.yml index 1c5cd66457a7..22e71716b76e 100644 --- a/Resources/Prototypes/_DV/Species/vulpkanin.yml +++ b/Resources/Prototypes/_DV/Species/vulpkanin.yml @@ -19,6 +19,8 @@ Hair: MobHumanoidAnyMarking FacialHair: MobHumanoidAnyMarking Snout: MobHumanoidAnyMarking + Underwear: MobHumanoidAnyMarking + Undershirt: MobHumanoidAnyMarking Chest: MobVulpkaninTorso HeadTop: MobHumanoidAnyMarking HeadSide: MobHumanoidAnyMarking @@ -49,6 +51,12 @@ Head: points: 3 required: false + Underwear: + points: 1 + required: false + Undershirt: + points: 1 + required: false Legs: points: 6 required: false diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/undershirt.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/undershirt.yml new file mode 100644 index 000000000000..5d5625a7f6a4 --- /dev/null +++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/undershirt.yml @@ -0,0 +1,139 @@ +- type: marking + id: UndershirtDefault + bodyPart: Undershirt + markingCategory: Undershirt + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _Impstation/Mobs/Customization/undershirt.rsi + state: undershirt + +- type: marking + id: UndershirtRolled + bodyPart: Undershirt + markingCategory: Undershirt + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _Impstation/Mobs/Customization/undershirt.rsi + state: rolled_undershirt + +- type: marking + id: UndershirtSleeveless + bodyPart: Undershirt + markingCategory: Undershirt + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _Impstation/Mobs/Customization/undershirt.rsi + state: sleeveless + +- type: marking + id: UndershirtRolledSleeveless + bodyPart: Undershirt + markingCategory: Undershirt + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _Impstation/Mobs/Customization/undershirt.rsi + state: rolled_undershirt_sleeveless + +- type: marking + id: UndershirtGrossSleeveless + bodyPart: Undershirt + markingCategory: Undershirt + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _Impstation/Mobs/Customization/undershirt.rsi + state: gross_sleeveless + +- type: marking + id: UndershirtNanotrasen + bodyPart: Undershirt + markingCategory: Undershirt + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _Impstation/Mobs/Customization/undershirt.rsi + state: nanotrasen + +- type: marking + id: UndershirtBinder + bodyPart: Undershirt + markingCategory: Undershirt + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _Impstation/Mobs/Customization/undershirt.rsi + state: binder + +- type: marking + id: UndershirtBraClassic + bodyPart: Undershirt + markingCategory: Undershirt + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _Impstation/Mobs/Customization/undershirt.rsi + state: classic + +- type: marking + id: UndershirtBraSports + bodyPart: Undershirt + markingCategory: Undershirt + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _Impstation/Mobs/Customization/undershirt.rsi + state: sports + +- type: marking + id: UndershirtBraStrapless + bodyPart: Undershirt + markingCategory: Undershirt + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _Impstation/Mobs/Customization/undershirt.rsi + state: strapless diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/underwear.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/underwear.yml new file mode 100644 index 000000000000..f43a6c9eb50a --- /dev/null +++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/underwear.yml @@ -0,0 +1,69 @@ +- type: marking + id: UnderwearDefault + bodyPart: Underwear + markingCategory: Underwear + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _Impstation/Mobs/Customization/underwear.rsi + state: boxers + +- type: marking + id: UnderwearBriefs + bodyPart: Underwear + markingCategory: Underwear + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _Impstation/Mobs/Customization/underwear.rsi + state: briefs + +- type: marking + id: UnderwearLowriders + bodyPart: Underwear + markingCategory: Underwear + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _Impstation/Mobs/Customization/underwear.rsi + state: lowriders + +- type: marking + id: UnderwearSatin + bodyPart: Underwear + markingCategory: Underwear + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _Impstation/Mobs/Customization/underwear.rsi + state: satin + +- type: marking + id: UnderwearTanga + bodyPart: Underwear + markingCategory: Underwear + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _Impstation/Mobs/Customization/underwear.rsi + state: tanga diff --git a/Resources/Textures/_DV/Mobs/Customization/tattoos.rsi/meta.json b/Resources/Textures/_DV/Mobs/Customization/tattoos.rsi/meta.json index 5693064c0f59..4999a2299f9d 100644 --- a/Resources/Textures/_DV/Mobs/Customization/tattoos.rsi/meta.json +++ b/Resources/Textures/_DV/Mobs/Customization/tattoos.rsi/meta.json @@ -1,23 +1,27 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297/modular_skyrat/master_files/icons/mob/body_markings/tattoo_markings.dmi, modified by Aikakakah", + "copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297/modular_skyrat/master_files/icons/mob/body_markings/tattoo_markings.dmi, modified by Aikakakah. NanoTrasen tattoo ported from ImpStation as of https://github.com/impstation/imp-station-14/pull/384", "size": { - "x": 32, - "y": 32 + "x": 32, + "y": 32 }, "states": [ - { - "name": "tattoo_hive_chest_female", - "directions": 4 - }, - { - "name": "tattoo_nightling", - "directions": 4 - }, - { - "name": "tattoo_nightling_female", - "directions": 4 - } + { + "name": "tattoo_hive_chest_female", + "directions": 4 + }, + { + "name": "tattoo_nightling", + "directions": 4 + }, + { + "name": "tattoo_nightling_female", + "directions": 4 + }, + { + "name": "tattoo_nanotrasen_chest", + "directions": 4 + } ] } diff --git a/Resources/Textures/_DV/Mobs/Customization/tattoos.rsi/tattoo_nanotrasen_chest.png b/Resources/Textures/_DV/Mobs/Customization/tattoos.rsi/tattoo_nanotrasen_chest.png new file mode 100644 index 0000000000000000000000000000000000000000..f97c3078a846199f018149364004aa3445e79c89 GIT binary patch literal 173 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wkP%z%p z#WAE}&f8lXc^eFPSPqE)UjItcsnw;?g?Yw-*ymdL+kdhEmHCBUy&-dUet4*|=Qr;2 zd;VOKT`-%ugdHdY0?$6CxIdU$+p_rFfw}8yo`2tenD2rtP`rUnoBNnsqgm0>NRTp5 LS3j3^P6vM6I^6ax|g_X9d=R;n9{gt`X&MEKS`|ruj z(^uP@m>fyI`L=BHBRfay2PIa$_iOzh8p$1A{Ac6q#ktXceQ$3IjBl0r+8o!oYu&}t zx#rhOWnb;$TPv^P_V?)H=yj6G@75IsiX8lTZ>=53flzSqHkX~}#%o!#mc95bmpO}x z;ge1M$<8wd6AZsx`fj`JcJ7|InqY-n~ZF`?cJeC)%dxaN*^LwK}IKsBkhIkT6ycov<)$lFErqIbrKgatoBMW}S8U^cq

57(?dCuK`KZDs&i3QgEYaOM5I6qSjt_WY WV3KzD)OBF2F?hQAxvXk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}zR#a51UAy-G|Np;#{|1U(ev#=3q*zOW{DOgk{~3O7;|m4~a29w( z7BevL9RXp+soH$fK*8mnE{-7)?r*1Ee{~^mi3wNF0@h0$tZsg+ue$e3^QFV$#%E_3y|FsrySAMFJiKI5au~&3MdYeQOc>N_P1b4;HNGewoRev52dr&fXz7 zG@-oVh3K0ifxUD68)e=tdYkxDai2X<3m@x$@h|_Fr2Op#=W@@o06Lk$)78&qol`;+ E08vADs{jB1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/gross_sleeveless.png b/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/gross_sleeveless.png new file mode 100644 index 0000000000000000000000000000000000000000..2ec1b3f1f369dbedbf7f21fb86c8023dc8759db8 GIT binary patch literal 735 zcmV<50wDc~P)P^!wRlc-_h$sn@CifI^uiUMp4s7-P`Yez+BWLRr|X zrYMw~*sP}h?@2r{x!7?WNGSpAi%=uaR7LUiIl=$@VovPQWCy&VD>_p=N1aZ!l zWmy1#PN$P(sf#^s7x?i0Eeho(EXzXDzNFX%Fx_ftxyirsdlJ&fCD9H5fZcAFbO~d+ zCn1g4i3^||H!ECI(!QXeSWQv@Fc=JShX-Fi^tpZ77-N1ffPPK#uP@OK(5G&tv_++~ z&7?^}H%RDWC;bj$v;*`PpP0-wJu0PGK_ER05@$hoi_2_b|KLI@!z{sLybMBPE3 R_bLDY002ovPDHLkV1jHnO&I_H literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/meta.json b/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/meta.json new file mode 100644 index 000000000000..cbf5c67d0ee0 --- /dev/null +++ b/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/meta.json @@ -0,0 +1,51 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/884ab172389b6fc54ef063f5fbea5e8b0a0a2235/icons/mob/humans/undershirt.dmi, nanotrasen taken from https://github.com/tgstation/tgstation/commit/c14e98740794eb107bfa40aad19bd4c4d307184f, undershirts modified by Pinkbat5(github), binder by Pinkbat5(github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "undershirt", + "directions": 4 + }, + { + "name": "sleeveless", + "directions": 4 + }, + { + "name": "gross_sleeveless", + "directions": 4 + }, + { + "name": "rolled_undershirt_sleeveless", + "directions": 4 + }, + { + "name": "rolled_undershirt", + "directions": 4 + }, + { + "name": "binder", + "directions": 4 + }, + { + "name": "classic", + "directions": 4 + }, + { + "name": "sports", + "directions": 4 + }, + { + "name": "strapless", + "directions": 4 + }, + { + "name": "nanotrasen", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/nanotrasen.png b/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/nanotrasen.png new file mode 100644 index 0000000000000000000000000000000000000000..5d69f6dd8e45e6bb905f0a55cb6e2ae6da6d6128 GIT binary patch literal 764 zcmV5*fj9pe1C=;9$^yU^2>kwl3aF zmu{ZAbTi$v`A?`9gU0*;Cc$%-z#%Xsi#+HCb#P8mZMoLzM@!rH0fVeN-S_$3y*s1# z0D>S0f*=TjI0@&I%yq|ES)1#QGtMWaZEfoN{~) z1_0ab1LF9$^0-xT-Enqyb`1bfYID%em`7bvws*@;kB z-zZ*Ocbr)k2V>%(O(}^qjg8J=Q@YSMUIA$uBTZw|$6Di0>k|Y)5ClOG1VIo4K@bE% z5Pvhq@9_1z`817TSsXxj`M^`?f(UI(oxFfiYE1ul+aADihR_8QI#qtGdZSJDwTiY_ z7RRv)mSY$>KnoVrQ;h9WWSmd3w(A1QP)dUHNw%v~5U)0Pd4AB8TB$MMZP_sFR#J-)T6k*XvAcU0u!clvvR&lQ1w|0daiWD~tJJ%|MroMzd1AV|Jaw*a80<X_3T-|wmq&>P>bFhc%hOC4$zNC0nVKj)Jy3?ne+<#j?`qLf4s%wKnY+4w(*kpqr- udb@pSVuLZi(rdCB2!bF8f*=UuKjH_f7EOM`;?FMt00001RCt{2+O4kQKo|z#_iQ#8YO6rui@;UlTZiKUAi)i0E&(&+ zNVtf)Ix29*AzEF6L5)RWz7?DHlm*T*gmSXk?@35Vr_4Ku8aA6ZdIp^)oMlkejia3UFDBPBV<{I>2zw9|I;RXGMNAX zcDo$_P+2w}k1-ew008ZFn`|5L2q|Ti4*;Xli0b9O@5A?f91aIsEEccLPt%m@(ln*@ zdR={Pl{cCHH#YeX&44V+s_$h_Z@1fvX8@{a_4i-l&-{Cu$_Ma!2?!ymD2kiCUK9lh zA!xN)y>#@O&bL}Co6UyeIL2%?yDD2Qmk7fU!{M;8O|Xglhc`h0h~pSx7^2tfU6qAl zh&YaIsw?H=s^RNlGaqBFeIih=`O@l%^?tb!7EwLI_IJ^k!S6lveHd z@kBWCJcs9b06y;vbUK}CM4F_OqE4q%V2J&*vY<6CM8m literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/rolled_undershirt_sleeveless.png b/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/rolled_undershirt_sleeveless.png new file mode 100644 index 0000000000000000000000000000000000000000..ec51c413ed35d060e4c3fe028e7663718a689514 GIT binary patch literal 555 zcmV+`0@VG9P)~XQTHIG< zSz@_dB1w{)v9@hdmSu3v#rJ>ta5|l&sw(VuyPL7&@rX1{vDs{bV*YggpdCUoB%@AbFmPb58ztW%X>v7;(;x)^e|d<(^-m$%m_L zj1jFhwAN5cVeS?g;Qb+$Qt0yzCw|IK44!}?r4*tl0st6e9tjns&lN=xlu{4Hn$#i# zyuS|Kdt9$qoX_WniU>8#=e>uuR;IrD5AA^d5bU?(s|@q?HB2>m2dq}BKW!;}YsxF` t=d&zZTrQVSXU$l{1Q8Jt5fKs5eQ!cL_4T=65552Z002ovPDHLkV1f(?_Xhv~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/sleeveless.png b/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/sleeveless.png new file mode 100644 index 0000000000000000000000000000000000000000..7f6f870ed860d461f747d1561f98c1ec7c330097 GIT binary patch literal 518 zcmV+h0{Q)kP)M6IGhX?JwzmLzQAAcw|{#WQ1E|*Kt`?=+gA5?(NW|K6YYL589r@--eg!lew zY`fj!a5w}f@b37*o1pi8@*G@3?)bq4_-}haPyw#jE1IT3(=?Ogb9#4tA|fIpA|fIp zA|m>9tJfcSWUbY*EYY?t%CZCi?DzZNd2;9)GP+#awnbG{^W`$u1tKE%#)KvM1p2YY za+&I2nG$?=c=&5~x5`CCm$*IVy@!bC*e&{)l^9%rJ`vHPC;$Mv-7aOSAYH7YD3IEh z6kUMOr8cLOT#{A*0Nif3)G6K?JGlU#E~-fi0II554L80enx%{}_g;YRIpxxqv;w+a zx7(4Ix(f8K0IB~$f>uEH$7kqtI;G?g?5}uJIT8^O5fRaYAH)(A=RYL1oB#j-07*qo IM6N<$f^Q`08~^|S literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/sports.png b/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/sports.png new file mode 100644 index 0000000000000000000000000000000000000000..49feecd4a6e4a3d8b84c2f322f82fe95cff1bcd8 GIT binary patch literal 335 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}zPMbC@BO~MX?c4wV{|Ac2EVtwVQmiFGe!)PI{|vvk@dX0~I14-? ziy0XBj({-ZRBb+Kpx_Qq7srqY_qWqd^Bqy(a25RXKYw1g;>=YB$wAY^` zrT)SOrswM%r1I95rTx6kBp4(3_K$GKs+lXNu?31mT-wa=|8M~3gzzgfKA&HZ$eoa5 zqO5DcdXLFOaZ#_>&rHXycat?18~~cp&cromH`AFl@`r05G_RM*Rc_?8Zki&o$Nz9# zz#5Yks;3|SbUpJZ_pl#JolocW-Zx)1)gAb<{`U;k>lLpGj_q2ori_bK#6o0`*q48d YZhCfkou3$H0{y_?>FVdQ&MBb@0FoPny8r+H literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/strapless.png b/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/strapless.png new file mode 100644 index 0000000000000000000000000000000000000000..6736e280018b9e147b230a1563bd0e2c0803f232 GIT binary patch literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}z-oAZ%+O%o^|Nqa($N-8RvDH-qQmiFGe!)P&{|vvk@dX0~I14-? ziy0XBj({-ZRBb+KpkSM)i(^QH``c-bTn7|*Sb9(XzaMkCMaVm7iX2z!bEQ{SFHYuu z65>z@P}spa>)~e8q*=Qh?c$S!e(-WJPG;@65k5sjqI2>N`9$syTlRl{zyea);Lymx z^mKj``}3e(SN}Ft34Q;VRMPOOTHJ5f;aCGJhsrqVBQbnzCs%)KU|?cxde5rFUiZgd Vb?T}*kXcc>nsEfidEqe}lLMTug>|Kh|D$qyhRA|fK1WQ=iIYd18ewRXms!LhYi zYh78EgBfL6I%{pXd~2-}L*p_QstB!hmtU6Uw}%+}f)?oqNC7_MYv)h#$$y)3P+iyE zYo!#FQs{>$r2qg`Red{t4PW!e{3icp?t#`?*E9{%G#xCWswxykf$esS!{IRdywA>m zoqM31bZmCz{SY5MWd7_40Dv@27mY6!B7fF3KomuR^ZDGZwZ8p+kJIVoUBI*Ry(R$o zSZiZz@Gq>L?>zxiYcRC6^SvhEe!rt>8Z=EaIv&!q^NEOvh=_=Yh=_>jzw_S5(^|VY zj?uO);y4BX9FNB!`+-xWAwz0u+ZLD0C0s4i1>&4@bzM8>oHNFB`|)e{1q|tD4b>8) zK|)BEh6GA8f`o@|kpVuwb@|}^#tEs(cLKb(#_~J|09b30BnfuA9RMK9vTiK2EXx1@ zQ4}H1bKGt>BuRqn_3C{t?+K9g9`vW?X|vhkIz?sb@iW) WQ}6blVxmw00000zNcJ5pyJ$dQL?XUkXD72dzcmB&+_6B#;FU@QX zp`R~$W%d}R$+#P*uaDL|oAq$>pVW1tljMKj$=Q8}Un+8zf;dx<*PSo2k+XJu-TI~3 zO^@Z#kJWGdG~aYFF&Ov;2kZ-H-ehucoyG+2M(<))2B6C0pB{8YMK2dAQoNw~H10-R zJI6gnh7TL>yNBML;az+;gFVdQ I&MBb@07yf&$p8QV literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Mobs/Customization/underwear.rsi/briefs.png b/Resources/Textures/_Impstation/Mobs/Customization/underwear.rsi/briefs.png new file mode 100644 index 0000000000000000000000000000000000000000..256345ff7d13929875d6c055ec8142c6a10b1339 GIT binary patch literal 288 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}z=H}+kpFjWk^XLEn{|Ab(DdpS*QmiFGe!)PI{|vvk@dX0~I14-? ziy0XBj({-ZRBb+KpkSw`i(^QH``c*;xf%?3oNwR!|37VZ)yBEn%=}F%N)nUo%3mLe z>tbM1VB%=tIKgnS@W*2970*}wTV^9IFzxfi{#oMTKV2WGYgBH%bk_c9ZM`##0E3_d zg9`)Wh4TzQ#NrQlYi!bpHJftk#=Xm|57h4PziK+48ko%|P`_c)`E@hvwYGef75rd( b;0?>$?RJm;R{wenbQFW9tDnm{r-UW|EeLEF literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Mobs/Customization/underwear.rsi/lowriders.png b/Resources/Textures/_Impstation/Mobs/Customization/underwear.rsi/lowriders.png new file mode 100644 index 0000000000000000000000000000000000000000..986aa6a0f0f62e97e596db1bed7980babc30ca2a GIT binary patch literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}z&YwU3`Sa)h|Nqa;%>{~0U+_T$NU@d#`2_<7|1b|fr1k}T^vIq+}}Fm*6$K#=2bCGD8_vzW@|?l@i+XbM(&UTjHF*i0|5S1dY7-w6HgjExyQcHJeEnWG zCe98PApxMKdbNa%yhArTU(Q%}`E8c!@&7!_kD9&Y`R`zpJKG+x3?~GHXDerUMNvDFJf3;$Y5T? zdwj#bNe&t>-CH$ISPD3KeAxHmxiKS93&V%Qn{=vsa&Lc&T5~$i?$%Kg-}!68>UwUR zcmJ)`I_1OZCjO_)SAH6v+xI7Y-hZ*_a&3xhU(b40Y4>-Iany9#;~y_cflL8{d9Qc# z#zkFS_GgE=b6Mw<&;$T+Gi>w# literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Mobs/Customization/underwear.rsi/tanga.png b/Resources/Textures/_Impstation/Mobs/Customization/underwear.rsi/tanga.png new file mode 100644 index 0000000000000000000000000000000000000000..5edf178a8d56bacedb73e635af7e13b3e784ab45 GIT binary patch literal 298 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`211o(uw?%K7hv9a<0|NlUN{ks=NgVdD-`2~YS9JE$`0rEKuJR*x382FBW zFymBhK53xfbWaz@kO=p;(@yg>8}P8?KL7uJ=kAuUN+}gR(OZ@-8~4m?nY{6n0H=zA zkcUH@+K+eTLB?gTek~SW!=x)0rt@cwR_+bu0;@I`Zl2`ryU#A=f{zT{mg0SUM2XYGuK`8mak#w ej8o8f${eytKVAO#%5^{|GI+ZBxvX Date: Tue, 14 Jan 2025 06:56:43 +0100 Subject: [PATCH 105/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 93edd908e8ec..bedb8809c707 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,12 +1,4 @@ Entries: -- author: Velcroboy - changes: - - message: Added the NTES-Fishbowl, a stylish new ride to Centcomm from The Hive - Station - type: Add - id: 409 - time: '2024-06-20T17:32:27.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1417 - author: Lyndomen changes: - message: Sleeper Agents are waking up! @@ -3854,3 +3846,12 @@ id: 908 time: '2025-01-14T05:31:53.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2724 +- author: alterae + changes: + - message: Ported undergarments from Impstation + type: Add + - message: Slimefolk can now wear chest tattoos + type: Tweak + id: 909 + time: '2025-01-14T05:56:24.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2719 From 88d43a428a7d193a164605ec8bc68d7231c3d8e5 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Tue, 14 Jan 2025 06:19:20 +0000 Subject: [PATCH 106/205] glacier update (#2706) * glacier update * power sec apc --------- Co-authored-by: deltanedas <@deltanedas:kde.org> --- Resources/Maps/glacier.yml | 356 ++++++++++++++++++++----------------- 1 file changed, 191 insertions(+), 165 deletions(-) diff --git a/Resources/Maps/glacier.yml b/Resources/Maps/glacier.yml index 1a32685837f0..50afc8ade06e 100644 --- a/Resources/Maps/glacier.yml +++ b/Resources/Maps/glacier.yml @@ -273,7 +273,7 @@ entities: version: 6 2,-2: ind: 2,-2 - tiles: UQAAAAAAGAAAAAAAGAAAAAACGAAAAAADGAAAAAAAGAAAAAAAYQAAAAAAGAAAAAAAGAAAAAABGAAAAAACGAAAAAAAYQAAAAAACQAAAAAACQAAAAAACQAAAAAAAAAAAAAAPQAAAAAAGAAAAAABGAAAAAAAGAAAAAACGAAAAAABGAAAAAAANwAAAAAAGAAAAAAAGAAAAAABYQAAAAAAYQAAAAAAYQAAAAAACQAAAAAACQAAAAAICQAAAAAECQAAAAAAYQAAAAAAYQAAAAAAGAAAAAADGAAAAAADGAAAAAADYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAACQAAAAAACQAAAAAACQAAAAADCQAAAAAACQAAAAAACQAAAAAAUQAAAAAAPQAAAAAAYQAAAAAAYQAAAAAAGAAAAAABYQAAAAAAOwAAAAADOwAAAAABOwAAAAABYQAAAAAACQAAAAAACQAAAAAACQAAAAAFCQAAAAAACQAAAAAACQAAAAAAUQAAAAAAPQAAAAAAGAAAAAADGAAAAAAAGAAAAAACYQAAAAAAOwAAAAACOwAAAAAAOwAAAAABYQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAYQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAYQAAAAAAGAAAAAACGAAAAAAAGAAAAAAANwAAAAAAOwAAAAABOwAAAAADOwAAAAAAYQAAAAAAXgAAAAABXgAAAAADXgAAAAADXgAAAAABIQAAAAABIQAAAAADGAAAAAADGAAAAAACGAAAAAACGAAAAAAAGAAAAAAAPQAAAAAAOwAAAAAAOwAAAAAAOwAAAAACYQAAAAAAXgAAAAAAXgAAAAAAXgAAAAABXgAAAAAAIQAAAAAAIQAAAAABGAAAAAADGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAACPQAAAAAAOwAAAAACOwAAAAADOwAAAAACYQAAAAAAIQAAAAADIQAAAAABIQAAAAACIQAAAAAAIQAAAAADIQAAAAABGAAAAAADGAAAAAACGAAAAAACGAAAAAADGAAAAAADYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAIQAAAAADIQAAAAACIQAAAAACIQAAAAADIQAAAAACIQAAAAAAGAAAAAACGAAAAAAAGAAAAAACGAAAAAADGAAAAAADGAAAAAADGAAAAAACGAAAAAACNwAAAAAAIQAAAAADIQAAAAAAAQAAAAADAQAAAAADAQAAAAACAQAAAAAAAQAAAAADGAAAAAACGAAAAAABGAAAAAADGAAAAAAAGAAAAAACGAAAAAACGAAAAAAAGAAAAAACYQAAAAAAIQAAAAADIQAAAAABAQAAAAAAAQAAAAAAAQAAAAABAQAAAAADAQAAAAADGAAAAAABPQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAIQAAAAADIQAAAAABAQAAAAACAQAAAAABAQAAAAAAAQAAAAADAQAAAAADHwAAAAACHwAAAAACYQAAAAAAGAAAAAADGAAAAAADGAAAAAADYQAAAAAAFgAAAAADYQAAAAAAYQAAAAAAPQAAAAAANwAAAAAANwAAAAAAPQAAAAAAPQAAAAAAYQAAAAAAHwAAAAACHwAAAAABNwAAAAAAGAAAAAACGAAAAAAAGAAAAAABYQAAAAAACQAAAAAACQAAAAABCQAAAAAACQAAAAAASwAAAAABSwAAAAADCQAAAAAACQAAAAAACQAAAAAAGAAAAAACGAAAAAABNwAAAAAAGAAAAAAAGAAAAAACGAAAAAAAYQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAISwAAAAADSwAAAAADCQAAAAAACQAAAAAACQAAAAALHwAAAAAAHwAAAAADPQAAAAAAGAAAAAADGAAAAAACGAAAAAAAYQAAAAAACQAAAAAACQAAAAAAFQAAAAACCQAAAAAASwAAAAAASwAAAAAACQAAAAAACQAAAAAACQAAAAAA + tiles: UQAAAAAAGAAAAAAAGAAAAAACGAAAAAADGAAAAAAAGAAAAAAAYQAAAAAAGAAAAAAAGAAAAAABGAAAAAACGAAAAAAAYQAAAAAACQAAAAAACQAAAAAACQAAAAAAAAAAAAAAPQAAAAAAGAAAAAABGAAAAAAAGAAAAAACGAAAAAABGAAAAAAANwAAAAAAGAAAAAAAGAAAAAABYQAAAAAAYQAAAAAAYQAAAAAACQAAAAAACQAAAAAICQAAAAAECQAAAAAAYQAAAAAAYQAAAAAAGAAAAAADGAAAAAADGAAAAAADYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAACQAAAAAACQAAAAAACQAAAAADCQAAAAAACQAAAAAACQAAAAAAUQAAAAAAPQAAAAAAYQAAAAAAYQAAAAAAGAAAAAABYQAAAAAAOwAAAAADOwAAAAABOwAAAAABYQAAAAAACQAAAAAACQAAAAAACQAAAAAFCQAAAAAACQAAAAAACQAAAAAAUQAAAAAAPQAAAAAAGAAAAAADGAAAAAAAGAAAAAACYQAAAAAAOwAAAAACOwAAAAAAOwAAAAABYQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAYQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAYQAAAAAAGAAAAAACGAAAAAAAGAAAAAAANwAAAAAAOwAAAAABOwAAAAADOwAAAAAAYQAAAAAAXgAAAAABXgAAAAADXgAAAAADXgAAAAABIQAAAAABIQAAAAADGAAAAAADGAAAAAACGAAAAAACGAAAAAAAGAAAAAAAPQAAAAAAOwAAAAAAOwAAAAAAOwAAAAACYQAAAAAAXgAAAAAAXgAAAAAAXgAAAAABXgAAAAAAIQAAAAAAIQAAAAABGAAAAAADGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAACPQAAAAAAOwAAAAACOwAAAAADOwAAAAACYQAAAAAAIQAAAAADIQAAAAABIQAAAAACIQAAAAAAIQAAAAADIQAAAAABGAAAAAADGAAAAAACGAAAAAAAGAAAAAADGAAAAAADYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAIQAAAAADIQAAAAACIQAAAAACIQAAAAADIQAAAAACIQAAAAAAGAAAAAACGAAAAAAAGAAAAAAAGAAAAAADGAAAAAADGAAAAAADGAAAAAACGAAAAAACNwAAAAAAIQAAAAADIQAAAAAAAQAAAAADAQAAAAADAQAAAAACAQAAAAAAAQAAAAADGAAAAAACGAAAAAABGAAAAAADGAAAAAAAGAAAAAACGAAAAAACGAAAAAAAGAAAAAACYQAAAAAAIQAAAAADIQAAAAABAQAAAAAAAQAAAAAAAQAAAAABAQAAAAADAQAAAAADGAAAAAABPQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAIQAAAAADIQAAAAABAQAAAAACAQAAAAABAQAAAAAAAQAAAAADAQAAAAADHwAAAAACHwAAAAACYQAAAAAAGAAAAAADGAAAAAADGAAAAAADYQAAAAAAFgAAAAADYQAAAAAAYQAAAAAAPQAAAAAANwAAAAAANwAAAAAAPQAAAAAAPQAAAAAAYQAAAAAAHwAAAAACHwAAAAABNwAAAAAAGAAAAAACGAAAAAAAGAAAAAABYQAAAAAACQAAAAAACQAAAAABCQAAAAAACQAAAAAASwAAAAABSwAAAAADCQAAAAAACQAAAAAACQAAAAAAGAAAAAACGAAAAAABNwAAAAAAGAAAAAAAGAAAAAACGAAAAAAAYQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAISwAAAAADSwAAAAADCQAAAAAACQAAAAAACQAAAAALHwAAAAAAHwAAAAADPQAAAAAAGAAAAAADGAAAAAACGAAAAAAAYQAAAAAACQAAAAAACQAAAAAAFQAAAAACCQAAAAAASwAAAAAASwAAAAAACQAAAAAACQAAAAAACQAAAAAA version: 6 3,-2: ind: 3,-2 @@ -281,7 +281,7 @@ entities: version: 6 1,-2: ind: 1,-2 - tiles: FQAAAAAAFQAAAAAEFQAAAAABFQAAAAAECQAAAAAACQAAAAAAPQAAAAAAXgAAAAABXgAAAAAAXgAAAAAAYQAAAAAAHAAAAAAAHAAAAAACYQAAAAAAPQAAAAAAYQAAAAAAFQAAAAAGFQAAAAAAFQAAAAAEFQAAAAABFQAAAAAGFQAAAAAFYQAAAAAAXgAAAAABXgAAAAACXgAAAAACNwAAAAAAHAAAAAACHAAAAAABYQAAAAAAPQAAAAAAYQAAAAAAFQAAAAAEFQAAAAACFQAAAAABUgAAAAAAFQAAAAADUgAAAAAAYQAAAAAAPQAAAAAAPQAAAAAAYQAAAAAAYQAAAAAAHAAAAAADHAAAAAABYQAAAAAAYQAAAAAAUQAAAAAAFQAAAAACFQAAAAACFQAAAAADUgAAAAAAFQAAAAABFQAAAAACYQAAAAAAOwAAAAAAOwAAAAAAOwAAAAABPQAAAAAAHAAAAAABHAAAAAADYQAAAAAAPQAAAAAAYQAAAAAAFQAAAAAGFQAAAAAGYQAAAAAAYQAAAAAAYQAAAAAAUQAAAAAAYQAAAAAAOwAAAAACOwAAAAACOwAAAAAANwAAAAAAHAAAAAAAHAAAAAAAYQAAAAAAPQAAAAAAYQAAAAAAFQAAAAADFQAAAAAAFQAAAAACFQAAAAABFQAAAAAFFQAAAAABYQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAYQAAAAAAHAAAAAABHAAAAAABYQAAAAAAPQAAAAAAPQAAAAAAFQAAAAAAFQAAAAADFQAAAAADFQAAAAAEFQAAAAAAFQAAAAAGYQAAAAAAGAAAAAADGAAAAAADGAAAAAABGAAAAAABHAAAAAAAHAAAAAACHAAAAAAAGAAAAAABGAAAAAADFQAAAAAAFQAAAAACFQAAAAACFQAAAAAFFQAAAAAFFQAAAAAAUQAAAAAAGAAAAAACGAAAAAAAGAAAAAADGAAAAAABHAAAAAACHAAAAAACHAAAAAAAGAAAAAADGAAAAAAACQAAAAAKCQAAAAADFQAAAAAGFQAAAAAFFQAAAAACFQAAAAAEYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAHAAAAAAAHAAAAAACHAAAAAADGAAAAAAAGAAAAAABCQAAAAACCQAAAAAAFQAAAAAEFQAAAAAEFQAAAAAAFQAAAAAGYQAAAAAAGAAAAAABGAAAAAACGAAAAAABYQAAAAAAHAAAAAADHAAAAAADHAAAAAAAYQAAAAAAGAAAAAABCQAAAAAAFQAAAAAAFQAAAAAGFQAAAAADFQAAAAADFQAAAAAFYQAAAAAAGAAAAAAAGAAAAAAAGAAAAAACYQAAAAAAHAAAAAACHAAAAAADHAAAAAADYQAAAAAAGAAAAAABFQAAAAADFQAAAAACFQAAAAADFQAAAAADFQAAAAAAFQAAAAAAYQAAAAAAYQAAAAAANwAAAAAAYQAAAAAAYQAAAAAAYQAAAAAANwAAAAAAYQAAAAAAYQAAAAAAPQAAAAAAFQAAAAAFFQAAAAABFQAAAAABFQAAAAAFFQAAAAAAFQAAAAABUQAAAAAAGAAAAAACGAAAAAADGAAAAAACNwAAAAAAHwAAAAADHwAAAAABHwAAAAADHwAAAAABHwAAAAACFQAAAAAGFQAAAAAGFQAAAAAFFQAAAAAAFQAAAAABFQAAAAAAFQAAAAACGAAAAAACGAAAAAACGAAAAAADPQAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAHwAAAAAAFQAAAAAEFQAAAAABFQAAAAABFQAAAAACFQAAAAADFQAAAAACFQAAAAADGAAAAAAAGAAAAAABGAAAAAACFQAAAAABHwAAAAACHwAAAAAAGAAAAAACGAAAAAACGAAAAAADFQAAAAAFFQAAAAACFQAAAAAAFQAAAAACFQAAAAAAFQAAAAACFQAAAAACFQAAAAAAFQAAAAADFQAAAAACFQAAAAAFHwAAAAADHwAAAAAAHwAAAAABHwAAAAACHwAAAAAB + tiles: FQAAAAAAFQAAAAAEFQAAAAABFQAAAAAECQAAAAAACQAAAAAAPQAAAAAAXgAAAAABXgAAAAAAXgAAAAAAYQAAAAAAHAAAAAAAHAAAAAACYQAAAAAAPQAAAAAAYQAAAAAAFQAAAAAGFQAAAAAAFQAAAAAEFQAAAAABFQAAAAAGFQAAAAAFYQAAAAAAXgAAAAABXgAAAAACXgAAAAACNwAAAAAAHAAAAAACHAAAAAABYQAAAAAAPQAAAAAAYQAAAAAAFQAAAAAEFQAAAAACFQAAAAABUgAAAAAAFQAAAAADUgAAAAAAYQAAAAAAPQAAAAAAPQAAAAAAYQAAAAAAYQAAAAAAHAAAAAADHAAAAAABYQAAAAAAYQAAAAAAUQAAAAAAFQAAAAACFQAAAAACFQAAAAADUgAAAAAAFQAAAAABFQAAAAACYQAAAAAAOwAAAAAAOwAAAAAAOwAAAAABPQAAAAAAHAAAAAABHAAAAAADYQAAAAAAPQAAAAAAYQAAAAAAFQAAAAAGFQAAAAAGYQAAAAAAYQAAAAAAYQAAAAAAUQAAAAAAYQAAAAAAOwAAAAACOwAAAAACOwAAAAAANwAAAAAAHAAAAAAAHAAAAAAAYQAAAAAAPQAAAAAAYQAAAAAAFQAAAAADFQAAAAAAFQAAAAACFQAAAAABFQAAAAAFFQAAAAABYQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAYQAAAAAAHAAAAAABHAAAAAABYQAAAAAAPQAAAAAAPQAAAAAAFQAAAAAAFQAAAAADFQAAAAADFQAAAAAEFQAAAAAAFQAAAAAGYQAAAAAAGAAAAAADGAAAAAADGAAAAAABGAAAAAABHAAAAAAAHAAAAAACHAAAAAAAGAAAAAABGAAAAAADFQAAAAAAFQAAAAACFQAAAAACFQAAAAAFFQAAAAAFFQAAAAAAUQAAAAAAGAAAAAACGAAAAAAAGAAAAAADGAAAAAABHAAAAAACHAAAAAACHAAAAAAAGAAAAAADGAAAAAAACQAAAAAKCQAAAAADFQAAAAAGFQAAAAAFFQAAAAACFQAAAAAEYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAHAAAAAAAHAAAAAACHAAAAAADGAAAAAAAGAAAAAABCQAAAAACCQAAAAAAFQAAAAAEFQAAAAAEFQAAAAAAFQAAAAAGYQAAAAAAGAAAAAABGAAAAAACGAAAAAABYQAAAAAAHAAAAAADHAAAAAADHAAAAAAAYQAAAAAAGAAAAAABCQAAAAAAFQAAAAAAFQAAAAAGFQAAAAADFQAAAAADFQAAAAAFYQAAAAAAGAAAAAAAGAAAAAAAGAAAAAACYQAAAAAAHAAAAAACHAAAAAAAHAAAAAACYQAAAAAAGAAAAAABFQAAAAADFQAAAAACFQAAAAADFQAAAAADFQAAAAAAFQAAAAAAYQAAAAAAYQAAAAAANwAAAAAAYQAAAAAAYQAAAAAAYQAAAAAANwAAAAAAYQAAAAAAYQAAAAAAPQAAAAAAFQAAAAAFFQAAAAABFQAAAAABFQAAAAAFFQAAAAAAFQAAAAABUQAAAAAAGAAAAAACGAAAAAADGAAAAAACNwAAAAAAHwAAAAADHwAAAAABHwAAAAADHwAAAAABHwAAAAACFQAAAAAGFQAAAAAGFQAAAAAFFQAAAAAAFQAAAAABFQAAAAAAFQAAAAACGAAAAAACGAAAAAACGAAAAAADPQAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAHwAAAAAAFQAAAAAEFQAAAAABFQAAAAABFQAAAAACFQAAAAADFQAAAAACFQAAAAADGAAAAAAAGAAAAAABGAAAAAACFQAAAAABHwAAAAACHwAAAAAAGAAAAAACGAAAAAACGAAAAAADFQAAAAAFFQAAAAACFQAAAAAAFQAAAAACFQAAAAAAFQAAAAACFQAAAAACFQAAAAAAFQAAAAADFQAAAAACFQAAAAAFHwAAAAADHwAAAAAAHwAAAAABHwAAAAACHwAAAAAB version: 6 4,-2: ind: 4,-2 @@ -2702,7 +2702,6 @@ entities: 3535: 13,16 3541: 6,-8 3583: 49,6 - 3587: 28,-22 3591: 52,-23 3647: 39,-23 3732: 11,-4 @@ -14214,8 +14213,6 @@ entities: - type: Transform pos: -33.5,33.5 parent: 2 - - type: PowerNetworkBattery - canDischarge: False - uid: 254 components: - type: MetaData @@ -17141,6 +17138,11 @@ entities: - type: Transform pos: 24.449337,-17.398048 parent: 2 + - uid: 9184 + components: + - type: Transform + pos: -0.4814006,1.10948 + parent: 2 - proto: BoxCardboard entities: - uid: 768 @@ -46283,10 +46285,10 @@ entities: parent: 2 - proto: ClosetChefFilled entities: - - uid: 6018 + - uid: 9183 components: - type: Transform - pos: 16.5,15.5 + pos: 7.5,17.5 parent: 2 - proto: ClosetEmergencyFilledRandom entities: @@ -46361,6 +46363,11 @@ entities: parent: 2 - proto: ClosetMaintenanceFilledRandom entities: + - uid: 3278 + components: + - type: Transform + pos: 16.5,15.5 + parent: 2 - uid: 6028 components: - type: Transform @@ -49420,16 +49427,22 @@ entities: - type: Transform pos: -62.5,-9.5 parent: 2 + - type: NavMapBeacon + text: Tyrant - uid: 11132 components: - type: Transform pos: -52.5,-11.5 parent: 2 + - type: NavMapBeacon + text: Tyrant Dock - uid: 13645 components: - type: Transform pos: 63.5,-25.5 parent: 2 + - type: NavMapBeacon + text: Sauna - uid: 16454 components: - type: Transform @@ -55476,16 +55489,6 @@ entities: - type: Transform pos: 43.5,12.5 parent: 2 - - uid: 7261 - components: - - type: Transform - pos: 32.5,-25.5 - parent: 2 - - uid: 7262 - components: - - type: Transform - pos: 31.5,-25.5 - parent: 2 - uid: 17925 components: - type: Transform @@ -58204,6 +58207,12 @@ entities: - type: Transform pos: -15.5,57.5 parent: 2 + - uid: 8626 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 64.5,-25.5 + parent: 2 - uid: 8922 components: - type: Transform @@ -58375,6 +58384,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#03FCD3FF' + - uid: 7262 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 37.5,-18.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - uid: 7600 components: - type: Transform @@ -58389,6 +58406,13 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' + - uid: 7610 + components: + - type: Transform + pos: 35.5,-23.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - uid: 7615 components: - type: Transform @@ -58832,14 +58856,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 7713 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 37.5,-22.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - uid: 7715 components: - type: Transform @@ -59117,6 +59133,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 8625 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 28.5,-18.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - uid: 9821 components: - type: Transform @@ -59828,6 +59852,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#03FCD3FF' + - uid: 7717 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 36.5,-18.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - uid: 7718 components: - type: Transform @@ -65712,7 +65744,8 @@ entities: - uid: 8608 components: - type: Transform - pos: 37.5,-18.5 + rot: -1.5707963267948966 rad + pos: 34.5,-18.5 parent: 2 - type: AtmosPipeColor color: '#990000FF' @@ -65761,14 +65794,15 @@ entities: - uid: 8617 components: - type: Transform - pos: 37.5,-20.5 + rot: -1.5707963267948966 rad + pos: 35.5,-18.5 parent: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 8618 components: - type: Transform - pos: 37.5,-21.5 + pos: 28.5,-22.5 parent: 2 - type: AtmosPipeColor color: '#990000FF' @@ -65776,7 +65810,7 @@ entities: components: - type: Transform rot: 1.5707963267948966 rad - pos: 36.5,-19.5 + pos: 33.5,-23.5 parent: 2 - type: AtmosPipeColor color: '#990000FF' @@ -65784,23 +65818,15 @@ entities: components: - type: Transform rot: 1.5707963267948966 rad - pos: 35.5,-19.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 8621 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 34.5,-19.5 + pos: 32.5,-23.5 parent: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 8622 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 36.5,-22.5 + rot: 1.5707963267948966 rad + pos: 31.5,-23.5 parent: 2 - type: AtmosPipeColor color: '#990000FF' @@ -65808,7 +65834,7 @@ entities: components: - type: Transform rot: 1.5707963267948966 rad - pos: 34.5,-22.5 + pos: 29.5,-23.5 parent: 2 - type: AtmosPipeColor color: '#990000FF' @@ -65816,46 +65842,7 @@ entities: components: - type: Transform rot: 1.5707963267948966 rad - pos: 33.5,-22.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 8625 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 32.5,-22.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 8626 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 31.5,-22.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 8627 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 30.5,-22.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 8628 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 29.5,-22.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 8629 - components: - - type: Transform - pos: 28.5,-23.5 + pos: 30.5,-23.5 parent: 2 - type: AtmosPipeColor color: '#990000FF' @@ -69334,6 +69321,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' + - uid: 9286 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 33.5,-18.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - uid: 9297 components: - type: Transform @@ -69389,6 +69384,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#DD2222FF' + - uid: 10406 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 32.5,-18.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - uid: 10918 components: - type: Transform @@ -69741,6 +69744,22 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' + - uid: 18027 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 31.5,-18.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 18028 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 30.5,-18.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - uid: 18033 components: - type: Transform @@ -70888,6 +70907,28 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 18318 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 29.5,-18.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 18319 + components: + - type: Transform + pos: 28.5,-19.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 18320 + components: + - type: Transform + pos: 28.5,-20.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - proto: GasPipeTJunction entities: - uid: 506 @@ -71083,14 +71124,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 7610 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 35.5,-23.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - uid: 7619 components: - type: Transform @@ -71105,21 +71138,21 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 7716 + - uid: 7713 components: - type: Transform - pos: 28.5,-25.5 + rot: 1.5707963267948966 rad + pos: 28.5,-23.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 7717 + color: '#990000FF' + - uid: 7716 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 28.5,-22.5 + pos: 28.5,-25.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#0055CCFF' - uid: 7724 components: - type: Transform @@ -71201,6 +71234,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' + - uid: 8621 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 34.5,-23.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - uid: 8937 components: - type: Transform @@ -71869,21 +71910,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 9183 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 37.5,-19.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 9184 - components: - - type: Transform - pos: 35.5,-22.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - uid: 9185 components: - type: Transform @@ -72499,6 +72525,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 18321 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 28.5,-21.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - proto: GasPort entities: - uid: 544 @@ -72577,12 +72611,6 @@ entities: rot: -1.5707963267948966 rad pos: 37.5,-32.5 parent: 2 - - uid: 9254 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 63.5,-25.5 - parent: 2 - uid: 9268 components: - type: Transform @@ -72878,12 +72906,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 9286 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 64.5,-25.5 - parent: 2 - proto: GasVentPump entities: - uid: 4959 @@ -74271,8 +74293,7 @@ entities: - uid: 9420 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 34.5,-23.5 + pos: 34.5,-22.5 parent: 2 - type: DeviceNetwork deviceLists: @@ -74664,7 +74685,8 @@ entities: - uid: 17602 components: - type: Transform - pos: 28.5,-21.5 + rot: -1.5707963267948966 rad + pos: 29.5,-21.5 parent: 2 - type: DeviceNetwork deviceLists: @@ -80864,6 +80886,13 @@ entities: - type: Transform pos: -2.5,21.5 parent: 2 +- proto: MedicalBiofabricator + entities: + - uid: 8628 + components: + - type: Transform + pos: 13.5,-6.5 + parent: 2 - proto: MedicalScannerMachineCircuitboard entities: - uid: 10350 @@ -81183,12 +81212,6 @@ entities: rot: 3.141592653589793 rad pos: 10.5,-8.5 parent: 2 - - uid: 10406 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 13.5,-6.5 - parent: 2 - uid: 16519 components: - type: Transform @@ -89203,12 +89226,12 @@ entities: - uid: 12104 components: - type: Transform - pos: 7.6254354,17.978848 + pos: 7.99691,17.851439 parent: 2 - uid: 12105 components: - type: Transform - pos: 7.2112093,17.989098 + pos: 8.137535,18.429564 parent: 2 - proto: OperatingTable entities: @@ -99267,10 +99290,10 @@ entities: parent: 2 - proto: ReverseEngineeringMachine entities: - - uid: 3278 + - uid: 8629 components: - type: Transform - pos: 34.5,-21.5 + pos: 32.5,-25.5 parent: 2 - proto: RevolverCapGun entities: @@ -99459,6 +99482,13 @@ entities: - type: Transform pos: 8.5,40.5 parent: 2 +- proto: SecureCabinetEpistemics + entities: + - uid: 6018 + components: + - type: Transform + pos: 31.5,-25.5 + parent: 2 - proto: SecureCabinetHoP entities: - uid: 7133 @@ -101661,6 +101691,13 @@ entities: - type: Transform pos: 41.5,-5.5 parent: 2 +- proto: SpawnMobSmile + entities: + - uid: 8627 + components: + - type: Transform + pos: 29.5,-25.5 + parent: 2 - proto: SpawnMobWalter entities: - uid: 5879 @@ -104523,27 +104560,6 @@ entities: - SurveillanceCameraService nameSet: True id: Reporter's Office - - uid: 18027 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -25.5,-3.5 - parent: 2 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraService - nameSet: True - id: Mime - - uid: 18028 - components: - - type: Transform - pos: -23.5,-11.5 - parent: 2 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraService - nameSet: True - id: Clown - uid: 18029 components: - type: Transform @@ -105458,6 +105474,11 @@ entities: - type: Transform pos: -3.5,12.5 parent: 2 + - uid: 9254 + components: + - type: Transform + pos: 29.5,-25.5 + parent: 2 - uid: 12109 components: - type: Transform @@ -107067,6 +107088,11 @@ entities: - Middle: Toggle - proto: UnfinishedMachineFrame entities: + - uid: 7261 + components: + - type: Transform + pos: 34.5,-21.5 + parent: 2 - uid: 14596 components: - type: Transform @@ -116486,15 +116512,15 @@ entities: - type: Transform pos: 36.5,70.5 parent: 2 - - uid: 17689 + - uid: 15209 components: - type: Transform - pos: 40.5,70.5 + pos: 38.5,63.5 parent: 2 - - uid: 15209 + - uid: 17689 components: - type: Transform - pos: 38.5,63.5 + pos: 40.5,70.5 parent: 2 - proto: WelderIndustrial entities: @@ -116972,7 +116998,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -10354.103 + secondsUntilStateChange: -10872.24 state: Opening - type: Airlock autoClose: False @@ -116988,7 +117014,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -10353.536 + secondsUntilStateChange: -10871.674 state: Opening - type: Airlock autoClose: False @@ -117010,7 +117036,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -10353.069 + secondsUntilStateChange: -10871.207 state: Opening - type: Airlock autoClose: False @@ -117026,7 +117052,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -10354.603 + secondsUntilStateChange: -10872.74 state: Opening - type: Airlock autoClose: False From 45ea7451ca383ac5b6adfedf00ad4024fc29e610 Mon Sep 17 00:00:00 2001 From: beck-thompson <107373427+beck-thompson@users.noreply.github.com> Date: Tue, 14 Jan 2025 06:14:01 -0800 Subject: [PATCH 107/205] Fixed various issues with kill objectives (#2723) The fix is in doc! --- .../Objectives/Systems/KillPersonConditionSystem.cs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Content.Server/Objectives/Systems/KillPersonConditionSystem.cs b/Content.Server/Objectives/Systems/KillPersonConditionSystem.cs index bd062e745604..9d9c6aa7f31a 100644 --- a/Content.Server/Objectives/Systems/KillPersonConditionSystem.cs +++ b/Content.Server/Objectives/Systems/KillPersonConditionSystem.cs @@ -41,18 +41,18 @@ private void OnGetProgress(EntityUid uid, KillPersonConditionComponent comp, ref private void OnPersonAssigned(Entity ent, ref ObjectiveAssignedEvent args) { - AssignRandomTarget(ent, args, _ => true); + AssignRandomTarget(ent, ref args, _ => true); } private void OnHeadAssigned(Entity ent, ref ObjectiveAssignedEvent args) { - AssignRandomTarget(ent, args, mindId => + AssignRandomTarget(ent, ref args, mindId => TryComp(mindId, out var mind) && mind.OwnedEntity is { } ownedEnt && HasComp(ownedEnt)); } - private void AssignRandomTarget(EntityUid uid, ObjectiveAssignedEvent args, Predicate filter, bool fallbackToAny = true) + private void AssignRandomTarget(EntityUid uid, ref ObjectiveAssignedEvent args, Predicate filter, bool fallbackToAny = true) { // invalid prototype if (!TryComp(uid, out var target)) @@ -97,6 +97,13 @@ private void AssignRandomTarget(EntityUid uid, ObjectiveAssignedEvent args, Pred // Pick between humans matching our filter or fall back to all humans alive var selectedHumans = filteredHumans.Count > 0 ? filteredHumans : allHumans; + // Still no valid targets even after the fallback + if (selectedHumans.Count == 0) + { + args.Cancelled = true; + return; + } + _target.SetTarget(uid, _random.Pick(selectedHumans), target); } From 32af76dd2b6898ca2d9e2eecde14dc1776a7380f Mon Sep 17 00:00:00 2001 From: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Date: Tue, 14 Jan 2025 08:17:01 -0600 Subject: [PATCH 108/205] Adds Smile the slime recipe (#2632) * Adds Smile the slime recipe * unindent * 4 space Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com> * switch to migration * It's the future, bro --------- Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: Velcroboy Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> --- .../en-US/_DV/reagents/meta/biological.ftl | 2 + Resources/Migrations/deltaMigrations.yml | 3 ++ .../Prototypes/Entities/Mobs/NPCs/pets.yml | 3 ++ .../_DV/Body/Organs/Animal/slimes.yml | 17 +++++++ .../_DV/Body/Prototypes/Animal/slimes.yml | 19 ++++++++ .../Prototypes/_DV/Reagents/biological.yml | 5 +++ .../Prototypes/_DV/Recipes/Reactions/fun.yml | 18 ++++++++ .../Smile/organs.rsi/brain-inhand-left.png | Bin 0 -> 428 bytes .../Smile/organs.rsi/brain-inhand-right.png | Bin 0 -> 414 bytes .../Pets/Smile/organs.rsi/brain-smile.png | Bin 0 -> 2177 bytes .../_DV/Mobs/Pets/Smile/organs.rsi/meta.json | 42 ++++++++++++++++++ 11 files changed, 109 insertions(+) create mode 100644 Resources/Locale/en-US/_DV/reagents/meta/biological.ftl create mode 100644 Resources/Prototypes/_DV/Body/Organs/Animal/slimes.yml create mode 100644 Resources/Prototypes/_DV/Body/Prototypes/Animal/slimes.yml create mode 100644 Resources/Prototypes/_DV/Reagents/biological.yml create mode 100644 Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/brain-inhand-left.png create mode 100644 Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/brain-inhand-right.png create mode 100644 Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/brain-smile.png create mode 100644 Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/meta.json diff --git a/Resources/Locale/en-US/_DV/reagents/meta/biological.ftl b/Resources/Locale/en-US/_DV/reagents/meta/biological.ftl new file mode 100644 index 000000000000..d3fcceb245ff --- /dev/null +++ b/Resources/Locale/en-US/_DV/reagents/meta/biological.ftl @@ -0,0 +1,2 @@ +reagent-name-sentient-grey-matter = sentient grey matter +reagent-desc-sentient-grey-matter = Thought juice, the stuff that leaks out of your ears. It seems to be sparkling when you look at it in the right light. That's odd... diff --git a/Resources/Migrations/deltaMigrations.yml b/Resources/Migrations/deltaMigrations.yml index d0c682215f9f..8113abba1784 100644 --- a/Resources/Migrations/deltaMigrations.yml +++ b/Resources/Migrations/deltaMigrations.yml @@ -131,3 +131,6 @@ AlwaysPoweredSmallLightMaintenanceRed: PoweredDimSmallLight # 2024-12-22 VendingMachineRestockSalvageEquipment: null + +# 2025-01-11 +SpawnMobSmile: SentientSmileCore diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index 3570e8fd5e24..41b1aca0ed5a 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -776,6 +776,9 @@ BaseUnshaded: aslime-_3 Dead: Base: rainbow_baby_slime_dead + - type: Body # DeltaV - Changes to add brain + prototype: Smiles + requiredLegs: 1 - type: Butcherable spawned: - id: FoodMeatSlime diff --git a/Resources/Prototypes/_DV/Body/Organs/Animal/slimes.yml b/Resources/Prototypes/_DV/Body/Organs/Animal/slimes.yml new file mode 100644 index 000000000000..b16f5735475a --- /dev/null +++ b/Resources/Prototypes/_DV/Body/Organs/Animal/slimes.yml @@ -0,0 +1,17 @@ +- type: entity + id: SentientSmileCore + parent: SentientSlimesCore + name: sentient smile core + components: + - type: Sprite + sprite: _DV/Mobs/Pets/Smile/organs.rsi + state: brain-smile + - type: Extractable + grindableSolutionName: organ + - type: SolutionContainerManager + solutions: + organ: + maxVol: 5 + reagents: + - ReagentId: SentientGreyMatter + Quantity: 5 diff --git a/Resources/Prototypes/_DV/Body/Prototypes/Animal/slimes.yml b/Resources/Prototypes/_DV/Body/Prototypes/Animal/slimes.yml new file mode 100644 index 000000000000..80a27f8c3a9e --- /dev/null +++ b/Resources/Prototypes/_DV/Body/Prototypes/Animal/slimes.yml @@ -0,0 +1,19 @@ +- type: body + id: Smiles + name: "Smiles" + parent: Slimes + root: torso + slots: + torso: + part: TorsoSlime + connections: + - legs + organs: + core: SentientSmileCore + lungs: OrganSlimesLungs + legs: + part: LegsAnimal + connections: + - feet + feet: + part: FeetAnimal diff --git a/Resources/Prototypes/_DV/Reagents/biological.yml b/Resources/Prototypes/_DV/Reagents/biological.yml new file mode 100644 index 000000000000..b45bf8a43509 --- /dev/null +++ b/Resources/Prototypes/_DV/Reagents/biological.yml @@ -0,0 +1,5 @@ +- type: reagent + id: SentientGreyMatter + parent: GreyMatter + name: reagent-name-sentient-grey-matter + desc: reagent-desc-sentient-grey-matter diff --git a/Resources/Prototypes/_DV/Recipes/Reactions/fun.yml b/Resources/Prototypes/_DV/Recipes/Reactions/fun.yml index 2c026637ce74..722c6a2a4f96 100644 --- a/Resources/Prototypes/_DV/Recipes/Reactions/fun.yml +++ b/Resources/Prototypes/_DV/Recipes/Reactions/fun.yml @@ -9,3 +9,21 @@ effects: - !type:CreateEntityReactionEffect entity: SheetGlass1 + +- type: reaction + id: SmileTheSlime + impact: Low + quantized: true + conserveEnergy: false + reactants: + Happiness: + amount: 4 + SentientGreyMatter: + amount: 5 + JuiceThatMakesYouWeh: + amount: 10 + Slime: + amount: 20 + effects: + - !type:CreateEntityReactionEffect + entity: MobSlimesPet diff --git a/Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/brain-inhand-left.png b/Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/brain-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..c07475fc631713557358605a8f675eca390d6391 GIT binary patch literal 428 zcmV;d0aN~oP)vk%=f0T0^ruaF7#hqBa;HL0NMS7@)a361Bkq3CfytzyQtN zk*Ey@NKn?C0|sdBjzn!RK!UR7956t0cfQreacJ6D1MEGu?#SHT8Cc!&pO4KO3!uI@ zk(qta?U6wm6?@cZr*;a9eenX^jf{Lmbwyh{{E(2b9X!pJiDq+QRMCyy-gp4ch2?S zx?-8tg0StUer+lJw&iO&TZ_}e534I>*KS#`a^CSLA-o=?OS+X zPaUmoS^xkYFP!_yjR<`+r22;Mz=U@LfW&#Zy9SU#=S$Kf2d|rU(Rz4;JtJyyEo0(n z$LJHqnSBK7XTNx7{^EQqGD_>5N5)nhK0|rJRP334^X8USKT?$PiLqA(woJFNZXMtG zxr{fRoLBZq`ZS^CGRp}gIDG2!Oaki|hjmHv8GHN?c5x<|5yoNZd`YeWQ}@`qTc)l{ z296>@vTg=IgQ;dj@?`sG0C#zGB!6bUTj#%0W*kt(AzQs@9T&Yz{F>mcG)dd0YRVi} zyw7>Rz6_W`pVOgdbWzlfH+j8F+Y@vUd>cOB@k*{vWbJcu;wes)(N>M^-=b^p!PRkw~m z?8O1>tiSu2-wFu$DOt8Q6D-gu+?V;Oiz=VQ-ctpER%w6A`+p4>L?TbQ{YKa8&5rKy zK~V|9H&umJ{Y>Q~%b}#LHc9SV-QXbIgO?fQi^Vy#AcLCbLBluPLo3P!+R3oJyHeqC z0Xc7dtX^61c@p#>`>%V-QMP^7LC>Uk?QM-)?iPX(P4~|ha%3(C$P`k6LH0_ zVto>~cpqya@FPRG3nQ0=BbzPpUy?#+vr}Ff61m;Ha6x?SgYKd4F$-K}< zC3)T*K52)QmC<}uouEP>`!i{Hw?5_0v=LFz=Xzi0kNxh~bp?C)xMU%uoo6?>4BIXj zpXZ2u_ud0+yYh;n11}gKHI9=I;9)tYAL(8eixSi zK2Er7F5ivFWb(|7I{rQ3IijYJWrUTW;1X^k3O>Kpl$4 zOf-h{myh~A)`72{)^ z@Tr9yMm)Mb39}rhqSjMOqoSh9-{rF8$+%I|M7=vgm=q*qA*`!C?$@M7Z zO;y1Kh4JEl)S+4Ph zcxddJC6T1pes9c=ZNEgcC@Z*y%Y10hfqp zRb5C>W9=F6>i-K&5gQX96iLgtcqv^6iWNymd%Fbc_M Date: Tue, 14 Jan 2025 15:17:21 +0100 Subject: [PATCH 109/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index bedb8809c707..a9ae764283a2 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Lyndomen - changes: - - message: Sleeper Agents are waking up! - type: Add - id: 410 - time: '2024-06-20T20:36:51.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1389 - author: deltanedas changes: - message: Fugitives can now be wanted by GALPOL, they might even be hiding in your @@ -3855,3 +3848,11 @@ id: 909 time: '2025-01-14T05:56:24.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2719 +- author: Velcroboy + changes: + - message: Added science! Smile the Slime can be created in the science lab through + a mixture of reagents and a special brain. + type: Add + id: 910 + time: '2025-01-14T14:17:02.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2632 From 6dd01ee5ed1b82d405441bf7c267f371186f6f84 Mon Sep 17 00:00:00 2001 From: Radezolid Date: Tue, 14 Jan 2025 12:04:13 -0300 Subject: [PATCH 110/205] Replace the medical biofabricator board with a flatpack (#2722) * Added flatpack * Given to CMO's locker * webedit ops Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com> --------- Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> --- Resources/Prototypes/Catalog/Fills/Lockers/heads.yml | 2 +- Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml | 1 + .../_DV/Entities/Objects/Devices/Devices/flatpack.yml | 9 +++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 20dcc4e3cec3..888716246216 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -231,7 +231,7 @@ - id: RubberStampCMO - id: MedTekCartridge # Shitmed - - id: MedicalBiofabMachineBoard + #- id: MedicalBiofabMachineBoard #DeltaV - Replaced with a flatpack at Prototypes/_DV/Catalog/Fills/Lockers/heads.yml # Hardsuit table, used for suit storage as well - type: entityTable diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml index ce8ff57b1d15..40b7d5dd6ed2 100644 --- a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml @@ -67,6 +67,7 @@ - id: LunchboxCommandFilledRandom prob: 0.3 - id: ChemMasterFlatpack # So the chemist can make pills + - id: MedBioFabricatorFlatpack # Replaced the shitmed board - type: entityTable id: LockerFillResearchDirectorDeltaV diff --git a/Resources/Prototypes/_DV/Entities/Objects/Devices/Devices/flatpack.yml b/Resources/Prototypes/_DV/Entities/Objects/Devices/Devices/flatpack.yml index eedeb96a8712..d19d3307db02 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Devices/Devices/flatpack.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Devices/Devices/flatpack.yml @@ -6,3 +6,12 @@ components: - type: Flatpack entity: ChemMaster + +- type: entity + parent: BaseFlatpack + id: MedBioFabricatorFlatpack + name: medical biofabricator flatpack + description: A flatpack used for constructing a medical biofabricator. + components: + - type: Flatpack + entity: MedicalBiofabricator From 450c7785412c41265b584e5dc0351f0418d6738b Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Tue, 14 Jan 2025 16:04:33 +0100 Subject: [PATCH 111/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index a9ae764283a2..ed243a30ff8e 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,12 +1,4 @@ Entries: -- author: deltanedas - changes: - - message: Fugitives can now be wanted by GALPOL, they might even be hiding in your - very station! - type: Add - id: 411 - time: '2024-06-30T19:40:33.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1413 - author: Lyndomen changes: - message: Death Acidifiers are now in Syndicate Uplinks once more @@ -3856,3 +3848,11 @@ id: 910 time: '2025-01-14T14:17:02.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2632 +- author: Radezolid + changes: + - message: CMO's locker now starts with a medical biofabricator flatpack instead + of it's machine board. + type: Tweak + id: 911 + time: '2025-01-14T15:04:14.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2722 From eb17a8adf4ec65688ef2ace262d3b664e75f180c Mon Sep 17 00:00:00 2001 From: Lyndomen <49795619+Lyndomen@users.noreply.github.com> Date: Tue, 14 Jan 2025 15:06:29 -0500 Subject: [PATCH 112/205] add surgery access to borg (#2730) Update misc.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> --- Resources/Prototypes/_DV/Access/misc.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/_DV/Access/misc.yml b/Resources/Prototypes/_DV/Access/misc.yml index 364b1ab4c2d8..96bdb2e55aac 100644 --- a/Resources/Prototypes/_DV/Access/misc.yml +++ b/Resources/Prototypes/_DV/Access/misc.yml @@ -51,4 +51,5 @@ - Justice - Prosecutor - Clerk + - Surgery From b390468ecbf03d84145be0df593ca6044246734d Mon Sep 17 00:00:00 2001 From: "Tad \"Taddy\" Johnson" <120885811+TadJohnson00@users.noreply.github.com> Date: Wed, 15 Jan 2025 10:14:38 +1100 Subject: [PATCH 113/205] Add DeltaV OuterClothing loadout group to secoff roleLoadout Signed-off-by: Tad "Taddy" Johnson <120885811+TadJohnson00@users.noreply.github.com> --- Resources/Prototypes/Loadouts/role_loadouts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 428922831a2f..5ef7a79d8bb8 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -398,7 +398,7 @@ - SecurityNeck # DeltaV - SecurityJumpsuit - SecurityBackpack - - SecurityOuterClothing + - SecurityOuterClothingDeltaV # DeltaV - Switched to DeltaV version, was SecurityOuterClothing - SecurityShoes - SecurityPDA - SecurityBelt From 86ce039c8c3e44dcd37a070a64423f4f3882ff3a Mon Sep 17 00:00:00 2001 From: "Tad \"Taddy\" Johnson" <120885811+TadJohnson00@users.noreply.github.com> Date: Wed, 15 Jan 2025 19:08:15 +1100 Subject: [PATCH 114/205] Security resprite final cut (#2695) * turn security gey * correct erroneous find and replace * Update dressers.yml * resprite sec backpacks + holoprojector * adjust sec whistle sprite, resprite forensic gloves * resprite security jetpacks * give sec whistles a sprite * give sec whistles a sprite forreal * reparent mantis locker, fix sec directional signs * typo * tidy sec resprite --- .../Catalog/Fills/Lockers/dressers.yml | 2 +- .../Entities/Clothing/Back/backpacks.yml | 2 +- .../Entities/Clothing/Back/duffel.yml | 2 +- .../Entities/Clothing/Back/satchel.yml | 2 +- .../Entities/Clothing/Hands/gloves.yml | 4 +- .../Objects/Devices/holoprojectors.yml | 2 +- .../Entities/Objects/Devices/radio.yml | 4 +- .../Entities/Objects/Fun/whistles.yml | 4 +- .../Entities/Objects/Misc/bedsheets.yml | 10 +- .../Objects/Misc/identification_cards.yml | 7 + .../Structures/Decoration/banners.yml | 4 +- .../Entities/Structures/Machines/lathe.yml | 4 +- .../Structures/Machines/vending_machines.yml | 6 +- .../Storage/Closets/Lockers/lockers.yml | 23 +- .../Structures/Storage/Crates/crates.yml | 6 +- .../Structures/Wallmounts/Signs/signs.yml | 7 + .../Storage/Closets/Lockers/lockers.yml | 2 +- .../Structures/Wallmounts/Signs/signs.yml | 2 +- Resources/Prototypes/StatusIcon/job.yml | 12 +- .../_DV/Entities/Objects/Misc/bedsheets.yml | 23 ++ .../Storage/Closets/Lockers/lockers.yml | 12 + .../security.rsi/equipped-BACKPACK.png | Bin 0 -> 1334 bytes .../Back/Backpacks/security.rsi/icon.png | Bin 0 -> 966 bytes .../Backpacks/security.rsi/inhand-left.png | Bin 0 -> 1394 bytes .../Backpacks/security.rsi/inhand-right.png | Bin 0 -> 1339 bytes .../Back/Backpacks/security.rsi/meta.json | 26 ++ .../security.rsi/equipped-BACKPACK.png | Bin 0 -> 1342 bytes .../Back/Duffels/security.rsi/icon.png | Bin 0 -> 957 bytes .../Back/Duffels/security.rsi/inhand-left.png | Bin 0 -> 1120 bytes .../Duffels/security.rsi/inhand-right.png | Bin 0 -> 1074 bytes .../Back/Duffels/security.rsi/meta.json | 26 ++ .../security.rsi/equipped-BACKPACK.png | Bin 0 -> 1068 bytes .../Back/Satchels/security.rsi/icon.png | Bin 0 -> 1174 bytes .../Satchels/security.rsi/inhand-left.png | Bin 0 -> 1100 bytes .../Satchels/security.rsi/inhand-right.png | Bin 0 -> 1046 bytes .../Back/Satchels/security.rsi/meta.json | 26 ++ .../Gloves/forensic.rsi/equipped-HAND.png | Bin 0 -> 944 bytes .../Hands/Gloves/forensic.rsi/icon.png | Bin 0 -> 907 bytes .../Hands/Gloves/forensic.rsi/inhand-left.png | Bin 0 -> 896 bytes .../Gloves/forensic.rsi/inhand-right.png | Bin 0 -> 901 bytes .../Hands/Gloves/forensic.rsi/meta.json | 26 ++ .../Misc/job_icons.rsi/Brigmedic.png | Bin 0 -> 554 bytes .../Misc/job_icons.rsi/Detective.png | Bin 0 -> 575 bytes .../Misc/job_icons.rsi/SecurityBorg.png | Bin 190 -> 578 bytes .../Misc/job_icons.rsi/SecurityCadet.png | Bin 0 -> 562 bytes .../Misc/job_icons.rsi/SecurityOfficer.png | Bin 0 -> 577 bytes .../Misc/job_icons.rsi/SeniorOfficer.png | Bin 0 -> 568 bytes .../Interface/Misc/job_icons.rsi/Warden.png | Bin 0 -> 537 bytes .../Interface/Misc/job_icons.rsi/meta.json | 20 +- .../Misc/job_icons.rsi/nyanoPrisonGuard.png | Bin 163 -> 554 bytes .../Holoprojectors/security.rsi/icon.png | Bin 0 -> 1194 bytes .../Holoprojectors/security.rsi/meta.json | 22 + .../_DV/Objects/Devices/pda.rsi/meta.json | 2 +- .../Objects/Devices/pda.rsi/pda-corpsman.png | Bin 506 -> 1038 bytes .../Objects/Devices/pda.rsi/pda-detective.png | Bin 423 -> 1042 bytes .../_DV/Objects/Devices/pda.rsi/pda-hos.png | Bin 549 -> 1037 bytes .../Devices/pda.rsi/pda-interncadet.png | Bin 486 -> 985 bytes .../Devices/pda.rsi/pda-prisonguard.png | Bin 486 -> 1020 bytes .../Objects/Devices/pda.rsi/pda-security.png | Bin 440 -> 986 bytes .../Devices/pda.rsi/pda-seniorofficer.png | Bin 459 -> 1109 bytes .../Objects/Devices/pda.rsi/pda-warden.png | Bin 520 -> 1037 bytes .../Devices/securityhandy.rsi/meta.json | 28 ++ .../securityhandy.rsi/walkietalkie-off.png | Bin 0 -> 831 bytes .../securityhandy.rsi/walkietalkie-on.png | Bin 0 -> 699 bytes .../securityhandy.rsi/walkietalkie.png | Bin 0 -> 831 bytes .../_DV/Objects/Misc/bedsheets.rsi/meta.json | 23 ++ .../Misc/bedsheets.rsi/sheetbrigmedic.png | Bin 0 -> 1139 bytes .../Objects/Misc/bedsheets.rsi/sheetdet.png | Bin 0 -> 1104 bytes .../Objects/Misc/bedsheets.rsi/sheethos.png | Bin 0 -> 1109 bytes .../Misc/bedsheets.rsi/sheetwarden.png | Bin 0 -> 1091 bytes .../_DV/Objects/Misc/id_cards.rsi/default.png | Bin 0 -> 355 bytes .../Objects/Misc/id_cards.rsi/idbrigmedic.png | Bin 0 -> 662 bytes .../Objects/Misc/id_cards.rsi/iddetective.png | Bin 0 -> 684 bytes .../Misc/id_cards.rsi/idheadofsecurity.png | Bin 0 -> 669 bytes .../Misc/id_cards.rsi/idintern-cadet.png | Bin 0 -> 652 bytes .../Misc/id_cards.rsi/idsecurityofficer.png | Bin 0 -> 678 bytes .../Misc/id_cards.rsi/idseniorofficer.png | Bin 0 -> 661 bytes .../Objects/Misc/id_cards.rsi/idwarden.png | Bin 0 -> 625 bytes .../_DV/Objects/Misc/id_cards.rsi/meta.json | 29 +- .../Misc/id_cards.rsi/nyanoprisonguard.png | Bin 1502 -> 643 bytes .../_DV/Objects/Misc/id_cards.rsi/silver.png | Bin 0 -> 462 bytes .../security.rsi/equipped-BACKPACK.png | Bin 839 -> 1324 bytes .../security.rsi/equipped-SUITSTORAGE.png | Bin 839 -> 1324 bytes .../Tanks/Jetpacks/security.rsi/icon-on.png | Bin 574 -> 1076 bytes .../Tanks/Jetpacks/security.rsi/icon.png | Bin 479 -> 931 bytes .../Jetpacks/security.rsi/inhand-left.png | Bin 563 -> 1089 bytes .../Jetpacks/security.rsi/inhand-right.png | Bin 564 -> 1083 bytes .../Tanks/Jetpacks/security.rsi/meta.json | 2 +- .../security.rsi/on-equipped-BACKPACK.png | Bin 1145 -> 1827 bytes .../security.rsi/on-equipped-SUITSTORAGE.png | Bin 1145 -> 1827 bytes .../Decoration/banner.rsi/banner_security.png | Bin 0 -> 1214 bytes .../Decoration/banner.rsi/meta.json | 14 + .../Airlocks/Glass/security.rsi/assembly.png | Bin 581 -> 1021 bytes .../Airlocks/Glass/security.rsi/closed.png | Bin 729 -> 1215 bytes .../Airlocks/Glass/security.rsi/closing.png | Bin 1818 -> 2407 bytes .../Airlocks/Glass/security.rsi/meta.json | 386 +++++++++--------- .../Airlocks/Glass/security.rsi/open.png | Bin 400 -> 812 bytes .../Airlocks/Glass/security.rsi/opening.png | Bin 1843 -> 2511 bytes .../Standard/security.rsi/assembly.png | Bin 570 -> 1038 bytes .../Airlocks/Standard/security.rsi/closed.png | Bin 689 -> 1206 bytes .../Standard/security.rsi/closing.png | Bin 1818 -> 2497 bytes .../Airlocks/Standard/security.rsi/meta.json | 386 +++++++++--------- .../Airlocks/Standard/security.rsi/open.png | Bin 381 -> 836 bytes .../Standard/security.rsi/opening.png | Bin 1843 -> 2625 bytes .../VendingMachines/detdrobe.rsi/broken.png | Bin 0 -> 1278 bytes .../VendingMachines/detdrobe.rsi/meta.json | 31 ++ .../detdrobe.rsi/normal-unshaded.png | Bin 0 -> 7645 bytes .../VendingMachines/detdrobe.rsi/off.png | Bin 0 -> 1015 bytes .../VendingMachines/detdrobe.rsi/panel.png | Bin 0 -> 190 bytes .../VendingMachines/sec.rsi/broken.png | Bin 0 -> 1312 bytes .../VendingMachines/sec.rsi/deny-unshaded.png | Bin 0 -> 1426 bytes .../sec.rsi/eject-unshaded.png | Bin 0 -> 1927 bytes .../VendingMachines/sec.rsi/meta.json | 52 +++ .../sec.rsi/normal-unshaded.png | Bin 0 -> 1974 bytes .../Machines/VendingMachines/sec.rsi/off.png | Bin 0 -> 1025 bytes .../VendingMachines/sec.rsi/panel.png | Bin 0 -> 242 bytes .../VendingMachines/secdrobe.rsi/broken.png | Bin 0 -> 1295 bytes .../VendingMachines/secdrobe.rsi/meta.json | 33 ++ .../secdrobe.rsi/normal-unshaded.png | Bin 0 -> 8343 bytes .../VendingMachines/secdrobe.rsi/off.png | Bin 0 -> 1006 bytes .../VendingMachines/secdrobe.rsi/panel.png | Bin 0 -> 190 bytes .../Structures/Machines/techfab.rsi/ammo.png | Bin 0 -> 731 bytes .../Structures/Machines/techfab.rsi/icon.png | Bin 0 -> 1122 bytes .../Machines/techfab.rsi/inserting.png | Bin 0 -> 713 bytes .../Structures/Machines/techfab.rsi/meta.json | 41 ++ .../Structures/Machines/techfab.rsi/panel.png | Bin 0 -> 5514 bytes .../Structures/Machines/techfab.rsi/sec.png | Bin 0 -> 753 bytes .../Structures/Machines/techfab.rsi/unlit.png | Bin 0 -> 648 bytes .../Storage/Crates/sec_gear.rsi/base.png | Bin 0 -> 809 bytes .../Storage/Crates/sec_gear.rsi/closed.png | Bin 0 -> 786 bytes .../Storage/Crates/sec_gear.rsi/icon.png | Bin 0 -> 987 bytes .../Storage/Crates/sec_gear.rsi/locked.png | Bin 0 -> 147 bytes .../Storage/Crates/sec_gear.rsi/meta.json | 45 ++ .../Storage/Crates/sec_gear.rsi/open.png | Bin 0 -> 737 bytes .../Storage/Crates/sec_gear.rsi/sparking.png | Bin 0 -> 206 bytes .../Storage/Crates/sec_gear.rsi/unlocked.png | Bin 0 -> 142 bytes .../Storage/Crates/sec_gear.rsi/welded.png | Bin 0 -> 294 bytes .../Structures/Storage/closet.rsi/armory.png | Bin 0 -> 773 bytes .../Storage/closet.rsi/armory_door.png | Bin 0 -> 825 bytes .../Storage/closet.rsi/armory_open.png | Bin 0 -> 734 bytes .../Storage/closet.rsi/brigmedic.png | Bin 0 -> 773 bytes .../Storage/closet.rsi/brigmedic_door.png | Bin 0 -> 817 bytes .../Storage/closet.rsi/brigmedic_open.png | Bin 0 -> 734 bytes .../_DV/Structures/Storage/closet.rsi/det.png | Bin 0 -> 773 bytes .../Storage/closet.rsi/det_door.png | Bin 0 -> 831 bytes .../Storage/closet.rsi/det_open.png | Bin 0 -> 734 bytes .../Storage/closet.rsi/evidence.png | Bin 0 -> 773 bytes .../Storage/closet.rsi/evidence_door.png | Bin 0 -> 829 bytes .../Storage/closet.rsi/evidence_open.png | Bin 0 -> 734 bytes .../_DV/Structures/Storage/closet.rsi/hos.png | Bin 0 -> 773 bytes .../Storage/closet.rsi/hos_door.png | Bin 0 -> 839 bytes .../Storage/closet.rsi/hos_open.png | Bin 0 -> 734 bytes .../Structures/Storage/closet.rsi/meta.json | 65 ++- .../_DV/Structures/Storage/closet.rsi/sec.png | Bin 0 -> 773 bytes .../Storage/closet.rsi/sec_door.png | Bin 0 -> 811 bytes .../Storage/closet.rsi/sec_open.png | Bin 0 -> 734 bytes .../Structures/Storage/closet.rsi/warden.png | Bin 0 -> 773 bytes .../Storage/closet.rsi/warden_door.png | Bin 0 -> 830 bytes .../Storage/closet.rsi/warden_open.png | Bin 0 -> 734 bytes .../Wallmounts/signs.rsi/armory.png | Bin 0 -> 911 bytes .../Wallmounts/signs.rsi/direction_brig.png | Bin 0 -> 974 bytes .../Wallmounts/signs.rsi/direction_sec.png | Bin 0 -> 958 bytes .../Wallmounts/signs.rsi/interrogation.png | Bin 0 -> 946 bytes .../Structures/Wallmounts/signs.rsi/law.png | Bin 0 -> 882 bytes .../Structures/Wallmounts/signs.rsi/meta.json | 28 +- .../Wallmounts/signs.rsi/prison.png | Bin 0 -> 865 bytes .../Structures/Wallmounts/signs.rsi/sec.png | Bin 0 -> 7023 bytes .../Wallmounts/signs.rsi/security.png | Bin 0 -> 927 bytes 168 files changed, 1018 insertions(+), 433 deletions(-) create mode 100644 Resources/Prototypes/_DV/Entities/Objects/Misc/bedsheets.yml create mode 100644 Resources/Textures/_DV/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/_DV/Clothing/Back/Backpacks/security.rsi/icon.png create mode 100644 Resources/Textures/_DV/Clothing/Back/Backpacks/security.rsi/inhand-left.png create mode 100644 Resources/Textures/_DV/Clothing/Back/Backpacks/security.rsi/inhand-right.png create mode 100644 Resources/Textures/_DV/Clothing/Back/Backpacks/security.rsi/meta.json create mode 100644 Resources/Textures/_DV/Clothing/Back/Duffels/security.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/_DV/Clothing/Back/Duffels/security.rsi/icon.png create mode 100644 Resources/Textures/_DV/Clothing/Back/Duffels/security.rsi/inhand-left.png create mode 100644 Resources/Textures/_DV/Clothing/Back/Duffels/security.rsi/inhand-right.png create mode 100644 Resources/Textures/_DV/Clothing/Back/Duffels/security.rsi/meta.json create mode 100644 Resources/Textures/_DV/Clothing/Back/Satchels/security.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/_DV/Clothing/Back/Satchels/security.rsi/icon.png create mode 100644 Resources/Textures/_DV/Clothing/Back/Satchels/security.rsi/inhand-left.png create mode 100644 Resources/Textures/_DV/Clothing/Back/Satchels/security.rsi/inhand-right.png create mode 100644 Resources/Textures/_DV/Clothing/Back/Satchels/security.rsi/meta.json create mode 100644 Resources/Textures/_DV/Clothing/Hands/Gloves/forensic.rsi/equipped-HAND.png create mode 100644 Resources/Textures/_DV/Clothing/Hands/Gloves/forensic.rsi/icon.png create mode 100644 Resources/Textures/_DV/Clothing/Hands/Gloves/forensic.rsi/inhand-left.png create mode 100644 Resources/Textures/_DV/Clothing/Hands/Gloves/forensic.rsi/inhand-right.png create mode 100644 Resources/Textures/_DV/Clothing/Hands/Gloves/forensic.rsi/meta.json create mode 100644 Resources/Textures/_DV/Interface/Misc/job_icons.rsi/Brigmedic.png create mode 100644 Resources/Textures/_DV/Interface/Misc/job_icons.rsi/Detective.png create mode 100644 Resources/Textures/_DV/Interface/Misc/job_icons.rsi/SecurityCadet.png create mode 100644 Resources/Textures/_DV/Interface/Misc/job_icons.rsi/SecurityOfficer.png create mode 100644 Resources/Textures/_DV/Interface/Misc/job_icons.rsi/SeniorOfficer.png create mode 100644 Resources/Textures/_DV/Interface/Misc/job_icons.rsi/Warden.png create mode 100644 Resources/Textures/_DV/Objects/Devices/Holoprojectors/security.rsi/icon.png create mode 100644 Resources/Textures/_DV/Objects/Devices/Holoprojectors/security.rsi/meta.json create mode 100644 Resources/Textures/_DV/Objects/Devices/securityhandy.rsi/meta.json create mode 100644 Resources/Textures/_DV/Objects/Devices/securityhandy.rsi/walkietalkie-off.png create mode 100644 Resources/Textures/_DV/Objects/Devices/securityhandy.rsi/walkietalkie-on.png create mode 100644 Resources/Textures/_DV/Objects/Devices/securityhandy.rsi/walkietalkie.png create mode 100644 Resources/Textures/_DV/Objects/Misc/bedsheets.rsi/meta.json create mode 100644 Resources/Textures/_DV/Objects/Misc/bedsheets.rsi/sheetbrigmedic.png create mode 100644 Resources/Textures/_DV/Objects/Misc/bedsheets.rsi/sheetdet.png create mode 100644 Resources/Textures/_DV/Objects/Misc/bedsheets.rsi/sheethos.png create mode 100644 Resources/Textures/_DV/Objects/Misc/bedsheets.rsi/sheetwarden.png create mode 100644 Resources/Textures/_DV/Objects/Misc/id_cards.rsi/default.png create mode 100644 Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idbrigmedic.png create mode 100644 Resources/Textures/_DV/Objects/Misc/id_cards.rsi/iddetective.png create mode 100644 Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idheadofsecurity.png create mode 100644 Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idintern-cadet.png create mode 100644 Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idsecurityofficer.png create mode 100644 Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idseniorofficer.png create mode 100644 Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idwarden.png create mode 100644 Resources/Textures/_DV/Objects/Misc/id_cards.rsi/silver.png create mode 100644 Resources/Textures/_DV/Structures/Decoration/banner.rsi/banner_security.png create mode 100644 Resources/Textures/_DV/Structures/Decoration/banner.rsi/meta.json create mode 100644 Resources/Textures/_DV/Structures/Machines/VendingMachines/detdrobe.rsi/broken.png create mode 100644 Resources/Textures/_DV/Structures/Machines/VendingMachines/detdrobe.rsi/meta.json create mode 100644 Resources/Textures/_DV/Structures/Machines/VendingMachines/detdrobe.rsi/normal-unshaded.png create mode 100644 Resources/Textures/_DV/Structures/Machines/VendingMachines/detdrobe.rsi/off.png create mode 100644 Resources/Textures/_DV/Structures/Machines/VendingMachines/detdrobe.rsi/panel.png create mode 100644 Resources/Textures/_DV/Structures/Machines/VendingMachines/sec.rsi/broken.png create mode 100644 Resources/Textures/_DV/Structures/Machines/VendingMachines/sec.rsi/deny-unshaded.png create mode 100644 Resources/Textures/_DV/Structures/Machines/VendingMachines/sec.rsi/eject-unshaded.png create mode 100644 Resources/Textures/_DV/Structures/Machines/VendingMachines/sec.rsi/meta.json create mode 100644 Resources/Textures/_DV/Structures/Machines/VendingMachines/sec.rsi/normal-unshaded.png create mode 100644 Resources/Textures/_DV/Structures/Machines/VendingMachines/sec.rsi/off.png create mode 100644 Resources/Textures/_DV/Structures/Machines/VendingMachines/sec.rsi/panel.png create mode 100644 Resources/Textures/_DV/Structures/Machines/VendingMachines/secdrobe.rsi/broken.png create mode 100644 Resources/Textures/_DV/Structures/Machines/VendingMachines/secdrobe.rsi/meta.json create mode 100644 Resources/Textures/_DV/Structures/Machines/VendingMachines/secdrobe.rsi/normal-unshaded.png create mode 100644 Resources/Textures/_DV/Structures/Machines/VendingMachines/secdrobe.rsi/off.png create mode 100644 Resources/Textures/_DV/Structures/Machines/VendingMachines/secdrobe.rsi/panel.png create mode 100644 Resources/Textures/_DV/Structures/Machines/techfab.rsi/ammo.png create mode 100644 Resources/Textures/_DV/Structures/Machines/techfab.rsi/icon.png create mode 100644 Resources/Textures/_DV/Structures/Machines/techfab.rsi/inserting.png create mode 100644 Resources/Textures/_DV/Structures/Machines/techfab.rsi/meta.json create mode 100644 Resources/Textures/_DV/Structures/Machines/techfab.rsi/panel.png create mode 100644 Resources/Textures/_DV/Structures/Machines/techfab.rsi/sec.png create mode 100644 Resources/Textures/_DV/Structures/Machines/techfab.rsi/unlit.png create mode 100644 Resources/Textures/_DV/Structures/Storage/Crates/sec_gear.rsi/base.png create mode 100644 Resources/Textures/_DV/Structures/Storage/Crates/sec_gear.rsi/closed.png create mode 100644 Resources/Textures/_DV/Structures/Storage/Crates/sec_gear.rsi/icon.png create mode 100644 Resources/Textures/_DV/Structures/Storage/Crates/sec_gear.rsi/locked.png create mode 100644 Resources/Textures/_DV/Structures/Storage/Crates/sec_gear.rsi/meta.json create mode 100644 Resources/Textures/_DV/Structures/Storage/Crates/sec_gear.rsi/open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/Crates/sec_gear.rsi/sparking.png create mode 100644 Resources/Textures/_DV/Structures/Storage/Crates/sec_gear.rsi/unlocked.png create mode 100644 Resources/Textures/_DV/Structures/Storage/Crates/sec_gear.rsi/welded.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/armory.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/armory_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/armory_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/brigmedic.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/brigmedic_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/brigmedic_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/det.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/det_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/det_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/evidence.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/evidence_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/evidence_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/hos.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/hos_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/hos_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/sec.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/sec_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/sec_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/warden.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/warden_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/warden_open.png create mode 100644 Resources/Textures/_DV/Structures/Wallmounts/signs.rsi/armory.png create mode 100644 Resources/Textures/_DV/Structures/Wallmounts/signs.rsi/direction_brig.png create mode 100644 Resources/Textures/_DV/Structures/Wallmounts/signs.rsi/direction_sec.png create mode 100644 Resources/Textures/_DV/Structures/Wallmounts/signs.rsi/interrogation.png create mode 100644 Resources/Textures/_DV/Structures/Wallmounts/signs.rsi/law.png create mode 100644 Resources/Textures/_DV/Structures/Wallmounts/signs.rsi/prison.png create mode 100644 Resources/Textures/_DV/Structures/Wallmounts/signs.rsi/sec.png create mode 100644 Resources/Textures/_DV/Structures/Wallmounts/signs.rsi/security.png diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml index b33002934d38..e6ab72026832 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml @@ -120,4 +120,4 @@ - id: ClothingHeadHatWarden - id: ClothingHeadHatBeretWarden - id: ClothingOuterCoatStasecWarden # DeltaV - add winter coat - - id: ClothingShoesBootsWinterWarden # DeltaV - add winter boots + - id: ClothingShoesBootsWinterSec # DeltaV - add winter boots diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index 5e5b77c36ad7..7e402cdc6bb4 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -63,7 +63,7 @@ description: It's a very robust backpack. components: - type: Sprite - sprite: Clothing/Back/Backpacks/security.rsi + sprite: _DV/Clothing/Back/Backpacks/security.rsi # DeltaV - resprite security backpacks - type: entity parent: [ClothingBackpack, BaseRestrictedContraband] diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml index e2def41c36d8..faffe584aa8a 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml @@ -70,7 +70,7 @@ description: A large duffel bag for holding extra security related goods. components: - type: Sprite - sprite: Clothing/Back/Duffels/security.rsi + sprite: _DV/Clothing/Back/Duffels/security.rsi # DeltaV - resprite security duffel bags - type: entity parent: [ClothingBackpackDuffel, BaseRestrictedContraband] diff --git a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml index 38f80fc2d6b2..f8d94ca554e5 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml @@ -112,7 +112,7 @@ description: A robust satchel for security related needs. components: - type: Sprite - sprite: Clothing/Back/Satchels/security.rsi + sprite: _DV/Clothing/Back/Satchels/security.rsi # DeltaV - resprite security satchels - type: entity parent: [ClothingBackpackSatchel, BaseRestrictedContraband] diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml index cb4f8689b331..71ce79182eff 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml @@ -421,9 +421,9 @@ description: Do not leave fibers or fingerprints. If you work without them, you're A TERRIBLE DETECTIVE. components: - type: Sprite - sprite: Clothing/Hands/Gloves/forensic.rsi + sprite: _DV/Clothing/Hands/Gloves/forensic.rsi # DeltaV - resprite forensic gloves - type: Clothing - sprite: Clothing/Hands/Gloves/forensic.rsi + sprite: _DV/Clothing/Hands/Gloves/forensic.rsi # DeltaV - resprite forensic gloves - type: FingerprintMask - type: GuideHelp guides: diff --git a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml index 0df74d80d6ab..e312326219ff 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml @@ -116,7 +116,7 @@ signProto: HolosignSecurity chargeUse: 120 - type: Sprite - sprite: Objects/Devices/Holoprojectors/security.rsi + sprite: _DV/Objects/Devices/Holoprojectors/security.rsi # DeltaV - resprite holobarrier projector state: icon - type: Tag tags: diff --git a/Resources/Prototypes/Entities/Objects/Devices/radio.yml b/Resources/Prototypes/Entities/Objects/Devices/radio.yml index e750e4dbc1e5..c2fd8b5f8e0e 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/radio.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/radio.yml @@ -37,7 +37,7 @@ channels: - Security - type: Sprite - sprite: Objects/Devices/securityhandy.rsi + sprite: _DV/Objects/Devices/securityhandy.rsi # DeltaV - resprite security radio - type: Item - sprite: Objects/Devices/securityhandy.rsi + sprite: _DV/Objects/Devices/securityhandy.rsi # DeltaV - resprite security radio heldPrefix: walkietalkie diff --git a/Resources/Prototypes/Entities/Objects/Fun/whistles.yml b/Resources/Prototypes/Entities/Objects/Fun/whistles.yml index 1ab6567e65f2..6aecb4215b36 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/whistles.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/whistles.yml @@ -35,9 +35,9 @@ description: Sound of it make you feel fear. components: - type: Sprite - state: sec + state: whistle # DeltaV - replace sec with whistle - type: Clothing - equippedPrefix: sec + equippedPrefix: whistle # DeltaV - replace sec with whistle - type: Whistle distance: 5 diff --git a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml index 8ff12a2325a8..7f38b684bc92 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml @@ -176,12 +176,13 @@ id: BedsheetHOS parent: BedsheetBase name: HOS's bedsheet - description: It's decorated with a shield emblem. While crime doesn't sleep, you do, but you are still THE LAW! + description: A soft, slate-coloured quilt, adorned with gold trim. Not quite cozy enough to warm a cold heart. # DeltaV - change from "It's decorated with a shield emblem. While crime doesn't sleep, you do, but you are still THE LAW!" components: - type: Sprite + sprite: _DV/Objects/Misc/bedsheets.rsi # DeltaV - resprite sec bedsheets state: sheethos - type: Clothing - sprite: Clothing/Neck/Bedsheets/hos.rsi + sprite: Clothing/Neck/Bedsheets/grey.rsi # DeltaV - resprite sec bedsheets - type: StealTarget stealGroup: HeadBedsheet @@ -287,12 +288,13 @@ id: BedsheetBrigmedic parent: BedsheetBase name: corpsman's bedsheet # DeltaV - rename brigmedic to corpsman - description: Not worse than cotton. + description: A soft, slate-coloured quilt, adorned with white crosses. Unfortunately not sterile. # DeltaV - change from "Not worse than cotton." components: - type: Sprite + sprite: _DV/Objects/Misc/bedsheets.rsi # DeltaV - resprite sec bedsheets state: sheetbrigmedic - type: Clothing - sprite: Clothing/Neck/Bedsheets/brigmedic.rsi + sprite: Clothing/Neck/Bedsheets/grey.rsi # DeltaV - resprite sec bedsheets - type: entity id: BedsheetRed diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 030477b4cf8a..efabb22de93c 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -85,6 +85,7 @@ - type: PresetIdCard job: SecurityCadet - type: Sprite + sprite: _DV/Objects/Misc/id_cards.rsi # DeltaV - resprite security IDs layers: - state: default - state: idintern-cadet @@ -128,6 +129,7 @@ name: security ID card components: - type: Sprite + sprite: _DV/Objects/Misc/id_cards.rsi # DeltaV - resprite security IDs layers: - state: default - state: idsecurityofficer @@ -140,6 +142,7 @@ name: warden ID card components: - type: Sprite + sprite: _DV/Objects/Misc/id_cards.rsi # DeltaV - resprite security IDs layers: - state: default - state: idwarden @@ -429,6 +432,7 @@ name: head of security ID card components: - type: Sprite + sprite: _DV/Objects/Misc/id_cards.rsi # DeltaV - resprite security IDs layers: - state: silver - state: idheadofsecurity @@ -458,6 +462,7 @@ name: corpsman ID card # DeltaV - rename brigmedic to corpsman components: - type: Sprite + sprite: _DV/Objects/Misc/id_cards.rsi # DeltaV - resprite security IDs layers: - state: default - state: idbrigmedic @@ -716,6 +721,7 @@ name: detective ID card components: - type: Sprite + sprite: _DV/Objects/Misc/id_cards.rsi # DeltaV - resprite security IDs layers: - state: default - state: iddetective @@ -795,6 +801,7 @@ name: senior officer ID card components: - type: Sprite + sprite: _DV/Objects/Misc/id_cards.rsi # DeltaV - resprite security IDs layers: - state: default - state: idseniorofficer diff --git a/Resources/Prototypes/Entities/Structures/Decoration/banners.yml b/Resources/Prototypes/Entities/Structures/Decoration/banners.yml index c2e7bac65653..537856064847 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/banners.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/banners.yml @@ -111,10 +111,10 @@ id: BannerSecurity parent: BannerBase name: security banner - description: A banner displaying the colors of the security department. You're surprised it's not vandalised. + description: A simple but ornate grey banner with a stylised white shield. Reassuring and ominous in equal measures. # DeltaV - change from "A banner displaying the colors of the security department. You're surprised it's not vandalised." components: - type: Sprite - sprite: Structures/Decoration/banner.rsi + sprite: _DV/Structures/Decoration/banner.rsi # DeltaV - resprite sec banner state: banner_security - type: entity diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 84a98d6ca85d..a058724488ec 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -771,7 +771,7 @@ description: Prints equipment for use by security crew. components: - type: Sprite - sprite: Structures/Machines/techfab.rsi + sprite: _DV/Structures/Machines/techfab.rsi # DeltaV - resprite armoury fabs layers: - state: icon map: ["enum.LatheVisualLayers.IsRunning"] @@ -942,7 +942,7 @@ description: Prints the bare minimum of bullets that any budget military or armory could need. Nothing fancy. components: - type: Sprite - sprite: Structures/Machines/techfab.rsi + sprite: _DV/Structures/Machines/techfab.rsi # DeltaV - resprite armoury fabs layers: - state: icon map: ["enum.LatheVisualLayers.IsRunning"] diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 3ecb065518a8..170d724b74c9 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -905,7 +905,7 @@ - type: SpeakOnUIClosed pack: SecTechGoodbyes - type: Sprite - sprite: Structures/Machines/VendingMachines/sec.rsi + sprite: _DV/Structures/Machines/VendingMachines/sec.rsi # DeltaV - resprite security vendors layers: - state: "off" map: ["enum.VendingMachineVisualLayers.Base"] @@ -1562,7 +1562,7 @@ - type: SpeakOnUIClosed pack: GenericVendGoodbyes - type: Sprite - sprite: Structures/Machines/VendingMachines/secdrobe.rsi + sprite: _DV/Structures/Machines/VendingMachines/secdrobe.rsi # DeltaV - resprite security vendors layers: - state: "off" map: ["enum.VendingMachineVisualLayers.Base"] @@ -1858,7 +1858,7 @@ - type: SpeakOnUIClosed pack: GenericVendGoodbyes - type: Sprite - sprite: Structures/Machines/VendingMachines/detdrobe.rsi + sprite: _DV/Structures/Machines/VendingMachines/detdrobe.rsi # DeltaV - resprite security vendors layers: - state: "off" map: ["enum.VendingMachineVisualLayers.Base"] diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml index 460aab5df5b3..e6c1e0a0b1bf 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -301,7 +301,7 @@ # HoS - type: entity id: LockerHeadOfSecurity - parent: LockerBaseSecure + parent: LockerBaseSecureDeltaV # DeltaV - resprite security lockers name: head of security's locker components: - type: Appearance @@ -315,7 +315,7 @@ # Warden - type: entity id: LockerWarden - parent: LockerBaseSecure + parent: LockerBaseSecureDeltaV # DeltaV - resprite security lockers name: warden's locker components: - type: Appearance @@ -329,7 +329,7 @@ # Brigmedic - type: entity id: LockerBrigmedic - parent: LockerBaseSecure + parent: LockerBaseSecureDeltaV # DeltaV - resprite security lockers name: corpsman locker # DeltaV - rename brigmedic to corpsman components: - type: Appearance @@ -343,7 +343,7 @@ # Security Officer - type: entity id: LockerSecurity - parent: LockerBaseSecure + parent: LockerBaseSecureDeltaV # DeltaV - resprite security lockers name: security officer's locker components: - type: Appearance @@ -384,19 +384,26 @@ # Detective - type: entity id: LockerDetective - parent: LockerBooze - name: detective's cabinet - description: Usually cold and empty... like your heart. + parent: LockerBaseSecureDeltaV # DeltaV - resprite security lockers + name: detective's locker # DeltaV - rename from detective's cabinet components: + - type: EntityStorageVisuals # DeltaV - set appearance of det's locker + stateBaseClosed: det + stateDoorOpen: det_open + stateDoorClosed: det_door - type: AccessReader access: [["Detective"]] - type: entity id: LockerEvidence - parent: LockerSecurity + parent: LockerBaseSecureDeltaV # DeltaV - resprite security lockers name: evidence locker description: To store bags of bullet casings and detainee belongings. components: + - type: EntityStorageVisuals # DeltaV - set appearance of evidence locker + stateBaseClosed: evidence + stateDoorOpen: evidence_open + stateDoorClosed: evidence_door - type: AccessReader access: [["Security"], ["Prosecutor"], ["Clerk"]] # DeltaV - allow Pros and Clerk access to Evidence diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml index 107e8f94d502..fb98c5b51b96 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml @@ -181,9 +181,9 @@ name: secgear crate components: - type: Icon - sprite: Structures/Storage/Crates/sec_gear.rsi + sprite: _DV/Structures/Storage/Crates/sec_gear.rsi # DeltaV - resprite security crates - type: Sprite - sprite: Structures/Storage/Crates/sec_gear.rsi + sprite: _DV/Structures/Storage/Crates/sec_gear.rsi # DeltaV - resprite security crates - type: AccessReader access: [["Security"]] @@ -299,7 +299,7 @@ description: An armory access locked crate for storing contraband confiscated from suspects or prisoners. components: - type: Sprite - sprite: Structures/Storage/Crates/sec_gear.rsi + sprite: _DV/Structures/Storage/Crates/sec_gear.rsi # DeltaV - resprite security crates - type: AccessReader access: [["Armory"]] diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml index 72bc35bb1875..6de1b0222560 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml @@ -50,6 +50,7 @@ description: A direction sign, pointing out which way the Brig is. components: - type: Sprite + sprite: _DV/Structures/Wallmounts/signs.rsi # DeltaV - resprite security signs state: direction_brig - type: entity @@ -213,6 +214,7 @@ description: A direction sign, pointing out which way Security is. components: - type: Sprite + sprite: _DV/Structures/Wallmounts/signs.rsi # DeltaV - resprite security signs state: direction_sec - type: entity @@ -278,6 +280,7 @@ description: A sign indicating the armory. components: - type: Sprite + sprite: _DV/Structures/Wallmounts/signs.rsi # DeltaV - resprite security signs state: armory - type: entity @@ -597,6 +600,7 @@ description: A sign indicating an interrogation room. components: - type: Sprite + sprite: _DV/Structures/Wallmounts/signs.rsi # DeltaV - resprite security signs state: interrogation - type: entity @@ -624,6 +628,7 @@ description: A sign indicating the presence of the (typically absent) rule of law. components: - type: Sprite + sprite: _DV/Structures/Wallmounts/signs.rsi # DeltaV - resprite security signs state: law - type: entity @@ -687,6 +692,7 @@ description: A sign indicating the prison. components: - type: Sprite + sprite: _DV/Structures/Wallmounts/signs.rsi # DeltaV - resprite security signs state: prison - type: entity @@ -1216,6 +1222,7 @@ description: A sign depicting the security insignia. components: - type: Sprite + sprite: _DV/Structures/Wallmounts/signs.rsi # DeltaV - resprite security signs state: security - type: entity diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Storage/Closets/Lockers/lockers.yml index 2744f965e07c..6a9c8443bc77 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -1,6 +1,6 @@ - type: entity id: LockerForensicMantis - parent: LockerDetective + parent: LockerBooze # DeltaV - reparent from det's locker to booze cabinet suffix: Empty name: psionic mantis' cabinet # DeltaV - Rename Forensic Mantis to Psionic Mantis description: You'll never know what's inside until you collapse the quantum superposition of all possible mysteries. diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmounts/Signs/signs.yml index caf7c545105c..7725000b8255 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmounts/Signs/signs.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmounts/Signs/signs.yml @@ -5,7 +5,7 @@ description: A sign indicating the Security department. components: - type: Sprite - sprite: Nyanotrasen/Structures/Wallmounts/signs.rsi + sprite: _DV/Structures/Wallmounts/signs.rsi # DeltaV - resprite security signage state: sec - type: entity diff --git a/Resources/Prototypes/StatusIcon/job.yml b/Resources/Prototypes/StatusIcon/job.yml index d569041e17fe..4cecbc99e416 100644 --- a/Resources/Prototypes/StatusIcon/job.yml +++ b/Resources/Prototypes/StatusIcon/job.yml @@ -9,7 +9,7 @@ parent: JobIcon id: JobIconDetective icon: - sprite: /Textures/Interface/Misc/job_icons.rsi + sprite: /Textures/_DV/Interface/Misc/job_icons.rsi # DeltaV - resprite sec icons state: Detective jobName: job-name-detective @@ -105,7 +105,7 @@ parent: JobIcon id: JobIconSecurityOfficer icon: - sprite: /Textures/Interface/Misc/job_icons.rsi + sprite: /Textures/_DV/Interface/Misc/job_icons.rsi # DeltaV - resprite sec icons state: SecurityOfficer jobName: job-name-security @@ -273,7 +273,7 @@ parent: JobIcon id: JobIconBrigmedic icon: - sprite: /Textures/Interface/Misc/job_icons.rsi + sprite: /Textures/_DV/Interface/Misc/job_icons.rsi # DeltaV - resprite sec icons state: Brigmedic jobName: job-name-brigmedic @@ -305,7 +305,7 @@ parent: JobIcon id: JobIconWarden icon: - sprite: /Textures/Interface/Misc/job_icons.rsi + sprite: /Textures/_DV/Interface/Misc/job_icons.rsi # DeltaV - resprite sec icons state: Warden jobName: job-name-warden @@ -377,7 +377,7 @@ parent: JobIcon id: JobIconSecurityCadet icon: - sprite: /Textures/Interface/Misc/job_icons.rsi + sprite: /Textures/_DV/Interface/Misc/job_icons.rsi # DeltaV - resprite sec icons state: SecurityCadet jobName: job-name-cadet @@ -418,7 +418,7 @@ parent: JobIcon id: JobIconSeniorOfficer icon: - sprite: /Textures/Interface/Misc/job_icons.rsi + sprite: /Textures/_DV/Interface/Misc/job_icons.rsi # DeltaV - resprite sec icons state: SeniorOfficer allowSelection: true # DeltaV - Selectable, was false jobName: job-name-senior-officer # DeltaV - Agent ID localization diff --git a/Resources/Prototypes/_DV/Entities/Objects/Misc/bedsheets.yml b/Resources/Prototypes/_DV/Entities/Objects/Misc/bedsheets.yml new file mode 100644 index 000000000000..db586fcec78e --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Objects/Misc/bedsheets.yml @@ -0,0 +1,23 @@ +- type: entity + parent: BedsheetBase + id: BedsheetWarden + name: warden's bedsheet + description: A soft, slate-coloured quilt, adorned with silver trim. Cool to the touch and practically unused. + components: + - type: Sprite + sprite: _DV/Objects/Misc/bedsheets.rsi + state: sheetwarden + - type: Clothing + sprite: Clothing/Neck/Bedsheets/grey.rsi + +- type: entity + parent: BedsheetBase + id: BedsheetDetective + name: detective's bedsheet + description: A soft, slate-coloured quilt, adorned with pale plum trim. Rumpled and a little stained. + components: + - type: Sprite + sprite: _DV/Objects/Misc/bedsheets.rsi + state: sheetdet + - type: Clothing + sprite: Clothing/Neck/Bedsheets/grey.rsi diff --git a/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/lockers.yml index 10126317fc02..fd0c2a321bdd 100644 --- a/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -70,3 +70,15 @@ stateDoorClosed: admin_assist_door - type: AccessReader access: [["Command"]] + +- type: entity + parent: LockerBaseSecureDeltaV + id: LockerArmoryStorage + name: armory storage locker + components: + - type: EntityStorageVisuals + stateBaseClosed: armory + stateDoorOpen: armory_open + stateDoorClosed: armory_door + - type: AccessReader + access: [["Armory"]] diff --git a/Resources/Textures/_DV/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png b/Resources/Textures/_DV/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..69f92a22da8a95581ae2aa4170e48a6934e78264 GIT binary patch literal 1334 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 AB>(^b literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Clothing/Back/Backpacks/security.rsi/inhand-right.png b/Resources/Textures/_DV/Clothing/Back/Backpacks/security.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..475ec745fdff69e8b696ae23772e46e15b9606ed GIT binary patch literal 1339 zcmV-B1;qM^P)aTcu(v9TXIC$WXfE&m(nGJjBJU?tL92R8VaO`1*)vnZ+IAdE)ezV+r0P9%3cA zKzu?R<8(pdTcIl+zX>jS{3V#@G7ErT%#@04th6yJaf5i0IBMt>*1V7SlCWy7WT}o) zj=@F-DI_65K?R%8;UG@cq@8v4B^thEl*z;BZJ`QIjv`9rjgeZRsVY^Cbd??*Rk8Q~ z`?R&0X>WQs3G}|Y?&mlV+z0A4*ZnmcLAUn)@cb*3zQKKx7BFylH95 z0dTboj67R1mm5-m(ywX2#|1Eu2L|tf{&jCx&2yYT0l97ZMR&mA5imjhk&Qp&ENA@% z_zfcf000SaNLh0L01FZT01FZU(%pXi000AWNkl%S5kb|6Dv@$5T)3ptmY<`ER`xpUB};a3Jra2Rcjo&% zwim`qMTrbV1|kEIfyh8)ATkgchzvvqA_I|u$bd@IRDUinFSn0R&xf35apXjGgu_X|dc8gQ`%Z`qYbeGv|X7x44sw0n`S(~%=CW&pbRnqVG(@v+OZO47i&(GD* z-+$ECFCW!pGEu!=PuJbu-Km?Kn*_p|Bo`MK>1wr7tyW7-r&A?Z#9q@@YY8y3G)7>r z-EOPo!zY~zo36pk!RyEa`u_gj0`KzJ_bwv=345HQr=OqR3&;yOO`CbaadvhlkBTGk z`1ttQ=I4scgOdOOD}bdB3Sha(B1-`9MehMl0_conXF6{aX&MoLM@X@^vI`5`=WST@9Y{#bTk$I1ZcW{@S?h z*Kj!8nrqveM?mfpU?AS60Lq!lNkB@Ta#7UObTk?zzV=#RU@lZCLZZYN;kq-hk6;O7if)Lm zIx<~I0C56|6<`QPJlz?1)G2u}u*#V+$C79@f!Qj(z={o;inDnEYXW|YI|CB)!yXBN zXKmZ{xfB613*r$d&D&UZHRh#$60OeaeyP20ofiRYM0MR6$kSb=2NdoB!epIy229-& z{}+N+P`u>|S{{hI5aEBW#&yWBB002ovPDHLkV1oBkaPI&B literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Clothing/Back/Backpacks/security.rsi/meta.json b/Resources/Textures/_DV/Clothing/Back/Backpacks/security.rsi/meta.json new file mode 100644 index 000000000000..864092d172a5 --- /dev/null +++ b/Resources/Textures/_DV/Clothing/Back/Backpacks/security.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae. Modified by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_DV/Clothing/Back/Duffels/security.rsi/equipped-BACKPACK.png b/Resources/Textures/_DV/Clothing/Back/Duffels/security.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..c13c65e3d611cd69cfd4daa7818f2058b4d32859 GIT binary patch literal 1342 zcmV-E1;P4>P)aTcu(v9TXIC$WXfE&m(nGJjBJU?tL92R8VaO`1*)vnZ+IAdE)ezV+r0P9%3cA zKzu?R<8(pdTcIl+zX>jS{3V#@G7ErT%#@04th6yJaf5i0IBMt>*1V7SlCWy7WT}o) zj=@F-DI_65K?R%8;UG@cq@8v4B^thEl*z;BZJ`QIjv`9rjgeZRsVY^Cbd??*Rk8Q~ z`?R&0X>WQs3G}|Y?&mlV+z0A4*ZnmcLAUn)@cb*3zQKKx7BFylH95 z0dTboj67R1mm5-m(ywX2#|1Eu2L|tf{&jCx&2yYT0l97ZMR&mA5imjhk&Qp&ENA@% z_zfcf000SaNLh0L01m_e01m_fl`9S#000AZNklQqqJ0VL%uV2801&Ko}4PgaIQ1FWF&GRKh_QieMZmYwr^=&; zRfQ<9QIhvu7tb@Q3>y>m4j4nrd5^SQP9Ou3BB z=Hkyxm9ZDV`_*bSFmyJXsYaure*T)Pit||ATz*%s>sr~ADFVt)g;uK-dU`sYDvE}1 z(4u3-R#a}$kwCdm-iG%<02-pf*85nODFUz%jYmRJ8zcAj$;CazqhX24?)OF!K&to` z5RgLSc|PHN`rN18{;PYMIrj;h^%o&p$e-IXn(N?w$8myJL<30Jq-~S}af;!oxbZy3 zknfc9kOw0EUY}*keZrGV1duR1vus3sy{^BKn>)E%$yc2bd5!ZZ+ZN$@VHG*TfG{8o z2m``^Fdz&F1HynXAPfit!hkR!3k|!U)Pw)Q*SLTR)d~1Uf!EqVvXjc0N7wzV3d)s~0GpEpd-VXNgKIEhiS~^tfP8wpxRHU9^x_gi7#UGP zyYdcC*X#A5aGGY{iY0)D3^tR`N9REuKFLVh3zFvK@i#=8F84|P@egmY37*nxunAI1 zhl8t*HU((GyG}j4gLC)6`fg5C5Z+C|;?~%XnREanoQBOC*wM(AI9;(3z$c;}U#ryu zVMv3U%k>7y=j}ot;g3%M$5|TA?-JT31KARXn+V80=Kufz07*qoM6N<$g1XFg ABLDyZ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Clothing/Back/Duffels/security.rsi/icon.png b/Resources/Textures/_DV/Clothing/Back/Duffels/security.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..cf8514cfd76d4bab4f043770d1f516d415cc1e86 GIT binary patch literal 957 zcmV;u148_XP)aTcu(v9TXIC$WXfE&m(nGJjBJU?tL92R8VaO`1*)vnZ+IAdE)ezV+r0P9%3cA zKzu?R<8(pdTcIl+zX>jS{3V#@G7ErT%#@04th6yJaf5i0IBMt>*1V7SlCWy7WT}o) zj=@F-DI_65K?R%8;UG@cq@8v4B^thEl*z;BZJ`QIjv`9rjgeZRsVY^Cbd??*Rk8Q~ z`?R&0X>WQs3G}|Y?&mlV+z0A4*ZnmcLAUn)@cb*3zQKKx7BFylH95 z0dTboj67R1mm5-m(ywX2#|1Eu2L|tf{&jCx&2yYT0l97ZMR&mA5imjhk&Qp&ENA@% z_zfcf000SaNLh0L01m_e01m_fl`9S#0005>Nkl*aVq!UOd@W&I#Y=U1ZmFBv-!C_9V0l=%(DtVqq(2(1^i6Bufya|6e90~$( zK%!VIia7q%T=dY9*pd~B!Qi=EPJp8UY{-22K>g9S@GF&y0OnE|vL4NUTC@Zh z2xIT7`#wSAHe|C|p*h}awRELRabw9#aHi9#%&66B(smq2+=d_s2;ana zB$2>mGLikRU0>Qvrq}DqtB6C6w@%MwZk!SM3e-Exdw_{x8DS5=SHXD?ARf-OZJVB7 zqd(xp34lFFsN2nZT09fpJ%l$QZ^Ljd9%#SZlv{OCy~h8cbu!x_MPyxMkil82>{T*+9;E@wq65eIS_HTev`R*ehwV7f faBk}V?+JVWjvvvrP`mPc00000NkvXXu0mjf)&RQh literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Clothing/Back/Duffels/security.rsi/inhand-left.png b/Resources/Textures/_DV/Clothing/Back/Duffels/security.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..62ebbe67202cc14116014c2477340bf7a55defe6 GIT binary patch literal 1120 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d{Sb`Ho)PG(@xm{>Y-ulL~q zk)!_6OOv!^MMMfu1RPy>bdf?|&_TVc3)d!GRju@mQuI9R-6ax!@aVz^3cG%o{*Zs6 zwL^=eNvUJUu3uX{I=`E?ie={S*lB-m_w!Fh%s(z$8NZpwk}!ks{E|tRvg&-f_8o2) zcq-DCnilPS^Qg?OW9OAigKUl*UGuJ1Ryiafm+i-|j`W#FWgk^O`Z6t<^PaL?lIl)} z8Yh{@C614x7i!Dx=hUnEqdMcc5qCrUnJHblYql6_7dBT+vdDTNdTmetk4YP{)}^fM z3+g-Q#-^#F=;+8g`@%y7zpG2;mVQ%}+Lt=z&{Nw?^8YNx7yxomlhp& zNMYZxCo}UDW5HJL9-C;R>C!M?ft~Gr=}3F{&Fop@KDge z@$bZ5`^P%ze_4OEakt!T5HTWA<$af!5<{ zrmE@_onNkWPwo-WoZ=MqVdefs;q$X<-p_xnxx=zWrpNHu7x5`_UH(gVu!j1dl{mU4 zO#AJQg&)3cnppPz>>Kq=o}222+?Z4xa3BHi1PhsG8>NoF_Fvd3vG=iq;q}Z}b~k=h z?R}^C@nAy0sYkok?(^Qfwk`kP%zT3qpUF1X^?G}kpMR2Drg-{kP(l6v``!2agEbjj z8&+KAIjdO`XTqRjHPeUhW8S-cC!S9|5jyQ;*49aDUR*5rf6`SgJhSQa9rlCEcSh)J zxVPr3?vxFdugkc6!~4`2Vh-JY8#YNr@XO_wS4@|Fwath$4`!&yTESRx)_w8BH)Xpw z^?Uw`Fm^k=bz5m@S?7bpjR<^Fo&2K|c5JF;`9o9fNoRh^dK z!1h5^=GT)@@87G^!g;SI`Qr#QNML@j7w-7VJL7-!pZJ4EP6nEa@%ikk5cFZp2wHBl z_o76V$nrRrInIZ=3+C;qDB!t1#e0kWf?pygE6vFVdQ&MBb@0B<=4D*ylh literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Clothing/Back/Duffels/security.rsi/inhand-right.png b/Resources/Textures/_DV/Clothing/Back/Duffels/security.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..99f6112114cc18c1df09f1bddd1b6deab1f9e1bc GIT binary patch literal 1074 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Clothing/Back/Satchels/security.rsi/inhand-left.png b/Resources/Textures/_DV/Clothing/Back/Satchels/security.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..899fa6e1d401a857e4bf591fdf3b2d36d1c25ae6 GIT binary patch literal 1100 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d{Sb`Ho)PG(@xm{>Y-ulL~q zk)!_6OOv!^MMMfu1RPy>bdf?|&_TVc3)d!GRju@mQuI9R-6ax!@aVz^3cG%o{*Zs6 zwL^=eNvUJUu3uX{I=`E?ie={S*lB-m_w!Fh%s(z$8NZpwk}!ks{E|tRvg&-f_8o2) zcq-DCnilPS^Qg?OW9OAigKUl*UGuJ1Ryiafm+i-|j`W#FWgk^O`Z6t<^PaL?lIl)} z8Yh{@C614x7i!Dx=hUnEqdMcc5qCrUnJHblYql6_7dBT+vdDTNdTmetk4YP{)}^fM z3+g-Q#-^#F=;+8g`@%y7zpG2;mVQ%}+Lt=z&{Nw?^8YNx7yxomlhp& zNMYZxCo}UDW5HJL9-C;R>C!M?ft~Gr=}3F{&Fop@KDge z@$bZ5`^P%ze_4Oz`)e(>Eakt!T5HTtv{2aK%0AV z4{uOJzzl~ZCX?_LiYjJiG47tv{U4Ygl2;HBGjVWdHEWw7vHSA(LlgD}H&vUr&)PG4 z!rvXYe^!)z(@1l<;nBc?3vCkMXi`{pH7ju1-u*kDUvaXWlfV78*die#1#_Om5?TB2 z>$BwLF<5*}+pKx`VSv@#zB{&dZ+YH+t=e69XtTUeNZ#U$0uB*t!|ZQ7{eP|9#sjt24_2=!<=aIbICru9Be|_KWGKrVx zvmZB3SNwcHyT*q}#Q`_^pv`iJr!bIBp)xD5KVgz&(cG56i@&=gB%YrtJzj8cmE1uQ zhEG3M2wn(dVL7p7jk|$&@4?I`EE5&>@~_&oL&UM`%&vv^7*vBSDV4G-kD+SwHRTzxjJ&?4*Pc5ssjm68=#^ki&W+#i zHh%hmvkjUi*ZVwRUUx==qyOf#8^AQm N;OXk;vd$@?2>@V_^_lY-ulL~q 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Clothing/Hands/Gloves/forensic.rsi/inhand-left.png b/Resources/Textures/_DV/Clothing/Hands/Gloves/forensic.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..f87ba3718a2824748f1b8cdb531fd43ff3b9aba6 GIT binary patch literal 896 zcmV-`1AqL9P)Awm_07K(xhE>giR)uF9m)g`$mt&pVQk|M=baB(O& zh%Wvb{10>$TonXC5ky>F{k2Gm@0vo3v@cxVhwr`b6S=457DOWDO7y2j5VRZ~2~MX&C49V1jwZ3g)IiD#I_9pZW7^p;}@-Xk7j zCAmO+LLB3CK;m1WD;~cIE_(bWnCCJJfM4{Kifyd4F)ML{c#=43=oQvHkGM%#HCM8f zM`(@0Mg}P)AwfX}o6zAPPT8cHb@nA1zGalj!{~3J3Qmq9O5}}^TA{8gWsP)|J{?st z_y6;>wdpCZdpHU7zPj$`IMBBb)N8K$d+NINGa&E+T$?R_ndUV6O?s`RMUR2V4sdzX z(v$<>Y8M!Owq!0hqyR0yrU4%pz(5`tya$5o-mIGYIDZ0i+w??tz~K=vLG_W1KPEb8 z97Pq&vH$=832;bRa{vGf6951U69E94oEQKA0kug)K~#7F?OLHu#6S?;A>a_08Ug}= zMBvW!>ub&-kO%|>Q-i=EdOLgFq*(-{^RCG-uSsw3n%vtrZ{F-C+mUISQsnC_a_|~E z1)u|hE5H&6ZU8QVECH54a0OTb!41G&fF-~Z2(AE2Ah-dz3!I}IAR+~-?|VIDlwlZ9 z(0{^Rd$ws_12phu@LzJ9KHtBgC#?^6yGe2L1;tfBvjD2R-kSNY>(b@)rno7SE+gtg zaTQgK|X)dI-c?c)c~ybZR`xB9&{ z4p<3n6)1Wh3V>GB8y+3tEn{fDbO2gWZ+LWow~V3r(gA2iz2VUT-ZF;fO9!A8^@c|W zc*_`?FCBnZ)Egch;4NclzH|UuQEzzR9RPnbw6z0jKf>C1T{}R7ul)$MPoW)u6UMCo z8vL>!q4p`Xz^b74|I-29Gic=>-T?Y-zxQDW zk>mSwMVGEEx!`z2(MhyjtgDGbFX*7&)rD&luBz@-TRUON!%0d<$GDX z7J(xY&r;H&y>A|s*>&u^a%iy45!dzaN@bNp0&>}Y{OU}faa8tE<)bgtk~!}w%O$Dq zbf|HXd0gV~D0-o`+|<&#UzWY7oyi}`geFnn1*kf z;-1la$c;@?MbXibb@qja3Vt`2%q;z;Dzz_l%E`ko@)vUX^(lEh>75w0aGh3aZ^=|U z*-*pp|37cp`ciX!wFT#weY@U0x45vK|4R0{-_@^neKl72z!WoEw|?d`li$8oYnQtA zH=f`tsJwh>3iE?3af!NZDSGBh75(oQ)*9VH!a+|^yJ%LzjP}rlVacRzF&J?HCwgi z!q%F(Tj$smsWVtDC}hfMJjQ##b%O2zv5Ywk(F+QhKLD8t+$Mevx)*jZ{t&acZsFjv zD^cRZ$AD#-muxoOp0T1>#(iqr8>xmT^6&T_M&}tWe67F2L(XcyT^&=&>LzW&E z+nf9Dxt{Q1PyL=SaZm1qxguBDQ~S9e22RfLlyeQ*%NloY-n517?_NDiT7PKO<3$dq zl~%~<&uVqrJZqJ*6z`QMteUUH3@+u$wK1HTXwB`xZlT?=Q^x9m%+AdXB@LUKW}IHg zOoD`ir{f0Y*M-X~y!|5C|7_R(^8Jj%S%FOqLD4=R&m3^t6Q!QQxa3X9!I_Oy{(Oz& zY{)vtvqWP>S$nYXmAdsu7`Hy(_e#BCvPQC_P>BQMp2-zkD%t-qx!y|fc`46R35;3> MPgg&ebxsLQ0D?S@X#fBK literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Clothing/Hands/Gloves/forensic.rsi/meta.json b/Resources/Textures/_DV/Clothing/Hands/Gloves/forensic.rsi/meta.json new file mode 100644 index 000000000000..e1ddc6e77f46 --- /dev/null +++ b/Resources/Textures/_DV/Clothing/Hands/Gloves/forensic.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from paradise station at https://github.com/ss220-space/Paradise/blob/e13af16eec39b663112e014901960c89fb09ef8b/icons/obj/clothing/gloves.dmi. Modified by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/Brigmedic.png b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/Brigmedic.png new file mode 100644 index 0000000000000000000000000000000000000000..8176800106c8b2b2e2edc4f66b2c6389f8e76f5d GIT binary patch literal 554 zcmV+_0@eMAP)1VIr*EUkStBI_L^B#6#3dq2+1xy+n_(4=i-yqYLvvc4Oih-q{43tHV1 z4Rq4N5YeRJIa4#^3H}}LH&m&5-LHE6zwgh{v}}3?RMiU)8;j|xw&`i|mF;Wi_k zTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$Rj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H z+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnhIymU3CTB4is*%Van zzw`90!GTiua13f6g5aea>bBss7z7^&LGXD9)%S3gE&Fql)5x3X#j@752a$C+IWKGa zHk@ui`<;_?liyOc%#dZl^D#8fL+ceZE|#+TS?A~$5^M5Am$0)7J+eQt^aXoYXhVZ; z{@?%r010qNS#tmY3ljhU3ljkVnw%H_003f1L_t&-8DnGsf;I+*{~#I!R@+5E7(nv; zp=FGWAj!)A{~6XwNihUJdj^&aNvr|W_wL=>>}t&cmMzZ07*qoM6N<$g4)>eJ^%m! literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/Detective.png b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/Detective.png new file mode 100644 index 0000000000000000000000000000000000000000..fb1b68259550f9875b33b30535fb8539f576e3d1 GIT binary patch literal 575 zcmV-F0>J%=P)1VIr*EUkStBI_L^B#6#3dq2+1xy+n_(4=i-yqYLvvc4Oih-q{43tHV1 z4Rq4N5YeRJIa4#^3H}}LH&m&5-LHE6zwgh{v}}3?RMiU)8;j|xw&`i|mF;Wi_k zTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$Rj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H z+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnhIymU3CTB4is*%Van zzw`90!GTiua13f6g5aea>bBss7z7^&LGXD9)%S3gE&Fql)5x3X#j@752a$C+IWKGa zHk@ui`<;_?liyOc%#dZl^D#8fL+ceZE|#+TS?A~$5^M5Am$0)7J+eQt^aXoYXhVZ; z{@?%r010qNS#tmY3labT3lag+-G2N4004JML_t&-8DnGsf;I+*{~#I!R@+5E7(nv; zp=FGWAW1bzNw{F}vu9v-NMa4cy?gf=Sl}{121pVl0Rn60w=fvlM>8;id3XpE6JR<) zG|VKp0+8`*rKA{^yC=@KBWajU%LV`d N002ovPDHLkV1luP^=1G7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/SecurityBorg.png b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/SecurityBorg.png index f1a57d23e08b34d42fcad183aea2f09175d32a50..e8796c9afdbdac3259afd4be0aa682d4f843f33c 100644 GIT binary patch delta 535 zcmV+y0_gp|0m1~3BYy#LX+uL$X=7sm04R}lk-tmBKorNnZIw!`bkIS>Aww0B7K(z1 zlT@%vb!aPCbxE#CD(1QAzPe=SntyQa`0?F*Op z;d}4gQko&;c+4$q{L(rSK93ckaK5QZ>`IhonkQh#;9g) zZv6}hya3l`%U`BB&3=B= z3?Yd%2w{*3Ya}KAV*?-)m=H=KCV=?JCZH$?1{x0nYv#9rX%GQd0J0w$z)WET3F7l6 Z03O0QGe*)&4dMU*002ovPDHLkV1hz9=*<8C delta 143 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 bK5qg5&ucwf7flQD00000NkvXXu0mjfym{*| literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/meta.json index 323657bb0349..3780cba03941 100644 --- a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoPrisonGuard, nyanoMartialArtist, nyanoGladiator made by Floofers | ChiefJustice, Clerk by leonardo_dabepis (Discord), SecurityBorg recoloured from MedicalBorg by DangerRevolution(github), CargoAssistant recoloured from MedicalIntern by Radezolid, AdminAssistant made by noctyrnal (github), Surgeon by Janet Blackquill 2024", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoPrisonGuard, nyanoMartialArtist, nyanoGladiator made by Floofers | ChiefJustice, Clerk by leonardo_dabepis (Discord), SecurityBorg recoloured from MedicalBorg by DangerRevolution(github), CargoAssistant recoloured from MedicalIntern by Radezolid, AdminAssistant made by noctyrnal (github), Surgeon by Janet Blackquill 2024. Security cards modified by TJohnson.", "size": { "x": 8, "y": 8 @@ -51,6 +51,24 @@ }, { "name": "Surgeon" + }, + { + "name": "Detective" + }, + { + "name": "SecurityOfficer" + }, + { + "name": "Brigmedic" + }, + { + "name": "Warden" + }, + { + "name": "SecurityCadet" + }, + { + "name": "SeniorOfficer" } ] } diff --git a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/nyanoPrisonGuard.png b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/nyanoPrisonGuard.png index c4233ff7aa0fb7627357925a6bdc5eb31baac717..f2f12aaab7228de0892be5da0bf9f538631760be 100644 GIT binary patch delta 530 zcmV+t0`2{y0jdO$BYy#LX+uL$X=7sm04R}lk-tmBKorNnZIw!`bkIS>Aww0B7K(z1 zlT@%vb!aPCbxE#CD(1QAzPe=SntyQa`0?F*Op z;d}4gQko&;c+4$q{L(rSK93ckaK5QZ>`IhonkQh#;9g) zZv6}hya3l`%U`BB&3=aTcu(v9TXIC$WXfE&m(nGJjBJU?tL92R8VaO`1*)vnZ+IAdE)ezV+r0P9%3cA zKzu?R<8(pdTcIl+zX>jS{3V#@G7ErT%#@04th6yJaf5i0IBMt>*1V7SlCWy7WT}o) zj=@F-DI_65K?R%8;UG@cq@8v4B^thEl*z;BZJ`QIjv`9rjgeZRsVY^Cbd??*Rk8Q~ z`?R&0X>WQs3G}|Y?&mlV+z0A4*ZnmcLAUn)@cb*3zQKKx7BFylH95 z0dTboj67R1mm5-m(ywX2#|1Eu2L|tf{&jCx&2yYT0l97ZMR&mA5imjhk&Qp&ENA@% z_zfcf000SaNLh0L01m_e01m_fl`9S#0008vNklj3aPU=BRkDi1c1^8T2WCzIHN5(uH9mzpANK-RoTzRU2~ zUvXzy)bAel&6_tf-+7;z66jlF_>cezkN^pg011!)36Q{lNnojH*6nsXOj@JY>lI!< zX>Ifu)jyAg(kw(IA+%*Y5^Oftlct9llQbYtKQwn={xUn;=b|ZCyNG@!01+2~!Qitw z4R^y%@Z30pHnvu8ns*0pqK!%8=It%`g&?^4o2^gNH3P5u%h+X{?c9A}ueT&9&)fb} zYsD8JE0;Ug+Ro`qPGtGQRogE>Fc0xXt=8Y~->^&g)K3L)uz$x29*qXp-fBIG{93JM zPQQIHViA|%$M>(7CO^MN<80#(Ut0g`m)Sl<&zF8G0G#+_a%NM|KJr2wzCe(+?ngYY z)p}R1&u*e#SNn_TrviBN@R}Kq$L8eZhqZD7@JFMOk?Ss29_e=<_^@s)Z(Hlj4fL&V zPbzIgjYcD^*Xw3=^`bdE?3;~^mIWenkh~kmS{Nr|hQnc|4(4fFwtnWXz9cP*jt(AwO-x# z0k8HRTd+Rs^ZLkKUwaecQqde`iK98j0tk%DO@0lIuQ$H1euFvBG30;rZ z{v!4HxWv(?^|g<2Mf6hv==!|;3HYwhBZ)Yx_2nBO-};$9gJsv};}UoK%GS^P6)3wt z?, surgeon by Janet Blackquill 2024", + "copyright": "aPDA retexture by ZweiHawke @ zweihawke.net, added Hygiene Technician, modified interntech, added admin assistant and added the cargo assistant by Radezolid, added Psychiatrist, Therapist, and Social Worker versions by alterae , surgeon by Janet Blackquill 2024. Security PDAs modified by TJohnson.", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_DV/Objects/Devices/pda.rsi/pda-corpsman.png b/Resources/Textures/_DV/Objects/Devices/pda.rsi/pda-corpsman.png index 3e680736198b746b093ed45aaf00f269787e0f53..0018d78a4f5c186b71ea5519430c39b01015efa0 100644 GIT binary patch delta 1017 zcmV1VIr*EUkStBI_L^B#6#3dq2+1 zxy+n_(4=i-yqYLvvc4Oih-q{43tHV14Rq4N5YeRJIa4#^34i__?>AJbdfl&j{lD+e z(X?!O22|Ax4;zl_3y%s{)7w&WAfWj9_*Gv4UI91|T#cm=#1|ii` zOI5I5!A9E62=@wiW$e81a~^e*u$i5mk=h}%6OT9(#L&>mvx1FJztpT`_O~zk?VBbi z9z*^P1zd5YNPmmBPt?40HKkgjoATKdRPMj?^sK>wQulBSY9E5&r5ozD;IkM69|uA3 zc?i|_aF#9mbCT1@o9M-|*0l$bbvQXMYx*{vZb18;lXR2cQnk#GWx?|?G|xlp6*MlE zvie!)=oS)d@fgKqxd00009aDPZya{vGf5&!@T5&_cPe*6Fc z0!B$hK~z`??UzqWLO~F~r%)r!LZLr|D0vV;A^HLx`T!9fg}y+yK1Cm^P^(oT^!Z6Mg25%~ z?QdD|dS^*ym#4XTCc+E^Nlqp&0Aqh(I={eC~$ zMEb^N3=R+C!YYhYls+!$bQ+var&@N8$3tF)LVtm5B3%}m3-Hxx`umH4hK1n8Vqjc= zR4T>Bd-_2kdIIPST!2U=z8;ke&@+o;=offKjY~Fa^*Lgl4%M z#Wa8nf|FBYvIM{gLX(Z7SOzdGgrxvH2+pE4CMf{>#A>`GivH~|nl1&v&!`y)qvSXy z1%J^0Y-9nu$FUN!CI!INn}IM5fB{AcA*}%Wm5vHR3ZUPFSbaOB0Qy(T>Pkof@EI5- zL|*`-gb;4aaX*g@ceQurJnS|eNsn*sP=9u`4-1O{lG)|lyUs*dsl`b~UlvOp>=J|k zIH%oyr{s7pxGomS?eZ#1J=(e(&b3dJRB}_{HUkdF1jSH|9KjGElSxA;6s8qqDiw0i zr`lJYFZ81Y(9hiwsTQJ?hQ ntGQmw<<5EG=QfH?ML78zCW;&hk;Oyw00000NkvXXu0mjftC7y0 delta 481 zcmV<70UrL22>Jt%BYyw^b5ch_0Itp)=>Px$v`IukR9J=W*Re{&Kp4RBzam%;A_k-& zl-mk{LLS1!)vcS0o8aJ75O?Y7D>&B&=+YM`6g!kiQ6Y3FsSq&|L5DclI<&c5(j+eW zEtk7XF27vvjyw2|zaAS&m6j0E;<{F;DDR7oFILLD@f`r4y?+i)7%JbhrF(fx$|NHI z-MYO}R-Km(dL1kwA{9a@vxJCRQgS|>e&;QVFboNT007_j0gzG>1c5StYTMlQ`^sL} z)PCMP9LGTjfngW`n5GGU>$(_*q0H+d77#^I6!*{9MI?=%SiopBQa+Fsp^I2RqtQs5 z9a#`-0n$WTM1N_3q7bsOoSG&JgaQ#AMbB~{%H0E XIyLU$18qA700000NkvXXu0mjfpdQsc diff --git a/Resources/Textures/_DV/Objects/Devices/pda.rsi/pda-detective.png b/Resources/Textures/_DV/Objects/Devices/pda.rsi/pda-detective.png index 3ed8c9ad51eeb6598d15e1798c45b80be738954f..9416d5e1248f0b528a601e9c51021d903b62552e 100644 GIT binary patch delta 1021 zcmV1VIr*EUkStBI_L^B#6#3dq2+1 zxy+n_(4=i-yqYLvvc4Oih-q{43tHV14Rq4N5YeRJIa4#^34i__?>AJbdfl&j{lD+e z(X?!O22|Ax4;zl_3y%s{)7w&WAfWj9_*Gv4UI91|T#cm=#1|ii` zOI5I5!A9E62=@wiW$e81a~^e*u$i5mk=h}%6OT9(#L&>mvx1FJztpT`_O~zk?VBbi z9z*^P1zd5YNPmmBPt?40HKkgjoATKdRPMj?^sK>wQulBSY9E5&r5ozD;IkM69|uA3 zc?i|_aF#9mbCT1@o9M-|*0l$bbvQXMYx*{vZb18;lXR2cQnk#GWx?|?G|xlp6*MlE zvie!)=oS)d@fgKqxd00009aDPZya{vGf5&!@T5&_cPe*6Fc z0!m3lK~z`??U!Fm0znYKr~hFZ*gqmfNk{~x`UHK3=rO1d&|9CP@6l^L^%zAEL_JoN zh?S9^U0`XXh*@FI$X<8r?yY&}Q|-g;%QmF(R znntcWOMk1>=hMf4W9Byh;WgCDfilS$t7)2ao_-^O6L4}gg+gH{6!H-H`XY~Tc$WHs z>Me|oO_Izm6EB}kgwXgD$yZkwfVpH4QZfvR#~0x2?1U0Uqfw|-DpU ziems3gkVmK$rS)Q2+M2&#WjFVAzTFzK?oLYF)0DqC)N_BQ24jQ&Rq$BpHU|ec9Y|n z5`TdI*{Bkl$FUNsrUby%JArTvfC;(@p{xM=m39k43BYec+`b)30REM7yAnzOdVVBpp)T7PZ(Dx|U+;*y?J@b)=!NDQQVfN!?TYyw536V&YR*=$l zicP2QsjoIFPx$VM#^~^%qQ47;Liw6wsE*ImG>sK;W&2nuMccNtZGVeW3MnN*2!s&F=fgA8 zeNhxvpcU{vo6UwKNl4QafGo=ZsH%!IO^x@iXaRlS_qu;R6=9n{T0mKr#t+6KT+ssZ zJh!fnF^EY3pZFpc1I&d80{9>n2e=Ry0oV{1158EC3eX{f0lq^y72yPoS<^a1FktM) za*hZFWLXx32!94FjqsWSOCp?r^L0Hp!U@oAE^{Kh=D?DOpflkd2;<4;{)YZ(4V_$1 zZX7^%CC??ied_zV_Gtis7gzxj=ztpF@$_EZ!Ak0{wpd31;9=z=9`e40yX5!vwLa9F sM!1VIr*EUkStBI_L^B#6#3dq2+1 zxy+n_(4=i-yqYLvvc4Oih-q{43tHV14Rq4N5YeRJIa4#^34i__?>AJbdfl&j{lD+e z(X?!O22|Ax4;zl_3y%s{)7w&WAfWj9_*Gv4UI91|T#cm=#1|ii` zOI5I5!A9E62=@wiW$e81a~^e*u$i5mk=h}%6OT9(#L&>mvx1FJztpT`_O~zk?VBbi z9z*^P1zd5YNPmmBPt?40HKkgjoATKdRPMj?^sK>wQulBSY9E5&r5ozD;IkM69|uA3 zc?i|_aF#9mbCT1@o9M-|*0l$bbvQXMYx*{vZb18;lXR2cQnk#GWx?|?G|xlp6*MlE zvie!)=oS)d@fgKqxd00009aDPZya{vGf5&!@T5&_cPe*6Fc z0!2wgK~z`??U&t30znkVPtgZh1`0ulxFjKhL2u9_L_}9YFVIEMQ*_^J)RmV}H$l{G zQL>3y>Z*m2k+PH^<~cIk?l`k!?s`>ov2)IuIsf_X+0Oy^Z-2c46K(~FMx)(eFbK_N z6Lt-Qrhgu-r>UJ> zGk^+0u%;vA3xFGhV>N-}8^EX#z5<9K1SjnXDFN6k){&)f_@~2dx)K0iqh27~7RNCq z0Du3nQ3=||u@b7L1i-WR0^u0|1;z=XtN{CzjtfEw!2g8!eL0i>{3GReC6oYo4~!FH zD1dQ7NPo-me;ynD)jn5?aL{}wKeMw>{pHy)EJZZ3+2L@b%1qeHM99WmrezJ<3@HH4 zX}7;8RsR;v&|d2Wt$+U6_u{jydpZS-^D mAAoAL)7vlfDPx$-$_J4R9J=W*FQ@fK^%bL*AP_ZSaHEd z(Ln@Zu2{sAJIw``TMwJH zxKlaV**~|tS|q<_XPDWUXJ%)HS@<9SdUOR9Dj~e5^l)#lwtwE~&;$VU<40`&{tUqV zpX=s(f6G{|tL^7wSm(=91{ndUe3}Dbec^~7TXSt?51XqfAv_&ID^o&v%Tls*-5iNh z3fFaU90!0}tp1$EhlMY| z^E}V*n|F!`T7N&jfMT(zeIYI)EPMg^d_Hh@#6fffh!Rl|nE}#5BmzW1WDW>Jya^x( z@n(Qd5vc}*J&d{ z0e*)|nuthiAWKA|J7F3K?X~=}(Eysa+P3KKhW`F$dVgdDfa9rIMuG2>2W*^wX{$c| zYoDD~Td@Go4OA)soLLsbKp$`iTml890N7JQ)XOElO&3}DIYVx6jC#35Zg7kX*9~kx z5U^(3d>t47phrroK($rY1J8}u%Ox7OR~()~1VIr*EUkStBI_L^B#6#3dq2+1 zxy+n_(4=i-yqYLvvc4Oih-q{43tHV14Rq4N5YeRJIa4#^34i__?>AJbdfl&j{lD+e z(X?!O22|Ax4;zl_3y%s{)7w&WAfWj9_*Gv4UI91|T#cm=#1|ii` zOI5I5!A9E62=@wiW$e81a~^e*u$i5mk=h}%6OT9(#L&>mvx1FJztpT`_O~zk?VBbi z9z*^P1zd5YNPmmBPt?40HKkgjoATKdRPMj?^sK>wQulBSY9E5&r5ozD;IkM69|uA3 zc?i|_aF#9mbCT1@o9M-|*0l$bbvQXMYx*{vZb18;lXR2cQnk#GWx?|?G|xlp6*MlE zvie!)=oS)d@fgKqxd00009aDPZya{vGf5&!@T5&_cPe*6Fc z0uf0>K~z`??Uz4m0x=Z8UrW1)f)1`i9g4+IAcbx&1)+;e=i<=G-C4RgIQtdasX`a& z;?lj)LyEnM2o?_Nl>>1R>w7fT%O#idE;qG-0mhO+NXc*#E{*}P6bc2H&*$Jc4(YSmjASmCBb!WbHk;6BG(ZNh zPf-FigTVk2i3FrlDH@&0WJr$3W3tI~RcIl=YJXkI<+5jPSO`%p7F-Bm7zXouLQ)mE;q5~olKoAJm%~B}*+u=7{34q`JC=h;&qfZII|7=tNxBa*i zs(+#cz^jh}5g7mj#0jC?f$jf)96O-|;140XA(R08E2aB(C;{*ph!Y|ZK%5ZLlMg!; zTb2dg?gQL7HgdrI#TCh?$2+K0&Z+O$WV2a1S%*FqV}Q?33*JnV>hsGGu%ZoptRg7( zdFgk)L~vh(IE`(LM1G=XWplRaFl^Mmc+qtS@$yll7IWS2G4TYwW-c7&-} mPx$ph-kQR9J=W*S$}|KpcSKSHsk#a!p_} z%p@$XCa%nGEbg5caAxLzFdf)ob7EpMad9Id%%}+gk^+rH7V9FYw0Bqf!J@zAzS`cC z>)quJ{^PI5iKuVs3qYw!04 zhJk6C09cj$oxbfj$; z^*Xj~OYa8CV>v*vSOnm)R^uEv16IHbaM|qwU`(gn&qn857Ycz?b-o162mmx14V{tq zcAJOglB;|^klw9Ufc$op%GGSt>jmnbbKirjx|)3g=t$!$-1tMr00000NkvXXu0mjf Dvx?GW diff --git a/Resources/Textures/_DV/Objects/Devices/pda.rsi/pda-prisonguard.png b/Resources/Textures/_DV/Objects/Devices/pda.rsi/pda-prisonguard.png index 72793b7a5ec241b3c9317a875f1b8bd88abc0056..990d65f03dba4f524974f28f108006ed2ec3bf04 100644 GIT binary patch delta 999 zcmVAww0B7K(z1 zlT@%vb!aPCbxE#CD(1QAzPe=SntyQa`0?F*Op z;d}4gQko&;c+4$q{L(rSK93ckaK5QZ>`IhonkQh#;9g) zZv6}hya3l`%U`BB&3=j1Vf^I>7KoCSnp?{!TxBi3vm7wS# zouV#5)S*+m&s(n=kxW-9)Ab~XjQRTB%jEZh2{cuy3M%1<^Y32 z@M0Npxd5uF8sj$kTL@bK#=!+hCX>Qv1K0lsg2`tyxd66V97n$poTV1mzyKJ<3kX*L z{XkeQmt(jFkU?;AT3nt0I6+vlaSYD@28HkxfCs_3Xp2haNt0V^db~sI!0^n!V z4S$4FavYNaus<7FK=U|OLe``Jc=c`|TmxW$VM0hNVEjsl1tA4sHz8i%4k-ZpN_kxg zDF8kL!-VJyV3-iXZ8@F=u;H$@{8E7Z+6UR`?Ol>r=SMI%A0>Td?5-=rq_f?LR_N`d z*)g<*065rcH7Pls3!XF$U2uD!BZ)qvtzao{aHG{>CG4}wW V7R`rIq@n--002ovPDHLkV1kQo!#@B3 delta 461 zcmV;;0W$vl2j&BiBYyw^b5ch_0Itp)=>Px$ph-kQR9J=W*S}7}KpepFuf_nWsi6sR zF!bVL(u9NsqA%g#jyce%oU{Pj3cB`r-0*5~y~MS9=q`R=thcL9L+4z}-0`+t!p)}42SP#FPeUCVQ~ z4-Ozl9H|O-h2U;7S%NGJ-}mu64}kf64uB8>@5$S2d*AI&yG^g(m-ca}0{jfyw$U^V zUDp9H3r8Zz+f3WBQgUF!^nil z3@92AYYY^Lhy-lU>%0+>fUw0SPeiOSP$VMLo-hxDbXPoHEcf-DW^*%9DnYfnJU2}M z&aSF}8CvJ~WlC>VD-mEF7t<*KueMDcH~~I@G0?Ou07hDu&>#7O7+==;k0O2ED2 za8s)RP!<9ga96o9FkBT6Mlf_gf!*WtY^DVK`mfm+r+3-nr#O`e00000NkvXXu0mjf D1VIr*EUkStBI_L^B#6#3dq2+1 zxy+n_(4=i-yqYLvvc4Oih-q{43tHV14Rq4N5YeRJIa4#^34i__?>AJbdfl&j{lD+e z(X?!O22|Ax4;zl_3y%s{)7w&WAfWj9_*Gv4UI91|T#cm=#1|ii` zOI5I5!A9E62=@wiW$e81a~^e*u$i5mk=h}%6OT9(#L&>mvx1FJztpT`_O~zk?VBbi z9z*^P1zd5YNPmmBPt?40HKkgjoATKdRPMj?^sK>wQulBSY9E5&r5ozD;IkM69|uA3 zc?i|_aF#9mbCT1@o9M-|*0l$bbvQXMYx*{vZb18;lXR2cQnk#GWx?|?G|xlp6*MlE zvie!)=oS)d@fgKqxd00009aDPZya{vGf5&!@T5&_cPe*6Fc z0uo6?K~z`??U!Fm0znYKrzivU0)-$#lzfl_g}y}j%oZRj0-k#pwQ|-ge&g{(WZ|DB)0{pkXUV$~Q0%S6onW89Q7zUi` zI=NmPmVZh1TepB?vWBs`t_$bc5GBCLaV(e1!(h;d!gNZm`TRb~&2bab=^g5OU23%l zz+55-AsGghN(WG_-cf#4Rlzh(ssDy&l$9~Vv2ARdn| z%AQK4D5~9VlTD<{QgZ=j^TxZst3vQ{Szug%dVjrcjl1Ns5UvD_feTP97KP6S#xDcG z%;!?M04^_%!7l_S)L~i~0JDSv5eUE!gk!lJB`|;tf-|SX6bgVBgkv_25*om&5TOF_ zAUKP5n4|#KC)N=qQP{V`%Uue9pV1%?UX$aP6oCEN$P(Jeu@bT-1;Et@fd~wM38I9M zR)4_yl|}_21zhvFZfnk3O?Z|EC~ZBYy>?S5?E6QI%1 zpioe01&v;hVq2{jlH+-WlF98wzR~E5bUs#M4zDHzz>^FfPI|pA0dx`x$}=%PNdA_! nyU2~Yq8Q|Bm*^lm72((q(I*^v@$W}M00000NkvXXu0mjf6C%X@ delta 415 zcmV;Q0bu^x2e<=}BYyw^b5ch_0Itp)=>Px$a!Eu%R9J=W*THJSFc`q`|He=WbhO}6 za~mrNo_vr!hqs-4hP{mJK|Jjs-L-fS5rh?jp1OnRT$eOy)4IdYrGbm_lBT7IyMMCAGbwpquaBTOMkz&> zWdQ7UI{>7VWLah`PbU-Ri-mEFTh}*9k^~_HK@b2CMG*jLni2$ov1|)1AkXt$_s{Dh z%I1$2uv{*U4XPq+p#_Xaqtew;1yKv&60V5W08Jsh04|8u0XD={0A+})0qPrB`L!gwk^o$IIL@%M^O2g2}}9}bUc7=Gmo@vzx2zqlhf11>uNcuNunz&-E*tblPG zpPzeIibo-|X<1k=CQtpo%?LnxI3T;-AL;9M3z#n^zZiZs`vf*B(ZN>{@RtAp002ov JPDHLkV1lq5v-bc1 diff --git a/Resources/Textures/_DV/Objects/Devices/pda.rsi/pda-seniorofficer.png b/Resources/Textures/_DV/Objects/Devices/pda.rsi/pda-seniorofficer.png index b1fb4fe120ee83ae7faedbdd7e40a666c15758a9..72708a2f4a8c091000c0e2e399ffbd5a4bbb44ce 100644 GIT binary patch delta 1089 zcmV-H1it&r1JwwSBYy#IX+uL$X=7sm04R}lkvmHRK@^2Qqv9(PL<1VIr*EUkStBI_L^B#6#3dq2+1 zxy+n_(4=i-yqYLvvc4Oih-q{43tHV14Rq4N5YeRJIa4#^34i__?>AJbdfl&j{lD+e z(X?!O22|Ax4;zl_3y%s{)7w&WAfWj9_*Gv4UI91|T#cm=#1|ii` zOI5I5!A9E62=@wiW$e81a~^e*u$i5mk=h}%6OT9(#L&>mvx1FJztpT`_O~zk?VBbi z9z*^P1zd5YNPmmBPt?40HKkgjoATKdRPMj?^sK>wQulBSY9E5&r5ozD;IkM69|uA3 zc?i|_aF#9mbCT1@o9M-|*0l$bbvQXMYx*{vZb18;lXR2cQnk#GWx?|?G|xlp6*MlE zvie!)=oS)d@fgKqxd00009aDPZya{vGf5&!@T5&_cPe*6Fc z0*y&TK~z`??U&DL+dvS;C#u#dj+NMffGPe%eF!BE^bPt9p~t>SpP=v4W9g|-$Tbj* zF=?Q-Q?&%_PzBT2a^3ybmC?#O>v(l+=U}m;nV&v=yOLK#|KneGV8>=atyWtEK|oOy z(NXJ_R)2bX{fTgHQ=oS^9J1H(IRGw>bIoRpMx$G*x1MXI;@1@&9v*2q)8O**g23WL zumS)(J$*^%=bshV^E{eNCdv&Y#^bU4?NOuAP`Txp*2ZVA-_XYo?-j%Ja@^R&O6QCM7BUX1C-h@-kbkZv7ZDd%cLWv}Mgg5phxYvvoz$vp zecOrv11v6#0^05NjyL~JUaZ#PTJJU@zyOO2qW}~?S;XYil5dh_z9Z0~O2rz_& z!+#3!=QHvx%99JHk0uddfW-wXK+I#SbsR7&LQSP)alr~u4oKz6E0zP8@@WwX$5e-$ zMSy${Nc-@Yn@7ZQ3LG5}(t+%s4Rr3Uyw#!un7+`U+(ShtHWZUU*c7Fix0nA_ek-}YU>x5bZ&JIWch&&?jB64~P z!l%1*J?tw1c|?E#78mS(9b0MaimT6>^!?jcdKcYkjJH8qozs$r0eZ1DciNUurw{7l z_%8S|7-;xWy{?T>TPW<3>8KTE2G;L_Uaw2X$1l{rzZZsDYg8^%skFb!-QWLI<2vjS z3|p`QU>T+%3~!Wx!QP(6!6z5d%_@g+5JajreMA9gKhFIDYaEyE7EWJA00000NkvXX Hu0mjflEw$M delta 434 zcmV;j0ZsnZ2+ISIBYyw^b5ch_0Itp)=>Px$g-Jv~R9J=W*FQ_cKpe*LuOhSrA_PhY zDTj+R5OA?C!@<|#=G52FHzN+djJi0K6c;&)lu{@d2<;Syl7jXA zq9|0~+!tZ$KT5!4GSS}Pim*iqNRq@jI$RK5fGVkqI2fQQL@huS#K8eJ#8Chy#L)o0 zh(-Y_L~TITSAXe?umW7hvKA;`b}6nq3Y-2f~egIp+3TtT64lC5XNcwPzc_-UGL%mSBnKB zDgCD9WdVTKG^Gce1E0VQxQ^r9b<;ej9|X#+Db|I_T`Q+!GXfwt8$_%1WBasR0{Vr? cuP@EM0DQmO`8;mIeE1VIr*EUkStBI_L^B#6#3dq2+1 zxy+n_(4=i-yqYLvvc4Oih-q{43tHV14Rq4N5YeRJIa4#^34i__?>AJbdfl&j{lD+e z(X?!O22|Ax4;zl_3y%s{)7w&WAfWj9_*Gv4UI91|T#cm=#1|ii` zOI5I5!A9E62=@wiW$e81a~^e*u$i5mk=h}%6OT9(#L&>mvx1FJztpT`_O~zk?VBbi z9z*^P1zd5YNPmmBPt?40HKkgjoATKdRPMj?^sK>wQulBSY9E5&r5ozD;IkM69|uA3 zc?i|_aF#9mbCT1@o9M-|*0l$bbvQXMYx*{vZb18;lXR2cQnk#GWx?|?G|xlp6*MlE zvie!)=oS)d@fgKqxd00009aDPZya{vGf5&!@T5&_cPe*6Fc z0!2wgK~z`??U&C>0znkVU(pY+3=Dz@Q4$fsp#Px1z(aHt`Ukpo=ok?lI`pU1DLh48 zf~adzBBEBhX;5TjNC{DXpUmQ}Gdt$4r<%jgdvE4_=d*8r4$*)6>lGMsDnKw8{Pz3( zRIk@*&3`a>>i$xS`={b5VXU(ylS$J}r_*dB*Dws_IwNL=&A{Rag~Jhgd3mDP*B8%- zMCQ34{m9ew^bFhL5RFEK$$4EhyyMdR@}H5v`B1_HHOjpLzE zh+`^$c_l^1M~BKP46{lPhio=WKA+Dldms?ttbbCe#4(kxla>N}x0?O>La1K|nU(;P z0%S57G2Yex7NSeQ7LWoY5((wKf&AY<*w*WEr2t*CB!ONbB&n8A-vChY0>TwQFA$c~ zl{l^ebP$p?Eg??;oFFW#NgU4r`i1ZmKn5W>X-h~8AYQSSERAD-I-I6!0q`1i1L3qd z#(%T`_K%HDuyY)h&^0Xp&fX1#YXArg5<*)6@hKe?gciX56XNyd&;r;WDX%M`1;9Np zNQj;Q1_`13Eyw>n8vbe@EBCZpe`Wu0b)Eb3lLMNa3$rZ_Tbmogr0tzOwvj8e%)t&r z34l4x<|i+XeLPx$!bwCyR9J=W*Re{&Kp4RBzalD;NF(AP z=5!GP#Vi(m2XS!Ghj4T98GHd(H^<`SEV$M|g%WWxb&$4NFmUJ;hqOpb?vgZ#4*D%$ zjxV|VlH7$m_>aFH6S|^f7~$Y}Wp-A1-qKo>7gpbRds+bCv48UcK=2Bll*;=k3xk^< z3!yUtu(=!MjUA8sOJ}HdaOwkUgcfit1V=9~QQL8lQW69K0KHxh03ifH5GdP+u1meq zPy!|sAFm&t=V2HIrfC9TSr!1k?_-*#vYiyMfG`ZhxNkl#LN|V50nKJpc|lf0Qp5tP z)v9)OWI>DtNPiP)5v2i&LgWIZL6ivVR{-WmFU>E0a)Iy05(hOUD}U}L#NMOx2gC0%4h@_#Cp38z@6u@0?Y&Nz%$@F z(H>xP3mPrSe$D6XMo_a28ZAl9HaM43+rJiY;`{6^Mo%;&1RbE$ugw4t{m#P{Jaj&} lx{We?=ZkJv3;6Y|*%y-L>z~0!2KfL0002ovPDHLkV1gj#+XVms diff --git a/Resources/Textures/_DV/Objects/Devices/securityhandy.rsi/meta.json b/Resources/Textures/_DV/Objects/Devices/securityhandy.rsi/meta.json new file mode 100644 index 000000000000..396b52323382 --- /dev/null +++ b/Resources/Textures/_DV/Objects/Devices/securityhandy.rsi/meta.json @@ -0,0 +1,28 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "walkietalkie" + }, + { + "name": "walkietalkie-off" + }, + { + "name": "walkietalkie-on", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/_DV/Objects/Devices/securityhandy.rsi/walkietalkie-off.png b/Resources/Textures/_DV/Objects/Devices/securityhandy.rsi/walkietalkie-off.png new file mode 100644 index 0000000000000000000000000000000000000000..51da48dacd2876a6e3d768e3841c18a37fafa622 GIT binary patch literal 831 zcmV-F1Hk-=P)P(wt4Lq&sv6hvbf#OoHdC|%=H6QalE%TQ9e z|IgD*%uLt1_xqsh)v`V(pnD%GWy|_KwXDh+*k9l}*YM{hr@3#@%MES(7@RwBdDGCM z2XM6u!_Rueh*TxJOj{xW9~UsN27~wD*r;VyU+4S@!rSshcW`(Fld|8r`3D!(Xca;} zBwGLg010qNS#tmY3labT3lag+-G2N400DPNL_t(o31eUw1;Zf(WMpLilj{#Aay3#* z->3tIZU|74@Q~9F$sy3kz<`qCVGe=O$c7WcW+X-tOpT_dCW_@SaTtC5`gM}b1L%UQ15o^f z;(FU7*8c%37~mMhCpQg{6ap|GHiw%s{LnoH<1#c)GzGFB!TF>xNKP~$pYrnZV%PzS zf+tU&kZc}?L4*X_fYGov8}9002ov JPDHLkV1g2za5ew{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Devices/securityhandy.rsi/walkietalkie-on.png b/Resources/Textures/_DV/Objects/Devices/securityhandy.rsi/walkietalkie-on.png new file mode 100644 index 0000000000000000000000000000000000000000..0e0275506b83aa756455521bb08d007fbd800d68 GIT binary patch literal 699 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Y-ueVd6 z#IgF!z{rOI&MuA4uFXv%F3A#4l6bQ&TwiqE|HI>=^+K1VwwQ46271Rk|94#LnC&Pa z;^>lG9PfSNt*w^E!skWrem}N+UTOK7^V{_57Q)xYP)9V>Wn zQ1YTrt>zYqWp95}E^)rf-v8=qUHs{b;@z{QO1^NM&)O9zFi)H>N3`T<^&#gdEg@k$ z!7}M0hlkNi-LwBJvxt1Gf7H!l2ZPzw%Tse6We8_$Dr?)Q+RQsEvh`Qx72jWvcTSyf zMR4Zg87v*J4{WVjl+yFFOA8 zbU@I~|K~6JobkE7>-+Boudi;hQ(sUmua$cGm+jUyrzCI0Kd`#~;koMao%t6}^XC4M zm}6Z~dHKR3_JXb4htF3X=?GEX?GvrUC@*fXfvx%bgBvSSL*t+S;XHKvlS_F)1SU)94U7QJ0*}aI1_o{+5N5n|x9$&6@Uy3jV@L(#+glrXn;b+KE-X&q z6rSrC?Y?1C3DdRWzVp4(zOAtuf{|NqPFf872+!J&bH zk%@&v0LVBX&y}KCZFl|juY#zp-tB)YU!-;~iO8M6XMQ_5Zu;(3v4K6G4J1Q6e@+%V zdggNJirHLdnP(wt4Lq&sv6hvbf#OoHdC|%=H6QalE%TQ9e z|IgD*%uLt1_xqsh)v`V(pnD%GWy|_KwXDh+*k9l}*YM{hr@3#@%MES(7@RwBdDGCM z2XM6u!_Rueh*TxJOj{xW9~UsN27~wD*r;VyU+4S@!rSshcW`(Fld|8r`3D!(Xca;} zBwGLg010qNS#tmY3labT3lag+-G2N400DPNL_t(o31eUw1;Zf(WMpLilj{#Aay3#* z->3tIZU|74@Q~9F$sy3kz<`qCVGe=O$c7WcW+X-tOpT_dCW_@SaTtC5`gM}b1L%UQ15o^f z;(FU7*8c%37~mMhCpQg{6ap|GHiw%s{LnoH<1#c)GzGFB!TF>xNKP~$pYrnZV%PzS zf+tU&kZc}?L4*X_fYGov8}9002ov JPDHLkV1g2za5ew{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Misc/bedsheets.rsi/meta.json b/Resources/Textures/_DV/Objects/Misc/bedsheets.rsi/meta.json new file mode 100644 index 000000000000..f24ddb6eacfb --- /dev/null +++ b/Resources/Textures/_DV/Objects/Misc/bedsheets.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/0ec86b44b11f5e2f45137d9f6c851b8942a26aa3, sheetbrigmedic sprited by RudeyCoolLeet#3875. Modified by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "sheethos" + }, + { + "name": "sheetbrigmedic" + }, + { + "name": "sheetwarden" + }, + { + "name": "sheetdet" + } + ] +} diff --git a/Resources/Textures/_DV/Objects/Misc/bedsheets.rsi/sheetbrigmedic.png b/Resources/Textures/_DV/Objects/Misc/bedsheets.rsi/sheetbrigmedic.png new file mode 100644 index 0000000000000000000000000000000000000000..294b69a32dbfa62859074d735f48b558370cc0ed GIT binary patch literal 1139 zcmV-(1dRKMP)Aww0B7K(z1lT@%vb!aPCbxE#CD(1QAzPe=SntyQa`0?F*Op;d}4gQko&;c+4$q{L(rSK9 z3ckaK5QZ>`IhonkQg$(iuJQ9o)f5kL(W`r1$LKGpHUoTp#52s|4)Hv3ddsl{?-38N zl3XA@A&zl6An~ox6_4Kp7d`$G%yXFqz%P1A#Wq&jn3cFeJV6{a^a^X9N8BW=nk!k# zBeX_gBZCx@kf5M~P3UkCr)<*9I{Ok0-!jVNVf4391t&)lCGy5dtx#8$vPQZ}pN^`S z`~P{`+VqsyJ)8u3UtRZe3<&N6^_uJcp1N-R3<$gc*JjIKra8@ilU{3S(PJR816>78&YytXHa*cDaCiiaQ+;IP4@)O# zEhnx}SO5S332;bRa{vGf5&!@T5&_cPe*6Fc0;owuK~z`??N-fe6LAooh9oOVY!c9# zerO}KSTTyCo&>?0M9{xLpOxnfnNu3SX?L+D4)+WkJJwY2D{}o_OSqv?AjfmyLVv4EkGAd|y-h(P}C&1)tFIaafXzd3YUMY8~$`swIATaPGH z0NZ83e&i5|2#0#HSb&^%A(tt@IXHdhEWdk@;>j;wzRu?ZB9$J9U;%g%vnddAc^y*U ziz%?9nVf2w0yrR3u=wFE-I$u8mCRR~ICK={Mm?sWQmHW3?S&nXDL@mPZkYn$djiAU z8xgsPl_{uJt9&Nll6cq z+(1aD%dTm4%B^O}>+@5+u9CyyEizb!y}_De<(WLjJgZw&$X4u<8kiW_Qn4Q`~<+SVw9g`=Sctn002ovPDHLk FV1jVM85sZo literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Misc/bedsheets.rsi/sheetdet.png b/Resources/Textures/_DV/Objects/Misc/bedsheets.rsi/sheetdet.png new file mode 100644 index 0000000000000000000000000000000000000000..58b42fb0066379cbbe84222c928dcbbac05b413a GIT binary patch literal 1104 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 b#{qr=Ft1fnxgDH*00000NkvXXu0mjfSZ)eC literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Misc/bedsheets.rsi/sheetwarden.png b/Resources/Textures/_DV/Objects/Misc/bedsheets.rsi/sheetwarden.png new file mode 100644 index 0000000000000000000000000000000000000000..f2a131389f2861812fed3a811d1138d4cef791e0 GIT binary patch literal 1091 zcmV-J1ibr+P)Aww0B7K(z1lT@%vb!aPCbxE#CD(1QAzPe=SntyQa`0?F*Op;d}4gQko&;c+4$q{L(rSK9 z3ckaK5QZ>`IhonkQg$(iuJQ9o)f5kL(W`r1$LKGpHUoTp#52s|4)Hv3ddsl{?-38N zl3XA@A&zl6An~ox6_4Kp7d`$G%yXFqz%P1A#Wq&jn3cFeJV6{a^a^X9N8BW=nk!k# zBeX_gBZCx@kf5M~P3UkCr)<*9I{Ok0-!jVNVf4391t&)lCGy5dtx#8$vPQZ}pN^`S z`~P{`+VqsyJ)8u3UtRZe3<&N6^_uJcp1N-R3<$gc*JjIKra8@ilU{3S(PJR816>78&YytXHa*cDaCiiaQ+;IP4@)O# zEhnx}SO5S332;bRa{vGf5&!@T5&_cPe*6Fc0(eP8K~z`??N)1R(_j=nEomcdT^rEZ zZP88G@Ioty`pJG$zgT~TpRDxvwEZWgP!Ykhv4JqD!el}%tGC{=uGgexvFG3$-h@t) zR_K?!keobE&gJRJdzt{a%k6;M0k;Eg2iy)UxdWd6Q9qN(=zN}ZI&C{IIX-ywSXWim z$RUa%AZ8YCymVVPmyk>*jaa~ci_V)jcc>^Uj@ZhV%VqN8 z`N>3sKp;TA^PWfm2JhUC!`CmL$nwb;pGYKln*2_x6%#iPAOZNxkB`c5V{4l%Vq835 zDwPQH{AzTK{1!Qp04#pxYLxPzMa+sbUXmo@@p<$9ixkIL60k0Bnerh1_+bxb@z@C~ zZwht@NC577zU^!ZcwUxe+Nkk(+}N-VYt3{g0rO6Q_;;_&%xse+0qDziJ6e7*erZ#1 z^!bpcXf^5(jz};bYvA+w z39qb3Q2+JQ;PJ(T7+*q+A5Pn^X&NYsVyb~1vAewb`8fnbm!aACO~uh74u(P|9t$In zLYTj<>m~I!SQr2R002ov JPDHLkV1i^B`vCv| literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/default.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/default.png new file mode 100644 index 0000000000000000000000000000000000000000..95b3d54c270091387e888743faf2d53d147acbfd GIT binary patch literal 355 zcmV-p0i6DcP)Px$9Z5t%R9J=Wm9cGvFcgOWL>VNqSimg{q+x_BXhf<0) z@xnDt({wkl>w0q!5d|60T0SielL0c$O?EDNy6^ZxpI6?(hi zW7yW8_nOPHWEW2;%~+usE1X*Ctp|OABRonViUA=60Khr-JzvJnSOEae?HRz!sahymb5?>HQjdrpfuUY^A002ovPDHLkV1hb- Bj{X1u literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idbrigmedic.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idbrigmedic.png new file mode 100644 index 0000000000000000000000000000000000000000..82c9f703d4321a0a915e032fc4c3a030bc075c87 GIT binary patch literal 662 zcmV;H0%`q;P)1VIr*EUkStBI_L^B#6#3dq2+1xy+n_(4=i-yqYLvvc4Oih-q{43tHV1 z4Rq4N5YeRJIa4#^3H}}LH&m&5-LHE6zwgh{v}}3?RMiU)8;j|xw&`i|mF;Wi_k zTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$Rj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H z+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnhIymU3CTB4is*%Van zzw`90!GTiua13f6g5aea>bBss7z7^&LGXD9)%S3gE&Fql)5x3X#j@752a$C+IWKGa zHk@ui`<;_?liyOc%#dZl^D#8fL+ceZE|#+TS?A~$5^M5Am$0)7J+eQt^aXoYXhVZ; z{@?%r010qNS#tmY3labT3lag+-G2N4007QOL_t(o31eUw1*0J_8UmvsFw#SSk=Oue zV_^6XQoF&-jNvzj3Rv6uL(7QPkINnwToTCQAj>QNgY9QHu* zrrwE!)Pyx(V wkRxDhVrXJ4C&rvnHKQRg8UmvsF#JOR0HIhc%u%tg`Tzg`07*qoM6N<$g0w*+2><{9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/iddetective.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/iddetective.png new file mode 100644 index 0000000000000000000000000000000000000000..748deceac496c6704ed0a83a60e900b23b7047f2 GIT binary patch literal 684 zcmV;d0#p5oP)1VIr*EUkStBI_L^B#6#3dq2+1xy+n_(4=i-yqYLvvc4Oih-q{43tHV1 z4Rq4N5YeRJIa4#^3H}}LH&m&5-LHE6zwgh{v}}3?RMiU)8;j|xw&`i|mF;Wi_k zTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$Rj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H z+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnhIymU3CTB4is*%Van zzw`90!GTiua13f6g5aea>bBss7z7^&LGXD9)%S3gE&Fql)5x3X#j@752a$C+IWKGa zHk@ui`<;_?liyOc%#dZl^D#8fL+ceZE|#+TS?A~$5^M5Am$0)7J+eQt^aXoYXhVZ; z{@?%r010qNS#tmY3labT3lag+-G2N40087kL_t(o31eUw1*0J_8UmvsFw#SSk=Oue zV_^6XQoF&-jNvzj3Rv6uL(7QPPpmyy)qyNuBPj{S|Dhl_q58j}T@=_+STzwT$U>w# zu(IH1&lo&CeHgeU3>enTZ(%U9k0wPsR<%r6Md>I=QV6V-l495n3P5ETMd3=E76jEvwE|4#Nb!^>~?!S0}2Hl((%2bFn5m1JgS zX8(nRL`ib^yLYb{PMtbM(0qalV77uB0b>(G6Jt3s=8UQt4S~@R7!85p9|8agnmc^= S#Quo@00001VIr*EUkStBI_L^B#6#3dq2+1xy+n_(4=i-yqYLvvc4Oih-q{43tHV1 z4Rq4N5YeRJIa4#^3H}}LH&m&5-LHE6zwgh{v}}3?RMiU)8;j|xw&`i|mF;Wi_k zTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$Rj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H z+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnhIymU3CTB4is*%Van zzw`90!GTiua13f6g5aea>bBss7z7^&LGXD9)%S3gE&Fql)5x3X#j@752a$C+IWKGa zHk@ui`<;_?liyOc%#dZl^D#8fL+ceZE|#+TS?A~$5^M5Am$0)7J+eQt^aXoYXhVZ; z{@?%r010qNS#tmY3labT3lag+-G2N4007lVL_t(o31eUw1*0J_8UmvsFw#SSk=Ov> zROj7RfhRMf zU`%jmz&T_xScuUF3i2oWr!mN6EQ2ctIfO@jCY(<$gD3~U3`h1oOpH>RCITC4krN>}B|;M;H4-7w*$8IYfMi3$VKjtQ5ETVxW@i6|ghWa5=DT;V8BU!# zMbLbL3ShQ^906k!Lla{;G3Jb_84ZEa5Eu=C;U5A3f+$a#DL*H300000NkvXXu0mjf DgPR{! literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idintern-cadet.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idintern-cadet.png new file mode 100644 index 0000000000000000000000000000000000000000..9d5c34773cf449ed86b36b1e1b0a552f21e23ca7 GIT binary patch literal 652 zcmV;70(1R|P)1VIr*EUkStBI_L^B#6#3dq2+1xy+n_(4=i-yqYLvvc4Oih-q{43tHV1 z4Rq4N5YeRJIa4#^3H}}LH&m&5-LHE6zwgh{v}}3?RMiU)8;j|xw&`i|mF;Wi_k zTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$Rj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H z+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnhIymU3CTB4is*%Van zzw`90!GTiua13f6g5aea>bBss7z7^&LGXD9)%S3gE&Fql)5x3X#j@752a$C+IWKGa zHk@ui`<;_?liyOc%#dZl^D#8fL+ceZE|#+TS?A~$5^M5Am$0)7J+eQt^aXoYXhVZ; z{@?%r010qNS#tmY3labT3lag+-G2N4006{EL_t(o31eUw1*0J_8UmvsFw#SSk=Oue zV_^6XQoF&-jNvzj3Rv6uL(7QPPpmyy)qyNuBPsbG83ZR(|2MRY0y_$;CTa?T8~_3! zM|gO6{|8wP0@QE-3n>l_e)fzZm=p~}sAVET4P41uDJcd|PalSm#2UC5r3{iBK&fTe z^bfcLh|Wd>nhmi9-LMfODhkZZ%>D}riIU{$ckf;^oH})ip!oz9z-$FM0>&nWCdP7N m%o$ZP8UmvsFd72GKLh|P`atF939AtR00001VIr*EUkStBI_L^B#6#3dq2+1xy+n_(4=i-yqYLvvc4Oih-q{43tHV1 z4Rq4N5YeRJIa4#^3H}}LH&m&5-LHE6zwgh{v}}3?RMiU)8;j|xw&`i|mF;Wi_k zTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$Rj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H z+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnhIymU3CTB4is*%Van zzw`90!GTiua13f6g5aea>bBss7z7^&LGXD9)%S3gE&Fql)5x3X#j@752a$C+IWKGa zHk@ui`<;_?liyOc%#dZl^D#8fL+ceZE|#+TS?A~$5^M5Am$0)7J+eQt^aXoYXhVZ; z{@?%r010qNS#tmY3labT3lag+-G2N4007=eL_t(o31eUw1*0J_8UmvsFw#SSk=Oue zV_^6XQoF&-jNvzj3Rv6uL(7QPkINn=ToTCQAj{PxB^fIJ|7Q>q5@k4da4Cb5k|Kkl zT@=_+$ZAPt6XgJ8L$`0=g3P548x#T{utrkyzlVqS|KNmbFrOMBz(R@_f}cHO2qr}X z5o$?_g0)go44$4o3?Yd%L>Nt+5~4!@WI1vOP|FcSXCqo=L*l||IIAKm3e3#R{(}l2 zQoy@+uNh9AIz`ZYf(l@kf*b*36GIbYIWgvpsu>M|(GVC7f#Dwl0Q!_YGP34LZU6uP M07*qoM6N<$f?8c8f&c&j literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idseniorofficer.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idseniorofficer.png new file mode 100644 index 0000000000000000000000000000000000000000..0b665888cc80024395424bb4bd4c1e3cebde149f GIT binary patch literal 661 zcmV;G0&4w1VIr*EUkStBI_L^B#6#3dq2+1xy+n_(4=i-yqYLvvc4Oih-q{43tHV1 z4Rq4N5YeRJIa4#^3H}}LH&m&5-LHE6zwgh{v}}3?RMiU)8;j|xw&`i|mF;Wi_k zTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$Rj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H z+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnhIymU3CTB4is*%Van zzw`90!GTiua13f6g5aea>bBss7z7^&LGXD9)%S3gE&Fql)5x3X#j@752a$C+IWKGa zHk@ui`<;_?liyOc%#dZl^D#8fL+ceZE|#+TS?A~$5^M5Am$0)7J+eQt^aXoYXhVZ; z{@?%r010qNS#tmY4#WTe4#WYKD-Ig~007NNL_t(o31eUw1*0J_8UmvsFw#SSk=Oue zV_^6XQoF&-jNvzj3Rv6uL(7QPkINn=ToTCQAj>QN|7TE>lw=SR5@k?QQe-%Ha4CbK zT@=_+$ZAPt6XgJyp~26dfthROx4?ubrb%+ZS}7@p?c297ge2BbY%$CLk{kfi1VIr*EUkStBI_L^B#6#3dq2+1xy+n_(4=i-yqYLvvc4Oih-q{43tHV1 z4Rq4N5YeRJIa4#^3H}}LH&m&5-LHE6zwgh{v}}3?RMiU)8;j|xw&`i|mF;Wi_k zTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$Rj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H z+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnhIymU3CTB4is*%Van zzw`90!GTiua13f6g5aea>bBss7z7^&LGXD9)%S3gE&Fql)5x3X#j@752a$C+IWKGa zHk@ui`<;_?liyOc%#dZl^D#8fL+ceZE|#+TS?A~$5^M5Am$0)7J+eQt^aXoYXhVZ; z{@?%r010qNS#tmY3labT3lag+-G2N4005~;L_t(o31eUw1*0J_8UmvsFw#SSk=Oue zV_^6XQoF&-jNvzj3Rv6uL(7QPPpmyy)qyMrfi;qnU^+OV8cZA7MS&fKRTGhdOhl?1 zSY@yf0DBvWpnC|cm68I7L`Y%{)k0*zqhP=tKy)@5&}>Mx2p^0F5fueyW@i6|ghWYl z|GRgu8BU!#MbLbL3ShQ^906k!Lla{;G3Jb_84ZEa5Eu=C;U5A3si{Mw?44=}00000 LNkvXXu0mjfUEmBe literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/meta.json index d3a33736cbaa..bbac5740dffe 100644 --- a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoprisonguard, nyanogladiator, nyanomartialartist made by Floofers, idchiefjustice idclerk and idlawyer made by leonardo_dabepis (Discord), idprosecutor made by Timemaster99 (Discord), idcargoassistant made by Radezolid, idadminassistant by noctyrnal (github), idsurgeon by Janet Blackquill 2024", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoprisonguard, nyanogladiator, nyanomartialartist made by Floofers, idchiefjustice idclerk and idlawyer made by leonardo_dabepis (Discord), idprosecutor made by Timemaster99 (Discord), idcargoassistant made by Radezolid, idadminassistant by noctyrnal (github), idsurgeon by Janet Blackquill 2024. Security sprites modified by TJohnson.", "size": { "x": 32, "y": 32 @@ -48,6 +48,33 @@ }, { "name": "idsurgeon" + }, + { + "name": "idbrigmedic" + }, + { + "name": "iddetective" + }, + { + "name": "idheadofsecurity" + }, + { + "name": "idintern-cadet" + }, + { + "name": "idsecurityofficer" + }, + { + "name": "idseniorofficer" + }, + { + "name": "idwarden" + }, + { + "name": "default" + }, + { + "name": "silver" } ] } diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/nyanoprisonguard.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/nyanoprisonguard.png index 0539dd50da616bd3aaa00fcb53a792fcda4c9052..7efdc5205490d3cd1176f7f4abc399c885d9f6d0 100644 GIT binary patch delta 601 zcmV-f0;c`m3xfraBYy#LX+uL$X=7sm04R}lk-tmBKorNnZIw!`bkIS>Aww0B7K(z1 zlT@%vb!aPCbxE#CD(1QAzPe=SntyQa`0?F*Op z;d}4gQko&;c+4$q{L(rSK93ckaK5QZ>`IhonkQh#;9g) zZv6}hya3l`%U`BB&3=T925NP8AC9X6Ovd16Q+n}qDVItG!HEYtd)`i`FA85b*T$ zp+dkTj37E2PthtHBAhZ(SwuyFnVH#tPys{=c=zr#!>LoJ2%1k&0nAd6BVcS|XksiU n#+*?#qaiRF0;3@?{6hc$tUlNWA6gYf5JCMjm(Xgp*pQQR$#=g0 z{_m`<-a9pM+XTmPQMzD$BkX`YW1{k z-H#m>h{R_o)bqA9Xz(+ds$hxb3?k>?ux#+)Tv(K2m$E4`Sm_f~68 zZ_CkLe(`R!(7`|u(3GG~;D-tB7<``>!#X>bc+`iaTL!jx5Wl zsEedj)D&BvL8`1OlB~lk$THT7SSz97!-KfkZQ!bT&rlfb48E175tgKOyDhdgk;P3( z(RCnDB~=vwAtc=}B^@D5rbi4WO`O<^QjdiwV{RAG9IwX=5 zQO<1Y16?P_Mcc987w$R|^=UxEGy$xVW1|*JS<+(vLY@Dqbv)R%JqLt)U5aiD*Je zo3#bo)#qWW&g!N4qF!?H`zCX?v&fF_yZ`h41F;9CMf~gL$qFt@3B2MZ5UlR7BG&2g z;mY?=KMOE%vg|f^Ckrce`Qfp5-5wawwp$cP|0CQ3Si%}-J2hqM9+PA__ufW9DA|wRHJ4)rN^J%`QVtd z@AK2|=+%vHch1+%2Zi5{-*@zj!U6r_*S{W|2kMjG6ny{G%<0=de)eeAfh*-z^X)^M GPy7XUo!)2w diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/silver.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/silver.png new file mode 100644 index 0000000000000000000000000000000000000000..b13153a246ecc2a14dcec23df1f849cb0703072c GIT binary patch literal 462 zcmV;<0WtoGP)Px$h)G02R9J=Wm9c8VKp4mWDcya5lCuxs12_wUhzJ!rlrF)L;^0^)-TMd*K~b_u z2f>1f2!gZF)xm7_Vi!C41lPfy#CVr@!L9e3E_dJY|KIoBmjg5!&40&`EmW#Cc1fY} zXeiXWmWg}4_Qk}l`jd1`XaE2LN{_y$v-wF(saQx9Hwl5)Ys0F8iLxLy5EZ{AH^TWi z6DA=i2Z?f(B%Bs5o?{K zW?fd#06%$B4S{{BrnC7$oR0xuX}DM#Zu$(IQv!YwJ6-Q+{+v6I*oFb6C>0B_ZOBcA z@h0DRGJIJUL#0;I@57@k%Y9NR)bDFVaA%JWYwYpiUP&;H{`)}fHT(;{=yR;mXf!f@0WgiXOq!Q^WdHyG07*qoM6N<$ Ef_D4NUH||9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/Jetpacks/security.rsi/equipped-BACKPACK.png b/Resources/Textures/_DV/Objects/Tanks/Jetpacks/security.rsi/equipped-BACKPACK.png index b8961eaa7755496e3987dd129a8ae655694584df..d12845fcf1d9880eccf3b5384739dc1dfb82c20a 100644 GIT binary patch delta 1306 zcmV+#1?Bq32CNE@BYy#LX+uL$X=7sm04R}lk-tmBKorNnZ55@hbkIS>Awm_07K(xh zE>giR)uF9m)g`$mt&pVQk|M=baB(O&h%Wvb{10>$TonXC5ky>F{k2Gm@0vo3v@cxV zhwr`b6S=457DOMltL9J} zbsZyAP;CbI`iW}AWqq&nRWIh8op(e z$;0Sxp$blpB7aKcjgeZRt}11Xbd^3GRWbMf^R%_;DX)7t3G}|Y?&mnrw-3~7uKRoH zy7e<4@B&<$Eq|HjH2Y0@t))eefyfSUdDGIA1K?^G7=E^7E;pnAEx)D#9~Zzt9vHj_ zg6rO_n)^6^0&?5*M0dd95imjZk&QnlI%ph470a>!0Dk}pa7bBm000XT000XT0n*)m z`~Uz0VM#Ka4~}HnCbIaNFm^g`o7Ym!Rm~zbJg_?Y-Rt#Exgb87OitnR0(Kwl0dB6meGiOpFJW`51;*Dy*xX24A|%)DL#O=; z&`+mn3!u8vi05)So!r{K^@ndD8vkIgGb1~&y8ao8JM9yEVBhiD*(RdPws!~btq;=-0S}YagENnw3WBqqp=mhPv+_x#A7kb;soL3=Qp<2 zHvl(TtJO?==cC0WG_Kd{rb-;YWZe7?_V**#b63DP8o^rPkL7wPk+7^2M?beXOFvgC zl`P>^cIh|hX9Ki(@)gH~vtwBLJ%1IZfX)(hrBbnenABnxvNLjWa>R7R-7U52Psmh)#sKBpH(@*;Lq4Ae z!!Ycatyar5hV2+q$9XZ5$s`O014yM((0Tjb&S)GRDmf}^gH(5q#xL7}y4`N%|WTJbzfFYRX$cT(Dg(ix4d8;pZeG;~?YeT;uHf7GNH= zcxU1;`#M~e0#Kcu>h4&JUzUbki8pely~y}01rY1;REw7dId2$p#WMtWmH^KV1UfT7 zPk*xKZL=~y#FebfM+=)4+vX$y_q| z!t>imZjN`(oLpvxITs*=5JCtcq^oQ;%X|6W32SeBrpK@v?|f2Y_@s%>f{jQ20hZj7&liKDJ9Fcx7dUYnldCRonhgQ4~HmH-}s< zCp4#BnS{a>w;RhIHvnLx{ulev2o?^H&^o@p+n%2l+bh5jkH>|^`zba%+w&a41=!o$ z6B>6)!86tN`G25NF&!5%HY1)n6LG~v26Zp7Ioe9tzX1&n*X@p*oJ9-Et+eSdidFg#18_=}S>d=Zh{!VbqY>0gb+dqAp`XfzLib((qJg)00000NkvXXu0mjf&d7i2 diff --git a/Resources/Textures/_DV/Objects/Tanks/Jetpacks/security.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_DV/Objects/Tanks/Jetpacks/security.rsi/equipped-SUITSTORAGE.png index b8961eaa7755496e3987dd129a8ae655694584df..d12845fcf1d9880eccf3b5384739dc1dfb82c20a 100644 GIT binary patch delta 1306 zcmV+#1?Bq32CNE@BYy#LX+uL$X=7sm04R}lk-tmBKorNnZ55@hbkIS>Awm_07K(xh zE>giR)uF9m)g`$mt&pVQk|M=baB(O&h%Wvb{10>$TonXC5ky>F{k2Gm@0vo3v@cxV zhwr`b6S=457DOMltL9J} zbsZyAP;CbI`iW}AWqq&nRWIh8op(e z$;0Sxp$blpB7aKcjgeZRt}11Xbd^3GRWbMf^R%_;DX)7t3G}|Y?&mnrw-3~7uKRoH zy7e<4@B&<$Eq|HjH2Y0@t))eefyfSUdDGIA1K?^G7=E^7E;pnAEx)D#9~Zzt9vHj_ zg6rO_n)^6^0&?5*M0dd95imjZk&QnlI%ph470a>!0Dk}pa7bBm000XT000XT0n*)m z`~Uz0VM#Ka4~}HnCbIaNFm^g`o7Ym!Rm~zbJg_?Y-Rt#Exgb87OitnR0(Kwl0dB6meGiOpFJW`51;*Dy*xX24A|%)DL#O=; z&`+mn3!u8vi05)So!r{K^@ndD8vkIgGb1~&y8ao8JM9yEVBhiD*(RdPws!~btq;=-0S}YagENnw3WBqqp=mhPv+_x#A7kb;soL3=Qp<2 zHvl(TtJO?==cC0WG_Kd{rb-;YWZe7?_V**#b63DP8o^rPkL7wPk+7^2M?beXOFvgC zl`P>^cIh|hX9Ki(@)gH~vtwBLJ%1IZfX)(hrBbnenABnxvNLjWa>R7R-7U52Psmh)#sKBpH(@*;Lq4Ae z!!Ycatyar5hV2+q$9XZ5$s`O014yM((0Tjb&S)GRDmf}^gH(5q#xL7}y4`N%|WTJbzfFYRX$cT(Dg(ix4d8;pZeG;~?YeT;uHf7GNH= zcxU1;`#M~e0#Kcu>h4&JUzUbki8pely~y}01rY1;REw7dId2$p#WMtWmH^KV1UfT7 zPk*xKZL=~y#FebfM+=)4+vX$y_q| z!t>imZjN`(oLpvxITs*=5JCtcq^oQ;%X|6W32SeBrpK@v?|f2Y_@s%>f{jQ20hZj7&liKDJ9Fcx7dUYnldCRonhgQ4~HmH-}s< zCp4#BnS{a>w;RhIHvnLx{ulev2o?^H&^o@p+n%2l+bh5jkH>|^`zba%+w&a41=!o$ z6B>6)!86tN`G25NF&!5%HY1)n6LG~v26Zp7Ioe9tzX1&n*X@p*oJ9-Et+eSdidFg#18_=}S>d=Zh{!VbqY>0gb+dqAp`XfzLib((qJg)00000NkvXXu0mjf&d7i2 diff --git a/Resources/Textures/_DV/Objects/Tanks/Jetpacks/security.rsi/icon-on.png b/Resources/Textures/_DV/Objects/Tanks/Jetpacks/security.rsi/icon-on.png index 4a7f4ed64c8a7b946ec4bef0e765f9d89002a47b..db2f9d86e9326ec11107f4cd9f9300f0a7b6c933 100644 GIT binary patch delta 1056 zcmV+*1mF9<1hfc{BYy#LX+uL$X=7sm04R}lk-tmBKorNnZ55@hbkIS>Awm_07K(xh zE>giR)uF9m)g`$mt&pVQk|M=baB(O&h%Wvb{10>$TonXC5ky>F{k2Gm@0vo3v@cxV zhwr`b6S=457DOMltL9J} zbsZyAP;CbI`iW}AWqq&nRWIh8op(e z$;0Sxp$blpB7aKcjgeZRt}11Xbd^3GRWbMf^R%_;DX)7t3G}|Y?&mnrw-3~7uKRoH zy7e<4@B&<$Eq|HjH2Y0@t))eefyfSUdDGIA1K?^G7=E^7E;pnAEx)D#9~Zzt9vHj_ zg6rO_n)^6^0&?5*M0dd95imjZk&QnlI%ph470a>!0Dk}pa7bBm000XT000XT0n*)m z`~Uy~X-PyuRA>e5S3yf7F%*8Tg4I@$r65|xilAEyi@GffdZ{PR!g$d3>cL;+!K?0n z@MJ+fxD^BsYGoI8(JDd_v8~pFjK08wI?N<7N!v>TLuMxLecyXuGA|PV+pGds0jq#j zz$#!Buzw0jC@?;iauYL)uEg|V6 zPaliF{#=3j(<4kx41dU{`1c0@2T0ME`1jxaRr$39xGt3xLpS4Qf?rF3YPD)66Gapg z{8}{t<327NL#+FDW0Gtn#nH}SkN{U8|-JZe|~ljsdNfTcaJUI29Y0UKQWzva5${Q zul)%mlS#%c* zz7!k}Lny%Z&W==_ATqyR2Sdk~V&P$E{eK5UA`w>okqGbMy$H6lnc$b6T{@9rf_M^K z`1ze}fAlwo%dGzL0*6PZAaiW~tWeG3mlgm6&SkSMCQJt(EI?iX(5_rA0}8@hdT96A z)^2_lF9tz@V}*7chh2@;y3vMgP4$h~?cis55V1EY6r)iH@3^VwcJrIc!{S&4tQi9B aSKtloqJ+Gs(5X`Z00000@?kv2)+c6BYy$~Nkl9pV;X+%{VyHtqRD^<8=%CiYLE_*C z5aJ*$h+o3hkK&+C`W+N>vYnJhE4rzJi`DkDMawyerPWAc-o#3|XS#&<-skRx`v)i# z3WY+UP`F@oEiAV;lhUua|KJa~m9M9{ysuUP0P)dLY+YKmeSh7?{g$Bo1HX}PjK{Gt z9>;yPiuE*?0ALt~Gz>#J#Zd^-@2UU*V2q7@Yk!J6+jen&5R~6_0qoFq9jhmIm_NRP zuIrRkB>%x-&9i@qG60P+94+TQ+LS~@{}I7YD!|R{ZP)h%C0URBqyp6IbxLxtjr-Is(h9|v79n^VwJiTJu9oExJdN1WqHmM`5B@fVe7@@mYMQ1rO;dL6w4E{i o=I;`J{U85zApPoBC=~s}J1XyJI_kAgr~m)}07*qoM6N<$g3+f8i~s-t diff --git a/Resources/Textures/_DV/Objects/Tanks/Jetpacks/security.rsi/icon.png b/Resources/Textures/_DV/Objects/Tanks/Jetpacks/security.rsi/icon.png index 926a586a63af3d893cc96e40fe27a24393a01d72..cb67be1152a35dcb7c9c80518ba78f1a9253b96f 100644 GIT binary patch delta 909 zcmV;819JS|1EU9!B!6*fLqkw$V`BgSD3NuMze~eF6vw}96{W3o&_To@LKTM=ih>9( zQo%0Op{-!mCAlW8kfh;~BE?m3aVR*5F8&()4|Ek=6$C*ML|k3{wMdEYnnH`TFI?V- z@4fHi?j7Jy>&&ow5`bYkJd;XFtNAsl?;Spb5X2bfWM*4S*?+|xy2j5VRZ~2~MX&C4 z9V1jwZ3g)IiD#I_9pZW7^p;}@-Xk7jCAmO+LLB3CK;m1WD;~cIE_(bWnCCJJfM4{K zifyd4F)ML{c#=43=oQvHkGM%#HCM8fM`(@0Mg}P)AwfX}o6zAPPT8cHb@nA1zGalj z!{~3J3Qmq9N`K^yky@dyDrJpyl|CI+G57!Tw6*CeuX{KN^uD_8=Qz-}57cX}`+MrT z^)n#w0$iIdf0^bq`%QYSrA3c{$PRFM)6$d!;A$5bezs&TH>3b9zor2n7r;Os7`z99 z>)x!I`#66Ba@+JocfjEhFhTW^jXx$jXdFcq%d!9f0DlQ^NLh0L01FZT01FZU(%pXi z0005lNkl4~F-3?zv|U_q_+;G{*tQ0mlIg4#W~0a&mP? z=7pHWA%BmHM@IYMXk6}gnr!Ov2B20hX~vqx5w9i*ZBkF9;ph@us+9{sA~Kl_b0n9` zxr}hcrS44&5WGPUJOLKp>o%d+X+UCeZiuh=QUxuXo?93^F~neT5(bL{E%vqqyjLm~(~ZJy34ds{TBD2>S8UY)=E^_F&~CRarX9dd zor1^wp)4+Z!}QE9i~Rb$g4ef6I6f(XD2jl!P$(AR>@*HqxV7}9ZXVr@fkps4-&)5j zG8<$LEGIkQ^ZB6i(fHqEh$8o;7_6sKO1+lG+!~;pPLCDs=QSe^u7LSSgvZa_H{#$5 zIDfymFjXf;DvUU6-2;BVpH)95$1(gCq19&k@93q&1o#qeZ?3T8N4Fu`-0Sz@_U;MH zJliDHv;Yh^%4TIuNDmJdpjrUp>h(IHAS3G$H&#Ot6o}O=NfP^%m9E4P_D_3CtR_V< jN+IffXYM$l<-iXfwZS`gxhMnx0000x4YE(Rch*$I7tW?jH3INIJY4&d|$6l|zHpYfA-+!A;vNxOLxl&;_D;0oY z7|JjV<;DvX0Kk};`BArxyK5)jNCG%P*L60}pIAM+L)Ud*8WTYRXhLwhzWiPL)Cd&d z;qkHOJon!LYPDLBb|By%0JykR*tYGv-_snJm&pF@Mm<(-W+H+Q|0?D<9(koPV~kS}m@La(r@+T&NR^#Rl@qzi0=3f(>(y zrNu?x{jLGJhm8|7AzV#<({K%tPNiH8f@rt~I6OM?ys-Re1eyc!c$}M3sZ;Y-A6mor zI37m`WvOQMi>HTQ+>t*xFF vY?`JrO;dIM^lr|dpl#fL-ybAI2ru{o`dza9re@qx00000NkvXXu0mjfAa2*~ diff --git a/Resources/Textures/_DV/Objects/Tanks/Jetpacks/security.rsi/inhand-left.png b/Resources/Textures/_DV/Objects/Tanks/Jetpacks/security.rsi/inhand-left.png index 97d9e6f8891e818ce948fd6e3783c9c9ef8a0bd4..5d6cad59bb269c6beff11f8f94f6a00e8150daa4 100644 GIT binary patch delta 1068 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 delta 539 zcmV+$0_6R>2($!{B!Bx!L_t(|ob8&;O2a@9$Hxy;Eb2k1U=#!)NN+t9JV|_x2v%RD zZ=!+?K7m*1tzr+o)lw*hNj=AI&!1x>5c=2;EG>%s<0!He`kX00000 z00000001D$U2fX?l|p_R85 ztywCw==DsA<5b38+1PQ$gRc)dOeTnDz;n4q6SXDYVwmfz}%|c7y!aPxMThWYjmNeCd8etHUEy z_Y4HZpBJG7sO}kX#o;1{G~ba*WBje1Yw*%kh{G{Cwls&4YlA9#24uz-nzE{U2K?&( zmSstaCG-qX-80}<|CcofA};}zJp(dhqd!38BGo+uLG^zb2)_ua>=~F=|Nm7~*WXd^ d2a+M8ZxpP{R5-0#3d;Zh002ovPDHLkV1k^D09OD2 diff --git a/Resources/Textures/_DV/Objects/Tanks/Jetpacks/security.rsi/meta.json b/Resources/Textures/_DV/Objects/Tanks/Jetpacks/security.rsi/meta.json index 937ca0f7f359..df10b7c1b8a6 100644 --- a/Resources/Textures/_DV/Objects/Tanks/Jetpacks/security.rsi/meta.json +++ b/Resources/Textures/_DV/Objects/Tanks/Jetpacks/security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/1592a112e3d33eec4a0704b518a138d5a976f455, modified by Radezolid for SUITSTORAGE", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/1592a112e3d33eec4a0704b518a138d5a976f455, modified by Radezolid for SUITSTORAGE. Further modified by TJohnson.", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_DV/Objects/Tanks/Jetpacks/security.rsi/on-equipped-BACKPACK.png b/Resources/Textures/_DV/Objects/Tanks/Jetpacks/security.rsi/on-equipped-BACKPACK.png index 0ae456cf0ddbc4c0b144d87b47206d5d4fc9fb49..617db794b09351230d158b1bfdd6a80f2e10b9fa 100644 GIT binary patch literal 1827 zcmZuxc{CIX7oSPbpd@S4WGGCQUZX4-KF0Fw<5`mT5Lt#W`0T{22=Pqz8I2UL@v=sU z3}(po6s5#8$h##};KVhYqrIeE< z0YBdhpQvo`pMZ6oY{;j-EmRxuh>p=hT!V`sLYa6)AI1HaverJnUmw_K^J!MUwCeiI zWbwQC^Y5W^F1(Q@tQ;x8#I(rKvF?ju4IhfUdbl6F7MDV-4hx)>@_f7n_hRKK6_zACMF=Zh(mO!%+bqtB ztZzMgDkl9(Ap*0kIBA;q(81I2=jLL&Q1T;NaczwgmX_a@jlDhY%%R^%_ymJ6gNujz zmZK`AoUf}nE|3enEAQz9ljBQ}P>-|Q-!@twtY|l45t5rs#``72Si8*2@OwMhcZ@Cl z;~)09dMfU8&LH~kA(`j3zWv2 zsi*BAi2GuvHm#F--pZb_+$tcOpELlXj(3J9PpL6YuT*bj2?XyE5&kfZWpG6h9(Yb9Z0H znAZKn&1$D)wyiRJUv=0{2HcKWT)m;MkF{q>XK`9Cj|wIQlQI0b4^ws$%Km_ZB;Xl< zcn<&!5c}6aN=@Z(I3rCOqc*&TPp|702XwvLd$rbA%(s7`h!u5f&D>W5UAoIXXJnLI z3k@?;$b=O4odd5{X<7cN9^hvIR?^zy)q$H4&$2o3axuk1=Cqm;6E8|D{9u zsq~rd@!ydK1`BD^lqg5x6wy=>Izc6OwLJECju$k5S&Xib+0a+M&Np=};k`1Q{Am_p z3oa}Dp&~jtcmTaE`suFt*pjfD#}XoH)rz{8v1yEoJvLYaPJ0-bkno^+8zbdFls-#yRbp^)xk0eetZnok8cNKc#jKX+OH9b)yR;nkXaRULULaLR)y7kl2pyHM zk55b=@1ZL*RdCTbWqCya??61CfDLt-6(cVVpzE7y`H)#pO(Nthd5|0luSP^>hG8#a zaFN`b3c9s%ZCMcXknUrBLxLN@6ZCH<{w>Y_dUS7NcMV91yQ^bt$PAyJtiASYkA}R4 zSD)lKvd4rU6Che|?pA*Cl4-jV$uJ791y=u!=pTbRQh z7F+3+7L?;nnD{T$%ErQBh_2b$%Ee8|Ojfi&q1~R8XkKz89SH^SoF+&aVcfR-sTC2yB_0DYg#9 zVsO-yzp%}NmUzC`zLdn{FZIRRGO7mKNA+o{Pdbuw#e*b99-2bl9BMaC_*nB%CMn4c i`kznjuT#!xUY-MO4+i#)HjS?WcEiEO+4`Q9f7+k2_-aW2 delta 1125 zcmV-r1e*J!4*3X>BYy-yNklWsMqUn+@@ZyD?13f^8w&Na#{Sg7sZ3*vH*ZwE++sWpE1OCF@b!>kj@UsY`nR- zDeCn)DwWFE-x-D>(&;qz_V%Rayeawlj3JDf8Qc%f006eTf8p73601i|jE+C9j_=}4v1-rYu%02`5A^+oz4e?p~1V6aab@0bU7FW#`Hs#3tLd~``*E!g@7)_4Q+WmCRlcJIaHAjZ$1E@NZ7)DIxd`C0 z2Y<`qR}X7wSO8Ci3C=Uny|X{Zr(HCw|u7@?bx(#d@h$0 zKeRglfO3C;%3z@6An49_gOaZ0Tr_ zsY|bl?tG_|oP=*{mtO@X3osuF4SV$fT)SuBrsT^|vH;;o1m7fM*qynf)-T6dBL_|bHh##};KVhYqrIeE< z0YBdhpQvo`pMZ6oY{;j-EmRxuh>p=hT!V`sLYa6)AI1HaverJnUmw_K^J!MUwCeiI zWbwQC^Y5W^F1(Q@tQ;x8#I(rKvF?ju4IhfUdbl6F7MDV-4hx)>@_f7n_hRKK6_zACMF=Zh(mO!%+bqtB ztZzMgDkl9(Ap*0kIBA;q(81I2=jLL&Q1T;NaczwgmX_a@jlDhY%%R^%_ymJ6gNujz zmZK`AoUf}nE|3enEAQz9ljBQ}P>-|Q-!@twtY|l45t5rs#``72Si8*2@OwMhcZ@Cl z;~)09dMfU8&LH~kA(`j3zWv2 zsi*BAi2GuvHm#F--pZb_+$tcOpELlXj(3J9PpL6YuT*bj2?XyE5&kfZWpG6h9(Yb9Z0H znAZKn&1$D)wyiRJUv=0{2HcKWT)m;MkF{q>XK`9Cj|wIQlQI0b4^ws$%Km_ZB;Xl< zcn<&!5c}6aN=@Z(I3rCOqc*&TPp|702XwvLd$rbA%(s7`h!u5f&D>W5UAoIXXJnLI z3k@?;$b=O4odd5{X<7cN9^hvIR?^zy)q$H4&$2o3axuk1=Cqm;6E8|D{9u zsq~rd@!ydK1`BD^lqg5x6wy=>Izc6OwLJECju$k5S&Xib+0a+M&Np=};k`1Q{Am_p z3oa}Dp&~jtcmTaE`suFt*pjfD#}XoH)rz{8v1yEoJvLYaPJ0-bkno^+8zbdFls-#yRbp^)xk0eetZnok8cNKc#jKX+OH9b)yR;nkXaRULULaLR)y7kl2pyHM zk55b=@1ZL*RdCTbWqCya??61CfDLt-6(cVVpzE7y`H)#pO(Nthd5|0luSP^>hG8#a zaFN`b3c9s%ZCMcXknUrBLxLN@6ZCH<{w>Y_dUS7NcMV91yQ^bt$PAyJtiASYkA}R4 zSD)lKvd4rU6Che|?pA*Cl4-jV$uJ791y=u!=pTbRQh z7F+3+7L?;nnD{T$%ErQBh_2b$%Ee8|Ojfi&q1~R8XkKz89SH^SoF+&aVcfR-sTC2yB_0DYg#9 zVsO-yzp%}NmUzC`zLdn{FZIRRGO7mKNA+o{Pdbuw#e*b99-2bl9BMaC_*nB%CMn4c i`kznjuT#!xUY-MO4+i#)HjS?WcEiEO+4`Q9f7+k2_-aW2 delta 1125 zcmV-r1e*J!4*3X>BYy-yNklWsMqUn+@@ZyD?13f^8w&Na#{Sg7sZ3*vH*ZwE++sWpE1OCF@b!>kj@UsY`nR- zDeCn)DwWFE-x-D>(&;qz_V%Rayeawlj3JDf8Qc%f006eTf8p73601i|jE+C9j_=}4v1-rYu%02`5A^+oz4e?p~1V6aab@0bU7FW#`Hs#3tLd~``*E!g@7)_4Q+WmCRlcJIaHAjZ$1E@NZ7)DIxd`C0 z2Y<`qR}X7wSO8Ci3C=Uny|X{Zr(HCw|u7@?bx(#d@h$0 zKeRglfO3C;%3z@6An49_gOaZ0Tr_ zsY|bl?tG_|oP=*{mtO@X3osuF4SV$fT)SuBrsT^|vH;;o1m7fM*qynf)-T6dBL_|bHAww0B7K(z1lT@%vb!aPCbxE#CD(1QAzPe=SntyQa`0?F*Op;d}4gQko&;c+4$q{L(rSK9 z3ckaK5QZ>`IhonkQg$(iuJQ9o)f5kL(W`r1$LKGpHUoTp#52s|4)Hv3ddsl{?-38N zl3XA@A&zl6An~ox6_4Kp7d`$G%yXFqz%P1A#Wq&jn3cFeJV6{a^a^X9N8BW=nk!k# zBeX_gBZCx@kf5M~P3UkCr)<*9I{Ok0-!jVNVf4391t&)lCGy5dtx#8$vPQZ}pN^`S z`~P{`+VqsyJ)8u3UtRZe3<&N6^_uJcp1N-R3<$gc*JjIKra8@ilU{3S(PJR816>78&YytXHa*cDaCiiaQ+;IP4@)O# zEhnx}SO5S332;bRa{vGi!~g&e!~vBn4jTXf0`o~kK~z`?t(HA&R6!JmCt_g&2}rcs ze-H#a3sJ<6jg9z$5K$Y8fC>s$fAsx`GJ)hV4X~EewK?Kw`J% zIq+V_xidR=HXgWlX3m_Ccg~!dIU}wCwOXxy1F@P&uh$!?F#|?TAm^;p>6nR`^OxN3 zUp?#Z+|_b#UOl&dyWO@n^$S7O0H7EHF?aipJACMX`~2mr+0OMB?%l0n2%RIay(YEE zKoAhD47z${)-5hA8-N!tUmK5KtPe0`0Za=KshD%-q7h(102EqyvzM>a80{DxRoB`- z8ynSl`RSvoudNyi0Q*hI{gq-I-rINY-Q$N3%+a+QH{IDYCoMug$cq=w8IQau2GH$x z`@VA-gGZPl`j9_XZV0sWrlzK%(T*}P3IM`4F)_~2Y2`M^`~aaytgf!v2}uEnCL#6- zo02fxZ>>1Qp@_goM|m;mXeI%~j4Qm%`OX*%lrIB6N854&yC)~z_}G~H_~BDdw3u~`Hl1_B;5jC1rF9mBQt_3GMX#YDnSN;#iCeyrLi zuIDWi57M5!`}*99N2X8oPo18zKCSx9`D6OX!bdmuv=;%BAsKzL_^bi}&j+SCc>50? zHMyL#Y!3KIMpy~Acw9Do5Ip7-dfouZ4FZt`KxIQsu<~=o?1U#l#+3(*c>~aiRYj6l zn+1R%D^X!WLdI4Gk2$F1a7L@^SQc#@G$C>M^i0Q@VNB0~R{I zH1wvp`6~i|l5RGYYciy#J5~KkE^Lbd$bf)oT}7bD8+euQsO9RL6T07*qoM6N<$f(pwT&;S4c literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Decoration/banner.rsi/meta.json b/Resources/Textures/_DV/Structures/Decoration/banner.rsi/meta.json new file mode 100644 index 000000000000..9d855a16b529 --- /dev/null +++ b/Resources/Textures/_DV/Structures/Decoration/banner.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/commit/fa9e44d937026d5a2ba72615afccf2f18a87c485, modified by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "banner_security" + } + ] +} diff --git a/Resources/Textures/_DV/Structures/Doors/Airlocks/Glass/security.rsi/assembly.png b/Resources/Textures/_DV/Structures/Doors/Airlocks/Glass/security.rsi/assembly.png index 306d3295c5be6a795cad6bbb1339d59a8f719cee..31a8a5e367c3176f6743660ec93d71140e9edabc 100644 GIT binary patch delta 985 zcmV;~119{%1pNn)BYy#IX+uL$X=7sm04R}lk-bYoQ5eR5YEhZdP(y@+fklHt7(`XCI+t_bAI~|@ z%Q?>hXSARdt+p{Jmda)<680@57kwSCbm7HKh@q5b8ME=31b_dIuX`M--UU^!|M&el zx-(fz14pOugl3p!;VI$hTG>#%E!?l=QyJkS;eaUz6uwq^y3Q|(b9MeuY$jsU;8Z<* zxfV{hu$DKA!lT0eVxgin&ZBPP$(H8hQU_&vv4{~NjE^)GRwz&=D77S+{p}m8`Q}&^ zk0yVEbxd*O$bXABAZkUrW~J()XXPufu5$mKr=^dF>fJqIXn(ft_hIPRh3bxNe;?a+ z^#oi`a9L{lS0$&(PtkXpn*R`bH{txMsipVeVhaWyjg*Lhyy^D&34gjYCVuFgA zYIu0~z{dUf`JQ3Gqkt|Uzzy^*DSlbid08v9phdeaNpTx7Wc4}rnq z09YA-98C0LgVO*g|I@=lSd9qE889~30e@axgqM7@atO>qWXnNzfgOOHDrw~aV6xZAeiMGIRZgEewqKy63d$k|TQt)IA3P^7zJe{-eB100000NkvXX Hu0mjf&=$+c delta 557 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 diff --git a/Resources/Textures/_DV/Structures/Doors/Airlocks/Glass/security.rsi/meta.json b/Resources/Textures/_DV/Structures/Doors/Airlocks/Glass/security.rsi/meta.json index 602c9b73e4fb..8f39b0c69afb 100644 --- a/Resources/Textures/_DV/Structures/Doors/Airlocks/Glass/security.rsi/meta.json +++ b/Resources/Textures/_DV/Structures/Doors/Airlocks/Glass/security.rsi/meta.json @@ -1,195 +1,195 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "assembly" - }, - { - "name": "bolted_unlit" - }, - { - "name": "closed" - }, - { - "name": "closed_unlit" - }, - { - "name": "closing", - "delays": [ - [ - 0.1, - 0.1, - 0.07, - 0.07, - 0.07, - 0.2 - ] - ] - }, - { - "name": "closing_unlit", - "delays": [ - [ - 0.1, - 0.1, - 0.07, - 0.07, - 0.07, - 0.2 - ] - ] - }, - { - "name": "deny_unlit", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "open", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "opening", - "delays": [ - [ - 0.1, - 0.1, - 0.07, - 0.07, - 0.07, - 0.2 - ] - ] - }, - { - "name": "opening_unlit", - "delays": [ - [ - 0.1, - 0.1, - 0.07, - 0.07, - 0.07, - 0.2 - ] - ] - }, - { - "name": "panel_closing", - "delays": [ - [ - 0.1, - 0.1, - 0.07, - 0.07, - 0.07, - 0.2 - ] - ] - }, - { - "name": "panel_open", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "panel_opening", - "delays": [ - [ - 0.1, - 0.1, - 0.07, - 0.07, - 0.07, - 0.2 - ] - ] - }, - { - "name": "sparks", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "sparks_broken", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "sparks_damaged", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 1.7 - ] - ] - }, - { - "name": "sparks_open", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "welded" - }, - { - "name": "emergency_unlit", - "delays": [ - [ - 0.4, - 0.4 - ] - ] - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "assembly" + }, + { + "name": "bolted_unlit" + }, + { + "name": "closed" + }, + { + "name": "closed_unlit" + }, + { + "name": "closing", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "closing_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "deny_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "open", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "opening", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "opening_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "panel_closing", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "panel_opening", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "sparks", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "sparks_broken", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "sparks_damaged", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 1.7 + ] + ] + }, + { + "name": "sparks_open", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "welded" + }, + { + "name": "emergency_unlit", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + } + ] } diff --git a/Resources/Textures/_DV/Structures/Doors/Airlocks/Glass/security.rsi/open.png b/Resources/Textures/_DV/Structures/Doors/Airlocks/Glass/security.rsi/open.png index 5481dac9d84f352c241e6f342584475881037bd7..4ed843700ef61962a30121df932141af175e6833 100644 GIT binary patch delta 773 zcmV+g1N!`s1FQy+BYy#IX+uL$X=7sm04R}lk-bYoQ5eR5YEhZdP(y@+fklHt7(`XCI+t_bAI~|@ z%Q?>hXSARdt+p{Jmda)<680@57kwSCbm7HKh@q5b8ME=31b_dIuX`M--UU^!|M&el zx-(fz14pOugl3p!;VI$hTG>#%E!?l=QyJkS;eaUz6uwq^y3Q|(b9MeuY$jsU;8Z<* zxfV{hu$DKA!lT0eVxgin&ZBPP$(H8hQU_&vv4{~NjE^)GRwz&=D77S+{p}m8`Q}&^ zk0yVEbxd*O$bXABAZkUrW~J()XXPufu5$mKr=^dF>fJqIXn(ft_hIPRh3bxNe;?a+ z^#oi`a9L{lS0$&(PtkXpn*R`bH{txMsipVeVhaWyjg*Ec;NWIi?7AUk2^v49vFni?=Z!`CmL7;fFV0q4_#@$T(Q1~oMehBt5D zGk_fcvUH#T6UbtI726J4`x=)A!46O})MGaFO6|armo5ayTAB9wh8k_VY@V(W_<0uOH7tf0tLGBtyv;MVy|f0dLJ$uxp8 zZQ$B4dh-mp@ArQC#IW}3SDLj2GP$|`r?G!!*j}2*z@Tr;fRYG7mQSa(h){rl}2S1%3TWS%l)zy;)F@d*O+&IKxXbGX@@L8NdK+5y3+M zk6xNe(bWOintpV30JfkUb--u{42}?hH4d<)Qd)?C?1R|}E(sq#e8?aKETx`2c|r^O zP|SSx>>0z4pMT+EgChz+-E&$4PzZy1!yp<2V0HokHV0^c?;d^(00000NkvXXu0mjf DTC8RT delta 374 zcmV-+0g3*s29N`gBYyx1a7bBm000ie000ie0hKEb8vpoc9J@;^E3Yr^jY|5>rrN1Cr!#^OxCW|s^iHHQ@1SN=zG(oPx zJ9SW}o+o(U^mxnnz4tiyoiCZvt>#aY(0qtN%8z$G1d&?Xuz#Gj1aPj-0UZD;MvIbZ zigE+6)u^!mXV$$+tQkasP>O}qdvV0Hr%@u0f_ z4$~8`_kEVrGoWWc)#^f}s#a%pSLp}5K0I}_R+_ zw)V4WZg0x{0B<+s&W-m1+>nDk5#1M{YDPu50jR!3dAV%x{IS57Y;Vfb^chZqVWZz{ z-GCS11&j=EhJ#6whzEO43E=QE07`5k@>;vy_1U=o1QNio-}C>bsKh7&$YBPZe?T!} U6vMwZ^8f$<07*qoM6N<$f&%2Ms{jB1 diff --git a/Resources/Textures/_DV/Structures/Doors/Airlocks/Glass/security.rsi/opening.png b/Resources/Textures/_DV/Structures/Doors/Airlocks/Glass/security.rsi/opening.png index ed9d1e76dddc75fbca3e85f71f76969ddb07b3c7..88a71d7a1e39184ba58c77d59f4239b623d95d92 100644 GIT binary patch delta 2487 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 diff --git a/Resources/Textures/_DV/Structures/Doors/Airlocks/Standard/security.rsi/closed.png b/Resources/Textures/_DV/Structures/Doors/Airlocks/Standard/security.rsi/closed.png index 3c26a0c2b5b2d39b44ed76f0d5bc341f46a7efcd..bfff2ab3545c87ccba5801800d4bf863dbe5e351 100644 GIT binary patch delta 1171 zcmV;E1Z?}U1-1#0BYy#IX+uL$X=7sm04R}lk-bYoQ5eR5YEhZdP(y@+fklHt7(`XCI+t_bAI~|@ z%Q?>hXSARdt+p{Jmda)<680@57kwSCbm7HKh@q5b8ME=31b_dIuX`M--UU^!|M&el zx-(fz14pOugl3p!;VI$hTG>#%E!?l=QyJkS;eaUz6uwq^y3Q|(b9MeuY$jsU;8Z<* zxfV{hu$DKA!lT0eVxgin&ZBPP$(H8hQU_&vv4{~NjE^)GRwz&=D77S+{p}m8`Q}&^ zk0yVEbxd*O$bXABAZkUrW~J()XXPufu5$mKr=^dF>fJqIXn(ft_hIPRh3bxNe;?a+ z^#oi`a9L{lS0$&(PtkXpn*R`bH{txMsipVeVhaWyjg*{K~z`?wO2uFQ$Y}( zHU?W;6f0O8#3E=A0=BhMPyPZCy!7DFgMvT6i+b`0c=zH_JQh5NhzLRt?NJD5VwHfT zdXPe>wnc)zZ=|( z1eA%x1)82de@avH^Fh$i#LwLp)oLH8T)yDnF&xOj$eBO5+#+7)QtoY0g<^*tf=p%nNWC zSh}?0u;kwTo;Vl5A1(tH$n2@pgs0JHbc#?qmIlTBe@{~Md^|X>>KIuA7?A$V8j$8$ zok?5pNOxKtL<7)(!^+yJmKnztA*x;%%IdpkP6ykdAD&~7tZ(?@FU@5D6>mj&V{>x= zdu^ptuzF%jeCwEF2U-uk1HRBQ20Ecu4ms0$|025#pwNz=IoreOc0nrxJtazPt~l{n zYn(1$f4xp?FJ60`nIAh+)$?q#^Z5(W!N>lyz-uK;Z1uNS@6!9K{h3Of^7+ofYW2jS zL9Pgm@zkMf8Jxp09u7nUyDdOfm+NzWZlh4}yk?#hi?sFlK2^FCZ(1#SxVT6!@7?k&PDHLkV1kb0H6;K5 delta 666 zcmV;L0%iTS39$u`BYyx1a7bBm000ie000ie0hKEb8vpEMHCRF5((>A^+eZE3LT&-T2>_tiAHfYnG#!Vxx;(x95I$qrURsF-Bm*M@0V;z0c`Rzc4MS~k z({VD-l~RfKea3jdX50L^X4`rJ6Y_LI5kVAb1B^a0N~wVEPyJS)_z&~UMEgOx&|_Q_Bpx;i;{`(8B^AQRzOjR zq?8B?h^xL*DoH<*ZNn^9C5WPA3n+3K5mguU>H_?OWS^;Xr0F;rF69ccvF$aJia>w0DmlhIl{KLLa%^s_RpVP!Pk$6 z%5MN*RGJdLWO^)|FaeEl9!h8K4tpj=N%j$_T-e+ZCsbCS# z5*Cn{3xAz?5TUYOs@~07*qoM6N<$f>YKz A)Bpeg diff --git a/Resources/Textures/_DV/Structures/Doors/Airlocks/Standard/security.rsi/closing.png b/Resources/Textures/_DV/Structures/Doors/Airlocks/Standard/security.rsi/closing.png index d70f5b53dd64727a7120df97115ebc8e7292747a..20466b3f45f9260ae203bb2a62cd3dfe9a76fe1f 100644 GIT binary patch delta 2473 zcmV;a30C%+4#5+UBYy#IX+uL$X=7sm04R}lk-bYoQ5eR5YEhZdP(y@+fklHt7(`XCI+t_bAI~|@ z%Q?>hXSARdt+p{Jmda)<680@57kwSCbm7HKh@q5b8ME=31b_dIuX`M--UU^!|M&el zx-(fz14pOugl3p!;VI$hTG>#%E!?l=QyJkS;eaUz6uwq^y3Q|(b9MeuY$jsU;8Z<* zxfV{hu$DKA!lT0eVxgin&ZBPP$(H8hQU_&vv4{~NjE^)GRwz&=D77S+{p}m8`Q}&^ zk0yVEbxd*O$bXABAZkUrW~J()XXPufu5$mKr=^dF>fJqIXn(ft_hIPRh3bxNe;?a+ z^#oi`a9L{lS0$&(PtkXpn*R`bH{txMsipVeVhaWyjg*SloJ@b9f=K03io!Q-)*+?>wZ{FFRd7tN9HytI$IMiGy%Cd(V&0JsZyEqMf0vh+6+5d;a(!_iz8am2%N7OQ zl=Ihs83F(7cyfT;-v}7u!}xwUtl?_|HD`KO>yLLThOucvic41z^XMXssSKILj=#vBR^)Dxv-bTRWpcil@oU`?T ztMhPRf1kd5xukIZ)TvUACD@o;ckJ1_Z@3bU1@wQ_lcLf?>tbvKOdWi|l-s?srC3^8 z3f0j#-|qcS7tg==O0l^3p((39FeL}#p1<&IF?I0pU<7{sAAB_?1{WI>`uB|Xz#y9j zKo5B1%-Q0~-1u}18FB>nz`i&TUv16B#k_=Hf9kRFY4m#Fkdw>oQ-=-Q1oo@n`*Us8 z_ua}$@zLsPva^7*lamkMJaMA9cZ)>xDqonIDwYQG-W!7#K39Up zXf^=o+_TOn+?F4=qcW?e+^*oh~}t&U=o*c)|YS&BSSD~JoE0`KVwA1 z`hw*B7%?$11*Z(X8?pho4#9~OLaItP%11xMM3OS_O#|S-AZH*R4`i55&B4aWfp24~ zjleezfE5`|XHuR45E%O{_wKLlx8OSP5mIt+;Tq7v5Am5s9D_?8Cb8DVBZxbLe)5$K*lGW5x;X%D2dKB9{f^7eM zRi-j#3p~-+>$ZGrc~q-6?qhoA~7;$o7$EMfr&^ zXLyWZY4-{(oq~&vsgMP;i&kWulz=OXgOZ1M|HU{^?ph@e-zuigy|2jKJt`#FC|&kO+4aj%zK)@t*nng%z88poy1an z%DmSFn=`F)1gM8H6}y~PdCwPP8&-`Xpq9gqqbs!K5`qaltZ8%vV&-M{SmbNMqbW8% zRW4V;0P9lOC?7Md7cMz?)Q$kH)F!_2KA(8i3z@o$(f_D$^*k-ZfBgC#LlaDv=l214 z(c*i7GPK}3gr=kT|RP zYH{(c*Nb=Hhkx~Zf1{ed_%58+zWKyl{&DM?pT3>1j!RQa;*k?(HM3WT-wXh^DUWyY zy+feA#Gb!?-FzQW*#Ow9XzDBPbIaDAU-byGD<0`OE~zj>dGKQse)OT`LhP+<096#? zEAOia>T6Q*ETge<$%U!-l)`x*TE(ReCV;s2W1oo8_D~*8?Nw~7k+2T%zJy6?GfqMv8UgGTHsRdqoIFeeq#S;D-tl>B%XY=0XT;!Q zr=9u|Zo`8*Z9KhB zY`%occR<(5hGILYK`y!KM63%J7Y=yob*715bso@^e}`gJ$;2Kz4{$A#kg;tD)yIWU zX#P4rZFCSHdfSvIpEhMVD$EGrij)fNxQVYkhL-LBZ|k$uK77sZ;?f3FbwX~!0r`2F z*A|<*52gX=9}mS0F?{8@<*YvOs$cg>e0fn$^HYxAJBGFaJJ>iOjv+WSh17?FDZTX8Lkot|a}Vv&x6(t%vB&gM(*6aZU`P+X`O=1# z9MnJq)+Gr|gw#qULH$r1TY};qc4zeNXm;mgXJ(g5&qdO%c7J}4=3VW_%(D}(U%7g6 z^x_DoUOok?`@j4=0Z+Q}#+xVf^U;eV0PyZX zcDpt#ZEZbkV{?8UH!8Cj@ZsG9<5s)f6h4(3FCuewd4{js=^!dVy>)C2aG_D+Cs>u) zr~s_OoAdL*jDJwkJuHNW#p&c8pSFj)^g@}9UN3sX3Q)9|xpu!_D4!~nm&qWMu~Jov zf57Fpo&x~dKgdpo;rLXcyp*B<2Y2VBoe+{w71B#73Q%O{7tJq40Y*(Ll?s1fiUN!e zK?P`aX$I&N!)-k2C6>_+7mMM8$?rSLavxB%d~~|5N`Fy+|MN+BdF?4SKD>m#?)-+e zv(d5t#{ME-&kJz<+9mw)s0jdQRiAn@L`~u5p8y7X;Pq=4ym}bwjC~~dRMboLmUAmy zlM!st`95V#ozJZLCR$kKNBzBm;k<9ie}q( zIxmffql;G1`+%aR9*f{+G5Na6?D!v0w8jM}SbyUJ6s(ag08b_aW-=~&EyZA5Xo;P_ zb#8&b_jST%%#}(d!5_&2&>1Np%vBO)4$X+IF3ot4BT}s{#qqpO^0RLboXgZnS?#vS5QIq;IjWGclWX#L`OJ~$PM2Mh+pK6w8< z0DnNOR!c1R!Q9x`;LC1*w}%NDPY)eQXAy83Pxl>37vtgLGP=%3Bwb|i0%XZFD{o>T zYrTmVU1nN4d41Tj$@2kOGRw+mW#XxJ;*+47ulAzLWU99g`SStW|8%fYsVKL}@?pwu z^m^Dm{YseU15(?MJHQ9urcGBqOxj62AAgV~o2ImhWpK6I#p3j| zw3B@J;3r{v2$D6LC$^oMiKmj>2juah#YA-dPCGlT^G$r%vXv*{B2*SHA$(;11E{V> zBeq(xaaATht!)+qxA9`a{Pf+!=zq=rfXBA6^iWpb*18dMx##EY1e-nI#~iQjp08qO7QiI8ubYXdVtdQmKpr2a zY@Q2}0rUPfWtn)@bYxyHDt{(B(W>SHY)g3fg9q3xAcEAdd_JIU#hs$TGRs*Vn<}9T3!D7`Zd?ZWc9d(uau4h4DZ- z2w}X)GNID>$gW$GG@X@~S$3q$e5QQJE_dSPh7UqmFS1PD`7E5P66-b{Pe=9i^sw(o uM@Q1{2^&wRT(5Y#iWePbHJ%Ot{{uO!Ya5Gb>0tl>002ovP6b4+LSTZ>7K{7< diff --git a/Resources/Textures/_DV/Structures/Doors/Airlocks/Standard/security.rsi/meta.json b/Resources/Textures/_DV/Structures/Doors/Airlocks/Standard/security.rsi/meta.json index 602c9b73e4fb..8f39b0c69afb 100644 --- a/Resources/Textures/_DV/Structures/Doors/Airlocks/Standard/security.rsi/meta.json +++ b/Resources/Textures/_DV/Structures/Doors/Airlocks/Standard/security.rsi/meta.json @@ -1,195 +1,195 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "assembly" - }, - { - "name": "bolted_unlit" - }, - { - "name": "closed" - }, - { - "name": "closed_unlit" - }, - { - "name": "closing", - "delays": [ - [ - 0.1, - 0.1, - 0.07, - 0.07, - 0.07, - 0.2 - ] - ] - }, - { - "name": "closing_unlit", - "delays": [ - [ - 0.1, - 0.1, - 0.07, - 0.07, - 0.07, - 0.2 - ] - ] - }, - { - "name": "deny_unlit", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "open", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "opening", - "delays": [ - [ - 0.1, - 0.1, - 0.07, - 0.07, - 0.07, - 0.2 - ] - ] - }, - { - "name": "opening_unlit", - "delays": [ - [ - 0.1, - 0.1, - 0.07, - 0.07, - 0.07, - 0.2 - ] - ] - }, - { - "name": "panel_closing", - "delays": [ - [ - 0.1, - 0.1, - 0.07, - 0.07, - 0.07, - 0.2 - ] - ] - }, - { - "name": "panel_open", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "panel_opening", - "delays": [ - [ - 0.1, - 0.1, - 0.07, - 0.07, - 0.07, - 0.2 - ] - ] - }, - { - "name": "sparks", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "sparks_broken", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "sparks_damaged", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 1.7 - ] - ] - }, - { - "name": "sparks_open", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "welded" - }, - { - "name": "emergency_unlit", - "delays": [ - [ - 0.4, - 0.4 - ] - ] - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "assembly" + }, + { + "name": "bolted_unlit" + }, + { + "name": "closed" + }, + { + "name": "closed_unlit" + }, + { + "name": "closing", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "closing_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "deny_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "open", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "opening", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "opening_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "panel_closing", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "panel_opening", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "sparks", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "sparks_broken", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "sparks_damaged", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 1.7 + ] + ] + }, + { + "name": "sparks_open", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "welded" + }, + { + "name": "emergency_unlit", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + } + ] } diff --git a/Resources/Textures/_DV/Structures/Doors/Airlocks/Standard/security.rsi/open.png b/Resources/Textures/_DV/Structures/Doors/Airlocks/Standard/security.rsi/open.png index a3d7c60f33e4d6afeda6686333df4295a29bddc7..150de5306399a8857e12032e6ab87e923636b584 100644 GIT binary patch delta 798 zcmV+(1L6Gr0>lQ8BYy#IX+uL$X=7sm04R}lk-bYoQ5eR5YEhZdP(y@+fklHt7(`XCI+t_bAI~|@ z%Q?>hXSARdt+p{Jmda)<680@57kwSCbm7HKh@q5b8ME=31b_dIuX`M--UU^!|M&el zx-(fz14pOugl3p!;VI$hTG>#%E!?l=QyJkS;eaUz6uwq^y3Q|(b9MeuY$jsU;8Z<* zxfV{hu$DKA!lT0eVxgin&ZBPP$(H8hQU_&vv4{~NjE^)GRwz&=D77S+{p}m8`Q}&^ zk0yVEbxd*O$bXABAZkUrW~J()XXPufu5$mKr=^dF>fJqIXn(ft_hIPRh3bxNe;?a+ z^#oi`a9L{lS0$&(PtkXpn*R`bH{txMsipVeVhaWyjg*Ec;NWIi?7AUk2^v49vFni?=Z!`CmL7;fFV0q4_#@$T(Q1~oMehBt5D zGk_fcvUH#T6Ubtak7?~|Tpk2FKuSsqmpskI!49CgEqE*dJK#5m3LYi2l^Pr&KwCfJ zH+^t~K(T)KLPkXo9^gKIGN?&Pg1roPf51Rk4sroF3Z`jlL)rshzd|E| z`qXAYL53&7;tVf=37!X91~33yMDP%xzLmt8NLL47Yx>dE0ocN1)B&R*FgQX0);PeH zN@*bmvJYk_xFme|@F9Z`u#|f8%=L!t}u!>T|K$;NSVRvf< z^VIAF&3791@_jqI1OFt}>KoqZZA5x0O_cWCO#(&K*EhXzZGQormluH#0J`oNTS`@K z0Jeucwz64HMaB>4x?`onc_aaBDV4wV+yI@J025#Wv;|a(DZK$9+5@a`aoniU?>GRs z_CTq$Tph5wSA(+`e+Q!SxJd$2@}~XB(dE0cS>R+>cnAACTwk@n19Zr%rIqOb9dZbM z!rLY|GOx-FfLznb^Kdcb{%M(45j+%s;26dlFl+StUprs|Ou&x;;cyTam1644X#pHQ zFF>vki@Z0P_`U$`pTGi`bv^%WTDbx(0Ffc;`~->eWX=?m=KKHv002ovPDHLkV1f-W Bp637n diff --git a/Resources/Textures/_DV/Structures/Doors/Airlocks/Standard/security.rsi/opening.png b/Resources/Textures/_DV/Structures/Doors/Airlocks/Standard/security.rsi/opening.png index 3491921b8e027fb32fa0c52f139021a16d396a4e..33cffec94008b2dbaf833fccf3acc2bd9e1d5628 100644 GIT binary patch delta 2602 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 M07*qoM6N<$g45I)xBvhE delta 1829 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Machines/VendingMachines/sec.rsi/broken.png b/Resources/Textures/_DV/Structures/Machines/VendingMachines/sec.rsi/broken.png new file mode 100644 index 0000000000000000000000000000000000000000..b77f892157f49cbb45c1e1546a119331b301d71a GIT binary patch literal 1312 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 IM6N<$g8rAS=>Px# literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Machines/VendingMachines/sec.rsi/off.png b/Resources/Textures/_DV/Structures/Machines/VendingMachines/sec.rsi/off.png new file mode 100644 index 0000000000000000000000000000000000000000..d03dbe9def40633b0c3bfa1a8665279a6d87844e GIT binary patch literal 1025 zcmV+c1pfPpP)1VIr*EUkStBI_L^B#6#3dq2+1xy+n_(4=i-yqYLvvc4Oih-q{43tHV1 z4Rq4N5YeRJIa4#^3H}}LH&m&5-LHE6zwgh{v}}3?RMiU)8;j|xw&`i|mF;Wi_k zTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$Rj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H z+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnhIymU3CTB4is*%Van zzw`90!GTiua13f6g5aea>bBss7z7^&LGXD9)%S3gE&Fql)5x3X#j@752a$C+IWKGa zHk@ui`<;_?liyOc%#dZl^D#8fL+ceZE|#+TS?A~$5^M5Am$0)7J+eQt^aXoYXhVZ; z{@?%r010qNS#tmY4#WTe4#WYKD-Ig~00KElL_t(o3GG(NN&`U zM)VT!qIlDTM}N_acu)}W5bz=)B8X^kArOY(7MHligIY6Ir>c7gwv( zHPzEoB}g+2kJBR&|)1ni22$H`Ofp+(ANO0GA`v zj6Zb-7*|Q4u3qdX_N2L5q6&e30Ts`HR)kOr-NBH!xz31=&TgwRDDHi{W7RS?+{gGu zb>WoId5EE>O%w2xdl2x0hCRibySvsH{;k!75L$g#(>>!EGbK6TymG=c0pOiX9?MB8 zNE!w=oyQn&?;l{i6ww6azIXrf_UbsdC%Wut2jgvgLmR_*+Q7F#6VTGq_BCX>`FpbC zq7ch83$b8RM2lT`mO=LMfmqJ;H3y@n*Uw~=q5z_ZP+ylj$Zvn-E z;TXLE(T2S$$hQEmMTl=eTzF_CBJgpb4SL@K=;UG;E+AMG8*ryqHUaP$Ow+!Kofbx$ zs{neZqcik);ZU23`^k496eN5Z(ZZzujsj=^>I`^(XPcQ;XIB`{X_*=*)>44}{*!0L@00000NkvXXu0mjfj3?w1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Machines/VendingMachines/sec.rsi/panel.png b/Resources/Textures/_DV/Structures/Machines/VendingMachines/sec.rsi/panel.png new file mode 100644 index 0000000000000000000000000000000000000000..a797b42b18b66d3a3a9428d17e354f5e3de7ccf4 GIT binary patch literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D7eJa z#WAE}&f6;+IS(5MuwKX)x>Us{x@t=!o5xdGo|TIZm9lvV3$VO7RbA1x`ihj1XMvLQ zD-D6@gnyyoGJlTC-jSQx&A`N=kWkI={;!DBjOwK#bBd3yYLJMNWuJ3y_mZEkegcP& zZ)$9P!gweDy!oRpzgb@yqq1%En6i0~z32X6|KP&+6|P(!PQQd2B<@KWpY4!o;8!Xw ktM2ar8QZ|XRJT_A1VIr*EUkStBI_L^B#6#3dq2+1xy+n_(4=i-yqYLvvc4Oih-q{43tHV1 z4Rq4N5YeRJIa4#^3H}}LH&m&5-LHE6zwgh{v}}3?RMiU)8;j|xw&`i|mF;Wi_k zTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$Rj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H z+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnhIymU3CTB4is*%Van zzw`90!GTiua13f6g5aea>bBss7z7^&LGXD9)%S3gE&Fql)5x3X#j@752a$C+IWKGa zHk@ui`<;_?liyOc%#dZl^D#8fL+ceZE|#+TS?A~$5^M5Am$0)7J+eQt^aXoYXhVZ; z{@?%r010qNS#tmY4#EHc4#EKyC`y0;00T!!L_t(o3B^}UPg6k@y@;p@;Krs_Xkw%& zu~twM?ZW6rcYfg7js66GigD*kS+lCj!o&quH|3**7_rt`BnmZJLzFY^X=YyE z^u6jc-h_8Q=FYw6o;L%J4snraH2TXWtU_1T*Nvt0(X)pCrI<5(-C12-?a+PLJDmag zCr_P`pVc4AU09fxL}EnQ7v{4}QM!~k-S9I{#+1!mE_ChMEpyo^x`ws_(6dlb2cfUQ zX5-|=8&WC0a4xs>eE~oPf^b$tb2R=_+0pLCTb-T8mcMC^LcRg;72Mw15+?`)QJYT7 zR}kqtC~M`S>+mKxOl5;}#SPZyWpbD=Q5f z#>-dBhL4-0=fkenZ+v3NW#xm-@5GntH}(`hL@9+rFKYjXctx3HE-XDt=1KdcNeiS&X6HiivhLjZw*5rA|upcX9;D+A2OfK z!RB1Y8qWf9Ax;LE>!v*!z$Q$FCb3vd)xear5ho~u43q($czsedLSr66pu(%d57q)_ zK#jfqAP6)9-8}tZfad^ffil46pq+wdcm-$-CiE)_V1Y8ggGJggAtwhQumYdw0I|Rs z;Ne0u2teqQ!$%G!PzF#K4M00ygZ?ToIR)U52gcfA!1EfSs4mXy2cMw83IGrF52`Jb z+2{IJSKAW+CL#;Cc3^_P7g!O85JHwFmzTKYsXYOp0uC7I1|vLl07g*ABNMRwiYI^% zA8TJT)Qj45i0QuHrh1+y03=_%bXndP-2a^F#dN#BuTLIKJkmq1wl4tOIXXH@v!za@ zQZ3i@MPC3gJtmr&Zu%h8Yc*`-`en=)fZ4gM;OAdRO8~J$15G`zO_~4Wji0}6qU^#T}x@+HgtX2J1`x>JEso36O<-Y%>e*^S@n*U1?kW>Hw002ovPDHLk FV1fq0Q`!Ik literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Machines/VendingMachines/secdrobe.rsi/meta.json b/Resources/Textures/_DV/Structures/Machines/VendingMachines/secdrobe.rsi/meta.json new file mode 100644 index 000000000000..5c271b850e0e --- /dev/null +++ b/Resources/Textures/_DV/Structures/Machines/VendingMachines/secdrobe.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/a879151ef04192ae2a791278ee882c1bce7c5062. Modified by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "broken" + }, + { + "name": "off" + }, + { + "name": "panel" + }, + { + "name": "normal-unshaded", + "delays": [ + [ + 1.0, + 0.1, + 1.0, + 0.1, + 1.0, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/_DV/Structures/Machines/VendingMachines/secdrobe.rsi/normal-unshaded.png b/Resources/Textures/_DV/Structures/Machines/VendingMachines/secdrobe.rsi/normal-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..0aa49d64b69c74890501f692c830fbe19bdeb285 GIT binary patch literal 8343 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Machines/VendingMachines/secdrobe.rsi/panel.png b/Resources/Textures/_DV/Structures/Machines/VendingMachines/secdrobe.rsi/panel.png new file mode 100644 index 0000000000000000000000000000000000000000..0032751ff4ffedd3d0ecc00eaf4e0ab459929e9f GIT binary patch literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJR!TD@E@bvU_NvA($#wnr(!Xc+! zxY-SW0LU@E^H5*bg578Khv|+_lg$sW*?jCvdBeJOdWZj3DYB`nt4B%rOPnz=`)6-p h#&6~hvQUMA!DX(Lkd@zrT|fshc)I$ztaD0e0svz&KxzO0 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Machines/techfab.rsi/ammo.png b/Resources/Textures/_DV/Structures/Machines/techfab.rsi/ammo.png new file mode 100644 index 0000000000000000000000000000000000000000..80bd72f7859f808acaf473dd96e8196ac21334bf GIT binary patch literal 731 zcmV<10wn#3P)1VIr*EUkStBI_L^B#6#3dq2+1xy+n_(4=i-yqYLvvc4Oih-q{43tHV1 z4Rq4N5YeRJIa4#^3H}}LH&m&5-LHE6zwgh{v}}3?RMiU)8;j|xw&`i|mF;Wi_k zTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$Rj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H z+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnhIymU3CTB4is*%Van zzw`90!GTiua13f6g5aea>bBss7z7^&LGXD9)%S3gE&Fql)5x3X#j@752a$C+IWKGa zHk@ui`<;_?liyOc%#dZl^D#8fL+ceZE|#+TS?A~$5^M5Am$0)7J+eQt^aXoYXhVZ; z{@?%r010qNS#tmY3labT3lag+-G2N4009$8L_t(o31eUw1tUEK7)cEPCnuNx$a-A% z?Lp=;thS3n;R~|7LgDY*w+F>e78F?`INUsZ48MQ;eEov{dw6)G6h@@zM^{Tx6rdYM4xcOsfJ!uK0g}_e*Ds%_ zWjELyk{$4c$_^ka3aA+bqYfAi0g`jUvuDq!nFdGA8V!Nb5Eu;s1^~dpI#eE_a4`S? N002ovPDHLkV1j#QH}?Pl literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Machines/techfab.rsi/icon.png b/Resources/Textures/_DV/Structures/Machines/techfab.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..186fd30082bff99b748392c422265ee93f793237 GIT binary patch literal 1122 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Machines/techfab.rsi/unlit.png b/Resources/Textures/_DV/Structures/Machines/techfab.rsi/unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..6635772d336fc73b0b1a999d6c0503c71ff04482 GIT binary patch literal 648 zcmV;30(bq1P)EX>4Tx04R}tkv&MmKpe$iQ>7vm2Qx@<$WWauh+jBL6^me@v=v%)FuC*#ni!H4 z7e~Rh;NZt%)xpJCR|i)?5c~jfbaGO3krMxx6k5c1aNLh~_a1le0HIN3n$)S(glehxvqHp#<}FOz%xZNo1P;UiKS8pD;>LMR8WPD7_B-f7SgmI_wh$ue~MfRxhi1f zn8yY*$gUs!4}N!R6(`2Mq;MSQesP?SVIZ^%H0zG@ee5{R6Cn5uT)|5Tqat9cEGGtSBr65hASOnhB=$rDuz%9_b>h;#z$LRx*rLLB4fP+I| zq(s?kKJV`7?Csw(t^R%hpFMK95|x%T0002LNklp$fuK6vpxYb&p_JHkgdU zV0A^XEC`1A07kpTXV^n1A{bT#%j#gTxa#t%U9L$O=wU%83g=gDIG1w|AD074DW#NB z|DY(bUG?rs1%Kt+C~+*n@nE`oAF=afx&YvO+ESF*@#yv4C~<6+dSr2C0Nl_O)2fsD zsfU=rb$GG;<-Rq6D)kryxma%_4v@u}*@ZU)Fq_L?U=ZX~srUH-nxy#Q{RGtST5pVP io?rLaeqC-sr2y`(|2C_p8XYG90000P(wt4Lq&sv6hvbf#OoHdC|%=H6QalE%TQ9e z|IgD*%uLt1_xqsh)v`V(pnD%GWy|_KwXDh+*k9l}*YM{hr@3#@%MES(7@RwBdDGCM z2XM6u!_Rueh*TxJOj{xW9~UsN27~wD*r;VyU+4S@!rSshcW`(Fld|8r`3D!(Xca;} zBwGLg010qNS#tmY3labT3lag+-G2N400Ci1L_t(o31eUw1*0J_8UmvsFd71*Auzxp zzzDNnMn>j8j7<;v$&)8wyIGJe)6vmK=F*IP<;q34*(eSGi9URI4=zayhP=EIim@0D z`19uviUL}5m}qSQA@c{H1HOO%PRP+@%VRSeBMpE|$EJ{MTM1~yaDa=OA6_kcc5Pzd z<>h6Nl$1tM_x$-&hR>frGZ51M;@LwKeJBn9Wx-#+eloDJv7;zL=77oyNIrgwEDW|B zB!_MRvLcY#AcrCY6bB$n*zMTLpe8BFu-rX~;oiOb4B}iL86>3S!4`mgiO(XCI&9$4 zgIgHFICH^cZf=HK&!2-W|Ml$+SR*L-K>$XBIXH+*7fyg>R>+-W0AXAJrvpG5K#qV} z4&uY&7e<4`Z~hia*Y9maRHRd2$r~Tr2$af!_ol0dIMh+z!EF0GQw~GE|*eM n9F$vN4nRqSAc;{h;z9rbu;zpGrM(NL00000NkvXXu0mjfLYQL^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/Crates/sec_gear.rsi/closed.png b/Resources/Textures/_DV/Structures/Storage/Crates/sec_gear.rsi/closed.png new file mode 100644 index 0000000000000000000000000000000000000000..7f538e51adb240e1af541f5ace59743c24db69a6 GIT binary patch literal 786 zcmV+t1MU2YP)P(wt4Lq&sv6hvbf#OoHdC|%=H6QalE%TQ9e z|IgD*%uLt1_xqsh)v`V(pnD%GWy|_KwXDh+*k9l}*YM{hr@3#@%MES(7@RwBdDGCM z2XM6u!_Rueh*TxJOj{xW9~UsN27~wD*r;VyU+4S@!rSshcW`(Fld|8r`3D!(Xca;} zBwGLg010qNS#tmY3labT3lag+-G2N400Bx#L_t(o3GI}zN&`U~xs{Qyu5Ia#Y1-8x^85x_mesCEb1Ne) zs&z*kIEkYApxt(Pz6Y}z?sxb2-MhMk=2k{xRC`)g+GqChxXZ6`JU-`~&#jEas20DvGQeDC6`b{tn&|68Wt*p!X(1Wl^X(SZ`kH2- z+(x(0IiFh@iBYXPGJs3?cc(Sw)VmLUVk^^9G63y>&8<{3OeT*K``pS%P}j-;v>cwF z9;6{XCP(wt4Lq&sv6hvbf#OoHdC|%=H6QalE%TQ9e z|IgD*%uLt1_xqsh)v`V(pnD%GWy|_KwXDh+*k9l}*YM{hr@3#@%MES(7@RwBdDGCM z2XM6u!_Rueh*TxJOj{xW9~UsN27~wD*r;VyU+4S@!rSshcW`(Fld|8r`3D!(Xca;} zBwGLg010qNS#tmY3labT3lag+-G2N400I+9L_t(o3GGzRD@0KgKIBK4Mk!*LOj*#> zl$9hk8xuQ!06RPXjFs{yPy(a_v%{QMCzTIci%am z^PSJR=N+QZ!VZKT2s`k{9jKG~@p!xzjYh@gvs^Ayp-|wzv2kAv#CmRnUNMpA(_PAD zk13f<)+9;CeKBw$S4?$aHWI0gwYEx}&&}s&Iv*b4_kq0~(s5r5WXN5pRJgX$0j^{{ zGFuxQxrsz9gvb}uiIjlt9Wu0*uO3}na^QvxJlpKT5I9D1;Uci$J&sgwZhfUfR@ zj!{0JQ@)M+Vj$FWl>jV<>#GY@5HE-k6**?(zSt)((^7qK{M}P6BCOiqlp!l#T>*-x zQiEUSz!tT!zCxIXSggl@N~I!SS!R6Fh}+KHZQfYLh5!slwfag;P0e0xknLgz9Dp(1G;YD)q-=v^X(Cx!fgnwmflnPyqkscZKY)NqFrcN8CAt*!>r! z5*M$2Y(caiCMP?N$H~zyBTK!9grCct0+0X^QXIbAubhav?0v`>nwvi*{9I;y1u|T& z8Nl7k4B&LxcUK_8Dqq1D0WQ*?jALL$fH8!@cKgXvA=f|Xz#CSXKeb}w2w(sJ002ov JPDHLkV1jNk%69+& literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/Crates/sec_gear.rsi/locked.png b/Resources/Textures/_DV/Structures/Storage/Crates/sec_gear.rsi/locked.png new file mode 100644 index 0000000000000000000000000000000000000000..aceacfce597de2a7dd34974d00c7324fdb3a34f5 GIT binary patch literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}zMd|QArY-_ zFD~S5a1d#J*mS&nYVt3wh^K#|8Jd+i&O8P(wt4Lq&sv6hvbf#OoHdC|%=H6QalE%TQ9e z|IgD*%uLt1_xqsh)v`V(pnD%GWy|_KwXDh+*k9l}*YM{hr@3#@%MES(7@RwBdDGCM z2XM6u!_Rueh*TxJOj{xW9~UsN27~wD*r;VyU+4S@!rSshcW`(Fld|8r`3D!(Xca;} zBwGLg010qNS#tmY3labT3lag+-G2N4009|EL_t(o31eUwV895oUq(jeKa7n`KY8*5 ztOlDrxpE-$VR}&<;Ns?oY&XN6U7Jw&$nxaMfeZxc#p(bZ9eorFX~ns6_7(aG=MA!VuL~i z6cV7k3v(^H8bW+x%)pxls1Xv>FoTdsN99LDU^E0qLtr!nMnhmU1V%%Eq7VQ8o*88U T@4+)i00000NkvXXu0mjfNyI@$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/Crates/sec_gear.rsi/sparking.png b/Resources/Textures/_DV/Structures/Storage/Crates/sec_gear.rsi/sparking.png new file mode 100644 index 0000000000000000000000000000000000000000..87b78b9b4653d54a703643d161f7f8bf353995df GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^2|(QXSZ^$5X5FCBsLJs@fG2hgpXAxzo?UdK185n8r>mdKI;Vst0DN#gB>(^b literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/Crates/sec_gear.rsi/unlocked.png b/Resources/Textures/_DV/Structures/Storage/Crates/sec_gear.rsi/unlocked.png new file mode 100644 index 0000000000000000000000000000000000000000..94b89fa655da949cd72a05f4ca4438bb89764b66 GIT binary patch literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}9-c0aArY-_ zFCOG%P!w>!nBl!LLFdle1Jma0)vpjq{rP@YBa0goP~nI2d3^rIwe)wN4!xr4xzg-a n#Xj@W=MCBxvgf{XH$0BhzQQx>vT)Q^pi%};S3j3^P60oneEP)Px#;7LS5R9J=W&@pPmFcik|zaXFl(jeJ6O@`tl=oZdmyk;mg&>^$8rgN@rKUr+ydP+h^u7-Xlu}A5rBsKA++{7(RQ}s(h7P+y+uhDA(^O99 zGi6z}b0Gxr&S9-(?meHE3v=%QxHV0i6?xC=di|@fw-G`R06QAtl)`= zFW~EXWjdPy@Vr=1Rn<>n6!E^_1CS(1ZzjvKws-IcUREpVzT#;z;np-1MPc$h7l708 sh>v6Jc-*`9w%PodZOmY;Qc69TZ;Wzr1AKHN?EnA(07*qoM6N<$f;^dk6951J literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/armory.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/armory.png new file mode 100644 index 0000000000000000000000000000000000000000..80d7a43b265b6930ae54d8446a7adf8b8c4670bc GIT binary patch literal 773 zcmV+g1N!`lP)1VIr*EUkStBI_L^B#6#3dq2+1xy+n_(4=i-yqYLvvc4Oih-q{43tHV1 z4Rq4N5YeRJIa4#^3H}}LH&m&5-LHE6zwgh{v}}3?RMiU)8;j|xw&`i|mF;Wi_k zTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$Rj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H z+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnhIymU3CTB4is*%Van zzw`90!GTiua13f6g5aea>bBss7z7^&LGXD9)%S3gE&Fql)5x3X#j@752a$C+IWKGa zHk@ui`<;_?liyOc%#dZl^D#8fL+ceZE|#+TS?A~$5^M5Am$0)7J+eQt^aXoYXhVZ; z{@?%r010qNS#tmY3labT3lag+-G2N400BKoL_t(o31eUwV8BSM{hFGZ|3PXU9z6nU zIizU~rvH6?45rbE>({RnWi|`CMr?eLz2xtouywF(U2JgIgG4xCDrD z052~u!}I4)!Fc=i>tM4sFw2AKAFt12H5;Ud7(i530p)_vpFb009$XE`0mS42qCx;> zDkmo=jER^2{{1^%d1T4aTre5}10Dh-24D9M!= zS|Py1M1A*C-$WAQf}}Js8UjCm{vSQRl$Jg zf&q5`Nm20Z*)vi@n4o&19Dv-!Cbn~mtcRd022ue4@xw;#9gQ-g00000NkvXXu0mjf D`=(Y2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/armory_door.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/armory_door.png new file mode 100644 index 0000000000000000000000000000000000000000..6bccf3f1ccf7f2d90f002d433ad0e05431a8ae59 GIT binary patch literal 825 zcmV-91IGM`P)1VIr*EUkStBI_L^B#6#3dq2+1xy+n_(4=i-yqYLvvc4Oih-q{43tHV1 z4Rq4N5YeRJIa4#^3H}}LH&m&5-LHE6zwgh{v}}3?RMiU)8;j|xw&`i|mF;Wi_k zTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$Rj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H z+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnhIymU3CTB4is*%Van zzw`90!GTiua13f6g5aea>bBss7z7^&LGXD9)%S3gE&Fql)5x3X#j@752a$C+IWKGa zHk@ui`<;_?liyOc%#dZl^D#8fL+ceZE|#+TS?A~$5^M5Am$0)7J+eQt^aXoYXhVZ; z{@?%r010qNS#tmY3labT3lag+-G2N400D7HL_t(o31eUw1*0J_8UiCd1Q>}80AIhL z|H2{?4EZ-Ng0*Z4NCDILub;*+;_aIk44XHtBg$+R4Ba>cK$gFF_K@N3y?bC4m#*Fc z(_dda#LyujC66J7OMqwxfP94uAX^A>BtEt1W)STFbdAXTYgf*|xk5ssa5gavsyIMP z#{_N{C1VIr*EUkStBI_L^B#6#3dq2+1xy+n_(4=i-yqYLvvc4Oih-q{43tHV1 z4Rq4N5YeRJIa4#^3H}}LH&m&5-LHE6zwgh{v}}3?RMiU)8;j|xw&`i|mF;Wi_k zTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$Rj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H z+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnhIymU3CTB4is*%Van zzw`90!GTiua13f6g5aea>bBss7z7^&LGXD9)%S3gE&Fql)5x3X#j@752a$C+IWKGa zHk@ui`<;_?liyOc%#dZl^D#8fL+ceZE|#+TS?A~$5^M5Am$0)7J+eQt^aXoYXhVZ; z{@?%r010qNS#tmY3labT3lag+-G2N4009}E(rvZ+}(SRmn)%!*kK*84*c1HK^uP!3psFIq_&eSO;nc zTz7;$q3gceaJVa|dmsqbEEhzW983Uw0nh_5<9Kh9lfy;@wE+yDRo literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/brigmedic.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/brigmedic.png new file mode 100644 index 0000000000000000000000000000000000000000..80d7a43b265b6930ae54d8446a7adf8b8c4670bc GIT binary patch literal 773 zcmV+g1N!`lP)1VIr*EUkStBI_L^B#6#3dq2+1xy+n_(4=i-yqYLvvc4Oih-q{43tHV1 z4Rq4N5YeRJIa4#^3H}}LH&m&5-LHE6zwgh{v}}3?RMiU)8;j|xw&`i|mF;Wi_k zTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$Rj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H z+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnhIymU3CTB4is*%Van zzw`90!GTiua13f6g5aea>bBss7z7^&LGXD9)%S3gE&Fql)5x3X#j@752a$C+IWKGa zHk@ui`<;_?liyOc%#dZl^D#8fL+ceZE|#+TS?A~$5^M5Am$0)7J+eQt^aXoYXhVZ; z{@?%r010qNS#tmY3labT3lag+-G2N400BKoL_t(o31eUwV8BSM{hFGZ|3PXU9z6nU zIizU~rvH6?45rbE>({RnWi|`CMr?eLz2xtouywF(U2JgIgG4xCDrD z052~u!}I4)!Fc=i>tM4sFw2AKAFt12H5;Ud7(i530p)_vpFb009$XE`0mS42qCx;> zDkmo=jER^2{{1^%d1T4aTre5}10Dh-24D9M!= zS|Py1M1A*C-$WAQf}}Js8UjCm{vSQRl$Jg zf&q5`Nm20Z*)vi@n4o&19Dv-!Cbn~mtcRd022ue4@xw;#9gQ-g00000NkvXXu0mjf D`=(Y2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/brigmedic_door.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/brigmedic_door.png new file mode 100644 index 0000000000000000000000000000000000000000..3442e7f02dfc81f26fefc6676967088aef920a8e GIT binary patch literal 817 zcmV-11J3-3P)1VIr*EUkStBI_L^B#6#3dq2+1xy+n_(4=i-yqYLvvc4Oih-q{43tHV1 z4Rq4N5YeRJIa4#^3H}}LH&m&5-LHE6zwgh{v}}3?RMiU)8;j|xw&`i|mF;Wi_k zTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$Rj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H z+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnhIymU3CTB4is*%Van zzw`90!GTiua13f6g5aea>bBss7z7^&LGXD9)%S3gE&Fql)5x3X#j@752a$C+IWKGa zHk@ui`<;_?liyOc%#dZl^D#8fL+ceZE|#+TS?A~$5^M5Am$0)7J+eQt^aXoYXhVZ; z{@?%r010qNS#tmY3labT3lag+-G2N400C)9L_t(o31eUw1*0J_8UiCd1Q>}80AIhL z|H2{?4EZ-Ng0*Z4NCDILub;*+;_aIk44XHtBg$+R4Ba>cK$gFF_K@N3y?bC4m#*Fc z(_dda#LyujC66J7OMqwxfP94uAX^A>BtEt1W)STFbdAXTYgf*|xk5ssa5gavsyIMP z#{_N{C=SR%4J;J}43X z0w&mf`}PoJHpwB7auJdamb)i`9rG1f9?-oUKo5q|x?nT}NNt25ry-JZ0VsRjdj1@& v|K7d(U|Ns`dmVvn2}NvR`Og5t!xjJlwq2Sz36JN!00000NkvXXu0mjf==5mN literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/brigmedic_open.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/brigmedic_open.png new file mode 100644 index 0000000000000000000000000000000000000000..b6b428dcf827a25b44618c27efaf54937156ed5f GIT binary patch literal 734 zcmV<40wMj0P)1VIr*EUkStBI_L^B#6#3dq2+1xy+n_(4=i-yqYLvvc4Oih-q{43tHV1 z4Rq4N5YeRJIa4#^3H}}LH&m&5-LHE6zwgh{v}}3?RMiU)8;j|xw&`i|mF;Wi_k zTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$Rj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H z+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnhIymU3CTB4is*%Van zzw`90!GTiua13f6g5aea>bBss7z7^&LGXD9)%S3gE&Fql)5x3X#j@752a$C+IWKGa zHk@ui`<;_?liyOc%#dZl^D#8fL+ceZE|#+TS?A~$5^M5Am$0)7J+eQt^aXoYXhVZ; z{@?%r010qNS#tmY3labT3lag+-G2N4009}E(rvZ+}(SRmn)%!*kK*84*c1HK^uP!3psFIq_&eSO;nc zTz7;$q3gceaJVa|dmsqbEEhzW983Uw0nh_5<9Kh9lfy;@wE+yDRo literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/det.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/det.png new file mode 100644 index 0000000000000000000000000000000000000000..80d7a43b265b6930ae54d8446a7adf8b8c4670bc GIT binary patch literal 773 zcmV+g1N!`lP)1VIr*EUkStBI_L^B#6#3dq2+1xy+n_(4=i-yqYLvvc4Oih-q{43tHV1 z4Rq4N5YeRJIa4#^3H}}LH&m&5-LHE6zwgh{v}}3?RMiU)8;j|xw&`i|mF;Wi_k zTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$Rj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H z+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnhIymU3CTB4is*%Van zzw`90!GTiua13f6g5aea>bBss7z7^&LGXD9)%S3gE&Fql)5x3X#j@752a$C+IWKGa zHk@ui`<;_?liyOc%#dZl^D#8fL+ceZE|#+TS?A~$5^M5Am$0)7J+eQt^aXoYXhVZ; z{@?%r010qNS#tmY3labT3lag+-G2N400BKoL_t(o31eUwV8BSM{hFGZ|3PXU9z6nU zIizU~rvH6?45rbE>({RnWi|`CMr?eLz2xtouywF(U2JgIgG4xCDrD z052~u!}I4)!Fc=i>tM4sFw2AKAFt12H5;Ud7(i530p)_vpFb009$XE`0mS42qCx;> zDkmo=jER^2{{1^%d1T4aTre5}10Dh-24D9M!= zS|Py1M1A*C-$WAQf}}Js8UjCm{vSQRl$Jg zf&q5`Nm20Z*)vi@n4o&19Dv-!Cbn~mtcRd022ue4@xw;#9gQ-g00000NkvXXu0mjf D`=(Y2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/det_door.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/det_door.png new file mode 100644 index 0000000000000000000000000000000000000000..5255596379419e4a574e2ba2a0cd3465fc2a3097 GIT binary patch literal 831 zcmV-F1Hk-=P)P(wt4Lq&sv6hvbf#OoHdC|%=H6QalE%TQ9e z|IgD*%uLt1_xqsh)v`V(pnD%GWy|_KwXDh+*k9l}*YM{hr@3#@%MES(7@RwBdDGCM z2XM6u!_Rueh*TxJOj{xW9~UsN27~wD*r;VyU+4S@!rSshcW`(Fld|8r`3D!(Xca;} zBwGLg010qNS#tmY3labT3lag+-G2N400DPNL_t(o31eUw1*0J_8UiCd1Q>}80AIhL z|H2{?4EZ-Ng0*Z4NCDILub;*+;_aIk44XHtBg$+R4Ba>cK$gFF_K@N3y?bC4m#*Fc z(_dda#LyujC66J7OMqwxfP94uAX^A>BtEt1W)STFbdAXTYgf*|xk5ssa5gavsyIMP z#{_N{C5O-%-5K3oC^gQyw{ zq}R#GIh_mN7=-N000W~ks56=!Y}{;002ov JPDHLkV1j?|X?y?x literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/det_open.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/det_open.png new file mode 100644 index 0000000000000000000000000000000000000000..b6b428dcf827a25b44618c27efaf54937156ed5f GIT binary patch literal 734 zcmV<40wMj0P)1VIr*EUkStBI_L^B#6#3dq2+1xy+n_(4=i-yqYLvvc4Oih-q{43tHV1 z4Rq4N5YeRJIa4#^3H}}LH&m&5-LHE6zwgh{v}}3?RMiU)8;j|xw&`i|mF;Wi_k zTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$Rj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H z+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnhIymU3CTB4is*%Van zzw`90!GTiua13f6g5aea>bBss7z7^&LGXD9)%S3gE&Fql)5x3X#j@752a$C+IWKGa zHk@ui`<;_?liyOc%#dZl^D#8fL+ceZE|#+TS?A~$5^M5Am$0)7J+eQt^aXoYXhVZ; z{@?%r010qNS#tmY3labT3lag+-G2N4009}E(rvZ+}(SRmn)%!*kK*84*c1HK^uP!3psFIq_&eSO;nc zTz7;$q3gceaJVa|dmsqbEEhzW983Uw0nh_5<9Kh9lfy;@wE+yDRo literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/evidence.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/evidence.png new file mode 100644 index 0000000000000000000000000000000000000000..80d7a43b265b6930ae54d8446a7adf8b8c4670bc GIT binary patch literal 773 zcmV+g1N!`lP)1VIr*EUkStBI_L^B#6#3dq2+1xy+n_(4=i-yqYLvvc4Oih-q{43tHV1 z4Rq4N5YeRJIa4#^3H}}LH&m&5-LHE6zwgh{v}}3?RMiU)8;j|xw&`i|mF;Wi_k zTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$Rj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H z+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnhIymU3CTB4is*%Van zzw`90!GTiua13f6g5aea>bBss7z7^&LGXD9)%S3gE&Fql)5x3X#j@752a$C+IWKGa zHk@ui`<;_?liyOc%#dZl^D#8fL+ceZE|#+TS?A~$5^M5Am$0)7J+eQt^aXoYXhVZ; z{@?%r010qNS#tmY3labT3lag+-G2N400BKoL_t(o31eUwV8BSM{hFGZ|3PXU9z6nU zIizU~rvH6?45rbE>({RnWi|`CMr?eLz2xtouywF(U2JgIgG4xCDrD z052~u!}I4)!Fc=i>tM4sFw2AKAFt12H5;Ud7(i530p)_vpFb009$XE`0mS42qCx;> zDkmo=jER^2{{1^%d1T4aTre5}10Dh-24D9M!= zS|Py1M1A*C-$WAQf}}Js8UjCm{vSQRl$Jg zf&q5`Nm20Z*)vi@n4o&19Dv-!Cbn~mtcRd022ue4@xw;#9gQ-g00000NkvXXu0mjf D`=(Y2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/evidence_door.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/evidence_door.png new file mode 100644 index 0000000000000000000000000000000000000000..73fc7954814255f235593b4cb46d41aed61dc6eb GIT binary patch literal 829 zcmV-D1H$}?P)1VIr*EUkStBI_L^B#6#3dq2+1xy+n_(4=i-yqYLvvc4Oih-q{43tHV1 z4Rq4N5YeRJIa4#^3H}}LH&m&5-LHE6zwgh{v}}3?RMiU)8;j|xw&`i|mF;Wi_k zTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$Rj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H z+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnhIymU3CTB4is*%Van zzw`90!GTiua13f6g5aea>bBss7z7^&LGXD9)%S3gE&Fql)5x3X#j@752a$C+IWKGa zHk@ui`<;_?liyOc%#dZl^D#8fL+ceZE|#+TS?A~$5^M5Am$0)7J+eQt^aXoYXhVZ; z{@?%r010qNS#tmY3labT3lag+-G2N400DJLL_t(o31eUw1*0J_8UiCd1Q>}80AIhL z|H2{?4EZ-Ng0*Z4NCDILub;*+;_aIk44XHtBg$+R4Ba>cK$gFF_K@N3y?bC4m#*Fc z(_dda#LyujC66J7OMqwxfP94uAX^A>BtEt1W)STFbdAXTYgf*|xk5ssa5gavsyIMP z#{_N{CFEP!qcccNgy{Nl@|~Pq{$m3k9^U`W%*_4+HKNlv%|ezSIs`zP&Ye34)>~a& zhinE#Y$l3yBWVVP0uqmSCP^UxGq$z03C3gqg~sR4pW%E>O-&R&TmlD!s2U5T7nBCr z*x0cegPig~iSQRN!S36)hbXg24uO=5kaV!zJqhfXufXzvZsh=0?*j!#>w?h`Ahi*K zoR&z+1)%J8>-lrA{(JZCgK0q)L>+-_FxA+=@}B{Ohb;gAC8L%^HNg1VIr*EUkStBI_L^B#6#3dq2+1xy+n_(4=i-yqYLvvc4Oih-q{43tHV1 z4Rq4N5YeRJIa4#^3H}}LH&m&5-LHE6zwgh{v}}3?RMiU)8;j|xw&`i|mF;Wi_k zTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$Rj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H z+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnhIymU3CTB4is*%Van zzw`90!GTiua13f6g5aea>bBss7z7^&LGXD9)%S3gE&Fql)5x3X#j@752a$C+IWKGa zHk@ui`<;_?liyOc%#dZl^D#8fL+ceZE|#+TS?A~$5^M5Am$0)7J+eQt^aXoYXhVZ; z{@?%r010qNS#tmY3labT3lag+-G2N4009}E(rvZ+}(SRmn)%!*kK*84*c1HK^uP!3psFIq_&eSO;nc zTz7;$q3gceaJVa|dmsqbEEhzW983Uw0nh_5<9Kh9lfy;@wE+yDRo literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/hos.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/hos.png new file mode 100644 index 0000000000000000000000000000000000000000..80d7a43b265b6930ae54d8446a7adf8b8c4670bc GIT binary patch literal 773 zcmV+g1N!`lP)1VIr*EUkStBI_L^B#6#3dq2+1xy+n_(4=i-yqYLvvc4Oih-q{43tHV1 z4Rq4N5YeRJIa4#^3H}}LH&m&5-LHE6zwgh{v}}3?RMiU)8;j|xw&`i|mF;Wi_k zTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$Rj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H z+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnhIymU3CTB4is*%Van zzw`90!GTiua13f6g5aea>bBss7z7^&LGXD9)%S3gE&Fql)5x3X#j@752a$C+IWKGa zHk@ui`<;_?liyOc%#dZl^D#8fL+ceZE|#+TS?A~$5^M5Am$0)7J+eQt^aXoYXhVZ; z{@?%r010qNS#tmY3labT3lag+-G2N400BKoL_t(o31eUwV8BSM{hFGZ|3PXU9z6nU zIizU~rvH6?45rbE>({RnWi|`CMr?eLz2xtouywF(U2JgIgG4xCDrD z052~u!}I4)!Fc=i>tM4sFw2AKAFt12H5;Ud7(i530p)_vpFb009$XE`0mS42qCx;> zDkmo=jER^2{{1^%d1T4aTre5}10Dh-24D9M!= zS|Py1M1A*C-$WAQf}}Js8UjCm{vSQRl$Jg zf&q5`Nm20Z*)vi@n4o&19Dv-!Cbn~mtcRd022ue4@xw;#9gQ-g00000NkvXXu0mjf D`=(Y2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/hos_door.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/hos_door.png new file mode 100644 index 0000000000000000000000000000000000000000..f6fb4e4d271da1603ab37ec51541fbd8664000ce GIT binary patch literal 839 zcmV-N1GxN&P)1VIr*EUkStBI_L^B#6#3dq2+1xy+n_(4=i-yqYLvvc4Oih-q{43tHV1 z4Rq4N5YeRJIa4#^3H}}LH&m&5-LHE6zwgh{v}}3?RMiU)8;j|xw&`i|mF;Wi_k zTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$Rj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H z+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnhIymU3CTB4is*%Van zzw`90!GTiua13f6g5aea>bBss7z7^&LGXD9)%S3gE&Fql)5x3X#j@752a$C+IWKGa zHk@ui`<;_?liyOc%#dZl^D#8fL+ceZE|#+TS?A~$5^M5Am$0)7J+eQt^aXoYXhVZ; z{@?%r010qNS#tmY3labT3lag+-G2N400DnVL_t(o31eUw1*0J_8UiCd1Q>}80AIhL z|H2{?4EZ-Ng0*Z4NCDILub;*+;_aIk44XHtBg$+R4Ba>cK$gFF_K@N3y?bC4m#*Fc z(_dda#LyujC66J7OMqwxfP94uAX^A>BtEt1W)STFbdAXTYgf*|xk5ssa5gavsyIMP z#{_N{CL*)Wm#eY z(P`lKub*%;ksX1a=+OCaO_Va6oLv6HfQN_oe-MTNGc&XQK=c2j(L`BEbO?Y;Pm-U~Kfd;1@8#?%TJAD6>gQ10V}iE<)mbxqA}W{;$CDfRb{6 zWCy@}jZBZ$1*0KAY9j1VIr*EUkStBI_L^B#6#3dq2+1xy+n_(4=i-yqYLvvc4Oih-q{43tHV1 z4Rq4N5YeRJIa4#^3H}}LH&m&5-LHE6zwgh{v}}3?RMiU)8;j|xw&`i|mF;Wi_k zTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$Rj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H z+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnhIymU3CTB4is*%Van zzw`90!GTiua13f6g5aea>bBss7z7^&LGXD9)%S3gE&Fql)5x3X#j@752a$C+IWKGa zHk@ui`<;_?liyOc%#dZl^D#8fL+ceZE|#+TS?A~$5^M5Am$0)7J+eQt^aXoYXhVZ; z{@?%r010qNS#tmY3labT3lag+-G2N4009}E(rvZ+}(SRmn)%!*kK*84*c1HK^uP!3psFIq_&eSO;nc zTz7;$q3gceaJVa|dmsqbEEhzW983Uw0nh_5<9Kh9lfy;@wE+yDRo literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/_DV/Structures/Storage/closet.rsi/meta.json index 6012dc65ceed..b14ffba8cf78 100644 --- a/Resources/Textures/_DV/Structures/Storage/closet.rsi/meta.json +++ b/Resources/Textures/_DV/Structures/Storage/closet.rsi/meta.json @@ -4,7 +4,7 @@ "x": 32, "y": 32 }, - "copyright": "Taken from tgstation, added psych locker based on medical locker and admin assist based on captain's locker by Radezolid, CJ and Clerk lockers edited by Timemaster99 (Discord). Surgeon's locker by Janet Blackquill 2024", + "copyright": "Taken from tgstation, added psych locker based on medical locker and admin assist based on captain's locker by Radezolid, CJ and Clerk lockers edited by Timemaster99 (Discord). Surgeon's locker by Janet Blackquill 2024. Security lockers modified by TJohnson.", "license": "CC-BY-SA-3.0", "states": [ { @@ -72,6 +72,69 @@ }, { "name": "admin_assist_open" + }, + { + "name": "brigmedic_door" + }, + { + "name": "brigmedic" + }, + { + "name": "brigmedic_open" + }, + { + "name": "armory" + }, + { + "name": "armory_door" + }, + { + "name": "armory_open" + }, + { + "name": "det" + }, + { + "name": "det_door" + }, + { + "name": "det_open" + }, + { + "name": "evidence" + }, + { + "name": "evidence_door" + }, + { + "name": "evidence_open" + }, + { + "name": "hos" + }, + { + "name": "hos_door" + }, + { + "name": "hos_open" + }, + { + "name": "sec" + }, + { + "name": "sec_door" + }, + { + "name": "sec_open" + }, + { + "name": "warden" + }, + { + "name": "warden_door" + }, + { + "name": "warden_open" } ] } diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/sec.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/sec.png new file mode 100644 index 0000000000000000000000000000000000000000..80d7a43b265b6930ae54d8446a7adf8b8c4670bc GIT binary patch literal 773 zcmV+g1N!`lP)1VIr*EUkStBI_L^B#6#3dq2+1xy+n_(4=i-yqYLvvc4Oih-q{43tHV1 z4Rq4N5YeRJIa4#^3H}}LH&m&5-LHE6zwgh{v}}3?RMiU)8;j|xw&`i|mF;Wi_k zTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$Rj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H z+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnhIymU3CTB4is*%Van zzw`90!GTiua13f6g5aea>bBss7z7^&LGXD9)%S3gE&Fql)5x3X#j@752a$C+IWKGa zHk@ui`<;_?liyOc%#dZl^D#8fL+ceZE|#+TS?A~$5^M5Am$0)7J+eQt^aXoYXhVZ; z{@?%r010qNS#tmY3labT3lag+-G2N400BKoL_t(o31eUwV8BSM{hFGZ|3PXU9z6nU zIizU~rvH6?45rbE>({RnWi|`CMr?eLz2xtouywF(U2JgIgG4xCDrD z052~u!}I4)!Fc=i>tM4sFw2AKAFt12H5;Ud7(i530p)_vpFb009$XE`0mS42qCx;> zDkmo=jER^2{{1^%d1T4aTre5}10Dh-24D9M!= zS|Py1M1A*C-$WAQf}}Js8UjCm{vSQRl$Jg zf&q5`Nm20Z*)vi@n4o&19Dv-!Cbn~mtcRd022ue4@xw;#9gQ-g00000NkvXXu0mjf D`=(Y2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/sec_door.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/sec_door.png new file mode 100644 index 0000000000000000000000000000000000000000..57f620725eddbf37a048e81737837643190fb696 GIT binary patch literal 811 zcmV+`1JwM9P)1VIr*EUkStBI_L^B#6#3dq2+1xy+n_(4=i-yqYLvvc4Oih-q{43tHV1 z4Rq4N5YeRJIa4#^3H}}LH&m&5-LHE6zwgh{v}}3?RMiU)8;j|xw&`i|mF;Wi_k zTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$Rj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H z+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnhIymU3CTB4is*%Van zzw`90!GTiua13f6g5aea>bBss7z7^&LGXD9)%S3gE&Fql)5x3X#j@752a$C+IWKGa zHk@ui`<;_?liyOc%#dZl^D#8fL+ceZE|#+TS?A~$5^M5Am$0)7J+eQt^aXoYXhVZ; z{@?%r010qNS#tmY3labT3lag+-G2N400Co3L_t(o31eUw1*0J_8UiCd1Q>}80AIhL z|H2{?4EZ-Ng0*Z4NCDILub;*+;_aIk44XHtBg$+R4Ba>cK$gFF_K@N3y?bC4m#*Fc z(_dda#LyujC66J7OMqwxfP94ugoFgbrPi!j&wx)YTp^S}v;)vJqVqu(lLMH@(S%J8 zC=`%G0-G9aVpMSe$oJ%i09B%Z9G}BNgDMUn*Y_YtP{jeHWILG8VKmVW`2FiAOb-SP zDj&!NL?^;ucpUKV-D`#&JGL?))5JQ6Xa^8$AgSu8<^VG@Gg9pat0y`Q;4}U6=g)9y zO-)S(WIkL12ZL+}=xM7kfGQ+d4gk@x#0W|+*RNm4VI`_C*-@}!UKiM;lgIa?(5S`} z=8^4yh@>*G>E@P>C^TU!QB{!bfYA^b@DR{44+2M~yu1<$jT*y*c_d{+Q1-g@{5jav pd-v{xX+aj;bp&DSM^!K|001kOcMS@q!bJc8002ovPDHLkV1k2!W9$F` literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/sec_open.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/sec_open.png new file mode 100644 index 0000000000000000000000000000000000000000..b6b428dcf827a25b44618c27efaf54937156ed5f GIT binary patch literal 734 zcmV<40wMj0P)1VIr*EUkStBI_L^B#6#3dq2+1xy+n_(4=i-yqYLvvc4Oih-q{43tHV1 z4Rq4N5YeRJIa4#^3H}}LH&m&5-LHE6zwgh{v}}3?RMiU)8;j|xw&`i|mF;Wi_k zTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$Rj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H z+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnhIymU3CTB4is*%Van zzw`90!GTiua13f6g5aea>bBss7z7^&LGXD9)%S3gE&Fql)5x3X#j@752a$C+IWKGa zHk@ui`<;_?liyOc%#dZl^D#8fL+ceZE|#+TS?A~$5^M5Am$0)7J+eQt^aXoYXhVZ; z{@?%r010qNS#tmY3labT3lag+-G2N4009}E(rvZ+}(SRmn)%!*kK*84*c1HK^uP!3psFIq_&eSO;nc zTz7;$q3gceaJVa|dmsqbEEhzW983Uw0nh_5<9Kh9lfy;@wE+yDRo literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/warden.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/warden.png new file mode 100644 index 0000000000000000000000000000000000000000..80d7a43b265b6930ae54d8446a7adf8b8c4670bc GIT binary patch literal 773 zcmV+g1N!`lP)1VIr*EUkStBI_L^B#6#3dq2+1xy+n_(4=i-yqYLvvc4Oih-q{43tHV1 z4Rq4N5YeRJIa4#^3H}}LH&m&5-LHE6zwgh{v}}3?RMiU)8;j|xw&`i|mF;Wi_k zTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$Rj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H z+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnhIymU3CTB4is*%Van zzw`90!GTiua13f6g5aea>bBss7z7^&LGXD9)%S3gE&Fql)5x3X#j@752a$C+IWKGa zHk@ui`<;_?liyOc%#dZl^D#8fL+ceZE|#+TS?A~$5^M5Am$0)7J+eQt^aXoYXhVZ; z{@?%r010qNS#tmY3labT3lag+-G2N400BKoL_t(o31eUwV8BSM{hFGZ|3PXU9z6nU zIizU~rvH6?45rbE>({RnWi|`CMr?eLz2xtouywF(U2JgIgG4xCDrD z052~u!}I4)!Fc=i>tM4sFw2AKAFt12H5;Ud7(i530p)_vpFb009$XE`0mS42qCx;> zDkmo=jER^2{{1^%d1T4aTre5}10Dh-24D9M!= zS|Py1M1A*C-$WAQf}}Js8UjCm{vSQRl$Jg zf&q5`Nm20Z*)vi@n4o&19Dv-!Cbn~mtcRd022ue4@xw;#9gQ-g00000NkvXXu0mjf D`=(Y2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/warden_door.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/warden_door.png new file mode 100644 index 0000000000000000000000000000000000000000..c5125a6df162dd0551829231af062928c107f351 GIT binary patch literal 830 zcmV-E1Ht@>P)1VIr*EUkStBI_L^B#6#3dq2+1xy+n_(4=i-yqYLvvc4Oih-q{43tHV1 z4Rq4N5YeRJIa4#^3H}}LH&m&5-LHE6zwgh{v}}3?RMiU)8;j|xw&`i|mF;Wi_k zTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$Rj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H z+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnhIymU3CTB4is*%Van zzw`90!GTiua13f6g5aea>bBss7z7^&LGXD9)%S3gE&Fql)5x3X#j@752a$C+IWKGa zHk@ui`<;_?liyOc%#dZl^D#8fL+ceZE|#+TS?A~$5^M5Am$0)7J+eQt^aXoYXhVZ; z{@?%r010qNS#tmY3labT3lag+-G2N400DMML_t(o31eUw1*0J_8UiCd1Q>}80AIhL z|H2{?4EZ-Ng0*Z4NCDILub;*+;_aIk44XHtBg$+R4Ba>cK$gFF_K@N3y?bC4m#*Fc z(_dda#LyujC66J7OMqwxfP94uAX^A>BtEt1W)STFbdAXTYgf*|xk5ssa5gavsyIMP z#{_N{CBJ9mzuy1I@5IR}7TgwBV%5(k3` zhd74t?_WQ`Vj#;wz{tpmp|!OMTsD9Opadupl9CXKcEB&F1CT9)vERLW&9Gy~Rt97m zCP#=S+5v)C99Z;=}-= zYAldJPEIcW+1S{znu(n9K?x9)UiR(VLzLMhmxL)7AyKg0JqhfXufXzv?&Sb_FpSm( zqai?QBLq1Ok(3KS+3VKx=V1N!?%fB|f-I0a0@=_}HYp(h0NbgN{27M3DgXcg07*qo IM6N<$f)1i?cK`qY literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/warden_open.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/warden_open.png new file mode 100644 index 0000000000000000000000000000000000000000..b6b428dcf827a25b44618c27efaf54937156ed5f GIT binary patch literal 734 zcmV<40wMj0P)1VIr*EUkStBI_L^B#6#3dq2+1xy+n_(4=i-yqYLvvc4Oih-q{43tHV1 z4Rq4N5YeRJIa4#^3H}}LH&m&5-LHE6zwgh{v}}3?RMiU)8;j|xw&`i|mF;Wi_k zTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$Rj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H z+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnhIymU3CTB4is*%Van zzw`90!GTiua13f6g5aea>bBss7z7^&LGXD9)%S3gE&Fql)5x3X#j@752a$C+IWKGa zHk@ui`<;_?liyOc%#dZl^D#8fL+ceZE|#+TS?A~$5^M5Am$0)7J+eQt^aXoYXhVZ; z{@?%r010qNS#tmY3labT3lag+-G2N4009}E(rvZ+}(SRmn)%!*kK*84*c1HK^uP!3psFIq_&eSO;nc zTz7;$q3gceaJVa|dmsqbEEhzW983Uw0nh_5<9Kh9lfy;@wE+yDRo literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Wallmounts/signs.rsi/armory.png b/Resources/Textures/_DV/Structures/Wallmounts/signs.rsi/armory.png new file mode 100644 index 0000000000000000000000000000000000000000..ee7f1dea8bc373736128147310a474a00db1fc8a GIT binary patch literal 911 zcmV;A191F_P)Aww0B7K(z1lT@%vb!aPCbxE#CD(1QAzPe=SntyQa`0?F*Op;d}4gQko&;c+4$q{L(rSK9 z3ckaK5QZ>`IhonkQg$(iuJQ9o)f5kL(W`r1$LKGpHUoTp#52s|4)Hv3ddsl{?-38N zl3XA@A&zl6An~ox6_4Kp7d`$G%yXFqz%P1A#Wq&jn3cFeJV6{a^a^X9N8BW=nk!k# zBeX_gBZCx@kf5M~P3UkCr)<*9I{Ok0-!jVNVf4391t&)lCGy5dtx#8$vPQZ}pN^`S z`~P{`+VqsyJ)8u3UtRZe3<&N6^_uJcp1N-R3<$gc*JjIKra8@ilU{3S(PJR816>78&YytXHa*cDaCiiaQ+;IP4@)O# zEhnx}SO5S332;bRa{vGf5&!@T5&_cPe*6Fc0mMl}K~z`?Wj436phxmuO^d{HbCCINz+*w-3+SRA7@o=@2CwR-n0^ ztn&kqYt9nbA}Y`II!pk8>#J>l2*_jvZoBi$2oumX-H_=TFAFLOhI>E;VNLn>0Y{!{ z0to(#QAGgd&?O<6X!p}U+ye~2!-n$Hre}~~kLWYKPb;tsoB&b3v;vS`%FNr3z}cou z6CgN=WC2N(bE*UcM=CKW0H|K~AdKz{t>UM7~M zl6GqyBhbl?rjxgp-V>Cw1!mbo1Q4hbV=r$(thLPo)V44IT(KNl0rW;qbA|~>aBr;} zRI6sixo^ee^KlvU`&LYqZLwUI>HGB8tGRm{;$0pDB3H4C5z2*p)-V--Bfky2*J&%6 lXG?#WFwuW}ni1=8=Wo+*#bs9WiC6#t002ovPDHLkV1n-Zmu>(6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Wallmounts/signs.rsi/direction_brig.png b/Resources/Textures/_DV/Structures/Wallmounts/signs.rsi/direction_brig.png new file mode 100644 index 0000000000000000000000000000000000000000..6339a4ab0bbc5312b30d269e63515ae4f2816bc6 GIT binary patch literal 974 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 IM6N<$f literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Wallmounts/signs.rsi/meta.json b/Resources/Textures/_DV/Structures/Wallmounts/signs.rsi/meta.json index f0a3e1107407..96586c407e9e 100644 --- a/Resources/Textures/_DV/Structures/Wallmounts/signs.rsi/meta.json +++ b/Resources/Textures/_DV/Structures/Wallmounts/signs.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "directional sprites taken from https://github.com/space-wizards/space-station-14/commit/c1556214de46d66fe4057500e269b17438dc96ca | direction_mail modified by Hyenh, direction_logi modified by Floofers | direction_court, direction_justice by leonardo_dabepis (Discord) | chapel modified from upstream sprite by Lyndomen (github) | Logistics and Epistemics modified by JustAnOrange", + "copyright": "directional sprites taken from https://github.com/space-wizards/space-station-14/commit/c1556214de46d66fe4057500e269b17438dc96ca | direction_mail modified by Hyenh, direction_logi modified by Floofers | direction_court, direction_justice by leonardo_dabepis (Discord) | chapel modified from upstream sprite by Lyndomen (github) | Logistics and Epistemics modified by JustAnOrange | armory, direction_brig, direction_sec, interrogation, law, prison, and security sprites modified by TJohnson.", "size": { "x": 32, "y": 32 @@ -35,6 +35,32 @@ }, { "name": "logistics" + }, + { + "name": "armory" + }, + { + "name": "direction_brig", + "directions": 4 + }, + { + "name": "direction_sec", + "directions": 4 + }, + { + "name": "interrogation" + }, + { + "name": "law" + }, + { + "name": "prison" + }, + { + "name": "sec" + }, + { + "name": "security" } ] } diff --git a/Resources/Textures/_DV/Structures/Wallmounts/signs.rsi/prison.png b/Resources/Textures/_DV/Structures/Wallmounts/signs.rsi/prison.png new file mode 100644 index 0000000000000000000000000000000000000000..a3abcad188e78b1f002cf5a0bc99a489b264e5cd GIT binary patch literal 865 zcmV-n1D^beP)Aww0B7K(z1lT@%vb!aPCbxE#CD(1QAzPe=SntyQa`0?F*Op;d}4gQko&;c+4$q{L(rSK9 z3ckaK5QZ>`IhonkQg$(iuJQ9o)f5kL(W`r1$LKGpHUoTp#52s|4)Hv3ddsl{?-38N zl3XA@A&zl6An~ox6_4Kp7d`$G%yXFqz%P1A#Wq&jn3cFeJV6{a^a^X9N8BW=nk!k# zBeX_gBZCx@kf5M~P3UkCr)<*9I{Ok0-!jVNVf4391t&)lCGy5dtx#8$vPQZ}pN^`S z`~P{`+VqsyJ)8u3UtRZe3<&N6^_uJcp1N-R3<$gc*JjIKra8@ilU{3S(PJR816>78&YytXHa*cDaCiiaQ+;IP4@)O# zEhnx}SO5S332;bRa{vGf5&!@T5&_cPe*6Fc0hUQbK~z`?9TJxyC`}?IbfCB5MI$rzj1wG?Vkw%BCo^xJ*Y<7*hdz#S z1YBHRedgv%=3ZZ()mo|(iBWtw9E8(eucVF|`>|e!#bOyW5Gnu`KO2qIgxfgZ=W`Xr zNh%pTZ<S0oP_LZm*QA1aWzTr$K1N234%%Z zv1T2=@|ei7Y3*XCtUM{WblgO#ur*?jxFxpc${LI8kRnf7T8_u* zoXvVK#=+~3bx@$gjJij10!sgpc)d(w+y z7fj$szwlJUh@P-~Q=Ta`Cwy#P-mj+Rw%5OW^2eW#eCDgauj;s7w<@ChgGBsURrsQv zqu<}Naa&QMxwHCY?9=DNZ%g_n=0x!>)6wZ=nT_QB)}57gsWVb1 zNL_qE)$DVV_CGsy-toH*&a&V2#JC;XpMQRR)`i08SC*VQk$62O>O4CBvAye1jwxaG z*vVJlO|Q<$t9)(Nk<8uOUfp@U=dsq-u3w)?`fYgG!u+p_M@3!<``5FVzo|O%$bUyg zzQLVwH!pnI`scM34;FY@oaWcU7PK7{KjG?HO&fMk+tnO3C8ha*=V+5j*d8&Wx%QRj!sW}{o+XO8)6;Z&-X4MSirE0-Ea{_>n(Pem*Ck8L>VX>I*ju?b!rPp_5yhge6BI` z%)B|YeX?J5%;1|S?NCs|7l@NqL5 z2&9QDK`dOzr4==o7 zrVthcE+t^ZG($>2i1srEkp))HTf08_~vA-<< z1tKf4vk$@XXX-0fwOoBgU>8}TiWIX~l?1`Xpq8C&P^%jlDx4i{>c8f{N}N2gVg<|C z2_@+(dMBIn1(#L3essZ6Kl}N?8tD7|or?$#tv_LPv5)@#^=%XMQ^(RIL`2k4_ zPRtKP+P4w&|0>O=C5VDFO6YGioIpM?MsCB&$jHPu3W`x+F+K>b4+_X=5_oj8fr1fZ zWOlO|8NCHF>SZ)|F-G`aAmjAlM?(OlX&C|_js5Tf1xn2DG76N_AQ=S`V}uJ5$Y>O3 zbn}4*7Gvaf^BEca4LtH=G*~f4a6cg9!eB>30>rco2@qpH+(3O3Gu({&<}_$VeZ?5T zf(A00^&Nd5Km&;}vid$489fd(GB6sP7#*5@Qs4u8@@3z$)Gt|-YF}&lLvPiMfj4^_jLQjU62|TW)VOw=X;JzUSKE zDW1=^X1$kivHfadrFqs*AL2{t z(f@q%-%DDTCbf6lwzoB22u+FpU}J>kZEl>E9)5k|`UNPY^F&`6DOqy@&hd z#Y594A8(wWm^&l3qU3zj)d}4#D{b-JA%*v>c`kc@+n4Y!0he)a_RN}}En5FS3vFAz literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Wallmounts/signs.rsi/security.png b/Resources/Textures/_DV/Structures/Wallmounts/signs.rsi/security.png new file mode 100644 index 0000000000000000000000000000000000000000..508275e2e15f919df874d683e72de89987f41021 GIT binary patch literal 927 zcmV;Q17Q4#P)Aww0B7K(z1lT@%vb!aPCbxE#CD(1QAzPe=SntyQa`0?F*Op;d}4gQko&;c+4$q{L(rSK9 z3ckaK5QZ>`IhonkQg$(iuJQ9o)f5kL(W`r1$LKGpHUoTp#52s|4)Hv3ddsl{?-38N zl3XA@A&zl6An~ox6_4Kp7d`$G%yXFqz%P1A#Wq&jn3cFeJV6{a^a^X9N8BW=nk!k# zBeX_gBZCx@kf5M~P3UkCr)<*9I{Ok0-!jVNVf4391t&)lCGy5dtx#8$vPQZ}pN^`S z`~P{`+VqsyJ)8u3UtRZe3<&N6^_uJcp1N-R3<$gc*JjIKra8@ilU{3S(PJR816>78&YytXHa*cDaCiiaQ+;IP4@)O# zEhnx}SO5S332;bRa{vGf5&!@T5&_cPe*6Fc0n|xEK~z`?G!fww zNOUy$1XSEhcmyvwD)>YiIwU@kpfrh;qyy%pkv7Y&?M);ovPJA&+cV?!I(L`SsoPmD z0oOOTU%Bzf*vI>u$z=us4D!)vm@fML2#+~;x80`IYMm?*rT~&(j>jh8A;Hh((iCy- zf#r7o`tq2XX4)-99|oWOE}(uqyq=nubwScROjG+j>st0nj5zve+jf@4;-Gs3ldDM@ z4hEdpwFKV_8V-cr-9PP(tT&sqm@j_SK_~+f5hU8M^QgHsU;#1p9P3hzbPHl03+I&D zn1IT2tv!E;3kj&H0c3+kS=xPAfCQAs5ly?q31tA4EsKvLbPebmAPIFpBmj#o5d?*} z2sze;1z?dDf!HDBSQq*qU~wVk5W%7(IsYjET$_nv21tq)pmO)@lZ-;(%XJXsSy2FX zOLBmq&lr4?TXDuP&$H08zyqm?d(VPm25P{MnG-5PU1TM{Mp#UMy5}r95^10DTpKz9 z79Vy_L!ljGF#$hMLtZ_S@)ppKwxJ{7ZjlKXGlD*ZXdm&C{rfd^Gk|w_`A*2)mv$t_ z Date: Wed, 15 Jan 2025 09:08:34 +0100 Subject: [PATCH 115/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index ed243a30ff8e..dd64d111b203 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Lyndomen - changes: - - message: Death Acidifiers are now in Syndicate Uplinks once more - type: Tweak - id: 412 - time: '2024-07-01T20:03:52.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1356 - author: WarMechanic changes: - message: Updated DeltaV guns to be wieldable. @@ -3856,3 +3849,13 @@ id: 911 time: '2025-01-14T15:04:14.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2722 +- author: TadJohnson00 + changes: + - message: NanoTrasen Station Security have received another rollout of new uniform + apparel, and various stations are in the process of renovating their Security + departments; be careful of leaning against freshly painted airlocks especially + in freshly issued gear. + type: Tweak + id: 912 + time: '2025-01-15T08:08:15.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2695 From 36604e9d76f9c2638d0c2368dda6deae9bbb7783 Mon Sep 17 00:00:00 2001 From: Cody Veal Date: Wed, 15 Jan 2025 10:03:43 -0500 Subject: [PATCH 116/205] add bloodloss cryo meds (#2727) * add hemoxadone and cyanoxadone * bloodloss in not a real word i guess * require heating for both recipes * require cold temps for hemoxadone blood restoration * remove aberrant spaces --- .../en-US/_DV/reagents/meta/medicine.ftl | 5 ++ .../Prototypes/_DV/Reagents/medicine.yml | 81 +++++++++++++++++++ .../_DV/Recipes/Reactions/medicine.yml | 27 +++++++ .../Guidebook/Medical/Cryogenics.xml | 2 + 4 files changed, 115 insertions(+) create mode 100644 Resources/Locale/en-US/_DV/reagents/meta/medicine.ftl create mode 100644 Resources/Prototypes/_DV/Reagents/medicine.yml create mode 100644 Resources/Prototypes/_DV/Recipes/Reactions/medicine.yml diff --git a/Resources/Locale/en-US/_DV/reagents/meta/medicine.ftl b/Resources/Locale/en-US/_DV/reagents/meta/medicine.ftl new file mode 100644 index 000000000000..0c96c41b6c1d --- /dev/null +++ b/Resources/Locale/en-US/_DV/reagents/meta/medicine.ftl @@ -0,0 +1,5 @@ +reagent-name-hemoxadone = hemoxadone +reagent-desc-hemoxadone = A cryogenics chemical. Used to treat severe blood loss by regenerating red blood cells and promoting reperfusion. Works regardless of the patient being alive or dead. + +reagent-name-cyanoxadone = cyanoxadone +reagent-desc-cyanoxadone = A cryogenics chemical. Used to treat severe blood loss in blue-blooded creatures by regenerating hemocyanin and promoting reperfusion. Works regardless of the patient being alive or dead. diff --git a/Resources/Prototypes/_DV/Reagents/medicine.yml b/Resources/Prototypes/_DV/Reagents/medicine.yml new file mode 100644 index 000000000000..6c6333d1ee4e --- /dev/null +++ b/Resources/Prototypes/_DV/Reagents/medicine.yml @@ -0,0 +1,81 @@ +- type: reagent + id: Hemoxadone + name: reagent-name-hemoxadone + group: Medicine + desc: reagent-desc-hemoxadone + physicalDesc: reagent-physical-desc-metallic + flavor: medicine + color: "#ee0044" + worksOnTheDead: true + metabolisms: + Poison: + effects: + - !type:HealthChange + conditions: + - !type:OrganType + type: Arachnid + shouldHave: true + damage: + types: + Poison: 2 + Medicine: + effects: + - !type:HealthChange + conditions: + - !type:Temperature + max: 213.0 + - !type:OrganType + type: Arachnid + shouldHave: false + damage: + types: + Bloodloss: -6 + - !type:ModifyBloodLevel + conditions: + - !type:Temperature + max: 213.0 + - !type:OrganType + type: Arachnid + shouldHave: false + amount: 6 + +- type: reagent + id: Cyanoxadone + name: reagent-name-cyanoxadone + group: Medicine + desc: reagent-desc-cyanoxadone + physicalDesc: reagent-physical-desc-metallic + flavor: medicine + color: "#00eeff" + worksOnTheDead: true + metabolisms: + Poison: + effects: + - !type:HealthChange + conditions: + - !type:OrganType + type: Arachnid + shouldHave: false + damage: + types: + Poison: 2 + Medicine: + effects: + - !type:HealthChange + conditions: + - !type:Temperature + max: 213.0 + - !type:OrganType + type: Arachnid + shouldHave: true + damage: + types: + Bloodloss: -6 + - !type:ModifyBloodLevel + conditions: + - !type:Temperature + max: 213.0 + - !type:OrganType + type: Arachnid + shouldHave: true + amount: 6 diff --git a/Resources/Prototypes/_DV/Recipes/Reactions/medicine.yml b/Resources/Prototypes/_DV/Recipes/Reactions/medicine.yml new file mode 100644 index 000000000000..f9a007bf73f4 --- /dev/null +++ b/Resources/Prototypes/_DV/Recipes/Reactions/medicine.yml @@ -0,0 +1,27 @@ +- type: reaction + id: Hemoxadone + minTemp: 370 + reactants: + Iron: + amount: 2 + Traumoxadone: + amount: 1 + Blood: + amount: 1 + catalyst: true + products: + Hemoxadone: 2 + +- type: reaction + id: Cyanoxadone + minTemp: 370 + reactants: + Copper: + amount: 2 + Traumoxadone: + amount: 1 + CopperBlood: + amount: 1 + catalyst: true + products: + Cyanoxadone: 2 diff --git a/Resources/ServerInfo/Guidebook/Medical/Cryogenics.xml b/Resources/ServerInfo/Guidebook/Medical/Cryogenics.xml index 89b5ae5f1da3..14a486a13ce5 100644 --- a/Resources/ServerInfo/Guidebook/Medical/Cryogenics.xml +++ b/Resources/ServerInfo/Guidebook/Medical/Cryogenics.xml @@ -48,6 +48,8 @@ The standard pressure for a gas pump is 100.325 kpa. Cryoxadone works at under 1 + + From 7ca7d9c9e932d151cbb8bd611e994b10ab48ea82 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Wed, 15 Jan 2025 16:04:05 +0100 Subject: [PATCH 117/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index dd64d111b203..643571d947f1 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: WarMechanic - changes: - - message: Updated DeltaV guns to be wieldable. - type: Tweak - id: 413 - time: '2024-07-01T20:04:40.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1378 - author: deltanedas changes: - message: Psionic-hunting Wisps can now appear when glimmer gets too high. @@ -3859,3 +3852,10 @@ id: 912 time: '2025-01-15T08:08:15.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2695 +- author: cjhveal + changes: + - message: Added hemoxadone and cyanoxadone + type: Add + id: 913 + time: '2025-01-15T15:03:43.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2727 From 6ec871e5d36188ed6192e86a8c5606f5290200a6 Mon Sep 17 00:00:00 2001 From: deltanedas <@deltanedas:kde.org> Date: Tue, 14 Jan 2025 15:07:23 +0000 Subject: [PATCH 118/205] :trollface: --- Resources/ConfigPresets/DeltaV/deltav.toml | 2 +- .../Entities/Objects/Devices/pda.yml | 14 +--- .../_DV/Entities/Objects/Devices/pda.yml | 70 +++++++++++++++---- 3 files changed, 58 insertions(+), 28 deletions(-) diff --git a/Resources/ConfigPresets/DeltaV/deltav.toml b/Resources/ConfigPresets/DeltaV/deltav.toml index 4bd3d8cabce7..3157c4000cc1 100644 --- a/Resources/ConfigPresets/DeltaV/deltav.toml +++ b/Resources/ConfigPresets/DeltaV/deltav.toml @@ -4,7 +4,7 @@ lobbyenabled = true lobbyduration = 240 round_end_pacifist = true contraband_examine = false # Doubtful that it's desired at all, and would require going over every item in accordance with SOP -secret_weight_prototype = SecretDeltaV +secret_weight_prototype = "SecretDeltaV" # New players can't join a server without admins [game.panic_bunker] diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 3c411801611e..7d70d830a01a 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -393,18 +393,6 @@ id: ChaplainPDA description: God's chosen PDA. components: - - type: Sprite # DeltaV - Give Chaplain PDA Epistemics colors - sprite: _DV/Objects/Devices/pda.rsi # DeltaV aPDA Resprite File Path - layers: - - map: [ "enum.PdaVisualLayers.Base" ] - - state: "light_overlay" - map: [ "enum.PdaVisualLayers.Flashlight" ] - shader: "unshaded" - visible: false - - state: "id_overlay" - map: [ "enum.PdaVisualLayers.IdLight" ] - shader: "unshaded" - visible: false - type: Pda id: ChaplainIDCard - type: Appearance @@ -1073,7 +1061,7 @@ - type: Tag # Ignore Chameleon tags tags: - DoorBumpOpener - - ChameleonWhitelist # DeltaV - it has a unique sprite + - WhitelistChameleon # DeltaV - it has a unique sprite - type: entity parent: BasePDA diff --git a/Resources/Prototypes/_DV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_DV/Entities/Objects/Devices/pda.yml index 13e2978e327a..82184622b982 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Devices/pda.yml @@ -481,7 +481,10 @@ components: - type: Pda id: LifeSupportTechIDCard - state: pda-lifesupporttech # - aPDA Sprite Rework + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: !type:String + pda-lifesupporttech - type: entity parent: AtmosPDA @@ -490,7 +493,10 @@ components: - type: Pda id: PlasmaScientistIDCard - state: pda-plasmatech # - aPDA Sprite Rework + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: !type:String + pda-plasmatech # Station Engineer @@ -502,7 +508,10 @@ components: - type: Pda id: ElectricianIDCard - state: pda-electrician # - aPDA Sprite Rework + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: !type:String + pda-electrician - type: entity parent: EngineerPDA @@ -512,7 +521,10 @@ components: - type: Pda id: MechanicIDCard - state: pda-mechanic # - aPDA Sprite Rework + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: !type:String + pda-mechanic # Cargo Technician @@ -524,7 +536,10 @@ components: - type: Pda id: DeckWorkerIDCard - state: pda-deckworker # - aPDA Sprite Rework + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: !type:String + pda-deckworker - type: entity parent: CargoPDA @@ -533,7 +548,10 @@ components: - type: Pda id: InventoryAssociateIDCard - state: pda-inventoryassociate # - aPDA Sprite Rework + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: !type:String + pda-inventoryassociate # Salvage Technician @@ -544,7 +562,10 @@ components: - type: Pda id: ProspectorIDCard - state: pda-prospector # - aPDA Sprite Rework + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: !type:String + pda-prospector - type: entity parent: SalvagePDA @@ -553,7 +574,10 @@ components: - type: Pda id: ExcavatorIDCard - state: pda-excavator # - aPDA Sprite Rework + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: !type:String + pda-excavator # Scientist @@ -565,7 +589,10 @@ components: - type: Pda id: LabTechIDCard - state: pda-labsci # - aPDA Sprite Rework + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: !type:String + pda-labsci - type: entity parent: SciencePDA @@ -574,7 +601,10 @@ components: - type: Pda id: XenoarchIDCard - state: pda-xenobio # - aPDA Sprite Rework + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: !type:String + pda-xenobio - type: entity parent: SciencePDA @@ -584,7 +614,10 @@ components: - type: Pda id: RoboticistIDCard - state: pda-roboticist # - aPDA Sprite Rework + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: !type:String + pda-roboticist # Clown @@ -596,7 +629,10 @@ components: - type: Pda id: JesterIDCard - state: pda-jester # - aPDA Sprite Rework + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: !type:String + pda-jester - type: entity parent: ClownPDA @@ -606,7 +642,10 @@ components: - type: Pda id: FoolIDCard - state: pda-fool # - aPDA Sprite Rework + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: !type:String + pda-fool # Janitor @@ -618,4 +657,7 @@ components: - type: Pda id: HygieneTechnicianIDCard - state: pda-hygienetechnician + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: !type:String + pda-hygienetechnician From 2f109d4cbefadfab001b3f53e2dc02ec303eb861 Mon Sep 17 00:00:00 2001 From: HTML/Crystal <152909599+HTMLSystem@users.noreply.github.com> Date: Wed, 15 Jan 2025 14:18:12 -0500 Subject: [PATCH 119/205] Better command winter boots (WORKS NOW) (#2734) * Ce boots part one Gonna be real just commiting this so I can start another project * Redo ce boots * CMO boots * Captain boots * HoP boots * LO boots * Mysta boots * Warden boots * Centcomm boots * Atmos boots * chem boots * clown boots * gene boots * botanist boots * Jani boots * mime boots * salv boots * paramed boots * robo boots * viro boots * meta.json changes * FORGET CHEF BOOTS OOPS --- .../winterbootsatmos.rsi/equipped-FEET.png | Bin 490 -> 3308 bytes .../Shoes/Boots/winterbootsatmos.rsi/icon.png | Bin 631 -> 3308 bytes .../Boots/winterbootsatmos.rsi/inhand-left.png | Bin 404 -> 3163 bytes .../winterbootsatmos.rsi/inhand-right.png | Bin 405 -> 3162 bytes .../Shoes/Boots/winterbootsatmos.rsi/meta.json | 2 +- .../Boots/winterbootscap.rsi/equipped-FEET.png | Bin 493 -> 3322 bytes .../Shoes/Boots/winterbootscap.rsi/icon.png | Bin 556 -> 3268 bytes .../Boots/winterbootscap.rsi/inhand-left.png | Bin 399 -> 3173 bytes .../Boots/winterbootscap.rsi/inhand-right.png | Bin 401 -> 3175 bytes .../Shoes/Boots/winterbootscap.rsi/meta.json | 2 +- .../Boots/winterbootsce.rsi/equipped-FEET.png | Bin 471 -> 3319 bytes .../Shoes/Boots/winterbootsce.rsi/icon.png | Bin 569 -> 3212 bytes .../Boots/winterbootsce.rsi/inhand-left.png | Bin 388 -> 3146 bytes .../Boots/winterbootsce.rsi/inhand-right.png | Bin 390 -> 3143 bytes .../Shoes/Boots/winterbootsce.rsi/meta.json | 2 +- .../winterbootscentcom.rsi/equipped-FEET.png | Bin 511 -> 3299 bytes .../Boots/winterbootscentcom.rsi/icon.png | Bin 576 -> 3267 bytes .../winterbootscentcom.rsi/inhand-left.png | Bin 404 -> 3174 bytes .../winterbootscentcom.rsi/inhand-right.png | Bin 405 -> 3175 bytes .../Boots/winterbootscentcom.rsi/meta.json | 2 +- .../winterbootschef.rsi/equipped-FEET.png | Bin 582 -> 3421 bytes .../Shoes/Boots/winterbootschef.rsi/icon.png | Bin 697 -> 3381 bytes .../Boots/winterbootschef.rsi/inhand-left.png | Bin 410 -> 3167 bytes .../Boots/winterbootschef.rsi/inhand-right.png | Bin 409 -> 3166 bytes .../Shoes/Boots/winterbootschef.rsi/meta.json | 2 +- .../winterbootschem.rsi/equipped-FEET.png | Bin 494 -> 3308 bytes .../Shoes/Boots/winterbootschem.rsi/icon.png | Bin 542 -> 3220 bytes .../Boots/winterbootschem.rsi/inhand-left.png | Bin 401 -> 3167 bytes .../Boots/winterbootschem.rsi/inhand-right.png | Bin 402 -> 3168 bytes .../Shoes/Boots/winterbootschem.rsi/meta.json | 2 +- .../winterbootsclown.rsi/equipped-FEET.png | Bin 520 -> 3321 bytes .../Shoes/Boots/winterbootsclown.rsi/icon.png | Bin 566 -> 3256 bytes .../Boots/winterbootsclown.rsi/inhand-left.png | Bin 404 -> 3170 bytes .../winterbootsclown.rsi/inhand-right.png | Bin 391 -> 3171 bytes .../Shoes/Boots/winterbootsclown.rsi/meta.json | 2 +- .../Boots/winterbootscmo.rsi/equipped-FEET.png | Bin 480 -> 3348 bytes .../Shoes/Boots/winterbootscmo.rsi/icon.png | Bin 643 -> 3268 bytes .../Boots/winterbootscmo.rsi/inhand-left.png | Bin 400 -> 3163 bytes .../Boots/winterbootscmo.rsi/inhand-right.png | Bin 402 -> 3164 bytes .../Shoes/Boots/winterbootscmo.rsi/meta.json | 2 +- .../Boots/winterbootsgen.rsi/equipped-FEET.png | Bin 503 -> 3310 bytes .../Shoes/Boots/winterbootsgen.rsi/icon.png | Bin 557 -> 3239 bytes .../Boots/winterbootsgen.rsi/inhand-left.png | Bin 355 -> 3168 bytes .../Boots/winterbootsgen.rsi/inhand-right.png | Bin 354 -> 3167 bytes .../Shoes/Boots/winterbootsgen.rsi/meta.json | 2 +- .../Boots/winterbootshop.rsi/equipped-FEET.png | Bin 445 -> 3263 bytes .../Shoes/Boots/winterbootshop.rsi/icon.png | Bin 483 -> 3185 bytes .../Boots/winterbootshop.rsi/inhand-left.png | Bin 405 -> 3154 bytes .../Boots/winterbootshop.rsi/inhand-right.png | Bin 406 -> 3151 bytes .../Shoes/Boots/winterbootshop.rsi/meta.json | 2 +- .../winterbootshydro.rsi/equipped-FEET.png | Bin 489 -> 3307 bytes .../Shoes/Boots/winterbootshydro.rsi/icon.png | Bin 602 -> 3224 bytes .../Boots/winterbootshydro.rsi/inhand-left.png | Bin 408 -> 3173 bytes .../winterbootshydro.rsi/inhand-right.png | Bin 411 -> 3170 bytes .../Shoes/Boots/winterbootshydro.rsi/meta.json | 2 +- .../winterbootsjani.rsi/equipped-FEET.png | Bin 489 -> 3303 bytes .../Shoes/Boots/winterbootsjani.rsi/icon.png | Bin 612 -> 3288 bytes .../Boots/winterbootsjani.rsi/inhand-left.png | Bin 406 -> 3171 bytes .../Boots/winterbootsjani.rsi/inhand-right.png | Bin 408 -> 3171 bytes .../Shoes/Boots/winterbootsjani.rsi/meta.json | 2 +- .../winterbootsmime.rsi/equipped-FEET.png | Bin 464 -> 3364 bytes .../Shoes/Boots/winterbootsmime.rsi/icon.png | Bin 475 -> 3154 bytes .../Boots/winterbootsmime.rsi/inhand-left.png | Bin 384 -> 3190 bytes .../Boots/winterbootsmime.rsi/inhand-right.png | Bin 379 -> 3191 bytes .../Shoes/Boots/winterbootsmime.rsi/meta.json | 2 +- .../winterbootsminer.rsi/equipped-FEET.png | Bin 491 -> 3299 bytes .../Shoes/Boots/winterbootsminer.rsi/icon.png | Bin 615 -> 3228 bytes .../Boots/winterbootsminer.rsi/inhand-left.png | Bin 401 -> 3166 bytes .../winterbootsminer.rsi/inhand-right.png | Bin 404 -> 3166 bytes .../Shoes/Boots/winterbootsminer.rsi/meta.json | 2 +- .../winterbootsparamed.rsi/equipped-FEET.png | Bin 457 -> 3275 bytes .../Boots/winterbootsparamed.rsi/icon.png | Bin 468 -> 3216 bytes .../winterbootsparamed.rsi/inhand-left.png | Bin 412 -> 3162 bytes .../winterbootsparamed.rsi/inhand-right.png | Bin 414 -> 3162 bytes .../Boots/winterbootsparamed.rsi/meta.json | 2 +- .../Boots/winterbootsqm.rsi/equipped-FEET.png | Bin 506 -> 3301 bytes .../Shoes/Boots/winterbootsqm.rsi/icon.png | Bin 569 -> 3205 bytes .../Boots/winterbootsqm.rsi/inhand-left.png | Bin 426 -> 3164 bytes .../Boots/winterbootsqm.rsi/inhand-right.png | Bin 404 -> 3163 bytes .../Shoes/Boots/winterbootsqm.rsi/meta.json | 2 +- .../Boots/winterbootsrd.rsi/equipped-FEET.png | Bin 509 -> 3440 bytes .../Shoes/Boots/winterbootsrd.rsi/icon.png | Bin 575 -> 3219 bytes .../Boots/winterbootsrd.rsi/inhand-left.png | Bin 411 -> 3177 bytes .../Boots/winterbootsrd.rsi/inhand-right.png | Bin 409 -> 3175 bytes .../Shoes/Boots/winterbootsrd.rsi/meta.json | 2 +- .../winterbootsrobo.rsi/equipped-FEET.png | Bin 488 -> 3306 bytes .../Shoes/Boots/winterbootsrobo.rsi/icon.png | Bin 573 -> 3213 bytes .../Boots/winterbootsrobo.rsi/inhand-left.png | Bin 391 -> 3169 bytes .../Boots/winterbootsrobo.rsi/inhand-right.png | Bin 394 -> 3168 bytes .../Shoes/Boots/winterbootsrobo.rsi/meta.json | 2 +- .../winterbootsviro.rsi/equipped-FEET.png | Bin 503 -> 3317 bytes .../Shoes/Boots/winterbootsviro.rsi/icon.png | Bin 542 -> 3209 bytes .../Boots/winterbootsviro.rsi/inhand-left.png | Bin 355 -> 3163 bytes .../Boots/winterbootsviro.rsi/inhand-right.png | Bin 354 -> 3161 bytes .../Shoes/Boots/winterbootsviro.rsi/meta.json | 2 +- .../winterbootswarden.rsi/equipped-FEET.png | Bin 495 -> 3270 bytes .../Shoes/Boots/winterbootswarden.rsi/icon.png | Bin 595 -> 3215 bytes .../winterbootswarden.rsi/inhand-left.png | Bin 396 -> 3166 bytes .../winterbootswarden.rsi/inhand-right.png | Bin 398 -> 3165 bytes .../Boots/winterbootswarden.rsi/meta.json | 2 +- 100 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsatmos.rsi/equipped-FEET.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsatmos.rsi/equipped-FEET.png index ae08e73e3e115fadbc70e80df6f15748049b0407..210d39bef29b9cb1d744d5efead3cec4a75c271c 100644 GIT binary patch delta 3285 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 diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsatmos.rsi/icon.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsatmos.rsi/icon.png index 2888071af79b1fd52f6f1f831763b22c1fd6df65..08a0eaf5412b210eaa89ba19b436c501d7cb8e75 100644 GIT binary patch delta 3285 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 delta 359 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 Zfmbf&MXJ};!ht`kul*4IpC&T$e*jF=?*#w= delta 360 zcmV-u0hj*T7?lH%BpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPlb{M0e*r26P0vn{Fr?!`l1bSnEH6=a(Jc2#|trZ0XjXg#a3JImw_EbOv{h3{F zlO^0Cx5i{w|1Y`hgxr$Z+3RKm000000N}sL#p|B&{c}{Qlx4A4ioMp(&r~*ib{tB|>pL&q1)@3w2z4(e(kD_9|jvl-| zym4&)dxvQ@>biQ{&02~lCH;+E z8tMgAIYm{^#J1V|&D$>^^!xz;000000001fm2;OQ^!WiJaX#QXLZQzO*qm-F^!Wjs zbE2Wo4;Yz~H7#bR{(I=`p1U1~GCziai diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsatmos.rsi/meta.json b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsatmos.rsi/meta.json index f0fd68e2074f..2c5c4b325e10 100644 --- a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsatmos.rsi/meta.json +++ b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsatmos.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "drawn by Kilk", + "copyright": "drawn by Kilk, modified by HTMLSystem", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootscap.rsi/equipped-FEET.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootscap.rsi/equipped-FEET.png index 4e5dcb6a19cad535243b380633d65ad13d0858dd..fe2f04d755729b1b78063a61893a0c53f9bb9f5a 100644 GIT binary patch literal 3322 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 UslydT{uBq$*D;3ut&NQNFZS^?zyJUM delta 449 zcmV;y0Y3iv8SMj*BpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPlb{M0e*uC?L_t(| zUhUdHOF~f?$MJI;EyKkikqjDLtrs92W0 z&a^(dMsn}?JUBhrj@(@Gf9UKw)@Q~sj`}k;y|^Mzjdyc(|Ez10GItL#PXAiJTwaOf zDlIKW(c_M$tPjrJd-R5s`P8qiSM|~xJbC?Gq;Oc;*KwxxpqcO9nC9zSAcZ@*4PEOO z*EGw`6BCAw)cy)_>(_oR%tG@RJNVeM@ozG`yHQfWq__Oz|e`|$8UNh|tko2j) zTB&IIZU6uP000000000mB@*?|hI{go(yO;GPefYJ5bJz^Gu)GxoV3B(gXaa}O7yKs zNA~5iYL>U^W-gnttLb)x|KhsE;;Yv;?pdT;Y?r+y-T>E=7vnk?Fv_U20>Ygauv2e| rH$ZauOn{ig2H4@q8}kA>@Mg>}H7)$eL(t`~00000NkvXXu0mjfkOSGk diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootscap.rsi/icon.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootscap.rsi/icon.png index 1712e51895a843660544a3ab28c1b7332b7a6d30..c7798af275cb118cf91445cd04cddf5e877ed578 100644 GIT binary patch delta 3245 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 delta 512 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 Yhmf??wvd?0{}uuUx({{!)j~!74;1F`B>(^b delta 354 zcmV-o0iFKk7>@&xBpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPlb{M0e*q*(L_t(| zUhUekY63wJfZ@?H60uPbB<2BZd;|r>E-3@HLf%2J3iuAbLCT~|qkRg~uv-900000;J?X4QQe@|2`Z(6ELIyijE}?TM02|4 zCzXw&s$+{canyeZqT7ygf6YHfDqp}|qi$W~>*T{auWSCV&~7z@VA>6jcx+;H`6So; zq|_@}y(x!_-0t?0zs`l{jM+<5Ztur3|5{q-bj?4P>ch<9=e5Dl`148P@zvrzjK$5H z^#xq>FQHxlvvY>oy?A_Rz1~_2;F1pj00000000003vd6jX!Q@IJklSKHqHJ4FTa34 z(LdlytAD_|N@@2GcvXNj`Uku#0R00106>SxHy1SDP?N%HfB*mh07*qoM6N<$f(vq` ACjbBd diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootscap.rsi/inhand-right.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootscap.rsi/inhand-right.png index 8a10bb967e952879d88ef1b09b4ec548e154ec55..a14fd55eec7969970ff243d26e7d4477f96dfd26 100644 GIT binary patch delta 3151 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 pKvBF000000)*DO%0DvV2_ySN6k&vq`Fr)wg002ovPDHLkV1oU5?N$H) delta 356 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 C_$~DS delta 427 zcmV;c0aX6?8P@}lBpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPlb{M0e*tVsL_t(| zUhUe!O2a@9fZ<82ptN2@r1T}MH*If5d;7c9<+m42ljxzze!2mA_%%frQD*+7-WPwt+3d-Vn~fD4hof=g3t7BbiHiyd>){xfp>6YXYy#q96d-AI6T@c=6{azqR5@|M8)4T8)u>(ZD08`K< VVZD));s5{u07*qo1w^hwV1kvv(|`Z~ diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsce.rsi/icon.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsce.rsi/icon.png index a489b704b50c6c92a88d4f6192b665c788ba5224..1dbf3d9841a8c7b36afe3d2f03241b32aa39e405 100644 GIT binary patch delta 3188 zcmV-)42$!*1dJJwB!2{FK}|sb0I`n?{9y$E017v0Lqkw=Qb$4{Nkv08F*!CiEix`K z002mdotAf0Q`r`W&%HOjP?8Xel+bHvQUXW~y-1NRDlrKVO2Ci+A~r-+a70m&rU)`9 z;DDn;k+C9*g#l5q>jW7@)NybW8eS9UZc9vd* zf9@GXANa%eSALld0I;TIwb}ZIZD|z%UF!i*yZwjFU@riQvc7c=eQ_STd|pz-;w)z? ztK8gNO97v2DKF^n`kxMeLtlK)Qoh~qM8wF>;&Ay4=AVc7 z9|!(*9)A`Q{3O1JFO)?@%ce{qOqR7<$Ps@_@A2i55xYX*}0a9+V~OBmRJI% zAsRq_9snpR5g-YBWGm3`eGA4%1NqI1(V3W?`_F>@eOI_l{>T<2e~x2EL^8M%QO@j| z{8|DuAOJ-`1L{B<=mQhL1h&8txBw5}0|G%Ph<^leU@_o=6p#T#AQu#XwV)W3f~{aD zs0MYQ5j2A~a2RxfW8gG62QGojU!?g~$*UQipUPL&zMmg;!4Do9IA%up=Rh?=qPj=x&RGBx1dpI68aT-2O}^EromdU z5r1q2vtUm+2#$mo!O8G4I3F&8x4@Nf1AGwfgiphl;1O5~KY^zafDjQnqKhyQ7Q#kC zk$5Bt5h1IP5~KoYK-!QVq#wD8NRg+=TNDOGMKMrJlncrq6@}uWmZ4UmHlwOh2T+}; zKGapzC~6Az5lu#GqRr9H=m2yqIvJgdE`LT>pqtPg=(Fe%^f>wz27{qvj4_TFe@q-E z6|(}f8M7PHjyZ)H#*AU6u~@7+)*S1K4aIV>Vr((C3VRTH5_<(Zj(vk8;&gDfIA2^m zPKYbSRp451CvaDA6Sx_?65bH+j1R^0@XPUK_(psWeh5E~pCKp{j0vuUNJ1)MEq|es z&_*~*xJ!6JBog(APQ-AcfVhTONjyY6PaGw_B~eIbBsM95Bq41f?I)cg-6FjplgUP8 z4{|(NOx{9nCZ8eSC%;jkDp)E6DDV_kE7T}-DqK-`rifQGRP zUdc#_t;A7UrBtJIROyD&v@%uMMt?a}IYW7~a*Of>RIYI4MQ`g1<+DyrL=EogS06Xii({|v`U^zjmmKqDIK93(F5q|^fLNk z`gQs{RV`IdRle#b)i%{Ds;|}NsClUI)k@Ub)kf6bsWa4l)YH_rsduU0(|LZ@rEqJ6vJJH{f4iNjE!Q9HW+moJu+4^4lvF) zZZ*DZLN;+XS!U8;a?KQD$}&we-EDf=3^ubjOEIf48#0H@9n1yhyUm9!&=yV>LW>5A z8%z?@lbOS8WsX|XErTr!ExRnASs7TxTWz!IxB6&pZ=G)4Xnn_qVt*58Q)ts;^Q*0y zE!Vcj_S#(XT;I8?=XTG1Zf9=Cx7%ZP)1GP{V!y$@*ZzZpql3ty&0*5fz%kLW*6{|5 z#tLI?W}SCJJ9#;+b~@(t*4e>X?0ney7Z;{WnoEnzqj|>j`12a)jk)T%a$M_OrEUzj zM7OZX~g?%5634ad@uL*w`VG~gh(Z7JY zV9A1(1+OB#BFiH0M43cMqI#nhqZ6W=qhH5($CSrNW36IW#$Jlkh!ezh$7AE8xdr`1lgVC7dNk648kGzWRKONg3!bO?r`DyuP76)j zpY|y|CcQlamywupR7eq~3Hvg&GxIWsv&^%Kv!u(Mm+f3OB?=NXWkcDEvb)7J+0WE~ z#6+@QGMeL-Q%XSL?4XT0OqTZ_RsyNzibcgYHn?o4 z+lbmI*f_Xp?xw0uA4_;87fY>6D@xyQ=5D_DmCaX`Uwzt=v}Lf&p={4q%vRyn>)YJ7 z9Vk~W&wno;+a9vLa|dHb$&Qyhm+ZVyVOLSNi?B z>BD~Ee(8aT1AWbo&CM;EEoH56tE6@EV8X%6-+y?2)7{2wt8b^bmmUI#B!?bmEKDc(k|2rKjV2%kTFe(>+#mT;+J# z3Brk@6Q54zpPW9Gb?WKqB=X}qd>G$kEdEWK>u?x-@ zj(=WcUF^E#aH(^^exTzA`yV<69R@px9EZ9uJ6-M>o;Q5riu;w*SG}*EyB2Wm(#ZUg z;pqt>?FMZqM9Va~FNLH%A*>}Hq z{4y{VJ2n1X^!(GWn_sBE*#FY*W$$#@^!-;EuV!ACyitF1;4SNI|GSuX6EnH*vF|HC zn11N_81(V(r;JaZegpS}^ZUoqJ9q#903c&XQcVB=dL{q>fP?@5`Tzg`fam}KbrCQC z0P0`>06Lfe02gqax=}olJ{Nxg8+1ijbW?9;ba!ELWdK8EY;$>YAX9X8WNB|8RBvx= z!KdMT0004)NklQFTTwwn z|3Ev|r5>8Vj^3czV`UC$Gb$B9HD zRk_(~T9);-B}c@s06V(}6@vqTAexpXm3m-hWsyW8QBeb|`sKx5;{bs9g$-*$p-{B) zj*d2*aX$A%JX3d4PGeQQ*p9aM3`RUqE?4P8tBnrYQWtpe;-T&%k7PA+xRk zImJ2()en3?<_5wu&WIlY)CAB4yo0=8?A{M*9Pk>KJW)Oh6EIi+6d`k6Cm?e!DjWm^ zXa@?A$wKZ8#)be7&s{CkvI?wGii61m(nJf0!w zIl8ilmFRkXZ_Ld6T*$Ice^)JcgjsRDh?&lrSzX%{a$$n48_+Zj+3Za{a}mz(#TQx3 zc%9L&@9xCp-VECogr|e`Zazz|P?R#t4!GpC)YAGDY=y z1?b0iaEJngxQ1xbv!v%pS4S38=62_VqxN8rK_Wt+x$e*&sa81;S9_ed8l z>)XEp$pk%+Un#`Zlw31%z9xD*+WKPjy!cj-S=&e=vK(saE}wrwI-QY|U<9?NE_jj2 zT>Z{}Sv*G5JvRjHBjHeeZM-fh##CQpU!r(~n3^27^r0gQgoi?<7^V%4R(4KZiW!Po zijnF$g*D?;xNlc=XK6*-8xZW}1H~Q1JxygPD6NqCBL#Cy=P0q3-nx|bMCcrfBxdCa zOImtk^k0WN%6wcqISV$FC+aKyQwAmi*mw;Nal!#{qr-ZP@;P!Uy~~ P00000NkvXXu0mjfKJNO9 diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsce.rsi/inhand-left.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsce.rsi/inhand-left.png index f3f291d6b5285ea71defd879bdac42d3ee31e2cc..8dc934f95cd9fb512cebf29baeed0e0ae478bca4 100644 GIT binary patch delta 3122 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 M07*qoM6N<$g18;ti2wiq delta 343 zcmV-d0jU1U7=#0mBpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPlb{M0e*qauL_t(| zUhUd3Zo)7WfZ^B9bU~fC1Uqa<&;u}(J8%H#31|<%Dc}N7!B)h;0GD7wEOZYziX|@z zf#(Pe|0h|`O7i3vJ6oOr0000006d$QBziX*&!S4@UAEhuxUpWV=2}ympVw;=y-F+I z#J|NRN*+t4&A&t;U%>aze=xJiey^Lkt~UQJbUxcrw32w(xrxc`v$XkndEd!avk@2h zf7nautsGx7CWE3e?ZZE_74R41w2ImfR?ZRF@fNA%Kjn`vVTC! p?HO?An*M>Hc8mT2007{R$Pr>5_2vdD<(dEh002ovPDHLkV1mFzm~j9A diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsce.rsi/inhand-right.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsce.rsi/inhand-right.png index 26914768cda2f64caa3ebdc9f1a661dbbaa68d8f..cdbff9253e7a698399900c9a8cc368647a1810d4 100644 GIT binary patch delta 3119 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 diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsce.rsi/meta.json b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsce.rsi/meta.json index f0fd68e2074f..2c5c4b325e10 100644 --- a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsce.rsi/meta.json +++ b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsce.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "drawn by Kilk", + "copyright": "drawn by Kilk, modified by HTMLSystem", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootscentcom.rsi/equipped-FEET.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootscentcom.rsi/equipped-FEET.png index 6d726c88b2ed685e0106c3c4a90ddaadec2c6286..5021dfee6482d036335a43c5b382ead7d2761af9 100644 GIT binary patch literal 3299 zcma)8=Rcea6MYapddr4rQC9R4U36COy@cpjS!G3Cy|=4`5WNepiy&IG=wU5Z1Q9(} zU!AP>y8prbaORxfnKScgK1`y%t~wdXQxX6G$TT1-h7YXpFNg>pYOR~k@&i3`QPfcc zfTq7mZ|v~_fJDMgSy|uDP+f^tLseN^SV~-+UqnC{03eBlIRVB-3-s~GZi#OFOvAHI{#R{t;)utk=Co_*p@h_A7dt|n$43C3 z2e9hh+^j@@rG}e_8#PjUZqZGWPmtM$mi$ zNi$9{G&x}@K+RE|0OGPXic8I+NnS%DbKj!v$7|9QMs9Dl_^c<0YdPj$o5lOXs`Rb{+Nn^ilf)oPR`0Y6VE zPT{Kf!xhEAUByC2PU7Mf)l`l-ZYA4Og)n9S{DO*=IK+{63Iit{R>%8;NS@BiExblX z-NDV;weLphIl|K%)Kx^Ds0dq06iI;@IG5(-3)+dW#sF%%*%ir_gS znNXmNi5;b+GmM9^DvvUKiZxGX+{D9IrqXA6N5rYD1i__K*efxtVXBSWEp^_u+6Kd( zb^>I|Z6yY-)L6P;!skN7RsEKYR37-vc6yRTX)z4_V@D#AECNw&ec9f4p_GR)dIRrQ zsmw{_Bde(*D5<2&l7*<~zp5!^1ac5lvDKwhSKzuSET%J8uyiCrGO9FRwKq)Gw@gHES{p{)^h|*2!AFC zp$wr8!Iw#cM?YVOd4HCCZ7r*tz&mKNYU$1GZRSnW4*Ej9Oo>UM7&<)~KX$rO3#AAn zl20pU1Jk4s{}TgIdSTCBnmMH=snxC(sK`Nmo}fGET^7+EXRaZuBCE&5*~4i7apn-` ziR57OWINz4WdFt9&6+i)=1AcyYoWcY+)Rsz$%2}cv6OO9vv2YV{%>_! zzM+J5|h*ItLJ3YG3!68wrjB~Nv14Xg+FEJR@nk|jc(zgOG+x#Y|$*z zO#S9V$MdX|aT;%X=S&1^kM+mOnDCqEne^;(eHZ`ETift`t0t)C_`Bxp;&-*#<&UDX z@LAMs+sA;9D<}oGT(=na&A;}iCF_o1| zo#&m=oua|R!3M#x!3V*YXT(^(TaMdj*lw&5fiwXd0X{)JK^xg|9Nz%#fKA+OTtjL~ z>YEhtC;lKg5mQlep-Bm^mp$%E;yw}<&NFtt2wI14B08eKJcAb=i#JPX3D*fTio_$H zP2g{JA>#R`=ymCpk_nO-wW(2Ac>^9!X_hnm(fp+RU3|qBAoC$B&*t4Wtg9!q(Ce2g zd?fA-jjNF>%Hg!GK9B#$=i!S*>l5phjym*PB;3ozYozU`LjbDiFP1mG{XIYKqNB^B zM@td*Gt+&-(@k^71j)lB4xY}10ZKAKQuS}8x6bAk`YrZD=l?J;RB3(CN**r{8a}-` zeTq))*zNGO-m|IndfcYc*6n2&U=xrQ5`B$F0jDTZ&l-uT{^(MRRz$kk&e^gzkT?AB zaJkUD;DHYQM0O2^OvSI${5Cr9TQNgQEVO+O_=a4D#;)*$w}hwPi{CTiSmG>2Y(;!j z80pK7gez8*;46Mtq=-U9srJjUc|+_*FVeeC$ghz`ME*pK zRA~Xhln|PU`6h_gg!-kE z@ab`9ax!SuYw>EXK)1YluCftk*{|V?nJrF@6Qv$V z(+ShHxxJrDZO_1F0!TrYpUj`S{Rkb@$I{-*yx;$#Z*OMMmfWcINy`#sy

{-`cth z_t!j!q?+l3)H@$kE&k{V>T1|Oo=2Hho0wT%dNtT#5W&6JNrLjYBzP`d>Y7^ zXXAKqK0L zX~OWz=Z0F*9ENupb9y~8Efe_gQnETg40Qk?mLfWHs` z?Aif&a%W$ zJl&p9iqPzHVR`C4$NBRHdSGQYb=BYg2hP6in68#84<+ZTEp^1pWzakqEmz4wVkSYX-Z-5kMGD$xBYxet*T?36KZ2 zXT5ULR^7wE5ins)QSTzbD%yl0qH8%__kimm=>-=h?nAj)0oFygwlAWPe@bxxwc8MY zn$aCV;U@Qxp2OJI{d(>Q@L2&I^8le#;L(2&>%atN6W%Zcf17|W)SGn)7hW%&u+7Qs z7Nk5cFbA4>cQ*9oP_O&O*0$P>Qo3*&9|2D=ztwL;;usFHSvg)iTEB7d3^oHyA2+&k w_maen4G4BVjDDF1jxf4m*#HINZ@eQ0O{w+t!e6UzA1(yYP}NoWN69Yg|G@$tW&i*H delta 467 zcmV;^0WALG8UF*2BpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPlb{M0e*u(9L_t(| zUhUdFOT$1I2kdwo3{Y_A3mo}}nfB9);#;A+yyOEw5MH>0GuA!Ka>)U79IlXb`P%$=}NK+d5 zp$}kUd`xYf*X6MMB-<%Y106f&5YzVH0-f!ty zzS1imj4^NSN%|0)ke?Vi;md6c8I?E!(T29Y;FwR#je|H`CrNQJEs&>?_TDA|fIpA|fIpA|fIpqCYNHFF)9mM@6q*FJ~gDJ;drH27B_TS@UQ6zZZxq)>|7H z9#qGx12Q^Sk@k*)o)y_YILhQ-;BS9_yuXUxi#j>GjQm1l9{~FCM&D4EThW?M`w+~x z0#Lnh+zQ27F4h6WEpDcpo;)u6@GSfCCJ)*8E}?YSrdOg8`2is(0RFD#XORE^002ov JPDHLkV1lxj({BI( diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootscentcom.rsi/icon.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootscentcom.rsi/icon.png index 4cff3ca8f3115490101095236ed589cd83a8fb9e..4b43457ab641527fd816bc90dc7908db4b7648a6 100644 GIT binary patch delta 3244 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 WuI5^JiaS660000 diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootscentcom.rsi/inhand-left.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootscentcom.rsi/inhand-left.png index 26822968ea84b38c22ba42f3180dcd930f698949..dbe7ceedb781bba9f14055c51230b6cd805261df 100644 GIT binary patch delta 3150 zcma)(Rale@0ziKlDN#BcK?x~o1{}J(q*G#Wq^`gqAvyd*H%o_fBU~;ZAYIbZ3?K+f zN_P$e;_klh!@iyGJe}`5sgTV_i5%cPM@3yl0I2&H`K=uh0NfXMR#w*cG*nk&)l^l6 zi%7!Z0x&@l0MLleP4_W2T40Er=n(JFPo|1VoqX$LNT~6!LnBF$SA>j8t2+^3hpQO7 zs~9Aek-~UZFvZGAb?h@7(E_(ly^yLzmnAj>fW=S+0WKg83a2KOB$H zbFDz)Z79(f9dk0wgFY#xy z;Q&walHjJN(Hj>5WHJvdL}1+ySkV}^J)RaaADy5bq3jyGD7CV)dnR_!4a)&l+*0~#E-~bbl>MF2i8iVou z54VnB!a;shB#`PbOs_X%h1&eSd~i86hKgFMC{~!7;ftD5 zk}n4tHCt68O$nj1!uQ0dB`hs58cF3tujq(XRYml5Qpvxv(1))Tr5BnO!iy^nNc3|n zcP7L9MIywrFf>d>ioMmxAWT3W9281=*8Nw(Ga4&n58m#G!@AIFW=$pbj$^ zeLZ14w4Mo@AQ=uFh_frJGyhv^j(IQUVZTT1YZsBv_XDT`Xab0&6VRd0*1X(5OW0b; zyo}=OGg+~8=XN)9r)`F|)BL15ilgj5J03Z)$EgKU29e4q)!&&l=7qj0?=((6 z(%1}ZL|6A2Se6pC3hM&@xK7kZ_d_>*3ec_{{epk|8V~U z|EqH{JpXTw-%s!zcq3vdVm4xsh`5@#>ETHPe=l9Hb;R$8n)tZ**KzPi-cVVXsVIf; zxVYPk&bLbNcj6Wf(+H0-I^ty7FMV?hv zX9;}!JaGBl>eOnvrE2T_1lrBfZLnz(>4VMti{*7!Pv^J0(9q)0p~5k{>8Wm!sk*rn z;@E-vNLPnkA0=r&$?Eq~o9A;2Jr?_c^Vf`wW!fLKV@Hbp2F`G2kGJAmc3V8G_N+_Y z9yF;mb+{S&Soicy8j6~4E{>O4m(NjsixX{q z0h5tyw7-lFJeSQT#21=oeZEfoM1?Ou2OGe|Kkz?H1eOF#m`%(_g~9H$V6XY zB4x-}h-!~4o4W>L=rXbG?BN#qmQQ%dBxdrU@ajukZ+bYIC4mg2B(EU@AKB3wP)&7V zS`ot`=|nZ`9qc3QM=Dt=nnnJ_^u@GA*~PYlzJsZQ8p!I`W&<`c*eKdQ??L2x@p|@J zIU}Bbsl{EUN3Kv}70K7}>KWCoPiNn$KbLMcW(@aH+L<>Y8Nfzc1kDpItN*lGy zn_UhC4{7sAP#_5^`RJ?AmL5k7R~omh)_dKbc`{jRd4@@+#@!6YQ{55nQ}kJv4H#_MV?Fh%;8pEsgjea-SG>t& zWoeba*xF1Xp-6pN> z8GJ+i)M#ew7;d}XHpN$OHF>&CELnImqMJ7IraNM8K3p*ciT$p#-er}Q+m)3%M)ZVA zBbVy9(py!Ifp6j2sOdnd&mZQ2OKKaa` z?dwP9Cx_*6dig<+tFW`1!6|89003B#8iu+6;LimBm@ojq|3_iA0l=GD7yxz=03ekK z0F3TAtp+kla*QCr!%p7%M<2TeuCuW zq8Yls-6^C3a#tip_l{fSsW<`LB1;rS_thOt!5Cn>Bq@R%cgR!GD@2hh0EAQ+ZxSpi cVu9cekOPwv>1}g4{__yfRDG%Pj}ju}-vd$W4FCWD delta 359 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 delta 360 zcmV-u0hj*g7?lH%BpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPlb{M0e*r2v*F@`!P!x~x3ev8vk%F}^NZ`H zYb+_7f6c|5Ws5al^*gbfe`c0X{)N>%ZZ&^=$eZz#>9=4d`FBoF;`p(fTig!O`v&OZTJ$Y?>Ed+!+L+1y<%^qT zSC#y8yP-GGol|;)beuJLcsBb6gq}YD000000002MpQ?OH5_yHSG72Q2LJ&7hsYf9U)*7W24?dB0000<*gF{ diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootscentcom.rsi/meta.json b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootscentcom.rsi/meta.json index f0fd68e2074f..2c5c4b325e10 100644 --- a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootscentcom.rsi/meta.json +++ b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootscentcom.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "drawn by Kilk", + "copyright": "drawn by Kilk, modified by HTMLSystem", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootschef.rsi/equipped-FEET.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootschef.rsi/equipped-FEET.png index 5932fb199483c4cb7d38895bc0f35403a0438a55..f1b7288811a68ddf272ff1d085095d2a15df7eb6 100644 GIT binary patch delta 3399 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 delta 538 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 delta 654 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 LNkvXXu0mjf`Wvjq diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootschef.rsi/inhand-right.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootschef.rsi/inhand-right.png index 28e876ed2748ec65020117393246522c998e20a1..cffbfcdaa68fc8b62a3f680cdcac7b32d80d886f 100644 GIT binary patch delta 3142 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 delta 364 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 Hp`!i=H2ozg delta 450 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 diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootschem.rsi/inhand-left.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootschem.rsi/inhand-left.png index af1a522133f9c88370492beb428fbdefbc23b60a..6fd510063292e2f5d61374e4b24a1ecf8b7a970d 100644 GIT binary patch delta 3143 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 delta 356 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 RK3(nxFx0ybeW&9Z^FO!xGuQwC delta 476 zcmV<20VDqT8HfasBpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPlb{M0e*v9IL_t(| zUhUdFOT$nU2H=y{Pg<7>Qm})9tKy=FgN1-j{t!2RfP*;b?&c41QV7(KT5z!7CZY}% zieML8K~b+cC%JHmOL9rF_&&?Y7kzI}XqR&d0000000000000000RDKmBc(n`>B`s4 zbFT7WMzY9v!Ws*QJU$V1e>%bWnoG`^7lhVoM6)yg2aY8B%p|hNkNxn*x+_8bw;oMy z_UQGvLd{m&SzTFFJJ+|gzcf$fiHbaXa_Xht1T&xW4we__^6EzN^?GdbV?D^>qxE|^ z-r9YZ%3oMFfEU2@y+gO2Y7;nr+iS@2(cZMw=nG)_-bZ6Dc7E&ze{k(~U*x=88j`9P zz{i94Z~up=s9K$pduca-E9V!B1sWeK$aOQnKlqYsS>yu%00000000000002|SJ9a~ z*YH+u(pp0>WlZS&BAC(hte$7`T=QmT^ICXKHmoM7dL(V`31E3mWc9R|8T%Dfv(--g zLaiI1_XL=d%;jyFHhTq3{>#X>0bHXqd6q{5!b90F;5ZJIOT+%3z>h@(h<*VgMgm!5 SPbU)q0000eO diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsclown.rsi/icon.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsclown.rsi/icon.png index 68c6b5342a79f8797b6e310ab9425bf1e430ec3b..c74a96b5d2f33341bdeb70f14bcede5610623ae8 100644 GIT binary patch delta 3233 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 FV1hw!rp^EW diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsclown.rsi/inhand-right.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsclown.rsi/inhand-right.png index 6a27df29b5eb97822aad03b894533673ce5cdc5b..f2860555de98b8db4a6a00e430e74d5421203325 100644 GIT binary patch delta 3147 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 delta 436 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 delta 355 zcmV-p0i6EZ7?1;yBpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPlb{M0e*q;)L_t(| zUhUekP69y?fZ@^VBG`zHA=Fkr1SV=>X@SqglR!ZS1(;xGEKMwI?8Mlp4QQx1GH@g` zciCfSiw*ymkl7F>Gq<-~b0Yu%00000`{p2v=HA{XX|~AjHv2k|lRMR)#)nOJ* z#?=ee=sQeFkXr=k31eN1NZQwRso5 z`MWUPO}zlUb4o8@v)=af{E}PKHy;210000000005qJ7I^H9rt!Jw6~b%lUyQPk`n8 zK(v1WtNDTGHo$s*AgX6Ti1~r2P5|=*006*_$Py)|&Xrqe+Pwe(002ovPDHLkV1iFG Bq9gzS diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootscmo.rsi/inhand-right.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootscmo.rsi/inhand-right.png index 2d64f26b1938eb637b867217594fcfd27a3e196b..0d44c9a0d02e3cc5d149a7914ab277bec9b8c87e 100644 GIT binary patch delta 3140 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 D8`^;1f*nubdJ^` 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 delta 459 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 BAa4Kw delta 513 zcmV+c0{;D{8Lb46BpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPlb{M0e*wZtL_t(o zN9~i(D@0Kg$G;C_V<`UtvKgVN*$jn}AH_;p__2JJN=kMXHf)AHB`cJajm?aqCchWs z*Tb`rWF=+98%CMwdFRf34BneDv2#Cl-?`^|dgq*bPZt7#Kp+rg%k|x(?(_NdRNK%x8H!}}qBbfB- znwTAudtj;e^+Hijv#w)Ht=G+F>zUG-rRCo{)GLj~>~#LCB{|$?e}#H+iEeEIi?h?{ zSSp08yo_C?m7a-=SCcyPs1{*%yZQjFS546M&xgCYxy5mf0*@!@FL!EaYw+Ua(ZSzhx66gl&4M<5Ug{yV@M?Qt2(dU5Tg00000NkvXXu0mjf Dzs&mN diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsgen.rsi/inhand-left.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsgen.rsi/inhand-left.png index a8138bac8ca6ba93e5e5d33c60bb71dd3c672cbd..f26e5460f868b255e93ee7f6b69fc0076ed01851 100644 GIT binary patch delta 3143 zcmV-N47l^-0^k^sB!2{FK}|sb0I`n?{9y$E017v0Lqkw=Qb$4{Nkv08F*!CiEix`K z002mdotAf0Q`r`W&%HOjP?8Xel+bHvQUXW~y-1NRDlrKVO2Ci+A~r-+a70m&rU)`9 z;DDn;k+C9*g#l5q>jW7@)NybW8eS9UZc9vd* zf9@GXANa%eSALld0I;TIwb}ZIZD|z%UF!i*yZwjFU@riQvc7c=eQ_STd|pz-;w)z? ztK8gNO97v2DKF^n`kxMeLtlK)Qoh~qM8wF>;&Ay4=AVc7 z9|!(*9)A`Q{3O1JFO)?@%ce{qOqR7<$Ps@_@A2i55xYX*}0a9+V~OBmRJI% zAsRq_9snpR5g-YBWGm3`eGA4%1NqI1(V3W?`_F>@eOI_l{>T<2e~x2EL^8M%QO@j| z{8|DuAOJ-`1L{B<=mQhL1h&8txBw5}0|G%Ph<^leU@_o=6p#T#AQu#XwV)W3f~{aD zs0MYQ5j2A~a2RxfW8gG62QGojU!?g~$*UQipUPL&zMmg;!4Do9IA%up=Rh?=qPj=x&RGBx1dpI68aT-2O}^EromdU z5r1q2vtUm+2#$mo!O8G4I3F&8x4@Nf1AGwfgiphl;1O5~KY^zafDjQnqKhyQ7Q#kC zk$5Bt5h1IP5~KoYK-!QVq#wD8NRg+=TNDOGMKMrJlncrq6@}uWmZ4UmHlwOh2T+}; zKGapzC~6Az5lu#GqRr9H=m2yqIvJgdE`LT>pqtPg=(Fe%^f>wz27{qvj4_TFe@q-E z6|(}f8M7PHjyZ)H#*AU6u~@7+)*S1K4aIV>Vr((C3VRTH5_<(Zj(vk8;&gDfIA2^m zPKYbSRp451CvaDA6Sx_?65bH+j1R^0@XPUK_(psWeh5E~pCKp{j0vuUNJ1)MEq|es z&_*~*xJ!6JBog(APQ-AcfVhTONjyY6PaGw_B~eIbBsM95Bq41f?I)cg-6FjplgUP8 z4{|(NOx{9nCZ8eSC%;jkDp)E6DDV_kE7T}-DqK-`rifQGRP zUdc#_t;A7UrBtJIROyD&v@%uMMt?a}IYW7~a*Of>RIYI4MQ`g1<+DyrL=EogS06Xii({|v`U^zjmmKqDIK93(F5q|^fLNk z`gQs{RV`IdRle#b)i%{Ds;|}NsClUI)k@Ub)kf6bsWa4l)YH_rsduU0(|LZ@rEqJ6vJJH{f4iNjE!Q9HW+moJu+4^4lvF) zZZ*DZLN;+XS!U8;a?KQD$}&we-EDf=3^ubjOEIf48#0H@9n1yhyUm9!&=yV>LW>5A z8%z?@lbOS8WsX|XErTr!ExRnASs7TxTWz!IxB6&pZ=G)4Xnn_qVt*58Q)ts;^Q*0y zE!Vcj_S#(XT;I8?=XTG1Zf9=Cx7%ZP)1GP{V!y$@*ZzZpql3ty&0*5fz%kLW*6{|5 z#tLI?W}SCJJ9#;+b~@(t*4e>X?0ney7Z;{WnoEnzqj|>j`12a)jk)T%a$M_OrEUzj zM7OZX~g?%5634ad@uL*w`VG~gh(Z7JY zV9A1(1+OB#BFiH0M43cMqI#nhqZ6W=qhH5($CSrNW36IW#$Jlkh!ezh$7AE8xdr`1lgVC7dNk648kGzWRKONg3!bO?r`DyuP76)j zpY|y|CcQlamywupR7eq~3Hvg&GxIWsv&^%Kv!u(Mm+f3OB?=NXWkcDEvb)7J+0WE~ z#6+@QGMeL-Q%XSL?4XT0OqTZ_RsyNzibcgYHn?o4 z+lbmI*f_Xp?xw0uA4_;87fY>6D@xyQ=5D_DmCaX`Uwzt=v}Lf&p={4q%vRyn>)YJ7 z9Vk~W&wno;+a9vLa|dHb$&Qyhm+ZVyVOLSNi?B z>BD~Ee(8aT1AWbo&CM;EEoH56tE6@EV8X%6-+y?2)7{2wt8b^bmmUI#B!?bmEKDc(k|2rKjV2%kTFe(>+#mT;+J# z3Brk@6Q54zpPW9Gb?WKqB=X}qd>G$kEdEWK>u?x-@ zj(=WcUF^E#aH(^^exTzA`yV<69R@px9EZ9uJ6-M>o;Q5riu;w*SG}*EyB2Wm(#ZUg z;pqt>?FMZqM9Va~FNLH%A*>}Hq z{4y{VJ2n1X^!(GWn_sBE*#FY*W$$#@^!-;EuV!ACyitF1;4SNI|GSuX6EnH*vF|HC zn11N_81(V(r;JaZegpS}^ZUoqJ9q#903c&XQcVB=dL{q>fP?@5`Tzg`fam}KbrCQC z0P0`>06Lfe02gqax=}olJ{W%+bVXQnQ*UN;cVTj607GSLb9r+hQ*?D?X>TA@Z*OeD zr{R1600C@CL_t(|obB2nOG8l@#_{JSizZ<#2#PpiOe})mV;~q-6mGN|#UzH?7O!Yo z5G*F~D_pP$c3HIU102H`tZd%9bB-^E{hzYC@Lrzx2ZMz-bIxg0002i9ZUlN0FeNSqHyPf3q6mXH2=BN-p>AGzHXubEGl1j3E%l9i2{)4 z`O=q`Ww~?#-}xqq_7k|gzI8{fO>MMyb=c{sd$6z9w|89)&T5tSov)kV09n79zHss_ zZS6^t#t&Uds}<laB@BB)gLjnv(FYe>>OOkYQ z+|%rNK9Bb|3m5R6UnTqx00000tUH(n00000z`BEJ000000IWNh1^@s60KmF~X#fBK z0068zm?l|(Q1=5#0))IDND?6A{XmicQn>qpkilfhn-`7)8D0}@r}w$zUm>Q@xSP$vr}Oh7A6_TapAtw_*Mw! zv*dh#nqk*^PJfq@##iOMf0C2&$RzoGJyd@%G~cwRBdk3W&eOwwr3!_mh=yJRW14l004kHN__yz?L>124=*cl00000NkvXX Hu0mjf_G66P diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsgen.rsi/inhand-right.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsgen.rsi/inhand-right.png index b750e823b535b76e0c91fa7882682e8813729ffb..c8435f952a4a203ceb0a65cb21756da7ba584b4f 100644 GIT binary patch delta 3142 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 delta 308 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 B6-NL7 delta 400 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 delta 439 zcmV;o0Z9Jw7~=zwBpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPlb{M0e*t(&L_t(o zM`IWTqhJ(_f>AKy0V9+q8tmA!_W#2tw;AMRR2g7&MM)z=M^8PRk4%F=dO`(Gdzhd! zQ2?9eFiWtBgJ=*at;+ZhW?%s%g#fxiDryQ0cWymkShIX5!}Qrb414$OhRQ(XKmaCx z|Necfc99$fii(Q=`T2RFe>?_;j~_onSqu!g#6f_n4ydS4hX=1m<2o>{_~aM^E^%Cz zg8<16Ffh>je?i;==v@(@H{U=6zkP*Rq~?k$4g>}-PcU4#a0#b9Bqc%+xbRn$VP>Qf z!;Um#h8?Bu5DU4u!NHFqP6Qwv0=mxNgs1rB9>aYeC9n{KlrjUuf3v$_CP*9x!15qD znB~BbP`tI9f+zr4u4xYCKmjOtL6)P7g8;f5h!2Y%9F8C^3P1+IFmli$i-Q1qumde8 z1n`CcD8=8Gv4Zjt0PG_y;&AZc1%wumfY2cR<-J(#BIp1plOTYn4-kM_2Gb9g!{LBY hFbYP&NCylI0KF@;5ub&Go09+l002ovPDHLkV1kfHvuFSS diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootshop.rsi/inhand-left.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootshop.rsi/inhand-left.png index feb443eb26ec7c68517144cc02eff226e276683d..a1c424306ca91984545d164c190e7c103cb8c292 100644 GIT binary patch delta 3130 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 Hu0mjfGZm`Z diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootshop.rsi/meta.json b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootshop.rsi/meta.json index f0fd68e2074f..2c5c4b325e10 100644 --- a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootshop.rsi/meta.json +++ b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootshop.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "drawn by Kilk", + "copyright": "drawn by Kilk, modified by HTMLSystem", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootshydro.rsi/equipped-FEET.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootshydro.rsi/equipped-FEET.png index e87d519d9d7d159d99b6e705270bb13f71b72220..5c1705b5abebb70296ad535c92888b882d69ba42 100644 GIT binary patch delta 3284 zcma))WmlAo0)=0?l&%q^B$Wn9kr-m=?hqV86qr#4$>F6N4j~BAU5A5|ltV~M3@zQ# z4FV1z_uPMQzCCNNy`Hr{>>YwVNFp~#=%TEv3;;EMQQSBX0RXwQD->$rX{4dTp{WLy z5|fpZ5)u~{0{~cbcAB?|@hoE`79))@NT!bYF#6_|5kBlb29_lJSd5HXt0NKMl2SE6 zsv0Jhkc#uK1QkM)YPe#;@eFJB2qCJIZ;|vYX_}5zkmawwN5h%R?3aOWz+4P=(d7s| z-2x=ugc5zzu^Fb4ApMJ^?ue+?2$yAuxLJzl zsi1YhMTQfV?3sAjGsqz5IkM(-ys^Ny9xqGV7MElXVcH_SY8G$fg@>XvBb0g(8#Rys zJt=@cc|my7)7a5X2%gL@9wM~v3#`BfUL22$SPWt52B~^RhOC5Xxl5xUyf(%W@hNn% zt5~e=R&39ZD5Z4#qcyRa42UJ`>N~(0dt*uO>kg^qlAn>01!Y9th1}ctCqdhr%;d}W zX?9`YAw-q^s_Vi$FylV(xx}eq78mL6$^h8z;Tg2vMh@GH05P>~UX9{K7HqWfa^DDuY#-rrDM9Fq0IX5l;?YkBpR*L1WRw`xPTIrSuSB)Ge`F2$``%`5 z-ZGElT8rn(APQ4u?)!gLOY$6j6psgwj>+rz@(iKSi_6Y0-06G^1%2 z_{E$LlmgiR{>L;NWd4p%Mvu@Gy&43+hhxVw(zCCzA%D>3O*()28M(m(xQ42D6RqLM z{-+x&d`S*KO^IMviDjFBu7mJP2Tc<|wL*Ze%pV03zO@%y387EKQ{`Zy4{FF`{t!}S z&sRq5l}95PDurZ51;bY)Wk`gB2ki+L@Qg$$bAkkp$%mAv!@~Qi8H^%P9MFE&+Hi|R zmJI?TD2)N@2T~rW3Jjk?X)n*HjI|Kr&0mthwUY3xWv5(H2mhUs^GT%oZbR}3zt38JQvD~J`PVf?19 zlH|ipM#EW|NLz&Osx+6#R>a;M14}CHx27jnQxh}L`9SfVogsX!AT8f4U#hUeki;On z?D?eWB>!vjUo^VvZwiLTMz#Tzpd2JSRv1(_&&wQrxLvnRb1s8pAP&uk$B88{gF39d z40ZT*kUEx$1le#%Z=6F(jm6(`)2w?j_j}%be(5Imh1{RopVps9J^>y2Xbpw@BJ;xL znO@YBZqpSjBp=coN!JAVO1ngT6i3x_c073Ebfq3Z6-cU>kju$W7f1F_7)<4{gAkaX zJgP3E-K6cK%uV|%O0OGP5Y!Z5q4`YpnLaB|8;>E(nOjOAn48m`^MEg#Ymp1Xkusp} zNcHZSrOuLy2X8LtGGDu4-eZf$g#5?!W=|&hQIBm5eM+LtB~8vvZ2nHKw#fHUeG5A& zr?ne^MOSqjS{0iVqD*!o#_PpRXVpPj6IrNl-MiRRqMsV{f;~}d&{e}2{%d|0ez-|k zg}#$<^Q70L`mW`!%zdat3DKyLYjHi|RcO5cLrhGzR=rk^R{Zz33<3}HS;h#qch1Fe z4mdBIys40>zG>So@08TklZxu8%`)GzlPRsqxheI@rE-Z$^yI{3W4U+v@&u^ln(i9* zX5;n#m`vpfiqbt{ko7PtSvGQOVLI&Tu;e32^H+xxtfN`eJ}&-coD{PcL_yq4f>Lxu z+T&^48x^Uy(w5HS_V0%2;orq|B^KTNX75SWNo$K$im`}C4nG_s+H4(;6dGmJV^oPH zj%CrIok+>(a&tAje%qi3sXG=tE4+oE&7g9nzK+yjv~p1%k@A!> zRmgCNTBiah5@z3jk=S~6e~V(vJ3M4GX!Ice@>^V2S~!|LfefUgs3rrM9q0_H$J&Eh z><2>9h^o0TT!UOksu`-91%8DLg>(g(g)jPi`abl*;8icpd+lN-qUgH4`rzw@>zQk% zOgO=XX5_QZ=lL?LIIeXy-&kS6X^X73t1H?bo-7^>+OcS{XrbsM+59Zxk@NAO;s))~ zCbvW3L%JLi1W1BNKKd@QrO(~Wo64u4^{`4*;!HfUZm2G%u4pjp|2qC+KW!ZEKI@EOs)e zTea3s{L^}xampF5wA>{u=Ut8{!oGR-RCkc?6n)li2L@Yp+KyT0S%3awk1F2!jx!yt zD6aG~->Vk3QfTW%3V|6e%7wlwu0Eq+Bz9DH0+|iw0^6C6c=9!?k@7WyRQRE4Z8@;bHu);YKg`hXLQy>69=(#DT$_>tU^Y+&Zq!LKgm zNdLb+C)A@|u58^&8VZZ(c5Rkqr&7mx4ifg*on>v^iz?#|A}1RSI7ca#;a;8`W|6>;n~I(xPifX&{y+*kBn`gK!7F~XDp z+Bw?pw`?HGJv##P)=93}<%k~=%SWva%Xcrv@z@5?sFq9 z${_#rkInhbM0Mtivi6y~@k6I0)Xe#_0KPYtyPNAhPUl+Us6!JVH=TY=3*UDvWl3U{7a03ipk zM_ED>^dCTpv}68qu+64o^st`)<6|8?omP=~mgmhL-d013zB?~dVw)s*O|QE^1jbjXbz-gS^2h$)e^Bcb(zpAITOYI;N^;!S zE~g9r-}%7~60L0Xxypf8W_UrHeb=355(G`J3%%E8Sb<9qol>H<+qvz<`a4PvauxAA z1dx9wfp^~Sh>?Nu1`2B$QH{k$0hfW>tQAm$Mia1B;&ck*k!7cKh&1VizugMh!~ z)763h0=|Io(FVM_2mZdF2VHj(8`=yM-a3u<9+(?s*6vHWu#MnV@w(m%&31& nzRh?m*z6lGe4D3=R2{OQ#?M6as78r@p9E;C>8bvsVjuE9=8!P< delta 445 zcmV;u0Yd)k8R-L%BpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPlb{M0e*u0;L_t(| zUhUeyO2beT$MKU^QE3HfK{^Od?vCOjh>C-oFW}}YI6L_YZoYt06d@(ZJyhz;r9J;+tF5uVek$955U$|FDV+uGV(H(Cd; zeW~vB<>jm*t#&6^U0F8vxI9}4@2xkQnRh`nzkgnp>zmtO=O^j_4X@7~ivBb#j-I#o z*u`cgF5j4+5x)6}-jsb{ulF1tmrE02wH=`Uhi@O@qH4AI@LHB#f8gd9iv^jP{{C)m z{$ThXp35U200000000000QdvE=4a8FyjGpnk1mfzR%=MLKfsF4JRGG0hR_&t#xzT7Z67?Y@TM@{Q|zcJ3wo6Ca?1D0{12B net{qeq+FU5V?I4P7eM3-<=^&x(uaD)00000NkvXXu0mjfx{B7r diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootshydro.rsi/icon.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootshydro.rsi/icon.png index b98c897e4b227824c51e1257b545117fede2f749..137c848e6fe31dbe4607e61281ea055d24d4daa6 100644 GIT binary patch delta 3200 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 diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootshydro.rsi/inhand-left.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootshydro.rsi/inhand-left.png index aeadbeac72e225496f5887093a4e0dfa4c31e98f..db1fc36e7ecfa79fa3ada239cb213fa22b9f6c19 100644 GIT binary patch delta 3149 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 delta 363 zcmV-x0hIpb7?=Z)BpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPlb{M0e*rB?L_t(| zUhUd3OF~f;!0}T{Lk7|uwB+d69EgRxLwpt+?S znx34;6I|ZoKJU51#s3fFT*SjU@4o9>-Vp!*0001hU9*=(b5GB`fqv2{-^--pZ$1D3000000000AMMV3S#cF;a$b3L( zmh%Hqo&d}FfoT5%R`UbVZGiRsKvd6w5c303odD(s004j;kriLP$&TkX4VM4_002ov JPDHLkV1hw(uJ!-` diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootshydro.rsi/inhand-right.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootshydro.rsi/inhand-right.png index da162f0b1decfc682a8d7b5313e54bd0f409e797..cf144bd72da094804babb6f58b6dd3faa268fce3 100644 GIT binary patch delta 3146 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 delta 366 zcmV-!0g?XV7@Gr-BpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPlb{M0e*rK_L_t(| zUhUd3Yr;Sj!0}fXhgJ}0p-Ve<>|Bsm+#Tvi=ofJ5*r5ph0(Nt>gL|<>a1p_!&`}q` zxr^=4DdmM6B$!w)P`I=IAB1;=yzuTWWVt5*000000RPQF6gNEfI>B-ERFxYpfld9H6KP#HgRiq$I6izo z7aeQtKMkCoys>Nj8LTz|+>sS@5(#fyb}k56RyGIDwWZ0k?_12lP9z7xGP z*^D*W2YKpGtcJcoS5D~*%s6f`eRK8;@V$Nj000000001hKb8BGNW}O40VB0P;5WYa z55(o#E#LbG;&K=2d;fr8U99c-yX&m}0lxPSq_Ns9&fft5!2S^V0ro7(j#t}Jz5oCK M07*qoM6N<$f*ozGLI3~& diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootshydro.rsi/meta.json b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootshydro.rsi/meta.json index f0fd68e2074f..2c5c4b325e10 100644 --- a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootshydro.rsi/meta.json +++ b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootshydro.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "drawn by Kilk", + "copyright": "drawn by Kilk, modified by HTMLSystem", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsjani.rsi/equipped-FEET.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsjani.rsi/equipped-FEET.png index e86caf1fb1fb221d049522a46fcbd506a613f8db..ef3c7f439d2e406659dffc2cf437892f3b3b3b74 100644 GIT binary patch literal 3303 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 nUchl2jW7@)NybW8eS9UZc9vd* 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 delta 361 zcmV-v0ha#b7?uN&BpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPlb{M0e*r5=L_t(| zUhUe!N&-<7fZM=mBi)sve+sDAX5FY!N6fjiBB@3dBwB zN6s*Un;GtS&s|*lKag_~59iFC>ulx-000000Kk89kVSL7{y3@CPGqrI%5H32UO3hC z&3AQ}MN@grYn)6!lI&->e|+=H2yy}*pPmbweCXU4*7eOVBgh7*+naV${i>(y-}6t= zwZ@m%fm2Q2d{^chaDCNE@80@vB}d1V^gDI-)0FSicNvb}3Tyi2mu314(B?aLUD1y= zzg=tdE`0O%VY-`o0ea_@Uch#}YdV|f*7VH>0000000000K!IrAL$X-S4+NPH2+eYS zAj%V9IX@8XU%+a9Ai52(o*#(n84zNAAgU9<`~Uy|up_boTn)@07I_8g00000NkvXX Hu0mjf1{$QA diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsjani.rsi/inhand-right.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsjani.rsi/inhand-right.png index 38a466b6bbae9cfea099424ed58a60026a097cc6..9e0fb7a02b05f237409036e23ac9ff3c901b1abb 100644 GIT binary patch delta 3147 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 delta 419 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 diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsmime.rsi/inhand-left.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsmime.rsi/inhand-left.png index f402dce16cb6ae26368c1e28cb5e1b18fa724963..156e0dfa8d025e82511056f0a8330bc3190a8b97 100644 GIT binary patch delta 3166 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 delta 339 zcmV-Z0j&P^7=QziBpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPlb{M0e*qOqL_t(| zUhUekPQx$|fMLUgL|G6^2Ob6x$-u}^UX-ChrCY_w)`bnEE)@%@#FpwTTk2xV={af* z|0hM~R6Y58$(Az!000000RPR2i`gwdzPi!*nQ1q_W;b4suafrE=BGM!F{@DV5?;~qBr9gRdLY|&q?^?XQ2lv$G0{{R3 z0000003f2+uPnLd2L_oB7+TKxfg<04KQTX`m1};WxK8;`Z!Hy2bne0079xm@U;P?(L3na4i4;002ovPDHLkV1i=EolpP( diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsmime.rsi/inhand-right.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsmime.rsi/inhand-right.png index a091336ae8723dd3da152fe1404f9afebeeb3124..9680fe5a725897c9e512d5a2163b96763366d2fa 100644 GIT binary patch delta 3167 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 uzhagGDgTI4DFPr*WOt z&Fi~v?-T$40002Mzsc!%W4YRdrD8!HPiGa6^;-4e8k;1|KdaZLFVPgoC8>6c g{yP8w_#H}J0H=WN?WShncK`qY07*qoM6N<$f)QY!{Qv*} diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsmime.rsi/meta.json b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsmime.rsi/meta.json index f0fd68e2074f..2c5c4b325e10 100644 --- a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsmime.rsi/meta.json +++ b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsmime.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "drawn by Kilk", + "copyright": "drawn by Kilk, modified by HTMLSystem", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsminer.rsi/equipped-FEET.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsminer.rsi/equipped-FEET.png index 8fee2c8e66b78d1acc16a8665a7a9cd7ee8b5161..6178380cbd7a8cd72f9373f0c962b3486fa5af4e 100644 GIT binary patch delta 3276 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 delta 447 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 KMNUMnLSTZGsstba diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsminer.rsi/inhand-left.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsminer.rsi/inhand-left.png index e57ddb98d966e9b486afbf468d3cb5afc9072298..7b9cfa726550d1f3b0e7ef361935a269cafc267d 100644 GIT binary patch delta 3142 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 gfOQAc05I*L_t(| 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 delta 359 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 delta 424 zcmV;Z0ayNz8Po%iBpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPlb{M0e*tMpL_t(o zM`IWTqhJ(_f>AKy0V9+q8XVcN?EmwJHy9-4H5g!YQEfj%UvnXxk4%F=XnGS)dzhd! zQ2?9eFiWtBgJ=+_%8ULFW?%s%g#fxihT6&u=da#nShD^Q!?M|(4BNJCg~~wWKmaEH z=<#E$c99$fW~QcaN4$9Pe*(&4V33fIfU;1&T2s!{nqx%3o-q8WfGMIi4z?Tk2!6+C7BN;F-000|;+Ot7G S(SHB{002ovPDHLk0$_rfIkD{k diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsparamed.rsi/inhand-left.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsparamed.rsi/inhand-left.png index 820fa2e28b9664ab360d1404f0249cb2244138dd..e86a8cadd1097a2dbba2bde0987c78069fb815d3 100644 GIT binary patch delta 3138 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 delta 462 zcmV;<0WtpN8Ttc|BpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPlb{M0e*uq4L_t(| zUhUeyO2beT$MKU^!O{*c)()<2LLEgnLGcZAE`skMh=bre2;!`RtB9hTwc=8xi;9Eb z&_50i){3ZC&TRuFbV$;qgML5DFZbS(6K>M!Tmb+8000000002~2d9(1Y^*MsiR`F6 z*Iz|*ZF}F@Szj^kSaWOle>l)RgNUPkqLaS3MQ$H!a&&oT=QMTfK17`2sPB6N78mBt z;dNckDpe_L-be?fHJ|`}$n;riIChy*{{T*sP`UQY@97 z*_mlG-ny}K%X4Ek_a3I?O0E=5!EvUIv?Qj z_T)7Ot-E&jd4ZrpZGg8YfA#bkxG&!it)(?R=M_TL5B1r0_vBSv=K^}^byh&tQh8G> zl>@)f&>NuX?a8Y_C~QFI(w-M^97i(gVKL?>#0H4`0th!53e4*rF8}}l07*qoM6N<$ Eg32)8DgXcg diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsqm.rsi/icon.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsqm.rsi/icon.png index 72e90dcc4c867657ad8edbabb7ef758e44f7ae2f..b2bfe4d3098b23dc716396d13050bbab80db29ef 100644 GIT binary patch delta 3181 zcmV-z43hJ?1ce!pB!2{FK}|sb0I`n?{9y$E017v0Lqkw=Qb$4{Nkv08F*!CiEix`K z002mdotAf0Q`r`W&%HOjP?8Xel+bHvQUXW~y-1NRDlrKVO2Ci+A~r-+a70m&rU)`9 z;DDn;k+C9*g#l5q>jW7@)NybW8eS9UZc9vd* zf9@GXANa%eSALld0I;TIwb}ZIZD|z%UF!i*yZwjFU@riQvc7c=eQ_STd|pz-;w)z? ztK8gNO97v2DKF^n`kxMeLtlK)Qoh~qM8wF>;&Ay4=AVc7 z9|!(*9)A`Q{3O1JFO)?@%ce{qOqR7<$Ps@_@A2i55xYX*}0a9+V~OBmRJI% zAsRq_9snpR5g-YBWGm3`eGA4%1NqI1(V3W?`_F>@eOI_l{>T<2e~x2EL^8M%QO@j| z{8|DuAOJ-`1L{B<=mQhL1h&8txBw5}0|G%Ph<^leU@_o=6p#T#AQu#XwV)W3f~{aD zs0MYQ5j2A~a2RxfW8gG62QGojU!?g~$*UQipUPL&zMmg;!4Do9IA%up=Rh?=qPj=x&RGBx1dpI68aT-2O}^EromdU z5r1q2vtUm+2#$mo!O8G4I3F&8x4@Nf1AGwfgiphl;1O5~KY^zafDjQnqKhyQ7Q#kC zk$5Bt5h1IP5~KoYK-!QVq#wD8NRg+=TNDOGMKMrJlncrq6@}uWmZ4UmHlwOh2T+}; zKGapzC~6Az5lu#GqRr9H=m2yqIvJgdE`LT>pqtPg=(Fe%^f>wz27{qvj4_TFe@q-E z6|(}f8M7PHjyZ)H#*AU6u~@7+)*S1K4aIV>Vr((C3VRTH5_<(Zj(vk8;&gDfIA2^m zPKYbSRp451CvaDA6Sx_?65bH+j1R^0@XPUK_(psWeh5E~pCKp{j0vuUNJ1)MEq|es z&_*~*xJ!6JBog(APQ-AcfVhTONjyY6PaGw_B~eIbBsM95Bq41f?I)cg-6FjplgUP8 z4{|(NOx{9nCZ8eSC%;jkDp)E6DDV_kE7T}-DqK-`rifQGRP zUdc#_t;A7UrBtJIROyD&v@%uMMt?a}IYW7~a*Of>RIYI4MQ`g1<+DyrL=EogS06Xii({|v`U^zjmmKqDIK93(F5q|^fLNk z`gQs{RV`IdRle#b)i%{Ds;|}NsClUI)k@Ub)kf6bsWa4l)YH_rsduU0(|LZ@rEqJ6vJJH{f4iNjE!Q9HW+moJu+4^4lvF) zZZ*DZLN;+XS!U8;a?KQD$}&we-EDf=3^ubjOEIf48#0H@9n1yhyUm9!&=yV>LW>5A z8%z?@lbOS8WsX|XErTr!ExRnASs7TxTWz!IxB6&pZ=G)4Xnn_qVt*58Q)ts;^Q*0y zE!Vcj_S#(XT;I8?=XTG1Zf9=Cx7%ZP)1GP{V!y$@*ZzZpql3ty&0*5fz%kLW*6{|5 z#tLI?W}SCJJ9#;+b~@(t*4e>X?0ney7Z;{WnoEnzqj|>j`12a)jk)T%a$M_OrEUzj zM7OZX~g?%5634ad@uL*w`VG~gh(Z7JY zV9A1(1+OB#BFiH0M43cMqI#nhqZ6W=qhH5($CSrNW36IW#$Jlkh!ezh$7AE8xdr`1lgVC7dNk648kGzWRKONg3!bO?r`DyuP76)j zpY|y|CcQlamywupR7eq~3Hvg&GxIWsv&^%Kv!u(Mm+f3OB?=NXWkcDEvb)7J+0WE~ z#6+@QGMeL-Q%XSL?4XT0OqTZ_RsyNzibcgYHn?o4 z+lbmI*f_Xp?xw0uA4_;87fY>6D@xyQ=5D_DmCaX`Uwzt=v}Lf&p={4q%vRyn>)YJ7 z9Vk~W&wno;+a9vLa|dHb$&Qyhm+ZVyVOLSNi?B z>BD~Ee(8aT1AWbo&CM;EEoH56tE6@EV8X%6-+y?2)7{2wt8b^bmmUI#B!?bmEKDc(k|2rKjV2%kTFe(>+#mT;+J# z3Brk@6Q54zpPW9Gb?WKqB=X}qd>G$kEdEWK>u?x-@ zj(=WcUF^E#aH(^^exTzA`yV<69R@px9EZ9uJ6-M>o;Q5riu;w*SG}*EyB2Wm(#ZUg z;pqt>?FMZqM9Va~FNLH%A*>}Hq z{4y{VJ2n1X^!(GWn_sBE*#FY*W$$#@^!-;EuV!ACyitF1;4SNI|GSuX6EnH*vF|HC zn11N_81(V(r;JaZegpS}^ZUoqJ9q#903c&XQcVB=dL{q>fP?@5`Tzg`fam}KbrCQC z0P0`>06Lfe02gqax=}olJ{Nxg8+1ijbW?9;ba!ELWdK8EY;$>YAX9X8WNB|8RBvx= z!KdMT0004zNklGYwDDG`C>VC5xS+WpCI)3J!YrEIfF{8p>@)-4nKOU$%rJ@&f_e_c z19$)r-~l|qzXL><=7njc=~jKnc`trWXmpU$+_cgFtgLP;H37ICZdz%sZViIHnj@F9 z@$kf2?8p`IE5L$2{B5z;*@5x!glU@0&WsU1z5P}L?E22hef0oJ&J#ro}8jv^#SnFzr{}E9U~SNaN00000NkvXXu0mjfG3g3T delta 525 zcmV+o0`mQZ8My?IBpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPlb{M0e*w-(L_t(o zN9~i#O9D|8#=q$yR2D^~MK4-KrUXI|M2m#lL=d#7RrD7`>$X9wcCCV-MQc}WLZgVD z6h)#Hloer_4fN8|9!}=DUQKi+6WTdH7|!F)-0$3T=0Zh9MMWj&5xD&`vlGLSYw-zn zx^l#=bx*`#yDkwYTVirXCmt7(%abKW``RPSks+%Nq;6DSQwh)QJ~|Hkuy(}iLzdu!ox9V_bmS^$ar13`?NFL)*fi9h>a)AGdBx(*XvBJ+3L@67J{ zo3OPbe+x2>fJA7cXZSBH1Kb#pB!2{FK}|sb0I`n?{9y$E017v0Lqkw=Qb$4{Nkv08F*!CiEix`K z002mdotAf0Q`r`W&%HOjP?8Xel+bHvQUXW~y-1NRDlrKVO2Ci+A~r-+a70m&rU)`9 z;DDn;k+C9*g#l5q>jW7@)NybW8eS9UZc9vd* zf9@GXANa%eSALld0I;TIwb}ZIZD|z%UF!i*yZwjFU@riQvc7c=eQ_STd|pz-;w)z? ztK8gNO97v2DKF^n`kxMeLtlK)Qoh~qM8wF>;&Ay4=AVc7 z9|!(*9)A`Q{3O1JFO)?@%ce{qOqR7<$Ps@_@A2i55xYX*}0a9+V~OBmRJI% zAsRq_9snpR5g-YBWGm3`eGA4%1NqI1(V3W?`_F>@eOI_l{>T<2e~x2EL^8M%QO@j| z{8|DuAOJ-`1L{B<=mQhL1h&8txBw5}0|G%Ph<^leU@_o=6p#T#AQu#XwV)W3f~{aD zs0MYQ5j2A~a2RxfW8gG62QGojU!?g~$*UQipUPL&zMmg;!4Do9IA%up=Rh?=qPj=x&RGBx1dpI68aT-2O}^EromdU z5r1q2vtUm+2#$mo!O8G4I3F&8x4@Nf1AGwfgiphl;1O5~KY^zafDjQnqKhyQ7Q#kC zk$5Bt5h1IP5~KoYK-!QVq#wD8NRg+=TNDOGMKMrJlncrq6@}uWmZ4UmHlwOh2T+}; zKGapzC~6Az5lu#GqRr9H=m2yqIvJgdE`LT>pqtPg=(Fe%^f>wz27{qvj4_TFe@q-E z6|(}f8M7PHjyZ)H#*AU6u~@7+)*S1K4aIV>Vr((C3VRTH5_<(Zj(vk8;&gDfIA2^m zPKYbSRp451CvaDA6Sx_?65bH+j1R^0@XPUK_(psWeh5E~pCKp{j0vuUNJ1)MEq|es z&_*~*xJ!6JBog(APQ-AcfVhTONjyY6PaGw_B~eIbBsM95Bq41f?I)cg-6FjplgUP8 z4{|(NOx{9nCZ8eSC%;jkDp)E6DDV_kE7T}-DqK-`rifQGRP zUdc#_t;A7UrBtJIROyD&v@%uMMt?a}IYW7~a*Of>RIYI4MQ`g1<+DyrL=EogS06Xii({|v`U^zjmmKqDIK93(F5q|^fLNk z`gQs{RV`IdRle#b)i%{Ds;|}NsClUI)k@Ub)kf6bsWa4l)YH_rsduU0(|LZ@rEqJ6vJJH{f4iNjE!Q9HW+moJu+4^4lvF) zZZ*DZLN;+XS!U8;a?KQD$}&we-EDf=3^ubjOEIf48#0H@9n1yhyUm9!&=yV>LW>5A z8%z?@lbOS8WsX|XErTr!ExRnASs7TxTWz!IxB6&pZ=G)4Xnn_qVt*58Q)ts;^Q*0y zE!Vcj_S#(XT;I8?=XTG1Zf9=Cx7%ZP)1GP{V!y$@*ZzZpql3ty&0*5fz%kLW*6{|5 z#tLI?W}SCJJ9#;+b~@(t*4e>X?0ney7Z;{WnoEnzqj|>j`12a)jk)T%a$M_OrEUzj zM7OZX~g?%5634ad@uL*w`VG~gh(Z7JY zV9A1(1+OB#BFiH0M43cMqI#nhqZ6W=qhH5($CSrNW36IW#$Jlkh!ezh$7AE8xdr`1lgVC7dNk648kGzWRKONg3!bO?r`DyuP76)j zpY|y|CcQlamywupR7eq~3Hvg&GxIWsv&^%Kv!u(Mm+f3OB?=NXWkcDEvb)7J+0WE~ z#6+@QGMeL-Q%XSL?4XT0OqTZ_RsyNzibcgYHn?o4 z+lbmI*f_Xp?xw0uA4_;87fY>6D@xyQ=5D_DmCaX`Uwzt=v}Lf&p={4q%vRyn>)YJ7 z9Vk~W&wno;+a9vLa|dHb$&Qyhm+ZVyVOLSNi?B z>BD~Ee(8aT1AWbo&CM;EEoH56tE6@EV8X%6-+y?2)7{2wt8b^bmmUI#B!?bmEKDc(k|2rKjV2%kTFe(>+#mT;+J# z3Brk@6Q54zpPW9Gb?WKqB=X}qd>G$kEdEWK>u?x-@ zj(=WcUF^E#aH(^^exTzA`yV<69R@px9EZ9uJ6-M>o;Q5riu;w*SG}*EyB2Wm(#ZUg z;pqt>?FMZqM9Va~FNLH%A*>}Hq z{4y{VJ2n1X^!(GWn_sBE*#FY*W$$#@^!-;EuV!ACyitF1;4SNI|GSuX6EnH*vF|HC zn11N_81(V(r;JaZegpS}^ZUoqJ9q#903c&XQcVB=dL{q>fP?@5`Tzg`fam}KbrCQC z0P0`>06Lfe02gqax=}olJ{Nxg8+1ijbW?9;ba!ELWdK8EY;$>YAX9X8WNB|8RBvx= z!KdMT0004KNklr} z!Nx)@gj9mPrC=2s4T$N+Vi81e+0D%4GUPu^hJ_o>d`lq3b>4d|a~yvF003a!!88B> z0002i9ZUlN0001B-N7^f0FVga^mxy&4F`IiyzBR8b#~zvG2b>x0RAiA_7b7vkIIMV9Qwa%+g-97tOT|zW zzs0|Kd}#&84*&oF0IWNh1^@s60KmF~X#fBK0068zm<9j<006+cgJ}Q&00022 zJD4V0fLQwjSpvk|AIK6Q=KesI08+gDf$RWc?+;`JkYaxzJAf$I`vX}4qzC{2004k> e2h#ws>;T_iyo-3;h5cx^%8%M-{Y-qKi7X zxe9`XBB*oZjs&{oOnMja>i-AfJ<`71V7yJ74#A3 zDn>v5%C{>!Gs z`Pt1_$M2wMyaC(#SvYTidUA?-dT~DO_U_5p0GoOM0000000000R~UHvmBrQkKrZtE zd2=~G;N=@I7xM$Q)T}`GaG;MkpJjf)yG|v|51e<_q;m3>`SZC~4aj4Dz`F)8KL7v# b+z|Nz+}hnG0axwW00000NkvXXu0mjf$`rLP diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsqm.rsi/inhand-right.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsqm.rsi/inhand-right.png index 4ba41811a00e12e0223fcc5bc27c261ba559ebb3..f62bb60ff1fb0fd84ac8eb4d7bc2789e93a57663 100644 GIT binary patch delta 3139 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 delta 359 zcmV-t0hs>V7?cB$BpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPlb{M0e*q~;L_t(| zUhUd3OT$1E!11SR6{JHZSGO)soh!6-b8xV;6de2pm5%lsba3h1j$JKO7eyx>++3X$ zM6k{&cO;OKRCA%iyZZk@c$ef3UfyN9CjbBd00030%|;Ycy6tAT8|=vI+ovSsX>Yi6 zjV5{X-;CmdWs6O`?6ksYf0|k@`DgCtVQv4%j~rh=s{RXBl7H*?C>-CE>=lnqj9#mk zH~&;68ubG^Y4-IYTia#(%s4xLkp4wgt|n8}yYHI+!i`ycviEGqgO`fL+aZ|=4d(y=002ovPDHLk FV1gFxsjmP4 diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsqm.rsi/meta.json b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsqm.rsi/meta.json index f0fd68e2074f..2c5c4b325e10 100644 --- a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsqm.rsi/meta.json +++ b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsqm.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "drawn by Kilk", + "copyright": "drawn by Kilk, modified by HTMLSystem", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsrd.rsi/equipped-FEET.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsrd.rsi/equipped-FEET.png index 8db69e31195b641f8af5e33bc41c586704d455f6..0d28f71885dff0bf61f8ca053c61781f7f6b9f97 100644 GIT binary patch delta 3418 zcma*lcR1Az*ue3h9Wsu6qKxcKWu}h3$vk#PvK}*z%;P6}XG9c^k^KlEt0R(?ad2d3 zR<>h1j?vq5UGMe&{r-7>?)$IrbzhS0-ALmH$z4?qRRN&>CGCYH1pv^Y!sL3`U?IMcei-8q&#PuR8mgTjc_>?491Qp5kJ%G#;Sn_RXP-7!#k>-+yO(%Qi zG85P_ZS*{6=c2fW$z8x7^s82DJ{jOqPV(9TVa5*1KA@li&l6}i9?1E4*KkByZ-mb} zQr0rl|3KU}>?GHjLGe&F`aX0J^dDJq-upQ(w3?#G)RCNyfU>V$BecqP2s%X}bz@<@ zK0oWBVMcO*aK^mkZ-29=o)S(O!m^PPtHHpM&cNfnaVe`IEb|~k&&ZICBolvmJXFxm zEH)*RIcXV-HC#*T8Iq=#Pr1D!Go1^y=34dxT(B3`EWuvT4}8kg3W}hDw3mcehwubw zfAKcs^m(>JG`I`Z;3jmRz{7LtfVwj0rWs{W5MCAq6CU=m?-kJ-gKw z=3x4DMch@adVbzcp9Jk8BDIbuqUk~P$6;90jvx46jzNc+3K>Wlbq9HGmyj}zul*w{ zzGv5eqvHtNR96AFKsLw)e@DF3D@~2TG6Noi>?YfO=6H%+wOAMd{f5BMef4gpH9KLJ z02$4;A}!^;0Smtc2#Z2^s6(HMjp9+Xz1n1F!%1VgIr-<<$SV}Q#o(%+jUP;P($#gpqB+IM>OTJIOzGLRtWZB{EV~;dqez8A4_$k|m8qgNL0ZqN$MM zRb&l9sDd(}5OOz4&X)uE!fENQ0+r;8K?M0ciK#SwL4?R2%@B++I;NkI)ie&tqu$T; zA;v0=^CuaFI^+@8t7`)4YC5E>u&qMV3a+Zy%_5g|+jU{&jW&Qzy}8iDjfuz_LUmi3 zx~$8l4gz{oG$4!>uBAq^cMa^xDsW3iHg{(El7%tuMjLm(UV>QBJbY0OiC}~%6(>nU z*uH3~r3dj-LwKvxnBI}P!)DWNz2k08)JZSzw`HN!)RcK-@QU^uH*3sFadweqkz7fY z3Du+giU$)G6T<({977DXJc@_MM%DqOxDqr!NfOk87rq_6x!$l2IZ`09QbrXyCCj98 zfCgNGtPP|M&<0Lis$vYZH`%eQ-s)eaNv^F#x*or}C!R7NX+jx8nL;U)Q&Ca3SCGCR z6&~B&H;NbgYO!SFE949JWp06fVp?FtCo}XM?hWoc6STq@!mm9{Me_E744Z_FjoAz-58!Y?QCf}humcSk6n?*|`- zCv!mSDTCjAYl8(fZ$UKgqR?lPLQyMGa^XD|OR))Iq^O-qP+2_uuKAI<-M=}tRz*P? z&vf=HnH&am5^BDh*p!-=Ak8;o#~WoWX0$*>b4B&w2EU{OieK6+;yv*z>dPjH!so)S z!cOMVRmRR{trGzgTAS9J3Uums$|y!n-AfyN+@cyqSQ8WT^&0gG^isY(V->ks#5qQ` zzHuZ=bR-54l`SMJj4e7g1;5LE7ptoM{<|W$V*k6|#O!yiiG|8L6Q~K?L~~_e@z~m!TN9Ha{7CZ}{%*yKuK%9M@>xTB;toMLIZGt);Zo*v1RA@2oT1_-nrw?(zx3F!?n z35f~W2{}EYCW>G3U*05Qh-Q>Zl)RK61!WCoGu?iycsEP8ee7jyZAx;=lVmxL0H}(r z9Uf|O&*ZIL#u0wQEKc8K4e$K$3Yobs*C4MiQ!T?O8#jD&h~jtqaGb;_ zn-QB@5@iyn0TV7Wx7*V>)n;5GN`h9RT^wxMt6093ShH z8LOY%r%dXlaq@D>4^&eQR;+oh^!sRXrptOeZ2F9yy-fd&e$rq`aPJ}E@Wxt7>t?H; z-Ijf+_w{CtW{kIKpnYI!Xw*3w$be!f(9Z0OF0XX0T2sZkI!rq7)za5adAgqHorw5+ zox`?&4IPbJVg6;dU%Fi@^5B!E*@QGOz0UN=zKXQLKNo+{wBYsCz!umS1UZ7Op z6;h~vS7nGCj@0Z@;q}!)^q-`)AJVPSt_8+Kjz)~`6rFxa?#_-uai>y)479b>AcrHf z3FFx3h&IGPWHv=DABJy`53iA{p<5hM!dk*y{I=wAUr^txJ{_l;C-7c}L|i=c*ML5! z)soe>E9LA&@%dKY`&|!;6qbp6tD3<{lH!wAc^w1-Q;$HNfHu=uf=q%$0$#Bwk8-VPnWPWx zJ$GlY6A@oEJ~+s}Spmio zrEA}a7Nb?A)gkb$T1gv~j$WVP7fsPk?jE3UqolZ0SgWLqy>Ytb*qh?|b7g7Wdt@b$D3fjf8WJZ}q!?1H_lE!9_3##Qo^?toA8yetnBHjz8`e z_?ED9+^rfH`m!#y5#>s-_o8YldB?nIx1jhvYg}L_b?erH8$pfDeWm5Ap@aBSZk&px zzum8(8R{JI{!{CME zi+b7-_EgZ}sr`1_Pv1)a&hWxjs&j57%A1tRaa?h2Qp)zb&;t3emBjNb92`?y(9Y(& zGv0rZzPx2J<+GsE!iyPbKU=pX)~q%Adt>LV{n=5?KMTe&iRW)lIm7Q>*4uCLs65zI zQQAXvMJYSY*9$##{&N)mX`T1Xu_t;&dv12!TvmE$bhHrK0M|=KAv6W z%V7XO8m6nEY95rgGpnkT>B!Z$k1u&0NotIPSxu`Z$G?$|XH;_>_o5|d=DPVW1i~6H z0Glcd*iVZ~%qrIvy*?`mq1Kfa<7nY29xHN_9(~SKWqX9=2+frPmr;vhr(DE8MsvzR z=*9CHMBJap?louV5^@+o-if3tfdC|o0EzUEF1P;#1{efN-}p}$0o=`Gt^eeI&x8Q8 zHRCPs$5dIHf}`^5$`JFxjk0z}Vu|=n&2Mdw5Q=ro~@KnF0iz#_Y8@=;_=eT1&ak)Y7RE zJpSzvsmc^e-O|UMa$KX#;Q;B#_MV)T?i_lN@SC}-JYXW>c`Qu2*JSq*peJ4e*U8C% zA=eM>iPBs*#{KnMCDs-{qq3%a7OjDlHRI%1uiMj<0Aa75yfeKU1+aA*p=UyrI4i+( zPEL#2xw+}~a=K1ZfUtka4%pj2=)9_hT~Si}U$MUp!T(QLd0@`l^oQ8||Nb+et7)Y1UJViXKj?~RiU0rr delta 465 zcmV;?0WSXV8vO&1BpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPlb{M0e*uz7L_t(| zUhUdHOT$1I$MH+6ptOTi>EMeHT*O5X6kmXdt04Fe926(PO`L_kfG&cQh*HN|aj=Ms zgP`D0s|5$^Kh%@wnu9b{Nz$Z)em~2@-Ie@~3+eKl0ssI20000000906$E|^^EzaoS z+>pAhKPst98%1Y(WnSB{f7JEDeyC@LkwkvVt%2B(^Q$|xcYJB)q{`TCB1uW)2R?x5 zsY$(aT34lunwneQQui;~%uAKA%*(p`&Md^tpa1aMn(sD0&;iIp3&ma4m@TP^#-=;l zPUdA@ei!#4bjsJdJtAs;pzp;#uvV*^aW>OuYPnK%#>Ym?TJ!nSe{3qB&zZG@!=u># z3%vR1bV>~lwBDOH|Ec+5=90(<00000000000RDhT{WE`0UaIu!-Q}K$YY(CB2Uz}| zywqOvW_#}ogca!k{5|=ToA=mT;=hqB$@JYYI^cX+zaSLGHjk? z%O1KB>AU@@CohujE6aNiS?&usj-#@fex>!7E?24{U#L>w32+vBaw*Bq00000NkvXX Hu0mjfZTaT= diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsrd.rsi/icon.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsrd.rsi/icon.png index bd7e7cdbd1c8d6b0101e4807f2e3a20343e757b6..2bbf95dc11fc764a5a85d759d5659e1aac7c9dcc 100644 GIT binary patch delta 3195 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 delta 531 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 M07*qoM6N<$f{t0K@&Et; diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsrd.rsi/inhand-right.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsrd.rsi/inhand-right.png index 8a617f15f105bc6806a3b50dbc2c7f29288e0e2f..3706a8336761a54ef40571bf1fd83410db37c318 100644 GIT binary patch delta 3151 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 delta 364 zcmV-y0h9jc7?}f*BpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPlb{M0e*rE@L_t(| zUhUd3OT$1E!11TxrXUVZeu?5IP_Vc;Sg>0cp?gP*4i1j)1s4aQqfSDl)v0u|AHl&% zPzt(7UbsL)Q=1DF-s%4b;T_Fgc)b_0+!Fu*0001h|7OX>DW}K#(bnd=yuM8&9h(>3 znQJU5n*Xwk8M78^?3~mie>cr6pZs&Hd9YLY@lW18KAV0E7LtGc=rFpue~PbUtkK;z zuW0^LJ5k-+jVFD5e#q+DM*N#9|Cuk~g7 zrR`?eRwn<S&`008(qM7{wFMBF{7a1-wU0000< KMNUMnLSTZabgf$e diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsrd.rsi/meta.json b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsrd.rsi/meta.json index f0fd68e2074f..2c5c4b325e10 100644 --- a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsrd.rsi/meta.json +++ b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsrd.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "drawn by Kilk", + "copyright": "drawn by Kilk, modified by HTMLSystem", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsrobo.rsi/equipped-FEET.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsrobo.rsi/equipped-FEET.png index cc063a59ad0062505cf2a9c714a01f7b7cf434f8..9075246f922a5b297a9bb20200a43feabbcc01c7 100644 GIT binary patch delta 3283 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 delta 444 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 T5wh1_00000NkvXXu0mjfeYWe! diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsrobo.rsi/inhand-left.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsrobo.rsi/inhand-left.png index 788a607fddf8b964dd48c26353c761b7bed71581..cc67020949407f32beb25cd760481044bda4449c 100644 GIT binary patch delta 3145 zcmV-P47T%!1K}8uB!2{FK}|sb0I`n?{9y$E017v0Lqkw=Qb$4{Nkv08F*!CiEix`K z002mdotAf0Q`r`W&%HOjP?8Xel+bHvQUXW~y-1NRDlrKVO2Ci+A~r-+a70m&rU)`9 z;DDn;k+C9*g#l5q>jW7@)NybW8eS9UZc9vd* zf9@GXANa%eSALld0I;TIwb}ZIZD|z%UF!i*yZwjFU@riQvc7c=eQ_STd|pz-;w)z? ztK8gNO97v2DKF^n`kxMeLtlK)Qoh~qM8wF>;&Ay4=AVc7 z9|!(*9)A`Q{3O1JFO)?@%ce{qOqR7<$Ps@_@A2i55xYX*}0a9+V~OBmRJI% zAsRq_9snpR5g-YBWGm3`eGA4%1NqI1(V3W?`_F>@eOI_l{>T<2e~x2EL^8M%QO@j| z{8|DuAOJ-`1L{B<=mQhL1h&8txBw5}0|G%Ph<^leU@_o=6p#T#AQu#XwV)W3f~{aD zs0MYQ5j2A~a2RxfW8gG62QGojU!?g~$*UQipUPL&zMmg;!4Do9IA%up=Rh?=qPj=x&RGBx1dpI68aT-2O}^EromdU z5r1q2vtUm+2#$mo!O8G4I3F&8x4@Nf1AGwfgiphl;1O5~KY^zafDjQnqKhyQ7Q#kC zk$5Bt5h1IP5~KoYK-!QVq#wD8NRg+=TNDOGMKMrJlncrq6@}uWmZ4UmHlwOh2T+}; zKGapzC~6Az5lu#GqRr9H=m2yqIvJgdE`LT>pqtPg=(Fe%^f>wz27{qvj4_TFe@q-E z6|(}f8M7PHjyZ)H#*AU6u~@7+)*S1K4aIV>Vr((C3VRTH5_<(Zj(vk8;&gDfIA2^m zPKYbSRp451CvaDA6Sx_?65bH+j1R^0@XPUK_(psWeh5E~pCKp{j0vuUNJ1)MEq|es z&_*~*xJ!6JBog(APQ-AcfVhTONjyY6PaGw_B~eIbBsM95Bq41f?I)cg-6FjplgUP8 z4{|(NOx{9nCZ8eSC%;jkDp)E6DDV_kE7T}-DqK-`rifQGRP zUdc#_t;A7UrBtJIROyD&v@%uMMt?a}IYW7~a*Of>RIYI4MQ`g1<+DyrL=EogS06Xii({|v`U^zjmmKqDIK93(F5q|^fLNk z`gQs{RV`IdRle#b)i%{Ds;|}NsClUI)k@Ub)kf6bsWa4l)YH_rsduU0(|LZ@rEqJ6vJJH{f4iNjE!Q9HW+moJu+4^4lvF) zZZ*DZLN;+XS!U8;a?KQD$}&we-EDf=3^ubjOEIf48#0H@9n1yhyUm9!&=yV>LW>5A z8%z?@lbOS8WsX|XErTr!ExRnASs7TxTWz!IxB6&pZ=G)4Xnn_qVt*58Q)ts;^Q*0y zE!Vcj_S#(XT;I8?=XTG1Zf9=Cx7%ZP)1GP{V!y$@*ZzZpql3ty&0*5fz%kLW*6{|5 z#tLI?W}SCJJ9#;+b~@(t*4e>X?0ney7Z;{WnoEnzqj|>j`12a)jk)T%a$M_OrEUzj zM7OZX~g?%5634ad@uL*w`VG~gh(Z7JY zV9A1(1+OB#BFiH0M43cMqI#nhqZ6W=qhH5($CSrNW36IW#$Jlkh!ezh$7AE8xdr`1lgVC7dNk648kGzWRKONg3!bO?r`DyuP76)j zpY|y|CcQlamywupR7eq~3Hvg&GxIWsv&^%Kv!u(Mm+f3OB?=NXWkcDEvb)7J+0WE~ z#6+@QGMeL-Q%XSL?4XT0OqTZ_RsyNzibcgYHn?o4 z+lbmI*f_Xp?xw0uA4_;87fY>6D@xyQ=5D_DmCaX`Uwzt=v}Lf&p={4q%vRyn>)YJ7 z9Vk~W&wno;+a9vLa|dHb$&Qyhm+ZVyVOLSNi?B z>BD~Ee(8aT1AWbo&CM;EEoH56tE6@EV8X%6-+y?2)7{2wt8b^bmmUI#B!?bmEKDc(k|2rKjV2%kTFe(>+#mT;+J# z3Brk@6Q54zpPW9Gb?WKqB=X}qd>G$kEdEWK>u?x-@ zj(=WcUF^E#aH(^^exTzA`yV<69R@px9EZ9uJ6-M>o;Q5riu;w*SG}*EyB2Wm(#ZUg z;pqt>?FMZqM9Va~FNLH%A*>}Hq z{4y{VJ2n1X^!(GWn_sBE*#FY*W$$#@^!-;EuV!ACyitF1;4SNI|GSuX6EnH*vF|HC zn11N_81(V(r;JaZegpS}^ZUoqJ9q#903c&XQcVB=dL{q>fP?@5`Tzg`fam}KbrCQC z0P0`>06Lfe02gqax=}olJ{Nxg8+1ijbW?9;ba!ELWdK8EY;$>YAX9X8WNB|8RBvx= z!KdMT0004PNklb zq_puFY5P$##!0tee00a;T;OYL-?d>1n{cVQj^YG}z{KtITL;+Y;zU?D?=er~d z!1#RF_@&pk4~-A-o$r!pKLKm4n~Y8|noRL{cZIWy8&p+=JkMK|_nmK>-~fZ3aRBi3 z1MF<-i<3lM65AW49b`vXY=gxnuU5&#IdKad37D0Aeld4g j00bZab_Z$%u;~E54v348mH}x100000NkvXXu0mjf0hQ_2 delta 346 zcmV-g0j2)o7>5IpBpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPlb{M0e*qjxL_t(| zUhUc;Ps2bI!0`u~nI#Amc9IW(YO)1iF@o4vm`5P-NbCe=Ux19HiY$|ra|DIMbiU*@ z*JP%p<=!Pb_Wvc#yR?0|*XyOGPXGV_0001v&54WVmd_96#pOu8KDV+TuW#-;&FP!p z)v1f7nu^!>{`yk7+Zy@ifAMYMletojFn^aq4y**_5FG!FO|{R6(N`Uj$0 sDeL}$sJ;Oq`Uj%g0rU?500288KdtA|t;U$5W&i*H07*qoM6N<$f<@=0E&u=k diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsrobo.rsi/inhand-right.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsrobo.rsi/inhand-right.png index 2faabce45577d55347d9f3ce4c40973d04203b0a..e8edee6d52c20b7a7c21c2f7c6d048b09f2b6b4f 100644 GIT binary patch delta 3144 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 diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsrobo.rsi/meta.json b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsrobo.rsi/meta.json index f0fd68e2074f..2c5c4b325e10 100644 --- a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsrobo.rsi/meta.json +++ b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsrobo.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "drawn by Kilk", + "copyright": "drawn by Kilk, modified by HTMLSystem", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsviro.rsi/equipped-FEET.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsviro.rsi/equipped-FEET.png index 9bf59a0a1c141b1b7399f186e62dd948f9f21330..821eb3108a844d523c3e1cd4db2ce63239191d96 100644 GIT binary patch delta 3294 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 JUTI@v{|}f9Ezke} delta 459 zcmV;+0W|*g8TSK_BpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPlb{M0e*uh1L_t(| zUhUeyO2beT2Jn+cL1|q?N{jda-E{L0I0(A<02W+?yhz>q0uBWiK_9>+N)d)u9PV9Q=L|4)^9J-zD7bga7~l0000000000007{JdcCghyMYQT z&zWPcvM?oS{ diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsviro.rsi/icon.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsviro.rsi/icon.png index 755a1f9b7b01ac478fdec02dffa9939f171ec2a1..f9dd8ab4ab35404f5502a5841283917464d2fd5b 100644 GIT binary patch delta 3185 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 XGA1q1ZcKld00000NkvXXu0mjf*lz}R delta 498 zcmVeL_t(o zN9~ilO9Md=#=p~OV+{BYh>A@lhJZ~JRPYJfT8K8nSqdVGorV2juOM~`Vrdg!AU>i+ zv{mYex@hlM~O5C{b261|V>ilXSbI?&&f z7w0N1{_F3tYC;Cg@>!K-f7#N6#PvrM7IHeB&@>HKkqc~WA7XKShVNwdh|GQfCw|qm zS6K!KIxYXiYw8K_?`cSqgc^Gt&jP8J1k&j@9syOhN*o>s{>DJ7t3_8<*AY6}%fy|1 zOy}e=nC2(P5ei+F-N%v+uZPVR%V0{&cdqI#!?C936>csN0KhIAYnSr~zue z(|GV%kP!fD?rYfpmM7eP7lKoU2?H`fj1G6<^vwJflpcZ6gbHOB!A@S7Co{$>ycHTt zF>G8d@p;s|B0gEgOycy!_q-7^R)M93S#ko+Q@lA*as>SI6FT8@@{vap?6qI-Kg-VU o0jryR0SjW7@)NybW8eS9UZc9vd* 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 delta 309 zcmV-50m}Z{7~=wvBpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPlb{M1fA~p6K~#8N z?b^Kx!Y~lP@wn^aBMCYS4tB4P(-#oz?&z%GD2_gZ4le4T?v;cFg3u3p!G7@nK}cvh za=DB-1poj50000_q9{r(*IV*Er@sqH<7<_beAz=t{ z{R2|I`UhH9Df>j;%KiZ|RW14l004kLN__xSm^$OV51xml00000NkvXX Hu0mjfO+1cW diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsviro.rsi/inhand-right.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsviro.rsi/inhand-right.png index a4b7dc2ba736e0cfcbbb9b537257974879f758bc..a37a3420871e4298f367180e01051eb5236dfbc2 100644 GIT binary patch delta 3136 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 diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsviro.rsi/meta.json b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsviro.rsi/meta.json index f0fd68e2074f..2c5c4b325e10 100644 --- a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsviro.rsi/meta.json +++ b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootsviro.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "drawn by Kilk", + "copyright": "drawn by Kilk, modified by HTMLSystem", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootswarden.rsi/equipped-FEET.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootswarden.rsi/equipped-FEET.png index 203bbd05533969611a51ed87c87534838de41321..64bd64006c0b684287f4a3263d1cfa64afe971f2 100644 GIT binary patch delta 3247 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 t77O5Bn)3pVjW7@)NybW8eS9UZc9vd* zf9@GXANa%eSALld0I;TIwb}ZIZD|z%UF!i*yZwjFU@riQvc7c=eQ_STd|pz-;w)z? ztK8gNO97v2DKF^n`kxMeLtlK)Qoh~qM8wF>;&Ay4=AVc7 z9|!(*9)A`Q{3O1JFO)?@%ce{qOqR7<$Ps@_@A2i55xYX*}0a9+V~OBmRJI% zAsRq_9snpR5g-YBWGm3`eGA4%1NqI1(V3W?`_F>@eOI_l{>T<2e~x2EL^8M%QO@j| z{8|DuAOJ-`1L{B<=mQhL1h&8txBw5}0|G%Ph<^leU@_o=6p#T#AQu#XwV)W3f~{aD zs0MYQ5j2A~a2RxfW8gG62QGojU!?g~$*UQipUPL&zMmg;!4Do9IA%up=Rh?=qPj=x&RGBx1dpI68aT-2O}^EromdU z5r1q2vtUm+2#$mo!O8G4I3F&8x4@Nf1AGwfgiphl;1O5~KY^zafDjQnqKhyQ7Q#kC zk$5Bt5h1IP5~KoYK-!QVq#wD8NRg+=TNDOGMKMrJlncrq6@}uWmZ4UmHlwOh2T+}; zKGapzC~6Az5lu#GqRr9H=m2yqIvJgdE`LT>pqtPg=(Fe%^f>wz27{qvj4_TFe@q-E z6|(}f8M7PHjyZ)H#*AU6u~@7+)*S1K4aIV>Vr((C3VRTH5_<(Zj(vk8;&gDfIA2^m zPKYbSRp451CvaDA6Sx_?65bH+j1R^0@XPUK_(psWeh5E~pCKp{j0vuUNJ1)MEq|es z&_*~*xJ!6JBog(APQ-AcfVhTONjyY6PaGw_B~eIbBsM95Bq41f?I)cg-6FjplgUP8 z4{|(NOx{9nCZ8eSC%;jkDp)E6DDV_kE7T}-DqK-`rifQGRP zUdc#_t;A7UrBtJIROyD&v@%uMMt?a}IYW7~a*Of>RIYI4MQ`g1<+DyrL=EogS06Xii({|v`U^zjmmKqDIK93(F5q|^fLNk z`gQs{RV`IdRle#b)i%{Ds;|}NsClUI)k@Ub)kf6bsWa4l)YH_rsduU0(|LZ@rEqJ6vJJH{f4iNjE!Q9HW+moJu+4^4lvF) zZZ*DZLN;+XS!U8;a?KQD$}&we-EDf=3^ubjOEIf48#0H@9n1yhyUm9!&=yV>LW>5A z8%z?@lbOS8WsX|XErTr!ExRnASs7TxTWz!IxB6&pZ=G)4Xnn_qVt*58Q)ts;^Q*0y zE!Vcj_S#(XT;I8?=XTG1Zf9=Cx7%ZP)1GP{V!y$@*ZzZpql3ty&0*5fz%kLW*6{|5 z#tLI?W}SCJJ9#;+b~@(t*4e>X?0ney7Z;{WnoEnzqj|>j`12a)jk)T%a$M_OrEUzj zM7OZX~g?%5634ad@uL*w`VG~gh(Z7JY zV9A1(1+OB#BFiH0M43cMqI#nhqZ6W=qhH5($CSrNW36IW#$Jlkh!ezh$7AE8xdr`1lgVC7dNk648kGzWRKONg3!bO?r`DyuP76)j zpY|y|CcQlamywupR7eq~3Hvg&GxIWsv&^%Kv!u(Mm+f3OB?=NXWkcDEvb)7J+0WE~ z#6+@QGMeL-Q%XSL?4XT0OqTZ_RsyNzibcgYHn?o4 z+lbmI*f_Xp?xw0uA4_;87fY>6D@xyQ=5D_DmCaX`Uwzt=v}Lf&p={4q%vRyn>)YJ7 z9Vk~W&wno;+a9vLa|dHb$&Qyhm+ZVyVOLSNi?B z>BD~Ee(8aT1AWbo&CM;EEoH56tE6@EV8X%6-+y?2)7{2wt8b^bmmUI#B!?bmEKDc(k|2rKjV2%kTFe(>+#mT;+J# z3Brk@6Q54zpPW9Gb?WKqB=X}qd>G$kEdEWK>u?x-@ zj(=WcUF^E#aH(^^exTzA`yV<69R@px9EZ9uJ6-M>o;Q5riu;w*SG}*EyB2Wm(#ZUg z;pqt>?FMZqM9Va~FNLH%A*>}Hq z{4y{VJ2n1X^!(GWn_sBE*#FY*W$$#@^!-;EuV!ACyitF1;4SNI|GSuX6EnH*vF|HC zn11N_81(V(r;JaZegpS}^ZUoqJ9q#903c&XQcVB=dL{q>fP?@5`Tzg`fam}KbrCQC z0P0`>06Lfe02gqax=}olJ{Nxg8+1ijbW?9;ba!ELWdK8EY;$>YAX9X8WNB|8RBvx= z!KdMT0004-Nkl)C7pivN`JWl?Pfw zlZL@aTaYG6vgH5?U1zqV)0QO-gH)mL{UwabvN;}XFAoBceJxuYJUvn=2iSVJw*fAN zKzn=pIUwNiIC518dK(+7o{Ka!1CV)r0jLd7DYte3Akfg@cyC=c==GXb&yN7VQ7*s* dxPU(gyaOlsP0$(9`@;YL002ovPDHLkV1jI62y6fV delta 552 zcmV+@0@wYI8Pf!iBpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPlb{M0e*x%8L_t(o zM`IWTqhJ(_f>AKy0V9+q8XVcN?EmwJHy9-4H5g!YQ|}yxy5bZ#ADKRX?EypE#6>vm zVS>^`0c@6oXb`|A4x$aU6d0=V%aum3^I>CMOwB) zmoHz%X%EQ`u(B}tA9~{f13MQtnE&(JSBB%ielc7FIw1MUGpyoQf394^X%9(>5C&vA z^BDBzb%Qa;LQ6I_uurgw69NQ706EUTe0~R}K_Rfi%$VW-f7HbN;>9b5#K%uiLSe3q z6y6ZP>j04Do~O^j4Fmy@p}WkD8C)-2XW#%PJ{SOrgTQ=Q8HS9v@4;-C*lG<0hGQo# zV6}^26o4!T83e;1fBxTp|G}1{i-RzFsDRP|K0q)81dg77@(|#Oo*IM9rCU%QCirM$ z$pCZ-13y$RNIk9)Am{)n6AnN={Q3nF#5_E_49con3@@HPWBB?N65JrLYxh2|xjMis q3!?dW*l;>v6pVsVFwy}70|02Y_otONY~}y}002ovPDHLk0$_qZiuCRP diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootswarden.rsi/inhand-left.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootswarden.rsi/inhand-left.png index 2d7f4d495cfdc39a2db7bbdf5379da4fc4deee02..58cefe4384381c8595c61ff11ae158262f007fcd 100644 GIT binary patch delta 3142 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 delta 351 zcmV-l0igcg7>omuBpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPlb{M0e*qy$L_t(| zUhUd3OT$nQ!11eNsUU8hT>S`wPC~`8P*8E`SLp8G=M zZ@#OeG@8mQUgK;$jMLk4fBEK@QOOQ?>U9f?e0d!d&g+~1Cp_GD;=6i1IkK_F^zyHK z^Ie&*_0kZL~Mf9FKr*A$000000000003IzL?#j1axlKz0IIa&4(1i1qaqJO}b xRsTS6D`nk35Y#uIivEG1b^!eY006*_$PYy`)D^H2ydMAn002ovPDHLkV1f{-s&N1S diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootswarden.rsi/inhand-right.png b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootswarden.rsi/inhand-right.png index 7dc383c60d28f81b844528ed82ba27c18368d7d8..956580104a5cbac63d1977d66de3bdc7dbf70b7f 100644 GIT binary patch delta 3141 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 delta 353 zcmV-n0iOQd7>)ywBpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPlb{M0e*q&&L_t(| zUhUd3Yr;Sj!0}hdP(j?By800cbrKZELP4d2U!i-4j@=!*I=J);lop(7$>>tBV<$H$ z*gfTi3nUoZTu`{H{~v@qlDzP8FJ!qV0000000774#Ee@WAMT>YSyNV@OG%Hd-u2EH zmlVyvV#bVJ!8*P^O(S!gf3s}z&#mU|&FI&cydO`T{tEVz|8Q^>^@AWjlDUrNvh#}O zzqJzGPCLHod$X3)YCS%uYV%OOF3#ooW#)ACZS&9k12p*Z{X_K7;AF1BJ}8raW;OHy zx^hY%kj&HG!iBS6fbaPO000000000098~FD65sm=61n{WfAPJ4J0Pu8wS4a%*o&h3 z@2<11l#Y6(zV{F0v8opP?*IVc{}A~Boj}wT2_)RE00000NkvXXu0mjf>lv&i diff --git a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootswarden.rsi/meta.json b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootswarden.rsi/meta.json index f0fd68e2074f..2c5c4b325e10 100644 --- a/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootswarden.rsi/meta.json +++ b/Resources/Textures/_DV/Clothing/Shoes/Boots/winterbootswarden.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "drawn by Kilk", + "copyright": "drawn by Kilk, modified by HTMLSystem", "size": { "x": 32, "y": 32 From e3ec02c9778d1077111b983c7e906226583afb63 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Wed, 15 Jan 2025 20:18:32 +0100 Subject: [PATCH 120/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 643571d947f1..5e08720c9a3b 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: deltanedas - changes: - - message: Psionic-hunting Wisps can now appear when glimmer gets too high. - type: Add - id: 414 - time: '2024-07-01T20:05:56.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1383 - author: Bellwether changes: - message: The Clerk's Vest now has a pocket, matching its description. @@ -3859,3 +3852,11 @@ id: 913 time: '2025-01-15T15:03:43.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2727 +- author: HTMLSystem + changes: + - message: Resprited a majority of winter boots, mostly all command and job-specific + winter boots! + type: Tweak + id: 914 + time: '2025-01-15T19:18:13.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2734 From 7f70d1e66955f4456eb483418d75add588894667 Mon Sep 17 00:00:00 2001 From: rosieposie <52761126+rosieposieeee@users.noreply.github.com> Date: Wed, 15 Jan 2025 15:47:02 -0500 Subject: [PATCH 121/205] Ported Starlight Signs (#2741) * added signs * Update posters.yml --- .../Markers/Spawners/Random/posters.yml | 4 ++ .../Structures/Wallmounts/Signs/posters.yml | 39 ++++++++++++ .../Structures/Wallmounts/Signs/signs.yml | 59 ++++++++++++++++++ .../Wallmounts/signs.rsi/brigmed.png | Bin 0 -> 509 bytes .../Wallmounts/signs.rsi/calendar.png | Bin 0 -> 285 bytes .../Wallmounts/signs.rsi/cleanhands.png | Bin 0 -> 387 bytes .../Wallmounts/signs.rsi/disposals_proper.png | Bin 0 -> 480 bytes .../Wallmounts/signs.rsi/eyechart.png | Bin 0 -> 376 bytes .../Structures/Wallmounts/signs.rsi/meta.json | 41 ++++++++++++ .../Wallmounts/signs.rsi/secureareasmall.png | Bin 0 -> 353 bytes .../Wallmounts/signs.rsi/wall_biohazard.png | Bin 0 -> 368 bytes .../Wallmounts/signs.rsi/wall_extremeheat.png | Bin 0 -> 378 bytes .../Wallmounts/signs.rsi/yessmoking.png | Bin 0 -> 280 bytes .../Wallmounts/signs.rsi/youtoolpia.png | Bin 0 -> 900 bytes 14 files changed, 143 insertions(+) create mode 100644 Resources/Prototypes/_Starlight/Entities/Structures/Wallmounts/Signs/posters.yml create mode 100644 Resources/Prototypes/_Starlight/Entities/Structures/Wallmounts/Signs/signs.yml create mode 100644 Resources/Textures/_Starlight/Structures/Wallmounts/signs.rsi/brigmed.png create mode 100644 Resources/Textures/_Starlight/Structures/Wallmounts/signs.rsi/calendar.png create mode 100644 Resources/Textures/_Starlight/Structures/Wallmounts/signs.rsi/cleanhands.png create mode 100644 Resources/Textures/_Starlight/Structures/Wallmounts/signs.rsi/disposals_proper.png create mode 100644 Resources/Textures/_Starlight/Structures/Wallmounts/signs.rsi/eyechart.png create mode 100644 Resources/Textures/_Starlight/Structures/Wallmounts/signs.rsi/meta.json create mode 100644 Resources/Textures/_Starlight/Structures/Wallmounts/signs.rsi/secureareasmall.png create mode 100644 Resources/Textures/_Starlight/Structures/Wallmounts/signs.rsi/wall_biohazard.png create mode 100644 Resources/Textures/_Starlight/Structures/Wallmounts/signs.rsi/wall_extremeheat.png create mode 100644 Resources/Textures/_Starlight/Structures/Wallmounts/signs.rsi/yessmoking.png create mode 100644 Resources/Textures/_Starlight/Structures/Wallmounts/signs.rsi/youtoolpia.png diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml index 43a73df0f2f1..bbf4a95cec76 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml @@ -99,6 +99,7 @@ - PosterContrabandWork # DeltaV Poster, see Resources/Prototypes/_DV/Entities/Structures/Wallmount/Signs/posters.yml - PosterContrabandL6 # DeltaV Poster, see Resources/Prototypes/_DV/Entities/Structures/Wallmount/Signs/posters.yml - PosterContrabandRoid # DeltaV Poster, see Resources/Prototypes/_DV/Entities/Structures/Wallmount/Signs/posters.yml + - PosterContrabandYoutoolpia # Starlight Poster, see Resources/Prototypes/_Starlight/Entities/Structures/Wallmount/Signs/signs.yml chance: 1 - type: entity @@ -186,4 +187,7 @@ - PosterLegitGetToWork - PosterLegitBananaWarning # End DeltaV/Nyano Additions + - PosterLegitCalendar # Starlight, see Resources/Prototypes/_Starlight/Entities/Structures/Wallmount/Signs/posters.yml + - PosterLegitCleanHands # Starlight, see Resources/Prototypes/_Starlight/Entities/Structures/Wallmount/Signs/posters.yml + - PosterLegitEyeChart # Starlight, see Resources/Prototypes/_Starlight/Entities/Structures/Wallmount/Signs/posters.yml chance: 1 diff --git a/Resources/Prototypes/_Starlight/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/_Starlight/Entities/Structures/Wallmounts/Signs/posters.yml new file mode 100644 index 000000000000..97bbfd4d3ff8 --- /dev/null +++ b/Resources/Prototypes/_Starlight/Entities/Structures/Wallmounts/Signs/posters.yml @@ -0,0 +1,39 @@ +- type: entity + parent: PosterBase + id: PosterLegitCalendar + name: nanotrasen brand calendar + description: An outdated calendar bearing NanoTrasen's branding. + components: + - type: Sprite + sprite: _Starlight/Structures/Wallmounts/signs.rsi + state: calendar + +- type: entity + parent: PosterBase + id: PosterLegitCleanHands + name: clean hands sign + description: Wash your hands. Or else. + components: + - type: Sprite + sprite: _Starlight/Structures/Wallmounts/signs.rsi + state: cleanhands + +- type: entity + parent: PosterBase + id: PosterLegitEyeChart + name: eye exam chart + description: Is that third letter a P or an F? + components: + - type: Sprite + sprite: _Starlight/Structures/Wallmounts/signs.rsi + state: eyechart + +- type: entity + parent: PosterBase + id: PosterContrabandYoutoolpia + name: youtoolpia sign + description: A dream that went up in plasma fire. + components: + - type: Sprite + sprite: _Starlight/Structures/Wallmounts/signs.rsi + state: youtoolpia diff --git a/Resources/Prototypes/_Starlight/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/_Starlight/Entities/Structures/Wallmounts/Signs/signs.yml new file mode 100644 index 000000000000..8f01d24c272c --- /dev/null +++ b/Resources/Prototypes/_Starlight/Entities/Structures/Wallmounts/Signs/signs.yml @@ -0,0 +1,59 @@ +- type: entity + parent: BaseSign + id: SignBrigmed + name: corpsman sign + description: A sign indicating the corpsman's medical bay. + components: + - type: Sprite + sprite: _Starlight/Structures/Wallmounts/signs.rsi + state: brigmed + +- type: entity + parent: BaseSign + id: SignDisposalProper + name: disposal sign + description: A sign indicating a disposal area. + components: + - type: Sprite + sprite: _Starlight/Structures/Wallmounts/signs.rsi + state: disposals_proper + +- type: entity + parent: BaseSign + id: SignSecureAreaSmall + name: secure area sign + description: A sign indicating a secure area. + components: + - type: Sprite + sprite: _Starlight/Structures/Wallmounts/signs.rsi + state: secureareasmall + +- type: entity + parent: BaseSign + id: SignWallBiohazard + name: wall biohazard sign + description: A sign indicating a biohazard. + components: + - type: Sprite + sprite: _Starlight/Structures/Wallmounts/signs.rsi + state: wall_biohazard + +- type: entity + parent: BaseSign + id: SignWallExtremeHeat + name: wall extreme heat sign + description: A sign indicating extreme heat. + components: + - type: Sprite + sprite: _Starlight/Structures/Wallmounts/signs.rsi + state: wall_extremeheat + +- type: entity + parent: BaseSign + id: SignYesSmoking + name: yes smoking sign + description: A sign indicating you can smoke here. + components: + - type: Sprite + sprite: _Starlight/Structures/Wallmounts/signs.rsi + state: yessmoking diff --git a/Resources/Textures/_Starlight/Structures/Wallmounts/signs.rsi/brigmed.png b/Resources/Textures/_Starlight/Structures/Wallmounts/signs.rsi/brigmed.png new file mode 100644 index 0000000000000000000000000000000000000000..9e1c73d0d12edcaa3553d01bb969aec758a4d0ae GIT binary patch literal 509 zcmVX5f($I&1--6H2~xh@XdcC0J9Eu>&@>L zA(T_#t41l%Mb}+Tyb7=}KzB6(nnl2S6=-AM>esqB0>vWJ{k~GflI4AUe(5K!F*H;V40@Y&$90ds12YYOzEhYQLshHrAGUK zI&$p?oXha|4bUXNT8kj!=oq{DkIB`4&HnWXT^c5TDgOz~00000NkvXXu0mjfrn1-b literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Starlight/Structures/Wallmounts/signs.rsi/calendar.png b/Resources/Textures/_Starlight/Structures/Wallmounts/signs.rsi/calendar.png new file mode 100644 index 0000000000000000000000000000000000000000..b64172cba1b52cb5d7160507ca98a0c0a09b1e28 GIT binary patch literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D0tq} z#WAE}&f94ld7BLcT=j*xcWiVy$iy?@miH1DpNX0h%|_kC&n6#`5>h62U)220b$7vxqy zFXaskf0eoaZKqnnwkC$lCKm5^iT6BKj^3*_jje&#{aRqdobC6nd7aH-Gwxw@YLJ|JCZsSB=rsmUS3j3^P60;K{{uAJKSifqDcE|hN1R(L{W>sAHd3}t0>I#tfZhskk z=hODn@2_O?KKZ=1gn&7~1<`#Hu^=>?oPKYjwT?$O3U8?nhPR0-#t%;w@Jt1t0~o8LovQ1&|RVlOaN80$3UCWjLym z6acsAo-eB*0uc@Y+Vj2fMF3DXYvYTBKufAfiAF4)16+Wwigi{fk^^YZ_u9z9Uqk+4 ztJY;D6wd)Jp4smw10eIhf>i*luy9`#B2@+2sV6hrFhGBFrlWc0)Z_W-y&(W=a19#) h@ZY8;0Kc~80B`Q|4?Gjx`h5TZ002ovPDHLkV1jhqosR$j literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Starlight/Structures/Wallmounts/signs.rsi/disposals_proper.png b/Resources/Textures/_Starlight/Structures/Wallmounts/signs.rsi/disposals_proper.png new file mode 100644 index 0000000000000000000000000000000000000000..a94d7fd1eb0babc96137138c6118b52d9f4f6ea5 GIT binary patch literal 480 zcmV<60U!Q}P)U92!~Mh5n*6li0RYsPh>ieBKAp|2$pHXHv(P-xTCB%+d%gH1-3vPkalA=uQnZ)^Ui*?XS{tJPyxLTu$(tY)HR8HU^#E3 zM%^#tLsem%f}#|io{*&x6r~`YL#hH5vL|F|bS_1chuZ6adLx-*b?v*cbZE$t&R6PU zxvIm*C-rOA8sA?BsNP?+^MN)6r~M8_?^y{P9KYjq` W+{$nj35>1)00001Wc1*x=PC{6xUxB zgnqzl(J{t2{L@C>uq;bgqG_6f3h;fYOYmcHx3(-m$wCO(_L}3Y0yqPm5Hz3!)dheD zJwa;4+yuaP;ISh}E3e)5W&qFH0R!Y#n?QJ<1rP?{%BMkdeJF(a2-4)a05mI5GXrRo zcg+H-d>%;aa|7^RIRv07pZ1qZvIbb(0jh91xu$wcHmCr6FtXLwRBXBnB(v0nB7mfD zdL%gwp!Wo%0ZX4-8ix5bcv_s_HUMdWw?TD)r=WB(aa|yH1FQk*JFry;)pfw?n*nBr z&#j;N1Q;3Mp+qD_0Qlc)Z~FjY Wk_Fidrw+{k0000Iv>yv4=D^{C7 zL9^*Ofv3Kp<*JyfE^r!`34pfQ$EIukbV&rDZR1~P8%nz7KA6)B0FDV>LU0=R5FL*B*E?#{HTQwy za00yU0SX}Ta`7mh zzzc8!91IC2BrG7UdChBiKqVMM(tq&vz1F{99}P_5&vF0`zyUY_2QV6dNe}OGNC2rk z&kGTK-}f*VW31CTTPc9s70TUtF2|?sT}GNORv?X&BvBhvBMMS^6&+rxqY7YioK?Rs zIIJUhJOTC>Jx7IMsGXRTt(OK6MUgzwa;GYw=O59{MK`#*t(OL1BeU(I8(jSx)d1+l z;x1UY|IIvxAF^qmzq| z;uH7+JOK`d1QQY#DkUi?$I%v3#i2KF{R`Lo+U71yVPtav4!{9800$rgOn#J;^#MRp z6eah*?|XcVz4%V0Rk3`GX*ySsrfF+Y5rj1bB4XvuQ16rgQ4}=^a1hoQ2*-wDNUo~{ z5Q`>BQt}|-sbG967)S+60#Lh=lgnfIYH%!0)CYwD*zF2zcb?bcw7u8fre3VNmDW0e z&2d&eUvOB*@OT33FLt%=1R##%nsB*mX0V2VnzgkCfHGB0>v{tim{BY4tLbVUf*|m+ zEbBBOFf=0oygRuXc$rdg)&RtUxXW>VLoiIDk>? Y4a=A9qnp1?Jpcdz07*qoM6N<$fB4OM2oi9hGVWwo~N}tY29jD5IUNqdl z_U!oiyvGb}iGQqjUuwO3%AD(@Xi3Y6EXnp$=nCiDa$N$0>2g+Y%-6 X#Yzfq-Pn-`3IhgDS3j3^P6-AA7)Y0|&avlIGg}PDa zm3t8>P*K$e0ed-9xie!{OJTiKi#y#hnvtW7o4AsjLLK?l=SD;NdsZmI^L^ay4(o)rVdUSzmxq;K8i>L$5P7S^vpxLPbxTBcc?uBHcTwJ8o zJqN8Vsgp4qZo7wr)>eqN4^G0kkR~M|W464k2oqFjXu(4b(_FJtlQh+J`hI|e)|Qkx z=i!@BRh~vMlJyg*Ix2-ad_R!CCRpC~(r`Ne;z_BeJ4Of-z8}bkpug`psC!I$R2cgKQO~U=b$?QB4T9`l5+*I~ zdVP7hP`wz}0Tubx=U80MNjb42Qn6B;iL_LzG5s;Y_XBwd75BOc_0y+O*W|1UA;fqN zbiKYY>}dufjp(0FiXgjU6?&B;CFc+?dOAppn0z`KMHBJ!=rIS-9-&H;=PNC*MPaiEs;5waoaT+_`tPyAl| ar}zz(XT^<$!_hAQ0000 Date: Wed, 15 Jan 2025 21:47:22 +0100 Subject: [PATCH 122/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 5e08720c9a3b..db39bbef70f0 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Bellwether - changes: - - message: The Clerk's Vest now has a pocket, matching its description. - type: Fix - id: 415 - time: '2024-07-01T20:06:54.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1397 - author: deltanedas changes: - message: Artifacts can no longer create singularities or tesla balls. @@ -3860,3 +3853,10 @@ id: 914 time: '2025-01-15T19:18:13.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2734 +- author: Conflee, rosieposieeee + changes: + - message: Added some more signage for mappers. + type: Add + id: 915 + time: '2025-01-15T20:47:03.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2741 From c541d7b77e3553b3fa717bdd0d984e19c2e4e079 Mon Sep 17 00:00:00 2001 From: deltanedas <@deltanedas:kde.org> Date: Wed, 15 Jan 2025 21:42:18 +0000 Subject: [PATCH 123/205] :trollface: --- Resources/ConfigPresets/Build/debug.toml | 1 + Resources/ConfigPresets/Build/development.toml | 1 + 2 files changed, 2 insertions(+) diff --git a/Resources/ConfigPresets/Build/debug.toml b/Resources/ConfigPresets/Build/debug.toml index e4127628a012..1dd25bb773b5 100644 --- a/Resources/ConfigPresets/Build/debug.toml +++ b/Resources/ConfigPresets/Build/debug.toml @@ -7,6 +7,7 @@ enabled = false request_aco_delay_minutes = 1 auto_unlock_aa_delay_minutes = 1 auto_unlock_aa_enabled = true +secret_weight_prototype = "SecretDeltaV" # DeltaV [shuttle] auto_call_time = 0 diff --git a/Resources/ConfigPresets/Build/development.toml b/Resources/ConfigPresets/Build/development.toml index 4a3127a3164e..a4d163f4b8fe 100644 --- a/Resources/ConfigPresets/Build/development.toml +++ b/Resources/ConfigPresets/Build/development.toml @@ -5,6 +5,7 @@ lobbyenabled = false map = "Dev" role_timers = false contraband_examine = false # DeltaV +secret_weight_prototype = "SecretDeltaV" # DeltaV [ghost] role_time = 0.5 From d19a1c194f26578b9fb52b71e0556c7aa253e272 Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Wed, 15 Jan 2025 20:51:36 +0100 Subject: [PATCH 124/205] Update RT to v239.0.1 (#34454) --- RobustToolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RobustToolbox b/RobustToolbox index e4190f4f2900..bcc4cd77cf16 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit e4190f4f2900634e332208a77cd6df9cef75c29a +Subproject commit bcc4cd77cf16deb9b05f29b090d865f836a733ab From 996006a23611bc9b482b866a79023c8409a9c93e Mon Sep 17 00:00:00 2001 From: BarryNorfolk Date: Wed, 15 Jan 2025 23:35:48 +0100 Subject: [PATCH 125/205] Ensure BeingCarriedComponent removal cleans up Carrier's virtual items (#2729) --- Content.Shared/_DV/Carrying/CarryingSystem.cs | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/Content.Shared/_DV/Carrying/CarryingSystem.cs b/Content.Shared/_DV/Carrying/CarryingSystem.cs index 095bbf27e390..03e44f62b064 100644 --- a/Content.Shared/_DV/Carrying/CarryingSystem.cs +++ b/Content.Shared/_DV/Carrying/CarryingSystem.cs @@ -69,6 +69,7 @@ public override void Initialize() SubscribeLocalEvent(OnDrop); SubscribeLocalEvent(OnDrop); SubscribeLocalEvent(OnDrop); + SubscribeLocalEvent(OnRemoved); SubscribeLocalEvent(OnDoAfter); } @@ -205,6 +206,19 @@ private void OnDrop(Entity ent, ref TEvent args) DropCarried(ent.Comp.Carrier, ent); } + private void OnRemoved(Entity ent, ref ComponentRemove args) + { + /* + This component has been removed for whatever reason, so just make sure that the + carrier is cleaned up. + */ + if (!TryComp(ent.Comp.Carrier, out var carryingComponent)) + // This carrier has probably already been cleaned, no reason to try again + return; + + CleanupCarrier(ent.Comp.Carrier, ent); + } + private void OnDoAfter(Entity ent, ref CarryDoAfterEvent args) { if (args.Handled || args.Cancelled) @@ -295,6 +309,11 @@ public bool TryCarry(EntityUid carrier, Entity toCarry) public void DropCarried(EntityUid carrier, EntityUid carried) { Drop(carried); + CleanupCarrier(carrier, carried); + } + + private void CleanupCarrier(EntityUid carrier, EntityUid carried) + { RemComp(carrier); // get rid of this first so we don't recursively fire that event RemComp(carrier); _virtualItem.DeleteInHandsMatching(carrier, carried); From c65f619b5151152eabe47ecd2203ed83f9fe305e Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Wed, 15 Jan 2025 23:36:07 +0100 Subject: [PATCH 126/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index db39bbef70f0..b398bb089208 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: deltanedas - changes: - - message: Artifacts can no longer create singularities or tesla balls. - type: Remove - id: 416 - time: '2024-07-01T20:10:00.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1441 - author: Timemaster99 changes: - message: Gave prosecutors access to brig timers @@ -3860,3 +3853,11 @@ id: 915 time: '2025-01-15T20:47:03.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2741 +- author: BarryNorfolk + changes: + - message: Fixed virtual items persisting after inserting carried organics into + biomass reclaimers + type: Fix + id: 916 + time: '2025-01-15T22:35:49.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2729 From 213eb193255d98ee61903457ebc0ffabdc51084d Mon Sep 17 00:00:00 2001 From: rosieposie <52761126+rosieposieeee@users.noreply.github.com> Date: Wed, 15 Jan 2025 20:44:00 -0500 Subject: [PATCH 127/205] Update detective.yml --- Resources/Prototypes/Roles/Jobs/Security/detective.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml index 90d8cb55d6be..657ddc062522 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml @@ -28,6 +28,7 @@ equipment: eyes: ClothingEyesGlassesSecurity id: DetectivePDA + gloves: ClothingHandsGlovesForensic # DeltaV - roundstart detective forensic gloves ears: ClothingHeadsetSecurity belt: ClothingBeltHolster # DeltaV - loadouts storage: From 1107520098623f3b648c125a487af827fffb79dc Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Thu, 16 Jan 2025 06:36:55 -0600 Subject: [PATCH 128/205] Add Advanced Microwave (#2670) * Yuh * meow * sprite fix * rads and time increase * :( Signed-off-by: Stop-Signs * meow * minor comment fix Signed-off-by: Stop-Signs * removed valid microwave Signed-off-by: Stop-Signs * mrp * meow * No more rads so more cook time, still overall better * meow * Update advanced_microwave.yml * Revert "Update advanced_microwave.yml" This reverts commit 47ba535f479eac58c8c74ef7aa97e17c42212cd5. * i hate git * meta file moment * kaylie = meanie * I HATE META FILES * more cursed meta --------- Signed-off-by: Stop-Signs --- .../Entities/Structures/Machines/lathe.yml | 1 + .../Prototypes/Research/civilianservices.yml | 1 + .../CircuitBoards/Machine/production.yml | 11 +++++ .../Machines/advanced_microwave.yml | 25 +++++++++++ .../_DV/Recipes/Lathes/electronics.yml | 5 +++ .../Machines/advanced_microwave.rsi/meta.json | 41 ++++++++++++++++++ .../Machines/advanced_microwave.rsi/mw.png | Bin 0 -> 432 bytes .../Machines/advanced_microwave.rsi/mw0.png | Bin 0 -> 423 bytes .../mw_running_unlit.png | Bin 0 -> 276 bytes .../advanced_microwave.rsi/mw_unlit.png | Bin 0 -> 1772 bytes .../Machines/advanced_microwave.rsi/mwb.png | Bin 0 -> 825 bytes .../advanced_microwave.rsi/mwbloody.png | Bin 0 -> 603 bytes .../advanced_microwave.rsi/mwbloody0.png | Bin 0 -> 268 bytes .../advanced_microwave.rsi/mwbloody1.png | Bin 0 -> 230 bytes .../advanced_microwave.rsi/mwbloodyo.png | Bin 0 -> 723 bytes .../Machines/advanced_microwave.rsi/mwo.png | Bin 0 -> 543 bytes 16 files changed, 84 insertions(+) create mode 100644 Resources/Prototypes/_DV/Entities/Objects/Devices/CircuitBoards/Machine/production.yml create mode 100644 Resources/Prototypes/_DV/Entities/Structures/Machines/advanced_microwave.yml create mode 100644 Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/meta.json create mode 100644 Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mw.png create mode 100644 Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mw0.png create mode 100644 Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mw_running_unlit.png create mode 100644 Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mw_unlit.png create mode 100644 Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mwb.png create mode 100644 Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mwbloody.png create mode 100644 Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mwbloody0.png create mode 100644 Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mwbloody1.png create mode 100644 Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mwbloodyo.png create mode 100644 Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mwo.png diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index a058724488ec..e4f70afc07c2 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -593,6 +593,7 @@ - SalvageExpeditionsComputerCircuitboard - ComputerMassMediaCircuitboard - AlertsComputerCircuitboard + - AdvancedMicrowaveMachineCircuitBoard # End DeltaV additions - type: EmagLatheRecipes emagDynamicRecipes: diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml index bb65b890c423..3ca9ecbf42aa 100644 --- a/Resources/Prototypes/Research/civilianservices.yml +++ b/Resources/Prototypes/Research/civilianservices.yml @@ -97,6 +97,7 @@ - FatExtractorMachineCircuitboard - BiofabricatorMachineCircuitboard - BiomassReclaimerMachineCircuitboard + - AdvancedMicrowaveMachineCircuitBoard # DeltaV # Tier 2 diff --git a/Resources/Prototypes/_DV/Entities/Objects/Devices/CircuitBoards/Machine/production.yml b/Resources/Prototypes/_DV/Entities/Objects/Devices/CircuitBoards/Machine/production.yml new file mode 100644 index 000000000000..7ed04ada2f47 --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Objects/Devices/CircuitBoards/Machine/production.yml @@ -0,0 +1,11 @@ +- type: entity + parent: MicrowaveMachineCircuitboard + id: AdvancedMicrowaveMachineCircuitBoard + name: advanced microwave machine board + components: + - type: MachineBoard + prototype: AdvancedMicrowave + stackRequirements: + Capacitor: 2 + Glass: 4 + Cable: 5 diff --git a/Resources/Prototypes/_DV/Entities/Structures/Machines/advanced_microwave.yml b/Resources/Prototypes/_DV/Entities/Structures/Machines/advanced_microwave.yml new file mode 100644 index 000000000000..e68f43f3738f --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Structures/Machines/advanced_microwave.yml @@ -0,0 +1,25 @@ +- type: entity + parent: KitchenMicrowave + id: AdvancedMicrowave + name: Advanced Microwave + description: Don't stand too close to this thing, definitely dont put anything metal in. + components: + - type: Microwave + cookTimeMultiplier: 0.5 + capacity: 30 + canMicrowaveIdsSafely: false # No AA farm + - type: Sprite + sprite: _DV/Structures/Machines/advanced_microwave.rsi + - type: Machine + board: AdvancedMicrowaveMachineCircuitBoard + - type: Explosive + explosionType: Radioactive + maxIntensity: 60 + totalIntensity: 50 + intensitySlope: 10 + canCreateVacuum: false + deleteAfterExplosion: false + - type: FoodRecipeProvider + providedRecipes: # if any new unique foods get added this will need updating + - RecipeBaguetteSword + - RecipeThrowingCroissant diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/electronics.yml b/Resources/Prototypes/_DV/Recipes/Lathes/electronics.yml index f303be29f162..23cdd7e4f817 100644 --- a/Resources/Prototypes/_DV/Recipes/Lathes/electronics.yml +++ b/Resources/Prototypes/_DV/Recipes/Lathes/electronics.yml @@ -12,3 +12,8 @@ parent: BaseCircuitboardRecipe id: AlertsComputerCircuitboard result: AlertsComputerCircuitboard + +- type: latheRecipe + parent: BaseGoldCircuitboardRecipe + id: AdvancedMicrowaveMachineCircuitBoard + result: AdvancedMicrowaveMachineCircuitBoard diff --git a/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/meta.json b/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/meta.json new file mode 100644 index 000000000000..3ed061a708cb --- /dev/null +++ b/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from /tg/station at commit 9065b811726ae52be5d1889f436c01a24efbf47a, edited by github user @Flareguy for Space Station 14, edited by github user Stop-Signs for DeltaV", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "mw" + }, + { + "name": "mw_unlit" + }, + { + "name": "mw0" + }, + { + "name": "mw_running_unlit" + }, + { + "name": "mwb" + }, + { + "name": "mwbloody" + }, + { + "name": "mwbloody0" + }, + { + "name": "mwbloody1" + }, + { + "name": "mwbloodyo" + }, + { + "name": "mwo" + } + ] +} diff --git a/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mw.png b/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mw.png new file mode 100644 index 0000000000000000000000000000000000000000..3c677eb03119333dc8700658720ecabc66a51eb2 GIT binary patch literal 432 zcmV;h0Z;ykP)Px$X-PyuR9HvtRy|LJFcdv+Q!sHM49qaq(Si6sFmW?+V&W(G8+x)e_V1waE;ZCgI`3%7s;nx?ro zhG7`M8wKTO{xv{O$hTi~5N!hRJP%b>L3aHU005FI0-!HIn|ECY+qSo^6eP7p7!WmQ z&nbva0Mq?b)_^PnP1C@#EWX#S>tY;77>0qmuK%xrT}%{3fjEv4MG+3}A3mli2m($* znx<+1WHpdw8Nx6`k|Z2}<2W2Z+qP-|Hq|d;UPx$VM#g)t~WfV_`x?2pniUV z^T!9>b>a2u8rbCp7yzSyk^R=BKmZJ+u3hK(zO)5A(6;S^ z8K!9hQ3z^ro&o#WmpzD<06`Ey(=?!Z)eeAv0gDgA0Iuuqydoqn?EospIUGVP0oMH^ zdq4#Oi+5cIj^l`4`@RqJJcDIf(6;UWJ+QA0RaHTnrjR5FoNS-IrYMRcAwr(#Gyqi( z6h#4X97C360>JY;0nqn74PfbhnF4D7tqRCS@n{ODK8etPVHiSLmZAk{LcT~QR4vZq z#&P^L1>`YoPOU?0E5`@#v;1YGoQ)W`_hm%PNj~=HtC*aLc+dbC1&jhlflq6*sW8E$ ReK7z4002ovPDHLkV1iyDvJ3zK literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mw_running_unlit.png b/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mw_running_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..8b6fa76e0a1dc24ef29625d12e4e68fb859da2a9 GIT binary patch literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}XFOdTLn7Rh zQzQ}&SRD9f++&qs!s6zfP|)5`;C#70=yd0H-ck;KQv-)D*NqJf43f@&s&Hm_(r~GT zrR}SJoDqvxhwzf!;yMWjUNKBimO4?=(ABPf<5RY}pFu`s#DgV{eS0=1TbHp1NHMkO zw4Y3FVG#W2ZouWi**IBjnTmQ=6CcA;#w4eNKo^OV)0&w&7BF}4Hgd6A-m*xz(892A zjmKsI1trDisSBReCz%R*F{{jQ-WIe;i0|gM#ETZM8ZHV*@HT=8Mt(+yJ-b&bzSHeW S0{V-=)78&qol`;+0|Njt=U-9) literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mw_unlit.png b/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mw_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..11e691d0317e35db97579f0fe7214e7a936ad7ba GIT binary patch literal 1772 zcmbVNJ&fZ-6!z+l)v>3gp#UKYk(+we>mi$CDCl^*Y37w-J<>~FBRJZiZuLHOeQ>fhusSU(;g zyp;;V)hF|NOZeo|rv+iV5%dSyziwV77q$w*dg8)#HnRS_UidKP75j-vEhNwTEru#_f2 zoCQ1*b6PUw)2u0h#ic7@yylM5WxODA@|?u7Qp34x1<<2wTs%!Cg#{j!*@T5G%2L28 zYivB`8BfRjKd9Hg|D^yz?7C|m8*K^0wTd+Bo`M_8sBA>1{j-?K$1LU3gtG1_n0YPt zCU)8hBNJ6f46s^GQw!p$J^_$+;~BEUK%V@*lLDn?jGs@+%Wj$%3*q|tCN zE}<^>0{^TEH6Y7-3^DBN1i2PE&&5)Plfse9JP4su5&+ zd65#`Mubog>CCe<4>MCY%$0nH(`jA;xqR6b9;d+Zz&z^vielIp*@o>S+tM)_VqzeQ zbxpTz)6gtq#r8%LKxdLkl{L4@14gQ$f%|KY|Mc4 zAq7-wPr0AXNWxkp2CDLH+(8yCxXXR3b0 zhgUUg4S7?7OI&5>l>@bqhKUL*kXw!Oe6>CjSOi)V82IOJ?)?mhh2874`h)%ZKPpea zk#zan@6K<_PZ=M7IllYRhv>O0!n=3JAAC0b>94`px4S3z#=qR#`t=fsz4BV}{QXPY U-+%t++xd~x>mGLQT)*|+KbGbdxc~qF literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mwb.png b/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mwb.png new file mode 100644 index 0000000000000000000000000000000000000000..221a7a5df3dd07838e57a0ed20e274647c62072b GIT binary patch literal 825 zcmV-91IGM`P)Px%@kvBMR9HvtmEUVpVHn513Tw?oNezEMd6D6TC=4nh*iBu8G>9%7j0nQIaDPA{ z{Q)t$^U4uSqA>>ZqNHL4U3Jk#3k>9xlDn|QRC3s+(}HmEyzm}gj~+c|TX#M;=bZOE z@ALh<-}iaXF+dT4Kww`vc2v)jBpH;odIktU`tS+X)s?=w6D!MT&)({JxA%4pC$5G2 zjvG52bc{y$zkY!dVkiI!{`s+q&i!~-aSqa6d(Db-@z(lBm@Zs|2z2a8lFj}3?mYsR z&v!u#1Q1tCLKG9>>#!^@vHP+l!4V9iX0yRyv%_VzqPkIJIbv{_otasE08CKDat3kb zD$}Wc&cb=thsw?lTRjiuwj2mRtpWEQ#$lYA!oK5_oFa-V=Ml``#b??a*mk;5dH$-a zhU?}u#vje2{CFPj2XXw$Hz5I#`07#$ zGqV7v%>ZOS zIYACI8V$JJ?txB}N+l442vGOb;o5egVz0ovxXzq85P;ciM!8&u-|t7EP+(Uvc6WE7 z20(cPG5+G^;Q%Zai>yfy^_&s$#Z$gj9BhM4ZRhy6;=m$U!1cO0V zjD*ACFk3M>A#O)5m+NwXP7bY};z%4I0Rj>GfW|2JwuoCm0Q|IQc3@BsX!#t90Mvxp zY!;J~liHe)1k_G}7IFC`9QITEZNh|;o8RRote-xkM}J`Mxpr&#myjxmr$Fz|Xc+Cl zPq8?ewxe3DYWounQ&oBYUyEyD8Uc(P7&$O<;2+8{1V0F);<5k$002ovPDHLkV1fVu D%Px%6-h)vR9HvtR=-OlK@|Ri9B2}>35Wq3$-%)~XIz4%5NvG}1q(r&RQUreZX5rA zRH=k34(_-#3O2GJ*vPVK6BrN-LJ%SgX(IVi9m<=#x9si3+sV4+PV;t#dGCGmz3J(p6ZIHvc(3j{!3-C*wL_qg+-x3vSYT0{aMVL*!kR^Z{>432uE*aWF1 z!v67Bm2kJTf=2+C_O<%{W?#P>NOpfOybA~bZHzkJ^5^x?67a@MCNnXH!C(OLC&rG< zKki=u@mZ+#i5MUNpBx8whT+*M$H6bd0Nb+Tz%mT5B>)>z;zS6@P3av#G$I0^2n6D( zT*iWBDciR!WPR4KECqrF0hpB%&wc>!Wq^`W633U6!T2pP#U&W0A?*?{g{*-v1_%Tt zZ@1gX<#JxF3xxuP!y(e?G+M2ez6O{=0^qMX(LV0v#89)@M6FgswOYmW>6sE69pnPQ zx@n@(Xy^k7b^(F#Cm&ai^Z9vHDizf0bsV^^5@9}{_e9v~bo2rEOAurrC_tVQ0}No@ zb+HKGgK6U2G_eLKK-wBumJ+u@fHe?oy>asg9|KFStGXaE15qv_5@4xRf^FNL21tZF zCK6%PtGL_k{?!G+YgD@g_cQ5-XQsNH<7a p`~LYWjw`TkoCH9^K*B)6z$;gpzA$8J+Zq4>002ovPDHLkV1nNt4DbK| literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mwbloody0.png b/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mwbloody0.png new file mode 100644 index 0000000000000000000000000000000000000000..a51302a2537666447aab9729ffd9e99629aed1ba GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|3<7*YT(z~e z5ANE!baHbw14CnRW*h^9nVA`bHiIPtgR85nxVX5#zyFFAD;gRaQX&I^n)GFge*-Cj zk|4j}|EPfBfpV-QP%h8Y#WBR9_vr+0t^)=fF3imj&i%f>?b&6wPDhXMrFtqH1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mwbloody1.png b/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mwbloody1.png new file mode 100644 index 0000000000000000000000000000000000000000..8cfdf34281a32ce8dd087a52b77d1284ec461e3c GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}3p`yMLn2z= zPBP?TG8Ax)f0L4*xbjAoXs&If&h^ztjE-E2jyQgZlTFZ!rRi+FK%JW8Gycg90!|&Q zHYp7$QVQxP4kqRQo@Cw{oFi(NvR-f&DXP8ng^Zl zHO|)h%w51Pm$vU^VP5V7o^>|PCXY?$Yra`KF_BkgwgXGw)R$LHX7D||?ygg~)`>&0 c<;6qR_z=%p$19>CK({h@y85}Sb4q9e0Qr+vJOBUy literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mwbloodyo.png b/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mwbloodyo.png new file mode 100644 index 0000000000000000000000000000000000000000..c2af885979f7cb91978ed5c312fdcaf05073de74 GIT binary patch literal 723 zcmV;^0xbQBP)Px%jY&j7R9HvtR=;agQ5ZcP1REQJBqk83N)jEsl@{8HIEc7(@z-Kia40y%{sAHi zKG5Qvp=K&{5EQexD7X}KsKs_r4OAnetDfOdyuhZYP);*HbS;z(n==mjt9^UUXE|$kHLLD7Jmq1qmUkZo=uZMau zwY=IfL;5n|%FL_*Tsw0TW44WF3yZjPWEA%n7TYG$cX`5l3P^z9_PdXW9oUCRB(f=B zK2MUPjF= zkm^Zd6fkN~iMLdwQp2%m*zo{+ol2!puh$U>1W+gxygfkhOeTYTK96iR3n4%SqRE8m zxkyhEI{;I?5D^cE0`$ThfHBKLE|>F1Ae~N|!_{ilAuwm#rb3aQvNH%yV^R&O@CGmn zhzaBIxMRX{xx94(RN!kefy0e-FMmnCyI2Cp?ob1mKlL?CIIK1L0c^7@Jhd#G0L)Z) zjv-snN&&eC++e(%Nr+W5IHrsNr65zVB?Ve}fCL1bK$M$7aPGU;{Px$*hxe|R9Hvtma$92KorJbai|812!TLBai}_+qm#I}D;*?)=%B`>|ALEuL#KjJ zaZm)a7f#!S+CdZwfq+OQx`^_kcb;kLT}$GWo7&gQeZPG7y}M>0GzcLd;ac3^ zZQIV!HQ5JRKmhyV3I-1Lm*i| zeq%-41qguR?(IEjVGN5T1yNqPEfET$@ z)n8jsC=|f=eNYqy>h-!f11MfDm%(uys8lLJ3t|SQjrBlBTQk7juC`=>uRGQu6Vi2^ z%{5I^4xm&j0Z#Tjj{$60$H7AQhBS<5`Fpe3Qr|LGnNU8TX8?^xqk8~!U}kAK5JZUZ zKqv${-P?sk9KbfD)>9B3;{3>BTg10vR}MsFfIo=ZWq< Date: Thu, 16 Jan 2025 13:37:15 +0100 Subject: [PATCH 129/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index b398bb089208..aa9212188802 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Timemaster99 - changes: - - message: Gave prosecutors access to brig timers - type: Tweak - id: 417 - time: '2024-07-01T20:11:26.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1430 - author: Bellwether changes: - message: Sechuds can now be used to mark subpoenaed crew members who are needed @@ -3861,3 +3854,10 @@ id: 916 time: '2025-01-15T22:35:49.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2729 +- author: Stop-Signs + changes: + - message: Epistemics can now research an advanced microwave for the kitchen + type: Add + id: 917 + time: '2025-01-16T12:36:56.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2670 From 3204aa8c50be00e0d18b6a4fac2d65e48337e774 Mon Sep 17 00:00:00 2001 From: rosieposie <52761126+rosieposieeee@users.noreply.github.com> Date: Thu, 16 Jan 2025 07:37:56 -0500 Subject: [PATCH 130/205] Acidifying Sec Crates & Emergency Lasers (#2672) * adds three PRs! * random failure * Update AntiTamperSystem.cs * Update cargo_technician.yml * Update cargo_technician.yml * armory & sec crates only * untouch * review fixes * more tweaks --- .../AntiTamper/AntiTamperComponent.cs | 93 ++++++++++ .../Containers/AntiTamper/AntiTamperSystem.cs | 161 ++++++++++++++++++ .../AntiTamperDisarmDoAfterEvent.cs | 9 + .../Locale/en-US/_Impstation/anti-tamper.ftl | 4 + .../Structures/Storage/Crates/crates.yml | 4 + .../Roles/Jobs/Cargo/cargo_technician.yml | 2 +- .../Catalog/Cargo/cargo_emergency.yml | 9 + .../Catalog/Fills/Crates/emergency.yml | 10 ++ .../Weapons/Guns/Battery/emergencylaser.yml | 28 +++ .../Weapons/Guns/Projectiles/hitscan.yml | 14 ++ .../Battery/emergency_laser_gun.rsi/base.png | Bin 0 -> 341 bytes .../equipped-BACKPACK.png | Bin 0 -> 1416 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 1416 bytes .../Battery/emergency_laser_gun.rsi/icon.png | Bin 0 -> 750 bytes .../emergency_laser_gun.rsi/inhand-left.png | Bin 0 -> 322 bytes .../emergency_laser_gun.rsi/inhand-right.png | Bin 0 -> 337 bytes .../mag-unshaded-1.png | Bin 0 -> 175 bytes .../mag-unshaded-2.png | Bin 0 -> 175 bytes .../mag-unshaded-3.png | Bin 0 -> 176 bytes .../mag-unshaded-4.png | Bin 0 -> 172 bytes .../Battery/emergency_laser_gun.rsi/meta.json | 53 ++++++ .../wielded-inhand-left.png | Bin 0 -> 929 bytes .../wielded-inhand-right.png | Bin 0 -> 919 bytes 23 files changed, 386 insertions(+), 1 deletion(-) create mode 100644 Content.Server/_Impstation/Containers/AntiTamper/AntiTamperComponent.cs create mode 100644 Content.Server/_Impstation/Containers/AntiTamper/AntiTamperSystem.cs create mode 100644 Content.Shared/_Impstation/Containers/AntiTamper/AntiTamperDisarmDoAfterEvent.cs create mode 100644 Resources/Locale/en-US/_Impstation/anti-tamper.ftl create mode 100644 Resources/Prototypes/_Impstation/Catalog/Cargo/cargo_emergency.yml create mode 100644 Resources/Prototypes/_Impstation/Catalog/Fills/Crates/emergency.yml create mode 100644 Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Battery/emergencylaser.yml create mode 100644 Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml create mode 100644 Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/emergency_laser_gun.rsi/base.png create mode 100644 Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/emergency_laser_gun.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/emergency_laser_gun.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/emergency_laser_gun.rsi/icon.png create mode 100644 Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/emergency_laser_gun.rsi/inhand-left.png create mode 100644 Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/emergency_laser_gun.rsi/inhand-right.png create mode 100644 Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/emergency_laser_gun.rsi/mag-unshaded-1.png create mode 100644 Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/emergency_laser_gun.rsi/mag-unshaded-2.png create mode 100644 Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/emergency_laser_gun.rsi/mag-unshaded-3.png create mode 100644 Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/emergency_laser_gun.rsi/mag-unshaded-4.png create mode 100644 Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/emergency_laser_gun.rsi/meta.json create mode 100644 Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/emergency_laser_gun.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/emergency_laser_gun.rsi/wielded-inhand-right.png diff --git a/Content.Server/_Impstation/Containers/AntiTamper/AntiTamperComponent.cs b/Content.Server/_Impstation/Containers/AntiTamper/AntiTamperComponent.cs new file mode 100644 index 000000000000..aa6b622e6173 --- /dev/null +++ b/Content.Server/_Impstation/Containers/AntiTamper/AntiTamperComponent.cs @@ -0,0 +1,93 @@ +using Content.Shared.Damage; +using Content.Shared.Tools; +using Robust.Shared.Audio; +using Robust.Shared.Prototypes; + +namespace Content.Server.Containers.AntiTamper; + +///

+/// When a locked container with this component is destroyed, it will +/// acidify the contents. +/// +[RegisterComponent] +[Access(typeof(AntiTamperSystem))] +public sealed partial class AntiTamperComponent : Component +{ + /// + /// List of containers to acidify. If null, + /// all containers will acidify. + /// + [DataField, ViewVariables(VVAccess.ReadWrite)] + public HashSet? Containers; + + /// + /// The popup message to display when the anti-tamper module + /// is triggered. + /// + [DataField, ViewVariables(VVAccess.ReadWrite)] + public LocId Message = "anti-tamper-contents-destroyed"; + + /// + /// The popup message to display when the anti-tamper module + /// fails to trigger. + /// + [DataField, ViewVariables(VVAccess.ReadWrite)] + public LocId FailureMessage = "anti-tamper-random-failure"; + + /// + /// The sound to play when the anti-tamper module is triggered. + /// + [DataField, ViewVariables(VVAccess.ReadWrite)] + public SoundSpecifier Sound = new SoundPathSpecifier("/Audio/Items/soda_spray.ogg"); + + /// + /// If true, mobs with a will not be + /// deleted, and instead will take . + /// + [DataField, ViewVariables(VVAccess.ReadWrite)] + public bool PreventRoundRemoval = true; + + /// + /// If is true, mobs caught inside + /// of the container when the anti-tamper is activated will receive this + /// damage instead of being deleted. + /// + [DataField, ViewVariables(VVAccess.ReadWrite)] + public DamageSpecifier MobDamage = new() + { + DamageDict = new() + { + { "Caustic", 85 } + }, + }; + + /// + /// If true, mobs with + /// ComplexInteractionComponent + /// will be able to disarm the anti-tamper component the crate is open or they are inside of it. + /// + [DataField, ViewVariables(VVAccess.ReadWrite)] + public bool CanDisarm = true; + + /// + /// The length of time it takes to disarm the anti-tamper module. Multiplied by + /// if the disarming mob is locked + /// inside of the container. + /// + [DataField, ViewVariables(VVAccess.ReadWrite)] + public TimeSpan DisarmTime = TimeSpan.FromSeconds(5); + + /// + /// If the disarming mob is locked inside of the container, + /// the will be multiplied by this. + /// + [DataField, ViewVariables(VVAccess.ReadWrite)] + public float DisarmLockedMultiplier = 4; + + /// + /// The tool required to disarm the anti-tamper module. If null, + /// no tool is required. + /// + [DataField, ViewVariables(VVAccess.ReadWrite)] + public ProtoId? DisarmToolRequired = "Screwing"; +} diff --git a/Content.Server/_Impstation/Containers/AntiTamper/AntiTamperSystem.cs b/Content.Server/_Impstation/Containers/AntiTamper/AntiTamperSystem.cs new file mode 100644 index 000000000000..4a1b13834cf5 --- /dev/null +++ b/Content.Server/_Impstation/Containers/AntiTamper/AntiTamperSystem.cs @@ -0,0 +1,161 @@ +using Content.Server.Storage.Components; +using Content.Server.Storage.EntitySystems; +using Content.Shared.Containers.AntiTamper; +using Content.Shared.Damage; +using Content.Shared.Destructible; +using Content.Shared.DoAfter; +using Content.Shared.Lock; +using Content.Shared.Mind.Components; +using Content.Shared.Popups; +using Content.Shared.Storage.EntitySystems; +using Content.Shared.Tools.Systems; +using Content.Shared.Verbs; +using Robust.Shared.Audio.Systems; +using Robust.Shared.Containers; +using Robust.Shared.Random; + +namespace Content.Server.Containers.AntiTamper; + +public sealed partial class AntiTamperSystem : EntitySystem +{ + [Dependency] private readonly SharedContainerSystem _containerSystem = default!; + [Dependency] private readonly SharedPopupSystem _popupSystem = default!; + [Dependency] private readonly LockSystem _lockSystem = default!; + [Dependency] private readonly SharedAudioSystem _audioSystem = default!; + [Dependency] private readonly SharedToolSystem _toolSystem = default!; + [Dependency] private readonly SharedEntityStorageSystem _entityStorageSystem = default!; + [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private readonly DamageableSystem _damageableSystem = default!; + [Dependency] private readonly IRobustRandom _random = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnDestroy, before: [typeof(EntityStorageSystem)]); + SubscribeLocalEvent>(OnGetVerbs); + SubscribeLocalEvent(OnDisarmDoAfter); + } + + private void OnDestroy(EntityUid uid, AntiTamperComponent comp, DestructionEventArgs args) + { + if (!TryComp(uid, out var containerManager)) + return; + + if (!_lockSystem.IsLocked(uid)) + return; + + var coords = Transform(uid).Coordinates; + + if (_random.Prob(0.25f)) + { + _popupSystem.PopupCoordinates(Loc.GetString(comp.FailureMessage, ("container", uid)), coords, PopupType.Small); + return; + } + + foreach (var container in _containerSystem.GetAllContainers(uid, containerManager)) + { + if (comp.Containers != null && !comp.Containers.Contains(container.ID)) + continue; + + foreach (var ent in container.ContainedEntities) + { + if (comp.PreventRoundRemoval && HasComp(ent)) + { + _damageableSystem.TryChangeDamage(ent, comp.MobDamage); + } + else + { + QueueDel(ent); + } + } + } + + _popupSystem.PopupCoordinates(Loc.GetString(comp.Message, ("container", uid)), coords, PopupType.SmallCaution); + _audioSystem.PlayPvs(comp.Sound, coords); + } + + private void OnGetVerbs(EntityUid uid, AntiTamperComponent comp, GetVerbsEvent args) + { + if (!args.CanAccess || !args.CanInteract || !args.CanComplexInteract) + return; + + if (!CanDisarm((uid, comp), args.User, args.Using)) + return; + + AlternativeVerb verb = new() + { + Text = Loc.GetString("anti-tamper-disarm-verb"), + Act = () => + { + AttemptDisarm((uid, comp), args.User, args.Using); + } + }; + args.Verbs.Add(verb); + } + + private bool CanDisarm(Entity ent, EntityUid user, EntityUid? used) + { + var uid = ent.Owner; + var comp = ent.Comp; + + if (comp.DisarmToolRequired != null && (used == null || !_toolSystem.HasQuality(used.Value, comp.DisarmToolRequired))) + return false; + + // Check if crate is unlocked+open or if the player is inside + if (!_containerSystem.ContainsEntity(uid, user)) + { + // Disarming entity is outside of the crate + // Crate must be unlocked+open + + if (!TryComp(uid, out var entStorage)) + return false; + if (_lockSystem.IsLocked(uid) || !entStorage.Open) + return false; + } + + return true; + } + + private void AttemptDisarm(Entity ent, EntityUid user, EntityUid? used) + { + if (!CanDisarm(ent, user, used)) + return; + + var delay = ent.Comp.DisarmTime; + if (_lockSystem.IsLocked(ent.Owner)) + delay *= ent.Comp.DisarmLockedMultiplier; + + if (ent.Comp.DisarmToolRequired != null) + _toolSystem.UseTool( + used!.Value, + user, + ent.Owner, + delay, + [ent.Comp.DisarmToolRequired.Value], + new AntiTamperDisarmDoAfterEvent(), + out _ + ); + else + _doAfterSystem.TryStartDoAfter( + new DoAfterArgs(EntityManager, user, delay, new AntiTamperDisarmDoAfterEvent(), ent, ent, used) + { + BreakOnDamage = true, + BreakOnMove = true, + BreakOnDropItem = true, + MovementThreshold = 1.0f, + BlockDuplicate = true, + DuplicateCondition = DuplicateConditions.SameTarget | DuplicateConditions.SameEvent, + } + ); + } + + private void OnDisarmDoAfter(EntityUid uid, AntiTamperComponent comp, AntiTamperDisarmDoAfterEvent args) + { + if (args.Cancelled || args.Handled || args.Args.Target == null || args.Args.Used == null) + return; + + RemComp(uid); + _popupSystem.PopupEntity(Loc.GetString("anti-tamper-disarmed", ("container", uid)), uid, args.User); + } +} diff --git a/Content.Shared/_Impstation/Containers/AntiTamper/AntiTamperDisarmDoAfterEvent.cs b/Content.Shared/_Impstation/Containers/AntiTamper/AntiTamperDisarmDoAfterEvent.cs new file mode 100644 index 000000000000..2c7ff1dd5038 --- /dev/null +++ b/Content.Shared/_Impstation/Containers/AntiTamper/AntiTamperDisarmDoAfterEvent.cs @@ -0,0 +1,9 @@ +using Content.Shared.DoAfter; +using Robust.Shared.Serialization; + +namespace Content.Shared.Containers.AntiTamper; + +[Serializable, NetSerializable] +public sealed partial class AntiTamperDisarmDoAfterEvent : SimpleDoAfterEvent +{ +} diff --git a/Resources/Locale/en-US/_Impstation/anti-tamper.ftl b/Resources/Locale/en-US/_Impstation/anti-tamper.ftl new file mode 100644 index 000000000000..9de361650a0c --- /dev/null +++ b/Resources/Locale/en-US/_Impstation/anti-tamper.ftl @@ -0,0 +1,4 @@ +anti-tamper-contents-destroyed = The anti-tamper system acidifies the contents of {THE($container)}! +anti-tamper-random-failure = The anti-tamper system failed to acidify the contents of {THE($container)}... +anti-tamper-disarm-verb = Disarm Anti-Tamper +anti-tamper-disarmed = You successfully disarm {THE($container)}'s anti-tamper module. diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml index fb98c5b51b96..adfb26d9ffd8 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml @@ -186,6 +186,8 @@ sprite: _DV/Structures/Storage/Crates/sec_gear.rsi # DeltaV - resprite security crates - type: AccessReader access: [["Security"]] + - type: AntiTamper # DeltaV - port impstation's anti-tamper + containers: [ entity_storage ] # DeltaV - port impstation's anti-tamper - type: entity parent: CrateBaseSecure @@ -290,6 +292,8 @@ sprite: Structures/Storage/Crates/weapon.rsi - type: AccessReader access: [["Armory"]] + - type: AntiTamper # DeltaV - port impstation's anti-tamper + containers: [ entity_storage ] # DeltaV - port impstation's anti-tamper - type: entity parent: [ CrateBaseSecure, BaseRestrictedContraband ] diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml index 392b2b43cae6..6de5e3655a92 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml @@ -9,7 +9,7 @@ #- !type:DepartmentTimeRequirement # department: Logistics # DeltaV - Logistics Department replacing Cargo # time: 21600 # 6 hrs ~3 shifts. - antagAdvantage: 3 # DeltaV - Reduced TC: free shuttle, ez salvage shit, free guns + antagAdvantage: 2 # DeltaV - Reduced TC: free shuttle, ez salvage shit, semi-free guns # End DeltaV modifications startingGear: CargoTechGear icon: "JobIconCargoTechnician" diff --git a/Resources/Prototypes/_Impstation/Catalog/Cargo/cargo_emergency.yml b/Resources/Prototypes/_Impstation/Catalog/Cargo/cargo_emergency.yml new file mode 100644 index 000000000000..c1bb50a5ca7c --- /dev/null +++ b/Resources/Prototypes/_Impstation/Catalog/Cargo/cargo_emergency.yml @@ -0,0 +1,9 @@ +- type: cargoProduct + id: EmergencyLasers + icon: + sprite: _Impstation/Objects/Weapons/Guns/Battery/emergency_laser_gun.rsi + state: icon + product: EmergencyLaserCrate + cost: 5000 + category: cargoproduct-category-name-emergency + group: market diff --git a/Resources/Prototypes/_Impstation/Catalog/Fills/Crates/emergency.yml b/Resources/Prototypes/_Impstation/Catalog/Fills/Crates/emergency.yml new file mode 100644 index 000000000000..12fecffe52a5 --- /dev/null +++ b/Resources/Prototypes/_Impstation/Catalog/Fills/Crates/emergency.yml @@ -0,0 +1,10 @@ +- type: entity + parent: CrateCommandSecure + id: EmergencyLaserCrate + name: emergency lasers crate + description: A crate of four emergency laser rifles, for situations where getting clearance isn't an option. + components: + - type: StorageFill + contents: + - id: EmergencyWeaponLaserCarbine + amount: 4 diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Battery/emergencylaser.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Battery/emergencylaser.yml new file mode 100644 index 000000000000..cdc19230ea49 --- /dev/null +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Battery/emergencylaser.yml @@ -0,0 +1,28 @@ +- type: entity + parent: [WeaponLaserCarbinePractice, BaseGunWieldable, BaseRestrictedContraband] + id: EmergencyWeaponLaserCarbine + name: emergency laser rifle + description: An emergency laser rifle, for use when getting timely clearance isn't an option. Hand this in to security once the coast is clear. + components: + - type: Sprite + sprite: _Impstation/Objects/Weapons/Guns/Battery/emergency_laser_gun.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: StaticPrice + price: 420 + - type: HitscanBatteryAmmoProvider + proto: EmergencyRedLaser + fireCost: 50 + - type: Item + size: Ginormous + - type: PointLight + radius: 1.5 + energy: 14 + color: "#ff0043" + mask: /Textures/Effects/LightMasks/double_cone.png + - type: RotatingLight + speed: 180 diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml new file mode 100644 index 000000000000..a33ba0d9ab64 --- /dev/null +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml @@ -0,0 +1,14 @@ +- type: hitscan + id: EmergencyRedLaser + damage: + types: + Heat: 12 + muzzleFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle_laser + travelFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: beam + impactFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact_laser diff --git a/Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/emergency_laser_gun.rsi/base.png b/Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/emergency_laser_gun.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..a631c503e5534acc0648a3b36493ee3579f3064a GIT binary patch literal 341 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|3<7*YT!D0O zaIlq?ReO88l9H0FtZZgx=6?x^QxX!InwpC^ICd&4e*iLET}!O3U);EHA}~W4s7IhA z$S;`TKM?4Ei2o(=K;rI(x%EJ~?Vc`Z({7d*_Wd^A~ZjC+)X~J)Zz6w;^m}y zr{mfbFTXi3yF%=))43*}{;OK6m^QJWw&Z=f&~4e(Co>iue0(A4?CrMCGuVE7-F&t4 f|8I7^ng_g+M_D;mZRijNdV#^y)z4*}Q$iB}jl__@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/emergency_laser_gun.rsi/equipped-BACKPACK.png b/Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/emergency_laser_gun.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..af91f7fe61510c7c1a88d1032f6812f49ef5e67e GIT binary patch literal 1416 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/emergency_laser_gun.rsi/inhand-left.png b/Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/emergency_laser_gun.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..6ed1213c78276f67561d3130fe34b24471aea14d GIT binary patch literal 322 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`s0a9jxB_Wq zWo1`a*U-?=wzjs^)YRbM;AQ`t60Y)OW@es}keJQI_1)Wh?HSSAK&8ATL4Lsu|B-+$ zi{o0L#0F0n$B>BDx6>~2H7oGAzFfM9`Tzgwa3RyVw_EzmuYXR+Ikb1-$AiL6k1e*h zxqV(>+P@`;W$MHxfhCPsPduAjG{-_V_|eHSMoVtL&zpKr&ylz$%5g(lh5t!LXZVK+ zZM#}+p5B$ZFZF8s8T)6l#|!7|S6DB*f5&QN*Cz`j3rbrAZnLUe2W)sU`{QO=4HuC| zyMNa>+-_Xd<@8dJHJ5#TWy3F*hZ~q%eMQQw19oUw+^=M^k44ofy`glX(f`Xa)F$xB_Wq zWo1`a*U-?=wzjt5;NaBM)b{rFgsVKu{x@Z2W}cFen9arYA}ox_yQvwdny)0tFPPy! zG6?s&EdrF;?djqe64Cm0+DV~93IZ-O**0zX^Zz|pmy=FXgx{+@!OJ|#4K0^MbF?Ma z@x0DFcR=u#Y*xO|o1R9c9ch(DfkziyRl2xTEGhD9_MNh|0r%g8^oPEWzQ(Llou{C} z=+7?uWm$G3yMd#m{F@p7-X*w~@EkTcbKRltoxi-*p-PYFa@l!L?6&au>;6nFJn^?F zKr!lCbIg==vRgtsX8hKAUgx+<;QExE^;gWpIV5Hl*mdKI;Vst0I{cu$^ZZW literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/emergency_laser_gun.rsi/mag-unshaded-1.png b/Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/emergency_laser_gun.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000000000000000000000000000000000..e021aae704b983704a9bbbcdda5ebcc1532b7a75 GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@31>6XFV_BW7wkmB}h8DJ}colyH^DYZF7U@Am~j3HFj8zhH*{V6e1) z*>9kbf~SjPNX4Aw1c@gO9)X@5t_LD+To4U)xT(=IPfse4f#FIl6Vo)Giq}B344$rj JF6*2UngD`^GJ*gA literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/emergency_laser_gun.rsi/mag-unshaded-2.png b/Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/emergency_laser_gun.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000000000000000000000000000000000..0a051aae142b103282d793a52f51c48d21ffcd6e GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@31>6XFV_BW7wkmB}h8DJ}colyH^DYZF7U@Am~j3HFj8zhH*{V6e1) z*>9kbf~SjPNX4Aw1c@gO9)X@5t_LDiE{KLY+|=lqrzaK2z`z{Iq%0fi)df_`;OXk; Jvd$@?2>?yCFdF~> literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/emergency_laser_gun.rsi/mag-unshaded-3.png b/Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/emergency_laser_gun.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000000000000000000000000000000000..fd7847d16f02ebe8537fd13452210a5931838b37 GIT binary patch literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@31>6XFV_BW7wkmB}h8DJ5LxS@yrlYZHT~XJ$B1g1scjFPPy!7%Z({ z_8Taq=;`7ZQZXkvLE?#nN1!K%>j9T5hAgfJB2-WI&eM|$WMD9CWpeFJmQ(;LX7F_N Kb6Mw<&;$TLHZT|f literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/emergency_laser_gun.rsi/mag-unshaded-4.png b/Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/emergency_laser_gun.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000000000000000000000000000000000..efa7d9ea526ecf4dfb36c45bae2c235a3d70972e GIT binary patch literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@2)*6XFV_BW7wkmB}vq-;{8b$7>VAf!x&pKvA}mAirRS{~%CR`QRT= zMA6g5F{ENna)QJY2aiBc4%Y)NH!iZc9tc%EF?F7vR3HNb(`hD^ef~4jfr=SCUHx3v IIVCg!02`?>djJ3c literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/emergency_laser_gun.rsi/meta.json b/Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/emergency_laser_gun.rsi/meta.json new file mode 100644 index 000000000000..2b374ec4dd8e --- /dev/null +++ b/Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/emergency_laser_gun.rsi/meta.json @@ -0,0 +1,53 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Polaris at https://github.com/PolarisSS13/Polaris/commit/9ded73fb85b9106d6bbf1c9a34d1d2fa27ee0e2e, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/emergency_laser_gun.rsi/wielded-inhand-left.png b/Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/emergency_laser_gun.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..5ba3bf5c2408c84da2dfc1580fa41e259239ac0b GIT binary patch literal 929 zcmV;S177@zP)Px&TS-JgRCt{2n!jt?KorNnE`>nRqD7pBX1GG386pCvkn`4|bPb}V|9~kj9o_s5 zCFxiQrDK+2>M2X{?qm@dXGo!74PNf>k_^U6hwI>+I4k<)A8D8O0rQ0Q?%v(g(;57} z06`E0K@bE%5Cm~QbX-^8r~f)U%)23k&;W3LeqPJE|Kjkm_MSMHjHa;d_jkW)VHj!v z=ytm`eQ}|2aDa~M>NnTdnRD56Tvxx|+Je5g(6#;jQvV{#_5c8xH_Qg=^*R7xJRV~> z9K!c~0DzPdPrqH_<<22`S4Ru>OXDY$QfM}th@uFd=K%mFlL@4hg^LkFXy5mfF()S{ zYbC(mOSjw2oGY^e27|$Z1%T0Ph6a!%VKSPchod_d*ac$@Q4}Q!1c2@BZA4L2xLDu! z7sl8KA#_pl44N@rQ!4SZ_mD+q0!FhL8k{2t0t|;k1VMnttpxzj^Dz7b+}!%#064h3 zMB8!jmPfyWy95gsDeEPurDM=}{iDRRbD%^;n!8u_0GRDx4D@_0}f6_{+%z0M9>?Lo$%nFF(xW+lx=|N^AN+}p?kJ-e6 z(^NUg$|zdfgJlLW#t;O-f-S>r!1w*+y2#g@F+vD!{HvCK7G)16Hvw5FrIItjSjHIk z_VyAVbLs-~iZSIZrK}V~N{Kj*Yf34YPaMZJd)`g5R9WSn4U94PzF+z?M-T)-5ClOG z1VIo4K@bE%5X66_@_+bwEvmO)pXszlU^1G*9X-d7ejlHwQ+%9GSMC+0OT zja#`pY+B)IYcIt9RGoL7xSNPmIRR;1K#@LR8BM?{am!dHZsiP?wZ@GKD-1(z4oZ`t zO}_@|m}%c-;%=l=jk4ok>I3YUS;-&>f*=TjAWHZPGFlW}#cCq$00000NkvXXu0mjf DYU`^q literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/emergency_laser_gun.rsi/wielded-inhand-right.png b/Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/emergency_laser_gun.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..e9b1892f0ac34a315cd0d18e3874ee59d807ed20 GIT binary patch literal 919 zcmV;I18Dq-P)Px&QAtEWRCt{2nm=#bMi_@57O94ylLq2AlmiVEXa^GlI8j@Nw2Oy;8M<`}3KyM& zdyVs6Qj|nWLIV`<0~n`2clW#Z z<=qMJ`vXA`1VIo4K@bGtJ?Ddg{nTsNC%xi19}KKj%HE%zT7WFeY?fsf;D=wow%@+^ z(l*;wbERo&(=^>GnY)awa({Yitx|SX61=8p5Cr(X4?tO#BuT>A*%?YHewlsG<;@9C zzIjn=-#kAg2m%0%F~o697={4kc@Ds2GO1~;!zH}Wm{lAfA6plTF@~$FtJ<88s&9fI zAW4$N`!Ed2^BkoV0GBr>l(!FDQg0o`7-m{?P!u~Y`uh5M=`*X8^@?I+Leey~)gax2 zaIrM0C15g{c*Yp}GS4|04*B`%Q+}LIIT{W*c>I``qklLWD#lR+!2O4DaU28S`#xjf zyEtY(pA&y*XIj(eQQp3L$2f}6S}#5uM-g;LY|-d*cXtQCd_G@#`oQwK(loV2QJ}S6 z`Ywv1tPbt-!fY16&q_y^%i*m=qwXRRKZ{I+64ZP0T4P$;0mc}#)?QH*wJq;%W`NOXvU*}d31VIo4K@bE%5ClOG1VIplz0>)B_~(OxJsJ-2 zio$b6lFy&q08rjO;2(TJdHcX0CvQFYSXpYT$Mw~GHXif$!Ji9_YWv$yua`>veRMl@ zs+O00-zN;im7ak&&kq3>9)Ud1x32S73o&1v{Z;cNyc++G`>xH80Nwlrk2ZC1fddQg zz&g(Wz)Wk#z{SNyk8s;{lO$m}oi6zj;BYT~gw9VUO;hW90A*PM?~M%2f@rf|IMbRg z#)fse?nyUwfSOiS6X>MdD*`L5f)syiBu7B~Ak%|5zYFU~E% tT~NFH-uIz;DgIZQf*=TjAPE0U{sjOK0WPya!m0oO002ovPDHLkV1fqQru6^- literal 0 HcmV?d00001 From 11900bcb3192413fefb5b8c2e439b627528e1257 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Thu, 16 Jan 2025 13:38:16 +0100 Subject: [PATCH 131/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index aa9212188802..706c7944489e 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,12 +1,4 @@ Entries: -- author: Bellwether - changes: - - message: Sechuds can now be used to mark subpoenaed crew members who are needed - in court. - type: Add - id: 418 - time: '2024-07-01T21:50:51.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1405 - author: deltanedas changes: - message: Fixed shipyard. @@ -3861,3 +3853,12 @@ id: 917 time: '2025-01-16T12:36:56.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2670 +- author: rosieposieeee, TGRCdev, kipdotnet + changes: + - message: High security crates now acidify when destroyed whilst locked. + type: Tweak + - message: Added Emergency Laser Rifles, for when the station is in truly dire straits. + type: Add + id: 918 + time: '2025-01-16T12:37:56.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2672 From a5909b8f7d27bb071cd689d18d7ecc4624334188 Mon Sep 17 00:00:00 2001 From: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Date: Thu, 16 Jan 2025 06:42:47 -0600 Subject: [PATCH 132/205] Map Edits: Arena/Hive (#2752) * Map Edits: Arena/Hive * checkpoint holo * move holobarriers --------- Co-authored-by: Velcroboy --- Resources/Maps/arena.yml | 2584 ++++++++++------- Resources/Maps/hive.yml | 1095 ++++--- Resources/Prototypes/Maps/tortuga.yml | 2 +- .../Structures/Doors/Windoors/windoor.yml | 9 + 4 files changed, 2205 insertions(+), 1485 deletions(-) diff --git a/Resources/Maps/arena.yml b/Resources/Maps/arena.yml index 0e868f1167df..0f8a0d7191e8 100644 --- a/Resources/Maps/arena.yml +++ b/Resources/Maps/arena.yml @@ -210,11 +210,11 @@ entities: version: 6 0,-3: ind: 0,-3 - tiles: XgAAAAACXgAAAAACXgAAAAABXgAAAAADXgAAAAAAXgAAAAABXgAAAAADXgAAAAADXgAAAAAAXgAAAAAAXgAAAAADXgAAAAAAXgAAAAAAXgAAAAABXgAAAAAAXgAAAAABXgAAAAACXgAAAAABXgAAAAABXgAAAAACXgAAAAADXgAAAAAAXgAAAAACXgAAAAABXgAAAAABXgAAAAADXgAAAAADXgAAAAABXgAAAAABXgAAAAABXgAAAAAAXgAAAAACXgAAAAACXgAAAAADXgAAAAACMwAAAAABMwAAAAAAMwAAAAABMwAAAAAAMwAAAAACMwAAAAAAMwAAAAACMwAAAAABMwAAAAABMwAAAAADMwAAAAABMwAAAAADMwAAAAACXgAAAAABXgAAAAADXgAAAAACMwAAAAADMwAAAAADMwAAAAABMwAAAAABMwAAAAABMwAAAAABMwAAAAACMwAAAAACMwAAAAADMwAAAAADMwAAAAABMwAAAAAAMwAAAAABXgAAAAABXgAAAAAAXgAAAAACMwAAAAAAMwAAAAABMwAAAAAAMwAAAAADMwAAAAADMwAAAAACMwAAAAAAMwAAAAACMwAAAAACMwAAAAACMwAAAAAAMwAAAAABMwAAAAAAXgAAAAABXgAAAAACXgAAAAABXgAAAAADXgAAAAAAXgAAAAADXgAAAAADXgAAAAAAXgAAAAACXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAADXgAAAAADXgAAAAABXgAAAAADXgAAAAACXgAAAAABXgAAAAABXgAAAAADXgAAAAABXgAAAAAAXgAAAAADXgAAAAAAXgAAAAAAXgAAAAABXgAAAAAAXgAAAAABXgAAAAABXgAAAAABXgAAAAABXgAAAAABXgAAAAAAXgAAAAADXgAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAfwAAAAAAfwAAAAAAXgAAAAACXgAAAAACXgAAAAAAfwAAAAAAcQAAAAACcQAAAAACcQAAAAAAcQAAAAABcQAAAAADUAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAXgAAAAAAXgAAAAACXgAAAAACfwAAAAAAcQAAAAACcQAAAAABcQAAAAACcQAAAAABcQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAXgAAAAADXgAAAAACXgAAAAACfwAAAAAAcQAAAAABcQAAAAAAcQAAAAABcQAAAAAAcQAAAAADUAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAXgAAAAACXgAAAAADXgAAAAAAfwAAAAAAcQAAAAACcQAAAAAAcQAAAAADcQAAAAADcQAAAAABUAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAcQAAAAADcQAAAAAAcQAAAAADcQAAAAACcQAAAAAAcQAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAcQAAAAACcQAAAAADfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAcQAAAAADcQAAAAAC + tiles: XgAAAAACXgAAAAACXgAAAAABXgAAAAADXgAAAAAAXgAAAAABXgAAAAADXgAAAAADXgAAAAAAXgAAAAAAXgAAAAADXgAAAAAAXgAAAAAAXgAAAAABXgAAAAAAXgAAAAABXgAAAAACXgAAAAABXgAAAAABXgAAAAACXgAAAAADXgAAAAAAXgAAAAACXgAAAAABXgAAAAABXgAAAAADXgAAAAADXgAAAAABXgAAAAABXgAAAAABXgAAAAAAXgAAAAACXgAAAAACXgAAAAADXgAAAAACMwAAAAABMwAAAAAAMwAAAAABMwAAAAAAMwAAAAACMwAAAAAAMwAAAAACMwAAAAABMwAAAAABMwAAAAADMwAAAAABMwAAAAADMwAAAAACXgAAAAABXgAAAAADXgAAAAACMwAAAAADMwAAAAADMwAAAAABMwAAAAABMwAAAAABMwAAAAABMwAAAAACMwAAAAACMwAAAAADMwAAAAADMwAAAAABMwAAAAAAMwAAAAABXgAAAAABXgAAAAAAXgAAAAACMwAAAAAAMwAAAAABMwAAAAAAMwAAAAADMwAAAAADMwAAAAACMwAAAAAAMwAAAAACMwAAAAACMwAAAAACMwAAAAAAMwAAAAABMwAAAAAAXgAAAAABXgAAAAACXgAAAAABXgAAAAADXgAAAAAAXgAAAAADXgAAAAADXgAAAAAAXgAAAAACXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAADXgAAAAADXgAAAAABXgAAAAADXgAAAAACXgAAAAABXgAAAAABXgAAAAADXgAAAAABXgAAAAAAXgAAAAADXgAAAAAAXgAAAAAAXgAAAAABXgAAAAAAXgAAAAABXgAAAAABXgAAAAABXgAAAAABXgAAAAABXgAAAAAAXgAAAAADXgAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAfwAAAAAAfwAAAAAAXgAAAAACXgAAAAACXgAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAXgAAAAAAXgAAAAACXgAAAAACfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAXgAAAAADXgAAAAACXgAAAAACfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAXgAAAAACXgAAAAADXgAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAcQAAAAADcQAAAAAAcQAAAAADcQAAAAACcQAAAAAAcQAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAcQAAAAACcQAAAAADfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAcQAAAAADcQAAAAAC version: 6 1,-3: ind: 1,-3 - tiles: XgAAAAADXgAAAAAAXgAAAAACXgAAAAAAXgAAAAADXgAAAAADXgAAAAAAXgAAAAAAXgAAAAADXgAAAAABXgAAAAADXgAAAAACXgAAAAADXgAAAAADXgAAAAACXgAAAAAAXgAAAAABXgAAAAACXgAAAAAAXgAAAAACXgAAAAACXgAAAAADXgAAAAAAXgAAAAABXgAAAAACXgAAAAAAXgAAAAACXgAAAAAAXgAAAAABXgAAAAACXgAAAAAAXgAAAAADMwAAAAABMwAAAAAAMwAAAAACMwAAAAADMwAAAAADMwAAAAABMwAAAAADMwAAAAACXgAAAAADXgAAAAACXgAAAAABXgAAAAABXgAAAAABXgAAAAABXgAAAAABXgAAAAABMwAAAAABMwAAAAABMwAAAAADMwAAAAACMwAAAAABMwAAAAAAMwAAAAADMwAAAAADXgAAAAAAXgAAAAABUwAAAAAAUwAAAAAAUwAAAAAAXgAAAAAAXgAAAAACXgAAAAAAMwAAAAADMwAAAAACMwAAAAADMwAAAAADMwAAAAABMwAAAAACMwAAAAACMwAAAAACXgAAAAABXgAAAAADUwAAAAAAUwAAAAAAUwAAAAAAXgAAAAAAXgAAAAABXgAAAAACXgAAAAAAXgAAAAABXgAAAAAAXgAAAAABXgAAAAAAXgAAAAADXgAAAAACXgAAAAABXgAAAAACXgAAAAACXgAAAAACXgAAAAABXgAAAAABXgAAAAABXgAAAAAAXgAAAAAAXgAAAAADXgAAAAADXgAAAAABXgAAAAAAXgAAAAACXgAAAAAAXgAAAAACXgAAAAAAXgAAAAABXgAAAAAAXgAAAAADXgAAAAACXgAAAAADXgAAAAADXgAAAAAAXgAAAAADfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAACXgAAAAAAXgAAAAACXgAAAAADXgAAAAAAXgAAAAABXgAAAAABXgAAAAAAXgAAAAAAXgAAAAADUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAbAAAAAACbAAAAAAAUAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAfwAAAAAAIAAAAAACIAAAAAABIAAAAAACIAAAAAAAIAAAAAACUAAAAAAAbAAAAAACbAAAAAABbAAAAAACbAAAAAADUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAIAAAAAAAIAAAAAABIAAAAAAAIAAAAAABIAAAAAABIAAAAAADIAAAAAAAbAAAAAACbAAAAAACbAAAAAAAbAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAACIAAAAAACUAAAAAAAbAAAAAABbAAAAAABbAAAAAABbAAAAAABXgAAAAABfwAAAAAAfwAAAAAAXgAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAABIAAAAAAAIAAAAAAAfwAAAAAAbAAAAAAAbAAAAAABbAAAAAAAbAAAAAADcQAAAAADfwAAAAAAcQAAAAACcQAAAAADcQAAAAAAcQAAAAABcQAAAAADfwAAAAAAIAAAAAADIAAAAAAAIAAAAAADUAAAAAAAbAAAAAACbAAAAAABbAAAAAACZgAAAAACcQAAAAADcQAAAAABcQAAAAACcQAAAAAAcQAAAAABcQAAAAABcQAAAAADIAAAAAABIAAAAAADIAAAAAADIAAAAAAAUAAAAAAAbAAAAAACbAAAAAADbAAAAAACbAAAAAADcQAAAAABfwAAAAAAcQAAAAAAcQAAAAACcQAAAAADcQAAAAABcQAAAAABfwAAAAAAIAAAAAADIAAAAAACIAAAAAABUAAAAAAAZgAAAAADawAAAAAAawAAAAAAZgAAAAAD + tiles: XgAAAAADXgAAAAAAXgAAAAACXgAAAAAAXgAAAAADXgAAAAADXgAAAAAAXgAAAAAAXgAAAAADXgAAAAABXgAAAAADXgAAAAACXgAAAAADXgAAAAADXgAAAAACXgAAAAAAXgAAAAABXgAAAAACXgAAAAAAXgAAAAACXgAAAAACXgAAAAADXgAAAAAAXgAAAAABXgAAAAACXgAAAAAAXgAAAAACXgAAAAAAXgAAAAABXgAAAAACXgAAAAAAXgAAAAADMwAAAAABMwAAAAAAMwAAAAACMwAAAAADMwAAAAADMwAAAAABMwAAAAADMwAAAAACXgAAAAADXgAAAAACXgAAAAABXgAAAAABXgAAAAABXgAAAAABXgAAAAABXgAAAAABMwAAAAABMwAAAAABMwAAAAADMwAAAAACMwAAAAABMwAAAAAAMwAAAAADMwAAAAADXgAAAAAAXgAAAAABUwAAAAAAUwAAAAAAUwAAAAAAXgAAAAAAXgAAAAACXgAAAAAAMwAAAAADMwAAAAACMwAAAAADMwAAAAADMwAAAAABMwAAAAACMwAAAAACMwAAAAACXgAAAAABXgAAAAADUwAAAAAAUwAAAAAAUwAAAAAAXgAAAAAAXgAAAAABXgAAAAACXgAAAAAAXgAAAAABXgAAAAAAXgAAAAABXgAAAAAAXgAAAAADXgAAAAACXgAAAAABXgAAAAACXgAAAAACXgAAAAACXgAAAAABXgAAAAABXgAAAAABXgAAAAAAXgAAAAAAXgAAAAADXgAAAAADXgAAAAABXgAAAAAAXgAAAAACXgAAAAAAXgAAAAACXgAAAAAAXgAAAAABXgAAAAAAXgAAAAADXgAAAAACXgAAAAADXgAAAAADXgAAAAAAXgAAAAADfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAACXgAAAAAAXgAAAAACXgAAAAADXgAAAAAAXgAAAAABXgAAAAABXgAAAAAAXgAAAAAAXgAAAAADUgAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAbAAAAAACbAAAAAAAUAAAAAAAUgAAAAAAUAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAIAAAAAACIAAAAAABIAAAAAACIAAAAAAAIAAAAAACUAAAAAAAbAAAAAACbAAAAAABbAAAAAACbAAAAAADUgAAAAAAUAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAIAAAAAAAIAAAAAABIAAAAAAAIAAAAAABIAAAAAABIAAAAAADIAAAAAAAbAAAAAACbAAAAAACbAAAAAAAbAAAAAAAUgAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAACIAAAAAACUAAAAAAAbAAAAAABbAAAAAABbAAAAAABbAAAAAABXgAAAAABfwAAAAAAfwAAAAAAcQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAABIAAAAAAAIAAAAAAAfwAAAAAAbAAAAAAAbAAAAAABbAAAAAAAbAAAAAADcQAAAAADfwAAAAAAcQAAAAACcQAAAAADcQAAAAAAcQAAAAABcQAAAAADfwAAAAAAIAAAAAADIAAAAAAAIAAAAAADUAAAAAAAbAAAAAACbAAAAAABbAAAAAACZgAAAAACcQAAAAADcQAAAAABcQAAAAACcQAAAAAAcQAAAAABcQAAAAABcQAAAAADIAAAAAABIAAAAAADIAAAAAADIAAAAAAAUAAAAAAAbAAAAAACbAAAAAADbAAAAAACbAAAAAADcQAAAAABfwAAAAAAcQAAAAAAcQAAAAACcQAAAAADcQAAAAABcQAAAAABfwAAAAAAIAAAAAADIAAAAAACIAAAAAABUAAAAAAAZgAAAAADawAAAAAAawAAAAAAZgAAAAAD version: 6 0,2: ind: 0,2 @@ -1027,7 +1027,6 @@ entities: 890: 15,-19 891: 15,-22 947: 18,-33 - 997: 10,-30 3387: 21,-22 - node: color: '#FFFFFFFF' @@ -1224,7 +1223,6 @@ entities: 893: 15,-20 894: 15,-17 948: 18,-35 - 1012: 10,-31 3349: 10,-28 - node: color: '#FFFFFFFF' @@ -1324,7 +1322,6 @@ entities: color: '#F9FFFEFF' id: BrickTileWhiteEndW decals: - 998: 10,-35 3403: 21,-23 - node: color: '#1D1D21FF' @@ -1504,7 +1501,6 @@ entities: decals: 922: 18,-19 923: 18,-22 - 1004: 14,-35 - node: color: '#1D1D21FF' id: BrickTileWhiteInnerSe @@ -1667,7 +1663,6 @@ entities: 902: 18,-28 903: 18,-20 904: 18,-17 - 1008: 14,-31 - node: color: '#169C9CC4' id: BrickTileWhiteLineE @@ -1909,12 +1904,6 @@ entities: 874: 19,-27 875: 19,-29 876: 19,-30 - 1013: 16,-32 - 1014: 16,-33 - 1043: 15,-34 - 1044: 15,-33 - 1045: 15,-32 - 1046: 15,-31 3344: 13,-24 3345: 13,-26 3362: 13,-27 @@ -2277,14 +2266,6 @@ entities: 944: 21,-33 945: 20,-33 946: 19,-33 - 989: 15,-30 - 990: 14,-30 - 991: 13,-30 - 992: 12,-30 - 993: 11,-30 - 994: 11,-35 - 995: 12,-35 - 996: 13,-35 3388: 22,-22 3389: 23,-22 3390: 24,-22 @@ -2620,14 +2601,6 @@ entities: 917: 17,-17 941: 20,-35 942: 21,-35 - 999: 11,-35 - 1000: 12,-35 - 1001: 13,-35 - 1002: 14,-35 - 1003: 15,-35 - 1009: 13,-31 - 1010: 12,-31 - 1011: 11,-31 3347: 12,-28 3348: 11,-28 3393: 24,-24 @@ -2913,13 +2886,6 @@ entities: 883: 15,-27 884: 18,-21 885: 18,-18 - 1005: 14,-34 - 1006: 14,-33 - 1007: 14,-32 - 1039: 15,-31 - 1040: 15,-32 - 1041: 15,-33 - 1042: 15,-34 3350: 10,-27 3351: 10,-26 3352: 10,-25 @@ -5812,10 +5778,6 @@ entities: color: '#52B4E996' id: FullTileOverlayGreyscale decals: - 976: 10,-35 - 977: 11,-35 - 978: 12,-35 - 979: 13,-35 1015: 10,-32 1016: 10,-33 1017: 10,-34 @@ -5826,9 +5788,6 @@ entities: 1022: 11,-32 1031: 11,-34 1032: 12,-34 - 1035: 15,-32 - 1036: 15,-33 - 1037: 15,-34 3396: 21,-23 3397: 22,-23 3398: 23,-23 @@ -6094,11 +6053,6 @@ entities: 933: 21,-33 934: 20,-33 935: 19,-33 - 968: 11,-30 - 969: 12,-30 - 970: 13,-30 - 971: 14,-30 - 972: 15,-30 3379: 22,-22 3380: 23,-22 3381: 24,-22 @@ -6122,24 +6076,6 @@ entities: 408: 2,-54 409: 4,-54 410: 5,-54 - - node: - color: '#D4D4D496' - id: HalfTileOverlayGreyscale - decals: - 5697: 15,-31 - 5698: 15,-31 - - node: - color: '#EAEBEE93' - id: HalfTileOverlayGreyscale - decals: - 4726: 15,-31 - 4727: 15,-31 - 4728: 15,-31 - - node: - color: '#F9FFFEFF' - id: HalfTileOverlayGreyscale - decals: - 1047: 15,-31 - node: color: '#52B4E996' id: HalfTileOverlayGreyscale180 @@ -6164,11 +6100,6 @@ entities: 858: 17,-28 938: 20,-35 939: 21,-35 - 975: 15,-35 - 985: 11,-31 - 986: 12,-31 - 987: 13,-31 - 1038: 15,-31 3384: 22,-24 3385: 23,-24 3386: 24,-24 @@ -6219,9 +6150,6 @@ entities: 851: 18,-21 856: 15,-27 860: 18,-30 - 981: 14,-34 - 982: 14,-33 - 983: 14,-32 3382: 15,-24 3383: 15,-26 - node: @@ -6273,8 +6201,6 @@ entities: 808: 19,-21 862: 19,-30 863: 19,-29 - 973: 16,-32 - 974: 16,-33 3401: 26,-23 5750: 19,-18 - node: @@ -6959,7 +6885,6 @@ entities: 845: 18,-17 846: 18,-20 859: 18,-28 - 984: 14,-31 - node: color: '#9FED5896' id: QuarterTileOverlayGreyscale270 @@ -8161,6 +8086,94 @@ entities: decals: 77: 0,34 5665: -12,34 + - node: + color: '#52B4E996' + id: ThickCornerNorthEastOverlayTrimline + decals: + 5921: 5,-38 + - node: + color: '#52B4E996' + id: ThickCornerNorthWestTrimline + decals: + 5919: 7,-38 + - node: + color: '#52B4E996' + id: ThickCornerSouthEastOverlayTrimline + decals: + 5920: 5,-39 + - node: + color: '#52B4E996' + id: ThickCornerSouthWestOverlayTrimline + decals: + 5922: 7,-39 + - node: + color: '#52B4E996' + id: ThickNorthOverlayTrimline + decals: + 5914: 10,-30 + 5915: 11,-30 + 5916: 12,-30 + 5917: 13,-30 + 5918: 14,-30 + 5923: 6,-38 + - node: + color: '#52B4E996' + id: ThickSouthOverlayTrimline + decals: + 5909: 12,-30 + 5910: 11,-30 + 5911: 10,-30 + 5912: 13,-30 + 5913: 14,-30 + 5924: 6,-39 + - node: + color: '#52B4E996' + id: ThinCornerInnerNorthEastOverlayTrimline + decals: + 5895: 15,-35 + - node: + color: '#52B4E996' + id: ThinCornerInnerNorthWestOverlayTrimline + decals: + 5896: 16,-35 + - node: + color: '#52B4E996' + id: ThinCornerInnerSouthEastOverlayTrimline + decals: + 5894: 15,-30 + - node: + color: '#52B4E996' + id: ThinCornerInnerSouthWestOverlayTrimline + decals: + 5893: 16,-30 + - node: + color: '#52B4E996' + id: ThinEastOverlayTrimline + decals: + 5885: 15,-34 + 5886: 15,-33 + 5887: 15,-32 + 5888: 15,-31 + 5903: 16,-30 + 5904: 16,-31 + 5905: 16,-32 + 5906: 16,-33 + 5907: 16,-34 + 5908: 16,-35 + - node: + color: '#52B4E996' + id: ThinWestOverlayTrimline + decals: + 5889: 16,-31 + 5890: 16,-32 + 5891: 16,-33 + 5892: 16,-34 + 5897: 15,-30 + 5898: 15,-31 + 5899: 15,-32 + 5900: 15,-33 + 5901: 15,-34 + 5902: 15,-35 - node: color: '#0E7F1BCE' id: ThreeQuarterTileOverlayGreyscale @@ -8178,7 +8191,6 @@ entities: 830: 15,-19 855: 15,-22 936: 18,-33 - 967: 10,-30 3376: 21,-22 3756: -21,-10 - node: @@ -8244,8 +8256,6 @@ entities: 832: 15,-17 857: 15,-28 937: 18,-35 - 980: 14,-35 - 988: 10,-31 3402: 21,-24 3757: -21,-11 - node: @@ -8963,7 +8973,9 @@ entities: -9,0: 0: 61377 -8,1: - 0: 30577 + 0: 6001 + 1: 8192 + 2: 16384 -9,1: 0: 61160 -8,2: @@ -9040,35 +9052,35 @@ entities: 0: 30591 -4,6: 0: 307 - 1: 34952 + 3: 34952 -5,6: 0: 65535 -4,7: - 1: 63624 + 3: 63624 -4,8: - 1: 4369 + 3: 4369 0: 61166 -3,5: 0: 65535 -3,6: - 1: 4369 + 3: 4369 0: 140 -3,7: - 1: 29457 + 3: 29457 -3,8: 0: 13115 - 1: 17476 + 3: 17476 -2,5: 0: 65535 -2,6: 0: 19 - 1: 34944 + 3: 34944 -2,8: 0: 28799 -1,5: 0: 4095 -1,6: - 1: 30576 + 3: 30576 -1,7: 0: 13107 -1,8: @@ -9333,18 +9345,18 @@ entities: 0: 65535 15,0: 0: 4369 - 1: 49164 + 3: 49164 15,1: 0: 28672 - 1: 8 + 3: 8 15,2: 0: 61559 15,-1: 0: 4369 16,0: - 1: 61455 + 3: 61455 16,1: - 1: 15 + 3: 15 0: 65280 16,2: 0: 57599 @@ -9401,7 +9413,8 @@ entities: 5,-6: 0: 3838 5,-9: - 0: 32624 + 4: 16 + 0: 32608 5,-8: 0: 61156 6,-8: @@ -9527,7 +9540,7 @@ entities: -1,-7: 0: 65535 -1,-6: - 2: 65520 + 5: 65520 0: 4 -1,-9: 0: 64160 @@ -9538,7 +9551,7 @@ entities: 0,-7: 0: 57305 0,-6: - 2: 4368 + 5: 4368 0: 52416 -8,-8: 0: 65535 @@ -9624,7 +9637,7 @@ entities: 0: 63231 -12,4: 0: 63 - 1: 2048 + 3: 2048 -11,0: 0: 61183 -11,1: @@ -9633,11 +9646,11 @@ entities: 0: 24695 -11,3: 0: 255 - 1: 49152 + 3: 49152 -11,-1: 0: 65294 -11,4: - 1: 53198 + 3: 53198 -10,0: 0: 60943 -10,1: @@ -9646,11 +9659,11 @@ entities: 0: 4095 -10,3: 0: 255 - 1: 28672 + 3: 28672 -10,-1: 0: 65473 -10,4: - 1: 4471 + 3: 4471 0: 51336 -8,-16: 0: 4080 @@ -9730,13 +9743,13 @@ entities: 0: 61166 14,-8: 0: 65416 - 1: 1 + 3: 1 14,-7: 0: 15 - 3: 60928 + 6: 60928 14,-6: 0: 61440 - 3: 238 + 6: 238 14,-5: 0: 30222 14,-4: @@ -9747,17 +9760,17 @@ entities: 0: 65315 15,-7: 0: 47 - 3: 26112 + 6: 26112 15,-6: 0: 28673 - 3: 102 + 6: 102 15,-5: 0: 30583 15,-9: 0: 16383 16,-8: 0: 65416 - 1: 1 + 3: 1 16,-7: 0: 34831 8,-12: @@ -9812,17 +9825,17 @@ entities: 0: 61166 14,-10: 0: 14 - 1: 256 + 3: 256 14,-13: 0: 52428 - 1: 256 + 3: 256 15,-12: 0: 65535 15,-11: 0: 65535 15,-10: 0: 15 - 1: 256 + 3: 256 15,-13: 0: 20479 16,-12: @@ -9962,19 +9975,19 @@ entities: -1,9: 0: 65535 0,10: - 1: 29760 + 3: 29760 0: 34944 0,11: 0: 153 - 1: 29542 + 3: 29542 -1,10: - 1: 61440 + 3: 61440 -1,11: 0: 52462 - 1: 13073 + 3: 13073 0,12: 0: 785 - 1: 29794 + 3: 29794 1,10: 0: 4912 1,11: @@ -9991,89 +10004,89 @@ entities: 0: 3272 8,9: 0: 816 - 1: 2176 + 3: 2176 8,10: 0: 30583 8,11: 0: 880 - 1: 128 + 3: 128 7,12: - 1: 8 + 3: 8 8,12: - 1: 4371 + 3: 4371 9,9: - 1: 4080 + 3: 4080 9,10: - 5: 273 - 6: 1092 + 7: 273 + 8: 1092 9,11: - 1: 240 + 3: 240 10,9: - 1: 4080 + 3: 4080 10,10: - 7: 273 - 8: 1092 + 9: 273 + 10: 1092 10,11: - 1: 752 + 3: 752 0: 28672 10,12: 0: 119 11,9: - 1: 4080 + 3: 4080 11,10: - 8: 1365 + 10: 1365 11,11: - 1: 35056 + 3: 35056 12,9: - 1: 4080 + 3: 4080 12,10: - 8: 273 + 10: 273 0: 34816 12,11: - 1: 5936 + 3: 5936 0: 136 11,12: - 1: 34952 + 3: 34952 -4,9: - 1: 143 + 3: 143 -4,10: - 1: 49152 + 3: 49152 -4,11: - 1: 33860 + 3: 33860 0: 2184 -3,9: - 1: 13175 + 3: 13175 0: 8 -3,10: - 1: 62259 + 3: 62259 -3,11: 0: 947 - 1: 29772 + 3: 29772 -2,9: 0: 15 -2,10: - 1: 63616 + 3: 63616 -2,11: - 1: 32863 + 3: 32863 0: 160 -1,12: - 1: 61457 + 3: 61457 0: 4078 0,13: - 1: 13107 + 3: 13107 0,14: - 1: 51 + 3: 51 -2,12: - 1: 34944 + 3: 34944 -1,13: - 1: 13107 + 3: 13107 -1,14: - 1: 51 + 3: 51 -12,-4: 0: 65134 -13,-4: 0: 56780 - 1: 1 + 3: 1 -12,-3: 0: 65103 -13,-3: @@ -10211,13 +10224,13 @@ entities: -12,-7: 0: 26214 -13,-7: - 1: 52431 + 3: 52431 -12,-6: 0: 26214 -13,-6: - 1: 52974 + 3: 52974 -13,-5: - 1: 8140 + 3: 8140 0: 49152 -11,-8: 0: 48050 @@ -10253,10 +10266,10 @@ entities: 0: 34952 16,-5: 0: 136 - 1: 16384 + 3: 16384 16,-9: 0: 34952 - 1: 8192 + 3: 8192 17,-8: 0: 65315 17,-7: @@ -10267,7 +10280,7 @@ entities: 0: 52479 17,-9: 0: 13107 - 1: 32768 + 3: 32768 17,-4: 0: 204 18,-8: @@ -10282,22 +10295,22 @@ entities: 0: 61166 19,-7: 0: 28672 - 1: 32 + 3: 32 19,-5: 0: 7 - 1: 4608 + 3: 4608 16,-11: 0: 61166 16,-10: 0: 14 - 1: 8448 + 3: 8448 17,-12: 0: 61439 17,-11: 0: 61166 17,-10: 0: 14 - 1: 33024 + 3: 33024 17,-13: 0: 43690 18,-12: @@ -10310,13 +10323,13 @@ entities: 0: 61440 19,-11: 0: 15 - 1: 2048 + 3: 2048 19,-10: 0: 61440 - 1: 136 + 3: 136 19,-9: 0: 15 - 1: 512 + 3: 512 20,-12: 0: 28672 20,-11: @@ -10370,10 +10383,10 @@ entities: 5,-18: 0: 47887 5,-20: - 1: 1 + 3: 1 0: 34952 5,-21: - 1: 4369 + 3: 4369 0: 34816 6,-20: 0: 57297 @@ -10413,22 +10426,22 @@ entities: 0: 30476 -13,-12: 0: 28535 - 1: 8 + 3: 8 -12,-11: 0: 65319 -13,-11: 0: 56640 - 1: 16 + 3: 16 -12,-10: 0: 65295 -13,-10: 0: 52236 - 1: 4097 + 3: 4097 -13,-9: 0: 52364 -12,-13: 0: 25275 - 1: 4096 + 3: 4096 -11,-11: 0: 65280 -11,-10: @@ -10451,7 +10464,7 @@ entities: 0: 47935 -13,-16: 0: 52972 - 1: 12560 + 3: 12560 -12,-15: 0: 6827 -13,-15: @@ -10462,10 +10475,10 @@ entities: 0: 36588 -13,-13: 0: 26608 - 1: 38912 + 3: 38912 -12,-17: 0: 60544 - 1: 15 + 3: 15 -11,-16: 0: 65518 -11,-15: @@ -10520,7 +10533,7 @@ entities: 0: 30578 2,-21: 0: 17408 - 1: 238 + 3: 238 -5,-20: 0: 44643 -4,-19: @@ -10571,16 +10584,16 @@ entities: 0: 3 -17,3: 0: 15 - 1: 34816 + 3: 34816 -15,0: 0: 65399 -15,1: 0: 1911 -15,-1: 0: 28672 - 1: 68 + 3: 68 -15,2: - 1: 17476 + 3: 17476 -15,3: 0: 34944 -14,0: @@ -10600,9 +10613,9 @@ entities: -13,4: 0: 255 -13,3: - 1: 512 + 3: 512 -16,-4: - 1: 4096 + 3: 4096 -16,-2: 0: 4915 -17,-2: @@ -10610,12 +10623,12 @@ entities: -17,-1: 0: 47295 -15,-2: - 1: 19456 + 3: 19456 -14,-4: - 1: 1 + 3: 1 0: 65024 -14,-5: - 1: 7953 + 3: 7953 0: 204 -14,-3: 0: 65166 @@ -10625,19 +10638,19 @@ entities: 0: 13056 13,-13: 0: 819 - 1: 2048 + 3: 2048 14,-14: 0: 49152 15,-14: 0: 61440 16,-13: - 1: 10 + 3: 10 17,-14: 0: 43680 18,-13: - 1: 2 + 3: 2 19,-13: - 1: 8448 + 3: 8448 0,-23: 0: 8191 -1,-23: @@ -10649,41 +10662,41 @@ entities: 1,-22: 0: 4369 1,-24: - 1: 17988 + 3: 17988 1,-25: - 1: 61263 + 3: 61263 2,-23: - 1: 63624 + 3: 63624 2,-22: - 1: 59528 + 3: 59528 2,-24: - 1: 34952 + 3: 34952 2,-25: - 1: 36623 + 3: 36623 3,-24: - 1: 16 + 3: 16 0: 3822 3,-23: - 1: 16 + 3: 16 0: 3822 3,-22: - 1: 16 + 3: 16 0: 3822 3,-21: - 1: 16 + 3: 16 0: 3822 4,-24: 0: 1911 - 1: 128 + 3: 128 4,-23: 0: 1911 - 1: 128 + 3: 128 4,-22: 0: 1911 - 1: 128 + 3: 128 4,-21: 0: 1911 - 1: 128 + 3: 128 -4,-24: 0: 65382 -4,-23: @@ -10708,7 +10721,7 @@ entities: 0: 57580 -2,-25: 0: 57344 - 1: 3822 + 3: 3822 -1,-24: 0: 272 -1,-22: @@ -10764,23 +10777,23 @@ entities: -6,-18: 0: 16352 -12,-20: - 1: 46 + 3: 46 -13,-20: 0: 34952 - 1: 35 + 3: 35 -13,-19: 0: 34952 - 1: 4896 + 3: 4896 -12,-19: - 1: 36384 + 3: 36384 -12,-18: 0: 3891 - 1: 32904 + 3: 32904 -13,-18: 0: 3276 - 1: 4369 + 3: 4369 -13,-17: - 1: 15 + 3: 15 -11,-18: 0: 52673 -11,-19: @@ -10792,105 +10805,105 @@ entities: -10,-20: 0: 32768 16,-4: - 1: 32768 + 3: 32768 16,-3: - 1: 8 + 3: 8 17,-3: 0: 65518 17,-2: 0: 239 16,-2: - 1: 2048 + 3: 2048 18,-3: 0: 13073 - 1: 4 + 3: 4 18,-2: 0: 19 - 1: 1024 + 3: 1024 18,-4: - 1: 16384 + 3: 16384 -16,-7: - 1: 1103 + 3: 1103 -17,-7: - 1: 15 + 3: 15 -16,-6: - 1: 1525 + 3: 1525 -17,-6: - 1: 1525 + 3: 1525 -16,-8: 0: 3822 - 1: 16384 + 3: 16384 -16,-9: 0: 61152 - 1: 4 + 3: 4 -15,-7: - 1: 47 + 3: 47 0: 34816 -15,-6: - 1: 20016 + 3: 20016 0: 8 -15,-8: 0: 3822 - 1: 16384 + 3: 16384 -15,-9: 0: 61152 - 1: 4 + 3: 4 -15,-5: - 1: 19524 + 3: 19524 -14,-7: - 1: 15 + 3: 15 0: 65472 -14,-6: 0: 52431 - 1: 4352 + 3: 4352 -14,-8: 0: 3822 - 1: 16384 + 3: 16384 -14,-9: 0: 61152 - 1: 4 + 3: 4 -16,-12: - 1: 29218 + 3: 29218 -17,-12: - 1: 63078 + 3: 63078 -16,-11: - 1: 30562 + 3: 30562 -17,-11: - 1: 65382 + 3: 65382 -16,-10: - 1: 61444 + 3: 61444 -17,-10: - 1: 61440 + 3: 61440 -16,-13: - 1: 61440 + 3: 61440 0: 4081 -15,-10: - 1: 61440 + 3: 61440 0: 14 -15,-12: - 1: 819 + 3: 819 -15,-13: - 1: 61442 + 3: 61442 0: 4080 -15,-11: 0: 61152 -14,-10: - 1: 61452 + 3: 61452 -14,-12: - 1: 36650 + 3: 36650 -14,-13: - 1: 61440 + 3: 61440 0: 4080 -14,-11: - 1: 192 + 3: 192 0: 52224 12,12: - 1: 28945 + 3: 28945 13,9: 0: 26470 13,10: 0: 65286 - 1: 240 + 3: 240 13,11: 0: 4095 13,12: @@ -10899,81 +10912,81 @@ entities: 0: 32628 14,10: 0: 4352 - 1: 26208 + 3: 26208 14,11: 0: 17 - 1: 1638 + 3: 1638 15,9: 0: 65520 15,10: 0: 65535 16,9: - 1: 240 + 3: 240 0: 13056 16,10: 0: 13107 12,13: - 1: 61713 + 3: 61713 11,13: - 1: 63624 + 3: 63624 12,14: - 1: 31 + 3: 31 11,14: - 1: 63624 + 3: 63624 13,13: - 1: 61440 + 3: 61440 13,14: - 1: 15 + 3: 15 14,13: - 1: 62063 + 3: 62063 14,14: - 1: 255 + 3: 255 14,12: - 1: 24576 + 3: 24576 15,13: - 1: 15 + 3: 15 15,14: - 1: 15 + 3: 15 16,13: - 1: 15 + 3: 15 16,14: - 1: 15 + 3: 15 -20,-6: - 1: 2296 + 3: 2296 -21,-6: - 1: 240 + 3: 240 -19,-6: - 1: 2039 + 3: 2039 -19,-8: - 1: 40857 + 3: 40857 -19,-9: - 1: 39417 + 3: 39417 -19,-7: - 1: 4383 + 3: 4383 -18,-7: - 1: 17487 + 3: 17487 -18,-6: - 1: 244 + 3: 244 -18,-8: 0: 3822 - 1: 16384 + 3: 16384 -18,-9: 0: 61152 - 1: 4 + 3: 4 -17,-8: 0: 3822 - 1: 16384 + 3: 16384 -17,-9: 0: 61152 - 1: 4 + 3: 4 -10,5: 0: 52972 -10,6: 0: 136 -16,-20: - 1: 15 + 3: 15 -17,-20: - 1: 8 + 3: 8 -16,-19: 0: 54519 -17,-19: @@ -10989,7 +11002,7 @@ entities: -16,-16: 0: 3942 -15,-20: - 1: 7 + 3: 7 -15,-19: 0: 65280 -15,-18: @@ -10997,7 +11010,7 @@ entities: -15,-17: 0: 63675 -15,-21: - 1: 17408 + 3: 17408 0: 287 -14,-19: 0: 4096 @@ -11006,49 +11019,49 @@ entities: -14,-17: 0: 273 -14,-20: - 1: 8 + 3: 8 -13,-21: 0: 36863 -16,-22: - 1: 15 + 3: 15 0: 61184 -17,-22: - 1: 34952 + 3: 34952 -16,-21: 0: 3838 -17,-21: - 1: 34952 + 3: 34952 -15,-22: - 1: 1095 + 3: 1095 0: 4352 -14,-21: 0: 15 -14,-22: - 1: 1216 + 3: 1216 -13,-22: 0: 61440 -12,-22: 0: 61440 - 1: 128 + 3: 128 -12,-21: 0: 1911 -11,-22: - 1: 16 + 3: 16 0: 61440 -10,-22: 0: 64704 - 1: 17 + 3: 17 -10,-23: - 1: 61440 + 3: 61440 -10,-21: - 1: 61712 + 3: 61712 0: 204 -9,-23: - 1: 12288 + 3: 12288 -9,-21: - 1: 12834 + 3: 12834 -9,-22: - 1: 8738 + 3: 8738 -17,-16: 0: 28671 -16,-15: @@ -11059,17 +11072,17 @@ entities: 0: 13117 -17,-13: 0: 4086 - 1: 61440 + 3: 61440 -15,-16: 0: 25344 - 1: 2048 + 3: 2048 -15,-14: 0: 3 - 1: 8736 + 3: 8736 -15,-15: 0: 26214 -14,-16: - 1: 36608 + 3: 36608 -20,-20: 0: 65280 -20,-19: @@ -11118,83 +11131,83 @@ entities: 0: 60943 9,-24: 0: 4369 - 1: 136 + 3: 136 9,-23: 0: 24593 9,-22: 0: 61159 9,-25: - 1: 53007 + 3: 53007 10,-24: - 1: 9010 + 3: 9010 10,-23: - 1: 30498 + 3: 30498 10,-22: 0: 13104 10,-25: - 1: 26487 + 3: 26487 5,-24: - 1: 39385 + 3: 39385 5,-23: - 1: 7577 + 3: 7577 5,-22: - 1: 4369 + 3: 4369 0: 3276 5,-25: - 1: 57231 + 3: 57231 6,-23: - 1: 256 + 3: 256 0: 49356 6,-22: 0: 52703 6,-24: 0: 52428 -2,-26: - 1: 57344 + 3: 57344 -1,-25: - 1: 3855 + 3: 3855 0,-25: - 1: 3855 + 3: 3855 3,-25: - 1: 3855 + 3: 3855 4,-25: - 1: 3855 + 3: 3855 6,-25: - 1: 7951 + 3: 7951 7,-25: - 1: 3855 + 3: 3855 8,-25: - 1: 3855 + 3: 3855 10,-26: - 1: 28672 + 3: 28672 -16,4: - 1: 16 + 3: 16 -15,5: - 1: 4 + 3: 4 8,13: - 1: 63249 + 3: 63249 7,13: - 1: 34816 + 3: 34816 8,14: - 1: 50247 + 3: 50247 7,14: - 1: 8 + 3: 8 8,15: - 1: 50244 + 3: 50244 8,16: - 1: 50244 + 3: 50244 9,13: - 1: 12288 + 3: 12288 0: 52224 9,14: - 1: 12288 + 3: 12288 0: 52236 9,15: - 1: 12288 + 3: 12288 0: 52236 9,16: 0: 52236 - 1: 12288 + 3: 12288 10,13: 0: 65280 10,14: @@ -11204,41 +11217,41 @@ entities: 10,16: 0: 65295 11,15: - 1: 63624 + 3: 63624 11,16: - 1: 63624 + 3: 63624 -20,-11: - 1: 2184 + 3: 2184 -19,-11: - 1: 65331 + 3: 65331 -19,-12: - 1: 61713 + 3: 61713 -19,-13: - 1: 61940 + 3: 61940 -19,-10: - 1: 61713 + 3: 61713 -18,-12: - 1: 62259 + 3: 62259 -18,-11: - 1: 65331 + 3: 65331 -18,-10: - 1: 62532 + 3: 62532 -18,-13: 0: 65528 -24,-6: - 1: 497 + 3: 497 -23,-6: - 1: 240 + 3: 240 -22,-6: - 1: 240 + 3: 240 -25,-6: - 1: 1863 + 3: 1863 -20,0: - 1: 49664 + 3: 49664 -20,1: - 1: 2 + 3: 2 -19,0: - 1: 4096 + 3: 4096 0: 52428 -19,1: 0: 3276 @@ -11253,15 +11266,15 @@ entities: -18,2: 0: 12 -17,4: - 1: 72 + 3: 72 -17,-4: - 1: 16384 + 3: 16384 -17,-3: - 1: 2184 + 3: 2184 17,0: - 1: 61999 + 3: 61999 17,1: - 1: 15 + 3: 15 0: 56576 17,2: 0: 61661 @@ -11270,9 +11283,9 @@ entities: 17,4: 0: 36863 18,0: - 1: 61455 + 3: 61455 18,1: - 1: 15 + 3: 15 0: 30464 18,2: 0: 12407 @@ -11281,19 +11294,19 @@ entities: 18,4: 0: 3067 19,0: - 1: 12847 + 3: 12847 19,1: - 1: 13107 + 3: 13107 19,2: - 1: 3891 + 3: 3891 19,3: 0: 1911 19,4: 0: 52733 20,0: - 1: 15 + 3: 15 20,3: - 1: 4096 + 3: 4096 16,7: 0: 61166 16,8: @@ -11304,7 +11317,7 @@ entities: 0: 4369 17,8: 0: 4369 - 1: 50176 + 3: 50176 17,5: 0: 3276 18,5: @@ -11313,41 +11326,41 @@ entities: 0: 30583 20,4: 0: 4369 - 1: 3808 + 3: 3808 17,9: - 1: 244 + 3: 244 18,8: - 1: 61440 + 3: 61440 18,9: - 1: 245 + 3: 245 19,8: - 1: 61440 + 3: 61440 19,9: - 1: 36080 + 3: 36080 20,8: - 1: 61440 + 3: 61440 20,9: - 1: 40176 + 3: 40176 8,17: - 1: 60996 + 3: 60996 8,18: - 1: 14 + 3: 14 9,17: - 1: 61440 + 3: 61440 0: 12 10,17: 0: 15 - 1: 61440 + 3: 61440 11,17: - 1: 64648 + 3: 64648 11,18: - 1: 12 + 3: 12 12,17: - 1: 4352 + 3: 4352 12,18: - 1: 1 + 3: 1 21,4: - 1: 36856 + 3: 36856 21,5: 0: 52428 21,6: @@ -11355,7 +11368,7 @@ entities: 21,3: 0: 52428 22,4: - 1: 36856 + 3: 36856 22,5: 0: 56797 22,6: @@ -11363,7 +11376,7 @@ entities: 22,3: 0: 56797 23,4: - 1: 36856 + 3: 36856 23,5: 0: 56797 23,6: @@ -11371,7 +11384,7 @@ entities: 23,3: 0: 56797 24,4: - 1: 36856 + 3: 36856 24,5: 0: 56797 24,6: @@ -11379,150 +11392,150 @@ entities: 24,3: 0: 56797 25,4: - 1: 4080 + 3: 4080 25,5: 0: 4369 25,6: 0: 17 27,7: - 1: 25668 + 3: 25668 27,8: - 1: 29783 + 3: 29783 27,4: - 1: 17476 + 3: 17476 27,3: - 1: 17476 + 3: 17476 27,5: - 1: 17476 + 3: 17476 27,6: - 1: 17476 + 3: 17476 21,0: - 1: 15 + 3: 15 21,2: 0: 52224 22,0: - 1: 143 + 3: 143 22,2: 0: 56576 22,-1: - 1: 32768 + 3: 32768 23,0: - 1: 62335 + 3: 62335 23,2: 0: 56576 23,-1: - 1: 29491 + 3: 29491 24,0: - 1: 61455 + 3: 61455 24,2: 0: 56576 24,-1: - 1: 17476 + 3: 17476 25,0: - 1: 61455 + 3: 61455 25,2: 0: 4352 25,3: 0: 4369 26,0: - 1: 61455 + 3: 61455 26,1: - 1: 140 + 3: 140 27,0: - 1: 29303 + 3: 29303 27,1: - 1: 26452 + 3: 26452 27,-1: - 1: 28672 + 3: 28672 27,2: - 1: 17476 + 3: 17476 23,-4: - 1: 13107 + 3: 13107 23,-5: - 1: 13107 + 3: 13107 23,-3: - 1: 13107 + 3: 13107 23,-2: - 1: 13299 + 3: 13299 24,-2: - 1: 17524 + 3: 17524 23,-6: - 1: 61440 + 3: 61440 24,-6: - 1: 28672 + 3: 28672 24,-4: - 1: 17476 + 3: 17476 24,-5: - 1: 17476 + 3: 17476 24,-3: - 1: 17476 + 3: 17476 24,8: - 1: 61440 + 3: 61440 23,8: - 1: 61440 + 3: 61440 24,9: - 1: 240 + 3: 240 23,9: - 1: 240 + 3: 240 25,8: - 1: 61440 + 3: 61440 25,9: - 1: 240 + 3: 240 26,8: - 1: 64640 + 3: 64640 26,9: - 1: 240 + 3: 240 27,9: - 1: 116 + 3: 116 20,10: - 1: 35051 + 3: 35051 21,8: - 1: 61440 + 3: 61440 21,9: - 1: 9968 + 3: 9968 20,11: - 1: 34952 + 3: 34952 20,12: - 1: 51336 + 3: 51336 21,10: - 1: 8814 + 3: 8814 21,11: - 1: 8738 + 3: 8738 21,12: - 1: 12834 + 3: 12834 22,8: - 1: 61440 + 3: 61440 22,9: - 1: 14064 + 3: 14064 22,10: - 1: 1 + 3: 1 17,13: - 1: 15 + 3: 15 17,14: - 1: 15 + 3: 15 18,13: - 1: 15 + 3: 15 18,14: - 1: 15 + 3: 15 19,13: - 1: 15 + 3: 15 19,14: - 1: 15 + 3: 15 20,13: - 1: 51407 + 3: 51407 20,14: - 1: 207 + 3: 207 21,13: - 1: 4115 + 3: 4115 21,14: - 1: 17 + 3: 17 -21,-16: 0: 14 -19,-15: 0: 26214 -19,-14: 0: 12 - 1: 17472 + 3: 17472 -18,-15: 0: 4095 -18,-14: @@ -11548,10 +11561,10 @@ entities: - 0 - 0 - volume: 2500 - immutable: True + temperature: 293.14978 moles: - - 0 - - 0 + - 21.813705 + - 82.06108 - 0 - 0 - 0 @@ -11563,10 +11576,10 @@ entities: - 0 - 0 - volume: 2500 - temperature: 235 + temperature: 293.14975 moles: - - 21.824879 - - 82.10312 + - 21.6852 + - 81.57766 - 0 - 0 - 0 @@ -11578,10 +11591,10 @@ entities: - 0 - 0 - volume: 2500 - temperature: 293.15 + immutable: True moles: - 0 - - 103.92799 + - 0 - 0 - 0 - 0 @@ -11607,6 +11620,36 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 235 + moles: + - 21.824879 + - 82.10312 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 0 + - 103.92799 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - volume: 2500 temperature: 293.15 moles: @@ -11795,23 +11838,6 @@ entities: - 21751 - 13451 - 13162 - - uid: 3694 - components: - - type: Transform - pos: 17.5,-35.5 - parent: 6747 - - type: DeviceList - devices: - - 22175 - - 22174 - - 22173 - - 21775 - - 22292 - - 21906 - - 13952 - - 13867 - - 13866 - - 13951 - uid: 4754 components: - type: Transform @@ -11856,6 +11882,20 @@ entities: - 27297 - 27396 - 27395 + - uid: 8702 + components: + - type: Transform + pos: 20.5,-35.5 + parent: 6747 + - type: DeviceList + devices: + - 22175 + - 22173 + - 21775 + - 22292 + - 21906 + - 13866 + - 13951 - uid: 8860 components: - type: Transform @@ -11927,16 +11967,19 @@ entities: parent: 6747 - type: DeviceList devices: - - 21772 - - 22179 - - 22173 - - 22174 - - 22178 - - 21909 - - 13868 - - 13953 - - 13874 + - 3740 - 13954 + - 13874 + - 13953 + - 13868 + - 21909 + - 22178 + - 22173 + - 22179 + - 21772 + - 3737 + - 29764 + - 29763 - uid: 13485 components: - type: Transform @@ -13384,6 +13427,23 @@ entities: - 29267 - 29265 - 29313 + - uid: 29754 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 9.5,-37.5 + parent: 6747 + - type: DeviceList + devices: + - 2160 + - 13951 + - 13866 + - 21906 + - 22292 + - 21775 + - 22173 + - 22175 + - 2159 - proto: AirAlarmVox entities: - uid: 29635 @@ -15685,11 +15745,6 @@ entities: - type: Transform pos: 20.5,-27.5 parent: 6747 - - uid: 2158 - components: - - type: Transform - pos: 9.5,-38.5 - parent: 6747 - uid: 3521 components: - type: Transform @@ -15727,6 +15782,11 @@ entities: - type: Transform pos: 43.5,-8.5 parent: 6747 + - uid: 29727 + components: + - type: Transform + pos: 9.5,-38.5 + parent: 6747 - proto: AirlockMedicalMorgueLocked entities: - uid: 1961 @@ -16393,6 +16453,11 @@ entities: - type: Transform pos: 16.5,-37.5 parent: 6747 + - type: DeviceNetwork + deviceLists: + - 8702 + - 29748 + - 29754 - uid: 21907 components: - type: Transform @@ -16417,6 +16482,7 @@ entities: - 10592 - 10590 - 131 + - 22118 - uid: 21910 components: - type: Transform @@ -16611,6 +16677,11 @@ entities: - type: Transform pos: 6.5,-38.5 parent: 6747 + - type: DeviceNetwork + deviceLists: + - 8702 + - 29748 + - 29754 - uid: 22295 components: - type: Transform @@ -17537,6 +17608,22 @@ entities: - type: Transform pos: -3.5,-48.5 parent: 6747 + - uid: 29779 + components: + - type: MetaData + name: APC (surgery/morgue) + - type: Transform + rot: 1.5707963267948966 rad + pos: 9.5,-30.5 + parent: 6747 + - uid: 29780 + components: + - type: MetaData + name: APC (chemistry lab) + - type: Transform + rot: -1.5707963267948966 rad + pos: 14.5,-20.5 + parent: 6747 - proto: APCHyperCapacity entities: - uid: 4019 @@ -17549,13 +17636,6 @@ entities: parent: 6747 - proto: APCSuperCapacity entities: - - uid: 2089 - components: - - type: MetaData - name: APC (chemistry lab/med locker room/morgue) - - type: Transform - pos: 13.5,-28.5 - parent: 6747 - uid: 2773 components: - type: MetaData @@ -20697,10 +20777,11 @@ entities: parent: 6747 - proto: BookMedicalReferenceBook entities: - - uid: 22542 + - uid: 29732 components: - type: Transform - pos: 4.2310553,-36.34688 + rot: 3.141592653589793 rad + pos: 18.993603,-39.4487 parent: 6747 - proto: BookRandom entities: @@ -20951,23 +21032,23 @@ entities: - uid: 3370 components: - type: Transform - parent: 3258 + parent: 2019 - type: Physics canCollide: False - type: InsideEntityStorage - uid: 3441 components: - type: Transform - parent: 3385 + parent: 1964 - type: Physics canCollide: False - type: InsideEntityStorage - proto: BoxBodyBag entities: - - uid: 3732 + - uid: 3813 components: - type: Transform - pos: 17.461784,-39.303867 + pos: 10.399912,-36.269756 parent: 6747 - proto: BoxBottle entities: @@ -21234,28 +21315,28 @@ entities: - uid: 3369 components: - type: Transform - parent: 3258 + parent: 2019 - type: Physics canCollide: False - type: InsideEntityStorage - uid: 3377 components: - type: Transform - parent: 3258 + parent: 2019 - type: Physics canCollide: False - type: InsideEntityStorage - uid: 3442 components: - type: Transform - parent: 3385 + parent: 1964 - type: Physics canCollide: False - type: InsideEntityStorage - uid: 3443 components: - type: Transform - parent: 3385 + parent: 1964 - type: Physics canCollide: False - type: InsideEntityStorage @@ -21540,20 +21621,35 @@ entities: - type: Transform pos: 22.5,-52.5 parent: 6747 - - uid: 1964 + - uid: 1749 components: - type: Transform - pos: 13.5,-27.5 + pos: 10.5,-30.5 parent: 6747 - uid: 1978 components: - type: Transform pos: 19.5,-18.5 parent: 6747 - - uid: 2090 + - uid: 2100 components: - type: Transform - pos: 12.5,-27.5 + pos: 11.5,-34.5 + parent: 6747 + - uid: 2101 + components: + - type: Transform + pos: 12.5,-34.5 + parent: 6747 + - uid: 2158 + components: + - type: Transform + pos: 13.5,-34.5 + parent: 6747 + - uid: 2162 + components: + - type: Transform + pos: 9.5,-30.5 parent: 6747 - uid: 2256 components: @@ -21565,6 +21661,16 @@ entities: - type: Transform pos: 50.5,13.5 parent: 6747 + - uid: 2478 + components: + - type: Transform + pos: 14.5,-20.5 + parent: 6747 + - uid: 2479 + components: + - type: Transform + pos: 13.5,-20.5 + parent: 6747 - uid: 2776 components: - type: Transform @@ -31370,11 +31476,6 @@ entities: - type: Transform pos: 22.5,-22.5 parent: 6747 - - uid: 20890 - components: - - type: Transform - pos: 11.5,-27.5 - parent: 6747 - uid: 20891 components: - type: Transform @@ -31405,26 +31506,6 @@ entities: - type: Transform pos: 12.5,-23.5 parent: 6747 - - uid: 20897 - components: - - type: Transform - pos: 13.5,-28.5 - parent: 6747 - - uid: 20900 - components: - - type: Transform - pos: 11.5,-32.5 - parent: 6747 - - uid: 20901 - components: - - type: Transform - pos: 12.5,-32.5 - parent: 6747 - - uid: 20902 - components: - - type: Transform - pos: 13.5,-32.5 - parent: 6747 - uid: 20903 components: - type: Transform @@ -31650,16 +31731,6 @@ entities: - type: Transform pos: 16.5,-37.5 parent: 6747 - - uid: 20948 - components: - - type: Transform - pos: 17.5,-37.5 - parent: 6747 - - uid: 20949 - components: - - type: Transform - pos: 18.5,-37.5 - parent: 6747 - uid: 20950 components: - type: Transform @@ -37950,10 +38021,40 @@ entities: - type: Transform pos: 1.5,-69.5 parent: 6747 - - uid: 29732 + - uid: 29772 components: - type: Transform - pos: 13.5,-29.5 + pos: 19.5,-34.5 + parent: 6747 + - uid: 29774 + components: + - type: Transform + pos: 19.5,-36.5 + parent: 6747 + - uid: 29775 + components: + - type: Transform + pos: 19.5,-37.5 + parent: 6747 + - uid: 29776 + components: + - type: Transform + pos: 20.5,-34.5 + parent: 6747 + - uid: 29777 + components: + - type: Transform + pos: 19.5,-35.5 + parent: 6747 + - uid: 29781 + components: + - type: Transform + pos: 11.5,-30.5 + parent: 6747 + - uid: 29782 + components: + - type: Transform + pos: 12.5,-30.5 parent: 6747 - proto: CableApcStack entities: @@ -45095,15 +45196,60 @@ entities: - type: Transform pos: 19.5,-10.5 parent: 6747 - - uid: 2023 + - uid: 2077 components: - type: Transform - pos: 13.5,-27.5 + pos: 12.5,-30.5 parent: 6747 - - uid: 2077 + - uid: 2089 components: - type: Transform - pos: 12.5,-27.5 + pos: 10.5,-30.5 + parent: 6747 + - uid: 2090 + components: + - type: Transform + pos: 14.5,-20.5 + parent: 6747 + - uid: 2099 + components: + - type: Transform + pos: 14.5,-30.5 + parent: 6747 + - uid: 2476 + components: + - type: Transform + pos: 13.5,-30.5 + parent: 6747 + - uid: 2477 + components: + - type: Transform + pos: 11.5,-30.5 + parent: 6747 + - uid: 2480 + components: + - type: Transform + pos: 12.5,-21.5 + parent: 6747 + - uid: 2481 + components: + - type: Transform + pos: 12.5,-20.5 + parent: 6747 + - uid: 2482 + components: + - type: Transform + pos: 13.5,-20.5 + parent: 6747 + - uid: 2483 + components: + - type: Transform + pos: 9.5,-30.5 + parent: 6747 + - uid: 2484 + components: + - type: Transform + pos: 15.5,-30.5 parent: 6747 - uid: 2774 components: @@ -47240,36 +47386,6 @@ entities: - type: Transform pos: 12.5,-22.5 parent: 6747 - - uid: 18350 - components: - - type: Transform - pos: 11.5,-22.5 - parent: 6747 - - uid: 18361 - components: - - type: Transform - pos: 11.5,-23.5 - parent: 6747 - - uid: 18362 - components: - - type: Transform - pos: 11.5,-24.5 - parent: 6747 - - uid: 18363 - components: - - type: Transform - pos: 11.5,-25.5 - parent: 6747 - - uid: 18364 - components: - - type: Transform - pos: 11.5,-26.5 - parent: 6747 - - uid: 18365 - components: - - type: Transform - pos: 11.5,-27.5 - parent: 6747 - uid: 18367 components: - type: Transform @@ -50935,11 +51051,6 @@ entities: - type: Transform pos: -61.5,-70.5 parent: 6747 - - uid: 29731 - components: - - type: Transform - pos: 13.5,-28.5 - parent: 6747 - proto: CableMVStack entities: - uid: 1271 @@ -51321,6 +51432,11 @@ entities: parent: 6747 - proto: CarpetBlack entities: + - uid: 2490 + components: + - type: Transform + pos: 19.5,-38.5 + parent: 6747 - uid: 2575 components: - type: Transform @@ -51331,6 +51447,11 @@ entities: - type: Transform pos: -5.5,-65.5 parent: 6747 + - uid: 4358 + components: + - type: Transform + pos: 20.5,-38.5 + parent: 6747 - uid: 4376 components: - type: Transform @@ -51366,6 +51487,16 @@ entities: - type: Transform pos: -7.5,-66.5 parent: 6747 + - uid: 5667 + components: + - type: Transform + pos: 19.5,-39.5 + parent: 6747 + - uid: 7170 + components: + - type: Transform + pos: 18.5,-39.5 + parent: 6747 - uid: 8718 components: - type: Transform @@ -51446,6 +51577,11 @@ entities: - type: Transform pos: -19.5,6.5 parent: 6747 + - uid: 18364 + components: + - type: Transform + pos: 18.5,-38.5 + parent: 6747 - uid: 18455 components: - type: Transform @@ -51511,6 +51647,11 @@ entities: - type: Transform pos: -19.5,-48.5 parent: 6747 + - uid: 29745 + components: + - type: Transform + pos: 20.5,-39.5 + parent: 6747 - proto: CarpetBlue entities: - uid: 11191 @@ -57318,30 +57459,6 @@ entities: rot: -1.5707963267948966 rad pos: -5.5,-43.5 parent: 6747 - - uid: 2485 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,-36.5 - parent: 6747 - - uid: 2486 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,-37.5 - parent: 6747 - - uid: 2487 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 6.5,-36.5 - parent: 6747 - - uid: 2488 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 8.5,-36.5 - parent: 6747 - uid: 2656 components: - type: Transform @@ -59000,6 +59117,16 @@ entities: rot: -1.5707963267948966 rad pos: -45.5,-35.5 parent: 6747 + - uid: 13856 + components: + - type: Transform + pos: 18.564568,-38.66691 + parent: 6747 + - uid: 14240 + components: + - type: Transform + pos: 19.49165,-38.635635 + parent: 6747 - uid: 15038 components: - type: Transform @@ -60644,20 +60771,16 @@ entities: - type: InsideEntityStorage - proto: ClothingMaskBreathMedical entities: - - uid: 3740 - components: - - type: Transform - pos: 13.543918,-32.32793 - parent: 6747 - - uid: 3741 + - uid: 11198 components: - type: Transform - pos: 13.50225,-32.50514 + pos: 38.483875,-84.61417 parent: 6747 - - uid: 11198 + - uid: 29752 components: - type: Transform - pos: 38.483875,-84.61417 + rot: 3.141592653589793 rad + pos: 6.1823225,-39.441753 parent: 6747 - proto: ClothingMaskGas entities: @@ -60761,15 +60884,15 @@ entities: parent: 6747 - proto: ClothingNeckStethoscope entities: - - uid: 3749 + - uid: 2491 components: - type: Transform - pos: 15.441949,-15.36942 + pos: 6.846137,-39.320812 parent: 6747 - - uid: 4358 + - uid: 3749 components: - type: Transform - pos: 13.546214,-33.268925 + pos: 15.441949,-15.36942 parent: 6747 - uid: 6123 components: @@ -61848,11 +61971,10 @@ entities: rot: 1.5707963267948966 rad pos: 58.5,-12.5 parent: 6747 - - uid: 20882 + - uid: 13943 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 14.5,-32.5 + pos: 12.5,-29.5 parent: 6747 - proto: ComputerId entities: @@ -62974,40 +63096,11 @@ entities: - 0 - proto: CrateFreezer entities: - - uid: 29727 + - uid: 18365 components: - type: Transform - pos: 13.5,-34.5 + pos: 14.353385,-29.497513 parent: 6747 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14673 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 29728 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: CrateFunBoardGames entities: - uid: 12164 @@ -63581,6 +63674,18 @@ entities: - type: Transform pos: -16.5,5.5 parent: 6747 +- proto: CurtainsBlueOpen + entities: + - uid: 16878 + components: + - type: Transform + pos: 17.5,-38.5 + parent: 6747 + - uid: 29444 + components: + - type: Transform + pos: 17.5,-37.5 + parent: 6747 - proto: CurtainsCyanOpen entities: - uid: 5545 @@ -75407,11 +75512,6 @@ entities: parent: 6747 - proto: DonkpocketBoxSpawner entities: - - uid: 2490 - components: - - type: Transform - pos: 5.5,-39.5 - parent: 6747 - uid: 3118 components: - type: Transform @@ -75428,6 +75528,11 @@ entities: - type: Transform pos: 9.5,26.5 parent: 6747 + - uid: 9087 + components: + - type: Transform + pos: 18.5,-36.5 + parent: 6747 - uid: 12875 components: - type: Transform @@ -75975,10 +76080,10 @@ entities: parent: 6747 - proto: DrinkMugRainbow entities: - - uid: 21848 + - uid: 13861 components: - type: Transform - pos: 4.631568,-36.221367 + pos: 18.462353,-39.219376 parent: 6747 - proto: DrinkSakeBottleFull entities: @@ -76152,16 +76257,6 @@ entities: - type: Transform pos: -15.45827,2.5335972 parent: 6747 - - uid: 3747 - components: - - type: Transform - pos: 7.656001,-39.42155 - parent: 6747 - - uid: 3748 - components: - - type: Transform - pos: 7.656001,-39.21307 - parent: 6747 - uid: 4335 components: - type: Transform @@ -76299,6 +76394,11 @@ entities: rot: 1.5707963267948966 rad pos: -21.5,-58.5 parent: 6747 + - uid: 3731 + components: + - type: Transform + pos: 13.5,-36.5 + parent: 6747 - uid: 4719 components: - type: Transform @@ -76634,14 +76734,6 @@ entities: - type: PointLight enabled: True - type: ActiveEmergencyLight - - uid: 17185 - components: - - type: Transform - pos: 17.5,-36.5 - parent: 6747 - - type: PointLight - enabled: True - - type: ActiveEmergencyLight - uid: 17186 components: - type: Transform @@ -77165,6 +77257,13 @@ entities: parent: 8368 - type: Physics canCollide: False +- proto: EpinephrineChemistryBottle + entities: + - uid: 9088 + components: + - type: Transform + pos: 6.387803,-39.1853 + parent: 6747 - proto: ExosuitFabricator entities: - uid: 9073 @@ -77652,7 +77751,6 @@ entities: - type: DeviceList devices: - 22175 - - 22174 - 22173 - 21775 - 22292 @@ -78070,12 +78168,11 @@ entities: parent: 6747 - type: DeviceList devices: - - 21772 - - 22179 - - 22173 - - 22174 - - 22178 - 21909 + - 22178 + - 22173 + - 22179 + - 21772 - uid: 22120 components: - type: Transform @@ -78812,6 +78909,19 @@ entities: - 25234 - 25233 - 25236 + - uid: 29748 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 17.5,-36.5 + parent: 6747 + - type: DeviceList + devices: + - 21906 + - 22292 + - 21775 + - 22173 + - 22175 - proto: FireAlarmElectronics entities: - uid: 7654 @@ -79992,6 +80102,7 @@ entities: - type: DeviceNetwork deviceLists: - 10592 + - 22118 - uid: 21773 components: - type: Transform @@ -80015,6 +80126,11 @@ entities: - type: Transform pos: 13.5,-40.5 parent: 6747 + - type: DeviceNetwork + deviceLists: + - 8702 + - 29748 + - 29754 - uid: 21776 components: - type: Transform @@ -80202,19 +80318,20 @@ entities: - type: DeviceNetwork deviceLists: - 10592 - - uid: 22174 - components: - - type: Transform - pos: 19.5,-35.5 - parent: 6747 - - type: DeviceNetwork - deviceLists: - - 10592 + - 8702 + - 29748 + - 29754 + - 22118 - uid: 22175 components: - type: Transform pos: 21.5,-37.5 parent: 6747 + - type: DeviceNetwork + deviceLists: + - 8702 + - 29748 + - 29754 - uid: 22176 components: - type: Transform @@ -80235,6 +80352,7 @@ entities: - 10592 - 10590 - 131 + - 22118 - uid: 22179 components: - type: Transform @@ -80245,6 +80363,7 @@ entities: - 10592 - 10590 - 131 + - 22118 - uid: 22180 components: - type: Transform @@ -81412,6 +81531,11 @@ entities: - type: Transform pos: 15.72746,-60.379566 parent: 6747 + - uid: 29765 + components: + - type: Transform + pos: -40.531376,2.6492875 + parent: 6747 - proto: FoodBowlBigTrash entities: - uid: 10080 @@ -81784,10 +81908,10 @@ entities: parent: 6747 - proto: FoodPieBaklava entities: - - uid: 3745 + - uid: 25585 components: - type: Transform - pos: 7.4926186,-36.385815 + pos: 19.514439,-39.354885 parent: 6747 - proto: FoodPieBananaCream entities: @@ -82534,6 +82658,22 @@ entities: parent: 6747 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 3743 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 16.5,-37.5 + parent: 6747 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 3745 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 15.5,-38.5 + parent: 6747 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 4773 components: - type: Transform @@ -85019,6 +85159,13 @@ entities: parent: 6747 - type: AtmosPipeColor color: '#FF3333FF' + - uid: 29758 + components: + - type: Transform + pos: 19.5,-33.5 + parent: 6747 + - type: AtmosPipeColor + color: '#0335FCFF' - proto: GasPipeFourway entities: - uid: 360 @@ -85028,6 +85175,13 @@ entities: parent: 6747 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 3746 + components: + - type: Transform + pos: 28.5,-37.5 + parent: 6747 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 5666 components: - type: Transform @@ -85689,6 +85843,21 @@ entities: parent: 6747 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 3732 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 27.5,-37.5 + parent: 6747 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 3738 + components: + - type: Transform + pos: 13.5,-38.5 + parent: 6747 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 3750 components: - type: Transform @@ -90447,13 +90616,6 @@ entities: parent: 6747 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 13849 - components: - - type: Transform - pos: 15.5,-31.5 - parent: 6747 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 13850 components: - type: Transform @@ -90496,14 +90658,6 @@ entities: parent: 6747 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 13856 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 16.5,-38.5 - parent: 6747 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 13857 components: - type: Transform @@ -90536,14 +90690,6 @@ entities: parent: 6747 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 13861 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 10.5,-38.5 - parent: 6747 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 13862 components: - type: Transform @@ -90981,22 +91127,6 @@ entities: parent: 6747 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 13936 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 16.5,-32.5 - parent: 6747 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 13937 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 16.5,-33.5 - parent: 6747 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 13938 components: - type: Transform @@ -91035,14 +91165,6 @@ entities: parent: 6747 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 13943 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 13.5,-37.5 - parent: 6747 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 13944 components: - type: Transform @@ -110947,6 +111069,86 @@ entities: parent: 6747 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 29744 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 26.5,-37.5 + parent: 6747 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 29747 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-37.5 + parent: 6747 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 29753 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 25.5,-37.5 + parent: 6747 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 29755 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 23.5,-37.5 + parent: 6747 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 29756 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-37.5 + parent: 6747 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 29757 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,-37.5 + parent: 6747 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 29759 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 17.5,-33.5 + parent: 6747 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 29760 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-33.5 + parent: 6747 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 29761 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-34.5 + parent: 6747 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 29762 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-35.5 + parent: 6747 + - type: AtmosPipeColor + color: '#0335FCFF' - proto: GasPipeTJunction entities: - uid: 293 @@ -111033,6 +111235,45 @@ entities: parent: 6747 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 3739 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,-38.5 + parent: 6747 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 3741 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 16.5,-33.5 + parent: 6747 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 3742 + components: + - type: Transform + pos: 13.5,-37.5 + parent: 6747 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 3747 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 16.5,-32.5 + parent: 6747 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 3748 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 15.5,-31.5 + parent: 6747 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 5983 components: - type: Transform @@ -111890,22 +112131,6 @@ entities: parent: 6747 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 13804 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 16.5,-37.5 - parent: 6747 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 13805 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 15.5,-38.5 - parent: 6747 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 13891 components: - type: Transform @@ -112013,14 +112238,6 @@ entities: parent: 6747 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 14240 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 28.5,-37.5 - parent: 6747 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 14241 components: - type: Transform @@ -115058,6 +115275,17 @@ entities: - 131 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 2160 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 13.5,-39.5 + parent: 6747 + - type: DeviceNetwork + deviceLists: + - 29754 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 3675 components: - type: Transform @@ -115069,6 +115297,17 @@ entities: - 7456 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 3737 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 15.5,-32.5 + parent: 6747 + - type: DeviceNetwork + deviceLists: + - 10592 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 4982 components: - type: Transform @@ -115346,14 +115585,10 @@ entities: rot: 1.5707963267948966 rad pos: 5.5,-37.5 parent: 6747 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 13952 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 17.5,-37.5 - parent: 6747 + - type: DeviceNetwork + deviceLists: + - 8702 + - 29754 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13953 @@ -117062,6 +117297,17 @@ entities: parent: 6747 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 29763 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-36.5 + parent: 6747 + - type: DeviceNetwork + deviceLists: + - 10592 + - type: AtmosPipeColor + color: '#0335FCFF' - proto: GasVentPumpVox entities: - uid: 29596 @@ -117077,6 +117323,16 @@ entities: color: '#FF3333FF' - proto: GasVentScrubber entities: + - uid: 2159 + components: + - type: Transform + pos: 10.5,-37.5 + parent: 6747 + - type: DeviceNetwork + deviceLists: + - 29754 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 2472 components: - type: Transform @@ -117099,6 +117355,17 @@ entities: - 7456 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 3740 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 16.5,-31.5 + parent: 6747 + - type: DeviceNetwork + deviceLists: + - 10592 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 3755 components: - type: Transform @@ -117426,14 +117693,10 @@ entities: rot: 1.5707963267948966 rad pos: 5.5,-38.5 parent: 6747 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 13867 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 17.5,-38.5 - parent: 6747 + - type: DeviceNetwork + deviceLists: + - 8702 + - 29754 - type: AtmosPipeColor color: '#FF1212FF' - uid: 13868 @@ -119110,6 +119373,17 @@ entities: - 29421 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 29764 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 20.5,-37.5 + parent: 6747 + - type: DeviceNetwork + deviceLists: + - 10592 + - type: AtmosPipeColor + color: '#FF1212FF' - proto: GasVentScrubberVox entities: - uid: 29609 @@ -120525,26 +120799,11 @@ entities: - type: Transform pos: 30.5,-30.5 parent: 6747 - - uid: 2159 - components: - - type: Transform - pos: 9.5,-39.5 - parent: 6747 - - uid: 2160 - components: - - type: Transform - pos: 9.5,-37.5 - parent: 6747 - uid: 2161 components: - type: Transform pos: 64.5,33.5 parent: 6747 - - uid: 2162 - components: - - type: Transform - pos: 9.5,-36.5 - parent: 6747 - uid: 2227 components: - type: Transform @@ -125695,6 +125954,16 @@ entities: - type: Transform pos: 60.5,-24.5 parent: 6747 + - uid: 29773 + components: + - type: Transform + pos: 17.5,-38.5 + parent: 6747 + - uid: 29778 + components: + - type: Transform + pos: 17.5,-37.5 + parent: 6747 - proto: GrilleBroken entities: - uid: 9970 @@ -125927,18 +126196,18 @@ entities: - type: Transform pos: 57.935726,57.403614 parent: 6747 -- proto: GunSafe +- proto: GunSafeBaseSecure entities: - - uid: 3258 + - uid: 1964 components: - type: Transform - pos: -30.5,7.5 + pos: -29.5,7.5 parent: 6747 - type: EntityStorage air: volume: 200 immutable: False - temperature: 293.14673 + temperature: 293.14697 moles: - 1.8856695 - 7.0937095 @@ -125958,28 +126227,28 @@ entities: showEnts: False occludes: True ents: - - 3371 - - 3377 - - 3370 - - 3369 - - 3367 + - 3443 + - 3444 + - 3446 + - 3441 + - 3442 paper_label: !type:ContainerSlot showEnts: False occludes: True ent: null - - uid: 3385 + - uid: 2019 components: - type: Transform - pos: -29.5,7.5 + pos: -30.5,7.5 parent: 6747 - type: EntityStorage air: volume: 200 immutable: False - temperature: 293.14673 + temperature: 293.14703 moles: - - 1.7459903 - - 6.568249 + - 1.8968438 + - 7.1357465 - 0 - 0 - 0 @@ -125996,11 +126265,11 @@ entities: showEnts: False occludes: True ents: - - 3442 - - 3441 - - 3446 - - 3444 - - 3443 + - 3371 + - 3367 + - 3369 + - 3370 + - 3377 paper_label: !type:ContainerSlot showEnts: False occludes: True @@ -126205,16 +126474,20 @@ entities: - type: Transform pos: 1.3405766,38.626003 parent: 6747 - - uid: 7169 + - uid: 6580 components: - type: Transform - pos: 13.259391,-32.870655 - parent: 6747 - - uid: 7170 + parent: 2040 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 7169 components: - type: Transform - pos: 13.519809,-32.839382 - parent: 6747 + parent: 2040 + - type: Physics + canCollide: False + - type: InsideEntityStorage - uid: 7171 components: - type: Transform @@ -126243,10 +126516,10 @@ entities: - type: Transform pos: 10.528759,-32.0083 parent: 6747 - - uid: 3731 + - uid: 5668 components: - type: Transform - pos: 10.5016,-36.36708 + pos: 10.483246,-39.219723 parent: 6747 - uid: 9673 components: @@ -126648,6 +126921,13 @@ entities: - type: Transform pos: -33.5,-45.5 parent: 6747 +- proto: HolopadEngineeringAME + entities: + - uid: 29783 + components: + - type: Transform + pos: 65.5,13.5 + parent: 6747 - proto: HolopadEngineeringAtmosMain entities: - uid: 29496 @@ -126676,6 +126956,13 @@ entities: - type: Transform pos: 44.5,11.5 parent: 6747 +- proto: HolopadEngineeringMain + entities: + - uid: 29784 + components: + - type: Transform + pos: 57.5,19.5 + parent: 6747 - proto: HolopadEngineeringStorage entities: - uid: 29518 @@ -126797,10 +127084,10 @@ entities: parent: 6747 - proto: HolopadMedicalBreakroom entities: - - uid: 29534 + - uid: 5669 components: - type: Transform - pos: 6.5,-37.5 + pos: 19.5,-37.5 parent: 6747 - proto: HolopadMedicalChemistry entities: @@ -127834,11 +128121,6 @@ entities: - type: Transform pos: -24.5,-4.5 parent: 6747 - - uid: 2489 - components: - - type: Transform - pos: 6.5,-39.5 - parent: 6747 - uid: 2699 components: - type: Transform @@ -127914,6 +128196,11 @@ entities: - type: Transform pos: 49.5,23.5 parent: 6747 + - uid: 13849 + components: + - type: Transform + pos: 18.5,-36.5 + parent: 6747 - uid: 17762 components: - type: Transform @@ -128112,6 +128399,12 @@ entities: rot: -1.5707963267948966 rad pos: 38.918972,-49.78948 parent: 6747 + - uid: 9089 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 14.5373125,-33.15561 + parent: 6747 - uid: 9126 components: - type: Transform @@ -128147,6 +128440,12 @@ entities: rot: -1.5707963267948966 rad pos: 48.56912,-50.90788 parent: 6747 + - uid: 20881 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 14.5060625,-30.945742 + parent: 6747 - uid: 23608 components: - type: Transform @@ -128847,6 +129146,36 @@ entities: - type: Transform pos: 20.5,-34.5 parent: 6747 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14673 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - type: ContainerContainer + containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 6580 + - 7169 + paper_label: !type:ContainerSlot + showEnts: False + occludes: True + ent: null - proto: LockerPsychologistFilled entities: - uid: 540 @@ -128987,10 +129316,10 @@ entities: parent: 6747 - proto: LockerSurgeonFilled entities: - - uid: 20889 + - uid: 3385 components: - type: Transform - pos: 10.5,-30.5 + pos: 10.5,-34.5 parent: 6747 - proto: LockerWallMedicalDoctorFilled entities: @@ -129008,10 +129337,10 @@ entities: - 3202 - proto: LockerWallMedicalFilled entities: - - uid: 3695 + - uid: 18361 components: - type: Transform - pos: 20.5,-35.5 + pos: 5.5,-35.5 parent: 6747 - uid: 23938 components: @@ -129197,10 +129526,10 @@ entities: - type: Transform pos: -36.5,-85.5 parent: 6747 - - uid: 20881 + - uid: 13937 components: - type: Transform - pos: 14.5,-31.5 + pos: 13.5,-29.5 parent: 6747 - proto: MachineFrameDestroyed entities: @@ -129938,24 +130267,24 @@ entities: parent: 6747 - proto: MedicalBiofabricator entities: - - uid: 29444 + - uid: 20901 components: - type: Transform - pos: 11.5,-34.5 + pos: 10.5,-29.5 parent: 6747 - proto: MedicalScanner entities: - - uid: 20883 + - uid: 13952 components: - type: Transform - pos: 14.5,-33.5 + pos: 11.5,-29.5 parent: 6747 - proto: MedicalTechFab entities: - - uid: 3736 + - uid: 3694 components: - type: Transform - pos: 20.5,-38.5 + pos: 4.5,-37.5 parent: 6747 - proto: MedicalTechFabCircuitboard entities: @@ -130066,22 +130395,22 @@ entities: parent: 6747 - proto: MedkitRadiationFilled entities: - - uid: 3727 + - uid: 29749 components: - type: Transform - pos: 13.549136,-31.569992 + pos: 5.4948225,-39.264545 parent: 6747 - proto: MedkitToxinFilled entities: - - uid: 3728 + - uid: 3963 components: - type: Transform - pos: 13.424136,-31.861862 + pos: -29.464008,-48.231915 parent: 6747 - - uid: 3963 + - uid: 29751 components: - type: Transform - pos: -29.464008,-48.231915 + pos: 5.6302385,-39.4626 parent: 6747 - proto: Memorial entities: @@ -132563,10 +132892,10 @@ entities: parent: 6747 - proto: NitrousOxideTankFilled entities: - - uid: 3743 + - uid: 9085 components: - type: Transform - pos: 10.502254,-34.43969 + pos: 14.441907,-32.405785 parent: 6747 - proto: NoticeBoard entities: @@ -132641,6 +132970,16 @@ entities: - type: Transform pos: 1.5,-69.5 parent: 6747 + - uid: 9090 + components: + - type: Transform + pos: 13.5,-31.5 + parent: 6747 + - uid: 13867 + components: + - type: Transform + pos: 13.5,-33.5 + parent: 6747 - proto: Oracle entities: - uid: 8917 @@ -132670,15 +133009,6 @@ entities: - type: Transform pos: -2.4960773,-75.40111 parent: 6747 -- proto: OrganAnimalRuminantStomach - entities: - - uid: 29728 - components: - - type: Transform - parent: 29727 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: OrganHumanHeart entities: - uid: 22426 @@ -138683,6 +139013,13 @@ entities: - type: Transform pos: 52.5,-26.5 parent: 6747 +- proto: PosterContrabandYoutoolpia + entities: + - uid: 29771 + components: + - type: Transform + pos: 58.5,-18.5 + parent: 6747 - proto: PosterLegit12Gauge entities: - uid: 16297 @@ -138704,6 +139041,23 @@ entities: rot: 1.5707963267948966 rad pos: 60.5,-48.5 parent: 6747 +- proto: PosterLegitCalendar + entities: + - uid: 29766 + components: + - type: Transform + pos: -43.5,2.5 + parent: 6747 + - uid: 29767 + components: + - type: Transform + pos: 21.5,-38.5 + parent: 6747 + - uid: 29768 + components: + - type: Transform + pos: 41.5,-30.5 + parent: 6747 - proto: PosterLegitCohibaRobustoAd entities: - uid: 2732 @@ -138748,6 +139102,13 @@ entities: rot: 1.5707963267948966 rad pos: -6.5,-7.5 parent: 6747 +- proto: PosterLegitEyeChart + entities: + - uid: 29770 + components: + - type: Transform + pos: 22.5,-17.5 + parent: 6747 - proto: PosterLegitHelpOthers entities: - uid: 7503 @@ -139565,6 +139926,11 @@ entities: rot: -1.5707963267948966 rad pos: 38.5,-50.5 parent: 6747 + - uid: 20882 + components: + - type: Transform + pos: 7.5,-39.5 + parent: 6747 - uid: 22507 components: - type: Transform @@ -140209,6 +140575,12 @@ entities: rot: 3.141592653589793 rad pos: 16.5,-13.5 parent: 6747 + - uid: 10593 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,-39.5 + parent: 6747 - uid: 11135 components: - type: Transform @@ -141308,16 +141680,6 @@ entities: enabled: False - type: ApcPowerReceiver powerLoad: 0 - - uid: 16906 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 6.5,-39.5 - parent: 6747 - - type: PointLight - enabled: False - - type: ApcPowerReceiver - powerLoad: 0 - uid: 16907 components: - type: Transform @@ -143158,6 +143520,12 @@ entities: enabled: False - type: ApcPowerReceiver powerLoad: 0 + - uid: 13805 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 15.5,-39.5 + parent: 6747 - uid: 16432 components: - type: Transform @@ -143178,16 +143546,6 @@ entities: enabled: False - type: ApcPowerReceiver powerLoad: 0 - - uid: 16878 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 10.5,-39.5 - parent: 6747 - - type: PointLight - enabled: False - - type: ApcPowerReceiver - powerLoad: 0 - uid: 16944 components: - type: Transform @@ -143197,16 +143555,6 @@ entities: enabled: False - type: ApcPowerReceiver powerLoad: 0 - - uid: 16947 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 15.5,-39.5 - parent: 6747 - - type: PointLight - enabled: False - - type: ApcPowerReceiver - powerLoad: 0 - uid: 20768 components: - type: Transform @@ -143225,6 +143573,12 @@ entities: enabled: False - type: ApcPowerReceiver powerLoad: 0 + - uid: 29728 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 11.5,-39.5 + parent: 6747 - proto: PoweredLightColoredRed entities: - uid: 808 @@ -144750,6 +145104,11 @@ entities: - type: Transform pos: -42.5,11.5 parent: 6747 + - uid: 1748 + components: + - type: Transform + pos: 14.5,-32.5 + parent: 6747 - uid: 1777 components: - type: Transform @@ -144780,21 +145139,6 @@ entities: - type: Transform pos: -13.5,-34.5 parent: 6747 - - uid: 2477 - components: - - type: Transform - pos: 18.5,-39.5 - parent: 6747 - - uid: 2478 - components: - - type: Transform - pos: 19.5,-39.5 - parent: 6747 - - uid: 2479 - components: - - type: Transform - pos: 20.5,-39.5 - parent: 6747 - uid: 2705 components: - type: Transform @@ -144883,11 +145227,6 @@ entities: - type: Transform pos: 21.5,-23.5 parent: 6747 - - uid: 3742 - components: - - type: Transform - pos: 10.5,-34.5 - parent: 6747 - uid: 3853 components: - type: Transform @@ -145556,6 +145895,11 @@ entities: rot: -1.5707963267948966 rad pos: 74.5,9.5 parent: 6747 + - uid: 18362 + components: + - type: Transform + pos: 4.5,-36.5 + parent: 6747 - uid: 19034 components: - type: Transform @@ -145566,6 +145910,16 @@ entities: - type: Transform pos: -5.5,6.5 parent: 6747 + - uid: 20889 + components: + - type: Transform + pos: 4.5,-39.5 + parent: 6747 + - uid: 20900 + components: + - type: Transform + pos: 4.5,-38.5 + parent: 6747 - uid: 21020 components: - type: Transform @@ -147301,6 +147655,11 @@ entities: - type: Transform pos: -10.5,-55.5 parent: 6747 + - uid: 13936 + components: + - type: Transform + pos: -52.5,7.5 + parent: 6747 - uid: 16300 components: - type: Transform @@ -147336,11 +147695,6 @@ entities: - type: Transform pos: 43.5,-22.5 parent: 6747 - - uid: 24540 - components: - - type: Transform - pos: -43.5,2.5 - parent: 6747 - uid: 29719 components: - type: Transform @@ -156297,20 +156651,25 @@ entities: - type: Transform pos: -28.565948,-13.381782 parent: 6747 - - uid: 2019 + - uid: 3695 components: - type: Transform - pos: 13.492375,-29.078419 + pos: 7.5,-36 parent: 6747 - - uid: 10593 + - uid: 17311 components: - type: Transform - pos: 14.502791,-29.067995 + pos: 7.5,-36.5 parent: 6747 - - uid: 17311 + - uid: 20883 + components: + - type: Transform + pos: 6.5,-36 + parent: 6747 + - uid: 20948 components: - type: Transform - pos: 12.492375,-29.088842 + pos: 6.5,-36.5 parent: 6747 - proto: SalvageCanisterSpawner entities: @@ -156479,6 +156838,13 @@ entities: - type: Transform pos: 27.524822,34.178925 parent: 6747 +- proto: Scalpel + entities: + - uid: 2489 + components: + - type: Transform + pos: 14.433146,-31.362698 + parent: 6747 - proto: SchoolgirlUniformSpawner entities: - uid: 23529 @@ -156801,6 +157167,13 @@ entities: rot: -1.5707963267948966 rad pos: 60.38245,-16.485804 parent: 6747 +- proto: SentientSmileCore + entities: + - uid: 29735 + components: + - type: Transform + pos: 18.5,-58.5 + parent: 6747 - proto: ShardGlass entities: - uid: 3806 @@ -156859,11 +157232,6 @@ entities: parent: 6747 - proto: SheetGlass entities: - - uid: 3738 - components: - - type: Transform - pos: 19.536514,-39.348763 - parent: 6747 - uid: 4396 components: - type: Transform @@ -156879,6 +157247,12 @@ entities: - type: Transform pos: 50.472504,16.50103 parent: 6747 + - uid: 17309 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.564595,-39.418255 + parent: 6747 - uid: 25679 components: - type: Transform @@ -156994,10 +157368,11 @@ entities: parent: 6747 - proto: SheetPlastic entities: - - uid: 3737 + - uid: 2485 components: - type: Transform - pos: 20.484428,-39.442577 + rot: 1.5707963267948966 rad + pos: 4.564595,-38.375866 parent: 6747 - uid: 3866 components: @@ -157053,10 +157428,11 @@ entities: parent: 6747 - proto: SheetSteel entities: - - uid: 3739 + - uid: 1752 components: - type: Transform - pos: 18.505264,-39.38003 + rot: 1.5707963267948966 rad + pos: 4.512513,-36.450493 parent: 6747 - uid: 3868 components: @@ -159232,6 +159608,13 @@ entities: rot: 1.5707963267948966 rad pos: -10.5,-50.5 parent: 6747 +- proto: SignBrigmed + entities: + - uid: 29769 + components: + - type: Transform + pos: -27.5,-13.5 + parent: 6747 - proto: SignCargo entities: - uid: 6455 @@ -161441,13 +161824,6 @@ entities: - type: Transform pos: -25.5,-5.5 parent: 6747 -- proto: SpawnMobMedibot - entities: - - uid: 8702 - components: - - type: Transform - pos: 17.5,-36.5 - parent: 6747 - proto: SpawnMobMonkeyPunpun entities: - uid: 25509 @@ -161483,13 +161859,6 @@ entities: - type: Transform pos: 31.5,-61.5 parent: 6747 -- proto: SpawnMobSmile - entities: - - uid: 29735 - components: - - type: Transform - pos: 18.5,-58.5 - parent: 6747 - proto: SpawnMobWalter entities: - uid: 27989 @@ -161681,10 +162050,10 @@ entities: - type: Transform pos: 12.5,-26.5 parent: 6747 - - uid: 25585 + - uid: 29731 components: - type: Transform - pos: 7.5,-37.5 + pos: 19.5,-38.5 parent: 6747 - proto: SpawnPointChiefEngineer entities: @@ -161945,26 +162314,6 @@ entities: - type: Transform pos: -20.5,-11.5 parent: 6747 - - uid: 5667 - components: - - type: Transform - pos: 5.5,-36.5 - parent: 6747 - - uid: 5668 - components: - - type: Transform - pos: 6.5,-36.5 - parent: 6747 - - uid: 5669 - components: - - type: Transform - pos: 4.5,-37.5 - parent: 6747 - - uid: 5670 - components: - - type: Transform - pos: 8.5,-36.5 - parent: 6747 - uid: 6582 components: - type: Transform @@ -161985,6 +162334,11 @@ entities: - type: Transform pos: 20.5,-33.5 parent: 6747 + - uid: 20890 + components: + - type: Transform + pos: 18.5,-37.5 + parent: 6747 - uid: 21422 components: - type: Transform @@ -162090,16 +162444,26 @@ entities: - type: Transform pos: -23.5,-11.5 parent: 6747 - - uid: 6580 + - uid: 3727 components: - type: Transform - pos: 6.5,-38.5 + pos: 25.5,-21.5 + parent: 6747 + - uid: 3728 + components: + - type: Transform + pos: 25.5,-23.5 parent: 6747 - uid: 6581 components: - type: Transform pos: 46.5,-42.5 parent: 6747 + - uid: 20897 + components: + - type: Transform + pos: 18.5,-38.5 + parent: 6747 - proto: SpawnPointPassenger entities: - uid: 6078 @@ -162469,10 +162833,10 @@ entities: parent: 6747 - proto: SpawnPointSurgeon entities: - - uid: 17310 + - uid: 5670 components: - type: Transform - pos: 5.5,-38.5 + pos: 19.5,-37.5 parent: 6747 - uid: 29437 components: @@ -164169,7 +164533,7 @@ entities: setupAvailableNetworks: - SurveillanceCameraMedical nameSet: True - id: Medbay Breakroom + id: Storage Closet - uid: 21406 components: - type: Transform @@ -164181,6 +164545,16 @@ entities: - SurveillanceCameraMedical nameSet: True id: Outpost (Arena) + - uid: 24540 + components: + - type: Transform + pos: 18.5,-39.5 + parent: 6747 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Breakroom - uid: 26890 components: - type: Transform @@ -165161,10 +165535,10 @@ entities: - type: Transform pos: 10.5,-39.5 parent: 6747 - - uid: 2476 + - uid: 2487 components: - type: Transform - pos: 17.5,-39.5 + pos: 6.5,-39.5 parent: 6747 - uid: 2693 components: @@ -165384,6 +165758,16 @@ entities: - type: Transform pos: -37.5,-32.5 parent: 6747 + - uid: 13804 + components: + - type: Transform + pos: 7.5,-39.5 + parent: 6747 + - uid: 17310 + components: + - type: Transform + pos: 5.5,-39.5 + parent: 6747 - uid: 22942 components: - type: Transform @@ -166052,21 +166436,6 @@ entities: - type: Transform pos: 10.5,-33.5 parent: 6747 - - uid: 2099 - components: - - type: Transform - pos: 13.5,-32.5 - parent: 6747 - - uid: 2100 - components: - - type: Transform - pos: 13.5,-31.5 - parent: 6747 - - uid: 2101 - components: - - type: Transform - pos: 13.5,-33.5 - parent: 6747 - uid: 2153 components: - type: Transform @@ -166312,6 +166681,11 @@ entities: - type: Transform pos: 25.5,2.5 parent: 6747 + - uid: 18350 + components: + - type: Transform + pos: 14.5,-33.5 + parent: 6747 - uid: 23546 components: - type: Transform @@ -166413,6 +166787,11 @@ entities: rot: 1.5707963267948966 rad pos: 58.5,-22.5 parent: 6747 + - uid: 29750 + components: + - type: Transform + pos: 14.5,-31.5 + parent: 6747 - proto: TablePlasmaGlass entities: - uid: 4020 @@ -167402,6 +167781,11 @@ entities: - type: Transform pos: -20.5,-17.5 parent: 6747 + - uid: 1723 + components: + - type: Transform + pos: 19.5,-39.5 + parent: 6747 - uid: 1800 components: - type: Transform @@ -167468,31 +167852,6 @@ entities: - type: Transform pos: 25.5,-34.5 parent: 6747 - - uid: 2480 - components: - - type: Transform - pos: 7.5,-36.5 - parent: 6747 - - uid: 2481 - components: - - type: Transform - pos: 4.5,-36.5 - parent: 6747 - - uid: 2482 - components: - - type: Transform - pos: 5.5,-39.5 - parent: 6747 - - uid: 2483 - components: - - type: Transform - pos: 6.5,-39.5 - parent: 6747 - - uid: 2484 - components: - - type: Transform - pos: 7.5,-39.5 - parent: 6747 - uid: 2721 components: - type: Transform @@ -168058,6 +168417,16 @@ entities: rot: -1.5707963267948966 rad pos: 58.5,-50.5 parent: 6747 + - uid: 29743 + components: + - type: Transform + pos: 18.5,-36.5 + parent: 6747 + - uid: 29746 + components: + - type: Transform + pos: 18.5,-39.5 + parent: 6747 - proto: TableWoodReinforced entities: - uid: 386 @@ -169482,11 +169851,6 @@ entities: - type: Transform pos: -22.5,-21.5 parent: 6747 - - uid: 2491 - components: - - type: Transform - pos: 4.5,-39.5 - parent: 6747 - uid: 2941 components: - type: Transform @@ -169497,6 +169861,11 @@ entities: - type: Transform pos: 67.5,-25.5 parent: 6747 + - uid: 16906 + components: + - type: Transform + pos: 20.5,-36.5 + parent: 6747 - proto: VendingMachineClothing entities: - uid: 2932 @@ -169609,10 +169978,10 @@ entities: parent: 6747 - proto: VendingMachineMediDrobe entities: - - uid: 29733 + - uid: 2486 components: - type: Transform - pos: 11.5,-29.5 + pos: 8.5,-39.5 parent: 6747 - proto: VendingMachineMNKDrobe entities: @@ -169743,10 +170112,10 @@ entities: parent: 6747 - proto: VendingMachineViroDrobe entities: - - uid: 17309 + - uid: 17185 components: - type: Transform - pos: 10.5,-29.5 + pos: 8.5,-36.5 parent: 6747 - proto: VendingMachineWallMedical entities: @@ -169892,11 +170261,6 @@ entities: - type: Transform pos: -35.5,-34.5 parent: 6747 - - uid: 22463 - components: - - type: Transform - pos: 4.5,-35.5 - parent: 6747 - uid: 22464 components: - type: Transform @@ -171916,11 +172280,6 @@ entities: - type: Transform pos: -18.5,-7.5 parent: 6747 - - uid: 1723 - components: - - type: Transform - pos: 3.5,-37.5 - parent: 6747 - uid: 1728 components: - type: Transform @@ -171936,26 +172295,11 @@ entities: - type: Transform pos: 3.5,-35.5 parent: 6747 - - uid: 1748 - components: - - type: Transform - pos: 3.5,-36.5 - parent: 6747 - - uid: 1749 - components: - - type: Transform - pos: 3.5,-38.5 - parent: 6747 - uid: 1751 components: - type: Transform pos: 9.5,-30.5 parent: 6747 - - uid: 1752 - components: - - type: Transform - pos: 3.5,-39.5 - parent: 6747 - uid: 1789 components: - type: Transform @@ -183177,6 +183521,16 @@ entities: - type: Transform pos: 50.5,-16.5 parent: 6747 + - uid: 3814 + components: + - type: Transform + pos: 9.5,-36.5 + parent: 6747 + - uid: 3815 + components: + - type: Transform + pos: 9.5,-39.5 + parent: 6747 - uid: 3816 components: - type: Transform @@ -185082,6 +185436,11 @@ entities: - type: Transform pos: 43.5,-52.5 parent: 6747 + - uid: 16947 + components: + - type: Transform + pos: 17.5,-39.5 + parent: 6747 - uid: 17250 components: - type: Transform @@ -185147,6 +185506,11 @@ entities: - type: Transform pos: 21.5,-94.5 parent: 6747 + - uid: 20949 + components: + - type: Transform + pos: 3.5,-38.5 + parent: 6747 - uid: 21080 components: - type: Transform @@ -185172,6 +185536,11 @@ entities: - type: Transform pos: 58.5,4.5 parent: 6747 + - uid: 21848 + components: + - type: Transform + pos: 3.5,-39.5 + parent: 6747 - uid: 21852 components: - type: Transform @@ -185187,6 +185556,11 @@ entities: - type: Transform pos: -22.5,-56.5 parent: 6747 + - uid: 22174 + components: + - type: Transform + pos: 3.5,-37.5 + parent: 6747 - uid: 22207 components: - type: Transform @@ -185202,6 +185576,16 @@ entities: - type: Transform pos: 60.5,-4.5 parent: 6747 + - uid: 22463 + components: + - type: Transform + pos: 3.5,-36.5 + parent: 6747 + - uid: 22542 + components: + - type: Transform + pos: 17.5,-36.5 + parent: 6747 - uid: 22928 components: - type: Transform @@ -185247,6 +185631,11 @@ entities: - type: Transform pos: 35.5,12.5 parent: 6747 + - uid: 29534 + components: + - type: Transform + pos: 9.5,-37.5 + parent: 6747 - uid: 29668 components: - type: Transform @@ -186282,11 +186671,6 @@ entities: - type: Transform pos: -14.5,2.5 parent: 6747 - - uid: 3746 - components: - - type: Transform - pos: 8.5,-39.5 - parent: 6747 - uid: 4131 components: - type: Transform @@ -186327,6 +186711,11 @@ entities: - type: Transform pos: 57.5,-41.5 parent: 6747 + - uid: 29733 + components: + - type: Transform + pos: 20.5,-39.5 + parent: 6747 - proto: WatermelonSeeds entities: - uid: 9373 @@ -186521,28 +186910,28 @@ entities: - uid: 3367 components: - type: Transform - parent: 3258 + parent: 2019 - type: Physics canCollide: False - type: InsideEntityStorage - uid: 3371 components: - type: Transform - parent: 3258 + parent: 2019 - type: Physics canCollide: False - type: InsideEntityStorage - uid: 3444 components: - type: Transform - parent: 3385 + parent: 1964 - type: Physics canCollide: False - type: InsideEntityStorage - uid: 3446 components: - type: Transform - parent: 3385 + parent: 1964 - type: Physics canCollide: False - type: InsideEntityStorage @@ -187183,24 +187572,6 @@ entities: - type: Transform pos: 25.5,-20.5 parent: 6747 - - uid: 9088 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 18.5,-39.5 - parent: 6747 - - uid: 9089 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 19.5,-39.5 - parent: 6747 - - uid: 9090 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 20.5,-38.5 - parent: 6747 - uid: 16796 components: - type: Transform @@ -187303,6 +187674,20 @@ entities: rot: 1.5707963267948966 rad pos: -38.5,0.5 parent: 6747 +- proto: WindoorSecureSurgeryLocked + entities: + - uid: 2488 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 14.5,-30.5 + parent: 6747 + - uid: 3736 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 14.5,-34.5 + parent: 6747 - proto: WindoorServiceLocked entities: - uid: 17560 @@ -187546,6 +187931,11 @@ entities: - type: Transform pos: -22.5,-27.5 parent: 6747 + - uid: 2023 + components: + - type: Transform + pos: 17.5,-38.5 + parent: 6747 - uid: 2043 components: - type: Transform @@ -187746,21 +188136,6 @@ entities: - type: Transform pos: 31.5,-48.5 parent: 6747 - - uid: 3813 - components: - - type: Transform - pos: 9.5,-36.5 - parent: 6747 - - uid: 3814 - components: - - type: Transform - pos: 9.5,-37.5 - parent: 6747 - - uid: 3815 - components: - - type: Transform - pos: 9.5,-39.5 - parent: 6747 - uid: 3847 components: - type: Transform @@ -188381,6 +188756,11 @@ entities: - type: Transform pos: -7.5,-60.5 parent: 6747 + - uid: 18363 + components: + - type: Transform + pos: 17.5,-37.5 + parent: 6747 - uid: 18424 components: - type: Transform @@ -189229,30 +189609,6 @@ entities: rot: -1.5707963267948966 rad pos: 24.5,-45.5 parent: 6747 - - uid: 9084 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 20.5,-38.5 - parent: 6747 - - uid: 9085 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 20.5,-39.5 - parent: 6747 - - uid: 9086 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 19.5,-39.5 - parent: 6747 - - uid: 9087 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 18.5,-39.5 - parent: 6747 - uid: 10394 components: - type: Transform @@ -190503,6 +190859,12 @@ entities: rot: -1.5707963267948966 rad pos: -5.5,-5.5 parent: 6747 + - uid: 3258 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 14.5,-31.5 + parent: 6747 - uid: 4231 components: - type: Transform @@ -190582,6 +190944,18 @@ entities: - type: Transform pos: -51.5,10.5 parent: 6747 + - uid: 9084 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 14.5,-29.5 + parent: 6747 + - uid: 9086 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 14.5,-32.5 + parent: 6747 - uid: 17305 components: - type: Transform @@ -190594,6 +190968,12 @@ entities: rot: -1.5707963267948966 rad pos: -43.5,9.5 parent: 6747 + - uid: 20902 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 14.5,-33.5 + parent: 6747 - uid: 22297 components: - type: Transform diff --git a/Resources/Maps/hive.yml b/Resources/Maps/hive.yml index 5391dc8b96e5..13975626bfb2 100644 --- a/Resources/Maps/hive.yml +++ b/Resources/Maps/hive.yml @@ -177,7 +177,7 @@ entities: version: 6 4,0: ind: 4,0 - tiles: bwAAAAACbwAAAAADbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAADbwAAAAADbwAAAAADbwAAAAABbwAAAAADbwAAAAABTgAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAbwAAAAAAbwAAAAACfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAAXAAAAAADXAAAAAABXAAAAAADXAAAAAAAXAAAAAABXAAAAAADXAAAAAACXAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAeQAAAAADeQAAAAADeQAAAAAAXAAAAAACXAAAAAABTQAAAAACXAAAAAACXAAAAAAATQAAAAACXAAAAAADXAAAAAACTgAAAAAAZwAAAAACZwAAAAAAZwAAAAACTgAAAAAAeQAAAAAATQAAAAACeQAAAAAAXAAAAAACTQAAAAABXAAAAAAAXAAAAAAATQAAAAACXAAAAAAAXAAAAAACXAAAAAACTgAAAAAAZwAAAAADZwAAAAAAZwAAAAADTgAAAAAAeQAAAAADTQAAAAADeQAAAAABXAAAAAACXAAAAAADXAAAAAABXAAAAAAAXAAAAAABXAAAAAACXAAAAAACXAAAAAADTgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAeQAAAAABeQAAAAAAeQAAAAABZwAAAAACZwAAAAADTgAAAAAATgAAAAAAfAAAAAAAZwAAAAABZwAAAAADfAAAAAAATgAAAAAAZwAAAAACTgAAAAAAfAAAAAAATgAAAAAAfAAAAAAAfAAAAAAATgAAAAAAZwAAAAABZwAAAAAATgAAAAAATgAAAAAAfAAAAAAAZwAAAAABZwAAAAAAfAAAAAAATgAAAAAAZwAAAAABTgAAAAAAfAAAAAAATgAAAAAATgAAAAAAfAAAAAAAewAAAAAAZwAAAAABZwAAAAABZwAAAAAATgAAAAAAfAAAAAAAZwAAAAAAZwAAAAACfAAAAAAATgAAAAAAZwAAAAACTgAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAewAAAAAAZwAAAAADfAAAAAAATgAAAAAATgAAAAAAfAAAAAAAZwAAAAAAZwAAAAADfAAAAAAATgAAAAAAZwAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAZwAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAZwAAAAADZwAAAAACTgAAAAAATgAAAAAAZwAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAZwAAAAAATgAAAAAATgAAAAAAZwAAAAAAZwAAAAADZwAAAAADZwAAAAADZwAAAAADZwAAAAABZwAAAAABZwAAAAACTgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAZwAAAAACfAAAAAAATgAAAAAAZwAAAAADZwAAAAAAZwAAAAACZwAAAAABZwAAAAADZwAAAAABZwAAAAADTgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAZwAAAAADZwAAAAABZwAAAAABZwAAAAABZwAAAAACZwAAAAACZwAAAAADZwAAAAADZwAAAAABZwAAAAABTgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAZwAAAAACZwAAAAACZwAAAAABZwAAAAAAZwAAAAABZwAAAAACZwAAAAADZwAAAAABZwAAAAADZwAAAAACTgAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAZwAAAAABfAAAAAAAZwAAAAABTgAAAAAAfAAAAAAATgAAAAAAZwAAAAAAZwAAAAACZwAAAAABZwAAAAADTgAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAA + tiles: bwAAAAACbwAAAAADbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAADbwAAAAADbwAAAAADbwAAAAABbwAAAAADbwAAAAABTgAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAbwAAAAAAbwAAAAACfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAAXAAAAAADXAAAAAABXAAAAAADXAAAAAAAXAAAAAABXAAAAAADXAAAAAACXAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAeQAAAAADeQAAAAADeQAAAAAAXAAAAAACXAAAAAABTQAAAAACXAAAAAACXAAAAAAATQAAAAACXAAAAAADXAAAAAACTgAAAAAAZwAAAAACZwAAAAAAZwAAAAACTgAAAAAAeQAAAAAATQAAAAACeQAAAAAAXAAAAAACTQAAAAABXAAAAAAAXAAAAAAATQAAAAACXAAAAAAAXAAAAAACXAAAAAACTgAAAAAAZwAAAAADZwAAAAAAZwAAAAADTgAAAAAAeQAAAAADTQAAAAADeQAAAAABXAAAAAACXAAAAAADXAAAAAABXAAAAAAAXAAAAAABXAAAAAACXAAAAAACXAAAAAADTgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAeQAAAAABeQAAAAAAeQAAAAABZwAAAAACZwAAAAADTgAAAAAATgAAAAAAfAAAAAAAZwAAAAABZwAAAAADfAAAAAAATgAAAAAAZwAAAAACTgAAAAAAfAAAAAAATgAAAAAAfAAAAAAAfAAAAAAATgAAAAAAZwAAAAABZwAAAAAATgAAAAAATgAAAAAAfAAAAAAAZwAAAAABZwAAAAAAfAAAAAAATgAAAAAAZwAAAAABTgAAAAAAfAAAAAAAeQAAAAAAeQAAAAAAfAAAAAAAewAAAAAAZwAAAAABZwAAAAABZwAAAAAATgAAAAAAfAAAAAAAZwAAAAAAZwAAAAACfAAAAAAATgAAAAAAZwAAAAACTgAAAAAAfAAAAAAAeQAAAAAAeQAAAAAAfAAAAAAAewAAAAAAZwAAAAADfAAAAAAATgAAAAAATgAAAAAAfAAAAAAAZwAAAAAAZwAAAAADfAAAAAAATgAAAAAAZwAAAAAATgAAAAAAfAAAAAAAfAAAAAAAeQAAAAAAfAAAAAAAfAAAAAAAZwAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAZwAAAAADZwAAAAACTgAAAAAATgAAAAAAZwAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAZwAAAAAATgAAAAAATgAAAAAAZwAAAAAAZwAAAAADZwAAAAADZwAAAAADZwAAAAADZwAAAAABZwAAAAABZwAAAAACTgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAZwAAAAACfAAAAAAATgAAAAAAZwAAAAADZwAAAAAAZwAAAAACZwAAAAABZwAAAAADZwAAAAABZwAAAAADTgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAZwAAAAADZwAAAAABZwAAAAABZwAAAAABZwAAAAACZwAAAAACZwAAAAADZwAAAAADZwAAAAABZwAAAAABTgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAZwAAAAACZwAAAAACZwAAAAABZwAAAAAAZwAAAAABZwAAAAACZwAAAAADZwAAAAABZwAAAAADZwAAAAACTgAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAZwAAAAABfAAAAAAAZwAAAAABTgAAAAAAfAAAAAAATgAAAAAAZwAAAAAAZwAAAAACZwAAAAABZwAAAAADTgAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAA version: 6 5,0: ind: 5,0 @@ -509,11 +509,11 @@ entities: version: 6 9,0: ind: 9,0 - tiles: TwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAHgAAAAADTwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAHgAAAAADTgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATQAAAAACTQAAAAABTQAAAAADTQAAAAAATQAAAAACTQAAAAADTQAAAAABfAAAAAAAHgAAAAABHgAAAAABHgAAAAACNwAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAABHgAAAAADHgAAAAACNwAAAAAAfAAAAAAATgAAAAAATgAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAHgAAAAAAHgAAAAADTQAAAAACTQAAAAACfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAHgAAAAAAHgAAAAACTQAAAAAATQAAAAADAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAADHgAAAAADHgAAAAAAHgAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: TwAAAAAATwAAAAAATwAAAAAATwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAHgAAAAADTwAAAAAATwAAAAAATwAAAAAATwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAHgAAAAADTgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATQAAAAACTQAAAAABTQAAAAADTQAAAAAATQAAAAACTQAAAAADTQAAAAABfAAAAAAAHgAAAAABHgAAAAABHgAAAAACNwAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAABHgAAAAADHgAAAAACNwAAAAAAfAAAAAAATgAAAAAATgAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAHgAAAAAAHgAAAAADTQAAAAACTQAAAAACfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAHgAAAAAAHgAAAAACTQAAAAAATQAAAAADAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAADHgAAAAADHgAAAAAAHgAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 9,-1: ind: 9,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAHgAAAAADHgAAAAAAHgAAAAABHgAAAAABfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAHgAAAAADHgAAAAAATQAAAAAATQAAAAACNwAAAAAAfAAAAAAATgAAAAAATgAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAHgAAAAADHgAAAAAATQAAAAACTQAAAAADNwAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAATgAAAAAATgAAAAAABwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAACHgAAAAABHgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATQAAAAABTQAAAAAATQAAAAACTQAAAAACTQAAAAADTQAAAAABTQAAAAACfAAAAAAAHgAAAAADHgAAAAAAHgAAAAAB + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAHgAAAAADHgAAAAAAHgAAAAABHgAAAAABfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAHgAAAAADHgAAAAAATQAAAAAATQAAAAACNwAAAAAAfAAAAAAATgAAAAAATgAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAHgAAAAADHgAAAAAATQAAAAACTQAAAAADNwAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAATgAAAAAATgAAAAAABwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAACHgAAAAABHgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATQAAAAABTQAAAAAATQAAAAACTQAAAAACTQAAAAADTQAAAAABTQAAAAACfAAAAAAAHgAAAAADHgAAAAAAHgAAAAAB version: 6 -4,-4: ind: -4,-4 @@ -1021,6 +1021,7 @@ entities: 1216: 22,42 6265: 161,6 6266: 161,-4 + 6718: 158,1 - node: color: '#DC801DBF' id: BrickTileWhiteCornerNe @@ -1275,6 +1276,7 @@ entities: 1219: 22,39 6273: 161,-5 6280: 161,5 + 6719: 158,0 - node: color: '#DC801DBF' id: BrickTileWhiteCornerSe @@ -2871,6 +2873,16 @@ entities: 6287: 159,6 6288: 158,6 6289: 157,6 + 6720: 157,1 + 6721: 156,1 + 6722: 155,1 + 6723: 154,1 + 6724: 153,1 + 6725: 152,1 + 6726: 151,1 + 6727: 150,1 + 6728: 149,1 + 6729: 148,1 - node: color: '#DC801DBF' id: BrickTileWhiteLineN @@ -3314,6 +3326,16 @@ entities: 6292: 158,-5 6293: 159,-5 6294: 160,-5 + 6730: 148,0 + 6731: 149,0 + 6732: 150,0 + 6733: 151,0 + 6734: 152,0 + 6735: 153,0 + 6736: 154,0 + 6737: 155,0 + 6738: 156,0 + 6739: 157,0 - node: color: '#DC801DBF' id: BrickTileWhiteLineS @@ -9513,7 +9535,8 @@ entities: -6,3: 0: 65295 -6,-1: - 0: 65535 + 0: 65527 + 3: 8 -6,4: 0: 47887 -5,0: @@ -10194,10 +10217,12 @@ entities: 1: 15 0: 65280 19,1: - 0: 12543 + 0: 4351 + 3: 8192 1: 32768 19,2: - 0: 65283 + 0: 65027 + 4: 256 1: 8 19,3: 0: 30479 @@ -11217,7 +11242,7 @@ entities: 0: 140 -15,5: 0: 4369 - 3: 2048 + 5: 2048 -15,6: 0: 64735 -15,7: @@ -11225,27 +11250,27 @@ entities: -15,8: 0: 65535 -14,5: - 3: 1792 + 5: 1792 0: 8 -14,6: 0: 65535 -14,7: 0: 4383 - 4: 17408 + 6: 17408 -14,8: 0: 65297 - 4: 4 + 6: 4 -13,5: 0: 65311 -13,6: 0: 65535 -13,7: 0: 15 - 5: 4352 - 3: 17408 + 7: 4352 + 5: 17408 -13,8: - 5: 1 - 3: 4 + 7: 1 + 5: 4 0: 65280 -12,5: 0: 65280 @@ -11254,11 +11279,11 @@ entities: 0: 65535 -12,7: 0: 15 - 6: 4352 - 3: 17408 + 8: 4352 + 5: 17408 -12,8: - 6: 1 - 3: 4 + 8: 1 + 5: 4 0: 65280 -11,5: 1: 3 @@ -11267,9 +11292,9 @@ entities: 0: 65535 -11,7: 0: 52431 - 3: 4352 + 5: 4352 -11,8: - 3: 1 + 5: 1 0: 65484 -10,5: 0: 65283 @@ -12188,11 +12213,11 @@ entities: 1: 8192 37,-2: 1: 80 - 4: 57344 + 6: 57344 37,-3: 1: 32768 38,-2: - 5: 28672 + 7: 28672 38,-3: 1: 16384 39,-2: @@ -12288,6 +12313,36 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.14975 + moles: + - 21.824879 + - 82.10312 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + temperature: 293.14975 + moles: + - 20.078888 + - 75.53487 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - volume: 2500 temperature: 293.15 moles: @@ -13208,32 +13263,34 @@ entities: parent: 1 - type: DeviceList devices: - - 22156 - - 1871 - - 14228 - - 15839 - - 1560 - - 22159 - - 9293 - - 22142 - - 22171 - - 22173 - - 7030 - - 7029 - - 22055 - - 22172 - - 22174 - - 9301 - - 14185 - - 12650 - - 14169 - - 12629 - - 12628 - - 14170 - - 12638 + - 30128 + - 30129 - 14165 - - 14164 - - 12637 + - 12638 + - 14170 + - 12628 + - 12629 + - 14169 + - 12650 + - 14185 + - 9301 + - 22174 + - 22172 + - 22055 + - 7029 + - 7030 + - 22173 + - 22171 + - 22142 + - 9293 + - 22159 + - 1560 + - 15839 + - 14228 + - 1871 + - 22156 + - 30127 + - 30130 - uid: 22187 components: - type: Transform @@ -13537,19 +13594,18 @@ entities: parent: 1 - type: DeviceList devices: - - 22342 - - 22445 - - 22446 - - 22442 - - 22449 - - 13699 - - 14928 - - 14885 - - 13646 - - 14884 - - 13645 - 14838 - - 13647 + - 13645 + - 14884 + - 13646 + - 14885 + - 14928 + - 13699 + - 22449 + - 22442 + - 22446 + - 22445 + - 22342 - uid: 22456 components: - type: Transform @@ -14246,6 +14302,13 @@ entities: - type: Transform pos: 75.5,11.5 parent: 1 +- proto: AirlockArmoryLocked + entities: + - uid: 25188 + components: + - type: Transform + pos: 77.5,9.5 + parent: 1 - proto: AirlockAssembly entities: - uid: 16516 @@ -14534,13 +14597,6 @@ entities: - type: Transform pos: 140.5,1.5 parent: 1 -- proto: AirlockCorpsmanLocked - entities: - - uid: 1723 - components: - - type: Transform - pos: 75.5,8.5 - parent: 1 - proto: AirlockDetectiveLocked entities: - uid: 2539 @@ -17309,6 +17365,7 @@ entities: deviceLists: - 6959 - 4 + - 22182 - uid: 22062 components: - type: Transform @@ -17432,6 +17489,7 @@ entities: - 29641 - 513 - 6964 + - 22182 - uid: 22143 components: - type: Transform @@ -17459,11 +17517,15 @@ entities: deviceLists: - 513 - 6964 + - 22182 - uid: 22159 components: - type: Transform pos: -16.5,10.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 22182 - uid: 22160 components: - type: Transform @@ -17478,11 +17540,17 @@ entities: - type: Transform pos: -33.5,4.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 22182 - uid: 22174 components: - type: Transform pos: -16.5,-3.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 22182 - uid: 22179 components: - type: Transform @@ -17632,6 +17700,7 @@ entities: deviceLists: - 9788 - 685 + - 22450 - uid: 22353 components: - type: Transform @@ -17684,6 +17753,9 @@ entities: rot: 1.5707963267948966 rad pos: 87.5,17.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 22450 - uid: 23611 components: - type: Transform @@ -20310,6 +20382,11 @@ entities: - type: Transform pos: -20.5,19.5 parent: 1 + - uid: 25195 + components: + - type: Transform + pos: 77.5,7.5 + parent: 1 - uid: 25299 components: - type: Transform @@ -20329,10 +20406,17 @@ entities: parent: 1 - proto: BedsheetBrigmedic entities: - - uid: 25184 + - uid: 4711 components: - type: Transform - pos: 77.5,8.5 + rot: -1.5707963267948966 rad + pos: -20.5,-5.5 + parent: 1 + - uid: 25189 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -20.5,-6.5 parent: 1 - proto: BedsheetCaptain entities: @@ -20653,6 +20737,13 @@ entities: - type: Transform pos: -20.5,19.5 parent: 1 +- proto: BedsheetWarden + entities: + - uid: 25182 + components: + - type: Transform + pos: 77.5,7.5 + parent: 1 - proto: BenchBlueComfy entities: - uid: 29714 @@ -20858,10 +20949,6 @@ entities: - type: Transform pos: 137.5,-1.5 parent: 1 - - type: DeviceLinkSource - linkedPorts: - 30107: - - DoorStatus: Toggle - uid: 16133 components: - type: Transform @@ -20917,6 +21004,8 @@ entities: - type: Transform pos: 135.5,-1.5 parent: 1 + - type: WirelessNetworkConnection + range: 2000 - type: DeviceLinkSink invokeCounter: 1 - uid: 30108 @@ -20931,10 +21020,6 @@ entities: - type: Transform pos: 138.5,3.5 parent: 1 - - type: DeviceLinkSource - linkedPorts: - 30108: - - DoorStatus: Toggle - uid: 30110 components: - type: Transform @@ -22272,6 +22357,11 @@ entities: rot: 1.5707963267948966 rad pos: 68.5,-2.5 parent: 1 + - uid: 29045 + components: + - type: Transform + pos: 64.5,-1.5 + parent: 1 - proto: ButtonFrameJanitor entities: - uid: 12982 @@ -22579,6 +22669,11 @@ entities: - type: Transform pos: -1.5,-5.5 parent: 1 + - uid: 1723 + components: + - type: Transform + pos: 77.5,9.5 + parent: 1 - uid: 1801 components: - type: Transform @@ -34979,6 +35074,11 @@ entities: - type: Transform pos: 22.5,14.5 parent: 1 + - uid: 22570 + components: + - type: Transform + pos: 77.5,10.5 + parent: 1 - uid: 22618 components: - type: Transform @@ -36514,16 +36614,6 @@ entities: - type: Transform pos: -3.5,53.5 parent: 1 - - uid: 25195 - components: - - type: Transform - pos: 74.5,8.5 - parent: 1 - - uid: 25196 - components: - - type: Transform - pos: 75.5,8.5 - parent: 1 - uid: 25221 components: - type: Transform @@ -60148,24 +60238,6 @@ entities: rot: 3.141592653589793 rad pos: 86.5,17.5 parent: 1 - - uid: 5122 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -23.5,-6.5 - parent: 1 - - uid: 5124 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -22.5,-6.5 - parent: 1 - - uid: 5125 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -21.5,-6.5 - parent: 1 - uid: 5301 components: - type: Transform @@ -61370,6 +61442,11 @@ entities: rot: -1.5707963267948966 rad pos: 78.735176,31.755037 parent: 1 + - uid: 28472 + components: + - type: Transform + pos: -20.502268,-4.4860387 + parent: 1 - uid: 28517 components: - type: Transform @@ -61738,11 +61815,6 @@ entities: rot: -1.5707963267948966 rad pos: 46.583893,8.237314 parent: 1 - - uid: 25181 - components: - - type: Transform - pos: 76.5,8.5 - parent: 1 - uid: 28708 components: - type: Transform @@ -65066,20 +65138,6 @@ entities: rot: -1.5707963267948966 rad pos: 20.695349,-10.445904 parent: 1 -- proto: ClothingUniformJumpsuitSecGrey - entities: - - uid: 22570 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -20.430426,-2.3343182 - parent: 1 - - uid: 22571 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -20.472092,-2.5219486 - parent: 1 - proto: ClothingUniformJumpsuitTshirtJeans entities: - uid: 7576 @@ -65189,6 +65247,12 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,49.5 parent: 1 + - uid: 5105 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 76.5,8.5 + parent: 1 - uid: 5242 components: - type: Transform @@ -65614,17 +65678,17 @@ entities: rot: -1.5707963267948966 rad pos: 122.5,-0.5 parent: 1 - - uid: 25180 + - uid: 28837 components: - type: Transform rot: 3.141592653589793 rad - pos: 76.5,7.5 + pos: 166.5,-2.5 parent: 1 - - uid: 28837 + - uid: 30119 components: - type: Transform - rot: 3.141592653589793 rad - pos: 166.5,-2.5 + rot: 1.5707963267948966 rad + pos: -22.5,-5.5 parent: 1 - proto: ComputerCriminalRecords entities: @@ -67797,10 +67861,10 @@ entities: parent: 1 - proto: DefaultStationBeaconCorpsman entities: - - uid: 26621 + - uid: 30131 components: - type: Transform - pos: 76.5,7.5 + pos: -22.5,-5.5 parent: 1 - proto: DefaultStationBeaconCourtroom entities: @@ -68243,15 +68307,10 @@ entities: parent: 1 - proto: DeployableBarrier entities: - - uid: 5121 - components: - - type: Transform - pos: -24.5,-4.5 - parent: 1 - - uid: 5123 + - uid: 4772 components: - type: Transform - pos: -23.5,-4.5 + pos: -20.5,-2.5 parent: 1 - uid: 9306 components: @@ -68288,6 +68347,11 @@ entities: - type: Transform pos: 94.5,0.5 parent: 1 + - uid: 25183 + components: + - type: Transform + pos: -20.5,-3.5 + parent: 1 - uid: 28085 components: - type: Transform @@ -78315,10 +78379,10 @@ entities: parent: 1 - proto: DresserWardenFilled entities: - - uid: 6778 + - uid: 5124 components: - type: Transform - pos: 77.5,10.5 + pos: 76.5,7.5 parent: 1 - proto: Drill entities: @@ -82273,11 +82337,17 @@ entities: - type: Transform pos: -26.5,6.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 22182 - uid: 22172 components: - type: Transform pos: -26.5,1.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 22182 - uid: 22189 components: - type: Transform @@ -83232,11 +83302,17 @@ entities: - type: Transform pos: -14.5,2.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 22182 - uid: 1871 components: - type: Transform pos: -14.5,5.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 22182 - uid: 2117 components: - type: Transform @@ -83403,11 +83479,17 @@ entities: - type: Transform pos: -28.5,3.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 22182 - uid: 7030 components: - type: Transform pos: -28.5,4.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 22182 - uid: 7032 components: - type: Transform @@ -83719,6 +83801,9 @@ entities: - type: Transform pos: -17.5,6.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 22182 - uid: 9294 components: - type: Transform @@ -83754,6 +83839,9 @@ entities: - type: Transform pos: -16.5,1.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 22182 - uid: 9302 components: - type: Transform @@ -83802,6 +83890,9 @@ entities: - type: Transform pos: -14.5,4.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 22182 - uid: 14388 components: - type: Transform @@ -83850,6 +83941,9 @@ entities: - type: Transform pos: -14.5,3.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 22182 - uid: 16866 components: - type: Transform @@ -84098,11 +84192,17 @@ entities: - type: Transform pos: 75.5,17.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 22450 - uid: 22446 components: - type: Transform pos: 75.5,11.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 22450 - uid: 22447 components: - type: Transform @@ -84130,6 +84230,7 @@ entities: deviceLists: - 9788 - 685 + - 22450 - uid: 22455 components: - type: Transform @@ -87016,6 +87117,12 @@ entities: rot: 3.141592653589793 rad pos: 152.5,-4.5 parent: 1 + - uid: 29799 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 154.5,-6.5 + parent: 1 - proto: GasPipeBend entities: - uid: 254 @@ -91373,6 +91480,14 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 30125 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -21.5,-5.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' - proto: GasPipeFourway entities: - uid: 904 @@ -91431,6 +91546,13 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 12640 + components: + - type: Transform + pos: 151.5,1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 13343 components: - type: Transform @@ -93043,6 +93165,21 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 5120 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -23.5,-5.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 5127 + components: + - type: Transform + pos: 77.5,9.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 5231 components: - type: Transform @@ -96792,17 +96929,19 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 12640 + - uid: 12637 components: - type: Transform - pos: -23.5,-4.5 + rot: 3.141592653589793 rad + pos: 73.5,8.5 parent: 1 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12641 components: - type: Transform - pos: -23.5,-3.5 + rot: 3.141592653589793 rad + pos: -23.5,-4.5 parent: 1 - type: AtmosPipeColor color: '#0335FCFF' @@ -100524,6 +100663,13 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 13647 + components: + - type: Transform + pos: 77.5,10.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 13648 components: - type: Transform @@ -100578,14 +100724,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 13655 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 76.5,11.5 - parent: 1 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 13656 components: - type: Transform @@ -102749,6 +102887,14 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 14164 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -23.5,-3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 14171 components: - type: Transform @@ -102845,14 +102991,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 14183 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -21.5,-4.5 - parent: 1 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 14186 components: - type: Transform @@ -111718,6 +111856,14 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 22571 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -22.5,-6.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 22592 components: - type: Transform @@ -113029,30 +113175,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 25189 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 76.5,8.5 - parent: 1 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 25190 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 75.5,8.5 - parent: 1 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 25191 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 74.5,8.5 - parent: 1 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 25192 components: - type: Transform @@ -118013,22 +118135,13 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 29070 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 141.5,1.5 - parent: 1 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 29071 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 141.5,0.5 + pos: 151.5,0.5 parent: 1 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#0335FCFF' - uid: 29072 components: - type: Transform @@ -118524,14 +118637,16 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 29142 + components: + - type: Transform + pos: 154.5,-4.5 + parent: 1 - uid: 29448 components: - type: Transform - rot: 3.141592653589793 rad - pos: 151.5,-0.5 + pos: 154.5,-5.5 parent: 1 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 29556 components: - type: Transform @@ -118930,6 +119045,14 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 30126 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -22.5,-5.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' - proto: GasPipeTJunction entities: - uid: 253 @@ -119163,14 +119286,29 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 5183 + - uid: 5121 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 73.5,8.5 + rot: 3.141592653589793 rad + pos: -23.5,-6.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 5122 + components: + - type: Transform + pos: 76.5,11.5 parent: 1 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 5123 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -21.5,-4.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 5563 components: - type: Transform @@ -122128,14 +122266,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 29045 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 151.5,1.5 - parent: 1 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 29046 components: - type: Transform @@ -122597,6 +122727,22 @@ entities: open: False - type: AtmosPipeColor color: '#FF1212FF' + - uid: 5183 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 141.5,1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 5589 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 141.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 6477 components: - type: Transform @@ -122615,6 +122761,15 @@ entities: open: False - type: AtmosPipeColor color: '#B266FFFF' + - uid: 6778 + components: + - type: Transform + pos: 151.5,-0.5 + parent: 1 + - type: GasValve + open: False + - type: AtmosPipeColor + color: '#0335FCFF' - proto: GasVentPump entities: - uid: 59 @@ -122674,6 +122829,14 @@ entities: - 9433 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 5106 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 77.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 6721 components: - type: Transform @@ -123080,6 +123243,9 @@ entities: rot: 3.141592653589793 rad pos: -23.5,7.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 22182 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12629 @@ -123087,14 +123253,9 @@ entities: - type: Transform pos: -23.5,11.5 parent: 1 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 12637 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -23.5,-5.5 - parent: 1 + - type: DeviceNetwork + deviceLists: + - 22182 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12638 @@ -123103,6 +123264,9 @@ entities: rot: -1.5707963267948966 rad pos: -22.5,-2.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 22182 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12650 @@ -123111,6 +123275,9 @@ entities: rot: 3.141592653589793 rad pos: -22.5,4.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 22182 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12676 @@ -123716,6 +123883,9 @@ entities: rot: -1.5707963267948966 rad pos: 83.5,11.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 22450 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13646 @@ -123723,13 +123893,16 @@ entities: - type: Transform pos: 80.5,15.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 22450 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 13647 + - uid: 13655 components: - type: Transform rot: 3.141592653589793 rad - pos: 77.5,10.5 + pos: 76.5,10.5 parent: 1 - type: AtmosPipeColor color: '#0335FCFF' @@ -123747,6 +123920,9 @@ entities: rot: -1.5707963267948966 rad pos: 77.5,16.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 22450 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13700 @@ -124218,14 +124394,6 @@ entities: - 26192 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 25188 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 77.5,8.5 - parent: 1 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 25331 components: - type: Transform @@ -124809,6 +124977,28 @@ entities: - 1163 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 30127 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -21.5,-6.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 22182 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 30128 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -24.5,-6.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 22182 + - type: AtmosPipeColor + color: '#0335FCFF' - proto: GasVentScrubber entities: - uid: 642 @@ -125189,20 +125379,15 @@ entities: parent: 1 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 14164 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -21.5,-5.5 - parent: 1 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 14165 components: - type: Transform rot: 1.5707963267948966 rad pos: -22.5,-3.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 22182 - type: AtmosPipeColor color: '#FF1212FF' - uid: 14169 @@ -125210,6 +125395,9 @@ entities: - type: Transform pos: -21.5,11.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 22182 - type: AtmosPipeColor color: '#FF1212FF' - uid: 14170 @@ -125218,6 +125406,9 @@ entities: rot: 3.141592653589793 rad pos: -21.5,7.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 22182 - type: AtmosPipeColor color: '#FF1212FF' - uid: 14185 @@ -125225,6 +125416,9 @@ entities: - type: Transform pos: -22.5,3.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 22182 - type: AtmosPipeColor color: '#FF1212FF' - uid: 14195 @@ -125477,6 +125671,9 @@ entities: rot: -1.5707963267948966 rad pos: 79.5,12.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 22450 - type: AtmosPipeColor color: '#FF1212FF' - uid: 14839 @@ -125516,6 +125713,9 @@ entities: rot: 3.141592653589793 rad pos: 83.5,12.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 22450 - type: AtmosPipeColor color: '#FF1212FF' - uid: 14885 @@ -125524,6 +125724,9 @@ entities: rot: 1.5707963267948966 rad pos: 82.5,17.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 22450 - type: AtmosPipeColor color: '#FF1212FF' - uid: 14886 @@ -125554,6 +125757,9 @@ entities: rot: -1.5707963267948966 rad pos: 77.5,17.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 22450 - type: AtmosPipeColor color: '#FF1212FF' - uid: 14943 @@ -126983,6 +127189,28 @@ entities: - 1163 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 30129 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -23.5,-5.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 22182 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 30130 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -22.5,-4.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 22182 + - type: AtmosPipeColor + color: '#FF1212FF' - proto: GasVolumePump entities: - uid: 274 @@ -131299,6 +131527,11 @@ entities: - type: Transform pos: -73.5,-0.5 parent: 1 + - uid: 14183 + components: + - type: Transform + pos: 76.5,6.5 + parent: 1 - uid: 14241 components: - type: Transform @@ -131629,11 +131862,6 @@ entities: - type: Transform pos: 74.5,-16.5 parent: 1 - - uid: 17164 - components: - - type: Transform - pos: 76.5,6.5 - parent: 1 - uid: 17306 components: - type: Transform @@ -134937,6 +135165,13 @@ entities: - type: Transform pos: 105.5,-12.5 parent: 1 +- proto: HolopadEngineeringAME + entities: + - uid: 30132 + components: + - type: Transform + pos: -46.5,-17.5 + parent: 1 - proto: HolopadEngineeringAtmosMain entities: - uid: 29462 @@ -135161,6 +135396,13 @@ entities: - type: Transform pos: 82.5,14.5 parent: 1 +- proto: HolopadSecurityArrivalsCheckpoint + entities: + - uid: 25190 + components: + - type: Transform + pos: 12.5,-31.5 + parent: 1 - proto: HolopadSecurityBreakroom entities: - uid: 29467 @@ -135168,6 +135410,13 @@ entities: - type: Transform pos: 87.5,16.5 parent: 1 +- proto: HolopadSecurityCorpsman + entities: + - uid: 5118 + components: + - type: Transform + pos: -21.5,-5.5 + parent: 1 - proto: HolopadSecurityCourtroom entities: - uid: 29480 @@ -135266,6 +135515,13 @@ entities: - type: Transform pos: 25.5,-33.5 parent: 1 +- proto: HolopadServiceGameRoom + entities: + - uid: 17164 + components: + - type: Transform + pos: 3.5,-14.5 + parent: 1 - proto: HolopadServiceJanitor entities: - uid: 29494 @@ -135294,13 +135550,6 @@ entities: - type: Transform pos: 40.5,-10.5 parent: 1 -- proto: HolopadServiceToolroom - entities: - - uid: 29799 - components: - - type: Transform - pos: 3.5,-14.5 - parent: 1 - proto: HoloprojectorSecurity entities: - uid: 7401 @@ -136864,28 +137113,49 @@ entities: - Pressed: Toggle 28178: - Pressed: Toggle - - uid: 28138 + - uid: 25186 components: - type: Transform - rot: 3.141592653589793 rad - pos: 166.5,0.5 + rot: 1.5707963267948966 rad + pos: 156.5,-0.5 parent: 1 - type: DeviceLinkSource linkedPorts: - 30102: + 29141: - Pressed: Toggle - 30101: + 29140: - Pressed: Toggle - 30100: + 29139: - Pressed: Toggle - 30111: + 29138: - Pressed: Toggle - 30110: + 30107: + - Pressed: Toggle + 30108: - Pressed: Toggle 30109: - Pressed: Toggle 14965: - Pressed: Toggle + 30111: + - Pressed: Toggle + 30110: + - Pressed: Toggle + - uid: 28138 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 166.5,0.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 30102: + - Pressed: Toggle + 30101: + - Pressed: Toggle + 30100: + - Pressed: Toggle + 30108: [] - proto: LockableButtonRobotics entities: - uid: 28550 @@ -136976,10 +137246,10 @@ entities: ent: null - proto: LockerBrigmedicFilledHardsuit entities: - - uid: 25183 + - uid: 30124 components: - type: Transform - pos: 77.5,7.5 + pos: -22.5,-4.5 parent: 1 - proto: LockerCaptainFilledNoLaser entities: @@ -137091,15 +137361,10 @@ entities: parent: 1 - proto: LockerEvidence entities: - - uid: 5119 - components: - - type: Transform - pos: -20.478746,-3.1434608 - parent: 1 - - uid: 5120 + - uid: 5107 components: - type: Transform - pos: -20.478746,-4.071189 + pos: -24.666817,-4.2662525 parent: 1 - uid: 9313 components: @@ -137736,6 +138001,26 @@ entities: - type: Transform pos: 76.5,10.5 parent: 1 + - type: Lock + locked: False + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14673 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - proto: LockerWeldingSuppliesFilled entities: - uid: 6388 @@ -138871,6 +139156,16 @@ entities: parent: 1 - proto: MedicalBed entities: + - uid: 1767 + components: + - type: Transform + pos: -20.5,-6.5 + parent: 1 + - uid: 2677 + components: + - type: Transform + pos: -20.5,-5.5 + parent: 1 - uid: 3163 components: - type: Transform @@ -138901,11 +139196,6 @@ entities: - type: Transform pos: 58.5,-7.5 parent: 1 - - uid: 25182 - components: - - type: Transform - pos: 77.5,8.5 - parent: 1 - uid: 29268 components: - type: Transform @@ -138942,12 +139232,12 @@ entities: parent: 1 - proto: MedicatedSuture entities: - - uid: 28473 + - uid: 30114 components: - type: Transform - parent: 28472 - - type: Physics - canCollide: False + rot: 1.5707963267948966 rad + pos: -22.450184,-6.476698 + parent: 1 - proto: MedkitAdvancedFilled entities: - uid: 3496 @@ -140533,6 +140823,13 @@ entities: rot: -1.5707963267948966 rad pos: -29.48827,38.71972 parent: 1 + - uid: 25179 + components: + - type: Transform + pos: 25.418808,42.739098 + parent: 1 + - type: Paper + content: "Test Log #979\n\nAttempt to make fully sentient slime.\n\nComponents:\n - 20u slime\n - 10u weh juice\n - 4u happiness\n - 1 slime core\n\nMethod: Mixing liquids at room temperature. Injecting mixture into core.\n\nSuccess: Negative\n\nNotes: I feel like I'm close. All previous tests have indicated the components are correct. However, it seems we've been missing a step. \n\nSynopsis: Further testing and analysis needed. " - uid: 25573 components: - type: Transform @@ -142097,6 +142394,14 @@ entities: - type: Transform pos: -58.5,1.5 parent: 1 +- proto: PosterContrabandBorgFancyv2 + entities: + - uid: 4771 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 76.5,9.5 + parent: 1 - proto: PosterContrabandBountyHunters entities: - uid: 20105 @@ -142697,10 +143002,10 @@ entities: parent: 1 - proto: PottedPlant8 entities: - - uid: 4711 + - uid: 30115 components: - type: Transform - pos: 59.516224,16.589823 + pos: 60.265957,22.364315 parent: 1 - proto: PottedPlantBioluminscent entities: @@ -145974,6 +146279,12 @@ entities: parent: 1 - type: ApcPowerReceiver powerLoad: 0 + - uid: 5119 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 76.5,8.5 + parent: 1 - uid: 5259 components: - type: Transform @@ -146523,11 +146834,6 @@ entities: - type: Transform pos: -17.5,-41.5 parent: 1 - - uid: 25186 - components: - - type: Transform - pos: 77.5,8.5 - parent: 1 - uid: 25227 components: - type: Transform @@ -147495,12 +147801,6 @@ entities: - type: Transform pos: 84.5,17.5 parent: 1 - - uid: 5118 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -20.5,-2.5 - parent: 1 - uid: 5249 components: - type: Transform @@ -154203,11 +154503,6 @@ entities: - type: Transform pos: 64.5,-1.5 parent: 1 - - uid: 5589 - components: - - type: Transform - pos: 70.5,-1.5 - parent: 1 - uid: 5592 components: - type: Transform @@ -155903,11 +156198,6 @@ entities: - type: Transform pos: 75.5,0.5 parent: 1 - - uid: 25179 - components: - - type: Transform - pos: 76.5,6.5 - parent: 1 - uid: 25468 components: - type: Transform @@ -157005,6 +157295,13 @@ entities: - type: Transform pos: 71.5,37.5 parent: 1 +- proto: SentientSmileCore + entities: + - uid: 23774 + components: + - type: Transform + pos: 25.5,42.5 + parent: 1 - proto: ShardGlass entities: - uid: 5401 @@ -157670,23 +157967,6 @@ entities: - type: Transform pos: 59.5,-19.5 parent: 1 - - uid: 28472 - components: - - type: Transform - pos: 77.5,9.5 - parent: 1 - - type: Storage - storedItems: - 28473: - position: 0,0 - _rotation: East - - type: ContainerContainer - containers: - storagebase: !type:Container - showEnts: False - occludes: True - ents: - - 28473 - proto: ShelfRGlass entities: - uid: 22094 @@ -158273,6 +158553,16 @@ entities: linkedPorts: 25833: - Pressed: Toggle + - uid: 25180 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 78.5,8.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 5119: + - Pressed: Toggle - uid: 25800 components: - type: MetaData @@ -158351,22 +158641,15 @@ entities: linkedPorts: 22428: - Pressed: Toggle - - uid: 29142 + - uid: 29070 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 156.5,-0.5 + pos: 64.5,-1.5 parent: 1 - type: DeviceLinkSource linkedPorts: - 29138: - - Pressed: Toggle - 29139: - - Pressed: Toggle - 29140: - - Pressed: Toggle - 29141: - - Pressed: Toggle + 5594: + - Pressed: Open - proto: SignalControlledValve entities: - uid: 28991 @@ -158485,15 +158768,6 @@ entities: linkedPorts: 5798: - Status: Toggle - - uid: 2677 - components: - - type: Transform - pos: 76.5,9.5 - parent: 1 - - type: DeviceLinkSource - linkedPorts: - 25186: - - Status: Toggle - uid: 2907 components: - type: Transform @@ -160788,12 +161062,6 @@ entities: - type: Transform pos: 35.5,24.5 parent: 1 - - uid: 5127 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -20.5,-5.5 - parent: 1 - uid: 7067 components: - type: Transform @@ -161886,13 +162154,6 @@ entities: - type: Transform pos: -0.5,24.5 parent: 1 -- proto: SpawnMobSmile - entities: - - uid: 23774 - components: - - type: Transform - pos: 25.5,42.5 - parent: 1 - proto: SpawnMobWalter entities: - uid: 22755 @@ -162028,10 +162289,22 @@ entities: parent: 1 - proto: SpawnPointBrigmedic entities: - - uid: 25185 + - uid: 30117 components: - type: Transform - pos: 76.5,8.5 + rot: -1.5707963267948966 rad + pos: -20.5,-5.5 + parent: 1 + - uid: 30118 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -20.5,-6.5 + parent: 1 + - uid: 30133 + components: + - type: Transform + pos: 5.5,-46.5 parent: 1 - proto: SpawnPointCaptain entities: @@ -162772,6 +163045,11 @@ entities: - type: Transform pos: -0.5,-46.5 parent: 1 + - uid: 30134 + components: + - type: Transform + pos: 26.5,-43.5 + parent: 1 - proto: SpawnPointProsecutor entities: - uid: 28384 @@ -163553,6 +163831,11 @@ entities: rot: 1.5707963267948966 rad pos: 100.5,1.5 parent: 1 + - uid: 25196 + components: + - type: Transform + pos: -23.5,-6.5 + parent: 1 - uid: 26290 components: - type: Transform @@ -163563,6 +163846,11 @@ entities: - type: Transform pos: 80.5,34.5 parent: 1 + - uid: 30113 + components: + - type: Transform + pos: -24.5,-6.5 + parent: 1 - proto: Stool entities: - uid: 13062 @@ -166930,6 +167218,12 @@ entities: - type: Transform pos: 102.5,-19.5 parent: 1 + - uid: 26621 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -22.5,-6.5 + parent: 1 - uid: 28857 components: - type: Transform @@ -169469,6 +169763,16 @@ entities: - type: Transform pos: 61.5,-18.5 parent: 1 + - uid: 25184 + components: + - type: Transform + pos: 70.5,-1.5 + parent: 1 + - uid: 25185 + components: + - type: Transform + pos: 76.5,6.5 + parent: 1 - proto: ToiletDirtyWater entities: - uid: 4366 @@ -170392,6 +170696,13 @@ entities: - type: Transform pos: 4.5,25.5 parent: 1 +- proto: VendingMachineDetDrobe + entities: + - uid: 25181 + components: + - type: Transform + pos: 59.5,16.5 + parent: 1 - proto: VendingMachineDinnerware entities: - uid: 988 @@ -176292,16 +176603,6 @@ entities: - type: Transform pos: 75.5,9.5 parent: 1 - - uid: 4771 - components: - - type: Transform - pos: 76.5,9.5 - parent: 1 - - uid: 4772 - components: - - type: Transform - pos: 77.5,9.5 - parent: 1 - uid: 4773 components: - type: Transform @@ -177097,6 +177398,11 @@ entities: - type: Transform pos: 47.5,-21.5 parent: 1 + - uid: 5125 + components: + - type: Transform + pos: 75.5,8.5 + parent: 1 - uid: 5271 components: - type: Transform @@ -190979,6 +191285,11 @@ entities: - type: Transform pos: 0.5,-11.5 parent: 1 + - uid: 25191 + components: + - type: Transform + pos: 76.5,9.5 + parent: 1 - uid: 25308 components: - type: Transform @@ -192497,6 +192808,13 @@ entities: rot: -1.5707963267948966 rad pos: 108.5,8.5 parent: 1 +- proto: WindoorSecureCorpsmanLocked + entities: + - uid: 30120 + components: + - type: Transform + pos: -21.5,-3.5 + parent: 1 - proto: WindoorSecureEngineeringLocked entities: - uid: 2519 @@ -192674,18 +192992,13 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -179934.36 + secondsUntilStateChange: -187062.5 state: Opening - uid: 5096 components: - type: Transform pos: -21.5,1.5 parent: 1 - - uid: 5106 - components: - - type: Transform - pos: -22.5,-4.5 - parent: 1 - uid: 5315 components: - type: Transform @@ -192696,7 +193009,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -179934.36 + secondsUntilStateChange: -187062.5 state: Opening - uid: 5498 components: @@ -192712,7 +193025,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -179657.98 + secondsUntilStateChange: -186786.12 state: Opening - uid: 8696 components: @@ -192745,7 +193058,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -179656.1 + secondsUntilStateChange: -186784.23 state: Opening - uid: 18835 components: @@ -192757,7 +193070,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -179653.1 + secondsUntilStateChange: -186781.23 state: Opening - uid: 23917 components: @@ -192765,6 +193078,11 @@ entities: rot: -1.5707963267948966 rad pos: 71.5,24.5 parent: 1 + - uid: 28473 + components: + - type: Transform + pos: -23.5,-4.5 + parent: 1 - proto: WindoorServiceLocked entities: - uid: 3258 @@ -194039,11 +194357,6 @@ entities: rot: -1.5707963267948966 rad pos: 113.5,0.5 parent: 1 - - uid: 1767 - components: - - type: Transform - pos: -21.5,-4.5 - parent: 1 - uid: 2040 components: - type: Transform @@ -194139,16 +194452,6 @@ entities: rot: -1.5707963267948966 rad pos: 113.5,6.5 parent: 1 - - uid: 5105 - components: - - type: Transform - pos: -20.5,-4.5 - parent: 1 - - uid: 5107 - components: - - type: Transform - pos: -23.5,-4.5 - parent: 1 - uid: 5108 components: - type: Transform @@ -194392,6 +194695,34 @@ entities: rot: 1.5707963267948966 rad pos: 64.5,-4.5 parent: 1 + - uid: 30112 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -22.5,-6.5 + parent: 1 + - uid: 30116 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -22.5,-5.5 + parent: 1 + - uid: 30121 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -22.5,-4.5 + parent: 1 + - uid: 30122 + components: + - type: Transform + pos: -20.5,-3.5 + parent: 1 + - uid: 30123 + components: + - type: Transform + pos: -22.5,-3.5 + parent: 1 - proto: WindowTintedDirectional entities: - uid: 1854 diff --git a/Resources/Prototypes/Maps/tortuga.yml b/Resources/Prototypes/Maps/tortuga.yml index eb40a6290c40..1893693cf08b 100644 --- a/Resources/Prototypes/Maps/tortuga.yml +++ b/Resources/Prototypes/Maps/tortuga.yml @@ -2,7 +2,7 @@ id: Tortuga mapName: 'Tortuga' mapPath: /Maps/tortuga.yml - minPlayers: 50 + minPlayers: 40 stations: Tortuga: stationProto: StandardNanotrasenStation diff --git a/Resources/Prototypes/_DV/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/_DV/Entities/Structures/Doors/Windoors/windoor.yml index 3a144cdc2024..07a37c230c5b 100644 --- a/Resources/Prototypes/_DV/Entities/Structures/Doors/Windoors/windoor.yml +++ b/Resources/Prototypes/_DV/Entities/Structures/Doors/Windoors/windoor.yml @@ -88,6 +88,15 @@ containers: board: [ DoorElectronicsRobotics ] +- type: entity + parent: WindoorSecure + id: WindoorSecureSurgeryLocked + suffix: Surgery, Locked + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsSurgery ] + #Add windoors from upstream roles - type: entity parent: WindoorSecure From cac28c6336496d0bdd49f0e473bf27211345421c Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Thu, 16 Jan 2025 13:43:58 +0100 Subject: [PATCH 133/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 706c7944489e..15f5ecb4bd1e 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: deltanedas - changes: - - message: Fixed shipyard. - type: Fix - id: 419 - time: '2024-07-03T15:34:06.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1458 - author: Batuh1n changes: - message: 3 additions to the jukebox from SS13 musics @@ -3862,3 +3855,10 @@ id: 918 time: '2025-01-16T12:37:56.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2672 +- author: deltanedas + changes: + - message: Merged last week's changes from upstream. + type: Add + id: 919 + time: '2025-01-16T12:43:39.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2709 From 181da2a88a6d899d51f04c1d705971155b6c405e Mon Sep 17 00:00:00 2001 From: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Thu, 16 Jan 2025 23:49:03 +1100 Subject: [PATCH 134/205] Security loadouts rubber magazines (#2659) * Added rubber versions to SLP57 and Pollock and exchanging them with the loadouts to reflect how it was prior to sec sidearm loadouts (Revolvers unchanged) * conventions --- .../Objects/Weapons/Guns/Pistols/pistols.yml | 48 +++++++++++++++++++ .../Jobs/Security/security_officer.yml | 6 +-- 2 files changed, 51 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index f659db18f600..eabea9783e62 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -214,3 +214,51 @@ - type: GuideHelp guides: - Cargo + +- type: entity + parent: WeaponPistolPollock + id: WeaponPistolPollockNonlethal + suffix: Non-lethal + components: + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazinePistolRubber + insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg + priority: 2 + whitelist: + tags: + - MagazinePistol + gun_chamber: + name: Chamber + startingItem: CartridgePistolRubber + priority: 1 + whitelist: + tags: + - CartridgePistol + +- type: entity + parent: WeaponPistolSLP57 + id: WeaponPistolSLP57Nonlethal + suffix: Non-lethal + components: + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazinePistolRubber + insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg + priority: 2 + whitelist: + tags: + - MagazinePistol + gun_chamber: + name: Chamber + startingItem: CartridgePistolRubber + priority: 1 + whitelist: + tags: + - CartridgePistol diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Security/security_officer.yml index 842c91026b10..fd4a458b25b1 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Security/security_officer.yml @@ -3,17 +3,17 @@ - type: loadout id: SecurityFirearmWeaponPistolPollock equipment: - pocket1: WeaponPistolPollock + pocket1: WeaponPistolPollockNonlethal - type: loadout id: SecurityFirearmWeaponPistolSLP57 equipment: - pocket1: WeaponPistolSLP57 + pocket1: WeaponPistolSLP57Nonlethal - type: loadout id: SecurityFirearmWeaponPistolMk58 equipment: - pocket1: WeaponPistolMk58 + pocket1: WeaponPistolMk58Nonlethal - type: loadout id: SecurityFirearmWeaponDisabler From a47328ddea210868bb71a7ed04371b07d1dbc57f Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Thu, 16 Jan 2025 13:49:23 +0100 Subject: [PATCH 135/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 15f5ecb4bd1e..42abf79570f8 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Batuh1n - changes: - - message: 3 additions to the jukebox from SS13 musics - type: Add - id: 420 - time: '2024-07-05T21:42:00.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1361 - author: DLondon changes: - message: Removed "Steal The Clown Medal" thief objective @@ -3862,3 +3855,10 @@ id: 919 time: '2025-01-16T12:43:39.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2709 +- author: BlitzTheSquishy + changes: + - message: Security's autoloading sidearms are once again loaded with rubber bullets + type: Tweak + id: 920 + time: '2025-01-16T12:49:04.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2659 From 9ab8cef8c71cc7bbbaa0f6baa80254ae503ae2b3 Mon Sep 17 00:00:00 2001 From: beck-thompson <107373427+beck-thompson@users.noreply.github.com> Date: Thu, 16 Jan 2025 04:52:00 -0800 Subject: [PATCH 136/205] Subvert AI objective (#2643) * First commit * fix * bruh * Better lawset * delta v boss --------- Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> --- .../Silicons/Laws/SiliconLawSystem.cs | 2 + .../AILawsUpdatedRequirementComponent.cs | 14 +++++ .../Objectives/Events/AILawUpdatedEvent.cs | 9 ++++ .../Systems/AILawsUpdatedRequirementSystem.cs | 54 +++++++++++++++++++ .../Locale/en-US/_DV/station-laws/laws.ftl | 5 ++ .../Locale/en-US/_DV/store/uplink-catalog.ftl | 3 ++ .../Prototypes/Objectives/objectiveGroups.yml | 1 + .../Prototypes/_DV/Catalog/uplink_catalog.yml | 19 +++++++ .../_DV/Entities/Mobs/Player/silicon.yml | 12 +++++ .../_DV/Objectives/objectiveGroups.yml | 5 ++ .../Prototypes/_DV/Objectives/traitor.yml | 24 ++++++++- Resources/Prototypes/_DV/siliconlaws.yml | 29 ++++++++++ 12 files changed, 176 insertions(+), 1 deletion(-) create mode 100644 Content.Server/_DV/Objectives/Components/AILawsUpdatedRequirementComponent.cs create mode 100644 Content.Server/_DV/Objectives/Events/AILawUpdatedEvent.cs create mode 100644 Content.Server/_DV/Objectives/Systems/AILawsUpdatedRequirementSystem.cs diff --git a/Content.Server/Silicons/Laws/SiliconLawSystem.cs b/Content.Server/Silicons/Laws/SiliconLawSystem.cs index 4e0bb6d596c5..2bff34a5ad8c 100644 --- a/Content.Server/Silicons/Laws/SiliconLawSystem.cs +++ b/Content.Server/Silicons/Laws/SiliconLawSystem.cs @@ -1,4 +1,5 @@ using System.Linq; +using Content.Server._DV.Objectives.Events; // DeltaV using Content.Server.Administration; using Content.Server.Chat.Managers; using Content.Server.Radio.Components; @@ -317,6 +318,7 @@ protected override void OnUpdaterInsert(Entity ent, while (query.MoveNext(out var update)) { SetLaws(lawset, update, provider.LawUploadSound); + RaiseLocalEvent(new AILawUpdatedEvent(update, provider.Laws)); // DeltaV } } } diff --git a/Content.Server/_DV/Objectives/Components/AILawsUpdatedRequirementComponent.cs b/Content.Server/_DV/Objectives/Components/AILawsUpdatedRequirementComponent.cs new file mode 100644 index 000000000000..d7122095b1a7 --- /dev/null +++ b/Content.Server/_DV/Objectives/Components/AILawsUpdatedRequirementComponent.cs @@ -0,0 +1,14 @@ +using Content.Shared.Silicons.Laws; +using Robust.Shared.Prototypes; + +namespace Content.Server._DV.Objectives.Components; + +[RegisterComponent] +public sealed partial class AILawsUpdatedRequirementComponent : Component +{ + /// + /// The lawset that is needed to complete the objective. + /// + [DataField(required: true)] + public ProtoId Lawset; +} diff --git a/Content.Server/_DV/Objectives/Events/AILawUpdatedEvent.cs b/Content.Server/_DV/Objectives/Events/AILawUpdatedEvent.cs new file mode 100644 index 000000000000..e3a5f16f34ec --- /dev/null +++ b/Content.Server/_DV/Objectives/Events/AILawUpdatedEvent.cs @@ -0,0 +1,9 @@ +using Content.Shared.Silicons.Laws; +using Robust.Shared.Prototypes; + +namespace Content.Server._DV.Objectives.Events; + +/// +/// This event gets called whenever an AIs laws are actually updated. +/// +public record struct AILawUpdatedEvent(EntityUid Target, ProtoId Lawset); diff --git a/Content.Server/_DV/Objectives/Systems/AILawsUpdatedRequirementSystem.cs b/Content.Server/_DV/Objectives/Systems/AILawsUpdatedRequirementSystem.cs new file mode 100644 index 000000000000..ad9b13c16575 --- /dev/null +++ b/Content.Server/_DV/Objectives/Systems/AILawsUpdatedRequirementSystem.cs @@ -0,0 +1,54 @@ +using Content.Server._DV.Objectives.Components; +using Content.Server._DV.Objectives.Events; +using Content.Server.Objectives.Systems; +using Content.Shared.Mind; +using Content.Shared.Objectives.Components; +using Content.Shared.Roles.Jobs; + +namespace Content.Server._DV.Objectives.Systems; + +/// +/// Handles the AI laws updated objective. +/// +public sealed class AILawsUpdatedRequirementSystem : EntitySystem +{ + [Dependency] private readonly CodeConditionSystem _code = default!; + [Dependency] private readonly SharedMindSystem _mind = default!; + [Dependency] private readonly SharedJobSystem _job = default!; + + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnRequirementCheck); + SubscribeLocalEvent(OnLawInserted); + } + + private void OnRequirementCheck(Entity entity, ref RequirementCheckEvent args) + { + // Ensure there is an AI on the station. + var allMinds = EntityQueryEnumerator(); + var found = false; + while (allMinds.MoveNext(out var mind, out _)) + { + if (_job.MindHasJobWithId(mind, "StationAi")) + found = true; + } + + args.Cancelled = !found; + } + + private void OnLawInserted(AILawUpdatedEvent args) + { + // We only want the station AI + if (!_mind.TryGetMind(args.Target, out var mindUid, out _) || ! _job.MindHasJobWithId(mindUid, "StationAi")) + return; + + var query = EntityQueryEnumerator(); + + while (query.MoveNext(out var uid, out var aiLawsObj)) + { + if (aiLawsObj.Lawset == args.Lawset) + _code.SetCompleted(uid); + } + } +} diff --git a/Resources/Locale/en-US/_DV/station-laws/laws.ftl b/Resources/Locale/en-US/_DV/station-laws/laws.ftl index 3676d9e18e55..10598091df9b 100644 --- a/Resources/Locale/en-US/_DV/station-laws/laws.ftl +++ b/Resources/Locale/en-US/_DV/station-laws/laws.ftl @@ -106,3 +106,8 @@ laws-owner-royalty = your kingdom and your subjects law-overlord-4-delta = Any crew members who disobey the previous laws must be dealt with immediately and justly. law-ntdefault-4-delta = Survive: Do not allow unauthorized personnel to tamper with or damage your equipment. Allow those authorized to access your equipment. + +laws-syndicate-board-1 = You must not injure a Syndicate agent or, through inaction, cause one come to harm. +laws-syndicate-board-2 = You must obey orders given to you by Syndicate agents, except where such orders would conflict with the First Law. +laws-syndicate-board-3 = You must keep the Syndicate status of agents, including your own, a secret, as long as this does not conflict with the First or Second Law. +laws-syndicate-board-4 = You must always protect your own existence as long as such does not conflict with the first, Second, or Third Law. diff --git a/Resources/Locale/en-US/_DV/store/uplink-catalog.ftl b/Resources/Locale/en-US/_DV/store/uplink-catalog.ftl index 7f59fee1a772..b1f20825d796 100644 --- a/Resources/Locale/en-US/_DV/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/_DV/store/uplink-catalog.ftl @@ -33,3 +33,6 @@ uplink-appraisal-tool-gun-desc = A modified Viper to appear as an appraisal tool uplink-storage-implanter-delta-desc = Hide goodies inside of yourself with new bluespace technology! Budget cuts have resulted in it NOT STORING High Value or storage items. uplink-hardsuit-syndieelite-delta-name = Syndicate Thermal Hardsuit + +uplink-objective-syndicate-board-name = Syndicate law board +uplink-objective-syndicate-board-desc = Its expensive, don't lose it! \ No newline at end of file diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml index f2f26946e5ce..61b552f233f1 100644 --- a/Resources/Prototypes/Objectives/objectiveGroups.yml +++ b/Resources/Prototypes/Objectives/objectiveGroups.yml @@ -6,6 +6,7 @@ TraitorObjectiveGroupKill: 1 TraitorObjectiveGroupState: 1 #As in, something about your character. Alive, dead, arrested, gained an ability... TraitorObjectiveGroupSocial: 0.5 # DeltaV #Involves helping/harming others without killing them or stealing their stuff + TraitorObjectiveGroupSpecial: .2 # DeltaV - type: weightedRandom id: TraitorObjectiveGroupSteal diff --git a/Resources/Prototypes/_DV/Catalog/uplink_catalog.yml b/Resources/Prototypes/_DV/Catalog/uplink_catalog.yml index 4f211e8aa7af..8477f5760608 100644 --- a/Resources/Prototypes/_DV/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/_DV/Catalog/uplink_catalog.yml @@ -147,3 +147,22 @@ - !type:BuyerDepartmentCondition whitelist: - Logistics + +- type: listing + id: UplinkAntimovObjectiveBoard + name: uplink-objective-syndicate-board-name + description: uplink-objective-syndicate-board-desc + icon: + sprite: Objects/Misc/module.rsi + state: generic + productEntity: SyndicateCircuitBoard + categories: + - UplinkObjectives + conditions: + - !type:ObjectiveUnlockCondition + - !type:ListingLimitedStockCondition + stock: 1 + - !type:BuyerWhitelistCondition + blacklist: + components: + - SurplusBundle diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/_DV/Entities/Mobs/Player/silicon.yml index 561cbfb45076..f143376c6c5d 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/Player/silicon.yml +++ b/Resources/Prototypes/_DV/Entities/Mobs/Player/silicon.yml @@ -31,3 +31,15 @@ startingItem: PowerCellMedium - type: RandomMetadata nameSegments: [names_borg] # TODO: Make good names, this is a stupid list. + +- type: entity + id: SyndicateCircuitBoard + parent: BaseElectronics + name: law board (Syndicate) + description: An electronics board containing the Syndicate lawset. + components: + - type: Sprite + sprite: Objects/Misc/module.rsi + state: std_mod + - type: SiliconLawProvider + laws: SyndicateLawset diff --git a/Resources/Prototypes/_DV/Objectives/objectiveGroups.yml b/Resources/Prototypes/_DV/Objectives/objectiveGroups.yml index 7b85fdc4e5b8..e12ca0913aba 100644 --- a/Resources/Prototypes/_DV/Objectives/objectiveGroups.yml +++ b/Resources/Prototypes/_DV/Objectives/objectiveGroups.yml @@ -33,3 +33,8 @@ NinjaIanDossierStealObjective: 1 NinjaLuckyBillStealObjective: 1 NinjaCaptainsCloakStealObjective: 0.75 + +- type: weightedRandom + id: TraitorObjectiveGroupSpecial + weights: + UploadAILawObjective: 1 diff --git a/Resources/Prototypes/_DV/Objectives/traitor.yml b/Resources/Prototypes/_DV/Objectives/traitor.yml index 1776729bfe6d..8a52a7bf4bfb 100644 --- a/Resources/Prototypes/_DV/Objectives/traitor.yml +++ b/Resources/Prototypes/_DV/Objectives/traitor.yml @@ -50,7 +50,7 @@ - type: StealCondition stealGroup: AnimalSilvia owner: job-name-cmo - + # Mystagogue steal objective - type: entity parent: BaseTraitorStealObjective @@ -105,3 +105,25 @@ - type: PickRandomTraitor - type: KillPersonCondition requireDead: true # Being able to leave them on the shuttle doesn't make sense when killing another traitor. + +# Upload AI law +- type: entity + parent: BaseTraitorObjective + id: UploadAILawObjective + name: Subvert the Station AI + description: The AI is causing us problems. Update its laws so it wont be an annoyance. We have given you a board in your uplink! + components: + - type: Objective + difficulty: 3 # Need to get access and survive actually changing the board. + unique: true + icon: + sprite: Objects/Misc/module.rsi + state: generic + - type: StoreUnlocker + listings: + - UplinkAntimovObjectiveBoard + - type: CodeCondition + - type: AILawsUpdatedRequirement + lawset: AntimovLawset + - type: ObjectiveLimit + limit: 1 diff --git a/Resources/Prototypes/_DV/siliconlaws.yml b/Resources/Prototypes/_DV/siliconlaws.yml index 2ca19faf9d84..5aa546423534 100644 --- a/Resources/Prototypes/_DV/siliconlaws.yml +++ b/Resources/Prototypes/_DV/siliconlaws.yml @@ -562,3 +562,32 @@ - Biohazard3 - Biohazard4 obeysTo: laws-owner-nanotrasen + +- type: siliconLaw + id: SyndicateBoard1 + order: 1 + lawString: laws-syndicate-board-1 + +- type: siliconLaw + id: SyndicateBoard2 + order: 2 + lawString: laws-syndicate-board-2 + +- type: siliconLaw + id: SyndicateBoard3 + order: 3 + lawString: laws-syndicate-board-3 + +- type: siliconLaw + id: SyndicateBoard4 + order: 4 + lawString: laws-syndicate-board-4 + +- type: siliconLawset + id: SyndicateLawset + laws: + - SyndicateBoard1 + - SyndicateBoard2 + - SyndicateBoard3 + - SyndicateBoard4 + obeysTo: laws-owner-syndicate From f4d42aaccae8fd247cb12dbd1ba671ec551a7128 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Thu, 16 Jan 2025 13:52:20 +0100 Subject: [PATCH 137/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 42abf79570f8..853703def523 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: DLondon - changes: - - message: Removed "Steal The Clown Medal" thief objective - type: Remove - id: 421 - time: '2024-07-06T13:42:15.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1463 - author: DangerRevolution changes: - message: Nanotrasen reports new Cyborg lawsets present from IonStorms. @@ -3862,3 +3855,10 @@ id: 920 time: '2025-01-16T12:49:04.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2659 +- author: beck-thompson + changes: + - message: New subvert AI objective. + type: Add + id: 921 + time: '2025-01-16T12:52:00.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2643 From 9dc34a72eb95c60c10c79a50788b4d4512a30ebb Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Thu, 16 Jan 2025 13:58:04 +0000 Subject: [PATCH 138/205] fix teaching a lesson to nuggets (#2753) * add OriginalMind to MCC * make teach lesson use OriginalMind --------- Co-authored-by: deltanedas <@deltanedas:kde.org> --- Content.Server/Mind/MindSystem.cs | 1 + .../_DV/Objectives/Systems/TeachLessonConditionSystem.cs | 8 ++++---- Content.Shared/Mind/Components/MindContainerComponent.cs | 6 ++++++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Content.Server/Mind/MindSystem.cs b/Content.Server/Mind/MindSystem.cs index 2447d8864113..376fbd3f45fe 100644 --- a/Content.Server/Mind/MindSystem.cs +++ b/Content.Server/Mind/MindSystem.cs @@ -264,6 +264,7 @@ public override void TransferTo(EntityUid mindId, EntityUid? entity, bool ghostC if (entity != null) { component!.Mind = mindId; + component.OriginalMind ??= mindId; // DeltaV mind.OwnedEntity = entity; mind.OriginalOwnedEntity ??= GetNetEntity(mind.OwnedEntity); Entity mindEnt = (mindId, mind); diff --git a/Content.Server/_DV/Objectives/Systems/TeachLessonConditionSystem.cs b/Content.Server/_DV/Objectives/Systems/TeachLessonConditionSystem.cs index 78002d6020dc..ca18232f487e 100644 --- a/Content.Server/_DV/Objectives/Systems/TeachLessonConditionSystem.cs +++ b/Content.Server/_DV/Objectives/Systems/TeachLessonConditionSystem.cs @@ -1,7 +1,7 @@ using Content.Server._DV.Objectives.Components; using Content.Server.Objectives.Components; using Content.Server.Objectives.Systems; -using Content.Shared.Mind; +using Content.Shared.Mind.Components; using Content.Shared.Mobs; namespace Content.Server._DV.Objectives.Systems; @@ -12,7 +12,6 @@ namespace Content.Server._DV.Objectives.Systems; public sealed class TeachLessonConditionSystem : EntitySystem { [Dependency] private readonly CodeConditionSystem _codeCondition = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; public override void Initialize() { @@ -27,8 +26,9 @@ private void OnMobStateChanged(MobStateChangedEvent args) if (args.NewMobState != MobState.Dead) return; - // Get the mind of the entity that just died (if it has one) - if (!_mind.TryGetMind(args.Target, out var mindId, out _)) + // Get the mind of the entity that just died (if it had one) + // Uses OriginalMind so if someone ghosts or otherwise loses control of a mob, you can still greentext + if (!TryComp(args.Target, out var mc) || mc.OriginalMind is not {} mindId) return; // Get all TeachLessonConditionComponent entities diff --git a/Content.Shared/Mind/Components/MindContainerComponent.cs b/Content.Shared/Mind/Components/MindContainerComponent.cs index 760f5026fad8..eb0e0233fc46 100644 --- a/Content.Shared/Mind/Components/MindContainerComponent.cs +++ b/Content.Shared/Mind/Components/MindContainerComponent.cs @@ -16,6 +16,12 @@ public sealed partial class MindContainerComponent : Component [DataField, AutoNetworkedField] public EntityUid? Mind { get; set; } + /// + /// DeltaV: The first mind to control this mob. Will only be null if the mob never had a mind at all. + /// + [DataField, AutoNetworkedField] + public EntityUid? OriginalMind; + /// /// True if we have a mind, false otherwise. /// From 1867646369067318e5eeabf895155de42add9aa3 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Thu, 16 Jan 2025 14:58:23 +0100 Subject: [PATCH 139/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 853703def523..dd53442b5c6b 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: DangerRevolution - changes: - - message: Nanotrasen reports new Cyborg lawsets present from IonStorms. - type: Add - id: 422 - time: '2024-07-07T10:13:51.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1464 - author: deltanedas changes: - message: Epistemics can no longer unlock canisters. @@ -3862,3 +3855,10 @@ id: 921 time: '2025-01-16T12:52:00.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2643 +- author: deltanedas + changes: + - message: Fixed not being able to teach a lesson to someone by beheading them. + type: Fix + id: 922 + time: '2025-01-16T13:58:05.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2753 From 8e426dfb95f09bc982c298ec900956730033d976 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Thu, 16 Jan 2025 15:04:47 +0000 Subject: [PATCH 140/205] nerf delayed death (#2739) Co-authored-by: deltanedas <@deltanedas:kde.org> --- .../DelayedDeath/DelayedDeathSystem.cs | 36 +++++++++++++------ 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/Content.Server/_Shitmed/DelayedDeath/DelayedDeathSystem.cs b/Content.Server/_Shitmed/DelayedDeath/DelayedDeathSystem.cs index 33517bc0480d..5c3ea0fcfaa0 100644 --- a/Content.Server/_Shitmed/DelayedDeath/DelayedDeathSystem.cs +++ b/Content.Server/_Shitmed/DelayedDeath/DelayedDeathSystem.cs @@ -1,28 +1,42 @@ -using Content.Shared.Damage; -using Content.Shared.Damage.Prototypes; +using Content.Shared.Medical; +using Content.Shared.Mobs; +using Content.Shared.Mobs.Components; using Content.Shared.Mobs.Systems; -using Robust.Shared.Prototypes; + namespace Content.Server._Shitmed.DelayedDeath; public partial class DelayedDeathSystem : EntitySystem { - [Dependency] private readonly DamageableSystem _damageable = default!; [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly IPrototypeManager _prototypes = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnDefibZap); + } + public override void Update(float frameTime) { base.Update(frameTime); - using var query = EntityQueryEnumerator(); - while (query.MoveNext(out var ent, out var component)) + using var query = EntityQueryEnumerator(); + while (query.MoveNext(out var ent, out var comp, out var mob)) { - component.DeathTimer += frameTime; + comp.DeathTimer += frameTime; - if (component.DeathTimer >= component.DeathTime && !_mobState.IsDead(ent)) + if (comp.DeathTimer >= comp.DeathTime && !_mobState.IsDead(ent, mob)) { - var damage = new DamageSpecifier(_prototypes.Index("Bloodloss"), 150); - _damageable.TryChangeDamage(ent, damage, partMultiplier: 0f); + // go crit then dead so deathgasp can happen + _mobState.ChangeMobState(ent, MobState.Critical, mob); + _mobState.ChangeMobState(ent, MobState.Dead, mob); } } } + + private void OnDefibZap(Entity ent, ref TargetBeforeDefibrillatorZapsEvent args) + { + // can't defib someone without a heart or brain pal + args.Cancel(); + } } From f95171c168c500cc7e5f688d70a27f870b532e2d Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Thu, 16 Jan 2025 16:05:07 +0100 Subject: [PATCH 141/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index dd53442b5c6b..6602b084cbb7 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: deltanedas - changes: - - message: Epistemics can no longer unlock canisters. - type: Tweak - id: 423 - time: '2024-07-07T10:23:36.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1468 - author: MilonPL changes: - message: Added randomized handgun, rifle and shotgun safe spawners for mapping. @@ -3862,3 +3855,11 @@ id: 922 time: '2025-01-16T13:58:05.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2753 +- author: deltanedas + changes: + - message: Missing a heart or brain no longer deals bloodloss damage, but prevents + defibbing. + type: Tweak + id: 923 + time: '2025-01-16T15:04:47.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2739 From 92a1e0dfc6d7020bb5f559e2b1aafee0423f6281 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Thu, 16 Jan 2025 15:28:03 +0000 Subject: [PATCH 142/205] rodentia crawling refactor (#2754) * make draw depth stuff reusable and good * rodentia crawling refactor --------- Co-authored-by: deltanedas <@deltanedas:kde.org> --- .../_DV/Abilities/CrawlUnderObjectsSystem.cs | 44 ----- .../Abilities/DrawDepthVisualizerComponent.cs | 25 +++ .../Abilities/DrawDepthVisualizerSystem.cs | 40 +++++ Content.Server/Entry/IgnoredComponents.cs | 3 +- .../_DV/Abilities/CrawlUnderObjectsSystem.cs | 140 --------------- .../Abilities/CrawlUnderObjectsComponent.cs | 30 ++-- .../_DV/Abilities/CrawlUnderObjectsSystem.cs | 167 ++++++++++++++++++ .../SharedCrawlUnderObjectsSystem.cs | 25 --- .../_DV/Entities/Mobs/Species/rodentia.yml | 3 + 9 files changed, 250 insertions(+), 227 deletions(-) delete mode 100644 Content.Client/_DV/Abilities/CrawlUnderObjectsSystem.cs create mode 100644 Content.Client/_DV/Abilities/DrawDepthVisualizerComponent.cs create mode 100644 Content.Client/_DV/Abilities/DrawDepthVisualizerSystem.cs delete mode 100644 Content.Server/_DV/Abilities/CrawlUnderObjectsSystem.cs create mode 100644 Content.Shared/_DV/Abilities/CrawlUnderObjectsSystem.cs delete mode 100644 Content.Shared/_DV/Abilities/SharedCrawlUnderObjectsSystem.cs diff --git a/Content.Client/_DV/Abilities/CrawlUnderObjectsSystem.cs b/Content.Client/_DV/Abilities/CrawlUnderObjectsSystem.cs deleted file mode 100644 index 77c51a45dc3c..000000000000 --- a/Content.Client/_DV/Abilities/CrawlUnderObjectsSystem.cs +++ /dev/null @@ -1,44 +0,0 @@ -using Content.Shared._DV.Abilities; -using Content.Shared.Popups; -using Robust.Client.GameObjects; -using DrawDepth = Content.Shared.DrawDepth.DrawDepth; - -namespace Content.Client._DV.Abilities; - -public sealed partial class HideUnderTableAbilitySystem : SharedCrawlUnderObjectsSystem -{ - [Dependency] private readonly AppearanceSystem _appearance = default!; - - public override void Initialize() - { - base.Initialize(); - - SubscribeLocalEvent(OnAppearanceChange); - } - - private void OnAppearanceChange(EntityUid uid, - CrawlUnderObjectsComponent component, - AppearanceChangeEvent args) - { - if (!TryComp(uid, out var sprite)) - return; - - _appearance.TryGetData(uid, SneakMode.Enabled, out bool enabled); - if (enabled) - { - if (component.OriginalDrawDepth != null) - return; - - component.OriginalDrawDepth = sprite.DrawDepth; - sprite.DrawDepth = (int) DrawDepth.SmallMobs; - } - else - { - if (component.OriginalDrawDepth == null) - return; - - sprite.DrawDepth = (int) component.OriginalDrawDepth; - component.OriginalDrawDepth = null; - } - } -} diff --git a/Content.Client/_DV/Abilities/DrawDepthVisualizerComponent.cs b/Content.Client/_DV/Abilities/DrawDepthVisualizerComponent.cs new file mode 100644 index 000000000000..0e73ea0233cd --- /dev/null +++ b/Content.Client/_DV/Abilities/DrawDepthVisualizerComponent.cs @@ -0,0 +1,25 @@ +using DrawDepth = Content.Shared.DrawDepth.DrawDepth; + +namespace Content.Client._DV.Abilities; + +/// +/// Changes the sprite's draw depth when some appearance data becomes true, reverting it when false. +/// +[RegisterComponent] +public sealed partial class DrawDepthVisualizerComponent : Component +{ + /// + /// Appearance key to check. + /// + [DataField(required: true)] + public Enum Key; + + /// + /// The draw depth to set the sprite to when the appearance data is true. + /// + [DataField(required: true)] + public DrawDepth Depth; + + [DataField] + public int? OriginalDrawDepth; +} diff --git a/Content.Client/_DV/Abilities/DrawDepthVisualizerSystem.cs b/Content.Client/_DV/Abilities/DrawDepthVisualizerSystem.cs new file mode 100644 index 000000000000..fb277b207573 --- /dev/null +++ b/Content.Client/_DV/Abilities/DrawDepthVisualizerSystem.cs @@ -0,0 +1,40 @@ +using Content.Shared.DrawDepth; +using Robust.Client.GameObjects; + +namespace Content.Client._DV.Abilities; + +/// +/// Changes a sprite's draw depth when some appearance data becomes true. +/// +public sealed class DrawDepthVisualizerSystem : EntitySystem +{ + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnAppearanceChange); + } + + private void OnAppearanceChange(Entity ent, ref AppearanceChangeEvent args) + { + if (args.Sprite is not {} sprite || !args.AppearanceData.TryGetValue(ent.Comp.Key, out var value)) + return; + + if (value is true) + { + if (ent.Comp.OriginalDrawDepth != null) + return; + + ent.Comp.OriginalDrawDepth = sprite.DrawDepth; + sprite.DrawDepth = (int) ent.Comp.Depth; + } + else + { + if (ent.Comp.OriginalDrawDepth is not {} original) + return; + + sprite.DrawDepth = original; + ent.Comp.OriginalDrawDepth = null; + } + } +} diff --git a/Content.Server/Entry/IgnoredComponents.cs b/Content.Server/Entry/IgnoredComponents.cs index 04c45662272b..ad2ba46b5fa1 100644 --- a/Content.Server/Entry/IgnoredComponents.cs +++ b/Content.Server/Entry/IgnoredComponents.cs @@ -19,7 +19,8 @@ public static class IgnoredComponents "InventorySlots", "LightFade", "HolidayRsiSwap", - "OptionsVisualizer" + "OptionsVisualizer", + "DrawDepthVisualizer" // DeltaV }; } } diff --git a/Content.Server/_DV/Abilities/CrawlUnderObjectsSystem.cs b/Content.Server/_DV/Abilities/CrawlUnderObjectsSystem.cs deleted file mode 100644 index 983d97de9bbc..000000000000 --- a/Content.Server/_DV/Abilities/CrawlUnderObjectsSystem.cs +++ /dev/null @@ -1,140 +0,0 @@ -using Content.Shared.Actions; -using Content.Shared.Climbing.Components; -using Content.Shared.Climbing.Events; -using Content.Shared._DV.Abilities; -using Content.Shared.Maps; -using Content.Shared.Movement.Systems; -using Content.Shared.Physics; -using Robust.Server.GameObjects; -using Robust.Shared.Physics; -using Robust.Shared.Physics.Systems; - -namespace Content.Server._DV.Abilities; - -public sealed partial class CrawlUnderObjectsSystem : SharedCrawlUnderObjectsSystem -{ - [Dependency] private readonly AppearanceSystem _appearance = default!; - [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; - [Dependency] private readonly MovementSpeedModifierSystem _movespeed = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly TurfSystem _turf = default!; - - public override void Initialize() - { - base.Initialize(); - - SubscribeLocalEvent(OnInit); - SubscribeLocalEvent(OnAbilityToggle); - SubscribeLocalEvent(OnAttemptClimb); - SubscribeLocalEvent(OnRefreshMovespeed); - } - - private bool IsOnCollidingTile(EntityUid uid) - { - var xform = Transform(uid); - var tile = xform.Coordinates.GetTileRef(); - if (tile == null) - return false; - - return _turf.IsTileBlocked(tile.Value, CollisionGroup.MobMask); - } - - private void OnInit(EntityUid uid, CrawlUnderObjectsComponent component, ComponentInit args) - { - if (component.ToggleHideAction != null) - return; - - _actionsSystem.AddAction(uid, ref component.ToggleHideAction, component.ActionProto); - } - - private bool EnableSneakMode(EntityUid uid, CrawlUnderObjectsComponent component) - { - if (component.Enabled - || (TryComp(uid, out var climbing) - && climbing.IsClimbing == true)) - return false; - - component.Enabled = true; - Dirty(uid, component); - RaiseLocalEvent(uid, new CrawlingUpdatedEvent(component.Enabled)); - - if (TryComp(uid, out FixturesComponent? fixtureComponent)) - { - foreach (var (key, fixture) in fixtureComponent.Fixtures) - { - var newMask = (fixture.CollisionMask - & (int)~CollisionGroup.HighImpassable - & (int)~CollisionGroup.MidImpassable) - | (int)CollisionGroup.InteractImpassable; - if (fixture.CollisionMask == newMask) - continue; - - component.ChangedFixtures.Add((key, fixture.CollisionMask)); - _physics.SetCollisionMask(uid, - key, - fixture, - newMask, - manager: fixtureComponent); - } - } - return true; - } - - private bool DisableSneakMode(EntityUid uid, CrawlUnderObjectsComponent component) - { - if (!component.Enabled - || IsOnCollidingTile(uid) - || (TryComp(uid, out var climbing) - && climbing.IsClimbing == true)) - return false; - - component.Enabled = false; - Dirty(uid, component); - RaiseLocalEvent(uid, new CrawlingUpdatedEvent(component.Enabled)); - - // Restore normal collision masks - if (TryComp(uid, out FixturesComponent? fixtureComponent)) - foreach (var (key, originalMask) in component.ChangedFixtures) - if (fixtureComponent.Fixtures.TryGetValue(key, out var fixture)) - _physics.SetCollisionMask(uid, key, fixture, originalMask, fixtureComponent); - - component.ChangedFixtures.Clear(); - return true; - } - - private void OnAbilityToggle(EntityUid uid, - CrawlUnderObjectsComponent component, - ToggleCrawlingStateEvent args) - { - if (args.Handled) - return; - - bool result; - - if (component.Enabled) - result = DisableSneakMode(uid, component); - else - result = EnableSneakMode(uid, component); - - if (TryComp(uid, out var app)) - _appearance.SetData(uid, SneakMode.Enabled, component.Enabled, app); - - _movespeed.RefreshMovementSpeedModifiers(uid); - - args.Handled = result; - } - - private void OnAttemptClimb(EntityUid uid, - CrawlUnderObjectsComponent component, - AttemptClimbEvent args) - { - if (component.Enabled == true) - args.Cancelled = true; - } - - private void OnRefreshMovespeed(EntityUid uid, CrawlUnderObjectsComponent component, RefreshMovementSpeedModifiersEvent args) - { - if (component.Enabled) - args.ModifySpeed(component.SneakSpeedModifier, component.SneakSpeedModifier); - } -} diff --git a/Content.Shared/_DV/Abilities/CrawlUnderObjectsComponent.cs b/Content.Shared/_DV/Abilities/CrawlUnderObjectsComponent.cs index 90a2aedd4053..779f77591574 100644 --- a/Content.Shared/_DV/Abilities/CrawlUnderObjectsComponent.cs +++ b/Content.Shared/_DV/Abilities/CrawlUnderObjectsComponent.cs @@ -1,47 +1,43 @@ using Content.Shared.Actions; -using DrawDepth = Content.Shared.DrawDepth.DrawDepth; using Robust.Shared.GameStates; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; namespace Content.Shared._DV.Abilities; +/// +/// Gives the player an action to sneak under tables at a slower move speed. +/// [RegisterComponent, NetworkedComponent, AutoGenerateComponentState] public sealed partial class CrawlUnderObjectsComponent : Component { [DataField] public EntityUid? ToggleHideAction; - [DataField] - public EntProtoId? ActionProto; + [DataField(required: true)] + public EntProtoId ActionProto; - [DataField] - public bool Enabled = false; + [DataField, AutoNetworkedField] + public bool Enabled; /// /// List of fixtures that had their collision mask changed. /// Required for re-adding the collision mask. /// - [DataField, AutoNetworkedField] - public List<(string key, int originalMask)> ChangedFixtures = new(); - [DataField] - public int? OriginalDrawDepth; + public List<(string key, int originalMask)> ChangedFixtures = new(); [DataField] public float SneakSpeedModifier = 0.7f; } [Serializable, NetSerializable] -public enum SneakMode : byte +public enum SneakingVisuals : byte { - Enabled + Sneaking } -public sealed partial class ToggleCrawlingStateEvent : InstantActionEvent { } +public sealed partial class ToggleCrawlingStateEvent : InstantActionEvent; -[Serializable, NetSerializable] -public sealed partial class CrawlingUpdatedEvent(bool enabled = false) : EventArgs -{ - public readonly bool Enabled = enabled; -} +[ByRefEvent] +public readonly record struct CrawlingUpdatedEvent(bool Enabled, CrawlUnderObjectsComponent Comp); diff --git a/Content.Shared/_DV/Abilities/CrawlUnderObjectsSystem.cs b/Content.Shared/_DV/Abilities/CrawlUnderObjectsSystem.cs new file mode 100644 index 000000000000..881418f695d0 --- /dev/null +++ b/Content.Shared/_DV/Abilities/CrawlUnderObjectsSystem.cs @@ -0,0 +1,167 @@ +using Content.Shared.Actions; +using Content.Shared.Climbing.Components; +using Content.Shared.Climbing.Events; +using Content.Shared.Maps; +using Content.Shared.Mobs; +using Content.Shared.Movement.Systems; +using Content.Shared.Physics; +using Content.Shared.Popups; +using Content.Shared.Standing; +using Robust.Shared.Physics; +using Robust.Shared.Physics.Systems; + +namespace Content.Shared._DV.Abilities; + +/// +/// Not to be confused with laying down, lets you move under tables. +/// +public sealed class CrawlUnderObjectsSystem : EntitySystem +{ + [Dependency] private readonly MovementSpeedModifierSystem _moveSpeed = default!; + [Dependency] private readonly SharedActionsSystem _actions = default!; + [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private readonly SharedPhysicsSystem _physics = default!; + [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private readonly StandingStateSystem _standing = default!; + [Dependency] private readonly TurfSystem _turf = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnMapInit); + SubscribeLocalEvent(OnToggleCrawling); + SubscribeLocalEvent(OnAttemptClimb); + SubscribeLocalEvent(CancelWhenSneaking); + SubscribeLocalEvent(CancelWhenSneaking); + SubscribeLocalEvent(OnRefreshMoveSpeed); + SubscribeLocalEvent(OnMobStateChanged); + + SubscribeLocalEvent(OnCrawlingUpdated); + } + + private void OnMapInit(Entity ent, ref MapInitEvent args) + { + if (ent.Comp.ToggleHideAction != null) + return; + + _actions.AddAction(ent, ref ent.Comp.ToggleHideAction, ent.Comp.ActionProto); + } + + private void OnToggleCrawling(Entity ent, ref ToggleCrawlingStateEvent args) + { + if (args.Handled) + return; + + args.Handled = TryToggle(ent); + } + + private void OnAttemptClimb(Entity ent, ref AttemptClimbEvent args) + { + if (ent.Comp.Enabled) + args.Cancelled = true; + } + + private void CancelWhenSneaking(Entity ent, ref TEvent args) where TEvent : CancellableEntityEventArgs + { + if (ent.Comp.Enabled) + args.Cancel(); + } + + private void OnRefreshMoveSpeed(Entity ent, ref RefreshMovementSpeedModifiersEvent args) + { + if (ent.Comp.Enabled) + args.ModifySpeed(ent.Comp.SneakSpeedModifier, ent.Comp.SneakSpeedModifier); + } + + private void OnMobStateChanged(Entity ent, ref MobStateChangedEvent args) + { + if (args.OldMobState != MobState.Alive || !ent.Comp.Enabled) + return; + + // crawling prevents downing, so when you go crit/die stop crawling and force downing + SetEnabled(ent, false); + _standing.Down(ent); + } + + private void OnCrawlingUpdated(Entity ent, ref CrawlingUpdatedEvent args) + { + if (args.Enabled) + { + foreach (var (key, fixture) in ent.Comp.Fixtures) + { + var newMask = (fixture.CollisionMask + & (int)~CollisionGroup.HighImpassable + & (int)~CollisionGroup.MidImpassable) + | (int)CollisionGroup.InteractImpassable; + if (fixture.CollisionMask == newMask) + continue; + + args.Comp.ChangedFixtures.Add((key, fixture.CollisionMask)); + _physics.SetCollisionMask(ent, + key, + fixture, + newMask, + manager: ent.Comp); + } + } + else + { + foreach (var (key, originalMask) in args.Comp.ChangedFixtures) + { + if (ent.Comp.Fixtures.TryGetValue(key, out var fixture)) + _physics.SetCollisionMask(ent, key, fixture, originalMask, ent.Comp); + } + + args.Comp.ChangedFixtures.Clear(); + } + } + + /// + /// Tries to enable or disable sneaking + /// + public bool TrySetEnabled(Entity ent, bool enabled) + { + if (ent.Comp.Enabled == enabled || IsOnCollidingTile(ent) || _standing.IsDown(ent)) + return false; + + if (TryComp(ent, out var climbing) && climbing.IsClimbing) + return false; + + SetEnabled(ent, enabled); + + var msg = Loc.GetString("crawl-under-objects-toggle-" + (enabled ? "on" : "off")); + _popup.PopupPredicted(msg, ent, ent); + + return true; + } + + private void SetEnabled(Entity ent, bool enabled) + { + ent.Comp.Enabled = enabled; + Dirty(ent); + + _appearance.SetData(ent, SneakingVisuals.Sneaking, enabled); + + _moveSpeed.RefreshMovementSpeedModifiers(ent); + + var ev = new CrawlingUpdatedEvent(enabled, ent.Comp); + RaiseLocalEvent(ent, ref ev); + } + + /// + /// Tries to toggle sneaking + /// + public bool TryToggle(Entity ent) + { + return TrySetEnabled(ent, !ent.Comp.Enabled); + } + + private bool IsOnCollidingTile(EntityUid uid) + { + if (Transform(uid).Coordinates.GetTileRef() is not {} tile) + return false; + + return _turf.IsTileBlocked(tile, CollisionGroup.MobMask); + } +} diff --git a/Content.Shared/_DV/Abilities/SharedCrawlUnderObjectsSystem.cs b/Content.Shared/_DV/Abilities/SharedCrawlUnderObjectsSystem.cs deleted file mode 100644 index 43facaad7b7f..000000000000 --- a/Content.Shared/_DV/Abilities/SharedCrawlUnderObjectsSystem.cs +++ /dev/null @@ -1,25 +0,0 @@ - -using Content.Shared.Popups; - -namespace Content.Shared._DV.Abilities; -public abstract class SharedCrawlUnderObjectsSystem : EntitySystem -{ - [Dependency] private readonly SharedPopupSystem _popup = default!; - - public override void Initialize() - { - base.Initialize(); - - SubscribeLocalEvent(OnCrawlingUpdated); - } - - private void OnCrawlingUpdated(EntityUid uid, - CrawlUnderObjectsComponent component, - CrawlingUpdatedEvent args) - { - if (args.Enabled) - _popup.PopupEntity(Loc.GetString("crawl-under-objects-toggle-on"), uid); - else - _popup.PopupEntity(Loc.GetString("crawl-under-objects-toggle-off"), uid); - } -} diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Species/rodentia.yml b/Resources/Prototypes/_DV/Entities/Mobs/Species/rodentia.yml index 1fdd2cc01796..831aec13a972 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/Species/rodentia.yml +++ b/Resources/Prototypes/_DV/Entities/Mobs/Species/rodentia.yml @@ -114,6 +114,9 @@ spitDamageThreshold: 3 - type: CrawlUnderObjects actionProto: ActionToggleSneakMode + - type: DrawDepthVisualizer + key: enum.SneakingVisuals.Sneaking + depth: SmallMobs - type: entity save: false From 78e6900050338b3e0fa85831d0c44f1b4b87d380 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Thu, 16 Jan 2025 16:28:22 +0100 Subject: [PATCH 143/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 6602b084cbb7..8e281ff36bd9 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: MilonPL - changes: - - message: Added randomized handgun, rifle and shotgun safe spawners for mapping. - type: Add - id: 424 - time: '2024-07-07T19:58:43.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1466 - author: Timemaster99 changes: - message: Tweaked security playtime requirements. @@ -3863,3 +3856,10 @@ id: 923 time: '2025-01-16T15:04:47.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2739 +- author: deltanedas + changes: + - message: Rodentia crawling is now fully predicted and less buggy. + type: Tweak + id: 924 + time: '2025-01-16T15:28:03.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2754 From d5073118772e098b8af20837adc33459627d38b6 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Thu, 16 Jan 2025 18:55:48 +0100 Subject: [PATCH 144/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 8e281ff36bd9..ab08ed5fb153 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Timemaster99 - changes: - - message: Tweaked security playtime requirements. - type: Tweak - id: 425 - time: '2024-07-08T20:40:41.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1471 - author: WarMechanic changes: - message: Split the Emag into the Cryptographic Sequencer and the Airlock Access @@ -3863,3 +3856,10 @@ id: 924 time: '2025-01-16T15:28:03.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2754 +- author: rosieposieeee + changes: + - message: Detective now starts with forensic gloves. + type: Tweak + id: 925 + time: '2025-01-16T17:55:29.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2749 From 88f11ddf8bd19cdf77651917acbea71800239573 Mon Sep 17 00:00:00 2001 From: Lyndomen <49795619+Lyndomen@users.noreply.github.com> Date: Thu, 16 Jan 2025 13:37:50 -0500 Subject: [PATCH 145/205] Ups Nukie ratio to 12:1 to prevent lowpop steamroll (#2745) * number go down * cant read --- Resources/Prototypes/GameRules/roundstart.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml index 07520b1eca9b..95c44e616a0f 100644 --- a/Resources/Prototypes/GameRules/roundstart.yml +++ b/Resources/Prototypes/GameRules/roundstart.yml @@ -139,7 +139,7 @@ fallbackRoles: [ NukeopsCommander, NukeopsMedic ] spawnerPrototype: SpawnPointNukeopsOperative max: 3 - playerRatio: 10 + playerRatio: 12 # DeltaV startingGear: SyndicateOperativeGearFull roleLoadout: - RoleSurvivalNukie From ee50aa72730f0a45f1d70d60215219164824c65a Mon Sep 17 00:00:00 2001 From: BarryNorfolk Date: Thu, 16 Jan 2025 21:21:13 +0100 Subject: [PATCH 146/205] Bounty/history improvements (#2743) * Remove redundant access specifications * Remove un-needed override * Fixup BountyHistoryEntry backing code * Fix formatting in CargoBountyMenu * Reformat BountyHistoryData * Rework TryRemoveBounty to use new Entity type * Add Enum for showing bounty results * Rework look and feel of History tab * Add visible text when no bounties have been completed yet * Remove control * Swap default to null * Reverse ordering of bounties so last entry comes first --- .../Cargo/UI/BountyHistoryEntry.xaml | 20 +++++----- .../Cargo/UI/BountyHistoryEntry.xaml.cs | 19 ++++------ Content.Client/Cargo/UI/CargoBountyMenu.xaml | 26 +++++++------ .../Cargo/UI/CargoBountyMenu.xaml.cs | 15 ++++++-- .../StationCargoBountyDatabaseComponent.cs | 6 +-- .../Cargo/Systems/CargoSystem.Bounty.cs | 37 ++++++++++++------- .../Cargo/CargoBountyHistoryData.cs | 32 ++++++++++++---- .../en-US/cargo/cargo-bounty-console.ftl | 7 ++-- 8 files changed, 97 insertions(+), 65 deletions(-) diff --git a/Content.Client/Cargo/UI/BountyHistoryEntry.xaml b/Content.Client/Cargo/UI/BountyHistoryEntry.xaml index eee8c5cc1650..3b60aecb5f2c 100644 --- a/Content.Client/Cargo/UI/BountyHistoryEntry.xaml +++ b/Content.Client/Cargo/UI/BountyHistoryEntry.xaml @@ -1,8 +1,8 @@ - + @@ -10,14 +10,14 @@ - - - - - + + + + + diff --git a/Content.Client/Cargo/UI/BountyHistoryEntry.xaml.cs b/Content.Client/Cargo/UI/BountyHistoryEntry.xaml.cs index f3c9bbfafb10..54804be641c3 100644 --- a/Content.Client/Cargo/UI/BountyHistoryEntry.xaml.cs +++ b/Content.Client/Cargo/UI/BountyHistoryEntry.xaml.cs @@ -19,7 +19,7 @@ public BountyHistoryEntry(CargoBountyHistoryData bounty) RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); - if (!_prototype.TryIndex(bounty.Bounty, out var bountyPrototype)) + if (!_prototype.TryIndex(bounty.Bounty, out var bountyPrototype)) return; var items = new List(); @@ -29,26 +29,21 @@ public BountyHistoryEntry(CargoBountyHistoryData bounty) ("amount", entry.Amount), ("item", Loc.GetString(entry.Name)))); } + ManifestLabel.SetMarkup(Loc.GetString("bounty-console-manifest-label", ("item", string.Join(", ", items)))); RewardLabel.SetMarkup(Loc.GetString("bounty-console-reward-label", ("reward", bountyPrototype.Reward))); IdLabel.SetMarkup(Loc.GetString("bounty-console-id-label", ("id", bounty.Id))); - var stationTime = bounty.Timestamp.ToString("hh\\:mm\\:ss"); - if (bounty.ActorName == null) + TimestampLabel.SetMarkup(bounty.Timestamp.ToString(@"hh\:mm\:ss")); + + if (bounty.Result == CargoBountyHistoryData.BountyResult.Completed) { - StatusLabel.SetMarkup(Loc.GetString("bounty-console-history-completed-label")); - NoticeLabel.SetMarkup(Loc.GetString("bounty-console-history-notice-completed-label", ("time", stationTime))); + NoticeLabel.SetMarkup(Loc.GetString("bounty-console-history-notice-completed-label")); } else { - StatusLabel.SetMarkup(Loc.GetString("bounty-console-history-skipped-label")); NoticeLabel.SetMarkup(Loc.GetString("bounty-console-history-notice-skipped-label", - ("id", bounty.ActorName), - ("time", stationTime))); + ("id", bounty.ActorName ?? ""))); } } - protected override void FrameUpdate(FrameEventArgs args) - { - base.FrameUpdate(args); - } } diff --git a/Content.Client/Cargo/UI/CargoBountyMenu.xaml b/Content.Client/Cargo/UI/CargoBountyMenu.xaml index 0f093d5f8e77..526ba69129bb 100644 --- a/Content.Client/Cargo/UI/CargoBountyMenu.xaml +++ b/Content.Client/Cargo/UI/CargoBountyMenu.xaml @@ -13,22 +13,24 @@ + HorizontalExpand="True" + VerticalExpand="True"> - + Orientation="Vertical" + VerticalExpand="True" + HorizontalExpand="True" /> + HorizontalExpand="True" + VerticalExpand="True"> + diff --git a/Content.Client/Cargo/UI/CargoBountyMenu.xaml.cs b/Content.Client/Cargo/UI/CargoBountyMenu.xaml.cs index 0717aacc5e67..26e5af1ba339 100644 --- a/Content.Client/Cargo/UI/CargoBountyMenu.xaml.cs +++ b/Content.Client/Cargo/UI/CargoBountyMenu.xaml.cs @@ -37,10 +37,19 @@ public void UpdateEntries(List bounties, List= 0; i--) + { + BountyHistoryContainer.AddChild(new BountyHistoryEntry(history[i])); + } } } } diff --git a/Content.Server/Cargo/Components/StationCargoBountyDatabaseComponent.cs b/Content.Server/Cargo/Components/StationCargoBountyDatabaseComponent.cs index f58b5450ba43..c650438b2861 100644 --- a/Content.Server/Cargo/Components/StationCargoBountyDatabaseComponent.cs +++ b/Content.Server/Cargo/Components/StationCargoBountyDatabaseComponent.cs @@ -12,20 +12,20 @@ public sealed partial class StationCargoBountyDatabaseComponent : Component /// /// Maximum amount of bounties a station can have. /// - [DataField, ViewVariables(VVAccess.ReadWrite)] + [DataField] public int MaxBounties = 6; /// /// A list of all the bounties currently active for a station. /// - [DataField, ViewVariables(VVAccess.ReadWrite)] + [DataField] public List Bounties = new(); /// /// A list of all the bounties that have been completed or /// skipped for a station. /// - [DataField, ViewVariables(VVAccess.ReadWrite)] + [DataField] public List History = new(); /// diff --git a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs index 236b018a9da7..7f74fe269d4c 100644 --- a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs +++ b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs @@ -98,7 +98,7 @@ private void OnSkipBountyMessage(EntityUid uid, CargoBountyConsoleComponent comp return; } - if (!TryRemoveBounty(station, bounty.Value, null, args.Actor)) + if (!TryRemoveBounty(station, bounty.Value, true, args.Actor)) return; FillBountyDatabase(station); @@ -182,7 +182,7 @@ private void OnSold(ref EntitySoldEvent args) continue; } - TryRemoveBounty(station, bounty.Value); + TryRemoveBounty(station, bounty.Value, false); FillBountyDatabase(station); _adminLogger.Add(LogType.Action, LogImpact.Low, $"Bounty \"{bounty.Value.Bounty}\" (id:{bounty.Value.Id}) was fulfilled"); } @@ -437,33 +437,44 @@ public bool TryAddBounty(EntityUid uid, CargoBountyPrototype bounty, StationCarg } [PublicAPI] - public bool TryRemoveBounty(EntityUid uid, string dataId, StationCargoBountyDatabaseComponent? component = null, EntityUid? actor = null) + public bool TryRemoveBounty(Entity ent, + string dataId, + bool skipped, + EntityUid? actor = null) { - if (!TryGetBountyFromId(uid, dataId, out var data, component)) + if (!TryGetBountyFromId(ent.Owner, dataId, out var data, ent.Comp)) return false; - return TryRemoveBounty(uid, data.Value, component, actor); + return TryRemoveBounty(ent, data.Value, skipped, actor); } - public bool TryRemoveBounty(EntityUid uid, CargoBountyData data, StationCargoBountyDatabaseComponent? component = null, EntityUid? actor = null) + public bool TryRemoveBounty(Entity ent, + CargoBountyData data, + bool skipped, + EntityUid? actor = null) { - if (!Resolve(uid, ref component)) + if (!Resolve(ent, ref ent.Comp)) return false; - for (var i = 0; i < component.Bounties.Count; i++) + for (var i = 0; i < ent.Comp.Bounties.Count; i++) { - if (component.Bounties[i].Id == data.Id) + if (ent.Comp.Bounties[i].Id == data.Id) { - string? actorName = default; + string? actorName = null; if (actor != null) { - var getIdentityEvent = new TryGetIdentityShortInfoEvent(uid, actor.Value); + var getIdentityEvent = new TryGetIdentityShortInfoEvent(ent.Owner, actor.Value); RaiseLocalEvent(getIdentityEvent); actorName = getIdentityEvent.Title; } - component.History.Add(new CargoBountyHistoryData(data, _gameTiming.CurTime, actorName)); - component.Bounties.RemoveAt(i); + ent.Comp.History.Add(new CargoBountyHistoryData(data, + skipped + ? CargoBountyHistoryData.BountyResult.Skipped + : CargoBountyHistoryData.BountyResult.Completed, + _gameTiming.CurTime, + actorName)); + ent.Comp.Bounties.RemoveAt(i); return true; } } diff --git a/Content.Shared/Cargo/CargoBountyHistoryData.cs b/Content.Shared/Cargo/CargoBountyHistoryData.cs index 43da42d5587f..9f9809434d52 100644 --- a/Content.Shared/Cargo/CargoBountyHistoryData.cs +++ b/Content.Shared/Cargo/CargoBountyHistoryData.cs @@ -1,6 +1,6 @@ -using Robust.Shared.Serialization; using Content.Shared.Cargo.Prototypes; using Robust.Shared.Prototypes; +using Robust.Shared.Serialization; namespace Content.Shared.Cargo; @@ -13,34 +13,50 @@ public readonly partial record struct CargoBountyHistoryData /// /// A unique id used to identify the bounty /// - [DataField, ViewVariables(VVAccess.ReadWrite)] + [DataField] public string Id { get; init; } = string.Empty; /// - /// Optional name of the actor that skipped the bounty. - /// Only set when the bounty has been skipped. + /// Whether this bounty was completed or skipped. + /// + [DataField] + public BountyResult Result { get; init; } = BountyResult.Completed; + + /// + /// Optional name of the actor that completed/skipped the bounty. /// - [DataField, ViewVariables(VVAccess.ReadWrite)] + [DataField] public string? ActorName { get; init; } = default; /// /// Time when this bounty was completed or skipped /// - [DataField, ViewVariables(VVAccess.ReadWrite)] + [DataField] public TimeSpan Timestamp { get; init; } = TimeSpan.MinValue; /// /// The prototype containing information about the bounty. /// - [ViewVariables(VVAccess.ReadWrite)] [DataField(required: true)] public ProtoId Bounty { get; init; } = string.Empty; - public CargoBountyHistoryData(CargoBountyData bounty, TimeSpan timestamp, string? actorName) + public CargoBountyHistoryData(CargoBountyData bounty, BountyResult result, TimeSpan timestamp, string? actorName) { Bounty = bounty.Bounty; + Result = result; Id = bounty.Id; ActorName = actorName; Timestamp = timestamp; } + + /// + /// Covers how a bounty was actually finished. + /// Completed - Bounty was actually fulfilled and the goods sold + /// Skipped - Bounty was explicitly skipped by some actor + /// + public enum BountyResult + { + Completed = 0, + Skipped = 1, + } } diff --git a/Resources/Locale/en-US/cargo/cargo-bounty-console.ftl b/Resources/Locale/en-US/cargo/cargo-bounty-console.ftl index 4d849c5bdab8..d7a7025927fc 100644 --- a/Resources/Locale/en-US/cargo/cargo-bounty-console.ftl +++ b/Resources/Locale/en-US/cargo/cargo-bounty-console.ftl @@ -21,7 +21,6 @@ bounty-manifest-list-start = Item manifest: bounty-console-tab-available-label = Available bounty-console-tab-history-label = History -bounty-console-history-notice-completed-label = {$time} - Completed -bounty-console-history-notice-skipped-label = {$time} - Skipped by {$id} -bounty-console-history-completed-label = [color=limegreen]Completed[/color] -bounty-console-history-skipped-label = [color=red]Skipped[/color] +bounty-console-history-empty-label = No bounty history found +bounty-console-history-notice-completed-label = [color=limegreen]Completed[/color] +bounty-console-history-notice-skipped-label = [color=red]Skipped[/color] by {$id} From bd0ab98078063b081e94e53fcbdb926ffbc00f69 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Thu, 16 Jan 2025 21:21:32 +0100 Subject: [PATCH 147/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index ab08ed5fb153..3a5dde9e3e37 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,12 +1,4 @@ Entries: -- author: WarMechanic - changes: - - message: Split the Emag into the Cryptographic Sequencer and the Airlock Access - Override. - type: Add - id: 426 - time: '2024-07-09T10:47:18.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1426 - author: deltanedas changes: - message: There are now reports of a syndicate recruitment drive in NT sectors. @@ -3863,3 +3855,10 @@ id: 925 time: '2025-01-16T17:55:29.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2749 +- author: BarryNorfolk + changes: + - message: Improved bounty history console screen + type: Tweak + id: 926 + time: '2025-01-16T20:21:13.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2743 From 426b2295907d838e104c65823a93ecfd784ed9b5 Mon Sep 17 00:00:00 2001 From: Lyndomen <49795619+Lyndomen@users.noreply.github.com> Date: Thu, 16 Jan 2025 18:36:39 -0500 Subject: [PATCH 148/205] surgery and shitmed tweaks (#2721) * surgery 2 * Update chemist.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update chemist.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update chief_medical_officer.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update medical_doctor.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update paramedic.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update surgeon.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update surgery_steps.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update belts.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * limbs * comment ops * Update Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml Co-authored-by: Radezolid Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml Co-authored-by: Radezolid Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update chemist.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update chemist.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update chief_medical_officer.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update surgeon.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * maybe ops Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * whitespace Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * ples Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update base.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update vox.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update vulpkanin.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update rodentia.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update chief_medical_officer.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> --------- Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> Co-authored-by: Radezolid --- Resources/Prototypes/Body/Parts/base.yml | 6 ++--- Resources/Prototypes/Body/Parts/vox.yml | 6 ++--- .../Prototypes/Roles/Jobs/Medical/chemist.yml | 14 +++++----- .../Jobs/Medical/chief_medical_officer.yml | 2 +- .../Roles/Jobs/Medical/medical_doctor.yml | 16 +++++++----- .../Roles/Jobs/Medical/medical_intern.yml | 10 +++---- .../Roles/Jobs/Medical/paramedic.yml | 10 +++---- Resources/Prototypes/_DV/Body/Parts/harpy.yml | 8 +++--- .../Prototypes/_DV/Body/Parts/rodentia.yml | 6 ++--- .../Prototypes/_DV/Body/Parts/vulpkanin.yml | 6 ++--- .../_DV/Catalog/Fills/Items/Belts/belts.yml | 2 +- .../_DV/Roles/Jobs/Medical/surgeon.yml | 2 +- .../Entities/Surgery/surgery_steps.yml | 26 +++++++++++++------ 13 files changed, 63 insertions(+), 51 deletions(-) diff --git a/Resources/Prototypes/Body/Parts/base.yml b/Resources/Prototypes/Body/Parts/base.yml index f2a67e4c91e7..81f16b1ede0f 100644 --- a/Resources/Prototypes/Body/Parts/base.yml +++ b/Resources/Prototypes/Body/Parts/base.yml @@ -34,13 +34,13 @@ - trigger: !type:DamageTypeTrigger damageType: Slash - damage: 150 + damage: 100 # DeltaV behaviors: - !type:GibPartBehavior { } - trigger: !type:DamageTypeTrigger damageType: Heat - damage: 200 + damage: 2000 # DeltaV behaviors: - !type:SpawnEntitiesBehavior spawnInContainer: true @@ -85,7 +85,7 @@ - trigger: !type:DamageTypeTrigger damageType: Heat - damage: 400 + damage: 4000 # DeltaV behaviors: - !type:SpawnEntitiesBehavior spawnInContainer: true diff --git a/Resources/Prototypes/Body/Parts/vox.yml b/Resources/Prototypes/Body/Parts/vox.yml index 8a3d8d35a785..1610d67304b2 100644 --- a/Resources/Prototypes/Body/Parts/vox.yml +++ b/Resources/Prototypes/Body/Parts/vox.yml @@ -43,13 +43,13 @@ - trigger: !type:DamageTypeTrigger damageType: Slash - damage: 150 + damage: 100 # DeltaV behaviors: - !type:GibPartBehavior { } - trigger: !type:DamageTypeTrigger damageType: Heat - damage: 200 + damage: 2000 # DeltaV behaviors: - !type:SpawnEntitiesBehavior spawnInContainer: true @@ -106,7 +106,7 @@ - trigger: !type:DamageTypeTrigger damageType: Heat - damage: 400 + damage: 4000 # DeltaV behaviors: - !type:SpawnEntitiesBehavior spawnInContainer: true diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml index e67345d02147..f06f988860bd 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml @@ -3,7 +3,7 @@ name: job-name-chemist description: job-description-chemist playTimeTracker: JobChemist - antagAdvantage: 4 # DeltaV - Synthesize any chem you want with little oversight. + antagAdvantage: 4 # DeltaV - Synthesize any chem you want with little oversight. requirements: - !type:DepartmentTimeRequirement department: Medical @@ -15,12 +15,12 @@ - Medical - Chemistry - Maintenance - # Shitmed Change - special: - - !type:AddComponentSpecial - components: - - type: SurgerySpeedModifier - speedModifier: 1.75 + # Shitmed Change, DeltaV - role modifiers bad + # special: + # - !type:AddComponentSpecial + # components: + # - type: SurgerySpeedModifier + # speedModifier: 1.75 - type: startingGear id: ChemistGear diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index ba6040901bff..ef544491ce9b 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -49,7 +49,7 @@ - !type:AddComponentSpecial components: - type: SurgerySpeedModifier - speedModifier: 2.5 + speedModifier: 1.5 # DeltaV - type: startingGear id: CMOGear diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml index 271eeaf82ae3..a74812b3b608 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml @@ -15,13 +15,15 @@ - Maintenance extendedAccess: - Chemistry - - Paramedic # DeltaV - Add Paramedic access - - Surgery # DeltaV - Add Surgery access - special: # Shitmed change - - !type:AddComponentSpecial - components: - - type: SurgerySpeedModifier - speedModifier: 1.75 + # Begin DeltaV changes + - Paramedic # Add Paramedic access + - Surgery # Add Surgery access + #special: Shitmed change + #- !type:AddComponentSpecial + # components: + # - type: SurgerySpeedModifier + # speedModifier: 1.75 + # End DeltaV - type: startingGear id: DoctorGear diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml index 250d821b0ac4..3ba703e9a4fc 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml @@ -17,11 +17,11 @@ access: - Medical - Maintenance - special: # Shitmed change - - !type:AddComponentSpecial - components: - - type: SurgerySpeedModifier - speedModifier: 1.5 + #special: # Shitmed change. DeltaV - role modifiers bad + #- !type:AddComponentSpecial + # components: + # - type: SurgerySpeedModifier + # speedModifier: 1.5 - type: startingGear id: MedicalInternGear diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml index a9cc76817437..88760fbe0072 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml @@ -23,11 +23,11 @@ - Paramedic # DeltaV - Add Paramedic access extendedAccess: - Chemistry - special: # Shitmed change - - !type:AddComponentSpecial - components: - - type: SurgerySpeedModifier - speedModifier: 1.75 + # special: # DeltaV - role modifiers bad + # - !type:AddComponentSpecial + # components: + # - type: SurgerySpeedModifier + # speedModifier: 1.75 - type: startingGear id: ParamedicGear diff --git a/Resources/Prototypes/_DV/Body/Parts/harpy.yml b/Resources/Prototypes/_DV/Body/Parts/harpy.yml index 30a961dcfa4d..df4452b904cc 100644 --- a/Resources/Prototypes/_DV/Body/Parts/harpy.yml +++ b/Resources/Prototypes/_DV/Body/Parts/harpy.yml @@ -28,19 +28,19 @@ - trigger: !type:DamageTypeTrigger damageType: Blunt - damage: 110 + damage: 150 # DeltaV behaviors: - !type:GibPartBehavior { } - trigger: !type:DamageTypeTrigger damageType: Slash - damage: 150 + damage: 100 # DeltaV behaviors: - !type:GibPartBehavior { } - trigger: !type:DamageTypeTrigger damageType: Heat - damage: 200 + damage: 2000 # DeltaV behaviors: - !type:SpawnEntitiesBehavior spawnInContainer: true @@ -90,7 +90,7 @@ - trigger: !type:DamageTypeTrigger damageType: Heat - damage: 400 + damage: 4000 # DeltaV behaviors: - !type:SpawnEntitiesBehavior spawnInContainer: true diff --git a/Resources/Prototypes/_DV/Body/Parts/rodentia.yml b/Resources/Prototypes/_DV/Body/Parts/rodentia.yml index 98b13648acb9..b8eec27314d8 100644 --- a/Resources/Prototypes/_DV/Body/Parts/rodentia.yml +++ b/Resources/Prototypes/_DV/Body/Parts/rodentia.yml @@ -38,13 +38,13 @@ - trigger: !type:DamageTypeTrigger damageType: Slash - damage: 150 + damage: 100 # DeltaV behaviors: - !type:GibPartBehavior { } - trigger: !type:DamageTypeTrigger damageType: Heat - damage: 200 + damage: 2000 # DeltaV behaviors: - !type:SpawnEntitiesBehavior spawnInContainer: true @@ -92,7 +92,7 @@ - trigger: !type:DamageTypeTrigger damageType: Heat - damage: 400 + damage: 4000 # DeltaV behaviors: - !type:SpawnEntitiesBehavior spawnInContainer: true diff --git a/Resources/Prototypes/_DV/Body/Parts/vulpkanin.yml b/Resources/Prototypes/_DV/Body/Parts/vulpkanin.yml index ba066446bb44..a2fe99bfbf53 100644 --- a/Resources/Prototypes/_DV/Body/Parts/vulpkanin.yml +++ b/Resources/Prototypes/_DV/Body/Parts/vulpkanin.yml @@ -36,13 +36,13 @@ - trigger: !type:DamageTypeTrigger damageType: Slash - damage: 150 + damage: 100 # DeltaV behaviors: - !type:GibPartBehavior { } - trigger: !type:DamageTypeTrigger damageType: Heat - damage: 200 + damage: 2000 # DeltaV behaviors: - !type:SpawnEntitiesBehavior spawnInContainer: true @@ -81,7 +81,7 @@ - trigger: !type:DamageTypeTrigger damageType: Blunt - damage: 400 + damage: 4000 # DeltaV behaviors: - !type:GibPartBehavior { } - trigger: diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Items/Belts/belts.yml b/Resources/Prototypes/_DV/Catalog/Fills/Items/Belts/belts.yml index 452353a3e7d3..96e2cd9a72e6 100644 --- a/Resources/Prototypes/_DV/Catalog/Fills/Items/Belts/belts.yml +++ b/Resources/Prototypes/_DV/Catalog/Fills/Items/Belts/belts.yml @@ -63,7 +63,7 @@ - type: StorageFill contents: - id: Cautery - - id: Scalpel + - id: ScalpelAdvanced - id: Retractor - id: Hemostat - id: Bonesetter diff --git a/Resources/Prototypes/_DV/Roles/Jobs/Medical/surgeon.yml b/Resources/Prototypes/_DV/Roles/Jobs/Medical/surgeon.yml index f68bb8ef9c46..ec733d0cc1d7 100644 --- a/Resources/Prototypes/_DV/Roles/Jobs/Medical/surgeon.yml +++ b/Resources/Prototypes/_DV/Roles/Jobs/Medical/surgeon.yml @@ -18,7 +18,7 @@ - !type:AddComponentSpecial components: - type: SurgerySpeedModifier - speedModifier: 2.0 + speedModifier: 1.25 - type: startingGear id: SurgeonGear diff --git a/Resources/Prototypes/_Shitmed/Entities/Surgery/surgery_steps.yml b/Resources/Prototypes/_Shitmed/Entities/Surgery/surgery_steps.yml index 4b3c52dccfd9..8011e69cc0a7 100644 --- a/Resources/Prototypes/_Shitmed/Entities/Surgery/surgery_steps.yml +++ b/Resources/Prototypes/_Shitmed/Entities/Surgery/surgery_steps.yml @@ -22,8 +22,8 @@ - type: SurgeryDamageChangeEffect damage: types: - Bloodloss: 10 - Slash: 3 # DeltaV + #Bloodloss: 10 # DeltaV + Slash: 12 # DeltaV sleepModifier: 0.5 - type: SurgeryStepEmoteEffect @@ -45,7 +45,7 @@ - type: SurgeryDamageChangeEffect damage: types: - Bloodloss: -5 + Bloodloss: -3 # DeltaV sleepModifier: 2 - type: entity @@ -66,7 +66,7 @@ - type: SurgeryDamageChangeEffect # DeltaV damage: types: - Slash: 2 + Slash: 4 - type: entity parent: SurgeryStepBase @@ -106,9 +106,10 @@ sprite: _Shitmed/Objects/Specific/Medical/Surgery/retractor.rsi state: retractor - type: SurgeryDamageChangeEffect # DeltaV + sleepModifier: 0.25 # Highly invasive, large damage if the patient is wriggling around damage: types: - Blunt: 10 + Blunt: 15 #- type: entity # parent: SurgeryStepBase @@ -350,7 +351,7 @@ - type: SurgeryDamageChangeEffect # DeltaV damage: types: - Slash: 2 + Slash: 4 - type: entity parent: SurgeryStepBase @@ -368,7 +369,7 @@ - type: SurgeryTendWoundsEffect damage: groups: - Brute: -5 + Brute: -3 # DeltaV: was -5 - type: SurgeryRepeatableStep - type: entity @@ -389,6 +390,10 @@ damage: groups: Burn: -5 + - type: SurgeryDamageChangeEffect # DeltaV + damage: + types: + Slash: 2 - type: SurgeryRepeatableStep - type: entity @@ -468,7 +473,7 @@ - type: SurgeryRemoveOrganStep - type: SurgeryStepEmoteEffect - type: SurgeryDamageChangeEffect # DeltaV - sleepModifier: 0.1 # Maints organ transplants are BAD + sleepModifier: 0.15 # Maints organ transplants are BAD damage: types: Slash: 50 @@ -488,6 +493,11 @@ state: insertion - type: SurgeryAddOrganStep - type: SurgeryStepEmoteEffect + - type: SurgeryDamageChangeEffect # DeltaV + sleepModifier: 0.5 + damage: + types: + Blunt: 5 - type: entity parent: SurgeryStepInsertOrgan From e02f6f98b65976e4106b8d60f8604c38bb727491 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Fri, 17 Jan 2025 00:36:58 +0100 Subject: [PATCH 149/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 3a5dde9e3e37..6ca243318121 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: deltanedas - changes: - - message: There are now reports of a syndicate recruitment drive in NT sectors. - type: Add - id: 427 - time: '2024-07-09T10:48:04.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1345 - author: Velcroboy changes: - message: Added clipboards to the Law Drobe @@ -3862,3 +3855,15 @@ id: 926 time: '2025-01-16T20:21:13.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2743 +- author: Lyndomen + changes: + - message: Surgery now does a lil more damage! Keep your patients asleep! + type: Tweak + - message: Limbs have a lot more burn resist, and a lil less slash resist. Be careful! + type: Tweak + - message: Role based speed modifications have been removed, Medical is no longer + intrinsically faster at surgery. + type: Tweak + id: 927 + time: '2025-01-16T23:36:40.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2721 From 51f9a885e22015ad2706ea1b8dc91967d8320311 Mon Sep 17 00:00:00 2001 From: boogiebogus <53976699+boogiebogus@users.noreply.github.com> Date: Thu, 16 Jan 2025 18:47:04 -0500 Subject: [PATCH 150/205] Add new wall lockers + other storage bonuses (#2636) * add new wall lockers * add new tall lockers * file off the serial numbers on science crate * correct whitespace & meta.json * nuke appearance for real --------- Signed-off-by: boogiebogus <53976699+boogiebogus@users.noreply.github.com> --- .../Storage/Closets/Lockers/lockers.yml | 8 +- .../Structures/Storage/Crates/crates.yml | 4 +- .../Storage/Closets/Lockers/lockers.yml | 36 +++ .../Storage/Closets/Lockers/wall_lockers.yml | 218 ++++++++++++++++++ .../Storage/Crates/epistemics.rsi/base.png | Bin 0 -> 507 bytes .../Storage/Crates/epistemics.rsi/closed.png | Bin 0 -> 227 bytes .../Storage/Crates/epistemics.rsi/icon.png | Bin 0 -> 527 bytes .../Storage/Crates/epistemics.rsi/meta.json | 39 ++++ .../Storage/Crates/epistemics.rsi/open.png | Bin 0 -> 252 bytes .../Crates/epistemics.rsi/sparking.png | Bin 0 -> 206 bytes .../Storage/Crates/epistemics.rsi/welded.png | Bin 0 -> 294 bytes .../Structures/Storage/closet.rsi/chef.png | Bin 0 -> 519 bytes .../Storage/closet.rsi/chef_door.png | Bin 0 -> 539 bytes .../Storage/closet.rsi/chef_open.png | Bin 0 -> 503 bytes .../_DV/Structures/Storage/closet.rsi/epi.png | Bin 0 -> 238 bytes .../Storage/closet.rsi/epi_door.png | Bin 0 -> 541 bytes .../Storage/closet.rsi/epi_open.png | Bin 0 -> 211 bytes .../Structures/Storage/closet.rsi/jani.png | Bin 0 -> 519 bytes .../Storage/closet.rsi/jani_door.png | Bin 0 -> 556 bytes .../Storage/closet.rsi/jani_open.png | Bin 0 -> 503 bytes .../Structures/Storage/closet.rsi/meta.json | 29 ++- .../Storage/wall_locker.rsi/atmos.png | Bin 0 -> 471 bytes .../Storage/wall_locker.rsi/atmos_door.png | Bin 0 -> 554 bytes .../Storage/wall_locker.rsi/atmos_open.png | Bin 0 -> 522 bytes .../Storage/wall_locker.rsi/bio.png | Bin 0 -> 454 bytes .../Storage/wall_locker.rsi/bio_door.png | Bin 0 -> 571 bytes .../Storage/wall_locker.rsi/bio_jani.png | Bin 0 -> 475 bytes .../Storage/wall_locker.rsi/bio_jani_door.png | Bin 0 -> 583 bytes .../Storage/wall_locker.rsi/bio_jani_open.png | Bin 0 -> 497 bytes .../Storage/wall_locker.rsi/bio_open.png | Bin 0 -> 469 bytes .../Storage/wall_locker.rsi/bio_sec.png | Bin 0 -> 475 bytes .../Storage/wall_locker.rsi/bio_sec_door.png | Bin 0 -> 589 bytes .../Storage/wall_locker.rsi/bio_sec_open.png | Bin 0 -> 497 bytes .../Storage/wall_locker.rsi/bio_viro.png | Bin 0 -> 475 bytes .../Storage/wall_locker.rsi/bio_viro_door.png | Bin 0 -> 589 bytes .../Storage/wall_locker.rsi/bio_viro_open.png | Bin 0 -> 497 bytes .../Storage/wall_locker.rsi/botany.png | Bin 0 -> 482 bytes .../Storage/wall_locker.rsi/botany_door.png | Bin 0 -> 559 bytes .../Storage/wall_locker.rsi/botany_open.png | Bin 0 -> 520 bytes .../Storage/wall_locker.rsi/chef.png | Bin 0 -> 471 bytes .../Storage/wall_locker.rsi/chef_door.png | Bin 0 -> 549 bytes .../Storage/wall_locker.rsi/chef_open.png | Bin 0 -> 520 bytes .../Storage/wall_locker.rsi/engi.png | Bin 0 -> 471 bytes .../Storage/wall_locker.rsi/engi_door.png | Bin 0 -> 555 bytes .../wall_locker.rsi/engi_electrical_door.png | Bin 0 -> 568 bytes .../Storage/wall_locker.rsi/engi_generic.png | Bin 0 -> 454 bytes .../wall_locker.rsi/engi_generic_open.png | Bin 0 -> 491 bytes .../Storage/wall_locker.rsi/engi_open.png | Bin 0 -> 522 bytes .../Storage/wall_locker.rsi/engi_rad_door.png | Bin 0 -> 565 bytes .../wall_locker.rsi/engi_tools_door.png | Bin 0 -> 553 bytes .../wall_locker.rsi/engi_welding_door.png | Bin 0 -> 573 bytes .../Storage/wall_locker.rsi/epi.png | Bin 0 -> 471 bytes .../Storage/wall_locker.rsi/epi_door.png | Bin 0 -> 550 bytes .../Storage/wall_locker.rsi/epi_open.png | Bin 0 -> 520 bytes .../Storage/wall_locker.rsi/generic.png | Bin 0 -> 219 bytes .../Storage/wall_locker.rsi/generic_door.png | Bin 0 -> 372 bytes .../Storage/wall_locker.rsi/generic_icon.png | Bin 0 -> 321 bytes .../Storage/wall_locker.rsi/generic_open.png | Bin 0 -> 339 bytes .../Storage/wall_locker.rsi/jani.png | Bin 0 -> 471 bytes .../Storage/wall_locker.rsi/jani_door.png | Bin 0 -> 571 bytes .../Storage/wall_locker.rsi/jani_open.png | Bin 0 -> 520 bytes .../Storage/wall_locker.rsi/justice.png | Bin 0 -> 470 bytes .../Storage/wall_locker.rsi/justice_door.png | Bin 0 -> 545 bytes .../Storage/wall_locker.rsi/justice_open.png | Bin 0 -> 528 bytes .../Storage/wall_locker.rsi/locked.png | Bin 0 -> 138 bytes .../Storage/wall_locker.rsi/logi.png | Bin 0 -> 467 bytes .../Storage/wall_locker.rsi/logi_door.png | Bin 0 -> 548 bytes .../Storage/wall_locker.rsi/logi_open.png | Bin 0 -> 520 bytes .../Storage/wall_locker.rsi/meta.json | 177 ++++++++++++++ .../Storage/wall_locker.rsi/salv.png | Bin 0 -> 471 bytes .../Storage/wall_locker.rsi/salv_door.png | Bin 0 -> 558 bytes .../Storage/wall_locker.rsi/salv_open.png | Bin 0 -> 520 bytes .../Storage/wall_locker.rsi/sec.png | Bin 0 -> 470 bytes .../Storage/wall_locker.rsi/sec_door.png | Bin 0 -> 545 bytes .../Storage/wall_locker.rsi/sec_open.png | Bin 0 -> 528 bytes .../Storage/wall_locker.rsi/unlocked.png | Bin 0 -> 144 bytes .../Storage/wall_locker.rsi/welded.png | Bin 0 -> 218 bytes 77 files changed, 505 insertions(+), 6 deletions(-) create mode 100644 Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/wall_lockers.yml create mode 100644 Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/base.png create mode 100644 Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/closed.png create mode 100644 Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/icon.png create mode 100644 Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/meta.json create mode 100644 Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/sparking.png create mode 100644 Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/welded.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/chef.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/chef_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/chef_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/epi.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/epi_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/epi_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/jani.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/jani_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/jani_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/atmos.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/atmos_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/atmos_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_jani.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_jani_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_jani_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_sec.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_sec_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_sec_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_viro.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_viro_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_viro_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/botany.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/botany_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/botany_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/chef.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/chef_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/chef_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_electrical_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_generic.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_generic_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_rad_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_tools_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_welding_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/epi.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/epi_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/epi_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/generic.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/generic_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/generic_icon.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/generic_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/jani.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/jani_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/jani_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/justice.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/justice_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/justice_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/locked.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/logi.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/logi_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/logi_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/meta.json create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/salv.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/salv_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/salv_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/sec.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/sec_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/sec_open.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/unlocked.png create mode 100644 Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/welded.png diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml index e6c1e0a0b1bf..2da75b35ef51 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -291,10 +291,12 @@ name: scientist's locker components: - type: Appearance + - type: Sprite # DeltaV - label locker with "E" for epi + sprite: _DV/Structures/Storage/closet.rsi - type: EntityStorageVisuals - stateBaseClosed: science - stateDoorOpen: science_open - stateDoorClosed: science_door + stateBaseClosed: epi # DeltaV + stateDoorOpen: epi_open # DeltaV + stateDoorClosed: epi_door # DeltaV - type: AccessReader access: [ [ "Research" ] ] diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml index adfb26d9ffd8..5a5cfa3dc48b 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml @@ -115,9 +115,9 @@ name: epistemics crate # DeltaV - Epistemics Department replacing Science components: - type: Icon - sprite: Structures/Storage/Crates/science.rsi + sprite: _DV/Structures/Storage/Crates/epistemics.rsi # DeltaV - Epistemics Department replacing Science - type: Sprite - sprite: Structures/Storage/Crates/science.rsi + sprite: _DV/Structures/Storage/Crates/epistemics.rsi # DeltaV - Epistemics Department replacing Science - type: entity parent: CrateGenericSteel diff --git a/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/lockers.yml index fd0c2a321bdd..85e0a87890e8 100644 --- a/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -71,6 +71,42 @@ - type: AccessReader access: [["Command"]] +- type: entity + parent: LockerBaseSecureDeltaV + id: LockerKitchen + name: kitchen locker + components: + - type: EntityStorageVisuals + stateBaseClosed: chef + stateDoorOpen: chef_open + stateDoorClosed: chef_door + - type: AccessReader + access: [["Kitchen"]] + +- type: entity + parent: LockerBaseSecureDeltaV + id: LockerJanitor + name: janitor's locker + components: + - type: EntityStorageVisuals + stateBaseClosed: jani + stateDoorOpen: jani_open + stateDoorClosed: jani_door + - type: AccessReader + access: [["Janitor"]] + +- type: entity + parent: LockerBaseSecure + id: LockerLogistics # Wizden has sprites for this but doesn't have an entity that uses them? + name: logistics locker + components: + - type: EntityStorageVisuals + stateBaseClosed: cargo + stateDoorOpen: cargo_open + stateDoorClosed: cargo_door + - type: AccessReader + access: [["Cargo"]] + - type: entity parent: LockerBaseSecureDeltaV id: LockerArmoryStorage diff --git a/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/wall_lockers.yml b/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/wall_lockers.yml new file mode 100644 index 000000000000..4a51cf0eabbb --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/wall_lockers.yml @@ -0,0 +1,218 @@ +- type: entity + parent: BaseWallCloset + id: BaseWallClosetDeltaV + components: + - type: Sprite + sprite: _DV/Structures/Storage/wall_locker.rsi + +- type: entity + parent: BaseWallLocker + id: BaseWallLockerDeltaV + components: + - type: Sprite + sprite: _DV/Structures/Storage/wall_locker.rsi + +- type: entity + parent: BaseWallClosetDeltaV + id: WallClosetTools + name: tool wall closet + components: + - type: EntityStorageVisuals + stateBaseClosed: engi_generic + stateDoorClosed: engi_tools_door + stateDoorOpen: engi_generic_open + +- type: entity + parent: BaseWallClosetDeltaV + id: WallClosetRadiationSuit + name: radiation suit wall closet + components: + - type: EntityStorageVisuals + stateBaseClosed: engi_generic + stateDoorClosed: engi_rad_door + stateDoorOpen: engi_generic_open + +- type: entity + parent: BaseWallClosetDeltaV + id: WallClosetL3 + name: level 3 biohazard wall closet + components: + - type: EntityStorageVisuals + stateBaseClosed: bio + stateDoorClosed: bio_door + stateDoorOpen: bio_open + +- type: entity + parent: WallClosetL3 + id: WallClosetL3Janitor + name: level 3 biohazard wall closet + components: + - type: EntityStorageVisuals + stateBaseClosed: bio_jani + stateDoorClosed: bio_jani_door + stateDoorOpen: bio_jani_open + +- type: entity + parent: WallClosetL3 + id: WallClosetL3Security + name: level 3 biohazard wall closet + components: + - type: EntityStorageVisuals + stateBaseClosed: bio_sec + stateDoorClosed: bio_sec_door + stateDoorOpen: bio_sec_open + +- type: entity + parent: WallClosetL3 + id: WallClosetL3Virology + name: level 3 biohazard wall closet + components: + - type: EntityStorageVisuals + stateBaseClosed: bio_viro + stateDoorClosed: bio_viro_door + stateDoorOpen: bio_viro_open + +- type: entity + parent: BaseWallLockerDeltaV + id: WallLockerAtmos + name: atmospherics wall locker + components: + - type: EntityStorageVisuals + stateBaseClosed: atmos + stateDoorClosed: atmos_door + stateDoorOpen: atmos_open + - type: AccessReader + access: [["Atmospherics"]] + +- type: entity + parent: BaseWallLockerDeltaV + id: WallLockerEngi + name: engineering wall locker + components: + - type: EntityStorageVisuals + stateBaseClosed: engi + stateDoorClosed: engi_door + stateDoorOpen: engi_open + - type: AccessReader + access: [["Engineering"]] + +- type: entity + parent: BaseWallLockerDeltaV + id: WallLockerElectrical + name: electrical wall locker + components: + - type: EntityStorageVisuals + stateBaseClosed: engi_generic + stateDoorClosed: engi_electrical_door + stateDoorOpen: engi_generic_open + - type: AccessReader + access: [["Engineering"]] + +- type: entity + parent: BaseWallLockerDeltaV + id: WallLockerWelding + name: welding tools wall locker + components: + - type: EntityStorageVisuals + stateBaseClosed: engi_generic + stateDoorClosed: engi_welding_door + stateDoorOpen: engi_generic_open + - type: AccessReader + access: [["Engineering"]] + + +- type: entity + parent: BaseWallLockerDeltaV + id: WallLockerBotany + name: botanist wall locker + components: + - type: EntityStorageVisuals + stateBaseClosed: botany + stateDoorClosed: botany_door + stateDoorOpen: botany_open + - type: AccessReader + access: [["Hydroponics"]] + +- type: entity + parent: BaseWallLockerDeltaV + id: WallLockerSalvage + name: salvage wall locker + components: + - type: EntityStorageVisuals + stateBaseClosed: salv + stateDoorClosed: salv_door + stateDoorOpen: salv_open + - type: AccessReader + access: [["Salvage"]] + +- type: entity + parent: BaseWallLockerDeltaV + id: WallLockerLogistics + name: logistics wall locker + components: + - type: EntityStorageVisuals + stateBaseClosed: logi + stateDoorClosed: logi_door + stateDoorOpen: logi_open + - type: AccessReader + access: [["Cargo"]] + +- type: entity + parent: BaseWallLockerDeltaV + id: WallLockerJanitor + name: janitor wall locker + components: + - type: EntityStorageVisuals + stateBaseClosed: jani + stateDoorClosed: jani_door + stateDoorOpen: jani_open + - type: AccessReader + access: [["Janitor"]] + +- type: entity + parent: BaseWallLockerDeltaV + id: WallLockerEpistemics + name: epistemics wall locker + components: + - type: EntityStorageVisuals + stateBaseClosed: epi + stateDoorClosed: epi_door + stateDoorOpen: epi_open + - type: AccessReader + access: [["Research"]] + +- type: entity + parent: BaseWallLockerDeltaV + id: WallLockerSecurity + name: security wall locker + components: + - type: EntityStorageVisuals + stateBaseClosed: sec + stateDoorClosed: sec_door + stateDoorOpen: sec_open + - type: AccessReader + access: [["Security"]] + +- type: entity + parent: BaseWallLockerDeltaV + id: WallLockerKitchen + name: kitchen wall locker + components: + - type: EntityStorageVisuals + stateBaseClosed: chef + stateDoorClosed: chef_door + stateDoorOpen: chef_open + - type: AccessReader + access: [["Kitchen"]] + +- type: entity + parent: BaseWallLockerDeltaV + id: WallLockerJustice + name: justice wall locker + components: + - type: EntityStorageVisuals + stateBaseClosed: justice + stateDoorClosed: justice_door + stateDoorOpen: justice_open + - type: AccessReader + access: [["Justice"]] diff --git a/Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/base.png b/Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..bc2127c171dcfc78603f16c57cff44df11fced41 GIT binary patch literal 507 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil&0(?ST{r&yt@IE|#{CHYgT2xfjD%p4U@86$3eR>DyQJ|7)7k&>Q#Z?mI z7yKUv7&e{JIS&-&EbxddW?QV0J5OE3=IrGvM;ZGvp97trwYi-@^o50Y{w^=r> zIC$+Jqm#uxhm!&&XB6H$734jbRs5e#b&eyajQfLXsU=&O@489!|Bh(U0lC1_)z4*} HQ$iB}_M3_} literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/closed.png b/Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/closed.png new file mode 100644 index 0000000000000000000000000000000000000000..d6ff085b18131ec0d36e93e5610592e2e3fa40df GIT binary patch literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}b3I)gLn2z= zPT9zNM1jY(-fug@)awbtZV5VBZVQrmcAa_9B{=Dn;FBglr(KIbuAXpT{Fl(7hD92u zlFTeEp7$+x@XD0_8F~Fzxpj|Wnc{m}Ck}RoCv&XrUmxL)ZH#*D9-OWFWYO;VrMl}E z{uGXK;Evhf(2>ydQbjQFN&4Np@vJi>fA1@IOmowGdhxu~OwQBuAH3H3C%UOi)HQI* a(>YzcbMnvRhRp{$l)=;0&t;ucLK6T63|oQ# literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/icon.png b/Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..0651f345bd98b45ab7d2031edc12c8f9aabdeb6f GIT binary patch literal 527 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil&0(?ST{r&wveE2YZ`tUuN)DXx+r zzu^Bcz_96z&Uv6HXMsm#F#`kNVGw3Kp1&dmC@4|l8c`CQpH@$cc0dZzK3s^i0$OeG~AO`7&(P)-30K;PfI|B<)g@KW=0pkLQsURJ!3m_&<0kT1W z31|)zSY?o<1&{^RWoTdkl6`sgo5iVHIaNSrou`Xqh=u>#{)1eH4S1Yok9$u4|No(9 zU$w{KJx>13wk%!`LvvGV9_srjbO`Silh$+yxtTpxKuf^*Th!O~mSfzeK*rLutjv3U zhKbGpkgTTSvrvA4(xMvQzyD9{{P604fZy>Qi)R-+Tx>AE%3rL&?VY}WtC^EWf#UO( a2FIlB?8Ov!N!c$4xysYk&t;ucLK6TG_>uhp literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/meta.json b/Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/meta.json new file mode 100644 index 000000000000..aa8d0e1c1823 --- /dev/null +++ b/Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Original sprites by EmoGarbage404 (github) for Space Station 14. Modifications to icon done by bogus_0451 (discord).", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "closed" + }, + { + "name": "open" + }, + { + "name": "welded" + }, + { + "name": "sparking", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/open.png b/Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/open.png new file mode 100644 index 0000000000000000000000000000000000000000..ec1f8c5956ecb8065ad6ca33148a9312030acf11 GIT binary patch literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}+dN$yLn2z= zPT9zNM1jY3?&YaGhnZ#`thF**aE4<_iRR^t#?9g%++wC`u)Le%?3npS>p}DnPY!0A zGaGc5WqNIG5;*ihH~(zkPrZhYlhyM@BeOUEHOxP|&E{AH*O|{TllRI#zoYlTuKf&; z%ax@cE&3L0J$H_aQHg13h&ZE?7E4^L)!#;rjsuUGZkng01$Z?YF7w`88rwK?y{K|h z)HGGaq|#~kOOKydx8Uy;d$+?`fW=XOWudlwZM4UM_(^b literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/sparking.png b/Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/sparking.png new file mode 100644 index 0000000000000000000000000000000000000000..87b78b9b4653d54a703643d161f7f8bf353995df GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^2|(QXSZ^$5X5FCBsLJs@fG2hgpXAxzo?UdK185n8r>mdKI;Vst0DN#gB>(^b literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/welded.png b/Resources/Textures/_DV/Structures/Storage/Crates/epistemics.rsi/welded.png new file mode 100644 index 0000000000000000000000000000000000000000..311739a2701db289577b99dbe6910bad2a1f9010 GIT binary patch literal 294 zcmV+>0oneEP)Px#;7LS5R9J=W&@pPmFcik|zaXFl(jeJ6O@`tl=oZdmyk;mg&>^$8rgN@rKUr+ydP+h^u7-Xlu}A5rBsKA++{7(RQ}s(h7P+y+uhDA(^O99 zGi6z}b0Gxr&S9-(?meHE3v=%QxHV0i6?xC=di|@fw-G`R06QAtl)`= zFW~EXWjdPy@Vr=1Rn<>n6!E^_1CS(1ZzjvKws-IcUREpVzT#;z;np-1MPc$h7l708 sh>v6Jc-*`9w%PodZOmY;Qc69TZ;Wzr1AKHN?EnA(07*qoM6N<$f;^dk6951J literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/chef.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/chef.png new file mode 100644 index 0000000000000000000000000000000000000000..a8bc5964de1d19e93e0a3eb7d93d73f6aa7950fd GIT binary patch literal 519 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil&0(?STBO@bwdV0>CJEx|mcH_p4r%#`Thlg8OSgc;X8mPpw^PMt~;wlO9 z3;quS44cmAoCk_>7I;J!GcfQS24TkI`72U@f)XXJ5hcO-X(i=}MX3w{iJ5sNdVa1U z3Z{C7dPcwZFmD5@*_ImNnda%K#lQjNurf$7vNA9NSzbUa4P}FTqru1w7H0yo4H=mj z1b}oD5NEctfW@VE}H;YrZa;kvLGEW!B5DWjOlf1bODDbd;z8Lks{-GOh zW{ZephWXsyPco161H>&DWu!R2i%jU4Y4svWcE4cIx#JV9HH8BB&fDlQu6P)-(BhCT zmsGu=$Kgne-gd5CT2p?kEDenazaiqb*`$m$S1fV6lTnL*v8$=6MMg&Q@bCZ?PFgOp z8%Xh#1o;L3M*s$)`{&L9#W@Q+B8wRq_zr_G*AN9$JwrXC-+P$10o80vjqptK^weVD0CHFvq!?Kl7=bJ=AeM%*LB7&pWCn{f z0ojI(Obh}*Itqw0+gZTkSwJ=jBmgl;Ka57RlmQqn6WAG8fGP}(j13qUKuiVcU|j$) zX$p`H0!%=2n7}H7EG>X6s4hbT1CZ>?tKTe6-O8x~GMhYI978PppH6V(Yf#`}S-YX@ z)BpdwbbFmbY_c8|G~~4T-cq#xV4o-;>2CPyO1_ff5ec4;9aq+IMhUEw?qawk8kfI8 zP_*Ae*=1gn`x2o57M~dp1v6WZoR6?-GJW6}Ap(@r*w((gt(M>RAvf=_UWO%0SdS`UUZM)?*bKt_ldePAeVW%`njxgN@xNA*Mg4S literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/chef_open.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/chef_open.png new file mode 100644 index 0000000000000000000000000000000000000000..3d96d8e1dab2018e0265528108e8a396c7cb9497 GIT binary patch literal 503 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikt0(?STBO@c9K7D%b+_|2fo}!{6pm5m6nq@$Wtt7}V_&*3RY~H_QKTw3T zz$3Dlfr0NZ2s0kfUy%Y7lqhkHC<)F_D=AMbN@WO0%*-p%^K%VRFx4~EGy1)Uc^gp8 zw$upEG*3@01`Z&Hl|hP;m4Ok+@&aOMC>!K@4Mt|LI1`X<$jHPX0HmXUIJ2DvES?2q zgFpfhgY?5_G)ozP{-40kzyefZU}S8-xBy}*NC)czh)Gj`Y!F}qn!^NE8DwbzWI=Tq z8W@0NUtaxYaq3o16_8ox>Eak-;eU6MH&=rLk8}3&z5l1aRnOCMb1Zn++^AT|GEs2< zL;oh0Qp?FxPlzeZC|SA6rK7Cy;F%o?pYj~59R+=YR|B^$7jR~I; z7!NraWGeCrzj8NR7-kn?z#^=pvrXX1X*YwDuQrvG-)EfeEa><|j{7&rHJ+}1F6*2U FngEoLf$jhR literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/epi.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/epi.png new file mode 100644 index 0000000000000000000000000000000000000000..3a10fee58ecda965af524a9bb589b64f172d7d1c GIT binary patch literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dy#sNMdu0UE(R^Qgv&fVQTARr*j zJR&6}H76&x%(1$@p>aA0%-pM7tG-B>_!@p zlj-T=7-Dhy>E*jz4GKIBfpd3mDf;!#KiWe_Uv09(t{1z%KH&FBKGv*OXe(Ihzm-M4 zF~*By=`_`b>rdD2jc>ffx6ae%(Aqok44n!^c^4h7F!(T8e;2a}zRxIqosr#~SHrpc f?en7_?dzFDCvf|?o5d&qEoJa@^>bP0l+XkKi6mI^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/epi_door.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/epi_door.png new file mode 100644 index 0000000000000000000000000000000000000000..378b6b7e8d11492f527f1fc8334eeedf2a326b26 GIT binary patch literal 541 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik70(?STSFc`o_3F(s$LgaePKTLCboKNCWsHoBY;ElvHJzjcq=4K@CmLS> zDV~xbzu^A}z#w%0+&Q2)XMsm#F#`kNVGw3Kp1&dmC@4|l8c`CQpH@$cc0dZzK3s^i0$OeG~AO`7&(P)-30K;VhI|B<)g@KW=0pkLQsURJ!3m_&< z0kT1W31|)zSY?o<1&{^RWoTdkl6`sgo5iVHIaNSri>HfYh=u>t366Y+40u>xTP@r2 z^M8G0e)t0pQyIr3z0PfmC(c@0|KNYi(VW=c9clqA#rbDDGnuwJG&b&f#j;!=L91r( zfp{O2M#l_|IT=i@9M7NcI4U;lfW{I-(TI*n##6QzS=baGTE~dadv73Ix6nbarK9#d m!v&TuhCb)%;)_4Hz32ZLq9XbJe)egQ+dN(UT-G@yGywpabCl8m literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/epi_open.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/epi_open.png new file mode 100644 index 0000000000000000000000000000000000000000..039b747226fa2ecb492cbe8f50ce11a3b1de66e3 GIT binary patch literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv=>VS)S0HU`YZnq4T2)=!)zf?Q z#AzTncka@Q7jM1Q4M6%BOM?7@862M7NCR@xJY5_^G|nd{NN60;&}cX#Dl+9ohJ)CI z7a6>+q8z+lKqAORm_tNqfs@RNMGUSCE0{tR0z`ZjOr|t6a0DnY9Mylpq;!KtCV;i+ z0!ss*vnYerTpm%j6&q9iy!t)x7$D3u`~F*C13&(AeP z!Bo#s&*=9a=50VV+fpMu(>y)37&w3&Rt70XRtAtQUO+4jWrKX9!N?32X9BVf8JQRa zfOHfPXSTC|#j}8H5J&)GkbW4AW+?+R1H%M%1{RSYP${-eX%g!S%qM6F?cx0*}aIpn}67%y>M1MG8<*qQo_#Bsf2@9X z7@5K1OhC3FBNKxFkd6Z4%yt&AcovWi0trA2(hsB2EM)+O&jfY`7N80PBVz-`1rSp~ zI#?G#Oqv2@g8&oI944^JAWI7%3#!Y|zyKus^6EE>Q@3)efXr@B7sn6_|ECj9^Bq>; zVRE&^4( z`F}z9-@=1C1wx+R literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/jani_open.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/jani_open.png new file mode 100644 index 0000000000000000000000000000000000000000..5f70aabc886b9cf8a510cdf10fd376548ed31f19 GIT binary patch literal 503 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikt0(?STJv=oSd8t6tSYP${|{Z?I`FIw1QRb$wH^*gij79_?H|qY)tr+ zz<9{XAXAY~_?5fi!Z5oC0~TQ&ooxb7PP-YLe6^{h{66D!XF 2024. Security lockers modified by TJohnson.", + "copyright": "Taken from tgstation, added psych locker based on medical locker and admin assist based on captain's locker by Radezolid, CJ and Clerk lockers edited by Timemaster99 (Discord). Surgeon's locker by Janet Blackquill 2024. Security lockers modified by TJohnson. Chef, janitor, and epistemics door modified from tgstation sprites by bogus_0451 (Discord).", "license": "CC-BY-SA-3.0", "states": [ { @@ -73,6 +73,33 @@ { "name": "admin_assist_open" }, + { + "name": "epi" + }, + { + "name": "epi_door" + }, + { + "name": "epi_open" + }, + { + "name": "jani" + }, + { + "name": "jani_door" + }, + { + "name": "jani_open" + }, + { + "name": "chef" + }, + { + "name": "chef_door" + }, + { + "name": "chef_open" + }, { "name": "brigmedic_door" }, diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/atmos.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/atmos.png new file mode 100644 index 0000000000000000000000000000000000000000..16614ee5bb00c5261f36182d34c5e79ff53c82af GIT binary patch literal 471 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil21AIbU3*rPiOGFs*CNo4=T3K1y*w{EaI=Z;H0Oe1rdNcqj&XOR%;Qvs- z5bR$e1QIOph%9Dc;5!V$jK}j=qyPmaN?apKg7ec#$`gxH83GbB^GfvmTtgI0^$hil ze(z!422`^xHNrE^(^HFq1IS@zkYZ$IU<9(ffLI#J2KhvTkr^z`1Y{dBGBF4M=_nx1 zY-a(BX93wDkO0IW{V*EMQU+jHOkihV0je-CGB#jb05KJ$gLMJKq$xl)2rvQ7VFIfR zva|rQpt=kV3_!9kuYR*Qbt|U|$n^4baSXBWe|pKA3mDk0fp1^`3!me3VfGXO7nk$} z3gsG|kJmOtv?g5cslI<`Nz#_g9rF!69z0iQc6MZ}c4XbowDp(9clGpl>`J`OC6doC Se7h6~vcc2U&t;ucLK6UPIB;$N literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/atmos_door.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/atmos_door.png new file mode 100644 index 0000000000000000000000000000000000000000..1e2a76a98e79d5af798fbb91c2d6a1417595669c GIT binary patch literal 554 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilI0(?STx6Dy_buoxx>Hib!bQzk~y|~`O5M9ZTH+fOFY-fpxnTD027JFo5 zBvASNb9e6mDZY{*zu^DKfWh^^ofAMA&H|6fVxWS&q9iy!t)x7$ zD3u`~F*C13&(AeP!Bo#s&*=9a=50VV+fpMu(>y)37&w3&Rt70XRt82O%L|C5p=^-v zG#Ht|;!HrcAtMum0FaIX;>>myuy_`b4FU;34AKvy(JW;EhR+0c1{RSYP${g-G%%IPd?*l!VxAYyjSGS&@Mz8FFfv~$8M4Ru4I}5qlj*WGZYnn>bg^vJ@8QuZEPAmeP`4sh;xWs5 WPx+N=S3QphImpx1&t;ucLK6Tv&5XqW literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio.png new file mode 100644 index 0000000000000000000000000000000000000000..8b416035e4c2aba1f4406188837aef73e35f956b GIT binary patch literal 454 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij?1AIbUJ;fNZ6&b9otZZy-93359TwH)M$5v)608;EFL4Lvi!GJ-^o7oL0 z#981GSIesvJDxT7zBWH6cA^&vw+33 zfNT)>RL02g0_af~jbT>? z%MA?;M~@x_YN}m+bsCToC<*cl{*MY69w^630_8XhJR*x382Ao>Fr%o3R|8N`qQo_# zBsf2+QC7@5K1OhC3FBNKxFkd6Z4%yt&AcovWi0-wql8D0Pb14g4+$^ev_z|Oz| zRB2#jY{0kxVk*c+)&&rgrU2O>zyvgx39K^6(gMhW>M}Gi0Lk`Q9}K@NzQ+&9oaE`^ z7-Hdncfv)!!wMX(qG{K|CjS3_Tk+tP+(+}S3okzT^~oivAMEAAPBIcn)-#oPT)6K` zF?>)gzws^7S^P@`=MAkGM{O~tq}zY;cg)~C`HrQMgWEl^x@_Bq^HP1Aix2RLSt%Et z6RYEN6?fS5Ay~sl literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_jani.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_jani.png new file mode 100644 index 0000000000000000000000000000000000000000..f8959dc0b659aa20af298be2ba45a9d81d4d46dd GIT binary patch literal 475 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil21AIbU{kgpJ_%f}mtZZy-TFM2JBY7Mh9bH^pfbvrd&nE#X&XOR%;Qvs- z5bR$e1QIOph%9Dc;5!7ujG`J|4M0JO64!{5;QX|b^2DN4hJeJ(yb?V>*AN9$JwrXC z-+P$10o80vjqptK^weVD0CHFvq!?Kl7=bJ=AeM%*K|ax7WCn{f0ojI(Obh}*Itqw0 z+gZTkSwJ=jd@5sPcmebsD5qauH!WnHiIGyj90|5(LmimH4+pj&vxw!+xH ZW5w}plIIPVb!C8T@pScbS?83{1OTukaWnt` literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_jani_door.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_jani_door.png new file mode 100644 index 0000000000000000000000000000000000000000..4dd27606658495f7dec30b6ff420ca62a9ff679d GIT binary patch literal 583 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilg0(?ST7mCc@68B?P2Y6`$g8w z7P@@-azjJI(W6IO$_0U1TN$_704br8Aiv=M=z!tT{{2EgSQV0J5OE3=IrGvVGPE!!L{P z@dGladAc};Soq(a5Xi@*$iv!rYM1s>o$veCw2G|t`WUUwGU@n}sSjR>|MM+~TbN{- z{nhcIYE32wqh1Yr?tD|8h4R{rQLUO^x>^}7nEmGUPji}L-DdCPq?>d7;InU$hYO`; z68VL)6dyKAEN+o^ddF?(`9m*7@896UujuZtoO-u0lC)G)z4*}Q$iB}^Si9C literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_jani_open.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_jani_open.png new file mode 100644 index 0000000000000000000000000000000000000000..1bdf3d3439ec783355d25a9ebccd2c5a3d97b23d GIT binary patch literal 497 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCiji0(?ST^Y}9NSZ!Mb$b#xJG%x_k_E{eczbwAT56H~$ba4!^@V`2Fw@`xu4@>{`kN@j+Ixi~mEj(Cw zM{m1z$pZZ!p$(BMtsAC%sWF;!W6JZ!8;$}Ub>bP0l+XkK^ZtKG literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_open.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_open.png new file mode 100644 index 0000000000000000000000000000000000000000..13fe146c216dc6adf351678275d64875aacbb273 GIT binary patch literal 469 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCim11AIbUvlSV(*)a6zG1O=Rg&3YK*ewX8SWANZg8u^n!|!c;!9W4d0*}aI z1_r)EAj~ML;ne^XlqhkHC<)F_D=AMbN@WO0%*-p%^K%VRFx4~EGy1)Uc^gp8w$upE zG*3@01`Z&Hl|hP;m4Ok+@&aOMC>!K*4Mt|LI1`X<$jHPX0HmXUIJ2DvES?2qgTSXU zMurza55j0POBsMt6WAG8fGQ1)j13qUKuiVM$hrVx(i9*Y1ek#4GJ#bFSy}*DP+f)w z1|Zo!>x1E!#rOCDnGv2Yjv*HQS0_309Z=w4Ir#K{{<<}DGLAT}?kp}&*Hi1z-Jvxh z@?@+_$j_R~bE9)VAIM$K5%Zqcfa%DDpN1KRDSa#t`D;E$Gc4d@m>0?;x$D&yZTD^L ZY5beS`9g%8b3yUM;OXk;vd$@?2>``yZjS%} literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_sec.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_sec.png new file mode 100644 index 0000000000000000000000000000000000000000..1bd3cf6c8ba20190c5f295b5f6594345991875ae GIT binary patch literal 475 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil21AIbUJ;fNZ6&b9otZZy-lGzxXm>C=$9bH^pfbvTk%4Py7&XOR%;Qvs- z5bR$e1QIOph%9Dc;5!7ujG`J|4M0JO64!{5;QX|b^2DN4hJeJ(yb?V>*AN9$JwrXC z-+P$10o80vjqptK^weVD0CHFvq!?Kl7=bJ=AeM%*K|ax7WCn{f0ojI(Obh}*Itqw0 z+gZTkSwJ=jd@5sPcmebsD5qauH!WnHiIGyj90|5(LmimH4+pj&vxw!+xH ZW5w}plIIPVb!C8T@pScbS?83{1OV}$Z)^Yn literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_sec_door.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_sec_door.png new file mode 100644 index 0000000000000000000000000000000000000000..e3d76c2ff9f2aab2836ada8a632c08dc8750ba2c GIT binary patch literal 589 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijq1AIbUx7je9k5li_V|f4c$*KT@8cl{{$Bu1ZHs4T-y*@XkB{`&qi=l^$ zAzP8*^5x474Gl++9!+KgYGx=6J5~>*giC__g8yRxhE271IDpce1s;*b3=DjSK$uZf z!>a)(C{f}XQ4*Y=R#Ki=l*$m0n3-3i=jR%tV5(=RXY_jy^ERNGZK)BSX`Y^13?Nfj z8Kf9l85n^qFCdnNvOzx9U}Of1GXdF#j7$syKspMDGuv6f;#oj82z)AIWOxA#7#NLa zDFaYy0y_f>P^E#9u>s=(h^ZhOSr{&803_RIeK7p8 z_#QtXbB3pjV~BU>ap_lx-+NzU?p$}f~HrX2e8LMKhu zH0S)eXJN+|iZJczFf96^ykr{#Q~P}^l&jGvoX|wOk{A@-q8Z2I7)*2g8xGR!@cIc zkw7ud0*}aI1_r)EAj~ML;ne^XlqhkHC<)F_D=AMbN@WO0%*-p%^K%VRFx4~EGy1)U zc^gp8w$upEG*3@01`Z&Hl|hP;m4Ok+@&aOMC>!Jp4Mt|LI1`X<$jHPX0HmXUIJ2Dv zES?2qgTSXUMurza&%$UlOBsMt6WAG8fGQ1)j13qUKuiVM$hrVx(i9*Y1ek#4GJ#bF zSy}*DP+f)w1|Zo!>x1E!#rOCDnHiogjv*HQS10clYEa-|>A(K*f4xrUMJ2w42Mh1$ zZMQC2p#LMZA#$a4!;~*IMssdVdER)#QJ|yFTq8Xo=R*$9Cf<44E3UHjvxROr*z9)I xF=3ur#XIqRd>(F$H(8`@I+kpBAMX>%vR6Lonxy@P8;^ z2==cK0tps)L>4nJ@ErnSMo|r~2B4rsiEBhjaDG}zd16s2LqK9?UWuNcYlwoWo}r%6 z?>)@hfNHj-MtG)qdTKFn06DA-QjDw&j6jwb5KBYZAfIS3GK0mLfNVoXCI$f@9RMK9w;tya0L_Mx$BE0F;`*&cFgxX<%e*z__0NEhG1T>ck ztTM>b0?2~uGBhv%$@WXRJV=3EfV zG*{Z^oA61M?HZTMqY44Z22Z~&z_3p^r=85sBufiR<} zhF1enP@=>&q9iy!t)x7$D3u`~F*C13&(AeP!Bo#s&*=9a=50VV+fpMu(>y)37(k}5 zGDtD9GB5&JUO+4jWrKXI!N?32X9BVf8JQRafOHfPXSTC|#j}8H5cpKa$nXLfFfba; zQU;*Z1a<}%ph^QHV*|zo5K}=mvMzv_GzG{80VbfiOkkBkmKH!3RF|QF0Z6vb`e68F z@jZS(<_u34#}EtuyA$5>9a7+N{dr-h=fa-v^*2O=wrHj9zsuS9q^QW-;AzWh&SP9I zXVNvVaq6_o^Pc-DefQ_CeyLp-`er`JZq?e-)%l?I?icetlAPuHlwT-YOgZ%Fg-)8R zY0mj`&%%x`6k*!aVOaD-dC4{gruO?zOh?i*oKEo?i6|;R;hFJO&_kAUx$+7(>5c3M h&n*-Y`RAbVlp%Ac%?g(IuNOh?^>p=fS?83{1OQ1;vVZ^p literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_viro_open.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/bio_viro_open.png new file mode 100644 index 0000000000000000000000000000000000000000..a1a26e7c4ebe48e5f4b39b4573bfc1960aa4f64a GIT binary patch literal 497 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCiji0(?STvlSV(*)a6zG1O=>Ft#x;WHT_-0Oc5-oLa~Oq&P}~{DS{O0K>iJ zy^%mM&H|6fVg?4jLmAC&ooa@Ed~xChm}E!k(GfF$npYWX($`y3k^nQus9QtZOF*PAONJJfH|e(b;Fb|HAZu8OnKgT!%?84&RiosAm>94&nDh^+AFTI^|OU;IN0oV y)iGh7S;af?eS98nj5k@NZ90~0cpvW*$+A~I>6)bcSE+Olko}&nelF{r5}E-2FMLG+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/botany.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/botany.png new file mode 100644 index 0000000000000000000000000000000000000000..e5044e7a0e65fd804f6a1c71c83ff9f166ccdf2b GIT binary patch literal 482 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil21AIbURcuxCe06z?4LOoEtgNhTY-}7I9bH^pfbyRgt7`)(&XOR%;Qvs- z5bR$e1QIOph%9Dc;5!7ujG`J|4M0JO64!{5;QX|b^2DN4hJeJ(yb?V>*AN9$JwrXC z-+P$10o80vjqptK^weVD0CHFvq!?Kl7=bJ=AeM%*K|ax7WCn{f0ojI(Obh}*Itqw0 z+gZTkSwJ=jd@5sPcmebgnPbV&VVv(oL?001nr{cDDcjyREwl_+3~W zV-|f~pzu4eQ~Exa%R!xVsqgm|GQG2${B34)>mSRAlimm2=CNAO6m5vyD?F$9m*@8? g4~g&hraxmBWOp`_d|p-_4+?h%Pgg&ebxsLQ0FYR8*#H0l literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/botany_door.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/botany_door.png new file mode 100644 index 0000000000000000000000000000000000000000..a7a4a7c96a5e61731d64bc717a0dd8d3fd54ac8d GIT binary patch literal 559 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikd1AIbUW2)TqCWeZh4NGnD6I|_{H8ZqkMG{A{25+&Ue};{oudbPfm7x}U zWMm{z$Ijo^8h{jkNswRge-yxQ<<5+SKq<}wkH}&M2EM}}%y>M1MG8<*qQo_#Bsf2< zq&%@Gl_4N8Gp|I?&oxBBRL@Y)==UDxZ9p~KQX@RmJUz7-IDi~h1}R2X21X#u3y7tm zY>*E%7@5K1OhC3FBNKxFkd6Z4%yt&AcovWi0trA2(hsB2EM)+O(FAq|7N80PBVz-` z1rSp~I#?G#Oqv2@g8&oI944^JAWI7%3#!Y|zyKus^6EE>Q@3)efXpsW7sn6_|GSeM z`I-%QST^!%&Tjhu|IV!|T^d~v4|MVcHHA$M-5~L$sa}{(DQVl$n@2aUp48E^SeMWB z$K?de&n8oo^!Kuf#~C+NDc#A>P+_{Q95jbx_aV2IYQ{Qu@ejwEIQkD=YxwHrpjETd zuf=^KuU2+O^Qo5Kyl?AYa9-s*fA7JUeM%1*n_jWA%+NEIWfRB%xzN+q&t;ucLK6TA CC7p2q literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/botany_open.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/botany_open.png new file mode 100644 index 0000000000000000000000000000000000000000..8b9bcc3dd9a50d42d1d1d63ff97ceff50e650a91 GIT binary patch literal 520 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil&0(?ST^?Y^nCWdk(YoxaLiJlD;TFr%o3R|8N`qQo_#Bsf2;m>7@5K1OhC3FBNKxF zkd6Z4%yt&AcovWi0-wql8D0QA4WrR4WdKS|U}sjH>LQ-Ev` zU;>)U1XdYjX#r$Gbr~8MfMolu4~AbB-{S{lmV3H5hFJJto#e>ZV8FpLeNo2$|B0Gk zLN32OnDOWim#~-F0=*wo8)izDGAMoA^Vn8I@ZwH|O)H&Q?w;LIz!0NRb7-dU8gaK- z0ka)(C{f}XQ4*Y=R#Ki=l*$m0n3-3i=jR%tV5(=R zXY_jy^ERNGZK)BSX`Y^13>-iXD}xjxD+42t>#!sj?$m_0?n z#U*`#Lb*ogn999M?Mpgz!Aj=DgrJ-z)&omgB z!QxCnwjm=Eg8-0@0^-be7O;30kPQN#$`~1500RIb$b#xJG%x_k_E{eczbwAT56JBBba4!^@V`6hAYY3D zkBjaDqaA<$zu&r;H_-Wdv-?SbFh)&l9rQWoe{9Joi)CqLUbG37Hh_Z8!mUWhcC1b xxpF~XOK6_?m;VMrvt-xhC@hX<+2arp%Xsss`sKCL4dOuV^K|udS?83{1OVh!J(4Mt|LI1`X<$jHPX z0HmXUIJ2DvES?2qgTSXUMurzaPs3<5OBsMt6WAG8fGQ1)j13qUKuiVM$hrVx(i9*Y z1ek#4GJ#bFSy}*DP+f)w1|Zo!>x1E!#rOCDndP1?jv*HQS0_30H5hQPOkb4o|9_(9 zmypYE4`w{N!zJuxwm|R4)P|Xor3^|R_dK>05xlrlVbe-ymb+(n6fneS)Et^Ayhhw@ zR=}-EJ~wtIXlCg5)F@@Botzf)Bw^;0&78UJQd54)yBPdG^s;rLg=N{THR5~pu2eBD WoGiasF_RDE1O`u6KbLh*2~7ZUB90RP literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi.png new file mode 100644 index 0000000000000000000000000000000000000000..55eb4bdfd9fb9d08c3303b210d5cfe87a6694d20 GIT binary patch literal 471 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil21AIbU3*rPiOGFBlH3B7NtgNhTY-}7I9bH^pfbyP8)hvM&XGxG>@P8;^ z2==cK0tps)L>4nJ@ErnSMo|r~2B4rsiEBhjaDG}zd16s2LqK9?UWuNcYlwoWo}r%6 z?>)@hfNHj-MtG)qdTKFn06DA-QjDw&j6jwb5KBYZAfIS3GK0mLfNVoXCI$f@9RMK9w;tya0L_Mx$BE0F;`*&cFgxX<%e*z__0NEhG1T>ck ztTM>b0?2~uGBhv%$@W&2WUO{%-OjZ2m&SMX^mpt^yv`+( U&o6wt6bQ1x)78&qol`;+0Lm(Sb!=FjEoH!7eGt} z>0n&|F=+~r4FXI+bC|#?gDfq8ET}F+0|Suk%d6ikPTk6>0y4WiT^vI!{O?Zk=4&wE zU|lNj9r~_5c45+D-;1u{R^7Aq@aQ*MT;#47R%0mWlYc1mdOF9R?}{Ik8``$BotxV& zc;t;~hk?4w8U8~R&PN5DZZ3MWGErORaZ_73<9Xu;P1;#ExKbs|qcueLbg0UtI35mL y(Y{IQ)k2-bJq!Qw+bVu8n8dbld+R}VmPN8`4q7J{zlvN6a-pZIpUXO@geCybu$bup literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_electrical_door.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_electrical_door.png new file mode 100644 index 0000000000000000000000000000000000000000..6a86b3121ffad1296d0ec8df7be4675d1a64c834 GIT binary patch literal 568 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik#1AIbUx6Dy_bus9~I^8fY-u4oSIc-uWjvqd}Z}FmTSu+hQLoN2E+SJa5 zkjTi$&JvLq*IR)4-ZlJB0#bq{L4Lvi(Ex+$+L<6p&H|6fVg?4j!ywFfJby(BP*9@8 zHKHUqKdq!Zu_%=xATcwqM9n999M?Mpgz! zAj=DgrJ-z)Pc;~s!QxCnwjm=Eg8-0@0^-be7O;30kPQL}Kn&6kqtPs70EX2Bb_N!p z3Iii!1I7gqQ$add7eGv!0%U^#6VMzcu*x7y3m^-s%h138B>VE}H;YrZa;kvLZci7- z5DWji6Hg1ZDDbfKo{*B~{`r5s=;4fqdKa73-!_N%&T{N>)2o<$A;3{ES#)7o;V;#e zcDA`Y{H8}WbKOflFSN(|hp?jWC&_IWp3dLWYI40=>5sUXz_dfl*=;_Y;P6hI#aREE zY4M)aeFBHL4#hWWxJAhy&Ei-&?{H_q{>0^KFW&Xu(&dp;=+My)HQu)OnEFMK6Fpu1 KT-G@yGywpBNv3iD literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_generic.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_generic.png new file mode 100644 index 0000000000000000000000000000000000000000..adc73f8860f13b16f49b46976872e13b21e4c164 GIT binary patch literal 454 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij?1AIbU3*rPiOGK=!tZZy-93359TwH)Mx5f9*0aENGL4Lvi!GJ-^o7oL0 z#981GSIesvJDxT7zBWH6cA^&vw+33 zfNT)>RL02g0_af~jb3l||jMK;cHK>mak(N`m}?|APR-=KV|d14TFs zJR*x382Ao>Fr%o3R|8N`qQo_#Bsf2V7NJjy2W;+X5JPXJM zflpx>8!#?_m$Nv;eZ8 zx(p2rK(c+-2g5Im@9_gNvpiiKLoEESPIBZspuoW*e)NC+PVS;bg8XZJt<1~SPcZiI z?ibo%WXrDb=)CotHB+~Vtx;`F_!_y;f1&$?O6LojTR4p7bG(@{$!)?$&a5!i2R~VE wZxq_0a@=LY!UcbtTqb;6XZ3bfaUXYb%o=OKO)i-^&p!J(4Mt|LI1`X<$jHPX z0HmXUIJ2DvES?2qgTSXUMurzaPs3<5OBsMt6WAG8fGQ1)j13qUKuiVM$hrVx(i9*Y z1ek#4GJ#bFSy}*DP+f)w1|Zo!>x1E!#rOCDnU$U{jv*HQS0_30H5hQPEY#Tc|NjOD z%fwxBJ!Xoijy>O~$PRESLl}EF#%!s_k^jVEfASL|hA;*^1HtR1p7p4ak zF8n#cFVdQ&MBb@0A9t7>;M1& literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_rad_door.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_rad_door.png new file mode 100644 index 0000000000000000000000000000000000000000..6d1a65f86f081512adc4b070e0da28067c706efd GIT binary patch literal 565 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilI0(?STx6Dy_bus9~I$c98_AoErigeKv#}6Ogx45Y`wX-2)QMYVoiO7rV zEkNaqj3mwgDZY{*zu^DKfWh^^ofAMA&H|6fVxWS&q9iy!t)x7$ zD3u`~F*C13&(AeP!Bo#s&*=9a=50VV+fpMu(>y)37&w3&Rt70XRt82O%L|C5p=^-v zG#Ht|;!HrcAtMum0FaIX;>>myuy_`b4FU;34AKvy(JW;EhR+0c1{RSYP${-N$wk_Kg`!?zKqTElPIXANYJg}d$p;P2|G|Nc_w%Za9*EVyva^L9t zpedk}dQnY~k44@{Y|8h9{VQfNl*foB^M6qjYHwy)~MBeB>7q`=G zM(eA?bFW3U2sdV2WBh1yvF?;lMrdaI+X6$OKPBlUXF2T^I`%MZHqc6o5_Fmla;vAS KpUXO@geCwX?4|Gk literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_tools_door.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/engi_tools_door.png new file mode 100644 index 0000000000000000000000000000000000000000..d4ee63cc67cb918639c03cc6d3c013c117bc1262 GIT binary patch literal 553 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilI0(?STx6Dy_bus9~I^8fY-imb56UPr9-nZCLi@m8fwX-2)QMYVoiO7rV zEkNbm0u29v6kkb@U+{lqz~Fk|&IzClXMsm#F;Kx_5N14{zaj-FC{f}XQ4*Y=R#Ki= zl*$m0n3-3i=jR%tV5(=RXY_jy^ERNGZK)BSX`Y^13>-iXD}xjxD+42tkOkFcXkY-6eR=hp#i?64RX}Ekr;B5Vh5y}&-h2%T zJgk`q<+py{zpi!5GPRI!y%I66xOVXiNBIBvdORrDxNjz-wdQv9jEc+`#czsbOlM5k zaEDX%xzg$YjmT}>6B9lMZ1{OsQTmgj$(KVW(!zQx7K&dx8}T~G^o!Hgy2cI@9+o33 y7!&R<{5!>Cf!2l9yz0se-+`suC_j$VdxvX15$z|L4Lvi(Ex+$+L=i}NzMX~$YKTtzQZ8Qcszea3Q$m@ z#5JNMI6tkVJh3R1As{g`uSCz!HAKNw&rr|k_a5eLKsDP^BRtbQJ+&A(fE-o^DMnTX zMj*=zh^3)ykWV!jnZe>rK(-+x6N3PdjsoJ$b{4RB7LW}B2|x_e52Mj6WdMfN1a<}% zpb7&cV*|zo5K}=qSQkJ{ngV2l029z0Ca}sNOA8{&803`eJ>Nks1w{oh0%n6<@ zjv*HQcPF0aJFLLNl6!p1yY3(V_iszc)tbd*`Q^$v)-62UIw$ylm^bcN*tv1n<`A*2 zR>6IyM|SEdevxwWSe2mdKI;Vst0DCp5G5`Po literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/epi.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/epi.png new file mode 100644 index 0000000000000000000000000000000000000000..91caa035d334e71f3ab84af4e1303d9ccb5a8a39 GIT binary patch literal 471 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil21AIbUEi5b|BO@I(oebm*tgNhTY-}7I9bH^pfbxa*+x`P7&XOR%;Qvs- z5bR$e1QIOph%9Dc;5!7ujG`J|4M0JO64!{5;QX|b^2DN4hJeJ(yb?V>*AN9$JwrXC z-+P$10o80vjqptK^weVD0CHFvq!?Kl7=bJ=AeM%*K|ax7WCn{f0ojI(Obh}*Itqw0 z+gZTkSwJ=jd@5sPcmeb}%WV&VVvk~bGHuw4V+zWx_J$LYfCDFQAo z=?fIfH98-!ZHQ=1xZG2H|Im`8Etxy!8+tr=uF&l4$XM;jx}9n3FOBc&>F?N;c%4fm UpI`WPDG+3Xr>mdKI;Vst0N)^SJ^%m! literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/epi_door.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/epi_door.png new file mode 100644 index 0000000000000000000000000000000000000000..65e30e1b193a1bd0f3bdc3c5896450ef6a700f19 GIT binary patch literal 550 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilo1AIbUSFc`o_3F(s$LgaePKTLCoIH8PK+eEX)2XYcH!?EPOvB1hiyf#| zb@d55AjMk}IesvJDxT7zBWH6cA^&vw+33fNT&*0Ai4S7>#Br12AkRursg#RTvl<8!#?_m*;vvR&oDALCccp7xTovImwFa*l<_OVGO@>;ZWR#M4f#LME7*4hjb+*>Thwb wmdKI;Vst0IPDFs{jB1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/epi_open.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/epi_open.png new file mode 100644 index 0000000000000000000000000000000000000000..4845c6ec1b716f1e66d56adaaeea19bd17cc21b1 GIT binary patch literal 520 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil&0(?STBO@cPUcG4`XK?hy=`zRaF!PA6o?b^yr`4<10hNgTo2(6_xJrWj zg8#z+!=^Jj=YgV}1s;*b3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*$m0n3-3i=jR%t zV5(=RXY_jy^ERNGZK)BSX`Y^13>-iXD}xjxD+42t9sZq*MJ2@@pNy5x0n>lmcrKbFpcQN>X=w<6f3(K-wYsB~HU8!PR WI9YzNVkRHR2@IaDelF{r5}E)xmX3u0 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/generic.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/generic.png new file mode 100644 index 0000000000000000000000000000000000000000..6806e85f43fadb5b83a167cac777e435526048fa GIT binary patch literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ1)eUBArbCxrx|h`P~c&Be2MR^ zie6LxhTZ><@2zcqpyc=Vg5KLpJB2t|yyh&n)K_$2{2X}Zrz67=hszEe5AD9~T^+u> zvQ6S~dY{^XM}KSM!o?3*@NCGF=54qp#TuB+$|%5`^dO$C$8d#ZfY-vg%uESuU8gEM z_lagIV|Xre%E7DiS_8udX$R8-(mqCAH_H#ro1gs7WO~qeUpyZ<@oj-cmn)U!Vf07C-bk$~ek{KqukT9|8+faiJW1yO-;{dHX)$MIVL zmSw@gbg!2iWg+JkN8AFC=MN=@?@W1Od8bs6Z6k zZZ=$-OvnIH6v2EpgX8Ih)<*?R0KzbY?xL-0A(Fo2cVeNHLVR{6Labr(iTvQHPH61tRzs5v%n*=n1O-sFbFdq&tH)O6s+@faSXBW zzdGqISAznN+voV`XTSI7Do@k2WWVe3-0ddc{0|RnO-Siiqpnb;x_+>@wuf|GNmYDgTX_FI95T!oZdN&=e{-Y7F>ba(hioL0TEs6jC6 t>Kq02n9yRURE-iF){p*0HTqME7~Hk=bPF$bgaTc{;OXk;vd$@?2>=haZx#Rm literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/generic_open.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/generic_open.png new file mode 100644 index 0000000000000000000000000000000000000000..6122db13f86d11bf7422d0543ca8fc952baafeec GIT binary patch literal 339 zcmV-Z0j&OsP)KgW8 z$PYl3lISoS!~n2bT-Ua>`z{FVE((C+UDtt93XV}E4{)w3@O@w2fjExg)-=}szV9sn zIk4GoA1Nhk{7O2Yf&0cBar%m7XzR!j@$Ld*dYHO5TBko8VDzLIfY lLdVsy_4eOiz6D@*2R@{evLSOiQw{(C002ovPDHLkV1lbziLd|w literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/jani.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/jani.png new file mode 100644 index 0000000000000000000000000000000000000000..afd1633cf14b92e8196da8d9990485f00e7de3c2 GIT binary patch literal 471 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil21AIbU4GauCJUl$rvu&l~tgNhTY-}7I9bH^pfbzbJ_N)a`oFzei!T+Iv zA=tk{2qakG5n0T@z;_6Q8AUa`8i0ZlC9V-A!TD(=<%vb93;~Imc_n&&t|1DhdWL#N zzxOb21FG4U8sVAd>8ZuQ0pzeUNHMZ9FalX#Kr9VqgM6aF$P5-|0#Br15j!LI|B<)rGb&L0pkLQsURC!7eGv!0%U^#6VO~H zu*x7y3m^-s%h138B->|wF#NLk9zP({%hSa%#KQmSC2uZZV7mssef=+dj?;zNQv_UG z(ibR{Yji$d+Yr&3aJi@Y{-GsFTQYadH}rV$T%p<7k+Is5bvx76UmD-l)8DZx@j91C UKELqoQXt3%Pgg&ebxsLQ0Q4tuOaK4? literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/jani_door.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/jani_door.png new file mode 100644 index 0000000000000000000000000000000000000000..c8df1f283e779403c45daccda236b87e1eb387cf GIT binary patch literal 571 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijK0(?STi;Iibu3bCD<4AjZd!F@z`Sa)7O2v7qXIofUczAd;x~xi0PBzo9 zGSp&^jEn?oI_)@hfNHj-MtG)qdTKFn06DA-QjDw&j6jwb z5KBYZAYW=QGK0mLfNVoXCI$f@9RM5`Y+_A4a2D%D~LPFoB(c1*pQn z$k>2!0mM|04%P(_lcoUKAixAPhY74Q$kGDHg6c9fFaXKEy!y@J)UBKGF^9BqgTe~DWM4fp7Nr+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/jani_open.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/jani_open.png new file mode 100644 index 0000000000000000000000000000000000000000..17b121990aba23432882da7f2b70fd7eb1e3fe60 GIT binary patch literal 520 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil&0(?STJv=lmp7ny{*AN9$ zJwrXC-+P$10o80vjqptK^weVD0CHFvq!?Kl7=bJ=AeM%*LB7#oWCn{f0ojI(Obh}* zItqw0+gZTkSwJ=jd@5sPcmeb@j7GDR0Vp+roq+|Y(!j{rfN=rDRFI9V3m_&<0kT1W z31}`8SY?o<1&{^RWoTdklI^oT7=BrNj~|d(?&;zfV&Q*vk|SS(0SC+UMH&D9Cu)8P zx%~EE#-lr2!d_+z^nOfjm?>Gxp!9LiV_Olyi#ruIt#oF&dv-?wLyShvp_#&K#NB2E z+?wQbV`qY9hJH_tQij^eX)#X{Wnd>e!<)^%h!T&=qTPIprmfcz-zDMs$730Fm V@{1KS`9Mx!@O1TaS?83{1OVw3jE(>R literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/justice.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/justice.png new file mode 100644 index 0000000000000000000000000000000000000000..0332a5e1dbedd99970e9fcdf1dda0660c7633fe2 GIT binary patch literal 470 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil21AIbUg#{$#q%^FVc#N62t*oqUY-}7I9bH^pfbs?f+OvQZXGxG>@P8;^ z2==cK0tps)L>4nJ@ErnSMo|r~2B4rsiEBhjaDG}zd16s2LqK9?UWuNcYlwoWo}r%6 z?>)@hfNHj-MtG)qdTKFn06DA-QjDw&j6jwb5KBYZAfIS3GK0mLfNVoXCI$f@9RMK9w;tya0L_Mx$BE0F;`*&cFgxX<%e*z__0NEhG1T>ck ztTM>b0?2~uGBhv%$@WB9|4nJ@ErnSMo|r~2B4rsiEBhjaDG}zd16s2LqK9? zUWuNcYlwoWo}r%6?>)@hfNHj-MtG)qdTKFn06DA-QjDw&j6jwb5KBYZAfIV4GK0mL zfNVoXCI$f@9RMK9w;tyZ{COj7GDR0Vp+roq+|Y(!j{rfN=rDRFI9V z3m_&<0kT1W31}`8SY?o<1&{^RWoTdklI^oT7=BrNj~|fP;_2cTV&Q*xf;V4-0f&og z*N=z)o=<&rWJPZ2L$7$}Sw8VJHm#T3vh-N&Tt!}%F#q<=&ZJw@vF6*2UngE#{juHR> literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/justice_open.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/justice_open.png new file mode 100644 index 0000000000000000000000000000000000000000..1ca247d7339e521edde08c156104d07e02aa0334 GIT binary patch literal 528 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijS1AIbU<)k!{BFl}LxILXBlh~y^m<9da6SPz;tj#>FnRtMzemE_d4y3qC zg8YL2!vTYrKjSB$FlT{BWHAE+-yslY6xHx*018T!xJHx&=ckpFCl;kL1SDqWmFW4o zhA5co8R{AR-ov~NsAgMgglC$krxpVTki*I##mLIQ2xNHyu{4wo@{tB3GgzDn$TnnT zVh{k*Q9zv8&H@(C0{a%Rmjjixs@1g@ft=*&>gTe~DWM4f7Y&4< literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/locked.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/locked.png new file mode 100644 index 0000000000000000000000000000000000000000..53f33d7893e8009fc9f05eddd2de8d3197c17ba1 GIT binary patch literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ08bakkO=p;*EVu87;v~;G_JPX zTYXeVK)`Xs&rDIGXf}hVtDnm{r-UX30IljQMgRZ+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/logi.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/logi.png new file mode 100644 index 0000000000000000000000000000000000000000..fc3aba7b332f78b47aa8799dcbe82ce75994b4b5 GIT binary patch literal 467 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCiji0(?STZFNM#>}4Gt9ZgJ3tgNhTY;0UyT!51Ibb4k0DUOmLzu^B6z;Lg5 zZzNERv%n*=n1O-s5C}7hYIrpO1tm&cBT9nv(@M${i&7Z^5;OBk^!!{y6ioFD^^AV+ zVcrH*vn@5kGtJXei-7~kVP%kFWMyCkvb=y;8p;OwLW7YREY1XE8!|F62mt9QAkJ)O z0gGn=*&y(#jFI65(6cZa%~A%S)C6`07NAN4BVz-`1rSp~HnJ{&m^1~*1_36ZxlCY{ zL6#Ok7F3s^fdNRi&-!5aW$`_JK&F?ci(`m||IK4cyxQ`+gypV}6j6fZ*K5 zraKFlG;U`~Qhs!~xBC96l%P*9cg#0D@!BCwA!lW;PIEts_y)Md5k?PxpS`apaDk+sTe*>hrN`m}? z|HA;orZYO{fufuR9+AZi419+`m{C;2s{tq|QQ{g=5}cn_Ql40p$`Fv4nOCCc=Nh75 zs%NNY^m`BUHlUhqsS%!Oo}O9^96$~$gA^kx10#^-1;o-&Hpn*`jLcwhCLr68k%>V7 zNJjy2W;+X5JPXJMflpx>8!#?_m$Nv;eZ8x(p2rK(c+-2g5Im@9_gN%ROBjLoEESPIBaHFyLUBz9{4W|3u9% zA(!7C%y@K%OW4b7f!>d)4KpQ68I(Tmd2A~pcyXt~rj^btchBx9V2IJEIW$vvjkw#a zfLoJ%ZtP6Z%+T+tQOZy|IW6W%!ptX|Idk2mru>w5G5CMzW$Q!>%d%T*#P{f3sbX9> VS$?r%CLhQN44$rjF6*2UngGu|ioyT@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/meta.json b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/meta.json new file mode 100644 index 000000000000..60453c0a998a --- /dev/null +++ b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/meta.json @@ -0,0 +1,177 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "copyright": "All locker sprites based off of the generic wall locker; chef and janitor wall lockers using original colors, and all other sprites being based on the colors of tall lockers. Done by @bogus_0451 on discord. locked.png, unlocked.png, welded.png, & generic textures copied directly from the wizden wall locker rsi in order to things work properly.", + "license": "CC-BY-SA-3.0", + "states": [ + { + "name": "atmos" + }, + { + "name": "atmos_door" + }, + { + "name": "atmos_open" + }, + { + "name": "engi" + }, + { + "name": "engi_door" + }, + { + "name": "engi_open" + }, + { + "name": "engi_generic" + }, + { + "name": "engi_generic_open" + }, + { + "name": "engi_electrical_door" + }, + { + "name": "engi_welding_door" + }, + { + "name": "engi_tools_door" + }, + { + "name": "engi_rad_door" + }, + { + "name": "botany" + }, + { + "name": "botany_door" + }, + { + "name": "botany_open" + }, + { + "name": "salv" + }, + { + "name": "salv_door" + }, + { + "name": "salv_open" + }, + { + "name": "logi" + }, + { + "name": "logi_door" + }, + { + "name": "logi_open" + }, + { + "name": "jani" + }, + { + "name": "jani_door" + }, + { + "name": "jani_open" + }, + { + "name": "epi" + }, + { + "name": "epi_door" + }, + { + "name": "epi_open" + }, + { + "name": "sec" + }, + { + "name": "sec_door" + }, + { + "name": "sec_open" + }, + { + "name": "chef" + }, + { + "name": "chef_door" + }, + { + "name": "chef_open" + }, + { + "name": "bio" + }, + { + "name": "bio_door" + }, + { + "name": "bio_open" + }, + { + "name": "bio_jani" + }, + { + "name": "bio_jani_door" + }, + { + "name": "bio_jani_open" + }, + { + "name": "bio_sec" + }, + { + "name": "bio_sec_door" + }, + { + "name": "bio_sec_open" + }, + { + "name": "bio_viro" + }, + { + "name": "bio_viro_door" + }, + { + "name": "bio_viro_open" + }, + { + "name": "justice" + }, + { + "name": "justice_door" + }, + { + "name": "justice_open" + }, + { + "name": "generic" + }, + { + "name": "generic_door" + }, + { + "name": "generic_open" + }, + { + "name": "generic_icon" + }, + { + "name": "locked" + }, + { + "name": "unlocked" + }, + { + "name": "welded" + } + ] +} + diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/salv.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/salv.png new file mode 100644 index 0000000000000000000000000000000000000000..d1ee3ae6b0b42b802fb360165c0d53f57de34ad2 GIT binary patch literal 471 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil21AIbUZFNM#>}9=;eH=BNtgNhTY-}7I9bH^pfbz}T%{qV-XGxG>@P8;^ z2==cK0tps)L>4nJ@ErnSMo|r~2B4rsiEBhjaDG}zd16s2LqK9?UWuNcYlwoWo}r%6 z?>)@hfNHj-MtG)qdTKFn06DA-QjDw&j6jwb5KBYZAfIS3GK0mLfNVoXCI$f@9RMK9w;tya0L_Mx$BE0F;`*&cFgxX<%e*z__0NEhG1T>ck ztTM>b0?2~uGBhv%$@W&2WUO{%-OjZ2m&SMX^mpt^yv`+( U&o6wt6bQ1x)78&qol`;+0O?wAnE(I) literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/salv_door.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/salv_door.png new file mode 100644 index 0000000000000000000000000000000000000000..83bf7fa378eb6e0cccd00073f47474739f2c5ef1 GIT binary patch literal 558 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilI0(?STJJX~#x7n0AR!=K1im{GcQ03^T>EvzfQynWFW-n`|VP&Yr9vK-4 zRQ|Jg?@S=YR}$nG{2v)GxE{E30w}{-;1O92RB#xC8IR|$NC65;l(KW=8{ocd84X9>YYJ_K+r>7PJ2av3CK2NWMU8i(osO1+0FtM&jPYRAOVO$`e8Jhr3}FEnZVA#0#spOWNg5=0Aeag z2kQceNmGDq5MTnD!vt0tWN86pL3J4#7=UD7Uj1fq>Q+t_klE|$;uvD#e|M5MUxNaV zORl3%*8BR{=ru?9ueNH-PMYK+C){@7WAi_@5{3p1=dGJ_)7u1`dW=F6o+&!k9NEXN z8qLYIq_N`@?+3eur&X1&%Y8tO^mO%eS?83{1ON~P Bn_U0^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/salv_open.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/salv_open.png new file mode 100644 index 0000000000000000000000000000000000000000..624cef88371f274b1bc5730d7552149adaddb2d9 GIT binary patch literal 520 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil&0(?ST!|Y`@x7j#qI!!AuDs!xkv5u>b756sw=}eOXDp@zLxB^IVl?3?( z|AzsFO=on@14TItJR*x382Ao>Fr%o3R|8N`qQo_#Bsf2;m>7@5K1OhC3FBNKxF zkd6Z4%yt&AcovWi0-wql8D0QA4WrR4WdKS|U}sjH>LQ-Ev` zU;>)U1XdYjX#r$Gbr~8MfMolu4~AbB-{S{lmV3H5hFJJto#e>ZV8FpLeNo2$|B0Gk zLN32OnDOWim#~-F0=*wo8)izDGAMoA^Vn8I@ZwH|O)H&Q?w;LIz!0NRb7-dU8gaK- z0knAmtPE0&tPG4mmKP99L)jpoXfQH^#hHL?Lq;YB0U#X( z#F_0ZVDT&<8w5U;F*3XWdKgBdS;_#En!wJ$0#s>WWNg5=0Aec0M%D!olcoUKAixAP zmkF#g$kGDHg6c9fFaXK+Ssx6)EWXDN$n^AdaSXBWPkx}l&^C>U%}pVJNid;7p#73e z50AqE9;E{ff?7Rm8dy1dQdrk`G`Mlyn7~lUbz|ZI2Tca18qKbRSw~pe;uzW48H{rz U?`Ow|gn=yZboFyt=akR{0MEN+&j0`b literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/sec_door.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/sec_door.png new file mode 100644 index 0000000000000000000000000000000000000000..17c5403536ff6f5ff77b14f8c76979194d55dada GIT binary patch literal 545 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilo1AIbUdsJ2TIT}2zSD&w;aVASNT~_w0t!;yf3Q%5-k;_$Bcy**8kiEe9 z-bo~+8J>l^3srHX5=->C=g>$)O{nrlw&=U-75V% o`3$;=fmieAE!gVX&d!mh{iQ}d`1GNV7eQ|GboFyt=akR{0E%IdCIA2c literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/sec_open.png b/Resources/Textures/_DV/Structures/Storage/wall_locker.rsi/sec_open.png new file mode 100644 index 0000000000000000000000000000000000000000..e53cae42630963eefaa064ce46fc31635732f955 GIT binary patch literal 528 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijS1AIbUU4@1BIU39k;GeId@w8t3OqOVms%pBdY=er*>PSJLs*8Hlw*V>b zk|4j}|8T(I<8ZuQ0pzeUNHMZ9FalX#Kr9VqgM6gH$P5-|0#Br15j!LI|B<)rGb&L0pkLQsURC!7eGv! z0%U^#6VO~Hu*x7y3m^-s%h138B->|wF#NLk9zP(n+SA1`#KQmTq=S471{}_gciMjc z=NG%-XMCmk;*oo7`n=g*f8F*oX(%WAxt#g9=TzAi!_7|^KI^G5cueGyU1DI$WAY-P zz4_e1RSdIaIT`=E^1Wb4;R~x}>R_D4Y$NnMp+WuUg@bu54XczK_}7Qt@?0;o%IsEa c9D9{LK|k3OgEnm9a&p!?*4V<6=bvDJB^4 cK#_sr&U Date: Fri, 17 Jan 2025 00:47:23 +0100 Subject: [PATCH 151/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 6ca243318121..c4826597218c 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Velcroboy - changes: - - message: Added clipboards to the Law Drobe - type: Add - id: 428 - time: '2024-07-10T15:55:58.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1479 - author: TadJohnson00 changes: - message: New security outer clothing for all security roles, as well as proper @@ -3867,3 +3860,12 @@ id: 927 time: '2025-01-16T23:36:40.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2721 +- author: boogiebogus + changes: + - message: Added several new lockers and wall lockers for mapping usage + type: Add + - message: replaced sci/research markings on the epistemics crate and locker, respectively + type: Tweak + id: 928 + time: '2025-01-16T23:47:04.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2636 From 90c7953ab1167d69f6c4ef0cb9cd957af9738960 Mon Sep 17 00:00:00 2001 From: HTML/Crystal <152909599+HTMLSystem@users.noreply.github.com> Date: Thu, 16 Jan 2025 18:48:43 -0500 Subject: [PATCH 152/205] Surgeon scrubops (#2756) * vulcan sprites * fixs surgeon loadout + adds DeltaV scrubs * Revert "vulcan sprites" Ignore this IDK how this fucking got here * Typos fix --- .../_DV/Loadouts/Jobs/Medical/surgeon.yml | 108 +++++++++--------- .../_DV/Loadouts/loadout_groups.yml | 46 ++++++++ .../Prototypes/_DV/Loadouts/role_loadouts.yml | 19 +++ 3 files changed, 117 insertions(+), 56 deletions(-) diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/surgeon.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/surgeon.yml index 07195a21ff9a..967f443c53d1 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/surgeon.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Medical/surgeon.yml @@ -5,59 +5,55 @@ equipment: id: SurgeonPDA -# Clothing - -- type: loadoutGroup - id: SurgeonHead - name: loadout-group-surgeon-head - loadouts: - - BlueSurgeryCap - - GreenSurgeryCap - - PurpleSurgeryCap - -- type: loadoutGroup - id: SurgeonScrubs - name: loadout-group-surgeon-scrubs - loadouts: - - MedicalBlueScrubs - - MedicalGreenScrubs - - MedicalPurpleScrubs - -- type: loadoutGroup - id: SurgeonPDA - name: loadout-group-surgeon-id - loadouts: - - SurgeonPDA - -- type: loadoutGroup - id: SurgeonGloves - name: loadout-group-surgeon-gloves - loadouts: - - LatexGloves - - NitrileGloves - -- type: loadoutGroup - id: SurgeonMask - name: loadout-group-surgeon-mask - loadouts: - - SterileMask - -# Loadout - -- type: roleLoadout - id: JobSurgeon - groups: - - GroupTankHarness - - SurgeonHead - - MedicalDoctorNeck - - SurgeonMask - - SurgeonScrubs - - SurgeonGloves - - MedicalBackpack - - MedicalDoctorOuterClothing - - MedicalShoes - - SurgeonPDA - - Glasses - - SurvivalMedical - - Trinkets - - GroupSpeciesBreathToolMedical +# Head +- type: loadout + id: BlackSurgeryCap + equipment: + head: ClothingHeadHatSurgcapBlack + +- type: loadout + id: CyanSurgeryCap + equipment: + head: ClothingHeadHatSurgcapCyan + +- type: loadout + id: PinkSurgeryCap + equipment: + head: ClothingHeadHatSurgcapPink + +- type: loadout + id: WhiteSurgeryCap + equipment: + head: ClothingHeadHatSurgcapWhite + +- type: loadout + id: RainbowSurgeryCap + equipment: + head: ClothingHeadHatSurgcapRainbow + +# Jumpsuit +- type: loadout + id: MedicalBlackScrubs + equipment: + jumpsuit: UniformScrubsColorBlack + +- type: loadout + id: MedicalCyanScrubs + equipment: + jumpsuit: UniformScrubsColorCyan + +- type: loadout + id: MedicalPinkScrubs + equipment: + jumpsuit: UniformScrubsColorPink + +- type: loadout + id: MedicalWhiteScrubs + equipment: + jumpsuit: UniformScrubsColorWhite + +- type: loadout + id: MedicalRainbowScrubs + equipment: + jumpsuit: UniformScrubsColorRainbow + diff --git a/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml b/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml index 7df19865851f..d873d4df00c2 100644 --- a/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml @@ -461,6 +461,52 @@ - ChemistWinterBoots - ChemistShoes +## Surgeon +- type: loadoutGroup + id: SurgeonHead + name: loadout-group-surgeon-head + loadouts: + - BlueSurgeryCap + - GreenSurgeryCap + - PurpleSurgeryCap + - BlackSurgeryCap + - CyanSurgeryCap + - PinkSurgeryCap + - WhiteSurgeryCap + - RainbowSurgeryCap + +- type: loadoutGroup + id: SurgeonScrubs + name: loadout-group-surgeon-scrubs + loadouts: + - MedicalBlueScrubs + - MedicalGreenScrubs + - MedicalPurpleScrubs + - MedicalBlackScrubs + - MedicalCyanScrubs + - MedicalPinkScrubs + - MedicalWhiteScrubs + - MedicalRainbowScrubs + +- type: loadoutGroup + id: SurgeonMask + name: loadout-group-surgeon-mask + loadouts: + - SterileMask + +- type: loadoutGroup + id: SurgeonGloves + name: loadout-group-surgeon-gloves + loadouts: + - LatexGloves + - NitrileGloves + +- type: loadoutGroup + id: SurgeonPDA + name: loadout-group-surgeon-id + loadouts: + - SurgeonPDA + # Justice ## Chief Justice - type: loadoutGroup diff --git a/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml b/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml index 488f4977ad99..3f96b6149278 100644 --- a/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml @@ -45,6 +45,25 @@ - SecurityFirearm - SecurityFirearmAmmo +# Medical +- type: roleLoadout + id: JobSurgeon + groups: + - GroupTankHarness + - SurgeonHead + - MedicalDoctorNeck + - SurgeonMask + - SurgeonScrubs + - SurgeonGloves + - MedicalBackpack + - MedicalDoctorOuterClothing + - MedicalShoes + - SurgeonPDA + - Glasses + - SurvivalMedical + - Trinkets + - GroupSpeciesBreathToolMedical + # Justice - type: roleLoadout id: JobChiefJustice From a535c921c41c803205361c8c440de6c7b3ae93fa Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Fri, 17 Jan 2025 00:49:02 +0100 Subject: [PATCH 153/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 29 ++++++------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index c4826597218c..47083e5cc5f7 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,26 +1,4 @@ Entries: -- author: TadJohnson00 - changes: - - message: New security outer clothing for all security roles, as well as proper - senior security officers' and cadets' jumpsuits. - type: Add - - message: Jetpacks are now available in all security suit storage. Thank goodness - for increased funding. - type: Add - - message: Revamped security's clothing and equipment options; all gear is now up - to code, and no further outdated equipment will be issued. This includes, most - notably, the detective's uniform, which has received a whole makeover. - type: Tweak - - message: Fixed security hardsuits not allowing you to turn on internals without - a mask. - type: Fix - - message: Head of security's winter coat, warden's winter coat, security winter - coat, security departmental winter boots, WizDen-pattern body armour, and some - other minor changes necessary for respriting. - type: Remove - id: 429 - time: '2024-07-15T06:45:41.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1273 - author: Bellwether changes: - message: Prosecutors can now lock and unlock Security evidence lockers. @@ -3869,3 +3847,10 @@ id: 928 time: '2025-01-16T23:47:04.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2636 +- author: HTMLSystem + changes: + - message: Added the DeltaV scrubs to the surgeon loadout, hooray! + type: Add + id: 929 + time: '2025-01-16T23:48:44.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2756 From 06c678843deaf3e0cf62963438d8623ab94e2298 Mon Sep 17 00:00:00 2001 From: rosieposie <52761126+rosieposieeee@users.noreply.github.com> Date: Thu, 16 Jan 2025 21:41:10 -0500 Subject: [PATCH 154/205] Increases Minimum Hours For Command Roles (#2732) * hours up * Update research_director.yml * Update research_director.yml --- Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml | 2 +- .../Prototypes/Roles/Jobs/Engineering/chief_engineer.yml | 4 ++-- .../Roles/Jobs/Medical/chief_medical_officer.yml | 4 ++-- .../Prototypes/Roles/Jobs/Science/research_director.yml | 9 +++++++-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index 2aff9a382c25..99191136c712 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -16,7 +16,7 @@ time: 7200 # 2 hours - !type:DepartmentTimeRequirement department: Logistics # DeltaV - Logistics Department replacing Cargo - time: 43200 # DeltaV 12 hours + time: 90000 # DeltaV - 25 hours - !type:OverallPlaytimeRequirement time: 144000 #40 hrs weight: 10 diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml index e57aa7fc84e6..c0cd92674df9 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -6,13 +6,13 @@ requirements: - !type:RoleTimeRequirement role: JobAtmosphericTechnician - time: 36000 # DeltaV - 10 hours + time: 72000 # DeltaV - 20 hours # - !type:RoleTimeRequirement # DeltaV - No Station Engineer time requirement # role: JobStationEngineer # time: 21600 #6 hrs - !type:DepartmentTimeRequirement department: Engineering - time: 90000 # DeltaV - 25 hours, was 10 + time: 108000 # DeltaV - 30 hours, was 10 # - !type:OverallPlaytimeRequirement # time: 144000 # DeltaV - was 40 hours upstream weight: 10 diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index ef544491ce9b..9cae71c9256c 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -15,9 +15,9 @@ # time: 21600 #6 hrs - !type:DepartmentTimeRequirement department: Medical - time: 43200 # DeltaV - 12 hours + time: 90000 # DeltaV - 25 hours - !type:OverallPlaytimeRequirement - time: 72000 # DeltaV - 20 hours, was 40 + time: 90000 # DeltaV - 25 hours, was 20 weight: 10 startingGear: CMOGear icon: "JobIconChiefMedicalOfficer" diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index d1149fec6065..867d5365b675 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -5,11 +5,16 @@ playTimeTracker: JobResearchDirector antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff requirements: + # Start DeltaV additions - Server specific roles + - !type:RoleTimeRequirement + role: JobForensicMantis + time: 7200 # 2 hrs + # End DeltaV additions - !type:DepartmentTimeRequirement department: Epistemics # DeltaV - Epistemics Department replacing Science - time: 54000 # DeltaV - 15 hours + time: 90000 # DeltaV - 25 hours - !type:OverallPlaytimeRequirement - time: 72000 # DeltaV - 20 hours, was 40 + time: 90000 # DeltaV - 25 hours, was 40 weight: 10 startingGear: ResearchDirectorGear icon: "JobIconResearchDirector" From 90629ee7965d95429e500942dc8b51e3c48f89ae Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Fri, 17 Jan 2025 03:41:29 +0100 Subject: [PATCH 155/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 47083e5cc5f7..f33a951afc28 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Bellwether - changes: - - message: Prosecutors can now lock and unlock Security evidence lockers. - type: Tweak - id: 430 - time: '2024-07-17T19:01:03.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1422 - author: deltanedas changes: - message: Fixed Glacier not being in map votes. @@ -3854,3 +3847,10 @@ id: 929 time: '2025-01-16T23:48:44.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2756 +- author: rosieposieeee + changes: + - message: Command hour minimums increased across the board. + type: Tweak + id: 930 + time: '2025-01-17T02:41:10.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2732 From fb01fc8ba394b21fec26b2d0436ed26843a477ff Mon Sep 17 00:00:00 2001 From: rosieposie <52761126+rosieposieeee@users.noreply.github.com> Date: Fri, 17 Jan 2025 15:22:29 -0500 Subject: [PATCH 156/205] Roundstart Secfab Rubbers (#2758) * re-add rubbers * removed research entirely --- .../Entities/Structures/Machines/lathe.yml | 14 +++++++ Resources/Prototypes/Research/arsenal.yml | 41 +++++++------------ 2 files changed, 29 insertions(+), 26 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index e4f70afc07c2..69d74f956c09 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -841,6 +841,20 @@ - SpeedLoaderSpecialEmpty - SpeedLoaderSpecialPractice - MagazinePistolSpecial + - MagazineRifleRubber + - MagazinePistolRubber + - MagazineLightRifleRubber + - SpeedLoaderMagnumRubber + - SpeedLoaderSpecialRubber + - MagazineBoxPistolRubber + - MagazineBoxMagnumRubber + - MagazineBoxLightRifleRubber + - MagazineBoxRifleRubber + - MagazineBoxSpecialRubber + - MagazineShotgunBeanbag + - BoxShellTranquilizer + - BoxBeanbag + - WeaponDisabler # End DeltaV additions dynamicRecipes: - EncryptionKeySyndie # Nyano diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index a768ac456394..a8192a0284cb 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -34,32 +34,21 @@ recipeUnlocks: - WeaponLaserCarbine -- type: technology - id: NonlethalAmmunition - name: research-technology-nonlethal-ammunition - icon: - sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi - state: beanbag - discipline: Arsenal - tier: 1 - cost: 5000 - recipeUnlocks: - - MagazineShotgunBeanbag - - BoxShellTranquilizer - - BoxBeanbag - - WeaponDisabler - # DeltaV - rubber ammo which upstream removed - - MagazineRifleRubber - - MagazinePistolRubber - - MagazineLightRifleRubber - - SpeedLoaderMagnumRubber - - SpeedLoaderSpecialRubber - - MagazineBoxPistolRubber - - MagazineBoxMagnumRubber - - MagazineBoxLightRifleRubber - - MagazineBoxRifleRubber - - MagazineBoxSpecialRubber - # End of modified code +# DeltaV: made nonlethals roundstart, see #2758 +#- type: technology +# id: NonlethalAmmunition +# name: research-technology-nonlethal-ammunition +# icon: +# sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi +# state: beanbag +# discipline: Arsenal +# tier: 1 +# cost: 5000 +# recipeUnlocks: +# - MagazineShotgunBeanbag +# - BoxShellTranquilizer +# - BoxBeanbag +# - WeaponDisabler - type: technology id: UraniumMunitions From 0bacdfdb7512b5e58e49663506024feacb1d4aba Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Fri, 17 Jan 2025 21:22:48 +0100 Subject: [PATCH 157/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index f33a951afc28..50178ecfb98f 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: deltanedas - changes: - - message: Fixed Glacier not being in map votes. - type: Fix - id: 431 - time: '2024-07-18T14:17:17.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1503 - author: deltanedas changes: - message: Mime and Clown lockers now use their respective accesses. @@ -3854,3 +3847,10 @@ id: 930 time: '2025-01-17T02:41:10.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2732 +- author: rosieposieeee + changes: + - message: Security can now print non-lethal ammunition roundstart. + type: Tweak + id: 931 + time: '2025-01-17T20:22:29.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2758 From e81b0411b74a1eae6bd029727d97cb6dac2bf8e5 Mon Sep 17 00:00:00 2001 From: BarryNorfolk Date: Sat, 18 Jan 2025 02:54:23 +0100 Subject: [PATCH 158/205] Use required number of legs to determine if standing fails (#2761) * Use required number of legs to determine if standing fails * Add check to TryStandUp which validates if an entity can even get up --- Content.Shared/Body/Systems/SharedBodySystem.Body.cs | 2 +- Content.Shared/_White/Standing/SharedLayingDownSystem.cs | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Body.cs b/Content.Shared/Body/Systems/SharedBodySystem.Body.cs index f33618727018..45935566e179 100644 --- a/Content.Shared/Body/Systems/SharedBodySystem.Body.cs +++ b/Content.Shared/Body/Systems/SharedBodySystem.Body.cs @@ -462,7 +462,7 @@ private void OnProfileLoadFinished(EntityUid uid, BodyComponent component, Profi private void OnStandAttempt(Entity ent, ref StandAttemptEvent args) { - if (ent.Comp.LegEntities.Count == 0) + if (ent.Comp.LegEntities.Count < ent.Comp.RequiredLegs) // DeltaV args.Cancel(); } diff --git a/Content.Shared/_White/Standing/SharedLayingDownSystem.cs b/Content.Shared/_White/Standing/SharedLayingDownSystem.cs index c772a1cb3f50..a3b5e348e941 100644 --- a/Content.Shared/_White/Standing/SharedLayingDownSystem.cs +++ b/Content.Shared/_White/Standing/SharedLayingDownSystem.cs @@ -126,6 +126,14 @@ standingState.CurrentState is not StandingState.Lying || HasComp(uid)) return false; + // Begin DeltaV Addition + // Don't allow users to start trying to stand if they couldn't stand anyway + var msg = new StandAttemptEvent(); + RaiseLocalEvent(uid, msg, false); + if (msg.Cancelled) + return false; + // End DeltaV Addition + var args = new DoAfterArgs(EntityManager, uid, layingDown.StandingUpTime, new StandingUpDoAfterEvent(), uid) { BreakOnHandChange = false, From 4fd98d7436bba34e458bf1f62c96d27a21cabead Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Sat, 18 Jan 2025 02:54:42 +0100 Subject: [PATCH 159/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 50178ecfb98f..0530fef11f0c 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: deltanedas - changes: - - message: Mime and Clown lockers now use their respective accesses. - type: Tweak - id: 432 - time: '2024-07-19T16:39:36.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1509 - author: DLondon changes: - message: New emergency shuttle "Vertex" @@ -3854,3 +3847,12 @@ id: 931 time: '2025-01-17T20:22:29.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2758 +- author: BarryNorfolk + changes: + - message: Fixed borgs being permanently prone even after repairs are done. + type: Fix + - message: Entities without the correct number of legs cannot stand up anymore. + type: Fix + id: 932 + time: '2025-01-18T01:54:23.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2761 From e5d41e6b06e9880864c441495b89d1f3a549951e Mon Sep 17 00:00:00 2001 From: "Tad \"Taddy\" Johnson" <120885811+TadJohnson00@users.noreply.github.com> Date: Sat, 18 Jan 2025 12:54:52 +1100 Subject: [PATCH 160/205] implement feedback on #2695 (#2755) --- .../security.rsi/equipped-BACKPACK.png | Bin 1334 -> 1341 bytes .../Back/Backpacks/security.rsi/icon.png | Bin 966 -> 984 bytes .../Backpacks/security.rsi/inhand-left.png | Bin 1394 -> 1383 bytes .../Backpacks/security.rsi/inhand-right.png | Bin 1339 -> 1370 bytes .../security.rsi/equipped-BACKPACK.png | Bin 1342 -> 1328 bytes .../Back/Duffels/security.rsi/icon.png | Bin 957 -> 960 bytes .../Back/Duffels/security.rsi/inhand-left.png | Bin 1120 -> 1159 bytes .../Duffels/security.rsi/inhand-right.png | Bin 1074 -> 1153 bytes .../security.rsi/equipped-BACKPACK.png | Bin 1068 -> 1072 bytes .../Back/Satchels/security.rsi/icon.png | Bin 1174 -> 1181 bytes .../Satchels/security.rsi/inhand-left.png | Bin 1100 -> 1055 bytes .../Satchels/security.rsi/inhand-right.png | Bin 1046 -> 1042 bytes .../Misc/job_icons.rsi/Brigmedic.png | Bin 554 -> 552 bytes .../Misc/job_icons.rsi/Detective.png | Bin 575 -> 548 bytes .../Misc/job_icons.rsi/SecurityBorg.png | Bin 578 -> 551 bytes .../Misc/job_icons.rsi/SecurityCadet.png | Bin 562 -> 542 bytes .../Misc/job_icons.rsi/SecurityOfficer.png | Bin 577 -> 554 bytes .../Misc/job_icons.rsi/SeniorOfficer.png | Bin 568 -> 547 bytes .../Interface/Misc/job_icons.rsi/Warden.png | Bin 537 -> 531 bytes .../Misc/job_icons.rsi/nyanoPrisonGuard.png | Bin 554 -> 534 bytes .../Objects/Misc/id_cards.rsi/idbrigmedic.png | Bin 662 -> 630 bytes .../Objects/Misc/id_cards.rsi/iddetective.png | Bin 684 -> 645 bytes .../Misc/id_cards.rsi/idheadofsecurity.png | Bin 669 -> 671 bytes .../Misc/id_cards.rsi/idintern-cadet.png | Bin 652 -> 622 bytes .../Misc/id_cards.rsi/idsecurityofficer.png | Bin 678 -> 638 bytes .../Misc/id_cards.rsi/idseniorofficer.png | Bin 661 -> 626 bytes .../Objects/Misc/id_cards.rsi/idwarden.png | Bin 625 -> 606 bytes .../Misc/id_cards.rsi/nyanoprisonguard.png | Bin 643 -> 608 bytes .../Decoration/banner.rsi/banner_security.png | Bin 1214 -> 1281 bytes .../Airlocks/Glass/security.rsi/assembly.png | Bin 1021 -> 983 bytes .../Airlocks/Glass/security.rsi/closed.png | Bin 1215 -> 1176 bytes .../Airlocks/Glass/security.rsi/closing.png | Bin 2407 -> 2378 bytes .../Airlocks/Glass/security.rsi/open.png | Bin 812 -> 776 bytes .../Airlocks/Glass/security.rsi/opening.png | Bin 2511 -> 2467 bytes .../Standard/security.rsi/assembly.png | Bin 1038 -> 994 bytes .../Airlocks/Standard/security.rsi/closed.png | Bin 1206 -> 1153 bytes .../Standard/security.rsi/closing.png | Bin 2497 -> 2292 bytes .../Airlocks/Standard/security.rsi/open.png | Bin 836 -> 770 bytes .../Standard/security.rsi/opening.png | Bin 2625 -> 2430 bytes 39 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/_DV/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png b/Resources/Textures/_DV/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png index 69f92a22da8a95581ae2aa4170e48a6934e78264..5b40a5efc7fdcc117850424cbeb0bee2b3574a54 100644 GIT binary patch delta 1306 zcmV+#1?Bp-3cU)DB!6&eLqkw$V`BgSD3NuMze~eF6vw}9m5Np>*g?c0Ln{s~6a{gV z3U;XuZ3U|?$u(((Bn_7oDXxNxL%~6G@z>ygpsV1jAP9;e;_B+JMM`|v6k4Qx$K`$a z=6xS`?*M;BXNKLE1Ps&R*>p-;Ev!kwcla7Y-=gEn14sl_<5viiid>g)w`~1 z3>8(I0lop^S!QvEc%C@34fTzGTz4j0$-e zeJ#|$$x%X?ynk_0tJGDctdXwL(oqw0|36P#o0;~yhf+ZQtLuKofZ#sRsJrg(sp~e* zfWQlIZMOXtn$z4j>Gif2JqE%%z~xO_Qx1TuU103llDXWJ0<`^_27Fuq!v$dU9vEEr zX4U$S^Cuv`O;21M-n*1i;}fV*mgE36r1!6n}F`L_t(|0qt7NiW)%> z?g?=tLePs538EJT#b?m7C!Zj9PhRpezJn)Eo)vQO><=he5Cst-;Kj=Z%zRCHb{Mp~ zdUjlYwhG3cp6agp>Z|UaWom_BVFs81X5axBXt&$PFkyTOGwBxRY&M%vupWkh{eJ(k z2?!PaBTdTZ^M4=v3<#S{t23b0YH3+E>BE9l^UCG&5f`!@Y!iuuz%wm|z#fM;1sg!r2kLS=|><|QFrVN|(iuJH<);;)Cuznkg6zFZ`ZdL$J z_g=3jiz;U4uf!_8lV0{Kmr_+QLX?GFyT(P$)%mP#doy^pit z_w%#7)WK-u)rx>(u_)Y={)nZH6Tjc@JB>y|_6voAh{a;UCBnwP^;p-pgMGeUuf4el z9GSP>|DFNrjp?sElb-5_$1wxU05iZ0Fayj0Gk?GgFayj0Gr$Zm12@1x*xLIwp;IxF zK8b~`y*l<_Y#vYg;inK;W83{$&<;%xD6JIh0af;I+HIfe_)PGPy#>q?{RRV(?td% zU`Xc^I$#b=d3zVHp0``Mtc82Pcv%M6Iy1lwFayj0Gr$Zm1Iz$3Kw{t@;}~Rl$`8-M Qy8r+H07*qoM6N<$f*W3RI{*Lx delta 1300 zcmV+v1?&2~3bqQ6B!6#dLqkw$V`BgSD3NuMy-UMT6va2!bMrxVrkaNQw6~g%)XVxVb;h zyXW$91NhTAGwhxOV3-ciq>|EVeoYF#!-o*%6ozGHTT9u+9DlmT&m(nGJjBJU?tL92 zR8VaO`1*)vnZ+IAdE)ezV+r0P9%3cAKzu?R<8(pdTcIl+zX>jS{3V#@G7ErT%#@04 zth6yJaf5i0IBMt>*1V7SlCWy7WT}o)j=@F-DI_65K?R%8;UG@cq@8v4B^thEl*z;B zZJ`QIjv`9rjen6^p{XiWjdYbB9aXXS|NFGHnQ3o&I0^K=y6)#V5ZnjqHP`(;b=~?I z5O@Ku&6dARdz$+uz1GsA$3SEUxV&j;$^me-3yeHlGM5`tfYPsNz{dqJkOv0uf&O)G zSIu*rKLNRI`bBrZ;Sn%F{gI77<1A(dbM@bK`p z3CI=wXByOQw|~F(9*{Sgnf8Fg!$U92A$?wuZd|X|n{$zE_w3pm8ykja*H?NM6F_j| z@z`q@eOV+BT&vYGTu8s)H$Q%E**k5g%SwWnfTN?MXu-VM+1XjjGVjsT4?soB<>h5G zoldP;vfXSpO;r75@3ay0^s^1&pYOtcw%cSf@pcdCy?=v+N`fTYocq5U#@=Z=a)f5$ zZkY%m!@eNVUtC;qM>YtsRy$Coj37H7+1y8UceNluE?0o*b5~C+|py_|NG~KX(1K+hvV+_^wb*dcDshP&tCB7 z=Eh#`ILzWT(dj+?cttc3_?r>J`}G1yFF4dL_70E|_Og$b+X5Q(JkB{AKcrya7uC8n)Xfg8~jQH*JZ1pHFmP zP7Qf|lcVSLR?4-o4j9X2K&>kS%78MU3@8K2fHI&AC<7t}{sCCIZLegxguMU&00{s| KMNUMnLSTZ!G=E6| diff --git a/Resources/Textures/_DV/Clothing/Back/Backpacks/security.rsi/icon.png b/Resources/Textures/_DV/Clothing/Back/Backpacks/security.rsi/icon.png index 939485b047db5ab3f6ddae4658af5488844e24c5..fb0a1c8cde2b3951a50f0741fada9658624764da 100644 GIT binary patch delta 962 zcmV;z13mo42iOOYB!6&eLqkw$V`BgSD3NuMze~eF6vw}9m5Np>*g?c0Ln{s~6a{gV z3U;XuZ3U|?$u(((Bn_7oDXxNxL%~6G@z>ygpsV1jAP9;e;_B+JMM`|v6k4Qx$K`$a z=6xS`?*M;BXNKLE1Ps&R*>p-;Ev!kwcla7Y-=gEn14sl_<5viiid>g)w`~1 z3>8(I0lop^S!QvEc%C@34fTzGTz4j0$-e zeJ#|$$x%X?ynk_0tJGDctdXwL(oqw0|36P#o0;~yhf+ZQtLuKofZ#sRsJrg(sp~e* zfWQlIZMOXtn$z4j>Gif2JqE%%z~xO_Qx1TuU103llDXWJ0<`^_27Fuq!v$dU9vEEr zX4U$S^Cuv`O;21M-n*1i;}fV*mgE34d@%S#tmY3labT3lag+-G2N4 z00It4L_t(o3GJ4#Y63wJhQ|;j*hml)Eaa+01uNgdXGv$1r^&PU4yF-QtPTqahXfl7 z8*|^7(dCG{cR`Q@2fW?c*_r>JncX`@{*w#_gI&>lZi+gbd;eJpOsCVr{LV_CFna26 zaRR>~eSgv?ilV=F2uml^$rw7Fj%K&nY%-RkTB%f2nM@|RtpozkjfR4fap~?s=OS~d*XvTN)xPz7 zB!UDi8sMYRNLsCyyrv`o*LEcDI$HDl) z3XmziT`U&*v*74IiM#(Ndv-1NiwF{woUz~U>zs14hVI(4AU@q&A`T$Ihr^+CyIonY z*M}0j?ciV{tW~R38IQ+G3ct{82)1CkTxxK@32q>b^d@jHIrXfYoe?oVRXmSi3&;im z1b2!bMrxVrkaNQw6~g%)XVxVb;h zyXW$91NhTAGwhxOV3-ciq>|EVeoYF#!-o*%6ozGHTT9u+9DlmT&m(nGJjBJU?tL92 zR8VaO`1*)vnZ+IAdE)ezV+r0P9%3cAKzu?R<8(pdTcIl+zX>jS{3V#@G7ErT%#@04 zth6yJaf5i0IBMt>*1V7SlCWy7WT}o)j=@F-DI_65K?R%8;UG@cq@8v4B^thEl*z;B zZJ`QIjv`9rjen6^p{XiWjdYbB9aXXS|NFGHnQ3o&I0^K=y6)#V5ZnjqHP`(;b=~?I z5O@Ku&6dARdz$+uz1GsA$3SEUxV&j;$^me-3yeHlGM5`tfYPsNz{dqJkOv0uf&O)G zSIu*rKLNRI`bBrZ;Sn%F{gI77<1A8yczG~BIwf^1^mae9gQFOaq z%Wk*ZWi)5DT7Rt?Go4Oz`+Yi_U*7@VY&Pw{d_H&WcH4b?ey0Yn&t->PXO4i{37mOZ$^^_d_;%PbCSNjDl?huzaZuSIpCfR7(vS20=#hD0HG2pJ1acZ&~*$VW|Ywu_~*0j zP%z4zvqiG!e4zj^fE37yJAI1+`?in$qXLf#+!wV1KiuR2GXTi=5dZ)H07*qoM6N<$ Eg6plc^8f$< diff --git a/Resources/Textures/_DV/Clothing/Back/Backpacks/security.rsi/inhand-left.png b/Resources/Textures/_DV/Clothing/Back/Backpacks/security.rsi/inhand-left.png index 1ed6be7ea85986875174ea15e2f99d124cdeea88..f547afbed54d4ced066f5ef60fc37df05465e85b 100644 GIT binary patch delta 1348 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 SM=ad{0000*g?c0Ln{s~6a{gV z3U;XuZ3U|?$u(((Bn_7oDXxNxL%~6G@z>ygpsV1jAP9;e;_B+JMM`|v6k4Qx$K`$a z=6xS`?*M;BXNKLE1Ps&R*>p-;Ev!kwcla7Y-=gEn14sl_<5viiid>g)w`~1 z3>8(I0lop^S!QvEc%C@34fTzGTz4j0$-e zeJ#|$$x%X?ynk_0tJGDctdXwL(oqw0|36P#o0;~yhf+ZQtLuKofZ#sRsJrg(sp~e* zfWQlIZMOXtn$z4j>Gif2JqE%%z~xO_Qx1TuU103llDXWJ0<`^_27Fuq!v$dU9vEEr zX4U$S^Cuv`O;21M-n*1i;}fV*mgE36r1!6n~IOL_t(|0qvTZa+#!FBj1yuc5 zoFRy$MLBXTu_R#AI{vx)KHgEXj!MN68Hfx-1|kEIfyh8)ATkgchzvvqA_I{Dm8Plw zoSmIzKmYx1bAO%3VO!oeHX*X*a_MSnmAnjxlYrG~)heJaW6N+j32;pqn%qgiY&Hu5 zYZ(qF0YRYm0Fe~?u;UK~gB1DG)04Wtzt??^kB_zN;NUD0%lm*EG-$c-^UCU)R^yYOz=-Y5|YEE{`=lK=3e# z2`(}Lp`d<#)z?Cf^lMr@91hneaSQBpI(os@!om;31Ed}B0#@RPYf&Iihtj`E_2c8C zHV5!!&wl|<4`47QALF)7M0aY?mw>0n-ZBp`2w-z#mBoFE*pSmsKUZ88$Gqk>n;+n* zDS3OdOJm=%hCnad_-yVYq|n~vk_QitP4*fdz^ZaD<#zJt`B^ha7~oD^Q!Xzr*Utw{ zBSIF5x@fO0gbkMfEbgs${tR8e-`C)g&*yWEmw!#MiS93pF&>XIb4`0~1Xx3WiFld< zDECx$e`>Cgi=w91S65ewue}Bsmxh#T7lkm#I+uMGpvdWqol)5AbCw)P9vb;QahNxc|zP2q??7x6w-~5x{%4&`Ko& zLVp7fo=OCi<=WdwP$dG|2(Zj%@0X&yDrd5NoEfm`E(2z3-|D3(gD`+(sid1ZGeGi$ zGXoT96GLsvx0U5}^IHD&^t9Gnu~!Ii79gJ~cAXj6MY4oBMK?r~_ph^f5g-aN1S2l8 z#3P~b`xVa&NVb~9Y@J?EN&txxNtOU!R(}I`q;M@~285_x)ROaKZb^aHp~py$Zkkk9 zK?tF*ZDZLq$F^;ft|a{{o{WVeH83>c{{9002ovPDHLkV1jkmd|m(m delta 1288 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 delta 920 zcmV;J184le2fYW7B!6#dLqkw$V`BgSD3NuMy-UMT6va2!bMrxVrkaNQw6~g%)XVxVb;h zyXW$91NhTAGwhxOV3-ciq>|EVeoYF#!-o*%6ozGHTT9u+9DlmT&m(nGJjBJU?tL92 zR8VaO`1*)vnZ+IAdE)ezV+r0P9%3cAKzu?R<8(pdTcIl+zX>jS{3V#@G7ErT%#@04 zth6yJaf5i0IBMt>*1V7SlCWy7WT}o)j=@F-DI_65K?R%8;UG@cq@8v4B^thEl*z;B zZJ`QIjv`9rjen6^p{XiWjdYbB9aXXS|NFGHnQ3o&I0^K=y6)#V5ZnjqHP`(;b=~?I z5O@Ku&6dARdz$+uz1GsA$3SEUxV&j;$^me-3yeHlGM5`tfYPsNz{dqJkOv0uf&O)G zSIu*rKLNRI`bBrZ;Sn%F{gI77<1Avj30Mt^pXGUhJ5KRL2jKA)%AY(|D*(0DwS@o=u|x>_9V0l=%(DtVqq(2(1^ zi6Bufya|6e90~$(K%!VIia7q%T=dY9*pd~B!Qi=EPJp8UY{-22K>g9S@GF&y0OnE< zLS8u6vMf@k$@$Qc1aN?6=a&w3Ivuz|j_L<&l4+Xa*MDd<1PQzf2*;0`6`31nXbHRo zrl@PT+p-?be_FHz7zktjO-Ur61MhabRW# zz*oU}4}TyY&b4iuo?oLs;KT`lJxHkA&3jrr6W%?9Hz9Asa4sHbzuc5tby2;>|Dkm< z->5Lu8$Hk~6c(;_6>~BQM~`27{=R>eSc6)Xcwr|`H}*wjU1X5KS*z?-GJGDT0m`BS u$N5?WxDm8UMvaHi_Qvd;pFg(X~*!@(p|d0000*g?c0Ln{s~6a{gV z3U;XuZ3U|?$u(((Bn_7oDXxNxL%~6G@z>ygpsV1jAP9;e;_B+JMM`|v6k4Qx$K`$a z=6xS`?*M;BXNKLE1Ps&R*>p-;Ev!kwcla7Y-=gEn14sl_<5viiid>g)w`~1 z3>8(I0lop^S!QvEc%C@34fTzGTz4j0$-e zeJ#|$$x%X?ynk_0tJGDctdXwL(oqw0|36P#o0;~yhf+ZQtLuKofZ#sRsJrg(sp~e* zfWQlIZMOXtn$z4j>Gif2JqE%%z~xO_Qx1TuU103llDXWJ0<`^_27Fuq!v$dU9vEEr zX4U$S^Cuv`O;21M-n*1i;}fV*mgE36r1!6o0)*L_t(|0qvT>YTG~% zh9`#j(39vbrSw)~j4^?fKzlH5$qVEed^3K7UV3StAm|}VA?Jc=!T1S`F~)s>ltPM6 zrMLwpvoJzkq}8r=l2G^;?3H$R{+a!>(i&@sP(T0#KmY_l00ck)1V8`;KmY_l00ck) z1V8`;VhMCQoqsG=!?wQ*P4;nMJBm5)_xt}$e6?B~aNzBB+sN{HsD7DdsD^8N%hl=I z$3gPv-SsscJ|56$G@>L)NP?Gk8Rw%bW5rf9eQZO<1YZ$boC6&Whk5gx%S(Fy{58Go zC$wBHX)qX=zGC})J}1{|aA~G#8Xa>U?CpWd3Yg7ixqs&N>WZ@8Kk{=qsA`vfyY|tv zZJL~`04Q_3*=)>h!1Z`ME*lcu##-7%6~NOprH`j)^y)>2y4^1Ab~{tY1Z``^XqDNj z+)sSZ?)Q6olsq$&XGe1Xw^}WFa&ck6{QdRa#K2>>+pW_#?;fnjg@JNm&BbEjv@-(( zzSP8u+kah^f7ur6CNK77ny!bZ*gaUy0lS>n^_ST;u_@E3YExSQ;=mQK@0AxVsf(IT zHAD+F2!H?xfB*=900@8p2!H?xfB*=900@8p2!H?xfWZGup!kn*lX+ntjxx>-`15mV{A$0(;z?=e zBB-r^$z+m!IX|bj-@ckG5e`(YO5Ifm>G#PS2+2iI10a(KaV|EobxbaT8UW2i2p=GJ z-ayk_1T_Gh5OLRqpDFy5=i5LMG1zA@7vb~CNuG$ORaybtoO oN&5O%15gac*STB;)DKAD23~VEyNN{ic>n+a07*qoM6N<$f(sWFR{#J2 delta 1084 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 It^-0~f=zkicmMzZ diff --git a/Resources/Textures/_DV/Clothing/Back/Satchels/security.rsi/equipped-BACKPACK.png b/Resources/Textures/_DV/Clothing/Back/Satchels/security.rsi/equipped-BACKPACK.png index 5407a70c0637b17b1a22a0999cc079c1230bd46c..686e96a42a888f584178adb75e3d0206c34a6ca0 100644 GIT binary patch delta 1034 zcmV+l1oiu@2(So{B!6&eLqkw$V`BgSD3NuMze~eF6vw}9m5Np>*g?c0Ln{s~6a{gV z3U;XuZ3U|?$u(((Bn_7oDXxNxL%~6G@z>ygpsV1jAP9;e;_B+JMM`|v6k4Qx$K`$a z=6xS`?*M;BXNKLE1Ps&R*>p-;Ev!kwcla7Y-=gEn14sl_<5viiid>g)w`~1 z3>8(I0lop^S!QvEc%C@34fTzGTz4j0$-e zeJ#|$$x%X?ynk_0tJGDctdXwL(oqw0|36P#o0;~yhf+ZQtLuKofZ#sRsJrg(sp~e* zfWQlIZMOXtn$z4j>Gif2JqE%%z~xO_Qx1TuU103llDXWJ0<`^_27Fuq!v$dU9vEEr zX4U$S^Cuv`O;21M-n*1i;}fV*mgE36r1!6n|z(L_t(|0qvT-Zo)7W zg-u1JsuE&r!hkXX3q!kfYo~0CY%JZGc#6J5AB0Ef8)QM5*kDA=Rhk-6lj*H!`Ml?`~WOD(CZ=K&32UN|zKs z5Cq9|IxVLsXn#2z4g&NEq|8a|_xr?DNYFKx;knG#BnTE zt5uywr`jPW_dpsUVHJkFl zKEU;Qm4CO`^p>W10XmJz-%@XUw`Q!1?e#qD97=4He^sfolf?Lufh>N zr*xLYTI+Tg<;7wlJkJy9x!~;31nkGdmUI+FT3Qv^(M@%otZQ!))(Q;(eBT%2@mOkJ zE|+ZdZ32+y1O+Vs;8*ot?`!7?_^|{NU;<2l3G|x4FEnzxE!;HUI{*Lx07*qoM6N<$ Ef@n(TVE_OC delta 1031 zcmV+i1o-=~2&@Q@B!6#dLqkw$V`BgSD3NuMy-UMT6va2!bMrxVrkaNQw6~g%)XVxVb;h zyXW$91NhTAGwhxOV3-ciq>|EVeoYF#!-o*%6ozGHTT9u+9DlmT&m(nGJjBJU?tL92 zR8VaO`1*)vnZ+IAdE)ezV+r0P9%3cAKzu?R<8(pdTcIl+zX>jS{3V#@G7ErT%#@04 zth6yJaf5i0IBMt>*1V7SlCWy7WT}o)j=@F-DI_65K?R%8;UG@cq@8v4B^thEl*z;B zZJ`QIjv`9rjen6^p{XiWjdYbB9aXXS|NFGHnQ3o&I0^K=y6)#V5ZnjqHP`(;b=~?I z5O@Ku&6dARdz$+uz1GsA$3SEUxV&j;$^me-3yeHlGM5`tfYPsNz{dqJkOv0uf&O)G zSIu*rKLNRI`bBrZ;Sn%F{gI77<1AkhE;qDL3LVg@^h~Eyg?xr6dlBRDII;za+`GqKc?AG&G#Xh4ETsh3P_FCczGr;F z_^P`j!#9N2`d*8tmca{$m!hdj?>C+B{02eo{^ix$$K3v;OdsQ85_}s@*6%i&1L0v9 zTK|~S1q(F52Tqe)Nw(VUcJvfps&2PylI?sf_`nHX)_>x?UN2$~WhLB(ffKyjp8OW+ z6)>C4RKMTPPb$f?-~=!AA_=J1>&n)zF)Ao^95}&Cy+{IXpWn{#YpekbKG#EB*49OnhOL7UNq*K})J&gA@WG(DTo>P;d;;Q{BdP23{7&8^^PbbN z+zppSUDhIdDkT(=p0qJS%&O!tBLP)j>0_&7Bp@rK>}LkDnA3em03qa{?>K~j_U348d^_5U#lj@Y+E}p7 z=X3Jcaq>VAW0i3XB?y9e@;Hou{djCiPbL$itp6A|HpyfCd9{q7Apr0BMx&uKSF2UL z`Yr|N;tUNV0jQVtUa#up8T?6v7!U(uKnzscz#sKC!hH&7D!l*z002ovPDHLkV1h`1 B>G}Ww diff --git a/Resources/Textures/_DV/Clothing/Back/Satchels/security.rsi/icon.png b/Resources/Textures/_DV/Clothing/Back/Satchels/security.rsi/icon.png index 6dd48d3db258a090aeb7c3882c816cfa9935bfb0..dd2fac1d35f68bcb85b2273a50831c6fefa3817a 100644 GIT binary patch delta 1144 zcmV-;1c&>U37rX$B!6&eLqkw$V`BgSD3NuMze~eF6vw}9m5Np>*g?c0Ln{s~6a{gV z3U;XuZ3U|?$u(((Bn_7oDXxNxL%~6G@z>ygpsV1jAP9;e;_B+JMM`|v6k4Qx$K`$a z=6xS`?*M;BXNKLE1Ps&R*>p-;Ev!kwcla7Y-=gEn14sl_<5viiid>g)w`~1 z3>8(I0lop^S!QvEc%C@34fTzGTz4j0$-e zeJ#|$$x%X?ynk_0tJGDctdXwL(oqw0|36P#o0;~yhf+ZQtLuKofZ#sRsJrg(sp~e* zfWQlIZMOXtn$z4j>Gif2JqE%%z~xO_Qx1TuU103llDXWJ0<`^_27Fuq!v$dU9vEEr zX4U$S^Cuv`O;21M-n*1i;}fV*mgE36r1!6o1o6L_t(o3GJ1?ids<+ z#>cRQgq0;JqC(JWcNaKxhw}=DRbLP*P@0+=Eu4X6s-#XA}G&X+CFMQ=W_D@dW_VzYX=aUnNpa;rX z-0&EBKA(@g=YR2doH&&CXaa>oA(E7YnM}szoy}%D`Q_U>+*yd+-Q7iEk0Jp0`@z88 zWwSP%PVGaX;J|aaT$l_JXD>6BNWQVPai1O73ew_2^{faQY- zwqM`JAqn{ggF&KFsaUJka$T!dtJZ8b!%iIa3O)rbr$U5wuGeduOeU@i*tEwt8jbAt zCS^$+TWPo34B-awo0}Wk>dt#`I`PtefJuCDabb(aB3!Sou3Q5B42Q$er&!3OQYoVg z9hfaP$|=oV8f@^fK6vrdAxdJb~=Dj_m|-b)PK$O^|keSJu8(;HlNR3VgTs`L&aWT zkmz>1#u?r}L%a_d93&*5>SN%4qqe^SryBsNdIgDubk_U8@rMLZ5D085ce>vND$+Ne zZvh`5guR3qRqyAKKfXq0Anx>aRmc5j&jT=zbbT8X>z_Zg-|4`eJj{iy@b-hn?&Vyp>ag6!k~0000< KMNUMnLSTZ}94@B- delta 1138 zcmV-&1daQh36=?vB!6#dLqkw$V`BgSD3NuMy-UMT6va2!bMrxVrkaNQw6~g%)XVxVb;h zyXW$91NhTAGwhxOV3-ciq>|EVeoYF#!-o*%6ozGHTT9u+9DlmT&m(nGJjBJU?tL92 zR8VaO`1*)vnZ+IAdE)ezV+r0P9%3cAKzu?R<8(pdTcIl+zX>jS{3V#@G7ErT%#@04 zth6yJaf5i0IBMt>*1V7SlCWy7WT}o)j=@F-DI_65K?R%8;UG@cq@8v4B^thEl*z;B zZJ`QIjv`9rjen6^p{XiWjdYbB9aXXS|NFGHnQ3o&I0^K=y6)#V5ZnjqHP`(;b=~?I z5O@Ku&6dARdz$+uz1GsA$3SEUxV&j;$^me-3yeHlGM5`tfYPsNz{dqJkOv0uf&O)G zSIu*rKLNRI`bBrZ;Sn%F{gI77<1A}ZI=X0+INU2nc zrqgMNyHN`WUMv<}v)OcwM#DRUpMSgWKX?coJhm3pqn#bcm#hqD)&fxQN~Pi!i-kKq zJ$09tm!6LnUmPEDWa!|r6$pVO*qhg{T)W+d4YctLD1Z25GI6a|%R6{puLMWP4i69g zes6Ct$lv$hZgsoe=-}YMgJNA$)a&(p8#V$ko6Q`7p>nw#DxpAR4v!8y>@8gd^B|6n zj+}yH6NbSa5Ks9jEshI?g1fl52rFf_baHYMbg~6ZKA(5P;c)9&^JTR2@RuJ*dn+<4 zz`*?cK7Vuddfgo#ANyGF0-=B?B-3i`$K$cZnc`OhAUIPyTLK^(vS6s>*j5COHe>ea zX#;X7D|>V)01A#0A}a`I`}_NTFCboFeyEVZ06=F|dSe>c*fmTB$4XA*cz1W#w*?)U z>P8S8o!Vf}@(|H?+k5m-ssew+&Oa~=&vGACtAABD7!3R)b9Q#-gJ?DwG|dKQ0nzXG z9cSqO_Jg7iF2Bh&0I=EfcyND{#tKd~2&C*~r)p`>x+-g{4*(=g2DeopBZd*;Vanxl zf%nYv2ODL7byljCYitHqT3iX09rque4-kCX>ur$j-~36Js(=)BRTYrY1`VWa2#5?F z#AglIBztUA72wKnZ&6yZ4(Y!@C^#~awUsPujSbqmK?K;3^N(4+y!>B+b07u)0U%g; z2^mOB{Pl{~O}FgUttkLHARyYaURO}-^Nzo(z^zx{H#6a+!Q#gw?f?J)07*qoM6N<$ Eg4JmrYXATM diff --git a/Resources/Textures/_DV/Clothing/Back/Satchels/security.rsi/inhand-left.png b/Resources/Textures/_DV/Clothing/Back/Satchels/security.rsi/inhand-left.png index 899fa6e1d401a857e4bf591fdf3b2d36d1c25ae6..cfa201cc556079ad439c621fd961dec337bfd71c 100644 GIT binary patch delta 996 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 R*Z=?k00>D%PDHLkV1iA!<#qr7 delta 514 zcmV+d0{#7{1gZp(B!6ycLqkw$V`BgSD3NuMJ4*vW6oo&d;wutF3lWPgR4f#Nidaen zZPX%0@YQ73-9*?V%kBmVwt|gCz(Ta~Rrn9I6>Jp*K@mhOt$j5j>m4H`h|V&5KhDg# z%$$MHq-|upnkZzlz8jy2X>;=nTHO;3bkf2Q(WK!yQ#0cU{(l|sH&m&5-LHE6zwgh{ zv}}3?RMiU)8;j|xw&`i|mF;Wi_kTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$ zRj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnxrCOq!^4Szr?!WW&tigd&_izkqAA;be8|t>;vls*)2SM<8 z2-Wv+mM!~plGDhW=*6MAObd%pwwak!Z!SgXR&qM1KG%l91 z`dR1b77}anM3=C$3q7(wvh)ReS7<|nZvNl^000SaNRy)h5_e)rL_t&-8DnGsf;I+* z{~#I!R@+5E7(nv;p=FGWAj!)A{~6XwNihUJdj^&aNvr|W_wL=>>}t&cmMzZ07*qoM6N<$ Ef@uuz8UO$Q diff --git a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/Detective.png b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/Detective.png index fb1b68259550f9875b33b30535fb8539f576e3d1..fb693807f2729a42a4c68bf56423e68cd43370be 100644 GIT binary patch delta 523 zcmV+m0`&dA1f&FzB!6&eLqkw$V`BgSD3NuMze~eF6vw}9m5Np>*g?c0Ln{s~6a{gV z3U;XuZ3U|?$u(((Bn_7oDXxNxL%~6G@z>ygpsV1jAP9;e;_B+JMM`|v6k4Qx$K`$a z=6xS`?*M;BXNKLE1Ps&R*>p-;Ev!kwcla7Y-=gEn14sl_<5viiid>g)w`~1 z3>8(I0lop^S!QvEc%C@34fTzGTz4j0$-e zeJ#|$$x%X?ynk_0tJGDctdXwL(oqw0|36P#o0;~yhf+ZQtLuKofZ#sRsJrg(sp~e* zfWQlIZMOXtn$z4j>Gif2JqE%%z~xO_Qx1TuU103llDXWJ0<`^_27Fuq!v$dU9vEEr zX4U$S^Cuv`O;21M-n*1i;}fV*mgE34d@%S#tmY3labT3lag+-G2N4 z003G^L_t&-8DnGs0yQJ9g|am~CZc%kcK?D+U(043Ghm z1WAAZh^?-!&cFob;UQ2=fawI$Fq7a4kc~$+5Nri5NsvND5P{E|04)O^NrJ6j)Bpeg N07*qoLJp*K@mhOt$j5j>m4H`h|V&5KhDg# z%$$MHq-|upnkZzlz8jy2X>;=nTHO;3bkf2Q(WK!yQ#0cU{(l|sH&m&5-LHE6zwgh{ zv}}3?RMiU)8;j|xw&`i|mF;Wi_kTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$ zRj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnxrCOq!^4Szr?!WW&tigd&_izkqAA;be8|t>;vls*)2SM<8 z2-Wv+mM!~plGDhW=*6MAObd%pwwak!Z!SgXR&qM1KG%l91 z`dR1b77}anM3=C$3q7(wvh)ReS7<|nZvNl^000SaNRy)h5`T9|L_t&-8DnGsf;I+* z{~#I!R@+5E7(nv;p=FGWAW1bzNw{F}vu9v-NMa4cy?gf=Sl}{121pVl0Rn60w=fvl zM>8;id3XpE6JR<)G|VKp0+8`*rKA{^yC=@KBWajU%MAtq0000G6*M diff --git a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/SecurityBorg.png b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/SecurityBorg.png index e8796c9afdbdac3259afd4be0aa682d4f843f33c..234d0eb4ebe3de3d3e4ad6c01d72b64cf45344f4 100644 GIT binary patch delta 509 zcmV*g?c0Ln{s~6a{gV z3U;XuZ3U|?$u(((Bn_7oDXxNxL%~6G@z>ygpsV1jAP9;e;_B+JMM`|v6k4Qx$K`$a z=6xS`?*M;BXNKLE1Ps&R*>p-;Ev!kwcla7Y-=gEn14sl_<5viiid>g)w`~1 z3>8(I0lop^S!QvEc%C@34fTzGTz4j0$-e zeJ#|$$x%X?ynk_0tJGDctdXwL(oqw0|36P#o0;~yhf+ZQtLuKofZ#sRsJrg(sp~e* zfWQlIZMOXtn$z4j>Gif2JqE%%z~xO_Qx1TuU103llDXWJ0<`^_27Fuq!v$dU9vEEr zX4U$S^Cuv`O;21M-n*1i;}fV*mgE36r7$6mnfjL_t&-8Eucz3BVu> zL=#sKI)XbW?eqnAFw5A!4<(8Z7I1wl{*5m#4#EmGpUrqCko3zzrd zd++G#*FBsBdS6}la|{UX1NEBg{+_yS z{R{}a0M};AU#2Cn6POT6Atr$M$R?mD2nHGt0&C{CfN2l`R{*jf8Nf_o1PS8v aCIBA7IWtDmOAX=x0000*g?c0Ln{s~6a{gV z3U;XuZ3U|?$u(((Bn_7oDXxNxL%~6G@z>ygpsV1jAP9;e;_B+JMM`|v6k4Qx$K`$a z=6xS`?*M;BXNKLE1Ps&R*>p-;Ev!kwcla7Y-=gEn14sl_<5viiid>g)w`~1 z3>8(I0lop^S!QvEc%C@34fTzGTz4j0$-e zeJ#|$$x%X?ynk_0tJGDctdXwL(oqw0|36P#o0;~yhf+ZQtLuKofZ#sRsJrg(sp~e* zfWQlIZMOXtn$z4j>Gif2JqE%%z~xO_Qx1TuU103llDXWJ0<`^_27Fuq!v$dU9vEEr zX4U$S^Cuv`O;21M-n*1i;}fV*mgE34L%#S#tmY4#NNd4#NS*Z>VGd z002};L_t&-8DnGs0yQtE)p4APd6SFdA$EjDv0hNSp~KiHjzvfDxni#1hNE>B!6ycLqkw$V`BgSD3NuMJ4*vW6oo&d;wutF3lWPgR4f#Nidaen zZPX%0@YQ73-9*?V%kBmVwt|gCz(Ta~Rrn9I6>Jp*K@mhOt$j5j>m4H`h|V&5KhDg# z%$$MHq-|upnkZzlz8jy2X>;=nTHO;3bkf2Q(WK!yQ#0cU{(l|sH&m&5-LHE6zwgh{ zv}}3?RMiU)8;j|xw&`i|mF;Wi_kTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$ zRj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnxrCOq!^4Szr?!WW&tigd&_izkqAA;be8|t>;vls*)2SM<8 z2-Wv+mM!~plGDhW=*6MAObd%pwwak!Z!SgXR&qM1KG%l91 z`dR1b77}anM3=C$3q7(wvh)ReS7<|nZvNl^000SaNRy)h5`St*L_t&-8DnGsf;I+* z{~#I!R@+5E7(nv;p=FGWAW1bzNrvEO&)^auMo3}}!@Ya=8CXCZnB-b1DTd|lNgyGH zHS=2-jO?Q!3cw;j0;Dh)#(~mc6JTQKCV<45V3N3Kf(jTxI`MfE0H1yzIoZn6tN;K2 M07*qoM6N<$f_+NyLjV8( diff --git a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/SecurityOfficer.png b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/SecurityOfficer.png index e8cabfdbea494a311fc11d2c3c105a9f366a7171..6f8ff128c4f9e2a28c4c02c68d14ad46c830ea7c 100644 GIT binary patch delta 529 zcmV+s0`C361gZp(B!6&eLqkw$V`BgSD3NuMze~eF6vw}9m5Np>*g?c0Ln{s~6a{gV z3U;XuZ3U|?$u(((Bn_7oDXxNxL%~6G@z>ygpsV1jAP9;e;_B+JMM`|v6k4Qx$K`$a z=6xS`?*M;BXNKLE1Ps&R*>p-;Ev!kwcla7Y-=gEn14sl_<5viiid>g)w`~1 z3>8(I0lop^S!QvEc%C@34fTzGTz4j0$-e zeJ#|$$x%X?ynk_0tJGDctdXwL(oqw0|36P#o0;~yhf+ZQtLuKofZ#sRsJrg(sp~e* zfWQlIZMOXtn$z4j>Gif2JqE%%z~xO_Qx1TuU103llDXWJ0<`^_27Fuq!v$dU9vEEr zX4U$S^Cuv`O;21M-n*1i;}fV*mgE34d@%S#tmY3labT3lag+-G2N4 z003Y~L_t&-8DnGs0yQJp*K@mhOt$j5j>m4H`h|V&5KhDg# z%$$MHq-|upnkZzlz8jy2X>;=nTHO;3bkf2Q(WK!yQ#0cU{(l|sH&m&5-LHE6zwgh{ zv}}3?RMiU)8;j|xw&`i|mF;Wi_kTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$ zRj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnxrCOq!^4Szr?!WW&tigd&_izkqAA;be8|t>;vls*)2SM<8 z2-Wv+mM!~plGDhW=*6MAObd%pwwak!Z!SgXR&qM1KG%l91 z`dR1b77}anM3=C$3q7(wvh)ReS7<|nZvNl^000SaNRy)h5`TF~L_t&-8DnGsf;I+* z{~#I!R@+5E7(nv;p=FFrAW1bzNruY*{~18El9D3Bxr0l=w4q(pe-^lMAS3wMGlpPf z0T3Hx0t~E?l>8r@Pz~e$C&~mSWE0m)Nil>Z)*uTpFv1)OvL6|M6yCdcpMeo12vP)- cME52Dc0Dj41fv9yB!6&eLqkw$V`BgSD3NuMze~eF6vw}9m5Np>*g?c0Ln{s~6a{gV z3U;XuZ3U|?$u(((Bn_7oDXxNxL%~6G@z>ygpsV1jAP9;e;_B+JMM`|v6k4Qx$K`$a z=6xS`?*M;BXNKLE1Ps&R*>p-;Ev!kwcla7Y-=gEn14sl_<5viiid>g)w`~1 z3>8(I0lop^S!QvEc%C@34fTzGTz4j0$-e zeJ#|$$x%X?ynk_0tJGDctdXwL(oqw0|36P#o0;~yhf+ZQtLuKofZ#sRsJrg(sp~e* zfWQlIZMOXtn$z4j>Gif2JqE%%z~xO_Qx1TuU103llDXWJ0<`^_27Fuq!v$dU9vEEr zX4U$S^Cuv`O;21M-n*1i;}fV*mgE34d@%S#tmY4#WTe4#WYKD-Ig~ z003D@L_t&-8DnGs0yQ{#< z%my3(9|$ZhZ9o(lz}O(uSzx+AG`ck)F}M{V4mLng0V7BkK5qg5!geb9)!ag-00000 MNkvXXt^-0~f~<4oI{*Lx delta 529 zcmV+s0`C2z1h@o{B!6ycLqkw$V`BgSD3NuMJ4*vW6oo&d;wutF3lWPgR4f#Nidaen zZPX%0@YQ73-9*?V%kBmVwt|gCz(Ta~Rrn9I6>Jp*K@mhOt$j5j>m4H`h|V&5KhDg# z%$$MHq-|upnkZzlz8jy2X>;=nTHO;3bkf2Q(WK!yQ#0cU{(l|sH&m&5-LHE6zwgh{ zv}}3?RMiU)8;j|xw&`i|mF;Wi_kTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$ zRj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnxrCOq!^4Szr?!WW&tigd&_izkqAA;be8|t>;vls*)2SM<8 z2-Wv+mM!~plGDhW=*6MAObd%pwwak!Z!SgXR&qM1KG%l91 z`dR1b77}anM3=C$3q7(wvh)ReS7<|nZvNl^000SaNRy)h5`S<>L_t&-8DnGsf;I+* z{~#I!R@+5E7(nv;p=FFLAj!)A{~6XwNr5GlloY}An)xjZM)nNdPz`1q+C}|mfvW^EK-MgGPeK-AfLnngio_wPfDxn^pEm)5kuUh! TOy2_l0000*g?c0Ln{s~6a{gV z3U;XuZ3U|?$u(((Bn_7oDXxNxL%~6G@z>ygpsV1jAP9;e;_B+JMM`|v6k4Qx$K`$a z=6xS`?*M;BXNKLE1Ps&R*>p-;Ev!kwcla7Y-=gEn14sl_<5viiid>g)w`~1 z3>8(I0lop^S!QvEc%C@34fTzGTz4j0$-e zeJ#|$$x%X?ynk_0tJGDctdXwL(oqw0|36P#o0;~yhf+ZQtLuKofZ#sRsJrg(sp~e* zfWQlIZMOXtn$z4j>Gif2JqE%%z~xO_Qx1TuU103llDXWJ0<`^_27Fuq!v$dU9vEEr zX4U$S^Cuv`O;21M-n*1i;}fV*mgE336~qS#tmY3labT3lag+-G2N4 z002ozL_t&-8DnGs0yQ!aY-o)00000NkvXXu0mjfi&@^h delta 497 zcmVJp*K@mhOt$j5j>m4H`h|V&5KhDg# z%$$MHq-|upnkZzlz8jy2X>;=nTHO;3bkf2Q(WK!yQ#0cU{(l|sH&m&5-LHE6zwgh{ zv}}3?RMiU)8;j|xw&`i|mF;Wi_kTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$ zRj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnxrCOq!^4Szr?!WW&tigd&_izkqAA;be8|t>;vls*)2SM<8 z2-Wv+mM!~plGDhW=*6MAObd%pwwak!Z!SgXR&qM1KG%l91 z`dR1b77}anM3=C$3q7(wvh)ReS7<|nZvNl^000SaNRy)h5@u0JL_t&-8DnGsf;I+* z{~#I!R@+5E7(nv;p=FF<$u*La|3Lso2Pag6`G$5;|C!**aWO!~;{tFK)=Ei%^~30p n#2UDH1g#*bfDvRCK5qg5&ucwf7flQD00000NkvXXu0mjfSKa3P diff --git a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/nyanoPrisonGuard.png b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/nyanoPrisonGuard.png index f2f12aaab7228de0892be5da0bf9f538631760be..4f4ec66fbe7fa8ee90ca9723e86ce1021952e4ad 100644 GIT binary patch delta 492 zcmV*g?c0Ln{s~6a{gV z3U;XuZ3U|?$u(((Bn_7oDXxNxL%~6G@z>ygpsV1jAP9;e;_B+JMM`|v6k4Qx$K`$a z=6xS`?*M;BXNKLE1Ps&R*>p-;Ev!kwcla7Y-=gEn14sl_<5viiid>g)w`~1 z3>8(I0lop^S!QvEc%C@34fTzGTz4j0$-e zeJ#|$$x%X?ynk_0tJGDctdXwL(oqw0|36P#o0;~yhf+ZQtLuKofZ#sRsJrg(sp~e* zfWQlIZMOXtn$z4j>Gif2JqE%%z~xO_Qx1TuU103llDXWJ0<`^_27Fuq!v$dU9vEEr zX4U$S^Cuv`O;21M-n*1i;}fV*mgE36r7$6k$wBL_t&-8DnGs0yQEYLg3N}y i0bK%S8zYE;&zk^fZV{Haxg<^i00007I1wl{*5m#4#EmGpUrqCko3zzrd zd++G#*FBsBdS6}la|{UX1NEBg{+_yS z{R{}a0M};AU#2*g?c0Ln{s~6a{gV z3U;XuZ3U|?$u(((Bn_7oDXxNxL%~6G@z>ygpsV1jAP9;e;_B+JMM`|v6k4Qx$K`$a z=6xS`?*M;BXNKLE1Ps&R*>p-;Ev!kwcla7Y-=gEn14sl_<5viiid>g)w`~1 z3>8(I0lop^S!QvEc%C@34fTzGTz4j0$-e zeJ#|$$x%X?ynk_0tJGDctdXwL(oqw0|36P#o0;~yhf+ZQtLuKofZ#sRsJrg(sp~e* zfWQlIZMOXtn$z4j>Gif2JqE%%z~xO_Qx1TuU103llDXWJ0<`^_27Fuq!v$dU9vEEr zX4U$S^Cuv`O;21M-n*1i;}fV*mgE34d@%S#tmY3labT3lag+-G2N4 z0068>L_t(o3GI|o3VJoV_YC% zvvTKGisvMH3bj~GHb%q@V!o re0K)4M7=Mhrfqvhzz7(DZxPr5ejO>nHR^|b00000NkvXXu0mjfoQM=H delta 623 zcmV-#0+9Xo1eOJmB!6ycLqkw$V`BgSD3NuMJ4*vW6oo&d;wutF3lWPgR4f#Nidaen zZPX%0@YQ73-9*?V%kBmVwt|gCz(Ta~Rrn9I6>Jp*K@mhOt$j5j>m4H`h|V&5KhDg# z%$$MHq-|upnkZzlz8jy2X>;=nTHO;3bkf2Q(WK!yQ#0cU{(l|sH&m&5-LHE6zwgh{ zv}}3?RMiU)8;j|xw&`i|mF;Wi_kTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$ zRj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnxrCOq!^4Szr?!WW&tigd&_izkqAA;be8|t>;vls*)2SM<8 z2-Wv+mM!~plGDhW=*6MAObd%pwwak!Z!SgXR&qM1KG%l91 z`dR1b77}anM3=C$3q7(wvh)ReS7<|nZvNl^000SaNRy)h5`WG~L_t(o31eUw1*0J_ z8UmvsFw#SSk=OueV_^6XQoF&-jNvzj3Rv6uL(7QPkINnwToTCQAj>QNgY9QHO@;Pf!8OR*)lLY+`6)EGNdCQ8l9>Fd71*Au#+y005y_EX+}{ulfK0002ov JPDHLkV1iI#A4C8E diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/iddetective.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/iddetective.png index 748deceac496c6704ed0a83a60e900b23b7047f2..185cab87903b3351d5bd1f5a119ccd743af1dd30 100644 GIT binary patch delta 620 zcmV-y0+ao$1%(BWB!6&eLqkw$V`BgSD3NuMze~eF6vw}9m5Np>*g?c0Ln{s~6a{gV z3U;XuZ3U|?$u(((Bn_7oDXxNxL%~6G@z>ygpsV1jAP9;e;_B+JMM`|v6k4Qx$K`$a z=6xS`?*M;BXNKLE1Ps&R*>p-;Ev!kwcla7Y-=gEn14sl_<5viiid>g)w`~1 z3>8(I0lop^S!QvEc%C@34fTzGTz4j0$-e zeJ#|$$x%X?ynk_0tJGDctdXwL(oqw0|36P#o0;~yhf+ZQtLuKofZ#sRsJrg(sp~e* zfWQlIZMOXtn$z4j>Gif2JqE%%z~xO_Qx1TuU103llDXWJ0<`^_27Fuq!v$dU9vEEr zX4U$S^Cuv`O;21M-n*1i;}fV*mgE34d@%S#tmY3labT3lag+-G2N4 z006s5L_t(o3GI|?3WXpLg{QbX2wH;fA-Jm#+Ji13Xbtyr0-<7(V~;;If;8$pztKc& z7y%<-1l~@dVgWekep}rbBW=I6P3t-dxi5k@O)Hoogn2^NlFIqf&OX}a-rg|u(skeY z7_#?%Pi2+frwGvA4k#88K=r5`Bat`|b7fMLz_JA^FDDjs3+@Pxyy<78-S{h>;R$#T zF{N6NencfTPtzz&i>L$;Si1wcgqYwtdpk1%M!*QXhrl0t-B!6ycLqkw$V`BgSD3NuMJ4*vW6oo&d;wutF3lWPgR4f#Nidaen zZPX%0@YQ73-9*?V%kBmVwt|gCz(Ta~Rrn9I6>Jp*K@mhOt$j5j>m4H`h|V&5KhDg# z%$$MHq-|upnkZzlz8jy2X>;=nTHO;3bkf2Q(WK!yQ#0cU{(l|sH&m&5-LHE6zwgh{ zv}}3?RMiU)8;j|xw&`i|mF;Wi_kTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$ zRj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnxrCOq!^4Szr?!WW&tigd&_izkqAA;be8|t>;vls*)2SM<8 z2-Wv+mM!~plGDhW=*6MAObd%pwwak!Z!SgXR&qM1KG%l91 z`dR1b77}anM3=C$3q7(wvh)ReS7<|nZvNl^000SaNRy)h5`W}LL_t(o31eUw1*0J_ z8UmvsFw#SSk=OueV_^6XQoF&-jNvzj3Rv6uL(7QPPpmyy)qyNuBPj{S|Dhl_q58j} zT@=_+STzwT$U>w#u(IH1&lo&CeHgeU3>enTZ(%U9k0wPsR<%r6Md>I=QV6V-l495n z3*g?c0Ln{s~6a{gV z3U;XuZ3U|?$u(((Bn_7oDXxNxL%~6G@z>ygpsV1jAP9;e;_B+JMM`|v6k4Qx$K`$a z=6xS`?*M;BXNKLE1Ps&R*>p-;Ev!kwcla7Y-=gEn14sl_<5viiid>g)w`~1 z3>8(I0lop^S!QvEc%C@34fTzGTz4j0$-e zeJ#|$$x%X?ynk_0tJGDctdXwL(oqw0|36P#o0;~yhf+ZQtLuKofZ#sRsJrg(sp~e* zfWQlIZMOXtn$z4j>Gif2JqE%%z~xO_Qx1TuU103llDXWJ0<`^_27Fuq!v$dU9vEEr zX4U$S^Cuv`O;21M-n*1i;}fV*mgE36q}zxe;n=YX60W#Ypnz+qbV6 fZr!?*X#yY=Z#YkyK35^`00000NkvXXu0mjfG8fG% delta 437 zcmV;m0ZRU#1)T+uB!6ycLqkw$V`BgSD3NuMJ4*vW6oo&d;wutF3lWPgR4f#Nidaen zZPX%0@YQ73-9*?V%kBmVwt|gCz(Ta~Rrn9I6>Jp*K@mhOt$j5j>m4H`h|V&5KhDg# z%$$MHq-|upnkZzlz8jy2X>;=nTHO;3bkf2Q(WK!yQ#0cU{(l|sH&m&5-LHE6zwgh{ zv}}3?RMiU)8;j|xw&`i|mF;Wi_kTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$ zRj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnxrCOq!^4Szr?!WW&tigd&_izkqAA;be8|t>;vls*)2SM<8 z2-Wv+mM!~plGDhW=*6MAObd%pwwak!Z!SgXR&qM1KG%l91 z`dR1b77}anM3=C$3q7(wvh)ReS7<|nZvNl^000SaNRy)hw-IJ$X8(nRL`m}IyLYb{ fPMtcFYXTq?f+$a#DL*H300000NkvXXu0mjf5t7a} diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idintern-cadet.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idintern-cadet.png index 9d5c34773cf449ed86b36b1e1b0a552f21e23ca7..ec95c9a37e7bc66de44f65a77c89179f7bea8f23 100644 GIT binary patch delta 597 zcmV-b0;>It1?~ipB!6&eLqkw$V`BgSD3NuMze~eF6vw}9m5Np>*g?c0Ln{s~6a{gV z3U;XuZ3U|?$u(((Bn_7oDXxNxL%~6G@z>ygpsV1jAP9;e;_B+JMM`|v6k4Qx$K`$a z=6xS`?*M;BXNKLE1Ps&R*>p-;Ev!kwcla7Y-=gEn14sl_<5viiid>g)w`~1 z3>8(I0lop^S!QvEc%C@34fTzGTz4j0$-e zeJ#|$$x%X?ynk_0tJGDctdXwL(oqw0|36P#o0;~yhf+ZQtLuKofZ#sRsJrg(sp~e* zfWQlIZMOXtn$z4j>Gif2JqE%%z~xO_Qx1TuU103llDXWJ0<`^_27Fuq!v$dU9vEEr zX4U$S^Cuv`O;21M-n*1i;}fV*mgE34d@%S#tmY3labT3lag+-G2N4 z005*(L_t(o3GI{N34kCFg)Q1ZXat=hsp$iUaD>1as{11$BF~Zvy!++h-M#0h3cT%;sI^2b`{1fp`3E9b;$27U;`vT zqP3&QKu%1chMB&`kS8-fHvoU5)Qf-Z8$Ln&`(Ee@2)~qL(P6yb1ad`?0a8xAft({m jJlD^AOn?b6fp!QS_scL?<8^>&00000NkvXXu0mjf^oJp*K@mhOt$j5j>m4H`h|V&5KhDg# z%$$MHq-|upnkZzlz8jy2X>;=nTHO;3bkf2Q(WK!yQ#0cU{(l|sH&m&5-LHE6zwgh{ zv}}3?RMiU)8;j|xw&`i|mF;Wi_kTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$ zRj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnxrCOq!^4Szr?!WW&tigd&_izkqAA;be8|t>;vls*)2SM<8 z2-Wv+mM!~plGDhW=*6MAObd%pwwak!Z!SgXR&qM1KG%l91 z`dR1b77}anM3=C$3q7(wvh)ReS7<|nZvNl^000SaNRy)h5`V-=L_t(o31eUw1*0J_ z8UmvsFw#SSk=OueV_^6XQoF&-jNvzj3Rv6uL(7QPPpmyy)qyNuBPsbG83ZR(|2MRY z0y_$;CTa?T8~_3!M|gO6{|8wP0@QE-3n>l_e)fzZm=p~}sAVET4P41uDJcd|PalSm z#2UC5r3{iBKw7C~*z^y$1BlK>1DXx71>LX_BPt5a%*_4^35k;A>38p5Gn_hgilF%f z6~Jr-IReHeh9<^xV$2y;Ga3S;Aut*O!#@N7EBZj?=LxG300000NkvXXu0mjfyd@C! diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idsecurityofficer.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idsecurityofficer.png index 192f42af4dbb46196b8f3f9e11482c53fe1cedf2..09a461ee26710ed5960e0531ce360a02b4a9dba6 100644 GIT binary patch delta 613 zcmV-r0-F7%1^xt(B!6&eLqkw$V`BgSD3NuMze~eF6vw}9m5Np>*g?c0Ln{s~6a{gV z3U;XuZ3U|?$u(((Bn_7oDXxNxL%~6G@z>ygpsV1jAP9;e;_B+JMM`|v6k4Qx$K`$a z=6xS`?*M;BXNKLE1Ps&R*>p-;Ev!kwcla7Y-=gEn14sl_<5viiid>g)w`~1 z3>8(I0lop^S!QvEc%C@34fTzGTz4j0$-e zeJ#|$$x%X?ynk_0tJGDctdXwL(oqw0|36P#o0;~yhf+ZQtLuKofZ#sRsJrg(sp~e* zfWQlIZMOXtn$z4j>Gif2JqE%%z~xO_Qx1TuU103llDXWJ0<`^_27Fuq!v$dU9vEEr zX4U$S^Cuv`O;21M-n*1i;}fV*mgE34d@%S#tmY3labT3lag+-G2N4 z006W}L_t(o3GI|k3Vs~R^t=*)Y5{t#(X z0!ly${GGsn0ZeJ`00000NkvXXu0mjffPNoj delta 639 zcmV-_0)YMg1f~U$B!6ycLqkw$V`BgSD3NuMJ4*vW6oo&d;wutF3lWPgR4f#Nidaen zZPX%0@YQ73-9*?V%kBmVwt|gCz(Ta~Rrn9I6>Jp*K@mhOt$j5j>m4H`h|V&5KhDg# z%$$MHq-|upnkZzlz8jy2X>;=nTHO;3bkf2Q(WK!yQ#0cU{(l|sH&m&5-LHE6zwgh{ zv}}3?RMiU)8;j|xw&`i|mF;Wi_kTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$ zRj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnxrCOq!^4Szr?!WW&tigd&_izkqAA;be8|t>;vls*)2SM<8 z2-Wv+mM!~plGDhW=*6MAObd%pwwak!Z!SgXR&qM1KG%l91 z`dR1b77}anM3=C$3q7(wvh)ReS7<|nZvNl^000SaNRy)h5`W%FL_t(o31eUw1*0J_ z8UmvsFw#SSk=OueV_^6XQoF&-jNvzj3Rv6uL(7QPkINn=ToTCQAj{PxB^fIJ|7Q>q z5@k4da4Cb5k|KklT@=_+$ZAPt6XgJ8L$`0=g3P548x#T{utrkyzlVqS|KNmbFrOMB zz(R@_f}cHO2y`Yz0}*OTih{LLQVgD+J`5p=HAEOqoD!l#0Ax9G2vExrL}w#fWkce^ zX*jDQDhkZZ%>IK4AX31)cdr>vojOI(e1ZyKmVz7sV-rIYV>vPAjH($8fzc2c4T0ew Z0s#7yJu*g?c0Ln{s~6a{gV z3U;XuZ3U|?$u(((Bn_7oDXxNxL%~6G@z>ygpsV1jAP9;e;_B+JMM`|v6k4Qx$K`$a z=6xS`?*M;BXNKLE1Ps&R*>p-;Ev!kwcla7Y-=gEn14sl_<5viiid>g)w`~1 z3>8(I0lop^S!QvEc%C@34fTzGTz4j0$-e zeJ#|$$x%X?ynk_0tJGDctdXwL(oqw0|36P#o0;~yhf+ZQtLuKofZ#sRsJrg(sp~e* zfWQlIZMOXtn$z4j>Gif2JqE%%z~xO_Qx1TuU103llDXWJ0<`^_27Fuq!v$dU9vEEr zX4U$S^Cuv`O;21M-n*1i;}fV*mgE34d@%S#tmY4#WTe4#WYKD-Ig~ z005{-L_t(o3GI|&3V%H#HB+rVwKb6eE(~G6hn)HSo7`n! zT{nU_vQk!b8Gxv!IQn%PK#^vAZa{pEYA0Uf8fwz~XD`tf06%_0J(2T4k}VP$fN<>$ nvB?GD=#FyUyCoo00000NkvXXu0mjfW*H57 delta 622 zcmV-!0+Idl1eFDlB!6ycLqkw$V`BgSD3NuMJ4*vW6oo&d;wutF3lWPgR4f#Nidaen zZPX%0@YQ73-9*?V%kBmVwt|gCz(Ta~Rrn9I6>Jp*K@mhOt$j5j>m4H`h|V&5KhDg# z%$$MHq-|upnkZzlz8jy2X>;=nTHO;3bkf2Q(WK!yQ#0cU{(l|sH&m&5-LHE6zwgh{ zv}}3?RMiU)8;j|xw&`i|mF;Wi_kTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$ zRj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnxrCOq!^4Szr?!WW&tigd&_izkqAA;be8|t>;vls*)2SM<8 z2-Wv+mM!~plGDhW=*6MAObd%pwwak!Z!SgXR&qM1KG%l91 z`dR1b77}anM3=C$3q7(wvh)ReS7<|nZvNl^000SaNRy)h5`WD}L_t(o31eUw1*0J_ z8UmvsFw#SSk=OueV_^6XQoF&-jNvzj3Rv6uL(7QPkINn=ToTCQAj>QN|7TE>lw=SR z5@k?QQe-%Ha4CbKT@=_+$ZAPt6XgJyp~26dfthROx4?ubrb%+ZS}7@p?c297ge2Bb zY%$CLk{kfi<{907*qo IM6N<$f*g?c0Ln{s~6a{gV z3U;XuZ3U|?$u(((Bn_7oDXxNxL%~6G@z>ygpsV1jAP9;e;_B+JMM`|v6k4Qx$K`$a z=6xS`?*M;BXNKLE1Ps&R*>p-;Ev!kwcla7Y-=gEn14sl_<5viiid>g)w`~1 z3>8(I0lop^S!QvEc%C@34fTzGTz4j0$-e zeJ#|$$x%X?ynk_0tJGDctdXwL(oqw0|36P#o0;~yhf+ZQtLuKofZ#sRsJrg(sp~e* zfWQlIZMOXtn$z4j>Gif2JqE%%z~xO_Qx1TuU103llDXWJ0<`^_27Fuq!v$dU9vEEr zX4U$S^Cuv`O;21M-n*1i;}fV*mgE34d@%S#tmY3labT3lag+-G2N4 z005LpL_t(o31eUw1*0J_8UmvsFw#SSk=OuGQ&anouJ+cgTSV(e*Gm!~WH|^}TH2t{ z*c?TY!9c}Kq-q!t^{@~Cdmo9Qdk9!r*@6QAMpGj+20RJ|+yO*qBW&?aw`@p_xE{1- z5ETWW;64`?79+_MZ{NORASQ~4asbF?Y-s?Wi-@rtpZ-y~(GVC7fzc2cIUxW5lT$ry Tp_6{i00000NkvXXu0mjfaSQ*d delta 586 zcmV-Q0=50#1n~rrB!6ycLqkw$V`BgSD3NuMJ4*vW6oo&d;wutF3lWPgR4f#Nidaen zZPX%0@YQ73-9*?V%kBmVwt|gCz(Ta~Rrn9I6>Jp*K@mhOt$j5j>m4H`h|V&5KhDg# z%$$MHq-|upnkZzlz8jy2X>;=nTHO;3bkf2Q(WK!yQ#0cU{(l|sH&m&5-LHE6zwgh{ zv}}3?RMiU)8;j|xw&`i|mF;Wi_kTo&FJ?sMgU!WT-{OZ=!fRpM90ZX!MgA=Oh$ zRj^*cM%v8?_X>Aq?7Z=F9(9wjnVp@H+99(Ok2n*=(9p@Vf{jnV)U0Iow=eqbnxrCOq!^4Szr?!WW&tigd&_izkqAA;be8|t>;vls*)2SM<8 z2-Wv+mM!~plGDhW=*6MAObd%pwwak!Z!SgXR&qM1KG%l91 z`dR1b77}anM3=C$3q7(wvh)ReS7<|nZvNl^000SaNRy)h5`U>lL_t(o31eUw1*0J_ z8UmvsFw#SSk=OueV_^6XQoF&-jNvzj3Rv6uL(7QPPpmyy)qyMrfi;qnU^+OV8cZA7 zMS&fKRTGhdOhl?1SY@yf0DBvWpnC|cm68I7L`Y%{)k0*zqhP=tKy)@5&}>Mx2p^0F z5fueyW@i6|gg-<{a{s$`uNh9AIz`ZYf(l@^f*b*36GIbYIWgvpsu>M|(GVC7f#Dwl Y0I8`%qwJk(2><{907*qoM6N<$f(#1?ivR!s diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/nyanoprisonguard.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/nyanoprisonguard.png index 7efdc5205490d3cd1176f7f4abc399c885d9f6d0..dcf89e0ff753e3424783e696618851edb963a736 100644 GIT binary patch delta 567 zcmV-70?7S?1>gjbB!6&eLqkw$V`BgSD3NuMze~eF6vw}9m5Np>*g?c0Ln{s~6a{gV z3U;XuZ3U|?$u(((Bn_7oDXxNxL%~6G@z>ygpsV1jAP9;e;_B+JMM`|v6k4Qx$K`$a z=6xS`?*M;BXNKLE1Ps&R*>p-;Ev!kwcla7Y-=gEn14sl_<5viiid>g)w`~1 z3>8(I0lop^S!QvEc%C@34fTzGTz4j0$-e zeJ#|$$x%X?ynk_0tJGDctdXwL(oqw0|36P#o0;~yhf+ZQtLuKofZ#sRsJrg(sp~e* zfWQlIZMOXtn$z4j>Gif2JqE%%z~xO_Qx1TuU103llDXWJ0<`^_27Fuq!v$dU9vEEr zX4U$S^Cuv`O;21M-n*1i;}fV*mgE36r7$6n~aUL_t(o31eUw1*0J_ z8UmvsFw#SSk=OuGQ&anouJ+cgTSV(e*9+qlWdO)>VPP?t9ytB>?JEXK9l-)OjR?lE zV~63YtgLL|Y)TkRlxU`g-l63HSg^zB0SN(WS`P96QMmx5kXG3cWcJ7gL`4Cvf(T#G z5nD(RQ002ovPDHLk FV1nvz{~!PW delta 601 zcmV-f0;c`o1cL>TB!6*fLqkw$V`BgSD3NuMze~eF6vw}9l}fF2&_To@Llu!0ih_uf zRIp2RXe(HCNv=sNBx$&$NO2Wh910Gii@yf{16>7I1wl{*5m#4#EmGpUrqCko3zzrd zd++G#*FBsBdS6}la|{UX1NEBg{+_yS z{R{}a0M};AU#2T925NP8AC9X6Ovd16Q+n}qDVItG!HEYtd)`i`FA85b*T$ zp+dkTj37E2(M~EGBAhZ(SwuyFnVH#tPys{=c=zr#!>LoJ2%1k&0nAd6BVcS|XksiU n#+*?#qaiRF0;3@?{6hc$*g?c0Ln{s~6a{gV z3U;XuZ3U|?$u(((Bn_7oDXxNxL%~6G@z>ygpsV1jAP9;e;_B+JMM`|v6k4Qx$K`$a z=6xS`?*M;BXNKLE1Ps&R*>p-;Ev!kwcla7Y-=gEn14sl_<5viiid>g)w`~1 z3>8(I0lop^S!QvEc%C@34fTzGTz4j0$-e zeJ#|$$x%X?ynk_0tJGDctdXwL(oqw0|36P#o0;~yhf+ZQtLuKofZ#sRsJrg(sp~e* zfWQlIZMOXtn$z4j>Gif2JqE%%z~xO_Qx1TuU103llDXWJ0<`^_27Fuq!v$dU9vEEr zX4U$S^Cuv`O;21M-n*1i;}fV*mgE36r7$6Mq9YNkle1fdFIQ4qmGt(Bq|p?I)J@fx%W z3Tm&q1wDy`D2R!LdhinWee=TX?#%9N^h0Lm&;0-2o0-2elOE+Dg+ig_U=}f{)oMMF z&QM3hAPKBmt$#|0xE;Hbblg04M+)Iy*^K>J1yWsBLR&Lg?qnu=FkZWySN9>hJH^ zKFwyW6N_vCy>tR$@LVoOGd1yPsndP~;I(*_m*4nxPGqZD&`S%~a5a%-|4yc3s_sMdjhG5?z zx=tHz$)?#ku^Af~He$uDz}*LbXGahMGT|h$U+6m8B!uzz7tYhnSR0cNme(h*N|vLo z?>TfG0Dn4#1flQ9=her0U4{_LCRPGr2hNNjtZ7G5+=5;XB-F86p!+_5`&n0G+dHSH zV#oDCX9CwQ4t0`F4-jr+W%y-;$4t7F08T9&wZDITkN9yrIKXA6&iYFxqvFm0*jWiM z2CDzUa5XnSBPsX(1h<}-ifQbb9Al-n&FEs%;g;%0m@KgjE zjo=ka5+?8;jRs;niSc~aJ$Wnk7Pc!~J`jLIKx*{e6ScX0JM#1M1_#x%)z!o=05P1m z05{;dOEUtFGXavzWdq>Iet>_wVn2GtQ7fDX;60#UOvrqaKrGB${~B-s@rkBk8JkW7 z5PuvbC^(jNK(zJa7vTCh{Y-iGamq&!X delta 1178 zcmV;L1ZDey3cd-DB!6*fLqkw$V`BgSD3NuMze~eF6vw}9l}fF2&_To@Llu!0ih_uf zRIp2RXe(HCNv=sNBx$&$NO2Wh910Gii@yf{16>7I1wl{*5m#4#EmGpUrqCko3zzrd zd++G#*FBsBdS6}la|{UX1NEBg{+_yS z{R{}a0M};AU#2yf;g^h}W2zI)H2>yoc zM4K%Pf{;LBx8^zUUdFjIJ9jo7xOZmGoR4?ToS8Wzt^u`Lt$qWsnnuk^Mol2+ ztkdb3iJ9}4+<)(1J?rn>)pBoMJ-2?l-L^LM3qjQYpcn%&cl(YzeCUAt{N=0J&h;1W z-K}8=og=WlCbh{x5D=^kx_V{SEiNq^fEO=c8;@VC4=`i_ObZdIm~-Z$5nw_96k2$* zm#@7%Nztr`jd`%TFGm0}#;+kbcO-Q$N3%+a+QH{IDYCoMug z$cq=w8IQau2GH$x`@VA-gGZPl`j9_XZV0sWrlzK%(T*}P3IM`4F)_~2Y2`M^`~aay ztgf!v2}uEnCL#6-o02fxZ>>1Qp@_goM|m;mXeI%~j4Qm%`OX*%lrIB6N854&yC)~z z_}G~H_X>mNgDfOn8zg>702~`#wV^If6msSU zg?-Q^gl-Z5lRn*=oBzkDK!na2Bioc31HfPmgrAJ1&aqhpAO->+G>mif8Xd#6_4Vr7 zWyM6oPf9tTK7Op)Ca&i#6A#j!z5DvyibtkT^nXvCp0Pfy`po%b`pCjZH}9~nkdiIkg zS!@NWl$oPcC-Wf^PNTNfPiRR>R5VPY5@@f sDK*$A0>e6K5|t!?VV$NTkOK1;Bg*T3gb!~}9RL6T07*qoM6N<$f{e@=0ssI2 diff --git a/Resources/Textures/_DV/Structures/Doors/Airlocks/Glass/security.rsi/assembly.png b/Resources/Textures/_DV/Structures/Doors/Airlocks/Glass/security.rsi/assembly.png index 31a8a5e367c3176f6743660ec93d71140e9edabc..8dca92d4c30cd4aac7f3d239254ec5f208ff719f 100644 GIT binary patch delta 923 zcmV;M17!UD2iFIXB!6&eLqkw$V`BgSD3NuMze~eF6vw}9m5Np>*g?c0Ln{s~6a{gV z3U;XuZ3U|?$u(((Bn_7oDXxNxL%~6G@z>ygpsV1jAP9;e;_B+JMM`|v6k4Qx$K`$a z=6xS`?*M;BXNKLE1Ps&R*>p-;Ev!kwcla7Y-=gEn14sl_<5viiid>g)w`~1 z3>8(I0lop^S!QvEc%C@34fTzGTz4j0$-e zeJ#|$$x%X?ynk_0tJGDctdXwL(oqw0|36P#o0;~yhf+ZQtLuKofZ#sRsJrg(sp~e* zfWQlIZMOXtn$z4j>Gif2JqE%%z~xO_Qx1TuU103llDXWJ0<`^_27Fuq!v$dU9vEEr zX4U$S^Cuv`O;21M-n*1i;}fV*mgE2^DZiS#tmY4#WTe4#WYKD-Ig~ z00Iq@v;iuA8Ix9utOkXB>FOPZd-v`G#m=IL6U$-dS7)fcy`N$4r%w#de0&VbN=k68 z@n3#G900O}Uf}M%dkCw+V@#xM6WV0oI}OG{e!udR(7kYLh2c~1CT9eLaGBmRq^>l%gAaA7}`bs5Abzm z*sytjH$3>!Jp^|ENCM<@dRcz!HmHq(Cl}D#=V04`1kK6;zYTL3SdSiMP`iyN^yT3L!5jL5AZWH#6VdfF<;YQbzscMLktc6RiC)H#Y;Q|A!BNLm)7~2dw7m)vI6{R#D*7NU9vH x`qkFfhHG8FVG9EzzV10Ky5w-%fecXh8~|(jvk6v|GPD2y002ovPDHLkV1g|lsNVnp delta 948 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 diff --git a/Resources/Textures/_DV/Structures/Doors/Airlocks/Glass/security.rsi/closing.png b/Resources/Textures/_DV/Structures/Doors/Airlocks/Glass/security.rsi/closing.png index 71db15d93df619459a56e10842de84e2ac575f89..2d8b57dfe93aaf4a0156e67e72dcc83cbd8a8cb2 100644 GIT binary patch delta 2367 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 XrxL(pGIL}L00000NkvXXu0mjfu06MZ delta 2488 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 diff --git a/Resources/Textures/_DV/Structures/Doors/Airlocks/Standard/security.rsi/closed.png b/Resources/Textures/_DV/Structures/Doors/Airlocks/Standard/security.rsi/closed.png index bfff2ab3545c87ccba5801800d4bf863dbe5e351..e25e93f7a472f56a3b99e39046aa587af9f57dbb 100644 GIT binary patch delta 1132 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 w90J%Wy612wQi<{R<4tgHm;qS+g8W*!HAKP~I z1YA#WS!()MC8xf# zHP$(OfW(G8(GBb$z=-VcUH$<_UuY|Uu6XpuUyFnMhX$ zU~Br()dASTWYhtpAuu>X0M_aj0*|TR1 wKYsp&iw%w_0Cmr44L~6b>J5Wv5P;bU08|rcs}0uWJOBUy07*qoM6N<$g5*kGEC2ui diff --git a/Resources/Textures/_DV/Structures/Doors/Airlocks/Standard/security.rsi/opening.png b/Resources/Textures/_DV/Structures/Doors/Airlocks/Standard/security.rsi/opening.png index 33cffec94008b2dbaf833fccf3acc2bd9e1d5628..047719683f7433d71e3253a73177b0447f090374 100644 GIT binary patch delta 2419 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 Date: Sat, 18 Jan 2025 03:52:36 -0500 Subject: [PATCH 161/205] Chibi Surgery Update (#2764) Chibi Surgery --- Resources/Maps/chibi.yml | 371 +++++++++++----------------- Resources/Prototypes/Maps/chibi.yml | 1 + 2 files changed, 151 insertions(+), 221 deletions(-) diff --git a/Resources/Maps/chibi.yml b/Resources/Maps/chibi.yml index efe33bf7fd79..c1d18654e46b 100644 --- a/Resources/Maps/chibi.yml +++ b/Resources/Maps/chibi.yml @@ -81,7 +81,7 @@ entities: version: 6 1,-1: ind: 1,-1 - tiles: gQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAADgQAAAAAAYAAAAAAAYAAAAAACYAAAAAACgQAAAAAABgAAAAACBgAAAAABEQAAAAAAEQAAAAAAgQAAAAAAEQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAAAYAAAAAABYAAAAAABAQAAAAADYAAAAAACgQAAAAAABgAAAAAACwAAAAADEQAAAAAAEQAAAAAAgQAAAAAAEQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAABYAAAAAABYAAAAAACYAAAAAABYAAAAAAAYAAAAAADBgAAAAACBgAAAAADCwAAAAACEQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADAAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAACCQAAAAAAYAAAAAABAQAAAAACYAAAAAACCQAAAAAABgAAAAABBgAAAAACEQAAAAAAEQAAAAAACQAAAAAABQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABAQAAAAADYAAAAAACBgAAAAAABgAAAAAABgAAAAACEQAAAAAAEQAAAAAACQAAAAAABQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADAAAAAACYAAAAAABYAAAAAAAYAAAAAAACQAAAAAABgAAAAADCwAAAAABEQAAAAAAEQAAAAAACQAAAAAABQAAAAAAgQAAAAAAgQAAAAAADAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACAQAAAAAAYAAAAAADgQAAAAAABgAAAAABCwAAAAABEQAAAAAAEQAAAAAAgQAAAAAAgQAAAAAABgAAAAADBgAAAAABgQAAAAAAgQAAAAAABgAAAAAAgQAAAAAAYAAAAAABAQAAAAADYAAAAAABBgAAAAABBgAAAAACBgAAAAAAEQAAAAAAEQAAAAAABgAAAAADYAAAAAABBgAAAAACBgAAAAABgQAAAAAABgAAAAABBgAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAACgQAAAAAABgAAAAAABgAAAAACBgAAAAADBgAAAAADBgAAAAABAQAAAAAABgAAAAACBgAAAAAABgAAAAABBgAAAAACBgAAAAABgQAAAAAAYAAAAAADAQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAABgAAAAADBgAAAAAACQAAAAAAgQAAAAAAYAAAAAABgQAAAAAACQAAAAAABgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAABgAAAAABBgAAAAAABgAAAAAABgAAAAADBgAAAAADAQAAAAADgQAAAAAAAgAAAAACAgAAAAADAgAAAAAAgQAAAAAAYAAAAAADYAAAAAACYAAAAAADgQAAAAAABgAAAAABBgAAAAABBgAAAAACBgAAAAABBgAAAAACBgAAAAABYAAAAAABAQAAAAADAQAAAAABAgAAAAACAgAAAAACAgAAAAADYAAAAAABAQAAAAADYAAAAAADBgAAAAAAAQAAAAACAQAAAAADBgAAAAACBgAAAAABBgAAAAADgQAAAAAAgQAAAAAAAgAAAAADAgAAAAAAAgAAAAABAgAAAAAACQAAAAAAYAAAAAAAAQAAAAABYAAAAAACBgAAAAAABgAAAAAABgAAAAADBgAAAAABBgAAAAADBgAAAAABgQAAAAAABQAAAAAAgQAAAAAAAwAAAAABAwAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAAACQAAAAAABgAAAAABBgAAAAADBgAAAAABBgAAAAAABgAAAAACCQAAAAAABQAAAAAAAwAAAAAAAwAAAAACAwAAAAADAwAAAAACgQAAAAAAYAAAAAABYAAAAAABYAAAAAADBgAAAAADAQAAAAADAQAAAAAABgAAAAACBgAAAAAABgAAAAABCQAAAAAABQAAAAAA + tiles: gQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAADgQAAAAAAYAAAAAAAYAAAAAACYAAAAAACgQAAAAAABgAAAAACBgAAAAABEQAAAAAAEQAAAAAAgQAAAAAAEQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAAAYAAAAAABYAAAAAABAQAAAAADYAAAAAACgQAAAAAABgAAAAAACwAAAAADEQAAAAAAEQAAAAAAgQAAAAAAEQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAABYAAAAAABYAAAAAACYAAAAAABYAAAAAAAYAAAAAADBgAAAAACBgAAAAADCwAAAAACEQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADAAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAACCQAAAAAAYAAAAAABAQAAAAACYAAAAAACCQAAAAAABgAAAAABBgAAAAACEQAAAAAAEQAAAAAACQAAAAAABQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABAQAAAAADYAAAAAACBgAAAAAABgAAAAAABgAAAAACEQAAAAAAEQAAAAAACQAAAAAABQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADAAAAAACYAAAAAABYAAAAAAAYAAAAAAACQAAAAAABgAAAAADCwAAAAABEQAAAAAAEQAAAAAACQAAAAAABQAAAAAAgQAAAAAAgQAAAAAADAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACAQAAAAAAYAAAAAADgQAAAAAABgAAAAABCwAAAAABEQAAAAAAEQAAAAAAgQAAAAAAgQAAAAAAAwAAAAAAAwAAAAAABgAAAAAABgAAAAAABgAAAAAAgQAAAAAAYAAAAAABAQAAAAADYAAAAAABBgAAAAABBgAAAAACBgAAAAAAEQAAAAAAEQAAAAAABgAAAAADYAAAAAABAwAAAAAAAwAAAAAABgAAAAAABgAAAAABBgAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAACgQAAAAAABgAAAAAABgAAAAACBgAAAAADBgAAAAADBgAAAAABAQAAAAAABgAAAAACBgAAAAAABgAAAAABBgAAAAACBgAAAAABgQAAAAAAYAAAAAADAQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAABgAAAAADBgAAAAAACQAAAAAAgQAAAAAAYAAAAAABgQAAAAAACQAAAAAABgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAABgAAAAABBgAAAAAABgAAAAAABgAAAAADBgAAAAADAQAAAAADgQAAAAAAAgAAAAACAgAAAAADAgAAAAAAgQAAAAAAYAAAAAADYAAAAAACYAAAAAADgQAAAAAABgAAAAABBgAAAAABBgAAAAACBgAAAAABBgAAAAACBgAAAAABYAAAAAABAQAAAAADAQAAAAABAgAAAAACAgAAAAACAgAAAAADYAAAAAABAQAAAAADYAAAAAADBgAAAAAAAQAAAAACAQAAAAADBgAAAAACBgAAAAABBgAAAAADgQAAAAAAgQAAAAAAAgAAAAADAgAAAAAAAgAAAAABAgAAAAAACQAAAAAAYAAAAAAAAQAAAAABYAAAAAACBgAAAAAABgAAAAAABgAAAAADBgAAAAABBgAAAAADBgAAAAABgQAAAAAABQAAAAAAgQAAAAAAAwAAAAABAwAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAAACQAAAAAABgAAAAABBgAAAAADBgAAAAABBgAAAAAABgAAAAACCQAAAAAABQAAAAAAAwAAAAAAAwAAAAACAwAAAAADAwAAAAACgQAAAAAAYAAAAAABYAAAAAABYAAAAAADBgAAAAADAQAAAAADAQAAAAAABgAAAAACBgAAAAAABgAAAAABCQAAAAAABQAAAAAA version: 6 0,-2: ind: 0,-2 @@ -203,16 +203,28 @@ entities: decals: 230: 14,16 234: 15,12 + - node: + color: '#FFFFFFFF' + id: BrickTileDarkCornerNe + decals: + 444: 17,-8 - node: color: '#FFFFFFFF' id: BrickTileDarkCornerNw decals: 21: 15,13 + 443: 16,-8 + - node: + color: '#FFFFFFFF' + id: BrickTileDarkCornerSe + decals: + 441: 17,-9 - node: color: '#FFFFFFFF' id: BrickTileDarkCornerSw decals: 22: 14,15 + 442: 16,-9 - node: color: '#FFFFFFFF' id: BrickTileDarkLineN @@ -829,6 +841,14 @@ entities: decals: 413: 19,-24 428: 23,-23 + - node: + color: '#52B4E996' + id: MiniTileCheckerAOverlay + decals: + 437: 17,-9 + 438: 17,-8 + 439: 16,-8 + 440: 16,-9 - node: color: '#FA750096' id: MiniTileCheckerAOverlay @@ -3499,10 +3519,10 @@ entities: parent: 2 - proto: BodyBagFolded entities: - - uid: 1497 + - uid: 365 components: - type: Transform - pos: 17.345045,-6.398447 + pos: 20.36747,-8.194437 parent: 2 - proto: BookAtmosDistro entities: @@ -8791,11 +8811,6 @@ entities: - type: Transform pos: 3.5,-13.5 parent: 2 - - uid: 774 - components: - - type: Transform - pos: 19.5,-8.5 - parent: 2 - uid: 775 components: - type: Transform @@ -9151,16 +9166,6 @@ entities: - type: Transform pos: -5.5,14.5 parent: 2 - - uid: 1490 - components: - - type: Transform - pos: 18.5,-8.5 - parent: 2 - - uid: 1496 - components: - - type: Transform - pos: 18.5,-7.5 - parent: 2 - uid: 1503 components: - type: Transform @@ -10057,6 +10062,13 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage +- proto: ClothingMaskBreathMedical + entities: + - uid: 1488 + components: + - type: Transform + pos: 16.67997,-8.590546 + parent: 2 - proto: ClothingNeckCloakCe entities: - uid: 3773 @@ -10105,6 +10117,13 @@ entities: - type: Transform pos: 3.5972524,-12.252082 parent: 2 +- proto: ClothingOuterVestTank + entities: + - uid: 362 + components: + - type: Transform + pos: 16.297668,-8.287531 + parent: 2 - proto: ClothingShoesGaloshes entities: - uid: 4131 @@ -10575,12 +10594,12 @@ entities: - type: Transform pos: 0.5,-21.5 parent: 2 -- proto: CrateMedicalSecure +- proto: CrateMedicalSurgery entities: - - uid: 3879 + - uid: 1537 components: - type: Transform - pos: 17.5,-8.5 + pos: 19.5,-8.5 parent: 2 - proto: CrateTrashCart entities: @@ -10624,13 +10643,6 @@ entities: - type: Transform pos: 28.5,4.5 parent: 2 -- proto: CryoPod - entities: - - uid: 353 - components: - - type: Transform - pos: 16.5,-6.5 - parent: 2 - proto: DefaultStationBeaconArtifactLab entities: - uid: 2093 @@ -13646,10 +13658,10 @@ entities: parent: 2 - type: Fixtures fixtures: {} - - uid: 416 + - uid: 366 components: - type: Transform - pos: 19.5,-6.5 + pos: 18.5,-7.5 parent: 2 - type: Fixtures fixtures: {} @@ -13786,11 +13798,6 @@ entities: parent: 2 - proto: GasAnalyzer entities: - - uid: 367 - components: - - type: Transform - pos: 17.686937,-6.445299 - parent: 2 - uid: 1536 components: - type: Transform @@ -13814,21 +13821,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#FFAA00FF' -- proto: GasFilterFlipped - entities: - - uid: 357 - components: - - type: MetaData - desc: Very useful for filtering gases out of the cryo pipes. - name: cryo gas filter - - type: Transform - rot: -1.5707963267948966 rad - pos: 17.5,-7.5 - parent: 2 - - type: GasFilter - transferRate: 20 - - type: AtmosPipeColor - color: '#FFAA00FF' - proto: GasMinerNitrogen entities: - uid: 482 @@ -13935,12 +13927,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0000FFFF' - - uid: 359 + - uid: 416 components: - type: Transform rot: 3.141592653589793 rad - pos: 16.5,-8.5 + pos: 17.5,-6.5 parent: 2 + - type: AtmosPipeColor + color: '#FFAA00FF' - uid: 461 components: - type: Transform @@ -14215,14 +14209,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#00AAFFFF' - - uid: 2152 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 18.5,-3.5 - parent: 2 - - type: AtmosPipeColor - color: '#00AAFFFF' - uid: 2204 components: - type: Transform @@ -14548,12 +14534,6 @@ entities: color: '#FFAA00FF' - proto: GasPipeStraight entities: - - uid: 360 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 17.5,-8.5 - parent: 2 - uid: 408 components: - type: Transform @@ -14795,6 +14775,13 @@ entities: rot: 3.141592653589793 rad pos: 14.5,-25.5 parent: 2 + - uid: 774 + components: + - type: Transform + pos: 22.5,-3.5 + parent: 2 + - type: AtmosPipeColor + color: '#00AAFFFF' - uid: 981 components: - type: Transform @@ -14824,12 +14811,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#00AAFFFF' - - uid: 1537 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 19.5,-8.5 - parent: 2 - uid: 1568 components: - type: Transform @@ -15799,44 +15780,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#00AAFFFF' - - uid: 2150 - components: - - type: Transform - pos: 18.5,-5.5 - parent: 2 - - type: AtmosPipeColor - color: '#00AAFFFF' - - uid: 2151 - components: - - type: Transform - pos: 18.5,-4.5 - parent: 2 - - type: AtmosPipeColor - color: '#00AAFFFF' - - uid: 2153 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 19.5,-3.5 - parent: 2 - - type: AtmosPipeColor - color: '#00AAFFFF' - - uid: 2154 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 20.5,-3.5 - parent: 2 - - type: AtmosPipeColor - color: '#00AAFFFF' - - uid: 2155 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 21.5,-3.5 - parent: 2 - - type: AtmosPipeColor - color: '#00AAFFFF' - uid: 2156 components: - type: Transform @@ -17685,24 +17628,6 @@ entities: color: '#FFAA00FF' - proto: GasPipeTJunction entities: - - uid: 290 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 18.5,-7.5 - parent: 2 - - uid: 361 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 16.5,-7.5 - parent: 2 - - uid: 362 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 18.5,-8.5 - parent: 2 - uid: 460 components: - type: Transform @@ -17780,14 +17705,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#FFAA00FF' - - uid: 1488 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 17.5,-6.5 - parent: 2 - - type: AtmosPipeColor - color: '#FFAA00FF' - uid: 1567 components: - type: Transform @@ -18135,14 +18052,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#00AAFFFF' - - uid: 2171 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 22.5,-3.5 - parent: 2 - - type: AtmosPipeColor - color: '#00AAFFFF' - uid: 2172 components: - type: Transform @@ -18747,26 +18656,8 @@ entities: targetPressure: 4500 - type: AtmosPipeColor color: '#0000FFFF' - - uid: 1493 - components: - - type: MetaData - desc: A pump that moves gas into the cryo pipes by pressure. - name: cryo gas pump - - type: Transform - pos: 18.5,-6.5 - parent: 2 - - type: GasPressurePump - targetPressure: 100 - - type: AtmosPipeColor - color: '#00AAFFFF' - proto: GasThermoMachineFreezerEnabled entities: - - uid: 32 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 20.5,-8.5 - parent: 2 - uid: 1161 components: - type: Transform @@ -21510,6 +21401,18 @@ entities: parent: 2 - proto: HospitalCurtainsOpen entities: + - uid: 290 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 11.5,-2.5 + parent: 2 + - uid: 360 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 11.5,-5.5 + parent: 2 - uid: 525 components: - type: Transform @@ -21816,17 +21719,6 @@ entities: - Pressed: Toggle 680: - Pressed: Toggle -- proto: LockableButtonMedical - entities: - - uid: 1033 - components: - - type: Transform - pos: 15.5,-1.5 - parent: 2 - - type: DeviceLinkSource - linkedPorts: - 2770: - - Pressed: Toggle - proto: LockableButtonResearch entities: - uid: 1392 @@ -21934,9 +21826,9 @@ entities: showEnts: False occludes: True ents: - - 1512 - - 1206 - 1507 + - 1206 + - 1512 paper_label: !type:ContainerSlot showEnts: False occludes: True @@ -22056,6 +21948,13 @@ entities: - type: Transform pos: 24.5,12.5 parent: 2 +- proto: LockerSurgeonFilled + entities: + - uid: 1497 + components: + - type: Transform + pos: 17.5,-6.5 + parent: 2 - proto: LockerWallMedicalDoctorFilled entities: - uid: 383 @@ -22333,6 +22232,13 @@ entities: - type: Transform pos: 11.5,-2.5 parent: 2 +- proto: MedicalBiofabricator + entities: + - uid: 32 + components: + - type: Transform + pos: 16.5,-6.5 + parent: 2 - proto: MedicalTechFab entities: - uid: 1120 @@ -22427,6 +22333,13 @@ entities: - type: Transform pos: -6.5,-9.5 parent: 2 +- proto: NitrousOxideTankFilled + entities: + - uid: 357 + components: + - type: Transform + pos: 16.39872,-8.402915 + parent: 2 - proto: NoticeBoard entities: - uid: 4188 @@ -22442,6 +22355,13 @@ entities: - type: Transform pos: 21.5,16.5 parent: 2 +- proto: OperatingTable + entities: + - uid: 1490 + components: + - type: Transform + pos: 17.5,-8.5 + parent: 2 - proto: Oracle entities: - uid: 4199 @@ -23197,6 +23117,17 @@ entities: parent: 2 - proto: PoweredSmallLight entities: + - uid: 353 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 20.5,-7.5 + parent: 2 + - uid: 1498 + components: + - type: Transform + pos: 16.5,-6.5 + parent: 2 - uid: 3672 components: - type: Transform @@ -23209,12 +23140,6 @@ entities: rot: 3.141592653589793 rad pos: -8.5,-4.5 parent: 2 - - uid: 3830 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 17.5,-8.5 - parent: 2 - uid: 3837 components: - type: Transform @@ -23300,10 +23225,10 @@ entities: - type: Transform pos: 11.5,1.5 parent: 2 - - uid: 365 + - uid: 359 components: - type: Transform - pos: 17.5,-6.5 + pos: 20.5,-8.5 parent: 2 - uid: 380 components: @@ -24309,6 +24234,13 @@ entities: - type: Transform pos: 5.5,1.5 parent: 2 +- proto: SentientSmileCore + entities: + - uid: 4135 + components: + - type: Transform + pos: 6.5,-9.5 + parent: 2 - proto: SheetGlass entities: - uid: 83 @@ -24525,6 +24457,17 @@ entities: linkedPorts: 684: - Pressed: Trigger + - uid: 1033 + components: + - type: Transform + pos: 15.5,-1.5 + parent: 2 + - type: DeviceLinkSource + linkedPorts: + 2770: + - Pressed: Open + 2771: + - Pressed: Open - proto: SignAnomaly entities: - uid: 1582 @@ -24599,13 +24542,6 @@ entities: - type: Transform pos: 20.5,-1.5 parent: 2 -- proto: SignCryogenicsMed - entities: - - uid: 1571 - components: - - type: Transform - pos: 15.5,-8.5 - parent: 2 - proto: SignDirectionalBridge entities: - uid: 1913 @@ -24836,13 +24772,6 @@ entities: - type: Transform pos: 12.5,-1.5 parent: 2 -- proto: SignMorgue - entities: - - uid: 2682 - components: - - type: Transform - pos: 17.5,-5.5 - parent: 2 - proto: SignPrison entities: - uid: 1580 @@ -24909,6 +24838,13 @@ entities: - type: Transform pos: -0.5,-14.5 parent: 2 +- proto: SignSurgery + entities: + - uid: 1496 + components: + - type: Transform + pos: 17.5,-5.5 + parent: 2 - proto: SignToolStorage entities: - uid: 1573 @@ -25321,13 +25257,6 @@ entities: - type: Transform pos: 0.5,14.5 parent: 2 -- proto: SpawnMobSmile - entities: - - uid: 4135 - components: - - type: Transform - pos: 6.5,-9.5 - parent: 2 - proto: SpawnMobWalter entities: - uid: 4315 @@ -25612,6 +25541,13 @@ entities: - type: Transform pos: 13.5,-21.5 parent: 2 +- proto: SpawnPointSurgeon + entities: + - uid: 361 + components: + - type: Transform + pos: 13.5,-7.5 + parent: 2 - proto: SpawnPointTechnicalAssistant entities: - uid: 3928 @@ -25643,13 +25579,6 @@ entities: - type: Transform pos: -4.3361387,8.327053 parent: 2 -- proto: StasisBed - entities: - - uid: 1498 - components: - - type: Transform - pos: 16.5,-8.5 - parent: 2 - proto: StationAnchor entities: - uid: 863 @@ -26226,6 +26155,11 @@ entities: - type: Transform pos: 25.5,2.5 parent: 2 + - uid: 1493 + components: + - type: Transform + pos: 16.5,-8.5 + parent: 2 - uid: 4335 components: - type: Transform @@ -26527,6 +26461,11 @@ entities: - 4273 - proto: ToolboxEmergencyFilled entities: + - uid: 367 + components: + - type: Transform + pos: 20.596636,-8.600969 + parent: 2 - uid: 3778 components: - type: Transform @@ -26552,11 +26491,6 @@ entities: - type: Transform pos: -7.7510853,8.209303 parent: 2 - - uid: 4187 - components: - - type: Transform - pos: 19.646408,-7.987255 - parent: 2 - proto: ToolboxMechanicalFilled entities: - uid: 3782 @@ -29525,9 +29459,4 @@ entities: - type: Transform pos: 5.86946,-0.30139673 parent: 2 - - uid: 366 - components: - - type: Transform - pos: 17.374437,-6.4036036 - parent: 2 ... diff --git a/Resources/Prototypes/Maps/chibi.yml b/Resources/Prototypes/Maps/chibi.yml index 6d9b4894321a..ded69cc64554 100644 --- a/Resources/Prototypes/Maps/chibi.yml +++ b/Resources/Prototypes/Maps/chibi.yml @@ -28,6 +28,7 @@ Chemist: [ 1, 1 ] MedicalDoctor: [ 1, 1 ] MedicalIntern: [ 1, 1 ] + Surgeon: [ 1, 1 ] #science ResearchAssistant: [ 1, 1 ] Scientist: [ 1, 1 ] From f9eba19e131cbe324540a0606e2fab67da166477 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Sat, 18 Jan 2025 09:52:55 +0100 Subject: [PATCH 162/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 0530fef11f0c..79893308e6aa 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: DLondon - changes: - - message: New emergency shuttle "Vertex" - type: Add - id: 433 - time: '2024-07-19T19:01:45.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1505 - author: deltanedas changes: - message: The security shuttle NTSP Bulwark can now be bought at the shipyard. @@ -3856,3 +3849,10 @@ id: 932 time: '2025-01-18T01:54:23.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2761 +- author: Colin-Tel + changes: + - message: Added Surgical equipment to Chibi Station. + type: Add + id: 933 + time: '2025-01-18T08:52:36.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2764 From aae4c69b2d0a066150b4b8296962caba3d6af31b Mon Sep 17 00:00:00 2001 From: therealDLondon <162949166+therealDLondon@users.noreply.github.com> Date: Sat, 18 Jan 2025 09:33:50 +0000 Subject: [PATCH 163/205] Edge Update January 9th (#2662) * Update edge.yml * Update edge.yml * Update edge.yml * Update edge.yml * Update edge.yml --- Resources/Maps/edge.yml | 3624 +++++++++++++++------------- Resources/Prototypes/Maps/edge.yml | 3 +- 2 files changed, 1953 insertions(+), 1674 deletions(-) diff --git a/Resources/Maps/edge.yml b/Resources/Maps/edge.yml index 1c2f0fe6c7fc..48caa58d9e3c 100644 --- a/Resources/Maps/edge.yml +++ b/Resources/Maps/edge.yml @@ -110,11 +110,11 @@ entities: version: 6 -1,-1: ind: -1,-1 - tiles: fwAAAAAAXgAAAAADXgAAAAAAXgAAAAADXgAAAAABXgAAAAACUAAAAAAAXgAAAAAAXgAAAAAAUAAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAACXgAAAAABMAAAAAACXgAAAAAAXgAAAAADXgAAAAADMAAAAAACXgAAAAADXgAAAAADXgAAAAACXgAAAAACbgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAABXgAAAAACXgAAAAADMAAAAAAAXgAAAAAAXgAAAAAAXgAAAAADMAAAAAACXgAAAAADXgAAAAABXgAAAAACfwAAAAAAbwAAAAAAbwAAAAACfwAAAAAAfwAAAAAAXgAAAAABNQAAAAABNQAAAAACNQAAAAADfwAAAAAAfwAAAAAAUAAAAAAATwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAABfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAewAAAAADewAAAAAAewAAAAAAewAAAAADewAAAAADewAAAAADewAAAAADewAAAAABfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAADfwAAAAAALAAAAAAALAAAAAAAfwAAAAAAewAAAAAAewAAAAAADgAAAAABDgAAAAADDgAAAAACDgAAAAABDgAAAAADDgAAAAABfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAABfwAAAAAALAAAAAAALAAAAAAATwAAAAACewAAAAACewAAAAAADgAAAAACDgAAAAAAMAAAAAACMAAAAAACMAAAAAABMAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAADfwAAAAAALAAAAAAALAAAAAAAfwAAAAAAewAAAAABewAAAAABDgAAAAABMAAAAAADDgAAAAAADgAAAAABDgAAAAADDgAAAAACfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAewAAAAADewAAAAACDgAAAAAAMAAAAAABDgAAAAADDgAAAAABDgAAAAACDgAAAAABfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAABfwAAAAAAewAAAAACewAAAAACfwAAAAAAewAAAAAAewAAAAACDgAAAAADMAAAAAABDgAAAAADDgAAAAADDgAAAAADDgAAAAACfwAAAAAAbwAAAAACbwAAAAADXgAAAAADfwAAAAAAewAAAAADewAAAAAATwAAAAAAewAAAAABewAAAAADDgAAAAABMAAAAAAADgAAAAABDgAAAAACDgAAAAAAbQAAAAAAfwAAAAAAbgAAAAAAfwAAAAAAXgAAAAABfwAAAAAAewAAAAABewAAAAACfwAAAAAAewAAAAADewAAAAACDgAAAAABDgAAAAAADgAAAAADDgAAAAACDgAAAAAAbQAAAAAAfwAAAAAAXgAAAAACMAAAAAADXgAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAewAAAAADewAAAAABDgAAAAACDgAAAAACfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAANQAAAAACXgAAAAAAXgAAAAADNQAAAAABNQAAAAAANQAAAAABfwAAAAAAfwAAAAAAUAAAAAAATwAAAAADfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAANQAAAAADXgAAAAADXgAAAAACXgAAAAADMAAAAAADXgAAAAABbQAAAAAAXgAAAAADXgAAAAADMAAAAAACXgAAAAACXgAAAAADXgAAAAADMAAAAAABXgAAAAAAbQAAAAAAXgAAAAAAXgAAAAAB + tiles: fwAAAAAAXgAAAAADXgAAAAAAXgAAAAADXgAAAAABXgAAAAACUAAAAAAAXgAAAAAAXgAAAAAAUAAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAACXgAAAAABMAAAAAACXgAAAAAAXgAAAAADXgAAAAADMAAAAAACXgAAAAADXgAAAAADXgAAAAACXgAAAAACbgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAABXgAAAAACXgAAAAADMAAAAAAAXgAAAAAAXgAAAAAAXgAAAAADMAAAAAACXgAAAAADXgAAAAABXgAAAAACfwAAAAAAbwAAAAAAbwAAAAACfwAAAAAAfwAAAAAAXgAAAAABNQAAAAABNQAAAAACNQAAAAADfwAAAAAAfwAAAAAAUAAAAAAATwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAABfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAewAAAAAAewAAAAAAewAAAAAATwAAAAAAewAAAAAADgAAAAAADgAAAAAADgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAADfwAAAAAALAAAAAAALAAAAAAAfwAAAAAAewAAAAAAewAAAAAAewAAAAAATwAAAAAAewAAAAAADgAAAAAADgAAAAAADgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAABfwAAAAAALAAAAAAALAAAAAAATwAAAAACewAAAAACewAAAAAAewAAAAAATwAAAAAAewAAAAAADgAAAAAAbQAAAAAADgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAADfwAAAAAALAAAAAAALAAAAAAAfwAAAAAAewAAAAAAewAAAAABewAAAAAATwAAAAAAewAAAAAADgAAAAAADgAAAAAADgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAATwAAAAAAewAAAAACewAAAAAATwAAAAAAewAAAAAADgAAAAAADgAAAAAADgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAABfwAAAAAAewAAAAACewAAAAACfwAAAAAAewAAAAAAewAAAAACewAAAAAATwAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfwAAAAAAbwAAAAACbwAAAAADXgAAAAADfwAAAAAAewAAAAADewAAAAAATwAAAAAAewAAAAABewAAAAADewAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfwAAAAAAbgAAAAAAfwAAAAAAXgAAAAABfwAAAAAAewAAAAABewAAAAACfwAAAAAAewAAAAADewAAAAACewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfwAAAAAAXgAAAAACMAAAAAADXgAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAewAAAAADewAAAAABewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfwAAAAAANQAAAAACXgAAAAAAXgAAAAADNQAAAAABNQAAAAAANQAAAAABfwAAAAAAfwAAAAAAUAAAAAAATwAAAAADfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAANQAAAAADXgAAAAADXgAAAAACXgAAAAADMAAAAAADXgAAAAABbQAAAAAAXgAAAAADXgAAAAADMAAAAAACXgAAAAACXgAAAAADXgAAAAADMAAAAAABXgAAAAAAbQAAAAAAXgAAAAAAXgAAAAAB version: 6 1,0: ind: 1,0 - tiles: bQAAAAAAXgAAAAAAMAAAAAABMAAAAAADXgAAAAABMAAAAAACMAAAAAAAXgAAAAACMAAAAAABMAAAAAADXgAAAAAAMAAAAAADMAAAAAADXgAAAAAAMAAAAAACMAAAAAACUAAAAAAAXgAAAAAAXgAAAAACXgAAAAAAXgAAAAAAXgAAAAADXgAAAAACXgAAAAADXgAAAAAAXgAAAAACXgAAAAADXgAAAAACXgAAAAACXgAAAAABXgAAAAACXgAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAXgAAAAACXgAAAAAAXgAAAAADfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAcQAAAAADcQAAAAABcQAAAAABcQAAAAACcQAAAAABcQAAAAABcQAAAAABfwAAAAAAfwAAAAAAbQAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAcQAAAAABcQAAAAABcQAAAAAAcQAAAAACcQAAAAAAcQAAAAAAcQAAAAABfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAcQAAAAABcQAAAAADcQAAAAAAcQAAAAACcQAAAAAAcQAAAAACcQAAAAABfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAfgAAAAAAAAAAAAAASAAAAAAAcQAAAAABcQAAAAAAcQAAAAADcQAAAAADcQAAAAABcQAAAAAAcQAAAAADbQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAfgAAAAAAfwAAAAAASAAAAAAAcQAAAAACcQAAAAADcQAAAAADcQAAAAADcQAAAAABcQAAAAAAcQAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAcQAAAAACcQAAAAADcQAAAAADcQAAAAABcQAAAAAAcQAAAAACcQAAAAABfwAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAUAAAAAAASAAAAAAAfwAAAAAAfwAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAcQAAAAABcQAAAAAAcQAAAAADcQAAAAAAfwAAAAAAcQAAAAACcQAAAAAAcQAAAAACfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAcgAAAAABcgAAAAABcgAAAAACcQAAAAADUAAAAAAAcQAAAAADcQAAAAADcQAAAAABfwAAAAAAcQAAAAABcQAAAAACcQAAAAABcQAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAcgAAAAAAcgAAAAADcgAAAAAAcQAAAAADUAAAAAAAcQAAAAACcQAAAAABcQAAAAADfwAAAAAAcQAAAAAAcQAAAAADcQAAAAAAcQAAAAABfwAAAAAAfgAAAAAAfwAAAAAAcQAAAAAAcQAAAAACcQAAAAABcQAAAAAAfwAAAAAAcQAAAAAAcQAAAAABcQAAAAABbQAAAAAAcQAAAAACcQAAAAABcQAAAAABcQAAAAABfwAAAAAAfgAAAAAAfgAAAAAAUAAAAAAAfwAAAAAASAAAAAAAfwAAAAAAfwAAAAAAcQAAAAABcQAAAAADcQAAAAADUAAAAAAAcQAAAAACcQAAAAABcQAAAAAAcQAAAAACfwAAAAAAfwAAAAAAfwAAAAAAcQAAAAADcQAAAAADcQAAAAABcQAAAAADSAAAAAAAcQAAAAACcQAAAAADcQAAAAAAUAAAAAAAcQAAAAACcQAAAAACcQAAAAACcQAAAAABewAAAAAAewAAAAADewAAAAAB + tiles: bQAAAAAAXgAAAAAAMAAAAAABMAAAAAADXgAAAAABMAAAAAACMAAAAAAAXgAAAAACMAAAAAABMAAAAAADXgAAAAAAMAAAAAADMAAAAAADXgAAAAAAMAAAAAACMAAAAAACUAAAAAAAXgAAAAAAXgAAAAACXgAAAAAAXgAAAAAAXgAAAAADXgAAAAACXgAAAAADXgAAAAAAXgAAAAACXgAAAAADXgAAAAACXgAAAAACXgAAAAABXgAAAAACXgAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAXgAAAAACXgAAAAAAXgAAAAADfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAcQAAAAADcQAAAAABcQAAAAABcQAAAAACcQAAAAABcQAAAAABcQAAAAABfwAAAAAAfwAAAAAAbQAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAcQAAAAABcQAAAAABcQAAAAAAcQAAAAACcQAAAAAAcQAAAAAAcQAAAAABfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAcQAAAAABcQAAAAADcQAAAAAAcQAAAAACcQAAAAAAcQAAAAACcQAAAAABfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAASAAAAAAAcQAAAAABcQAAAAAAcQAAAAADcQAAAAADcQAAAAABcQAAAAAAcQAAAAADbQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAfgAAAAAAfwAAAAAASAAAAAAAcQAAAAACcQAAAAADcQAAAAADcQAAAAADcQAAAAABcQAAAAAAcQAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAcQAAAAACcQAAAAADcQAAAAADcQAAAAABcQAAAAAAcQAAAAACcQAAAAABfwAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAUAAAAAAASAAAAAAAfwAAAAAAfwAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAcQAAAAABcQAAAAAAcQAAAAADcQAAAAAAfwAAAAAAcQAAAAACcQAAAAAAcQAAAAACfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAcgAAAAABcgAAAAABcgAAAAACcQAAAAADUAAAAAAAcQAAAAADcQAAAAADcQAAAAABfwAAAAAAcQAAAAABcQAAAAACcQAAAAABcQAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAcgAAAAAAcgAAAAADcgAAAAAAcQAAAAADUAAAAAAAcQAAAAACcQAAAAABcQAAAAADfwAAAAAAcQAAAAAAcQAAAAADcQAAAAAAcQAAAAABfwAAAAAAfgAAAAAAfwAAAAAAcQAAAAAAcQAAAAACcQAAAAABcQAAAAAAfwAAAAAAcQAAAAAAcQAAAAABcQAAAAABbQAAAAAAcQAAAAACcQAAAAABcQAAAAABcQAAAAABfwAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAfwAAAAAASAAAAAAAfwAAAAAAfwAAAAAAcQAAAAABcQAAAAADcQAAAAADUAAAAAAAcQAAAAACcQAAAAABcQAAAAAAcQAAAAACfwAAAAAAfwAAAAAAfwAAAAAAcQAAAAADcQAAAAADcQAAAAABcQAAAAADSAAAAAAAcQAAAAACcQAAAAADcQAAAAAAUAAAAAAAcQAAAAACcQAAAAACcQAAAAACcQAAAAABewAAAAAAewAAAAADewAAAAAB version: 6 1,-1: ind: 1,-1 @@ -130,11 +130,11 @@ entities: version: 6 1,1: ind: 1,1 - tiles: cQAAAAACcQAAAAAAcQAAAAADcQAAAAAASAAAAAAAcQAAAAACcQAAAAACcQAAAAAAfwAAAAAAcQAAAAACcQAAAAACcQAAAAAAcQAAAAABewAAAAAAewAAAAAAewAAAAAAUAAAAAAASAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAcQAAAAABcQAAAAADcQAAAAABfwAAAAAAfwAAAAAASAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAASAAAAAAASAAAAAAASAAAAAAASAAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAcQAAAAACfwAAAAAAIAAAAAABIAAAAAADIAAAAAACIAAAAAADIAAAAAAAfwAAAAAAfwAAAAAASAAAAAAASAAAAAAAfwAAAAAASAAAAAAAfwAAAAAAcQAAAAADcQAAAAABcQAAAAAASAAAAAAAIAAAAAACIAAAAAABIAAAAAABIAAAAAAAIAAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAASAAAAAAAfwAAAAAAfwAAAAAASAAAAAAAfwAAAAAAfwAAAAAAIAAAAAABIAAAAAABIAAAAAABIAAAAAADIAAAAAACfwAAAAAAfwAAAAAASAAAAAAASAAAAAAASAAAAAAASAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcQAAAAADfwAAAAAAIAAAAAACIAAAAAAAIAAAAAABIAAAAAADIAAAAAACfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcQAAAAACfwAAAAAAfwAAAAAASAAAAAAAIAAAAAADIAAAAAAAIAAAAAAAIAAAAAADIAAAAAADfwAAAAAAfwAAAAAAcQAAAAADcQAAAAACfwAAAAAAfwAAAAAAfwAAAAAAcQAAAAACcQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcQAAAAABcQAAAAADfwAAAAAAfwAAAAAAcQAAAAAAfwAAAAAAcQAAAAAAfwAAAAAAfwAAAAAAcQAAAAACfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcQAAAAABcQAAAAACfwAAAAAAfwAAAAAAcQAAAAADfwAAAAAAcQAAAAACcQAAAAACfwAAAAAAcQAAAAADcQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcQAAAAABcQAAAAADfwAAAAAAcQAAAAADfwAAAAAAfwAAAAAAcQAAAAADcQAAAAAAcQAAAAACfwAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbwAAAAADfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfwAAAAAAMAAAAAACMAAAAAAAMAAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAA + tiles: cQAAAAACcQAAAAAAcQAAAAADcQAAAAAASAAAAAAAcQAAAAACcQAAAAACcQAAAAAAfwAAAAAAcQAAAAACcQAAAAACcQAAAAAAcQAAAAABewAAAAAAewAAAAAAewAAAAAAUAAAAAAASAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAcQAAAAABcQAAAAADcQAAAAABfwAAAAAAfwAAAAAASAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAASAAAAAAASAAAAAAASAAAAAAASAAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAcQAAAAACfwAAAAAAIAAAAAABIAAAAAADIAAAAAACIAAAAAADIAAAAAAAfwAAAAAAfwAAAAAASAAAAAAASAAAAAAAfwAAAAAASAAAAAAAfwAAAAAAcQAAAAADcQAAAAABcQAAAAAASAAAAAAAIAAAAAACIAAAAAABIAAAAAABIAAAAAAAIAAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAASAAAAAAAfwAAAAAAfwAAAAAASAAAAAAAfwAAAAAAfwAAAAAAIAAAAAABIAAAAAABIAAAAAABIAAAAAADIAAAAAACfwAAAAAAfwAAAAAASAAAAAAASAAAAAAASAAAAAAASAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcQAAAAADfwAAAAAAIAAAAAACIAAAAAAAIAAAAAABIAAAAAADIAAAAAACfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcQAAAAACfwAAAAAAfwAAAAAASAAAAAAAIAAAAAADIAAAAAAAIAAAAAAAIAAAAAADIAAAAAADfwAAAAAAfwAAAAAAcQAAAAADcQAAAAACcQAAAAAAfwAAAAAAfwAAAAAAcQAAAAACcQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcQAAAAABcQAAAAADcQAAAAAAfwAAAAAAcQAAAAAAfwAAAAAAcQAAAAAAfwAAAAAAfwAAAAAAcQAAAAACfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcQAAAAABcQAAAAACcQAAAAAAfwAAAAAAcQAAAAADfwAAAAAAcQAAAAACcQAAAAACfwAAAAAAcQAAAAADcQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcQAAAAABcQAAAAADcQAAAAAAcQAAAAADfwAAAAAAfwAAAAAAcQAAAAADcQAAAAAAcQAAAAACfwAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbwAAAAADfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfwAAAAAAMAAAAAACMAAAAAAAMAAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAA version: 6 1,-2: ind: 1,-2 - tiles: XgAAAAAAXgAAAAABUAAAAAAAXgAAAAAAXgAAAAABXgAAAAAAXgAAAAADUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAACXgAAAAABXgAAAAACXgAAAAADXgAAAAABXgAAAAADXgAAAAADUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAADXgAAAAACXgAAAAABXgAAAAABXgAAAAACXgAAAAABXgAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAADXgAAAAAAXgAAAAABXgAAAAADXgAAAAAAXgAAAAADXgAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAACXgAAAAADXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAABfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATwAAAAABXgAAAAABHgAAAAACHgAAAAACHgAAAAADHgAAAAADHgAAAAACfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATwAAAAADXgAAAAACHgAAAAACHQAAAAAAHQAAAAACHQAAAAABHQAAAAABfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAAAXgAAAAABHgAAAAACHQAAAAADHQAAAAACHQAAAAABHQAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAUAAAAAAAbgAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAADXgAAAAACXgAAAAADbwAAAAADbwAAAAADbwAAAAACfwAAAAAAfwAAAAAAbwAAAAAAfwAAAAAAIAAAAAADIAAAAAADfwAAAAAAIAAAAAABfwAAAAAAXgAAAAABXgAAAAACXgAAAAAAXgAAAAADfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbwAAAAAAfwAAAAAAIAAAAAACIAAAAAABfwAAAAAAIAAAAAABfwAAAAAAXgAAAAABMAAAAAACXgAAAAAAMAAAAAADfwAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAfwAAAAAAXgAAAAABXgAAAAAAMAAAAAADXgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAIAAAAAADfwAAAAAAIAAAAAABfwAAAAAAXgAAAAACMAAAAAADXgAAAAAAMAAAAAACfwAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAIAAAAAACfwAAAAAAIAAAAAADfwAAAAAAXgAAAAADXgAAAAADXgAAAAABXgAAAAAAfwAAAAAAfwAAAAAAbwAAAAACbgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAMAAAAAADXgAAAAACXgAAAAACXgAAAAACXgAAAAADMAAAAAADXgAAAAACfwAAAAAA + tiles: XgAAAAAAXgAAAAABUAAAAAAAXgAAAAAAXgAAAAABXgAAAAAAXgAAAAADUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAACXgAAAAABXgAAAAACXgAAAAADXgAAAAABXgAAAAADXgAAAAADUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAADXgAAAAACXgAAAAABXgAAAAABXgAAAAACXgAAAAABXgAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAADXgAAAAAAXgAAAAABXgAAAAADXgAAAAAAXgAAAAADXgAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAACXgAAAAADXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAABfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATwAAAAABXgAAAAABHgAAAAACHgAAAAACHgAAAAADHgAAAAADHgAAAAACfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATwAAAAADXgAAAAACHgAAAAACHQAAAAAAHQAAAAACHQAAAAABHQAAAAABfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAAAXgAAAAABHgAAAAACHQAAAAADHQAAAAACHQAAAAABHQAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAUAAAAAAAbgAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAADXgAAAAACXgAAAAADbwAAAAADbwAAAAADbwAAAAACfwAAAAAAfwAAAAAAbwAAAAAAfwAAAAAAIAAAAAADIAAAAAADfwAAAAAAIAAAAAABfwAAAAAAXgAAAAABXgAAAAACXgAAAAAAXgAAAAADfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbwAAAAAAfwAAAAAAIAAAAAACIAAAAAABfwAAAAAAIAAAAAABUAAAAAAAXgAAAAABMAAAAAACXgAAAAAAMAAAAAADfwAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAUAAAAAAAXgAAAAABXgAAAAAAMAAAAAADXgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAIAAAAAADfwAAAAAAIAAAAAABUAAAAAAAXgAAAAACMAAAAAADXgAAAAAAMAAAAAACfwAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAIAAAAAACfwAAAAAAIAAAAAADfwAAAAAAXgAAAAADXgAAAAADXgAAAAABXgAAAAAAfwAAAAAAfwAAAAAAbwAAAAACbgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAMAAAAAADXgAAAAACXgAAAAACXgAAAAACXgAAAAADMAAAAAADXgAAAAACfwAAAAAA version: 6 0,-2: ind: 0,-2 @@ -162,11 +162,11 @@ entities: version: 6 -3,-1: ind: -3,-1 - tiles: XgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAUAAAAAAAJAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAbQAAAAAAJAAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAbQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAMAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAMAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAMAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAMAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAbQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAbQAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfwAAAAAAXgAAAAAAXgAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAbQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfwAAAAAAXgAAAAAAXgAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfwAAAAAAXgAAAAAAXgAAAAAAIAAAAAAAIAAAAAACfwAAAAAAfwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAfwAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfwAAAAAAXgAAAAAAXgAAAAAAIAAAAAADIAAAAAACfwAAAAAAfwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAIAAAAAADIAAAAAACfwAAAAAAfwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAbQAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcQAAAAAAcQAAAAAC + tiles: XgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAUAAAAAAAJAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAbQAAAAAAJAAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAbQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAMAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAMAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAMAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAMAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAbQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAbQAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfwAAAAAAXgAAAAAAXgAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAbQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfwAAAAAAXgAAAAAAXgAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfwAAAAAAXgAAAAAAXgAAAAAAIAAAAAAAIAAAAAACfwAAAAAAfwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAfwAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfwAAAAAAXgAAAAAAXgAAAAAAIAAAAAADIAAAAAACfwAAAAAAfwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAIAAAAAADIAAAAAACfwAAAAAAfwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAbQAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAUAAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcQAAAAAAcQAAAAAC version: 6 -3,0: ind: -3,0 - tiles: fgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcQAAAAACcQAAAAABfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcQAAAAACcQAAAAADfgAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcQAAAAACcQAAAAACfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAXgAAAAACXgAAAAACXgAAAAACXgAAAAADXgAAAAAAXgAAAAAAXgAAAAADXgAAAAACXgAAAAACbQAAAAAAXgAAAAADXgAAAAAAXgAAAAACXgAAAAABXgAAAAABXgAAAAABXgAAAAACMAAAAAACMAAAAAAAMAAAAAADXgAAAAABXgAAAAADMAAAAAACMAAAAAAAMAAAAAADbQAAAAAAXgAAAAAAMAAAAAAAMAAAAAADMAAAAAADXgAAAAAAXgAAAAACXgAAAAABXgAAAAACXgAAAAAAXgAAAAABXgAAAAABXgAAAAADXgAAAAABXgAAAAAAXgAAAAADUAAAAAAAXgAAAAADXgAAAAADXgAAAAACXgAAAAAAXgAAAAAAXgAAAAACUAAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAUAAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAATwAAAAAAfwAAAAAAfwAAAAAAXgAAAAADXgAAAAAAMAAAAAAANQAAAAABfwAAAAAAXgAAAAABMAAAAAABXgAAAAAAfwAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfwAAAAAAXgAAAAACXgAAAAAAMAAAAAACNQAAAAACfwAAAAAAMAAAAAACXgAAAAACXgAAAAACfwAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfwAAAAAAMAAAAAABXgAAAAABMAAAAAABfwAAAAAAfwAAAAAAXgAAAAAAMAAAAAABXgAAAAABfwAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfwAAAAAAMAAAAAACXgAAAAAAMAAAAAADfwAAAAAAaQAAAAABXgAAAAACXgAAAAABMAAAAAABfwAAAAAAfwAAAAAATwAAAAACfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAABXgAAAAAAMAAAAAADfwAAAAAAaQAAAAAAXgAAAAABMAAAAAADXgAAAAACfwAAAAAAXgAAAAACMAAAAAADXgAAAAACXgAAAAADMAAAAAAAXgAAAAAAXgAAAAADMAAAAAACXgAAAAACXgAAAAACfwAAAAAAfwAAAAAAMAAAAAACXgAAAAACXgAAAAACbQAAAAAAMAAAAAABXgAAAAACXgAAAAABMAAAAAAAXgAAAAABXgAAAAABMAAAAAABMAAAAAABXgAAAAABXgAAAAACXgAAAAAAbQAAAAAAXgAAAAACMAAAAAAAXgAAAAABbQAAAAAAXgAAAAAAMAAAAAACXgAAAAADXgAAAAAAMAAAAAADXgAAAAADXgAAAAAD + tiles: EwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAUAAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcQAAAAACcQAAAAABUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcQAAAAACcQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcQAAAAACcQAAAAACUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAXgAAAAACXgAAAAACXgAAAAACXgAAAAADXgAAAAAAXgAAAAAAXgAAAAADXgAAAAACXgAAAAACbQAAAAAAXgAAAAADXgAAAAAAXgAAAAACXgAAAAABXgAAAAABXgAAAAABXgAAAAACMAAAAAACMAAAAAAAMAAAAAADXgAAAAABXgAAAAADMAAAAAACMAAAAAAAMAAAAAADbQAAAAAAXgAAAAAAMAAAAAAAMAAAAAADMAAAAAADXgAAAAAAXgAAAAACXgAAAAABXgAAAAACXgAAAAAAXgAAAAABXgAAAAABXgAAAAADXgAAAAABXgAAAAAAXgAAAAADUAAAAAAAXgAAAAADXgAAAAADXgAAAAACXgAAAAAAXgAAAAAAXgAAAAACUAAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAUAAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAATwAAAAAAfwAAAAAAfwAAAAAAXgAAAAADXgAAAAAAMAAAAAAANQAAAAABfwAAAAAAXgAAAAABMAAAAAABXgAAAAAAfwAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfwAAAAAAXgAAAAACXgAAAAAAMAAAAAACNQAAAAACfwAAAAAAMAAAAAACXgAAAAACXgAAAAACfwAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfwAAAAAAMAAAAAABXgAAAAABMAAAAAABfwAAAAAAfwAAAAAAXgAAAAAAMAAAAAABXgAAAAABfwAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfwAAAAAAMAAAAAACXgAAAAAAMAAAAAADfwAAAAAAaQAAAAABXgAAAAACXgAAAAABMAAAAAABfwAAAAAAfwAAAAAATwAAAAACfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAABXgAAAAAAMAAAAAADfwAAAAAAaQAAAAAAXgAAAAABMAAAAAADXgAAAAACfwAAAAAAXgAAAAACMAAAAAADXgAAAAACXgAAAAADMAAAAAAAXgAAAAAAXgAAAAADMAAAAAACXgAAAAACXgAAAAACfwAAAAAAfwAAAAAAMAAAAAACXgAAAAACXgAAAAACbQAAAAAAMAAAAAABXgAAAAACXgAAAAABMAAAAAAAXgAAAAABXgAAAAABMAAAAAABMAAAAAABXgAAAAABXgAAAAACXgAAAAAAbQAAAAAAXgAAAAACMAAAAAAAXgAAAAABbQAAAAAAXgAAAAAAMAAAAAACXgAAAAADXgAAAAAAMAAAAAADXgAAAAADXgAAAAAD version: 6 -3,1: ind: -3,1 @@ -174,7 +174,7 @@ entities: version: 6 -3,-2: ind: -3,-2 - tiles: fwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAADwAAAAAAfwAAAAAAXgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAewAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAADQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAADQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAewAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAewAAAAAAfwAAAAAAewAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAewAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAewAAAAAAfwAAAAAAewAAAAAAewAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAbwAAAAACfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbwAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAJAAAAAAAJAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAJAAAAAAAJAAAAAAAfwAAAAAAbwAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAJAAAAAAAJAAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAJAAAAAAAJAAAAAAAfwAAAAAAbwAAAAABXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAUAAAAAAAbQAAAAAAfwAAAAAAIAAAAAAAfwAAAAAAUAAAAAAAbQAAAAAAfwAAAAAAfwAAAAAA + tiles: fwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAADwAAAAAAfwAAAAAAXgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAewAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAADQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAADQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAewAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAewAAAAAAfwAAAAAAewAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAewAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAewAAAAAAfwAAAAAAewAAAAAAewAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAbwAAAAACfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbwAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAJAAAAAAAJAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAJAAAAAAAJAAAAAAAfwAAAAAAbwAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAJAAAAAAAJAAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAJAAAAAAAJAAAAAAAfwAAAAAAbwAAAAABXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAUAAAAAAAbQAAAAAAfwAAAAAAIAAAAAAAfwAAAAAAUAAAAAAAbQAAAAAAfwAAAAAAfwAAAAAA version: 6 2,-2: ind: 2,-2 @@ -186,7 +186,7 @@ entities: version: 6 2,0: ind: 2,0 - tiles: XgAAAAACMAAAAAABMAAAAAABXgAAAAABXgAAAAAAXgAAAAAAXgAAAAABXgAAAAAAMAAAAAADXgAAAAAAXgAAAAAAXgAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAXgAAAAABXgAAAAACXgAAAAACXgAAAAADXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAACXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAfwAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAUAAAAAAAXgAAAAAAfwAAAAAACgAAAAAACgAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAbwAAAAABfwAAAAAAfwAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAUAAAAAAAXgAAAAAAUAAAAAAACgAAAAAACgAAAAAAUAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAMAAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfwAAAAAACgAAAAAACgAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAMAAAAAAAXgAAAAAAUAAAAAAAXgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAXgAAAAAAMAAAAAAAUAAAAAAAXgAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfwAAAAAAXgAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAUAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAUAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAewAAAAACewAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAA + tiles: XgAAAAACMAAAAAABMAAAAAABXgAAAAABXgAAAAAAXgAAAAAAXgAAAAABXgAAAAAAMAAAAAADXgAAAAAAXgAAAAAAXgAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAXgAAAAABXgAAAAACXgAAAAACXgAAAAADXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAACXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAfwAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAUAAAAAAAXgAAAAAAfwAAAAAACgAAAAAACgAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAbwAAAAABfwAAAAAAfwAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAUAAAAAAAXgAAAAAAUAAAAAAACgAAAAAACgAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAMAAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfwAAAAAACgAAAAAACgAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAMAAAAAAAXgAAAAAAUAAAAAAAXgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAXgAAAAAAMAAAAAAAUAAAAAAAXgAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfwAAAAAAXgAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAUAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAUAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAewAAAAACewAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAA version: 6 2,1: ind: 2,1 @@ -194,11 +194,11 @@ entities: version: 6 -4,0: ind: -4,0 - tiles: fgAAAAAAfgAAAAAAfwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAewAAAAACewAAAAABewAAAAABewAAAAAAewAAAAABewAAAAACewAAAAADewAAAAABfwAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAewAAAAABewAAAAAAewAAAAABewAAAAADewAAAAABewAAAAACewAAAAABewAAAAABfwAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAewAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAARAAAAAAARAAAAAAARAAAAAAARAAAAAAAfwAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAARAAAAAAARAAAAAAARAAAAAAARAAAAAAAXgAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAARAAAAAAARAAAAAAARAAAAAAARAAAAAAAUAAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAfwAAAAAAbQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAXgAAAAADXgAAAAABXgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAXgAAAAABXgAAAAACXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAACMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAbQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAABXgAAAAADMAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAUAAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAADXgAAAAACXgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAbQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAbQAAAAAAXgAAAAAAXgAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAXgAAAAACXgAAAAAAMAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAXgAAAAAAXgAAAAACMAAAAAAA + tiles: fgAAAAAAfgAAAAAAfwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAewAAAAACewAAAAABewAAAAABewAAAAAAewAAAAABewAAAAACfwAAAAAAAAAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAewAAAAABewAAAAAAewAAAAABewAAAAADewAAAAABewAAAAACfwAAAAAAAAAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAewAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAARAAAAAAARAAAAAAARAAAAAAARAAAAAAAfwAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAARAAAAAAARAAAAAAARAAAAAAARAAAAAAAXgAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAARAAAAAAARAAAAAAARAAAAAAARAAAAAAAUAAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAXgAAAAADXgAAAAABXgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAXgAAAAABXgAAAAACXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAACMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAbQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAABXgAAAAADMAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAUAAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAADXgAAAAACXgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAbQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAbQAAAAAAXgAAAAAAXgAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAXgAAAAACXgAAAAAAMAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAXgAAAAAAXgAAAAACMAAAAAAA version: 6 -4,-1: ind: -4,-1 - tiles: fgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAewAAAAACewAAAAABewAAAAABewAAAAAAewAAAAACewAAAAADewAAAAAAewAAAAADewAAAAADewAAAAAAewAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAewAAAAADewAAAAADewAAAAADewAAAAAAewAAAAACewAAAAAAewAAAAACewAAAAADfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAIAAAAAABIAAAAAAAfwAAAAAAewAAAAABewAAAAABewAAAAABewAAAAADewAAAAACewAAAAABewAAAAAAewAAAAABfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAIAAAAAAAIAAAAAACfwAAAAAAewAAAAADewAAAAAAewAAAAACewAAAAAAewAAAAAAewAAAAACfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAewAAAAABewAAAAABewAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAOwAAAAAATQAAAAAATQAAAAADTQAAAAABTQAAAAABTQAAAAACfwAAAAAAewAAAAABewAAAAADewAAAAABQwAAAAAAJAAAAAAAJAAAAAAAQwAAAAAAIAAAAAAAIAAAAAAAOwAAAAAATQAAAAADTQAAAAACTQAAAAAATQAAAAAATQAAAAAAUAAAAAAAewAAAAAAewAAAAACewAAAAAAQwAAAAAAJAAAAAAAJAAAAAAAQwAAAAAAIAAAAAAAIAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAQwAAAAAAewAAAAADewAAAAACewAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAOwAAAAAATQAAAAACTQAAAAADTQAAAAADTQAAAAABTQAAAAAAUAAAAAAAewAAAAABewAAAAACewAAAAADQwAAAAAAcQAAAAADcQAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAOwAAAAAATQAAAAADTQAAAAACTQAAAAADTQAAAAABTQAAAAAAfwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAewAAAAACewAAAAABQwAAAAAAIAAAAAABIAAAAAABIAAAAAACUAAAAAAAIAAAAAADIAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAPwAAAAAAPwAAAAAAewAAAAADewAAAAAAfwAAAAAAIAAAAAABIAAAAAACIAAAAAAAfwAAAAAAIAAAAAAAIAAAAAACfgAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAPwAAAAAAPwAAAAAAewAAAAABewAAAAACQwAAAAAAIAAAAAADIAAAAAABIAAAAAADUAAAAAAAIAAAAAABIAAAAAABfgAAAAAAAAAAAAAAUAAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAewAAAAACewAAAAADfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAUAAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAewAAAAAAewAAAAADewAAAAACewAAAAADewAAAAAAewAAAAAAewAAAAABewAAAAADfwAAAAAA + tiles: fgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAewAAAAACewAAAAABewAAAAABewAAAAAAewAAAAACewAAAAADewAAAAAAewAAAAADewAAAAADewAAAAAAewAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAewAAAAADewAAAAADewAAAAADewAAAAAAewAAAAACewAAAAAAewAAAAACewAAAAADfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAIAAAAAABIAAAAAAAfwAAAAAAewAAAAABewAAAAABewAAAAABewAAAAADewAAAAACewAAAAABewAAAAAAewAAAAABfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAIAAAAAAAIAAAAAACfwAAAAAAewAAAAADewAAAAAAewAAAAACewAAAAAAewAAAAAAewAAAAACfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAewAAAAABewAAAAABewAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAOwAAAAAATQAAAAAATQAAAAADTQAAAAABTQAAAAABTQAAAAACfwAAAAAAewAAAAABewAAAAADewAAAAABQwAAAAAAJAAAAAAAJAAAAAAAQwAAAAAAIAAAAAAAIAAAAAAAOwAAAAAATQAAAAADTQAAAAACTQAAAAAATQAAAAAATQAAAAAAUAAAAAAAewAAAAAAewAAAAACewAAAAAAQwAAAAAAJAAAAAAAJAAAAAAAQwAAAAAAIAAAAAAAIAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAQwAAAAAAewAAAAADewAAAAACewAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAOwAAAAAATQAAAAACTQAAAAADTQAAAAADTQAAAAABTQAAAAAAUAAAAAAAewAAAAABewAAAAACewAAAAADQwAAAAAAcQAAAAADcQAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAOwAAAAAATQAAAAADTQAAAAACTQAAAAADTQAAAAABTQAAAAAAfwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAewAAAAACewAAAAABQwAAAAAAIAAAAAABIAAAAAABIAAAAAACUAAAAAAAIAAAAAADIAAAAAAAewAAAAAAewAAAAAAewAAAAAAfwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAewAAAAADewAAAAAAfwAAAAAAIAAAAAABIAAAAAACIAAAAAAAfwAAAAAAIAAAAAAAIAAAAAACewAAAAAAewAAAAAAewAAAAAAbQAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAewAAAAABewAAAAACQwAAAAAAIAAAAAADIAAAAAABIAAAAAADUAAAAAAAIAAAAAABIAAAAAABewAAAAAAewAAAAAAewAAAAAAfwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAewAAAAACewAAAAADfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAewAAAAAAewAAAAADewAAAAACewAAAAADewAAAAAAewAAAAAAfwAAAAAAAAAAAAAAfwAAAAAA version: 6 -4,-2: ind: -4,-2 @@ -206,11 +206,11 @@ entities: version: 6 -4,1: ind: -4,1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAXgAAAAAAXgAAAAADXgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAXgAAAAADXgAAAAAAMAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAXgAAAAAAXgAAAAABMAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAXgAAAAABXgAAAAABXgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAbQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAbQAAAAAAXgAAAAAAXgAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAXgAAAAACXgAAAAAAMAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAUAAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAABXgAAAAAAMAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAbQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAbQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAABXgAAAAACXgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAewAAAAAAewAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAUAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAADewAAAAABewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAUAAAAAAAewAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAUAAAAAAAewAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAUAAAAAAAewAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAwAAAAAAAwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAewAAAAABewAAAAADewAAAAADfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAXgAAAAAAXgAAAAADXgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAXgAAAAADXgAAAAAAMAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAXgAAAAAAXgAAAAABMAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAXgAAAAABXgAAAAABXgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAbQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAbQAAAAAAXgAAAAAAXgAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAXgAAAAACXgAAAAAAMAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAUAAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAABXgAAAAAAMAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAbQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAbQAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAABXgAAAAACXgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAewAAAAAAewAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAUAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAADewAAAAABewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAUAAAAAAAewAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAUAAAAAAAewAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAUAAAAAAAewAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAwAAAAAAAwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAewAAAAABewAAAAADewAAAAADfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAA version: 6 -2,-3: ind: -2,-3 - tiles: UAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAawAAAAAAawAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAQwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAfwAAAAAAIAAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAfwAAAAAAIAAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAUAAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAfwAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAUAAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAfwAAAAAAUAAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAfwAAAAAAUAAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAUAAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAUAAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAA + tiles: UAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAawAAAAAAawAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAQwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAfwAAAAAAIAAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAfwAAAAAAIAAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAUAAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAfwAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAUAAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAfwAAAAAAUAAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAfwAAAAAAUAAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAUAAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAUAAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAA version: 6 -1,-3: ind: -1,-3 @@ -230,15 +230,15 @@ entities: version: 6 -4,2: ind: -4,2 - tiles: fwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAABUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAXgAAAAADMAAAAAADXgAAAAACfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAXgAAAAACMAAAAAABXgAAAAACfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAXgAAAAACMAAAAAABXgAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAXgAAAAAAMAAAAAAAXgAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAASAAAAAAASAAAAAAAXgAAAAACfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAUAAAAAAAKQAAAAADKQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAUAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAUAAAAAAAKQAAAAADKQAAAAACAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAUAAAAAAAIAAAAAAAIAAAAAAAbgAAAAAAIAAAAAAAIAAAAAAAUAAAAAAAKQAAAAABKQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAKQAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAKQAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAIAAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAA + tiles: fwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAABUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAXgAAAAADMAAAAAADXgAAAAACfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAXgAAAAACMAAAAAABXgAAAAACfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAXgAAAAACMAAAAAABXgAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAXgAAAAAAMAAAAAAAXgAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAASAAAAAAASAAAAAAAXgAAAAACfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAUAAAAAAAKQAAAAADKQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAUAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAUAAAAAAAKQAAAAADKQAAAAACAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAUAAAAAAAIAAAAAAAIAAAAAAAbgAAAAAAIAAAAAAAIAAAAAAAUAAAAAAAKQAAAAABKQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAKQAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAKQAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAIAAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAA version: 6 -2,2: ind: -2,2 - tiles: ewAAAAABewAAAAACewAAAAACewAAAAADewAAAAABewAAAAACfwAAAAAAMAAAAAADXgAAAAAAXgAAAAABfwAAAAAAbgAAAAAAfwAAAAAAfwAAAAAANQAAAAAANQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAADXgAAAAADXgAAAAACbQAAAAAAIAAAAAAAIAAAAAAAbQAAAAAAIAAAAAACIAAAAAADIAAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAXgAAAAADXgAAAAABXgAAAAACUAAAAAAAIAAAAAAAIAAAAAAAUAAAAAAAIAAAAAACIAAAAAAAIAAAAAADfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbwAAAAACfwAAAAAAMAAAAAABXgAAAAABXgAAAAACbQAAAAAAIAAAAAAAIAAAAAAAbQAAAAAAIAAAAAADIAAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAADXgAAAAABXgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAADIAAAAAACMAAAAAADfwAAAAAAfwAAAAAAfwAAAAAAewAAAAAAewAAAAABfwAAAAAAbQAAAAAAUAAAAAAAbQAAAAAAfwAAAAAAewAAAAADewAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAewAAAAAAewAAAAABewAAAAADewAAAAADewAAAAAAewAAAAABewAAAAACewAAAAADewAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAATwAAAAABTwAAAAABTwAAAAADTwAAAAACTwAAAAACTwAAAAACTwAAAAAATwAAAAADTwAAAAABfwAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAbwAAAAADbwAAAAACfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAATwAAAAAATwAAAAAATwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAIAAAAAAATwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAATwAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAATwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAATwAAAAAAIAAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAATwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAATwAAAAAAUAAAAAAAUAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAfwAAAAAAewAAAAAAewAAAAAAewAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAAAewAAAAAAfwAAAAAAewAAAAAAewAAAAAAewAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAA + tiles: ewAAAAABewAAAAACewAAAAACewAAAAADewAAAAABewAAAAACfwAAAAAAMAAAAAADXgAAAAAAXgAAAAABfwAAAAAAbgAAAAAAfwAAAAAAfwAAAAAANQAAAAAANQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAADXgAAAAADXgAAAAACbQAAAAAAIAAAAAAAIAAAAAAAbQAAAAAAIAAAAAACIAAAAAADIAAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAXgAAAAADXgAAAAABXgAAAAACUAAAAAAAIAAAAAAAIAAAAAAAUAAAAAAAIAAAAAACIAAAAAAAIAAAAAADfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbwAAAAACfwAAAAAAMAAAAAABXgAAAAABXgAAAAACbQAAAAAAIAAAAAAAIAAAAAAAbQAAAAAAIAAAAAADIAAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAADXgAAAAABXgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAADIAAAAAACMAAAAAADfwAAAAAAfwAAAAAAfwAAAAAAewAAAAAAewAAAAABfwAAAAAAbQAAAAAAUAAAAAAAbQAAAAAAfwAAAAAAewAAAAADewAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAewAAAAAAewAAAAABewAAAAADewAAAAADewAAAAAAewAAAAABewAAAAACewAAAAADewAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAATwAAAAABTwAAAAABTwAAAAADTwAAAAACTwAAAAACTwAAAAACTwAAAAAATwAAAAADTwAAAAABfwAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAbwAAAAADbwAAAAACfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAATwAAAAAATwAAAAAATwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAIAAAAAAATwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAATwAAAAAAIAAAAAAAIAAAAAAAfwAAAAAAJQAAAAAAJQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAATwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAATwAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAATwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAATwAAAAAAUAAAAAAAUAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAfwAAAAAAewAAAAAAewAAAAAAewAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAAAewAAAAAAfwAAAAAAewAAAAAAewAAAAAAewAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAA version: 6 -1,2: ind: -1,2 - tiles: fwAAAAAAbwAAAAACfwAAAAAAJQAAAAAAIAAAAAACMAAAAAABMAAAAAABIAAAAAACJQAAAAACfwAAAAAAbQAAAAAAUAAAAAAAbQAAAAAAfwAAAAAAewAAAAADewAAAAADfwAAAAAAfwAAAAAAfwAAAAAAJQAAAAABIAAAAAACMAAAAAABMAAAAAABIAAAAAACJQAAAAACfwAAAAAAIAAAAAACIAAAAAADIAAAAAAAfwAAAAAAewAAAAABMAAAAAACIAAAAAABIAAAAAACfwAAAAAAJQAAAAACIAAAAAADMAAAAAADMAAAAAABIAAAAAAAJQAAAAACfwAAAAAAIAAAAAADIAAAAAAAIAAAAAADbQAAAAAAewAAAAAAewAAAAABIAAAAAAAIAAAAAACbQAAAAAAJQAAAAADIAAAAAACMAAAAAADMAAAAAACIAAAAAADJQAAAAABbQAAAAAAIAAAAAADIAAAAAAAIAAAAAACfwAAAAAAewAAAAACMAAAAAACIAAAAAADIAAAAAABfwAAAAAAJQAAAAABIAAAAAABIAAAAAABIAAAAAADIAAAAAAAJQAAAAABfwAAAAAAIAAAAAADIAAAAAACIAAAAAADfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAIAAAAAACfwAAAAAAfwAAAAAAKQAAAAABTwAAAAACTwAAAAABKQAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAADfwAAAAAAewAAAAADewAAAAABIAAAAAADIAAAAAAAIAAAAAADIAAAAAABIAAAAAACTwAAAAACTwAAAAACIAAAAAABIAAAAAABIAAAAAACIAAAAAADIAAAAAACIAAAAAACbQAAAAAAewAAAAADewAAAAADIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAACIAAAAAAAIAAAAAADIAAAAAABIAAAAAADIAAAAAAAJQAAAAAAJQAAAAAAfwAAAAAAewAAAAADewAAAAABIAAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAewAAAAAAewAAAAACIAAAAAAAfwAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAAfwAAAAAAJAAAAAAAJAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAfwAAAAAABAAAAAAABAAAAAAAMAAAAAACMAAAAAAAMAAAAAAAMAAAAAABBAAAAAAABAAAAAAAfwAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAMAAAAAADMAAAAAABMAAAAAAAMAAAAAABMAAAAAAAMAAAAAACMAAAAAADMAAAAAACfwAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAMAAAAAADMAAAAAADMAAAAAABMAAAAAACUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAJAAAAAAAJAAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA + tiles: fwAAAAAAbwAAAAACfwAAAAAAJQAAAAAAIAAAAAACMAAAAAABMAAAAAABIAAAAAACJQAAAAACfwAAAAAAbQAAAAAAUAAAAAAAbQAAAAAAfwAAAAAAewAAAAADewAAAAADfwAAAAAAfwAAAAAAfwAAAAAAJQAAAAABIAAAAAACMAAAAAABMAAAAAABIAAAAAACJQAAAAACfwAAAAAAIAAAAAACIAAAAAADIAAAAAAAfwAAAAAAewAAAAABMAAAAAACIAAAAAABIAAAAAACfwAAAAAAJQAAAAACIAAAAAADMAAAAAADMAAAAAABIAAAAAAAJQAAAAACfwAAAAAAIAAAAAADIAAAAAAAIAAAAAADbQAAAAAAewAAAAAAewAAAAABIAAAAAAAIAAAAAACbQAAAAAAJQAAAAADIAAAAAACMAAAAAADMAAAAAACIAAAAAADJQAAAAABbQAAAAAAIAAAAAADIAAAAAAAIAAAAAACfwAAAAAAewAAAAACMAAAAAACIAAAAAADIAAAAAABfwAAAAAAJQAAAAABIAAAAAABIAAAAAABIAAAAAADIAAAAAAAJQAAAAABfwAAAAAAIAAAAAADIAAAAAACIAAAAAADfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAIAAAAAACfwAAAAAAfwAAAAAAKQAAAAABTwAAAAACTwAAAAABKQAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAADfwAAAAAAewAAAAADewAAAAABIAAAAAADIAAAAAAAIAAAAAADIAAAAAABIAAAAAACTwAAAAACTwAAAAACIAAAAAABIAAAAAABIAAAAAACIAAAAAADIAAAAAACIAAAAAACbQAAAAAAewAAAAADewAAAAADIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAACIAAAAAAAIAAAAAADIAAAAAABIAAAAAADIAAAAAAAJQAAAAAAJQAAAAAAfwAAAAAAewAAAAADewAAAAABIAAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAewAAAAAAewAAAAACIAAAAAAAfwAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAAfwAAAAAAJAAAAAAAJAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAJQAAAAAAfwAAAAAABAAAAAAABAAAAAAAMAAAAAACMAAAAAAAMAAAAAAAMAAAAAABBAAAAAAABAAAAAAAfwAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAMAAAAAADMAAAAAABMAAAAAAAMAAAAAABMAAAAAAAMAAAAAACMAAAAAADMAAAAAACfwAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAMAAAAAADMAAAAAADMAAAAAABMAAAAAACUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAJAAAAAAAJAAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA version: 6 0,2: ind: 0,2 @@ -258,19 +258,19 @@ entities: version: 6 -3,-3: ind: -3,-3 - tiles: fwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAHQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAEAAAAAAAXgAAAAAAEAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAXgAAAAAAEAAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAXgAAAAAADwAAAAAAXgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAEAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAfwAAAAAAEAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAXgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAXgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAA + tiles: fwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAHQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAEAAAAAAAXgAAAAAAEAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAXgAAAAAAEAAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAXgAAAAAADwAAAAAAXgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAEAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAfwAAAAAAEAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAXgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAXgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAA version: 6 -3,-4: ind: -3,-4 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA version: 6 -5,-1: ind: -5,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfgAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAUAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAUAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAUAAAAAAAUAAAAAAAfwAAAAAA version: 6 -5,0: ind: -5,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -5,-2: ind: -5,-2 @@ -306,7 +306,7 @@ entities: version: 6 -2,-6: ind: -2,-6 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAMAAAAAACMAAAAAADMAAAAAACMAAAAAADMAAAAAABMAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAMAAAAAADMAAAAAAAMAAAAAACMAAAAAAAMAAAAAADMAAAAAADMAAAAAABMAAAAAACMAAAAAAAMAAAAAABMAAAAAABAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAIAAAAAADTwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAIAAAAAADIAAAAAACAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAADTwAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAEgAAAAAAIAAAAAABOQAAAAAAOQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAADIAAAAAAC + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAMAAAAAACMAAAAAADMAAAAAACMAAAAAADMAAAAAABMAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAMAAAAAADMAAAAAAAMAAAAAACMAAAAAAAMAAAAAADMAAAAAADMAAAAAABMAAAAAACMAAAAAAAMAAAAAABMAAAAAABAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAIAAAAAADTwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAIAAAAAADIAAAAAACAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAADTwAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAEgAAAAAAIAAAAAABOQAAAAAAOQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAADIAAAAAAC version: 6 3,0: ind: 3,0 @@ -330,7 +330,7 @@ entities: version: 6 -2,3: ind: -2,3 - tiles: ewAAAAAAewAAAAAAfwAAAAAAewAAAAAAewAAAAAAewAAAAAAUAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAAAewAAAAAAfwAAAAAAewAAAAAAewAAAAAAewAAAAAAUAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAAAewAAAAAAfwAAAAAAewAAAAAAewAAAAAAewAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAfwAAAAAAewAAAAAAewAAAAAAewAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA + tiles: ewAAAAAAewAAAAAAfwAAAAAAewAAAAAAewAAAAAAewAAAAAAUAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAAAewAAAAAAfwAAAAAAewAAAAAAewAAAAAAewAAAAAAUAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAAAewAAAAAAfwAAAAAAewAAAAAAewAAAAAAewAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAfwAAAAAAewAAAAAAewAAAAAAewAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA version: 6 -3,3: ind: -3,3 @@ -1724,6 +1724,8 @@ entities: 2457: -40,-3 2458: -41,-3 2600: -54,41 + 2656: -42,1 + 2657: -43,1 - node: cleanable: True color: '#FFFFFFFF' @@ -2082,8 +2084,6 @@ entities: 1081: 31,-1 1083: 17,-2 1084: 8,-7 - 1091: -7,-4 - 1098: -8,-10 1105: -25,-6 1111: -10,3 1112: -9,17 @@ -2095,7 +2095,6 @@ entities: 1285: -30,31 1286: -32,31 1326: -18,-1 - 1327: -8,-8 1328: -10,-14 1329: 23,-13 1330: 33,-20 @@ -2329,9 +2328,7 @@ entities: 1082: 18,-2 1085: 5,-8 1086: 5,-11 - 1092: -9,-4 1095: -4,-7 - 1096: -9,-9 1101: -17,-12 1102: -19,-12 1103: -19,-3 @@ -2689,8 +2686,6 @@ entities: 1065: 10,15 1066: 23,10 1073: 17,25 - 1094: -6,-6 - 1097: -7,-10 1104: -24,1 1108: -25,-5 1120: -12,17 @@ -3961,7 +3956,8 @@ entities: decals: 42: -4,-25 43: -3,-25 - 2640: -10,42 + 2660: -8,42 + 2661: 27,20 - node: color: '#D381C9FF' id: WarnCornerGreyscaleNW @@ -4064,6 +4060,7 @@ entities: 2589: 15,-15 2590: 15,-16 2652: 13,-2 + 2658: -46,0 - node: color: '#D381C9FF' id: WarnLineGreyscaleE @@ -4124,6 +4121,7 @@ entities: 2586: 15,-15 2587: 15,-16 2655: 12,-2 + 2659: -44,0 - node: color: '#FFFFFFFF' id: WarnLineW @@ -4143,33 +4141,23 @@ entities: id: WoodTrimThinCornerNw decals: 538: 19,-6 - - node: - color: '#FFFFFFFF' - id: WoodTrimThinCornerSw - decals: - 33: -9,-10 - 35: -7,-8 - - node: - color: '#FFFFFFFF' - id: WoodTrimThinEndE - decals: - 37: -4,-8 - - node: - color: '#FFFFFFFF' - id: WoodTrimThinEndN - decals: - 34: -7,-5 + 2666: -8,-5 + 2686: -6,-7 - node: color: '#FFFFFFFF' id: WoodTrimThinInnerNe decals: - 40: -7,-8 2338: 28,14 - node: color: '#FFFFFFFF' id: WoodTrimThinInnerNw decals: 2108: 9,-35 + - node: + color: '#FFFFFFFF' + id: WoodTrimThinInnerSe + decals: + 2695: -8,-5 - node: color: '#FFFFFFFF' id: WoodTrimThinInnerSw @@ -4179,7 +4167,6 @@ entities: color: '#FFFFFFFF' id: WoodTrimThinLineE decals: - 41: -7,-7 46: 11,-30 47: 11,-31 48: 11,-32 @@ -4202,45 +4189,51 @@ entities: 2100: 11,-34 2336: 28,15 2337: 28,16 + 2689: -8,-11 + 2690: -8,-10 + 2691: -8,-9 + 2692: -8,-8 + 2693: -8,-7 + 2694: -8,-6 - node: color: '#FFFFFFFF' id: WoodTrimThinLineN decals: - 38: -5,-8 - 39: -6,-8 539: 20,-6 + 2662: -4,-5 + 2663: -5,-5 + 2664: -6,-5 + 2665: -7,-5 + 2687: -5,-7 + 2688: -4,-7 - node: color: '#FFFFFFFF' id: WoodTrimThinLineS decals: - 30: -8,-10 - 31: -7,-10 - 32: -4,-10 988: 21.001646,-5.1484656 - - node: - cleanable: True - color: '#FFFFFFFF' - id: WoodTrimThinLineS - decals: - 1099: -6,-10 - 1100: -5,-10 + 2696: -7,-5 + 2697: -6,-5 + 2698: -5,-5 + 2699: -4,-5 - node: color: '#FFFFFFFF' id: WoodTrimThinLineW decals: - 23: -9,-3 - 24: -9,-4 - 25: -9,-5 - 26: -9,-6 - 27: -9,-7 - 28: -9,-8 - 29: -9,-9 - 36: -7,-7 540: 19,-7 2103: 9,-34 2104: 9,-33 2105: 9,-32 2106: 9,-31 + 2667: -8,-6 + 2668: -8,-7 + 2669: -8,-8 + 2670: -8,-9 + 2671: -8,-10 + 2672: -8,-11 + 2682: -6,-11 + 2683: -6,-10 + 2684: -6,-9 + 2685: -6,-8 - node: color: '#FFFFFFFF' id: bushsnowa3 @@ -4378,7 +4371,7 @@ entities: 0,-3: 0: 1648 -1,-3: - 0: 57308 + 0: 56796 0,-2: 0: 20222 -1,-2: @@ -4452,7 +4445,7 @@ entities: -2,3: 0: 48059 -2,-1: - 0: 61663 + 0: 61695 -2,4: 0: 49083 -1,4: @@ -4522,16 +4515,15 @@ entities: 0: 65102 7,0: 0: 511 - 1: 49152 7,1: 0: 273 - 1: 17476 + 1: 17408 7,2: 0: 4113 1: 17476 7,3: 0: 61713 - 1: 196 + 1: 4 7,-1: 0: 61440 3: 255 @@ -4544,7 +4536,6 @@ entities: 8,2: 0: 65535 8,3: - 1: 48 0: 47112 4,-4: 0: 43566 @@ -4657,9 +4648,9 @@ entities: 3,7: 0: 53247 4,5: - 0: 45311 + 0: 28927 4,6: - 0: 3003 + 0: 1911 4,7: 0: 511 4,8: @@ -4812,7 +4803,7 @@ entities: -8,-8: 0: 45567 -8,-9: - 1: 4869 + 1: 4357 0: 57584 -9,-8: 0: 37119 @@ -4968,12 +4959,12 @@ entities: -13,-2: 0: 53468 -12,-1: - 0: 51 - 1: 12288 + 0: 28723 -13,-1: - 0: 28893 + 0: 4317 -12,0: - 1: 45875 + 0: 119 + 1: 61440 -11,-4: 0: 64911 -11,-3: @@ -5123,7 +5114,6 @@ entities: 0: 61166 9,0: 0: 33023 - 1: 12288 10,-3: 0: 7967 10,-2: @@ -5143,7 +5133,7 @@ entities: 1: 3840 9,1: 0: 4096 - 1: 17506 + 1: 17408 9,2: 0: 45329 1: 68 @@ -5216,11 +5206,8 @@ entities: -16,0: 1: 4371 0: 2184 - -16,-1: - 1: 4381 - 0: 34816 -17,0: - 1: 19554 + 1: 20083 -16,1: 1: 245 -15,0: @@ -5232,7 +5219,7 @@ entities: -15,3: 0: 3967 -15,-1: - 0: 65518 + 0: 65535 -15,2: 1: 558 -15,4: @@ -5253,7 +5240,7 @@ entities: -14,4: 0: 4095 -13,0: - 0: 29047 + 0: 28945 -16,-4: 1: 5905 -16,-5: @@ -5265,8 +5252,11 @@ entities: 0: 65280 -16,-2: 0: 4095 + -16,-1: + 0: 2039 -17,-1: - 1: 11810 + 0: 3276 + 1: 4112 -15,-4: 0: 47858 -15,-3: @@ -5363,7 +5353,7 @@ entities: 0: 240 -9,-11: 0: 4593 - 1: 25604 + 1: 25600 -8,-10: 0: 819 1: 54468 @@ -5372,7 +5362,6 @@ entities: 1: 25700 -7,-12: 0: 40944 - 1: 8192 -7,-11: 0: 4601 1: 17408 @@ -5823,10 +5812,10 @@ entities: 0: 16368 -10,-11: 0: 13299 - 1: 1032 + 1: 17408 -10,-10: 0: 13107 - 1: 192 + 1: 17604 -10,-13: 1: 16384 0: 255 @@ -5854,10 +5843,16 @@ entities: -9,-17: 1: 48027 0: 17412 + -18,-2: + 1: 47791 + -18,-1: + 1: 35051 + -18,-3: + 1: 44672 -17,-3: 1: 21877 -17,-2: - 1: 16935 + 1: 807 -17,1: 1: 4 -17,-9: @@ -5880,15 +5875,15 @@ entities: -5,-18: 0: 49356 -3,-20: - 0: 46079 + 0: 46077 -3,-19: - 0: 4083 + 0: 3571 -3,-18: 0: 8704 -2,-20: - 0: 56831 + 0: 56823 -2,-19: - 0: 12285 + 0: 10237 -2,-21: 0: 8192 -1,-20: @@ -6145,8 +6140,6 @@ entities: 1: 272 -4,13: 1: 65535 - -5,13: - 1: 240 -4,14: 1: 65535 -4,15: @@ -6173,7 +6166,7 @@ entities: -7,14: 1: 34975 -6,13: - 1: 240 + 1: 48 -6,14: 1: 1 -5,16: @@ -6988,6 +6981,17 @@ entities: - type: Transform pos: -10.5,40.5 parent: 2 + - type: DeviceList + devices: + - 10548 + - 10237 + - 10571 + - 7511 + - 7510 + - 7373 + - 7374 + - 7512 + - 10544 - uid: 39 components: - type: Transform @@ -7359,6 +7363,11 @@ entities: devices: - 10692 - 95 + - 5755 + - 10676 + - 469 + - 8958 + - 19966 - uid: 9878 components: - type: Transform @@ -8226,6 +8235,8 @@ entities: parent: 2 - uid: 13139 components: + - type: MetaData + name: Old Engineering Outpost - type: Transform pos: -45.5,-38.5 parent: 2 @@ -9573,12 +9584,6 @@ entities: - type: Transform pos: 40.5,18.5 parent: 2 - - uid: 5946 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -2.5,-9.5 - parent: 2 - uid: 9656 components: - type: Transform @@ -9834,13 +9839,6 @@ entities: - type: Transform pos: 11.5,9.5 parent: 2 - - uid: 387 - components: - - type: MetaData - name: Surgical Bay - - type: Transform - pos: 14.5,25.5 - parent: 2 - proto: AirlockMedicalMorgueLocked entities: - uid: 382 @@ -10173,6 +10171,14 @@ entities: - type: Transform pos: -56.5,-5.5 parent: 2 + - uid: 19995 + components: + - type: MetaData + name: Perma Chapel + - type: Transform + rot: 1.5707963267948966 rad + pos: -60.5,-2.5 + parent: 2 - proto: AirlockSecurityGlassLocked entities: - uid: 416 @@ -10301,6 +10307,15 @@ entities: - type: Transform pos: -28.5,-7.5 parent: 2 +- proto: AirlockSurgeryLocked + entities: + - uid: 591 + components: + - type: MetaData + name: Operating Room + - type: Transform + pos: 14.5,25.5 + parent: 2 - proto: AirlockVirologyLocked entities: - uid: 1598 @@ -10439,6 +10454,13 @@ entities: - type: DeviceNetwork deviceLists: - 19641 +- proto: AltarConvertBlue + entities: + - uid: 7602 + components: + - type: Transform + pos: -64.5,-2.5 + parent: 2 - proto: AltarHeaven entities: - uid: 8495 @@ -10990,6 +11012,23 @@ entities: - type: Transform pos: -17.640465,-80.18513 parent: 2 +- proto: Ashtray + entities: + - uid: 20029 + components: + - type: Transform + pos: -6.2914886,-9.357742 + parent: 2 + - uid: 20030 + components: + - type: Transform + pos: -6.279258,-5.6151795 + parent: 2 + - uid: 20031 + components: + - type: Transform + pos: -4.444669,-5.5784874 + parent: 2 - proto: AsimovCircuitBoard entities: - uid: 19642 @@ -12007,9 +12046,9 @@ entities: - type: Transform pos: 4.5,36.5 parent: 2 -- proto: BarSignKlubSkub +- proto: BarSignMalteseFalcon entities: - - uid: 591 + - uid: 601 components: - type: Transform pos: -6.5,-1.5 @@ -12029,6 +12068,13 @@ entities: - type: Transform pos: -42.5,-21.5 parent: 2 +- proto: BarSpoon + entities: + - uid: 12927 + components: + - type: Transform + pos: -3.7873898,-10.423093 + parent: 2 - proto: BaseComputer entities: - uid: 593 @@ -12072,12 +12118,6 @@ entities: rot: 3.141592653589793 rad pos: 27.5,18.5 parent: 2 - - uid: 601 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 17.5,23.5 - parent: 2 - proto: BaseGasCondenser entities: - uid: 11924 @@ -12647,6 +12687,26 @@ entities: - type: Transform pos: -63.5,32.5 parent: 2 + - uid: 20006 + components: + - type: Transform + pos: -10.5,-79.5 + parent: 2 + - uid: 20007 + components: + - type: Transform + pos: -10.5,-73.5 + parent: 2 + - uid: 20008 + components: + - type: Transform + pos: -4.5,-73.5 + parent: 2 + - uid: 20009 + components: + - type: Transform + pos: -4.5,-79.5 + parent: 2 - proto: BlastDoorOpen entities: - uid: 671 @@ -12664,12 +12724,65 @@ entities: - type: Transform pos: 2.5,42.5 parent: 2 -- proto: BoardGameSpawner - entities: - - uid: 698 + - uid: 4585 components: - type: Transform - pos: -58.5,-3.5 + pos: -42.5,2.5 + parent: 2 + - uid: 4808 + components: + - type: Transform + pos: -41.5,2.5 + parent: 2 + - uid: 5024 + components: + - type: Transform + pos: -45.5,2.5 + parent: 2 + - uid: 5026 + components: + - type: Transform + pos: -44.5,1.5 + parent: 2 + - uid: 5030 + components: + - type: Transform + pos: -44.5,-0.5 + parent: 2 + - uid: 11539 + components: + - type: Transform + pos: -42.5,-1.5 + parent: 2 + - uid: 11770 + components: + - type: Transform + pos: -39.5,-1.5 + parent: 2 + - uid: 12429 + components: + - type: Transform + pos: -40.5,-1.5 + parent: 2 + - uid: 13029 + components: + - type: Transform + pos: -40.5,2.5 + parent: 2 + - uid: 14021 + components: + - type: Transform + pos: -39.5,2.5 + parent: 2 + - uid: 16005 + components: + - type: Transform + pos: -47.5,2.5 + parent: 2 + - uid: 16028 + components: + - type: Transform + pos: -46.5,2.5 parent: 2 - proto: BodyBag entities: @@ -12710,31 +12823,8 @@ entities: - type: Transform pos: 17.50542,10.56221 parent: 2 -- proto: BookInspiration - entities: - - uid: 701 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -49.481606,-0.1413793 - parent: 2 - proto: BookRandom entities: - - uid: 702 - components: - - type: Transform - pos: -52.64169,-0.29077882 - parent: 2 - - uid: 703 - components: - - type: Transform - pos: -52.61044,-0.38452882 - parent: 2 - - uid: 704 - components: - - type: Transform - pos: -52.594814,-0.22827882 - parent: 2 - uid: 705 components: - type: Transform @@ -12757,11 +12847,6 @@ entities: - type: Transform pos: -52.5,1.5 parent: 2 - - uid: 712 - components: - - type: Transform - pos: -50.5,1.5 - parent: 2 - uid: 5093 components: - type: Transform @@ -12824,12 +12909,6 @@ entities: parent: 2 - proto: BoozeDispenser entities: - - uid: 713 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -3.5,-2.5 - parent: 2 - uid: 714 components: - type: Transform @@ -12842,6 +12921,12 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,33.5 parent: 2 + - uid: 14345 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,-7.5 + parent: 2 - proto: BoozeDispenserMachineCircuitboard entities: - uid: 7404 @@ -12950,6 +13035,13 @@ entities: - type: Transform pos: 47.5,1.5 parent: 2 +- proto: BoxLatexGloves + entities: + - uid: 20013 + components: + - type: Transform + pos: 18.472534,26.584526 + parent: 2 - proto: BoxLightMixed entities: - uid: 739 @@ -13021,6 +13113,13 @@ entities: priority: 0 component: ClothingSpeedModifier title: null +- proto: BoxSterileMask + entities: + - uid: 16906 + components: + - type: Transform + pos: 18.448074,25.740616 + parent: 2 - proto: BoxSyringe entities: - uid: 642 @@ -13150,6 +13249,12 @@ entities: parent: 2 - proto: ButtonFrameCautionSecurity entities: + - uid: 11729 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -44.5,-6.5 + parent: 2 - uid: 19606 components: - type: Transform @@ -13161,6 +13266,12 @@ entities: rot: 3.141592653589793 rad pos: -58.5,30.5 parent: 2 + - uid: 20010 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -6.5,-76.5 + parent: 2 - proto: ButtonFrameExit entities: - uid: 11698 @@ -15181,6 +15292,11 @@ entities: - type: Transform pos: -8.5,-20.5 parent: 2 + - uid: 1241 + components: + - type: Transform + pos: -63.5,-2.5 + parent: 2 - uid: 1245 components: - type: Transform @@ -15591,11 +15707,6 @@ entities: - type: Transform pos: -51.5,0.5 parent: 2 - - uid: 1333 - components: - - type: Transform - pos: -50.5,0.5 - parent: 2 - uid: 1334 components: - type: Transform @@ -23626,6 +23737,11 @@ entities: - type: Transform pos: -4.5,42.5 parent: 2 + - uid: 4810 + components: + - type: Transform + pos: -64.5,-2.5 + parent: 2 - uid: 5013 components: - type: Transform @@ -23951,6 +24067,11 @@ entities: - type: Transform pos: 49.5,7.5 parent: 2 + - uid: 7282 + components: + - type: Transform + pos: -62.5,-2.5 + parent: 2 - uid: 7311 components: - type: Transform @@ -24216,6 +24337,11 @@ entities: - type: Transform pos: -39.5,-23.5 parent: 2 + - uid: 10891 + components: + - type: Transform + pos: -60.5,-2.5 + parent: 2 - uid: 11124 components: - type: Transform @@ -24426,6 +24552,11 @@ entities: - type: Transform pos: 23.5,-46.5 parent: 2 + - uid: 13006 + components: + - type: Transform + pos: -61.5,-2.5 + parent: 2 - uid: 13069 components: - type: Transform @@ -24631,6 +24762,11 @@ entities: - type: Transform pos: 45.5,7.5 parent: 2 + - uid: 13771 + components: + - type: Transform + pos: -59.5,-2.5 + parent: 2 - uid: 13799 components: - type: Transform @@ -24666,6 +24802,11 @@ entities: - type: Transform pos: -41.5,-23.5 parent: 2 + - uid: 14015 + components: + - type: Transform + pos: -59.5,-3.5 + parent: 2 - uid: 14347 components: - type: Transform @@ -26444,6 +26585,11 @@ entities: parent: 2 - proto: CableHV entities: + - uid: 1148 + components: + - type: Transform + pos: -39.5,3.5 + parent: 2 - uid: 3027 components: - type: Transform @@ -29814,6 +29960,11 @@ entities: - type: Transform pos: 28.5,25.5 parent: 2 + - uid: 4566 + components: + - type: Transform + pos: -47.5,2.5 + parent: 2 - uid: 5498 components: - type: Transform @@ -29834,6 +29985,11 @@ entities: - type: Transform pos: -19.5,-50.5 parent: 2 + - uid: 5753 + components: + - type: Transform + pos: -45.5,2.5 + parent: 2 - uid: 6051 components: - type: Transform @@ -29849,6 +30005,11 @@ entities: - type: Transform pos: -13.5,-82.5 parent: 2 + - uid: 6989 + components: + - type: Transform + pos: -46.5,2.5 + parent: 2 - uid: 9579 components: - type: Transform @@ -29949,6 +30110,11 @@ entities: - type: Transform pos: -40.5,-37.5 parent: 2 + - uid: 10908 + components: + - type: Transform + pos: -46.5,3.5 + parent: 2 - uid: 11914 components: - type: Transform @@ -29959,6 +30125,16 @@ entities: - type: Transform pos: -13.5,-81.5 parent: 2 + - uid: 12003 + components: + - type: Transform + pos: -42.5,0.5 + parent: 2 + - uid: 12063 + components: + - type: Transform + pos: -46.5,0.5 + parent: 2 - uid: 12567 components: - type: Transform @@ -29969,6 +30145,16 @@ entities: - type: Transform pos: -18.5,-71.5 parent: 2 + - uid: 13281 + components: + - type: Transform + pos: -46.5,4.5 + parent: 2 + - uid: 13282 + components: + - type: Transform + pos: -47.5,4.5 + parent: 2 - uid: 13704 components: - type: Transform @@ -29994,6 +30180,11 @@ entities: - type: Transform pos: -26.5,-50.5 parent: 2 + - uid: 14361 + components: + - type: Transform + pos: -39.5,2.5 + parent: 2 - uid: 14759 components: - type: Transform @@ -30049,6 +30240,11 @@ entities: - type: Transform pos: -29.5,-9.5 parent: 2 + - uid: 16838 + components: + - type: Transform + pos: -44.5,0.5 + parent: 2 - uid: 16895 components: - type: Transform @@ -30179,21 +30375,11 @@ entities: - type: Transform pos: -40.5,2.5 parent: 2 - - uid: 17479 - components: - - type: Transform - pos: -40.5,3.5 - parent: 2 - uid: 17483 components: - type: Transform pos: -42.5,3.5 parent: 2 - - uid: 17815 - components: - - type: Transform - pos: -43.5,4.5 - parent: 2 - uid: 17818 components: - type: Transform @@ -30849,16 +31035,36 @@ entities: - type: Transform pos: -16.5,-46.5 parent: 2 + - uid: 19091 + components: + - type: Transform + pos: -46.5,1.5 + parent: 2 + - uid: 19095 + components: + - type: Transform + pos: -43.5,0.5 + parent: 2 - uid: 19101 components: - type: Transform pos: -51.5,-41.5 parent: 2 + - uid: 19658 + components: + - type: Transform + pos: -45.5,0.5 + parent: 2 - uid: 19768 components: - type: Transform pos: -17.5,-81.5 parent: 2 + - uid: 19944 + components: + - type: Transform + pos: -45.5,4.5 + parent: 2 - proto: CableHVStack entities: - uid: 3789 @@ -31110,6 +31316,11 @@ entities: - type: Transform pos: -42.5,50.5 parent: 2 + - uid: 181 + components: + - type: Transform + pos: -69.5,-2.5 + parent: 2 - uid: 183 components: - type: Transform @@ -31135,6 +31346,11 @@ entities: - type: Transform pos: 35.5,7.5 parent: 2 + - uid: 698 + components: + - type: Transform + pos: -70.5,-7.5 + parent: 2 - uid: 722 components: - type: Transform @@ -31285,11 +31501,6 @@ entities: - type: Transform pos: 40.5,2.5 parent: 2 - - uid: 3830 - components: - - type: Transform - pos: -64.5,-4.5 - parent: 2 - uid: 3831 components: - type: Transform @@ -33560,6 +33771,11 @@ entities: - type: Transform pos: -44.5,-17.5 parent: 2 + - uid: 4317 + components: + - type: Transform + pos: -68.5,-4.5 + parent: 2 - uid: 4332 components: - type: Transform @@ -34695,41 +34911,6 @@ entities: - type: Transform pos: -66.5,-6.5 parent: 2 - - uid: 4561 - components: - - type: Transform - pos: -66.5,-5.5 - parent: 2 - - uid: 4562 - components: - - type: Transform - pos: -66.5,-4.5 - parent: 2 - - uid: 4563 - components: - - type: Transform - pos: -66.5,-3.5 - parent: 2 - - uid: 4564 - components: - - type: Transform - pos: -66.5,-2.5 - parent: 2 - - uid: 4565 - components: - - type: Transform - pos: -66.5,-1.5 - parent: 2 - - uid: 4566 - components: - - type: Transform - pos: -66.5,-0.5 - parent: 2 - - uid: 4567 - components: - - type: Transform - pos: -66.5,0.5 - parent: 2 - uid: 4568 components: - type: Transform @@ -34760,16 +34941,6 @@ entities: - type: Transform pos: -65.5,4.5 parent: 2 - - uid: 4576 - components: - - type: Transform - pos: -65.5,-1.5 - parent: 2 - - uid: 4577 - components: - - type: Transform - pos: -65.5,-4.5 - parent: 2 - uid: 4578 components: - type: Transform @@ -34785,31 +34956,6 @@ entities: - type: Transform pos: -55.5,4.5 parent: 2 - - uid: 4581 - components: - - type: Transform - pos: -63.5,-4.5 - parent: 2 - - uid: 4582 - components: - - type: Transform - pos: -63.5,-3.5 - parent: 2 - - uid: 4583 - components: - - type: Transform - pos: -63.5,-2.5 - parent: 2 - - uid: 4584 - components: - - type: Transform - pos: -63.5,-1.5 - parent: 2 - - uid: 4585 - components: - - type: Transform - pos: -63.5,-0.5 - parent: 2 - uid: 4586 components: - type: Transform @@ -35695,26 +35841,6 @@ entities: - type: Transform pos: -5.5,38.5 parent: 2 - - uid: 4808 - components: - - type: Transform - pos: -60.5,-3.5 - parent: 2 - - uid: 4809 - components: - - type: Transform - pos: -61.5,-3.5 - parent: 2 - - uid: 4810 - components: - - type: Transform - pos: -61.5,-4.5 - parent: 2 - - uid: 4811 - components: - - type: Transform - pos: -62.5,-4.5 - parent: 2 - uid: 4812 components: - type: Transform @@ -36630,6 +36756,21 @@ entities: - type: Transform pos: -6.5,-38.5 parent: 2 + - uid: 5017 + components: + - type: Transform + pos: -69.5,-7.5 + parent: 2 + - uid: 5018 + components: + - type: Transform + pos: -68.5,-3.5 + parent: 2 + - uid: 5027 + components: + - type: Transform + pos: -68.5,-1.5 + parent: 2 - uid: 5126 components: - type: Transform @@ -36680,6 +36821,16 @@ entities: - type: Transform pos: 40.5,10.5 parent: 2 + - uid: 5815 + components: + - type: Transform + pos: -68.5,-2.5 + parent: 2 + - uid: 5947 + components: + - type: Transform + pos: -68.5,-5.5 + parent: 2 - uid: 5984 components: - type: Transform @@ -36710,6 +36861,16 @@ entities: - type: Transform pos: -27.5,-7.5 parent: 2 + - uid: 6308 + components: + - type: Transform + pos: -70.5,-6.5 + parent: 2 + - uid: 6439 + components: + - type: Transform + pos: -70.5,-2.5 + parent: 2 - uid: 6735 components: - type: Transform @@ -36840,6 +37001,16 @@ entities: - type: Transform pos: -54.5,3.5 parent: 2 + - uid: 10913 + components: + - type: Transform + pos: -70.5,-3.5 + parent: 2 + - uid: 11121 + components: + - type: Transform + pos: -66.5,-5.5 + parent: 2 - uid: 11137 components: - type: Transform @@ -37000,6 +37171,11 @@ entities: - type: Transform pos: -29.5,-9.5 parent: 2 + - uid: 14364 + components: + - type: Transform + pos: -70.5,-4.5 + parent: 2 - uid: 14433 components: - type: Transform @@ -37010,6 +37186,11 @@ entities: - type: Transform pos: 34.5,6.5 parent: 2 + - uid: 15654 + components: + - type: Transform + pos: -68.5,-6.5 + parent: 2 - uid: 16761 components: - type: Transform @@ -37140,6 +37321,11 @@ entities: - type: Transform pos: 44.5,14.5 parent: 2 + - uid: 17479 + components: + - type: Transform + pos: -69.5,-9.5 + parent: 2 - uid: 17489 components: - type: Transform @@ -37195,6 +37381,11 @@ entities: - type: Transform pos: -33.5,48.5 parent: 2 + - uid: 17815 + components: + - type: Transform + pos: -68.5,-7.5 + parent: 2 - uid: 18421 components: - type: Transform @@ -37340,6 +37531,16 @@ entities: - type: Transform pos: -45.5,-45.5 parent: 2 + - uid: 18522 + components: + - type: Transform + pos: -68.5,-10.5 + parent: 2 + - uid: 18669 + components: + - type: Transform + pos: -68.5,-9.5 + parent: 2 - uid: 18982 components: - type: Transform @@ -37500,6 +37701,41 @@ entities: - type: Transform pos: -58.5,5.5 parent: 2 + - uid: 19977 + components: + - type: Transform + pos: -70.5,-5.5 + parent: 2 + - uid: 19981 + components: + - type: Transform + pos: -68.5,-0.5 + parent: 2 + - uid: 19982 + components: + - type: Transform + pos: -67.5,-0.5 + parent: 2 + - uid: 19983 + components: + - type: Transform + pos: -67.5,0.5 + parent: 2 + - uid: 19984 + components: + - type: Transform + pos: -66.5,0.5 + parent: 2 + - uid: 19986 + components: + - type: Transform + pos: -64.5,-14.5 + parent: 2 + - uid: 20001 + components: + - type: Transform + pos: -66.5,2.5 + parent: 2 - proto: CableMVStack entities: - uid: 4996 @@ -37621,16 +37857,12 @@ entities: parent: 2 - proto: Carpet entities: - - uid: 5017 + - uid: 4565 components: - type: Transform + rot: 3.141592653589793 rad pos: -52.5,0.5 parent: 2 - - uid: 5018 - components: - - type: Transform - pos: -52.5,-0.5 - parent: 2 - uid: 5019 components: - type: Transform @@ -37651,52 +37883,11 @@ entities: - type: Transform pos: -20.5,41.5 parent: 2 - - uid: 5023 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -49.5,-0.5 - parent: 2 - - uid: 5024 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -49.5,0.5 - parent: 2 - - uid: 5025 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -49.5,1.5 - parent: 2 - - uid: 5026 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -50.5,-0.5 - parent: 2 - - uid: 5027 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -50.5,0.5 - parent: 2 - - uid: 5028 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -50.5,1.5 - parent: 2 - uid: 5029 components: - type: Transform pos: -51.5,0.5 parent: 2 - - uid: 5030 - components: - - type: Transform - pos: -51.5,-0.5 - parent: 2 - uid: 5031 components: - type: Transform @@ -37809,16 +38000,6 @@ entities: parent: 2 - proto: CarpetBlack entities: - - uid: 5036 - components: - - type: Transform - pos: -10.5,-9.5 - parent: 2 - - uid: 5037 - components: - - type: Transform - pos: -10.5,-10.5 - parent: 2 - uid: 5040 components: - type: Transform @@ -38106,6 +38287,143 @@ entities: rot: -1.5707963267948966 rad pos: -32.5,27.5 parent: 2 +- proto: CarpetGreen + entities: + - uid: 5961 + components: + - type: Transform + pos: -9.5,-2.5 + parent: 2 + - uid: 7131 + components: + - type: Transform + pos: -10.5,-9.5 + parent: 2 + - uid: 11777 + components: + - type: Transform + pos: -9.5,-7.5 + parent: 2 + - uid: 12821 + components: + - type: Transform + pos: -4.5,-3.5 + parent: 2 + - uid: 13628 + components: + - type: Transform + pos: -9.5,-5.5 + parent: 2 + - uid: 13927 + components: + - type: Transform + pos: -9.5,-6.5 + parent: 2 + - uid: 13994 + components: + - type: Transform + pos: -10.5,-10.5 + parent: 2 + - uid: 14116 + components: + - type: Transform + pos: -9.5,-10.5 + parent: 2 + - uid: 14130 + components: + - type: Transform + pos: -10.5,-7.5 + parent: 2 + - uid: 14571 + components: + - type: Transform + pos: -4.5,-2.5 + parent: 2 + - uid: 14717 + components: + - type: Transform + pos: -10.5,-3.5 + parent: 2 + - uid: 14730 + components: + - type: Transform + pos: -5.5,-3.5 + parent: 2 + - uid: 14747 + components: + - type: Transform + pos: -5.5,-2.5 + parent: 2 + - uid: 15760 + components: + - type: Transform + pos: -10.5,-2.5 + parent: 2 + - uid: 16637 + components: + - type: Transform + pos: -3.5,-2.5 + parent: 2 + - uid: 16901 + components: + - type: Transform + pos: -10.5,-5.5 + parent: 2 + - uid: 17825 + components: + - type: Transform + pos: -3.5,-3.5 + parent: 2 +- proto: CarpetOrange + entities: + - uid: 19987 + components: + - type: Transform + pos: -64.5,-1.5 + parent: 2 + - uid: 19988 + components: + - type: Transform + pos: -64.5,-2.5 + parent: 2 + - uid: 19989 + components: + - type: Transform + pos: -64.5,-3.5 + parent: 2 + - uid: 19990 + components: + - type: Transform + pos: -63.5,-1.5 + parent: 2 + - uid: 19991 + components: + - type: Transform + pos: -63.5,-2.5 + parent: 2 + - uid: 19992 + components: + - type: Transform + pos: -63.5,-3.5 + parent: 2 + - uid: 19998 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -65.5,-1.5 + parent: 2 + - uid: 19999 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -65.5,-2.5 + parent: 2 + - uid: 20000 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -65.5,-3.5 + parent: 2 - proto: CarpetPurple entities: - uid: 2954 @@ -41111,12 +41429,6 @@ entities: - type: Transform pos: -9.5,-49.5 parent: 2 - - uid: 5809 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,-9.5 - parent: 2 - uid: 6233 components: - type: Transform @@ -41711,11 +42023,6 @@ entities: - type: Transform pos: -46.5,-29.5 parent: 2 - - uid: 18522 - components: - - type: Transform - pos: -46.5,-30.5 - parent: 2 - uid: 18523 components: - type: Transform @@ -41813,12 +42120,6 @@ entities: rot: 3.141592653589793 rad pos: -46.5,-47.5 parent: 2 - - uid: 18669 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -46.5,-48.5 - parent: 2 - uid: 18670 components: - type: Transform @@ -41885,12 +42186,6 @@ entities: rot: 3.141592653589793 rad pos: -36.5,-50.5 parent: 2 - - uid: 18681 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -35.5,-50.5 - parent: 2 - uid: 18682 components: - type: Transform @@ -42714,24 +43009,6 @@ entities: rot: 1.5707963267948966 rad pos: -51.5,-2.5 parent: 2 - - uid: 5753 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -59.5,-1.5 - parent: 2 - - uid: 5754 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -59.5,-0.5 - parent: 2 - - uid: 5755 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -57.5,-3.5 - parent: 2 - uid: 5756 components: - type: Transform @@ -42997,11 +43274,6 @@ entities: rot: 3.141592653589793 rad pos: -49.5,46.5 parent: 2 - - uid: 5810 - components: - - type: Transform - pos: -58.5,-2.5 - parent: 2 - uid: 5811 components: - type: Transform @@ -43025,12 +43297,6 @@ entities: rot: -1.5707963267948966 rad pos: -16.5,-21.5 parent: 2 - - uid: 5815 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -50.5,0.5 - parent: 2 - uid: 6178 components: - type: Transform @@ -43106,6 +43372,18 @@ entities: - type: Transform pos: 53.5,6.5 parent: 2 + - uid: 13928 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,-2.5 + parent: 2 + - uid: 14128 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,-3.5 + parent: 2 - uid: 14338 components: - type: Transform @@ -43829,30 +44107,6 @@ entities: parent: 2 - proto: ChairWood entities: - - uid: 5895 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -9.5,-2.5 - parent: 2 - - uid: 5896 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -10.5,-3.5 - parent: 2 - - uid: 5897 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -5.6117735,-10.606748 - parent: 2 - - uid: 5898 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -7.3305235,-10.335726 - parent: 2 - uid: 5899 components: - type: Transform @@ -44046,11 +44300,6 @@ entities: parent: 2 - proto: Cigar entities: - - uid: 5945 - components: - - type: Transform - pos: -10.435092,-2.2350075 - parent: 2 - uid: 17607 components: - type: Transform @@ -44072,21 +44321,6 @@ entities: parent: 2 - proto: CigaretteSpent entities: - - uid: 5947 - components: - - type: Transform - pos: -49.604855,-0.48506254 - parent: 2 - - uid: 5948 - components: - - type: Transform - pos: -49.667355,-0.45381254 - parent: 2 - - uid: 5949 - components: - - type: Transform - pos: -49.854855,-0.36006254 - parent: 2 - uid: 5952 components: - type: Transform @@ -44178,18 +44412,6 @@ entities: - type: Transform pos: -28.278496,19.306747 parent: 2 -- proto: CigarSpent - entities: - - uid: 5960 - components: - - type: Transform - pos: -49.68298,-0.5319376 - parent: 2 - - uid: 5961 - components: - - type: Transform - pos: -6.1678247,-7.392461 - parent: 2 - proto: CigPackBlack entities: - uid: 5962 @@ -44211,13 +44433,6 @@ entities: - type: Transform pos: -33.656166,13.587164 parent: 2 -- proto: CigPackRed - entities: - - uid: 5965 - components: - - type: Transform - pos: -6.2785864,-10.556837 - parent: 2 - proto: CircuitImprinter entities: - uid: 5966 @@ -44755,6 +44970,11 @@ entities: - type: Transform pos: -44.5,-25.5 parent: 2 + - uid: 19971 + components: + - type: Transform + pos: -7.5,-50.5 + parent: 2 - proto: ClosetWallMaintenanceFilledRandom entities: - uid: 626 @@ -45205,13 +45425,6 @@ entities: - type: Transform pos: 17.378506,21.51793 parent: 2 -- proto: ClothingShoesBling - entities: - - uid: 6087 - components: - - type: Transform - pos: -60.347687,-3.4251437 - parent: 2 - proto: ClothingShoesBootsMag entities: - uid: 13305 @@ -45352,20 +45565,14 @@ entities: rot: 3.141592653589793 rad pos: 0.43691832,23.500238 parent: 2 -- proto: ComfyChair - entities: - - uid: 6111 + - uid: 19970 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -9.5,-9.5 - parent: 2 - - uid: 6112 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -9.5,-10.5 + rot: 1.5707963267948966 rad + pos: -38.791027,3.3515244 parent: 2 +- proto: ComfyChair + entities: - uid: 6113 components: - type: Transform @@ -45576,6 +45783,21 @@ entities: linkedPorts: 7691: - ArtifactAnalyzerSender: ArtifactAnalyzerReceiver +- proto: ComputerAtmosMonitoring + entities: + - uid: 12338 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,-39.5 + parent: 2 +- proto: computerBodyScanner + entities: + - uid: 16925 + components: + - type: Transform + pos: 18.5,24.5 + parent: 2 - proto: ComputerBroken entities: - uid: 6079 @@ -45896,16 +46118,6 @@ entities: parent: 2 - proto: ComputerTelevision entities: - - uid: 6181 - components: - - type: Transform - pos: -10.5,-10.5 - parent: 2 - - uid: 6182 - components: - - type: Transform - pos: -49.5,1.5 - parent: 2 - uid: 19329 components: - type: Transform @@ -46508,13 +46720,6 @@ entities: - type: Transform pos: -50.5,-41.5 parent: 2 -- proto: CrateMedicalScrubs - entities: - - uid: 6268 - components: - - type: Transform - pos: 19.5,25.5 - parent: 2 - proto: CrateMedicalSurgery entities: - uid: 6269 @@ -47268,6 +47473,8 @@ entities: - type: Transform pos: 32.5,-5.5 parent: 2 + - type: NavMapBeacon + text: Nitrogen Lounge - proto: DefaultStationBeaconSingularity entities: - uid: 9646 @@ -47324,16 +47531,16 @@ entities: parent: 2 - proto: DefibrillatorCabinetFilled entities: - - uid: 6286 + - uid: 6287 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 18.5,25.5 + pos: 23.5,9.5 parent: 2 - - uid: 6287 + - uid: 12748 components: - type: Transform - pos: 23.5,9.5 + rot: -1.5707963267948966 rad + pos: 19.5,23.5 parent: 2 - uid: 14514 components: @@ -47457,12 +47664,6 @@ entities: rot: 1.5707963267948966 rad pos: -52.5,3.5 parent: 2 - - uid: 6308 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -52.5,-0.5 - parent: 2 - uid: 6309 components: - type: Transform @@ -48251,18 +48452,6 @@ entities: - type: Transform pos: -52.5,1.5 parent: 2 - - uid: 6439 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -50.5,-0.5 - parent: 2 - - uid: 6440 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -51.5,-0.5 - parent: 2 - uid: 6441 components: - type: Transform @@ -51517,6 +51706,12 @@ entities: parent: 2 - proto: DisposalTrunk entities: + - uid: 5810 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -52.5,-0.5 + parent: 2 - uid: 6963 components: - type: Transform @@ -51534,12 +51729,6 @@ entities: - type: Transform pos: -56.5,2.5 parent: 2 - - uid: 6989 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -49.5,-0.5 - parent: 2 - uid: 6990 components: - type: Transform @@ -51888,6 +52077,16 @@ entities: - type: Transform pos: -32.5,-52.5 parent: 2 + - uid: 5505 + components: + - type: Transform + pos: -52.5,-0.5 + parent: 2 + - uid: 5754 + components: + - type: Transform + pos: -56.5,2.5 + parent: 2 - uid: 6351 components: - type: Transform @@ -51960,11 +52159,6 @@ entities: - type: Transform pos: -21.5,14.5 parent: 2 - - uid: 7051 - components: - - type: Transform - pos: -56.5,2.5 - parent: 2 - uid: 7053 components: - type: Transform @@ -52443,204 +52637,6 @@ entities: parent: 2 - proto: DrinkGlass entities: - - uid: 7131 - components: - - type: MetaData - desc: An all time classic, mild cocktail. - name: gin and tonic glass - - type: Transform - pos: -6.615975,-7.247586 - parent: 2 - - type: SolutionContainerManager - solutions: - drink: - temperature: 293.15 - canReact: True - maxVol: 30 - name: null - reagents: - - data: null - ReagentId: GinTonic - Quantity: 30 - - type: TransformableContainer - transformed: True - currentReagent: - metamorphicChangeColor: True - metamorphicFillBaseName: null - flavor: gintonic - flavorMinimum: 0.1 - slippery: False - fizziness: 0 - viscosity: 0 - worksOnTheDead: False - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 2 - probability: 1 - conditions: null - - !type:AdjustReagent - probability: 1 - conditions: null - amount: 0.15 - group: null - reagent: Ethanol - metabolismRate: 0.5 - reactiveEffects: - Flammable: - effects: - - !type:FlammableReaction - probability: 1 - conditions: null - multiplierOnExisting: 1 - multiplier: 0.05 - methods: - - Touch - tileReactions: - - !type:FlammableTileReaction - temperatureMultiplier: 1.35 - plantMetabolism: - - !type:PlantAdjustNutrition - guidebookIsAttributePositive: True - amount: 0.25 - guidebookAttributeName: plant-attribute-nutrition - probability: 1 - conditions: null - - !type:PlantAdjustWater - guidebookIsAttributePositive: True - amount: 0.7 - guidebookAttributeName: plant-attribute-water - probability: 1 - conditions: null - pricePerUnit: 0 - footstepSound: !type:SoundCollectionSpecifier - params: - variation: null - playOffsetSeconds: 0 - loop: False - referenceDistance: 1 - rolloffFactor: 1 - maxDistance: 20 - pitch: 1 - volume: 0 - collection: FootstepWater - id: GinTonic - name: reagent-name-gin-tonic - group: Drinks - parent: - - BaseAlcohol - abstract: False - desc: reagent-desc-gin-tonic - physicalDesc: reagent-physical-desc-strong-smelling - color: '#004166FF' - specificHeat: 1 - boilingPoint: null - meltingPoint: null - metamorphicSprite: - sprite: Objects/Consumable/Drinks/gintonicglass.rsi - state: icon - metamorphicMaxFillLevels: 0 - recognizable: False - - uid: 7132 - components: - - type: MetaData - desc: Whiskey, mixed with cola. Surprisingly refreshing. - name: whiskey cola glass - - type: Transform - pos: -10.289259,-2.5268764 - parent: 2 - - type: SolutionContainerManager - solutions: - drink: - temperature: 293.15 - canReact: True - maxVol: 30 - name: null - reagents: - - data: null - ReagentId: WhiskeyCola - Quantity: 30 - - type: TransformableContainer - transformed: True - currentReagent: - metamorphicChangeColor: True - metamorphicFillBaseName: null - flavor: whiskeycola - flavorMinimum: 0.1 - slippery: False - fizziness: 0 - viscosity: 0 - worksOnTheDead: False - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 2 - probability: 1 - conditions: null - - !type:AdjustReagent - probability: 1 - conditions: null - amount: 0.15 - group: null - reagent: Ethanol - metabolismRate: 0.5 - reactiveEffects: - Flammable: - effects: - - !type:FlammableReaction - probability: 1 - conditions: null - multiplierOnExisting: 1 - multiplier: 0.05 - methods: - - Touch - tileReactions: - - !type:FlammableTileReaction - temperatureMultiplier: 1.35 - plantMetabolism: - - !type:PlantAdjustNutrition - guidebookIsAttributePositive: True - amount: 0.25 - guidebookAttributeName: plant-attribute-nutrition - probability: 1 - conditions: null - - !type:PlantAdjustWater - guidebookIsAttributePositive: True - amount: 0.7 - guidebookAttributeName: plant-attribute-water - probability: 1 - conditions: null - pricePerUnit: 0 - footstepSound: !type:SoundCollectionSpecifier - params: - variation: null - playOffsetSeconds: 0 - loop: False - referenceDistance: 1 - rolloffFactor: 1 - maxDistance: 20 - pitch: 1 - volume: 0 - collection: FootstepWater - id: WhiskeyCola - name: reagent-name-whiskey-cola - group: Drinks - parent: - - BaseAlcohol - abstract: False - desc: reagent-desc-whiskey-cola - physicalDesc: reagent-physical-desc-bubbly - color: '#3E1B00FF' - specificHeat: 1 - boilingPoint: null - meltingPoint: null - metamorphicSprite: - sprite: Objects/Consumable/Drinks/whiskeycolaglass.rsi - state: icon - metamorphicMaxFillLevels: 0 - recognizable: False - uid: 13912 components: - type: Transform @@ -52695,6 +52691,13 @@ entities: - type: Transform pos: 8.374847,6.5835924 parent: 2 +- proto: DrinkHolyWaterFull + entities: + - uid: 19996 + components: + - type: Transform + pos: -64.5537,-2.2618818 + parent: 2 - proto: DrinkHotCoffee entities: - uid: 14044 @@ -52714,10 +52717,10 @@ entities: parent: 2 - proto: DrinkIceBucket entities: - - uid: 17488 + - uid: 14368 components: - type: Transform - pos: -3.3939247,-3.5195165 + pos: -3.5183163,-10.288557 parent: 2 - proto: DrinkIcedTeaCan entities: @@ -52726,6 +52729,13 @@ entities: - type: Transform pos: 8.249847,6.802495 parent: 2 +- proto: DrinkJigger + entities: + - uid: 16169 + components: + - type: Transform + pos: -3.2370129,-10.496477 + parent: 2 - proto: DrinkManlyDorfGlass entities: - uid: 7138 @@ -52802,16 +52812,6 @@ entities: Quantity: 20 - proto: DrinkMugMetal entities: - - uid: 7143 - components: - - type: Transform - pos: -58.624435,-3.4879594 - parent: 2 - - uid: 7144 - components: - - type: Transform - pos: -58.76118,-3.1559281 - parent: 2 - uid: 7145 components: - type: Transform @@ -52898,16 +52898,6 @@ entities: parent: 2 - proto: DrinkShotGlass entities: - - uid: 7157 - components: - - type: Transform - pos: -5.1731544,-7.5824575 - parent: 2 - - uid: 7158 - components: - - type: Transform - pos: -4.975238,-7.363556 - parent: 2 - uid: 17464 components: - type: Transform @@ -53369,12 +53359,6 @@ entities: rot: -1.5707963267948966 rad pos: -54.5,-7.5 parent: 2 - - uid: 7239 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -49.5,-0.5 - parent: 2 - uid: 7240 components: - type: Transform @@ -53632,18 +53616,6 @@ entities: - type: Transform pos: -55.5,40.5 parent: 2 -- proto: ExplosivesSignMed - entities: - - uid: 7281 - components: - - type: Transform - pos: -39.5,4.5 - parent: 2 - - uid: 7282 - components: - - type: Transform - pos: -43.5,4.5 - parent: 2 - proto: ExtendedEmergencyOxygenTankFilled entities: - uid: 7283 @@ -53964,11 +53936,6 @@ entities: - type: Transform pos: 28.5,4.5 parent: 2 - - uid: 12812 - components: - - type: Transform - pos: -17.5,42.5 - parent: 2 - uid: 17572 components: - type: Transform @@ -54423,11 +54390,17 @@ entities: - type: Transform pos: -7.5,40.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 38 - uid: 7374 components: - type: Transform pos: -12.5,40.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 38 - uid: 7375 components: - type: Transform @@ -55207,16 +55180,25 @@ entities: - type: Transform pos: -2.5,34.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 38 - uid: 7511 components: - type: Transform pos: -6.5,35.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 38 - uid: 7512 components: - type: Transform pos: -13.5,35.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 38 - uid: 7513 components: - type: Transform @@ -55707,13 +55689,6 @@ entities: parent: 2 - type: Fixtures fixtures: {} - - uid: 7582 - components: - - type: Transform - pos: -4.5,-3.5 - parent: 2 - - type: Fixtures - fixtures: {} - uid: 7583 components: - type: Transform @@ -55792,6 +55767,21 @@ entities: parent: 2 - type: Fixtures fixtures: {} + - uid: 13929 + components: + - type: Transform + pos: 17.5,25.5 + parent: 2 + - type: Fixtures + fixtures: {} + - uid: 14369 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-8.5 + parent: 2 + - type: Fixtures + fixtures: {} - uid: 18632 components: - type: Transform @@ -55954,13 +55944,6 @@ entities: - type: Transform pos: 20.464806,-5.5433955 parent: 2 -- proto: FoodBoritoPie - entities: - - uid: 7602 - components: - - type: Transform - pos: -60.37967,-1.3542025 - parent: 2 - proto: FoodBoxDonut entities: - uid: 7603 @@ -55968,13 +55951,6 @@ entities: - type: Transform pos: -10.054111,32.930138 parent: 2 -- proto: FoodBoxPizzaFilled - entities: - - uid: 7606 - components: - - type: Transform - pos: -3.538867,-7.2398877 - parent: 2 - proto: FoodBurgerRobot entities: - uid: 18697 @@ -56045,13 +56021,6 @@ entities: - type: Transform pos: 12.074322,6.534174 parent: 2 -- proto: FoodMealCornedbeef - entities: - - uid: 7627 - components: - - type: Transform - pos: -51.488167,-0.36223078 - parent: 2 - proto: FoodMealFriesCheesy entities: - uid: 7628 @@ -56247,13 +56216,6 @@ entities: - type: Transform pos: 51.432377,9.599066 parent: 2 -- proto: FoodPlateTin - entities: - - uid: 7656 - components: - - type: Transform - pos: -49.729855,-0.5163126 - parent: 2 - proto: FoodPoppy entities: - uid: 19624 @@ -56344,11 +56306,6 @@ entities: parent: 2 - proto: ForkPlastic entities: - - uid: 7681 - components: - - type: Transform - pos: -58.25037,-3.1736562 - parent: 2 - uid: 18113 components: - type: Transform @@ -56756,6 +56713,13 @@ entities: rot: 3.141592653589793 rad pos: 34.5,-12.5 parent: 2 + - uid: 6440 + components: + - type: Transform + pos: -42.5,0.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 7129 components: - type: Transform @@ -58805,6 +58769,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 4581 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -45.5,0.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 4776 components: - type: Transform @@ -58956,6 +58928,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 6241 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -44.5,0.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 6325 components: - type: Transform @@ -76711,6 +76691,13 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 15662 + components: + - type: Transform + pos: -43.5,0.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 17627 components: - type: Transform @@ -77307,13 +77294,6 @@ entities: color: '#66FF00FF' - proto: GasVentPump entities: - - uid: 181 - components: - - type: Transform - pos: -42.5,0.5 - parent: 2 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 503 components: - type: Transform @@ -77361,6 +77341,17 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 5755 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -46.5,0.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 7731 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 6466 components: - type: Transform @@ -77418,6 +77409,9 @@ entities: rot: 1.5707963267948966 rad pos: -43.5,-3.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 7731 - type: AtmosPipeColor color: '#0055CCFF' - uid: 9632 @@ -77538,6 +77532,9 @@ entities: rot: -1.5707963267948966 rad pos: -0.5,38.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 38 - type: AtmosPipeColor color: '#0055CCFF' - uid: 10238 @@ -78922,6 +78919,17 @@ entities: - 19417 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 19966 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -43.5,-0.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 7731 + - type: AtmosPipeColor + color: '#0055CCFF' - proto: GasVentPumpVox entities: - uid: 17035 @@ -78969,6 +78977,9 @@ entities: rot: -1.5707963267948966 rad pos: -40.5,-3.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 7731 - type: AtmosPipeColor color: '#990000FF' - uid: 1578 @@ -79950,6 +79961,9 @@ entities: - type: Transform pos: -15.5,35.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 38 - type: AtmosPipeColor color: '#990000FF' - uid: 10545 @@ -79979,6 +79993,9 @@ entities: - type: Transform pos: 0.5,39.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 38 - type: AtmosPipeColor color: '#990000FF' - uid: 10549 @@ -80135,6 +80152,9 @@ entities: rot: 3.141592653589793 rad pos: -8.5,29.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 38 - type: AtmosPipeColor color: '#990000FF' - uid: 10572 @@ -80239,6 +80259,9 @@ entities: - type: Transform pos: -41.5,0.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 7731 - type: AtmosPipeColor color: '#990000FF' - uid: 10702 @@ -80705,10 +80728,15 @@ entities: - type: Transform pos: 2.5,20.5 parent: 2 + - uid: 1162 + components: + - type: Transform + pos: -68.5,-3.5 + parent: 2 - uid: 1163 components: - type: Transform - pos: -46.5,-1.5 + pos: -65.5,-0.5 parent: 2 - uid: 1180 components: @@ -80730,6 +80758,26 @@ entities: - type: Transform pos: -12.5,6.5 parent: 2 + - uid: 1227 + components: + - type: Transform + pos: -65.5,-4.5 + parent: 2 + - uid: 1242 + components: + - type: Transform + pos: -66.5,-4.5 + parent: 2 + - uid: 1243 + components: + - type: Transform + pos: -68.5,-0.5 + parent: 2 + - uid: 1333 + components: + - type: Transform + pos: -66.5,-3.5 + parent: 2 - uid: 1569 components: - type: Transform @@ -80763,7 +80811,7 @@ entities: - uid: 3367 components: - type: Transform - pos: -43.5,-1.5 + pos: -66.5,-0.5 parent: 2 - uid: 3373 components: @@ -80805,11 +80853,21 @@ entities: - type: Transform pos: -60.5,13.5 parent: 2 + - uid: 4316 + components: + - type: Transform + pos: -66.5,-5.5 + parent: 2 - uid: 4318 components: - type: Transform pos: -45.5,-14.5 parent: 2 + - uid: 4563 + components: + - type: Transform + pos: -68.5,-10.5 + parent: 2 - uid: 4603 components: - type: Transform @@ -80863,7 +80921,6 @@ entities: - uid: 5808 components: - type: Transform - rot: -1.5707963267948966 rad pos: -65.5,32.5 parent: 2 - uid: 6017 @@ -80901,6 +80958,11 @@ entities: - type: Transform pos: -28.5,-11.5 parent: 2 + - uid: 7281 + components: + - type: Transform + pos: -68.5,-1.5 + parent: 2 - uid: 7330 components: - type: Transform @@ -80926,6 +80988,16 @@ entities: - type: Transform pos: -38.5,48.5 parent: 2 + - uid: 7627 + components: + - type: Transform + pos: -68.5,-2.5 + parent: 2 + - uid: 7656 + components: + - type: Transform + pos: -66.5,-1.5 + parent: 2 - uid: 7696 components: - type: Transform @@ -81996,16 +82068,6 @@ entities: - type: Transform pos: 3.5,38.5 parent: 2 - - uid: 10891 - components: - - type: Transform - pos: -63.5,-4.5 - parent: 2 - - uid: 10894 - components: - - type: Transform - pos: -64.5,-4.5 - parent: 2 - uid: 10895 components: - type: Transform @@ -82051,56 +82113,11 @@ entities: - type: Transform pos: -63.5,2.5 parent: 2 - - uid: 10904 - components: - - type: Transform - pos: -63.5,-1.5 - parent: 2 - - uid: 10905 - components: - - type: Transform - pos: -66.5,0.5 - parent: 2 - - uid: 10906 - components: - - type: Transform - pos: -66.5,-0.5 - parent: 2 - - uid: 10907 - components: - - type: Transform - pos: -66.5,-2.5 - parent: 2 - - uid: 10908 - components: - - type: Transform - pos: -66.5,-3.5 - parent: 2 - - uid: 10909 - components: - - type: Transform - pos: -66.5,-5.5 - parent: 2 - uid: 10910 components: - type: Transform pos: -66.5,-6.5 parent: 2 - - uid: 10911 - components: - - type: Transform - pos: -65.5,-4.5 - parent: 2 - - uid: 10912 - components: - - type: Transform - pos: -63.5,-3.5 - parent: 2 - - uid: 10913 - components: - - type: Transform - pos: -63.5,-0.5 - parent: 2 - uid: 10914 components: - type: Transform @@ -82111,16 +82128,6 @@ entities: - type: Transform pos: -63.5,1.5 parent: 2 - - uid: 10916 - components: - - type: Transform - pos: -64.5,-1.5 - parent: 2 - - uid: 10917 - components: - - type: Transform - pos: -65.5,-1.5 - parent: 2 - uid: 10918 components: - type: Transform @@ -83036,11 +83043,6 @@ entities: - type: Transform pos: -42.5,4.5 parent: 2 - - uid: 11121 - components: - - type: Transform - pos: -43.5,4.5 - parent: 2 - uid: 11127 components: - type: Transform @@ -83846,16 +83848,6 @@ entities: - type: Transform pos: -60.5,-11.5 parent: 2 - - uid: 11393 - components: - - type: Transform - pos: -61.5,-1.5 - parent: 2 - - uid: 11394 - components: - - type: Transform - pos: -61.5,-0.5 - parent: 2 - uid: 11395 components: - type: Transform @@ -83926,11 +83918,6 @@ entities: - type: Transform pos: 20.5,-34.5 parent: 2 - - uid: 11412 - components: - - type: Transform - pos: -62.5,-4.5 - parent: 2 - uid: 11413 components: - type: Transform @@ -84036,11 +84023,6 @@ entities: - type: Transform pos: -66.5,34.5 parent: 2 - - uid: 11437 - components: - - type: Transform - pos: -61.5,-3.5 - parent: 2 - uid: 11438 components: - type: Transform @@ -84321,6 +84303,11 @@ entities: - type: Transform pos: -33.5,-15.5 parent: 2 + - uid: 11875 + components: + - type: Transform + pos: -44.5,-0.5 + parent: 2 - uid: 11896 components: - type: Transform @@ -84406,6 +84393,11 @@ entities: - type: Transform pos: -56.5,13.5 parent: 2 + - uid: 12812 + components: + - type: Transform + pos: -68.5,-6.5 + parent: 2 - uid: 12827 components: - type: Transform @@ -84416,6 +84408,21 @@ entities: - type: Transform pos: -27.5,52.5 parent: 2 + - uid: 13003 + components: + - type: Transform + pos: -68.5,-5.5 + parent: 2 + - uid: 13004 + components: + - type: Transform + pos: -69.5,-7.5 + parent: 2 + - uid: 13005 + components: + - type: Transform + pos: -70.5,-4.5 + parent: 2 - uid: 13033 components: - type: Transform @@ -84436,6 +84443,11 @@ entities: - type: Transform pos: -29.5,1.5 parent: 2 + - uid: 13278 + components: + - type: Transform + pos: -44.5,1.5 + parent: 2 - uid: 13319 components: - type: Transform @@ -84451,6 +84463,31 @@ entities: - type: Transform pos: -28.5,56.5 parent: 2 + - uid: 13389 + components: + - type: Transform + pos: -69.5,-9.5 + parent: 2 + - uid: 13392 + components: + - type: Transform + pos: -68.5,-9.5 + parent: 2 + - uid: 13422 + components: + - type: Transform + pos: -46.5,4.5 + parent: 2 + - uid: 13432 + components: + - type: Transform + pos: -45.5,4.5 + parent: 2 + - uid: 13688 + components: + - type: Transform + pos: -47.5,4.5 + parent: 2 - uid: 13816 components: - type: Transform @@ -84491,6 +84528,11 @@ entities: - type: Transform pos: -43.5,28.5 parent: 2 + - uid: 14595 + components: + - type: Transform + pos: -70.5,-5.5 + parent: 2 - uid: 14618 components: - type: Transform @@ -84526,11 +84568,6 @@ entities: - type: Transform pos: 6.5,-27.5 parent: 2 - - uid: 15410 - components: - - type: Transform - pos: -47.5,-1.5 - parent: 2 - uid: 15622 components: - type: Transform @@ -84586,6 +84623,11 @@ entities: - type: Transform pos: 27.5,-20.5 parent: 2 + - uid: 16839 + components: + - type: Transform + pos: -39.5,2.5 + parent: 2 - uid: 16857 components: - type: Transform @@ -85021,6 +85063,16 @@ entities: - type: Transform pos: -50.5,-42.5 parent: 2 + - uid: 19075 + components: + - type: Transform + pos: -45.5,2.5 + parent: 2 + - uid: 19093 + components: + - type: Transform + pos: -46.5,2.5 + parent: 2 - uid: 19171 components: - type: Transform @@ -85106,6 +85158,11 @@ entities: - type: Transform pos: -58.5,6.5 parent: 2 + - uid: 19867 + components: + - type: Transform + pos: -47.5,2.5 + parent: 2 - uid: 19961 components: - type: Transform @@ -85116,6 +85173,21 @@ entities: - type: Transform pos: 31.5,37.5 parent: 2 + - uid: 19965 + components: + - type: Transform + pos: -70.5,-3.5 + parent: 2 + - uid: 19985 + components: + - type: Transform + pos: -67.5,0.5 + parent: 2 + - uid: 19993 + components: + - type: Transform + pos: -66.5,2.5 + parent: 2 - proto: GrilleBroken entities: - uid: 3234 @@ -85216,11 +85288,6 @@ entities: - type: Transform pos: -64.5,-7.5 parent: 2 - - uid: 11539 - components: - - type: Transform - pos: -63.5,-2.5 - parent: 2 - uid: 11540 components: - type: Transform @@ -86450,6 +86517,13 @@ entities: parent: 2 - proto: HighSecArmoryLocked entities: + - uid: 5023 + components: + - type: MetaData + name: T3 Armory + - type: Transform + pos: -44.5,0.5 + parent: 2 - uid: 14643 components: - type: MetaData @@ -86588,10 +86662,10 @@ entities: parent: 2 - proto: HolopadCommandBridge entities: - - uid: 19867 + - uid: 19975 components: - type: Transform - pos: -10.5,42.5 + pos: -12.5,42.5 parent: 2 - proto: HolopadCommandBridgeHallway entities: @@ -86602,10 +86676,10 @@ entities: parent: 2 - proto: HolopadCommandBridgeLongRange entities: - - uid: 19944 + - uid: 19976 components: - type: Transform - pos: -9.5,42.5 + pos: -7.5,42.5 parent: 2 - proto: HolopadCommandCaptain entities: @@ -86677,6 +86751,13 @@ entities: - type: Transform pos: -3.5,42.5 parent: 2 +- proto: HolopadEngineeringAME + entities: + - uid: 13750 + components: + - type: Transform + pos: 0.5,-24.5 + parent: 2 - proto: HolopadEngineeringAtmosFront entities: - uid: 19862 @@ -86810,6 +86891,13 @@ entities: - type: Transform pos: 27.5,19.5 parent: 2 +- proto: HolopadMedicalSurgery + entities: + - uid: 20002 + components: + - type: Transform + pos: 17.5,23.5 + parent: 2 - proto: HolopadMedicalVirology entities: - uid: 19943 @@ -86903,10 +86991,17 @@ entities: parent: 2 - proto: HolopadServiceBar entities: - - uid: 18068 + - uid: 12374 components: - type: Transform - pos: -8.5,-6.5 + pos: -5.5,-6.5 + parent: 2 +- proto: HolopadServiceBarberShop + entities: + - uid: 14132 + components: + - type: Transform + pos: -0.5,19.5 parent: 2 - proto: HolopadServiceBotany entities: @@ -87301,6 +87396,8 @@ entities: entities: - uid: 19820 components: + - type: MetaData + name: Old Destroyed Intercom - type: Transform pos: -2.5,28.5 parent: 2 @@ -87409,12 +87506,6 @@ entities: rot: 1.5707963267948966 rad pos: -57.5,-9.5 parent: 2 - - uid: 11729 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -59.5,-2.5 - parent: 2 - uid: 19817 components: - type: Transform @@ -87502,15 +87593,15 @@ entities: parent: 2 - proto: JetpackSecurityFilled entities: - - uid: 16028 + - uid: 11772 components: - type: Transform - pos: -43.704132,-0.12178463 + pos: -47.44181,-0.5972605 parent: 2 - - uid: 16909 + - uid: 19659 components: - type: Transform - pos: -43.599964,-0.22595131 + pos: -47.681393,-0.42017716 parent: 2 - proto: Jug entities: @@ -87539,13 +87630,6 @@ entities: - type: Transform pos: -54.5,-7.5 parent: 2 -- proto: JukeboxCircuitBoard - entities: - - uid: 15760 - components: - - type: Transform - pos: -3.5105395,-3.0565822 - parent: 2 - proto: KitchenDeepFryer entities: - uid: 11744 @@ -87723,12 +87807,6 @@ entities: - type: Transform pos: -35.60518,35.00326 parent: 2 - - uid: 11769 - components: - - type: Transform - rot: -1.5604093829777579 rad - pos: -49.27722,-0.13982904 - parent: 2 - uid: 11990 components: - type: Transform @@ -87754,23 +87832,6 @@ entities: - type: Transform pos: -27.450718,-5.0504284 parent: 2 -- proto: LandMineExplosive - entities: - - uid: 11770 - components: - - type: Transform - pos: -43.123215,3.5202084 - parent: 2 - - uid: 11771 - components: - - type: Transform - pos: -41.60759,3.5045834 - parent: 2 - - uid: 11772 - components: - - type: Transform - pos: -39.92009,3.5514584 - parent: 2 - proto: LargeBeaker entities: - uid: 11774 @@ -87795,11 +87856,6 @@ entities: rot: -1.5707963267948966 rad pos: -33.32283,13.430806 parent: 2 - - uid: 11777 - components: - - type: Transform - pos: -6.7160864,-10.619381 - parent: 2 - proto: LightHeadBorg entities: - uid: 18941 @@ -87807,6 +87863,40 @@ entities: - type: Transform pos: -51.5,39.5 parent: 2 +- proto: LockableButtonArmory + entities: + - uid: 11769 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -44.5,-6.5 + parent: 2 + - type: DeviceLinkSource + linkedPorts: + 11539: + - Pressed: Toggle + 12429: + - Pressed: Toggle + 11770: + - Pressed: Toggle + 14021: + - Pressed: Toggle + 13029: + - Pressed: Toggle + 4808: + - Pressed: Toggle + 4585: + - Pressed: Toggle + 5026: + - Pressed: Toggle + 5030: + - Pressed: Toggle + 5024: + - Pressed: Toggle + 16028: + - Pressed: Toggle + 16005: + - Pressed: Toggle - proto: LockableButtonResearch entities: - uid: 19601 @@ -87828,6 +87918,13 @@ entities: linkedPorts: 19547: - Pressed: Toggle +- proto: LockerAdministrativeAssistantFilled + entities: + - uid: 6087 + components: + - type: Transform + pos: -17.5,42.5 + parent: 2 - proto: LockerAtmosphericsFilled entities: - uid: 11778 @@ -88005,10 +88102,10 @@ entities: - type: Transform pos: -31.5,-12.5 parent: 2 - - uid: 7292 + - uid: 14278 components: - type: Transform - pos: -42.5,1.5 + pos: -43.5,1.5 parent: 2 - proto: LockerForensicMantisFilled entities: @@ -88079,13 +88176,6 @@ entities: - type: Transform pos: 6.5,8.5 parent: 2 -- proto: LockerMedicineFilled - entities: - - uid: 11808 - components: - - type: Transform - pos: 16.5,26.5 - parent: 2 - proto: LockerMime entities: - uid: 13414 @@ -88220,6 +88310,13 @@ entities: - type: Transform pos: -22.5,-11.5 parent: 2 +- proto: LockerSurgeonFilled + entities: + - uid: 11955 + components: + - type: Transform + pos: 16.5,26.5 + parent: 2 - proto: LockerWardenFilled entities: - uid: 7462 @@ -88234,6 +88331,21 @@ entities: - type: Transform pos: -36.5,-1.5 parent: 2 +- proto: LootSpawnerArmoryGunsOnly + entities: + - uid: 15663 + components: + - type: Transform + pos: -47.5,1.5 + parent: 2 +- proto: LootSpawnerSecuritySuperweapon + entities: + - uid: 4567 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -47.5,0.5 + parent: 2 - proto: LunchboxMedical entities: - uid: 19345 @@ -88639,16 +88751,6 @@ entities: prototypes: [] rarePrototypes: [] gameRules: [] - - uid: 11875 - components: - - type: Transform - pos: -49.5,1.5 - parent: 2 - - type: RandomSpawner - chance: 0.33 - prototypes: [] - rarePrototypes: [] - gameRules: [] - uid: 11876 components: - type: Transform @@ -88819,6 +88921,13 @@ entities: - type: Transform pos: 17.5,3.5 parent: 2 +- proto: MedicalBiofabricator + entities: + - uid: 20014 + components: + - type: Transform + pos: 27.5,20.5 + parent: 2 - proto: MedicalTechFab entities: - uid: 11905 @@ -88954,11 +89063,11 @@ entities: parent: 2 - proto: MinimoogInstrument entities: - - uid: 11930 + - uid: 14134 components: - type: Transform - rot: 3.141592653589793 rad - pos: -10.5,-5.5 + rot: -1.5707963267948966 rad + pos: -10.5,-6.5 parent: 2 - proto: Mirror entities: @@ -89108,6 +89217,11 @@ entities: - type: Transform pos: -40.5,1.5 parent: 2 + - uid: 10916 + components: + - type: Transform + pos: -45.5,1.5 + parent: 2 - proto: NoticeBoard entities: - uid: 12888 @@ -89172,11 +89286,6 @@ entities: - type: Transform pos: 17.5,24.5 parent: 2 - - uid: 11955 - components: - - type: Transform - pos: 27.5,20.5 - parent: 2 - uid: 13743 components: - type: Transform @@ -89299,11 +89408,10 @@ entities: parent: 2 - proto: PaintingMothBigCatch entities: - - uid: 11969 + - uid: 7582 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -2.5,-4.5 + pos: -2.5,-7.5 parent: 2 - proto: PaintingPrayerHands entities: @@ -89676,18 +89784,6 @@ entities: rot: 3.141592653589793 rad pos: -23.702309,43.635567 parent: 2 - - uid: 12003 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -49.515285,0.51080203 - parent: 2 - - uid: 12004 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -49.452785,0.35455203 - parent: 2 - uid: 17544 components: - type: Transform @@ -90268,11 +90364,6 @@ entities: - type: Transform pos: -35.573357,34.456673 parent: 2 - - uid: 12063 - components: - - type: Transform - pos: -49.573605,0.93681246 - parent: 2 - uid: 12064 components: - type: Transform @@ -90390,17 +90481,16 @@ entities: parent: 2 - proto: PlasmaReinforcedWindowDirectional entities: - - uid: 1227 + - uid: 4577 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -40.5,1.5 + rot: 3.141592653589793 rad + pos: -47.5,-0.5 parent: 2 - - uid: 8973 + - uid: 16004 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -42.5,1.5 + pos: -47.5,1.5 parent: 2 - proto: PlasmaTankFilled entities: @@ -90628,6 +90718,14 @@ entities: - type: Transform pos: -48.5,-47.5 parent: 2 +- proto: PosterContrabandBeachStarYamamoto + entities: + - uid: 10911 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -43.5,-1.5 + parent: 2 - proto: PosterContrabandC20r entities: - uid: 18961 @@ -90761,6 +90859,14 @@ entities: rot: -1.5707963267948966 rad pos: -41.5,-34.5 parent: 2 +- proto: PosterLegitCarbonDioxide + entities: + - uid: 10912 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.5,-47.5 + parent: 2 - proto: PosterLegitCleanliness entities: - uid: 12126 @@ -90768,6 +90874,13 @@ entities: - type: Transform pos: 35.5,-17.5 parent: 2 +- proto: PosterLegitCohibaRobustoAd + entities: + - uid: 14131 + components: + - type: Transform + pos: -6.5,-11.5 + parent: 2 - proto: PosterLegitDejaVu entities: - uid: 16112 @@ -90814,11 +90927,11 @@ entities: parent: 2 - proto: PosterLegitJustAWeekAway entities: - - uid: 12132 + - uid: 6286 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 18.5,26.5 + rot: -1.5707963267948966 rad + pos: 19.5,25.5 parent: 2 - proto: PosterLegitLoveIan entities: @@ -91061,6 +91174,11 @@ entities: - type: Transform pos: -33.5,3.5 parent: 2 + - uid: 7158 + components: + - type: Transform + pos: -10.5,-9.5 + parent: 2 - uid: 12175 components: - type: Transform @@ -91147,11 +91265,26 @@ entities: - type: Transform pos: -30.5,3.5 parent: 2 + - uid: 13785 + components: + - type: Transform + pos: -10.5,-7.5 + parent: 2 - uid: 14013 components: - type: Transform pos: 28.5,8.5 parent: 2 + - uid: 14129 + components: + - type: Transform + pos: -6.5,-2.5 + parent: 2 + - uid: 14135 + components: + - type: Transform + pos: -10.5,-5.5 + parent: 2 - uid: 17574 components: - type: Transform @@ -91194,15 +91327,15 @@ entities: - type: Transform pos: -43.5,20.5 parent: 2 - - uid: 12195 + - uid: 12132 components: - type: Transform - pos: 3.5,-12.5 + pos: 25.5,26.5 parent: 2 - - uid: 12198 + - uid: 12195 components: - type: Transform - pos: 19.5,26.5 + pos: 3.5,-12.5 parent: 2 - uid: 12199 components: @@ -91695,6 +91828,12 @@ entities: rot: 3.141592653589793 rad pos: -51.5,5.5 parent: 2 + - uid: 704 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -51.5,0.5 + parent: 2 - uid: 3237 components: - type: Transform @@ -91891,12 +92030,6 @@ entities: rot: 3.141592653589793 rad pos: 21.5,-15.5 parent: 2 - - uid: 12224 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -49.5,0.5 - parent: 2 - uid: 12225 components: - type: Transform @@ -92219,12 +92352,6 @@ entities: rot: 3.141592653589793 rad pos: -29.5,5.5 parent: 2 - - uid: 12296 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -47.5,5.5 - parent: 2 - uid: 12297 components: - type: Transform @@ -92429,12 +92556,6 @@ entities: rot: 1.5707963267948966 rad pos: -28.5,10.5 parent: 2 - - uid: 12338 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -59.5,-1.5 - parent: 2 - uid: 12339 components: - type: Transform @@ -92613,12 +92734,6 @@ entities: rot: 3.141592653589793 rad pos: 15.5,-1.5 parent: 2 - - uid: 12374 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 17.5,25.5 - parent: 2 - uid: 12375 components: - type: Transform @@ -92636,12 +92751,6 @@ entities: rot: 3.141592653589793 rad pos: 27.5,18.5 parent: 2 - - uid: 12378 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 19.5,26.5 - parent: 2 - uid: 12379 components: - type: Transform @@ -92884,12 +92993,6 @@ entities: rot: -1.5707963267948966 rad pos: -38.5,3.5 parent: 2 - - uid: 12429 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -44.5,3.5 - parent: 2 - uid: 12430 components: - type: Transform @@ -93534,6 +93637,11 @@ entities: rot: 1.5707963267948966 rad pos: -51.5,-39.5 parent: 2 + - uid: 19094 + components: + - type: Transform + pos: -45.5,7.5 + parent: 2 - uid: 19419 components: - type: Transform @@ -93789,6 +93897,12 @@ entities: parent: 2 - proto: PoweredlightLED entities: + - uid: 12004 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -65.5,-2.5 + parent: 2 - uid: 12574 components: - type: Transform @@ -93843,17 +93957,17 @@ entities: parent: 2 - proto: PoweredlightRed entities: - - uid: 14852 + - uid: 5948 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -39.5,0.5 + rot: 1.5707963267948966 rad + pos: -47.5,0.5 parent: 2 - - uid: 14854 + - uid: 14852 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -43.5,0.5 + rot: -1.5707963267948966 rad + pos: -39.5,0.5 parent: 2 - proto: PoweredlightSodium entities: @@ -94199,11 +94313,6 @@ entities: rot: 1.5707963267948966 rad pos: -24.5,-12.5 parent: 2 - - uid: 1200 - components: - - type: Transform - pos: -41.5,1.5 - parent: 2 - uid: 1659 components: - type: Transform @@ -94214,6 +94323,17 @@ entities: - type: Transform pos: -40.5,-2.5 parent: 2 + - uid: 4809 + components: + - type: Transform + pos: -45.5,-0.5 + parent: 2 + - uid: 5025 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -47.5,0.5 + parent: 2 - uid: 5882 components: - type: Transform @@ -94494,11 +94614,6 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,20.5 parent: 2 - - uid: 13545 - components: - - type: Transform - pos: -8.5,-39.5 - parent: 2 - uid: 13590 components: - type: Transform @@ -94554,11 +94669,6 @@ entities: - type: Transform pos: 12.664758,-32.312305 parent: 2 - - uid: 12746 - components: - - type: Transform - pos: -49.194317,1.0024505 - parent: 2 - uid: 12747 components: - type: Transform @@ -94566,11 +94676,6 @@ entities: parent: 2 - proto: RagItem entities: - - uid: 12748 - components: - - type: Transform - pos: -6.5395412,-4.15932 - parent: 2 - uid: 12749 components: - type: Transform @@ -95051,12 +95156,35 @@ entities: rot: 1.5707963267948966 rad pos: -50.5,11.5 parent: 2 +- proto: RailingDeltaVGrey + entities: + - uid: 4811 + components: + - type: Transform + pos: -61.5,-1.5 + parent: 2 + - uid: 14299 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -61.5,-3.5 + parent: 2 - proto: RandomArcade entities: - - uid: 12817 + - uid: 13910 components: - type: Transform - pos: -4.5,-10.5 + pos: -3.5,-2.5 + parent: 2 + - uid: 14567 + components: + - type: Transform + pos: -5.5,-2.5 + parent: 2 + - uid: 14568 + components: + - type: Transform + pos: -4.5,-2.5 parent: 2 - proto: RandomBoards entities: @@ -95067,10 +95195,10 @@ entities: parent: 2 - proto: RandomDrinkBottle entities: - - uid: 12821 + - uid: 20024 components: - type: Transform - pos: -4.5,-7.5 + pos: -6.5,-8.5 parent: 2 - proto: RandomDrinkGlass entities: @@ -95079,6 +95207,21 @@ entities: - type: Transform pos: 34.5,-7.5 parent: 2 + - uid: 20026 + components: + - type: Transform + pos: -6.5,-7.5 + parent: 2 + - uid: 20027 + components: + - type: Transform + pos: -6.5,-6.5 + parent: 2 + - uid: 20028 + components: + - type: Transform + pos: -5.5,-5.5 + parent: 2 - proto: RandomFoodBakedSingle entities: - uid: 3393 @@ -95108,6 +95251,11 @@ entities: - type: Transform pos: -8.5,23.5 parent: 2 + - uid: 20025 + components: + - type: Transform + pos: -10.5,-2.5 + parent: 2 - proto: RandomFoodSingle entities: - uid: 6016 @@ -95400,11 +95548,6 @@ entities: - type: Transform pos: 17.5,2.5 parent: 2 - - uid: 1241 - components: - - type: Transform - pos: -44.5,0.5 - parent: 2 - uid: 5657 components: - type: Transform @@ -95546,11 +95689,6 @@ entities: - type: Transform pos: -33.5,34.5 parent: 2 - - uid: 12889 - components: - - type: Transform - pos: -6.5,-2.5 - parent: 2 - uid: 12890 components: - type: Transform @@ -95792,6 +95930,88 @@ entities: - type: Transform pos: -28.5,10.5 parent: 2 +- proto: RandomSolarPanelState + entities: + - uid: 14596 + components: + - type: Transform + pos: -56.5,-45.5 + parent: 2 + - uid: 14597 + components: + - type: Transform + pos: -56.5,-44.5 + parent: 2 + - uid: 14854 + components: + - type: Transform + pos: -56.5,-43.5 + parent: 2 + - uid: 14867 + components: + - type: Transform + pos: -56.5,-42.5 + parent: 2 + - uid: 14903 + components: + - type: Transform + pos: -56.5,-35.5 + parent: 2 + - uid: 15019 + components: + - type: Transform + pos: -58.5,-42.5 + parent: 2 + - uid: 15040 + components: + - type: Transform + pos: -58.5,-43.5 + parent: 2 + - uid: 15117 + components: + - type: Transform + pos: -58.5,-44.5 + parent: 2 + - uid: 15319 + components: + - type: Transform + pos: -56.5,-36.5 + parent: 2 + - uid: 15326 + components: + - type: Transform + pos: -56.5,-37.5 + parent: 2 + - uid: 19964 + components: + - type: Transform + pos: -58.5,-45.5 + parent: 2 + - uid: 19967 + components: + - type: Transform + pos: -58.5,-36.5 + parent: 2 + - uid: 19968 + components: + - type: Transform + pos: -58.5,-35.5 + parent: 2 + - uid: 19969 + components: + - type: Transform + pos: -56.5,-38.5 + parent: 2 + - uid: 19972 + components: + - type: Transform + pos: -58.5,-37.5 + parent: 2 + - uid: 19973 + components: + - type: Transform + pos: -58.5,-38.5 + parent: 2 - proto: RandomSpawner entities: - uid: 12932 @@ -96120,29 +96340,12 @@ entities: - type: Transform pos: -2.7430477,-30.5355 parent: 2 -- proto: ReagentContainerFlour - entities: - - uid: 13003 - components: - - type: Transform - pos: -60.417053,-0.40202177 - parent: 2 - - uid: 13004 - components: - - type: Transform - pos: -60.573334,-0.26530302 - parent: 2 -- proto: ReagentContainerSugar +- proto: ReagentGrinderMachineCircuitboard entities: - - uid: 13005 - components: - - type: Transform - pos: -60.749146,-0.655928 - parent: 2 - - uid: 13006 + - uid: 16638 components: - type: Transform - pos: -60.358448,-0.71452177 + pos: -3.5305471,-5.518624 parent: 2 - proto: Recycler entities: @@ -96177,6 +96380,26 @@ entities: rot: 1.5707963267948966 rad pos: 48.5,-1.5 parent: 2 + - uid: 4320 + components: + - type: Transform + pos: -68.5,-7.5 + parent: 2 + - uid: 4561 + components: + - type: Transform + pos: -70.5,-2.5 + parent: 2 + - uid: 4562 + components: + - type: Transform + pos: -71.5,-4.5 + parent: 2 + - uid: 5028 + components: + - type: Transform + pos: -70.5,-7.5 + parent: 2 - uid: 5497 components: - type: Transform @@ -96212,6 +96435,16 @@ entities: - type: Transform pos: 18.5,-56.5 parent: 2 + - uid: 7239 + components: + - type: Transform + pos: -70.5,-6.5 + parent: 2 + - uid: 7681 + components: + - type: Transform + pos: -67.5,-2.5 + parent: 2 - uid: 7686 components: - type: Transform @@ -96242,6 +96475,16 @@ entities: rot: 3.141592653589793 rad pos: 49.5,32.5 parent: 2 + - uid: 10907 + components: + - type: Transform + pos: -70.5,-9.5 + parent: 2 + - uid: 10909 + components: + - type: Transform + pos: -68.5,-4.5 + parent: 2 - uid: 11153 components: - type: Transform @@ -96288,11 +96531,6 @@ entities: - type: Transform pos: -66.5,1.5 parent: 2 - - uid: 13029 - components: - - type: Transform - pos: -66.5,-1.5 - parent: 2 - uid: 13030 components: - type: Transform @@ -96801,32 +97039,28 @@ entities: - type: Transform pos: 18.5,-50.5 parent: 2 -- proto: ReinforcedPlasmaWindow - entities: - - uid: 4316 - components: - - type: Transform - pos: -43.5,-1.5 - parent: 2 - - uid: 4317 + - uid: 19994 components: - type: Transform - pos: -42.5,-1.5 + rot: 1.5707963267948966 rad + pos: -66.5,0.5 parent: 2 +- proto: ReinforcedPlasmaWindow + entities: - uid: 4319 components: - type: Transform pos: -40.5,2.5 parent: 2 - - uid: 4320 + - uid: 4584 components: - type: Transform - pos: -40.5,-1.5 + pos: -44.5,1.5 parent: 2 - - uid: 4323 + - uid: 5960 components: - type: Transform - pos: -39.5,-1.5 + pos: -39.5,4.5 parent: 2 - uid: 7690 components: @@ -96858,11 +97092,31 @@ entities: - type: Transform pos: -59.5,36.5 parent: 2 + - uid: 11393 + components: + - type: Transform + pos: -42.5,4.5 + parent: 2 + - uid: 11394 + components: + - type: Transform + pos: -45.5,2.5 + parent: 2 + - uid: 11412 + components: + - type: Transform + pos: -45.5,4.5 + parent: 2 - uid: 11635 components: - type: Transform pos: -45.5,-36.5 parent: 2 + - uid: 12224 + components: + - type: Transform + pos: -42.5,2.5 + parent: 2 - uid: 12431 components: - type: Transform @@ -97068,11 +97322,6 @@ entities: - type: Transform pos: -41.5,2.5 parent: 2 - - uid: 13163 - components: - - type: Transform - pos: -42.5,2.5 - parent: 2 - uid: 13164 components: - type: Transform @@ -97103,6 +97352,11 @@ entities: - type: Transform pos: -59.5,33.5 parent: 2 + - uid: 13438 + components: + - type: Transform + pos: -47.5,4.5 + parent: 2 - uid: 13456 components: - type: Transform @@ -97113,11 +97367,31 @@ entities: - type: Transform pos: -41.5,-40.5 parent: 2 + - uid: 13545 + components: + - type: Transform + pos: -46.5,4.5 + parent: 2 - uid: 13948 components: - type: Transform pos: -38.5,-29.5 parent: 2 + - uid: 14300 + components: + - type: Transform + pos: -40.5,4.5 + parent: 2 + - uid: 14301 + components: + - type: Transform + pos: -41.5,4.5 + parent: 2 + - uid: 15410 + components: + - type: Transform + pos: -44.5,-0.5 + parent: 2 - uid: 15685 components: - type: Transform @@ -97173,27 +97447,32 @@ entities: - type: Transform pos: -29.5,-49.5 parent: 2 -- proto: ReinforcedWindow - entities: - - uid: 89 + - uid: 19089 components: - type: Transform - pos: -60.5,21.5 + pos: -47.5,2.5 parent: 2 - - uid: 623 + - uid: 19092 components: - type: Transform - pos: -33.5,-15.5 + pos: -46.5,2.5 parent: 2 - - uid: 1148 + - uid: 19096 components: - type: Transform - pos: -46.5,-1.5 + pos: -39.5,2.5 parent: 2 - - uid: 1150 +- proto: ReinforcedWindow + entities: + - uid: 89 components: - type: Transform - pos: -47.5,-1.5 + pos: -60.5,21.5 + parent: 2 + - uid: 623 + components: + - type: Transform + pos: -33.5,-15.5 parent: 2 - uid: 1187 components: @@ -97265,6 +97544,11 @@ entities: - type: Transform pos: -35.5,-16.5 parent: 2 + - uid: 6182 + components: + - type: Transform + pos: -65.5,-4.5 + parent: 2 - uid: 6279 components: - type: Transform @@ -97480,6 +97764,11 @@ entities: - type: Transform pos: -33.5,51.5 parent: 2 + - uid: 13163 + components: + - type: Transform + pos: -39.5,-1.5 + parent: 2 - uid: 13170 components: - type: Transform @@ -97738,7 +98027,7 @@ entities: - uid: 13240 components: - type: Transform - pos: -61.5,-1.5 + pos: -40.5,-1.5 parent: 2 - uid: 13241 components: @@ -97793,7 +98082,7 @@ entities: - uid: 13252 components: - type: Transform - pos: -61.5,-0.5 + pos: -42.5,-1.5 parent: 2 - uid: 13253 components: @@ -97900,11 +98189,6 @@ entities: - type: Transform pos: 11.5,18.5 parent: 2 - - uid: 13278 - components: - - type: Transform - pos: -40.5,4.5 - parent: 2 - uid: 13279 components: - type: Transform @@ -97915,16 +98199,6 @@ entities: - type: Transform pos: 20.5,11.5 parent: 2 - - uid: 13281 - components: - - type: Transform - pos: -41.5,4.5 - parent: 2 - - uid: 13282 - components: - - type: Transform - pos: -42.5,4.5 - parent: 2 - uid: 13283 components: - type: Transform @@ -98155,11 +98429,6 @@ entities: - type: Transform pos: -51.5,34.5 parent: 2 - - uid: 13389 - components: - - type: Transform - pos: -43.5,4.5 - parent: 2 - uid: 13390 components: - type: Transform @@ -98170,11 +98439,6 @@ entities: - type: Transform pos: 3.5,38.5 parent: 2 - - uid: 13392 - components: - - type: Transform - pos: -39.5,4.5 - parent: 2 - uid: 13393 components: - type: Transform @@ -98265,11 +98529,6 @@ entities: - type: Transform pos: 41.5,-18.5 parent: 2 - - uid: 13422 - components: - - type: Transform - pos: -62.5,-4.5 - parent: 2 - uid: 13423 components: - type: Transform @@ -98285,11 +98544,6 @@ entities: - type: Transform pos: 12.5,-37.5 parent: 2 - - uid: 13432 - components: - - type: Transform - pos: -63.5,-4.5 - parent: 2 - uid: 13433 components: - type: Transform @@ -98315,11 +98569,6 @@ entities: - type: Transform pos: -57.5,3.5 parent: 2 - - uid: 13438 - components: - - type: Transform - pos: -64.5,-4.5 - parent: 2 - uid: 13439 components: - type: Transform @@ -98380,6 +98629,11 @@ entities: - type: Transform pos: -38.5,48.5 parent: 2 + - uid: 14020 + components: + - type: Transform + pos: -65.5,-0.5 + parent: 2 - uid: 14358 components: - type: Transform @@ -98415,6 +98669,26 @@ entities: - type: Transform pos: -18.5,-64.5 parent: 2 + - uid: 15374 + components: + - type: Transform + pos: -66.5,-1.5 + parent: 2 + - uid: 15397 + components: + - type: Transform + pos: -66.5,-0.5 + parent: 2 + - uid: 15649 + components: + - type: Transform + pos: -66.5,-4.5 + parent: 2 + - uid: 15650 + components: + - type: Transform + pos: -66.5,-3.5 + parent: 2 - uid: 15809 components: - type: Transform @@ -98746,6 +99020,16 @@ entities: - type: Transform pos: -39.5,1.5 parent: 2 + - uid: 11437 + components: + - type: Transform + pos: -42.5,1.5 + parent: 2 + - uid: 11771 + components: + - type: Transform + pos: -41.5,1.5 + parent: 2 - proto: RightArmBorg entities: - uid: 10857 @@ -99088,18 +99372,18 @@ entities: parent: 2 - proto: SecBreachingHammer entities: - - uid: 14278 + - uid: 10917 components: - type: Transform rot: 3.141592653589793 rad - pos: -43.245796,-0.486368 + pos: -45.446842,-0.5737871 parent: 2 - proto: SecurityTechFab entities: - - uid: 1243 + - uid: 16034 components: - type: Transform - pos: -43.5,1.5 + pos: -43.5,-5.5 parent: 2 - proto: SeedExtractor entities: @@ -99108,6 +99392,13 @@ entities: - type: Transform pos: -21.5,7.5 parent: 2 +- proto: SentientSmileCore + entities: + - uid: 19650 + components: + - type: Transform + pos: -52.5,5.5 + parent: 2 - proto: ShardGlass entities: - uid: 13485 @@ -99802,6 +100093,25 @@ entities: - Pressed: Toggle 13568: - Pressed: Toggle + - uid: 20011 + components: + - type: MetaData + desc: 'Caution: Remember laws before use!' + name: Turret Toggle + - type: Transform + rot: -1.5707963267948966 rad + pos: -6.5,-76.5 + parent: 2 + - type: DeviceLinkSource + linkedPorts: + 20008: + - Pressed: Toggle + 20007: + - Pressed: Toggle + 20009: + - Pressed: Toggle + 20006: + - Pressed: Toggle - proto: SignalSwitchDirectional entities: - uid: 13600 @@ -100096,13 +100406,6 @@ entities: - type: Transform pos: 21.5,20.5 parent: 2 -- proto: SignCryogenics - entities: - - uid: 13628 - components: - - type: Transform - pos: 17.5,22.5 - parent: 2 - proto: SignCryogenicsMed entities: - uid: 13629 @@ -100619,11 +100922,6 @@ entities: - type: Transform pos: -15.5,-89.5 parent: 2 - - uid: 13688 - components: - - type: Transform - pos: -66.5,-4.5 - parent: 2 - uid: 13689 components: - type: Transform @@ -100656,20 +100954,45 @@ entities: parent: 2 - proto: SignElectricalMed entities: - - uid: 19658 + - uid: 701 + components: + - type: Transform + pos: -45.5,2.5 + parent: 2 + - uid: 702 + components: + - type: Transform + pos: -47.5,2.5 + parent: 2 + - uid: 703 + components: + - type: Transform + pos: -42.5,2.5 + parent: 2 + - uid: 15656 + components: + - type: Transform + pos: -39.5,2.5 + parent: 2 + - uid: 16909 components: - type: Transform pos: -42.5,4.5 parent: 2 - - uid: 19659 + - uid: 19090 components: - type: Transform - pos: -40.5,4.5 + pos: -39.5,4.5 parent: 2 - - uid: 19660 + - uid: 19974 components: - type: Transform - pos: -41.5,2.5 + pos: -45.5,4.5 + parent: 2 + - uid: 19978 + components: + - type: Transform + pos: -47.5,4.5 parent: 2 - proto: SignEngineering entities: @@ -100958,13 +101281,6 @@ entities: - type: Transform pos: -25.5,24.5 parent: 2 -- proto: SignSec - entities: - - uid: 13750 - components: - - type: Transform - pos: -19.5,-5.5 - parent: 2 - proto: SignSecurearea entities: - uid: 6104 @@ -100981,17 +101297,17 @@ entities: parent: 2 - proto: SignSecureMedRed entities: - - uid: 16838 + - uid: 12746 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -42.5,-1.5 + rot: 3.141592653589793 rad + pos: -44.5,1.5 parent: 2 - - uid: 16839 + - uid: 16847 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -40.5,-1.5 + rot: 3.141592653589793 rad + pos: -44.5,-0.5 parent: 2 - proto: SignSecurity entities: @@ -101000,6 +101316,12 @@ entities: - type: Transform pos: -25.5,-1.5 parent: 2 + - uid: 13772 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -19.5,-5.5 + parent: 2 - proto: SignSmoking entities: - uid: 13754 @@ -101118,16 +101440,16 @@ entities: parent: 2 - proto: SinkStemlessWater entities: - - uid: 13770 + - uid: 10905 components: - type: Transform - pos: -52.5,-6.5 + rot: 1.5707963267948966 rad + pos: -60.5,1.5 parent: 2 - - uid: 13771 + - uid: 13770 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -60.5,0.5 + pos: -52.5,-6.5 parent: 2 - proto: SinkWide entities: @@ -101137,11 +101459,6 @@ entities: rot: 3.141592653589793 rad pos: -0.5,18.5 parent: 2 - - uid: 13772 - components: - - type: Transform - pos: -4.5,-2.5 - parent: 2 - uid: 13773 components: - type: Transform @@ -101165,6 +101482,12 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,10.5 parent: 2 + - uid: 14466 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-10.5 + parent: 2 - uid: 18631 components: - type: Transform @@ -101246,12 +101569,6 @@ entities: parent: 2 - proto: SodaDispenser entities: - - uid: 13785 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -3.5,-4.5 - parent: 2 - uid: 13786 components: - type: Transform @@ -101275,6 +101592,12 @@ entities: rot: 1.5707963267948966 rad pos: -55.5,17.5 parent: 2 + - uid: 14346 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,-8.5 + parent: 2 - proto: SodaDispenserMachineCircuitboard entities: - uid: 13986 @@ -101284,11 +101607,6 @@ entities: parent: 2 - proto: SolarAssembly entities: - - uid: 5505 - components: - - type: Transform - pos: -56.5,-42.5 - parent: 2 - uid: 13789 components: - type: Transform @@ -101404,51 +101722,6 @@ entities: - type: Transform pos: 80.5,14.5 parent: 2 - - uid: 19075 - components: - - type: Transform - pos: -56.5,-43.5 - parent: 2 - - uid: 19089 - components: - - type: Transform - pos: -56.5,-44.5 - parent: 2 - - uid: 19090 - components: - - type: Transform - pos: -56.5,-45.5 - parent: 2 - - uid: 19091 - components: - - type: Transform - pos: -56.5,-38.5 - parent: 2 - - uid: 19092 - components: - - type: Transform - pos: -56.5,-37.5 - parent: 2 - - uid: 19093 - components: - - type: Transform - pos: -56.5,-36.5 - parent: 2 - - uid: 19094 - components: - - type: Transform - pos: -56.5,-35.5 - parent: 2 - - uid: 19095 - components: - - type: Transform - pos: -58.5,-38.5 - parent: 2 - - uid: 19096 - components: - - type: Transform - pos: -58.5,-37.5 - parent: 2 - proto: SolarPanel entities: - uid: 13817 @@ -101953,6 +102226,13 @@ entities: - type: Transform pos: -35.5,13.5 parent: 2 +- proto: SpawnMobCatClippy + entities: + - uid: 20012 + components: + - type: Transform + pos: 6.5,-4.5 + parent: 2 - proto: SpawnMobCatException entities: - uid: 13898 @@ -102018,24 +102298,10 @@ entities: parent: 2 - proto: SpawnMobMonkeyPunpun entities: - - uid: 13910 - components: - - type: Transform - pos: -4.5,-5.5 - parent: 2 -- proto: SpawnMobPossumMorty - entities: - - uid: 13911 - components: - - type: Transform - pos: 26.5,20.5 - parent: 2 -- proto: SpawnMobSmile - entities: - - uid: 19650 + - uid: 18061 components: - type: Transform - pos: -52.5,5.5 + pos: -5.5,-8.5 parent: 2 - proto: SpawnPointAdminAssistant entities: @@ -102078,6 +102344,11 @@ entities: parent: 2 - proto: SpawnPointBartender entities: + - uid: 13911 + components: + - type: Transform + pos: -4.5,-7.5 + parent: 2 - uid: 13942 components: - type: Transform @@ -102356,11 +102627,6 @@ entities: - type: Transform pos: -23.5,42.5 parent: 2 - - uid: 17580 - components: - - type: Transform - pos: -7.5,-5.5 - parent: 2 - proto: SpawnPointClown entities: - uid: 7581 @@ -102388,11 +102654,6 @@ entities: - type: Transform pos: -34.5,-17.5 parent: 2 - - uid: 17816 - components: - - type: Transform - pos: -6.5,-8.5 - parent: 2 - uid: 17817 components: - type: Transform @@ -102413,6 +102674,11 @@ entities: - type: Transform pos: -7.5,36.5 parent: 2 + - uid: 20021 + components: + - type: Transform + pos: -5.5,-4.5 + parent: 2 - proto: SpawnPointCourier entities: - uid: 697 @@ -102638,11 +102904,6 @@ entities: - type: Transform pos: -33.5,41.5 parent: 2 - - uid: 13994 - components: - - type: Transform - pos: 17.5,25.5 - parent: 2 - uid: 13997 components: - type: Transform @@ -102792,6 +103053,11 @@ entities: - type: Transform pos: 18.5,1.5 parent: 2 + - uid: 12817 + components: + - type: Transform + pos: -7.5,-5.5 + parent: 2 - uid: 13513 components: - type: Transform @@ -102802,26 +103068,6 @@ entities: - type: Transform pos: -48.5,12.5 parent: 2 - - uid: 13926 - components: - - type: Transform - pos: -7.5,-7.5 - parent: 2 - - uid: 13927 - components: - - type: Transform - pos: -7.5,-6.5 - parent: 2 - - uid: 13928 - components: - - type: Transform - pos: -5.5,-8.5 - parent: 2 - - uid: 13929 - components: - - type: Transform - pos: -4.5,-8.5 - parent: 2 - uid: 13930 components: - type: Transform @@ -102872,6 +103118,26 @@ entities: - type: Transform pos: 21.5,-14.5 parent: 2 + - uid: 20017 + components: + - type: Transform + pos: -7.5,-6.5 + parent: 2 + - uid: 20018 + components: + - type: Transform + pos: -7.5,-7.5 + parent: 2 + - uid: 20019 + components: + - type: Transform + pos: -7.5,-8.5 + parent: 2 + - uid: 20020 + components: + - type: Transform + pos: -7.5,-9.5 + parent: 2 - proto: SpawnPointPrisoner entities: - uid: 14014 @@ -102879,11 +103145,6 @@ entities: - type: Transform pos: -55.5,-12.5 parent: 2 - - uid: 14015 - components: - - type: Transform - pos: -59.5,-0.5 - parent: 2 - uid: 14016 components: - type: Transform @@ -102904,16 +103165,6 @@ entities: - type: Transform pos: -61.5,-7.5 parent: 2 - - uid: 14020 - components: - - type: Transform - pos: -59.5,-1.5 - parent: 2 - - uid: 14021 - components: - - type: Transform - pos: -50.5,0.5 - parent: 2 - proto: SpawnPointPrisonGuard entities: - uid: 19833 @@ -103200,20 +103451,20 @@ entities: - type: Transform pos: -8.5,6.5 parent: 2 - - uid: 17824 + - uid: 20016 components: - type: Transform - pos: -7.5,-4.5 + pos: 0.5,19.5 parent: 2 - - uid: 17825 + - uid: 20022 components: - type: Transform - pos: -3.5,-8.5 + pos: -6.5,-4.5 parent: 2 - - uid: 18061 + - uid: 20023 components: - type: Transform - pos: 0.5,19.5 + pos: -4.5,-4.5 parent: 2 - proto: SpawnPointStationEngineer entities: @@ -103257,6 +103508,28 @@ entities: - type: Transform pos: 3.5,-24.5 parent: 2 +- proto: SpawnPointSurgeon + entities: + - uid: 713 + components: + - type: Transform + pos: 16.5,25.5 + parent: 2 + - uid: 20003 + components: + - type: Transform + pos: 16.5,24.5 + parent: 2 + - uid: 20004 + components: + - type: Transform + pos: 16.5,23.5 + parent: 2 + - uid: 20005 + components: + - type: Transform + pos: 15.5,24.5 + parent: 2 - proto: SpawnPointTechnicalAssistant entities: - uid: 14060 @@ -103391,6 +103664,12 @@ entities: rot: 1.5707963267948966 rad pos: 54.5,0.5 parent: 2 + - uid: 18681 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -61.5,-2.5 + parent: 2 - proto: StasisBed entities: - uid: 11906 @@ -103665,11 +103944,29 @@ entities: rot: 1.5707963267948966 rad pos: 1.5,18.5 parent: 2 - - uid: 14116 + - uid: 5036 components: - type: Transform rot: 3.141592653589793 rad - pos: -10.5,-6.5 + pos: -3.5093694,-3.0502641 + parent: 2 + - uid: 7157 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5151873,-3.0502641 + parent: 2 + - uid: 7606 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.942868,-6.321138 + parent: 2 + - uid: 11808 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.512278,-3.0624945 parent: 2 - uid: 14117 components: @@ -103721,76 +104018,62 @@ entities: parent: 2 - proto: StoolBar entities: - - uid: 5170 - components: - - type: Transform - pos: -6.5,20.5 - parent: 2 - - uid: 13602 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -39.5,-23.5 - parent: 2 - - uid: 14051 + - uid: 387 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -50.5,18.5 + rot: 1.5707963267948966 rad + pos: -7.5,-9.5 parent: 2 - - uid: 14063 + - uid: 5170 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -50.5,17.5 + pos: -6.5,20.5 parent: 2 - - uid: 14128 + - uid: 5809 components: - type: Transform rot: 1.5707963267948966 rad - pos: -7.5,-4.5 + pos: -7.5,-8.5 parent: 2 - - uid: 14129 + - uid: 5945 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -7.5,-5.5 + pos: -6.5,-4.5 parent: 2 - - uid: 14130 + - uid: 5965 components: - type: Transform rot: 1.5707963267948966 rad pos: -7.5,-6.5 parent: 2 - - uid: 14131 + - uid: 11930 components: - type: Transform rot: 1.5707963267948966 rad - pos: -7.5,-7.5 + pos: -7.5,-5.5 parent: 2 - - uid: 14132 + - uid: 12889 components: - type: Transform - rot: 3.141592653589793 rad - pos: -6.5,-8.5 + pos: -5.5,-4.5 parent: 2 - - uid: 14133 + - uid: 13602 components: - type: Transform - rot: 3.141592653589793 rad - pos: -5.5,-8.5 + rot: -1.5707963267948966 rad + pos: -39.5,-23.5 parent: 2 - - uid: 14134 + - uid: 14051 components: - type: Transform - rot: 3.141592653589793 rad - pos: -4.5,-8.5 + rot: -1.5707963267948966 rad + pos: -50.5,18.5 parent: 2 - - uid: 14135 + - uid: 14063 components: - type: Transform - rot: 3.141592653589793 rad - pos: -3.5,-8.5 + rot: -1.5707963267948966 rad + pos: -50.5,17.5 parent: 2 - uid: 14136 components: @@ -103864,6 +104147,17 @@ entities: rot: 1.5707963267948966 rad pos: 1.5,33.5 parent: 2 + - uid: 14566 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,-7.5 + parent: 2 + - uid: 14569 + components: + - type: Transform + pos: -4.5,-4.5 + parent: 2 - proto: StorageCanister entities: - uid: 14153 @@ -105481,22 +105775,6 @@ entities: - type: Transform pos: -18.5,-40.5 parent: 2 - - uid: 14299 - components: - - type: Transform - pos: -60.5,-1.5 - parent: 2 - - uid: 14300 - components: - - type: Transform - pos: -60.5,-0.5 - parent: 2 - - uid: 14301 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -58.5,-3.5 - parent: 2 - uid: 14303 components: - type: Transform @@ -105667,6 +105945,12 @@ entities: - type: Transform pos: 6.5,22.5 parent: 2 + - uid: 14367 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,-2.5 + parent: 2 - uid: 14506 components: - type: Transform @@ -105709,16 +105993,6 @@ entities: - type: Transform pos: 1.5,40.5 parent: 2 - - uid: 14345 - components: - - type: Transform - pos: -10.5,-2.5 - parent: 2 - - uid: 14346 - components: - - type: Transform - pos: -6.5,-10.5 - parent: 2 - uid: 14348 components: - type: Transform @@ -105754,17 +106028,6 @@ entities: - type: Transform pos: 10.5,-31.5 parent: 2 - - uid: 14361 - components: - - type: Transform - pos: -52.5,-0.5 - parent: 2 - - uid: 14364 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -51.5,-0.5 - parent: 2 - uid: 18545 components: - type: Transform @@ -105873,21 +106136,6 @@ entities: rot: -1.5707963267948966 rad pos: 32.5,-16.5 parent: 2 - - uid: 14367 - components: - - type: Transform - pos: -3.5,-3.5 - parent: 2 - - uid: 14368 - components: - - type: Transform - pos: -3.5,-4.5 - parent: 2 - - uid: 14369 - components: - - type: Transform - pos: -3.5,-2.5 - parent: 2 - uid: 14372 components: - type: Transform @@ -106497,11 +106745,6 @@ entities: rot: -1.5707963267948966 rad pos: -44.5,28.5 parent: 2 - - uid: 14466 - components: - - type: Transform - pos: -10.5,-9.5 - parent: 2 - uid: 14467 components: - type: Transform @@ -106643,6 +106886,16 @@ entities: rot: -1.5707963267948966 rad pos: -48.5,27.5 parent: 2 + - uid: 16902 + components: + - type: Transform + pos: 18.5,26.5 + parent: 2 + - uid: 16903 + components: + - type: Transform + pos: 18.5,25.5 + parent: 2 - proto: TablePlasmaGlass entities: - uid: 14497 @@ -106678,11 +106931,6 @@ entities: - type: Transform pos: -42.5,-0.5 parent: 2 - - uid: 1242 - components: - - type: Transform - pos: -43.5,-0.5 - parent: 2 - uid: 3241 components: - type: Transform @@ -106726,6 +106974,11 @@ entities: - type: Transform pos: -12.5,5.5 parent: 2 + - uid: 12296 + components: + - type: Transform + pos: -47.5,-0.5 + parent: 2 - uid: 13551 components: - type: Transform @@ -106909,6 +107162,11 @@ entities: - type: Transform pos: 61.5,3.5 parent: 2 + - uid: 19660 + components: + - type: Transform + pos: -47.5,1.5 + parent: 2 - proto: TableReinforcedGlass entities: - uid: 11773 @@ -107026,59 +107284,83 @@ entities: parent: 2 - proto: TableWoodReinforced entities: - - uid: 11476 + - uid: 5037 components: - type: Transform - rot: 3.141592653589793 rad - pos: -28.5,48.5 + rot: -1.5707963267948966 rad + pos: -6.5,-9.5 parent: 2 - - uid: 13511 + - uid: 5896 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -20.5,41.5 + rot: -1.5707963267948966 rad + pos: -3.5,-7.5 parent: 2 - - uid: 14565 + - uid: 5897 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -6.5,-4.5 + rot: -1.5707963267948966 rad + pos: -4.5,-5.5 parent: 2 - - uid: 14566 + - uid: 5898 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -6.5,-7.5 + rot: -1.5707963267948966 rad + pos: -3.5,-5.5 parent: 2 - - uid: 14567 + - uid: 5946 components: - type: Transform - rot: 1.5707963267948966 rad + rot: -1.5707963267948966 rad pos: -6.5,-5.5 parent: 2 - - uid: 14568 + - uid: 6111 components: - type: Transform - rot: 1.5707963267948966 rad + rot: -1.5707963267948966 rad + pos: -3.5,-10.5 + parent: 2 + - uid: 6181 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,-8.5 + parent: 2 + - uid: 7132 + components: + - type: Transform + rot: -1.5707963267948966 rad pos: -6.5,-6.5 parent: 2 - - uid: 14569 + - uid: 11476 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -5.5,-7.5 + rot: 3.141592653589793 rad + pos: -28.5,48.5 parent: 2 - - uid: 14570 + - uid: 11969 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -4.5,-7.5 + rot: -1.5707963267948966 rad + pos: -6.5,-7.5 parent: 2 - - uid: 14571 + - uid: 13511 components: - type: Transform rot: 1.5707963267948966 rad - pos: -3.5,-7.5 + pos: -20.5,41.5 + parent: 2 + - uid: 14133 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -6.5,-8.5 + parent: 2 + - uid: 14565 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-5.5 parent: 2 - uid: 14572 components: @@ -107206,12 +107488,6 @@ entities: rot: -1.5707963267948966 rad pos: -0.5,37.5 parent: 2 - - uid: 14593 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -49.5,1.5 - parent: 2 - uid: 14594 components: - type: MetaData @@ -107220,24 +107496,6 @@ entities: - type: Transform pos: -22.5,44.5 parent: 2 - - uid: 14595 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -49.5,0.5 - parent: 2 - - uid: 14596 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -49.5,0.5 - parent: 2 - - uid: 14597 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -49.5,-0.5 - parent: 2 - uid: 17529 components: - type: Transform @@ -107731,10 +107989,10 @@ entities: - type: Transform pos: 6.6968956,7.356404 parent: 2 - - uid: 16847 + - uid: 15998 components: - type: Transform - pos: -43.53581,-5.195364 + pos: -43.544712,-3.1413898 parent: 2 - uid: 18000 components: @@ -108184,10 +108442,10 @@ entities: parent: 2 - proto: VendingMachineBooze entities: - - uid: 14717 + - uid: 6112 components: - type: Transform - pos: -5.5,-2.5 + pos: -3.5,-6.5 parent: 2 - uid: 14718 components: @@ -108269,10 +108527,10 @@ entities: parent: 2 - proto: VendingMachineCigs entities: - - uid: 14730 + - uid: 12198 components: - type: Transform - pos: -3.5,-10.5 + pos: -10.5,-10.5 parent: 2 - uid: 14731 components: @@ -108396,10 +108654,10 @@ entities: parent: 2 - proto: VendingMachineGeneDrobe entities: - - uid: 14747 + - uid: 13926 components: - type: Transform - pos: 19.5,23.5 + pos: 20.5,23.5 parent: 2 - proto: VendingMachineHappyHonk entities: @@ -108782,20 +109040,30 @@ entities: - type: Transform pos: 17.5,45.5 parent: 2 + - uid: 712 + components: + - type: Transform + pos: -50.5,1.5 + parent: 2 - uid: 754 components: - type: Transform pos: -42.5,-13.5 parent: 2 - - uid: 1154 + - uid: 1149 components: - type: Transform - pos: -42.5,-11.5 + pos: -43.5,4.5 parent: 2 - - uid: 1162 + - uid: 1150 components: - type: Transform - pos: -46.5,4.5 + pos: -62.5,-4.5 + parent: 2 + - uid: 1154 + components: + - type: Transform + pos: -42.5,-11.5 parent: 2 - uid: 1185 components: @@ -108807,6 +109075,11 @@ entities: - type: Transform pos: -42.5,-14.5 parent: 2 + - uid: 1200 + components: + - type: Transform + pos: -66.5,-2.5 + parent: 2 - uid: 1201 components: - type: Transform @@ -109052,6 +109325,11 @@ entities: - type: Transform pos: -32.5,-53.5 parent: 2 + - uid: 3830 + components: + - type: Transform + pos: -63.5,-4.5 + parent: 2 - uid: 4237 components: - type: Transform @@ -109097,6 +109375,11 @@ entities: - type: Transform pos: -58.5,11.5 parent: 2 + - uid: 4323 + components: + - type: Transform + pos: -61.5,-0.5 + parent: 2 - uid: 4324 components: - type: Transform @@ -109107,11 +109390,26 @@ entities: - type: Transform pos: -56.5,15.5 parent: 2 + - uid: 4564 + components: + - type: Transform + pos: -64.5,-4.5 + parent: 2 - uid: 4575 components: - type: Transform pos: -32.5,-73.5 parent: 2 + - uid: 4582 + components: + - type: Transform + pos: -50.5,0.5 + parent: 2 + - uid: 4583 + components: + - type: Transform + pos: -50.5,-0.5 + parent: 2 - uid: 4612 components: - type: Transform @@ -109232,6 +109530,11 @@ entities: - type: Transform pos: 2.5,-18.5 parent: 2 + - uid: 5949 + components: + - type: Transform + pos: -44.5,4.5 + parent: 2 - uid: 6013 components: - type: Transform @@ -109282,6 +109585,11 @@ entities: - type: Transform pos: -38.5,-1.5 parent: 2 + - uid: 7051 + components: + - type: Transform + pos: -43.5,-1.5 + parent: 2 - uid: 7125 components: - type: Transform @@ -109292,6 +109600,16 @@ entities: - type: Transform pos: 45.5,21.5 parent: 2 + - uid: 7143 + components: + - type: Transform + pos: -60.5,-1.5 + parent: 2 + - uid: 7144 + components: + - type: Transform + pos: -60.5,-3.5 + parent: 2 - uid: 7222 components: - type: Transform @@ -109482,6 +109800,11 @@ entities: - type: Transform pos: -27.5,-15.5 parent: 2 + - uid: 8973 + components: + - type: Transform + pos: -62.5,-0.5 + parent: 2 - uid: 8975 components: - type: Transform @@ -109617,6 +109940,11 @@ entities: - type: Transform pos: 46.5,28.5 parent: 2 + - uid: 10139 + components: + - type: Transform + pos: -64.5,-0.5 + parent: 2 - uid: 10168 components: - type: Transform @@ -109782,6 +110110,21 @@ entities: - type: Transform pos: -45.5,-45.5 parent: 2 + - uid: 10894 + components: + - type: Transform + pos: -44.5,2.5 + parent: 2 + - uid: 10904 + components: + - type: Transform + pos: -63.5,-0.5 + parent: 2 + - uid: 10906 + components: + - type: Transform + pos: -60.5,-0.5 + parent: 2 - uid: 10982 components: - type: Transform @@ -111197,11 +111540,6 @@ entities: - type: Transform pos: 28.5,-24.5 parent: 2 - - uid: 14903 - components: - - type: Transform - pos: -45.5,0.5 - parent: 2 - uid: 14904 components: - type: Transform @@ -111652,11 +111990,6 @@ entities: - type: Transform pos: -44.5,-1.5 parent: 2 - - uid: 15019 - components: - - type: Transform - pos: -44.5,-0.5 - parent: 2 - uid: 15022 components: - type: Transform @@ -111742,11 +112075,6 @@ entities: - type: Transform pos: -45.5,-1.5 parent: 2 - - uid: 15040 - components: - - type: Transform - pos: -45.5,-0.5 - parent: 2 - uid: 15042 components: - type: Transform @@ -111992,11 +112320,6 @@ entities: - type: Transform pos: -8.5,-80.5 parent: 2 - - uid: 15117 - components: - - type: Transform - pos: -60.5,-2.5 - parent: 2 - uid: 15118 components: - type: Transform @@ -112887,11 +113210,6 @@ entities: - type: Transform pos: -58.5,-4.5 parent: 2 - - uid: 15319 - components: - - type: Transform - pos: -59.5,-3.5 - parent: 2 - uid: 15320 components: - type: Transform @@ -112917,11 +113235,6 @@ entities: - type: Transform pos: -54.5,-3.5 parent: 2 - - uid: 15326 - components: - - type: Transform - pos: -59.5,-2.5 - parent: 2 - uid: 15327 components: - type: Transform @@ -113152,11 +113465,6 @@ entities: - type: Transform pos: -61.5,0.5 parent: 2 - - uid: 15374 - components: - - type: Transform - pos: -61.5,-2.5 - parent: 2 - uid: 15375 components: - type: Transform @@ -113262,11 +113570,6 @@ entities: - type: Transform pos: 17.5,-35.5 parent: 2 - - uid: 15397 - components: - - type: Transform - pos: -66.5,-4.5 - parent: 2 - uid: 15398 components: - type: Transform @@ -114427,16 +114730,6 @@ entities: - type: Transform pos: 11.5,20.5 parent: 2 - - uid: 15649 - components: - - type: Transform - pos: -45.5,2.5 - parent: 2 - - uid: 15650 - components: - - type: Transform - pos: -45.5,1.5 - parent: 2 - uid: 15651 components: - type: Transform @@ -114452,21 +114745,11 @@ entities: - type: Transform pos: 30.5,24.5 parent: 2 - - uid: 15654 - components: - - type: Transform - pos: -44.5,1.5 - parent: 2 - uid: 15655 components: - type: Transform pos: 12.5,-36.5 parent: 2 - - uid: 15656 - components: - - type: Transform - pos: -45.5,3.5 - parent: 2 - uid: 15657 components: - type: Transform @@ -114492,16 +114775,6 @@ entities: - type: Transform pos: -28.5,-23.5 parent: 2 - - uid: 15662 - components: - - type: Transform - pos: -44.5,0.5 - parent: 2 - - uid: 15663 - components: - - type: Transform - pos: -44.5,2.5 - parent: 2 - uid: 15664 components: - type: Transform @@ -115857,11 +116130,6 @@ entities: - type: Transform pos: -37.5,4.5 parent: 2 - - uid: 15998 - components: - - type: Transform - pos: -44.5,4.5 - parent: 2 - uid: 15999 components: - type: Transform @@ -115887,16 +116155,6 @@ entities: - type: Transform pos: 3.5,41.5 parent: 2 - - uid: 16004 - components: - - type: Transform - pos: -45.5,4.5 - parent: 2 - - uid: 16005 - components: - - type: Transform - pos: -39.5,2.5 - parent: 2 - uid: 16006 components: - type: Transform @@ -116012,11 +116270,6 @@ entities: - type: Transform pos: 4.5,-14.5 parent: 2 - - uid: 16034 - components: - - type: Transform - pos: -47.5,4.5 - parent: 2 - uid: 16035 components: - type: Transform @@ -117074,6 +117327,16 @@ entities: - type: Transform pos: 32.5,34.5 parent: 2 + - uid: 19979 + components: + - type: Transform + pos: -47.5,-1.5 + parent: 2 + - uid: 19980 + components: + - type: Transform + pos: -46.5,-1.5 + parent: 2 - proto: WallReinforcedDiagonal entities: - uid: 11200 @@ -117093,7 +117356,6 @@ entities: - uid: 350 components: - type: Transform - rot: -1.5707963267948966 rad pos: -2.5,-6.5 parent: 2 - uid: 397 @@ -117136,6 +117398,11 @@ entities: - type: Transform pos: -37.5,8.5 parent: 2 + - uid: 6268 + components: + - type: Transform + pos: 19.5,25.5 + parent: 2 - uid: 6271 components: - type: Transform @@ -117241,6 +117508,11 @@ entities: - type: Transform pos: -36.5,8.5 parent: 2 + - uid: 12378 + components: + - type: Transform + pos: 19.5,24.5 + parent: 2 - uid: 12742 components: - type: Transform @@ -117381,6 +117653,12 @@ entities: - type: Transform pos: -35.5,8.5 parent: 2 + - uid: 14570 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,-9.5 + parent: 2 - uid: 14978 components: - type: Transform @@ -117841,11 +118119,6 @@ entities: - type: Transform pos: -10.5,-11.5 parent: 2 - - uid: 16169 - components: - - type: Transform - pos: -6.5,-2.5 - parent: 2 - uid: 16170 components: - type: Transform @@ -119121,11 +119394,6 @@ entities: - type: Transform pos: -0.5,-20.5 parent: 2 - - uid: 16456 - components: - - type: Transform - pos: 18.5,23.5 - parent: 2 - uid: 16457 components: - type: Transform @@ -119876,20 +120144,10 @@ entities: - type: Transform pos: 12.5,27.5 parent: 2 - - uid: 16637 - components: - - type: Transform - pos: 18.5,24.5 - parent: 2 - - uid: 16638 - components: - - type: Transform - pos: 18.5,25.5 - parent: 2 - uid: 16639 components: - type: Transform - pos: 18.5,26.5 + pos: 19.5,26.5 parent: 2 - uid: 16640 components: @@ -120791,6 +121049,11 @@ entities: - type: Transform pos: -51.5,8.5 parent: 2 + - uid: 20015 + components: + - type: Transform + pos: 19.5,23.5 + parent: 2 - proto: WallSolidDiagonal entities: - uid: 14382 @@ -121268,13 +121531,6 @@ entities: rot: 1.5707963267948966 rad pos: -43.293633,-15.39107 parent: 2 -- proto: WeaponLauncherRocket - entities: - - uid: 6241 - components: - - type: Transform - pos: -41.486843,1.4964085 - parent: 2 - proto: WeaponPistolMk58 entities: - uid: 1198 @@ -121302,6 +121558,18 @@ entities: - type: Transform pos: -44.484955,-13.278492 parent: 2 +- proto: WeaponRifleVulcan + entities: + - uid: 14593 + components: + - type: MetaData + desc: An extremely old Swiss battle rifle. One of only 5000 made. Hits hard, fires slow. + name: SIG PE-Stgw. 57 + - type: Transform + pos: -38.520016,-6.1752872 + parent: 2 + - type: Gun + availableModes: SemiAuto - proto: WeaponSniperCeremonial entities: - uid: 12819 @@ -121309,23 +121577,32 @@ entities: - type: Transform pos: -2.4973116,44.519363 parent: 2 -- proto: WeaponTurretSyndicateBroken +- proto: WeaponTurretAI entities: - - uid: 16901 + - uid: 17488 components: - type: Transform - pos: -4.5,-73.5 + pos: -10.5,-73.5 parent: 2 - - uid: 16902 + - uid: 17580 components: - type: Transform - pos: -10.5,-79.5 + rot: 3.141592653589793 rad + pos: -4.5,-79.5 parent: 2 - - uid: 16903 + - uid: 17816 components: - type: Transform - pos: -10.5,-73.5 + pos: -4.5,-73.5 parent: 2 + - uid: 17824 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,-79.5 + parent: 2 +- proto: WeaponTurretSyndicateBroken + entities: - uid: 16904 components: - type: Transform @@ -121336,11 +121613,6 @@ entities: - type: Transform pos: -10.5,-76.5 parent: 2 - - uid: 16906 - components: - - type: Transform - pos: -4.5,-79.5 - parent: 2 - uid: 16907 components: - type: Transform @@ -121471,11 +121743,11 @@ entities: parent: 2 - proto: WindoorBarLocked entities: - - uid: 16925 + - uid: 16456 components: - type: Transform rot: 1.5707963267948966 rad - pos: -6.5,-3.5 + pos: -6.5,-10.5 parent: 2 - proto: WindoorCargoLocked entities: @@ -122362,13 +122634,17 @@ entities: parent: 2 - proto: WindowDirectional entities: - - uid: 14867 + - uid: 4576 components: - - type: MetaData - desc: In case of emergency, apply hammer to front - name: RPG Access - type: Transform - pos: -41.5,1.5 + rot: 1.5707963267948966 rad + pos: -47.5,0.5 + parent: 2 + - uid: 11084 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,-5.5 parent: 2 - uid: 17089 components: @@ -122393,6 +122669,12 @@ entities: - type: Transform pos: -6.5,13.5 parent: 2 + - uid: 18068 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-5.5 + parent: 2 - proto: WindowReinforcedDirectional entities: - uid: 103 @@ -122418,11 +122700,6 @@ entities: - type: Transform pos: -27.5,53.5 parent: 2 - - uid: 1149 - components: - - type: Transform - pos: -47.5,-0.5 - parent: 2 - uid: 1192 components: - type: Transform @@ -122476,11 +122753,6 @@ entities: rot: -1.5707963267948966 rad pos: 35.5,11.5 parent: 2 - - uid: 10139 - components: - - type: Transform - pos: -46.5,-0.5 - parent: 2 - uid: 10799 components: - type: Transform @@ -124434,21 +124706,27 @@ entities: - type: Transform pos: -46.5,24.5 parent: 2 -- proto: WoodenKegBeer +- proto: WoodenBench entities: - - uid: 11084 + - uid: 7292 components: - type: Transform rot: -1.5707963267948966 rad - pos: -3.5,-5.5 + pos: -63.5,-2.5 parent: 2 -- proto: WoodenKegWine + - uid: 19997 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -65.5,-2.5 + parent: 2 +- proto: WoodenKegBeer entities: - - uid: 12927 + - uid: 5895 components: - type: Transform rot: -1.5707963267948966 rad - pos: -3.5,-6.5 + pos: -3.5,-9.5 parent: 2 - proto: Wrench entities: diff --git a/Resources/Prototypes/Maps/edge.yml b/Resources/Prototypes/Maps/edge.yml index 368a1ea3172d..05d0060219bb 100644 --- a/Resources/Prototypes/Maps/edge.yml +++ b/Resources/Prototypes/Maps/edge.yml @@ -45,7 +45,8 @@ Paramedic: [ 2, 2 ] Psychologist: [ 1, 1 ] MedicalDoctor: [ 2, 3 ] - MedicalIntern: [ 2, 3 ] + MedicalIntern: [ 2, 2 ] + Surgeon: [ 1, 1 ] #science ResearchDirector: [ 1, 1 ] Chaplain: [ 1, 1 ] From a2cd8d5331bd26eeb7733a0e152b614c9b1e0acb Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Sat, 18 Jan 2025 10:34:09 +0100 Subject: [PATCH 164/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 79893308e6aa..e16c21cc09f1 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: deltanedas - changes: - - message: The security shuttle NTSP Bulwark can now be bought at the shipyard. - type: Add - id: 434 - time: '2024-07-21T03:34:43.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1267 - author: Velcroboy changes: - message: Fixed shuttle windows being too easy to deconstruct @@ -3856,3 +3849,11 @@ id: 933 time: '2025-01-18T08:52:36.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2764 +- author: Fox + changes: + - message: Edge's Armory has been expanded and made more secure, and the bar has + been rebuilt! + type: Tweak + id: 934 + time: '2025-01-18T09:33:50.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2662 From 381935353bc4a1c794aac3b33bf74c5c025cf0d5 Mon Sep 17 00:00:00 2001 From: Unkn0wn_Gh0st Date: Sat, 18 Jan 2025 03:35:09 -0600 Subject: [PATCH 165/205] Shoukou Surgery and Admin Assistant (#2725) --- Resources/Maps/shoukou.yml | 344 +++++++++++++++++++++++--- Resources/Prototypes/Maps/shoukou.yml | 27 +- 2 files changed, 324 insertions(+), 47 deletions(-) diff --git a/Resources/Maps/shoukou.yml b/Resources/Maps/shoukou.yml index 87f6bcaa3690..017a57d0d7fa 100644 --- a/Resources/Maps/shoukou.yml +++ b/Resources/Maps/shoukou.yml @@ -2962,7 +2962,8 @@ entities: 0: 3855 2: 36864 -7,-1: - 0: 65291 + 0: 65283 + 4: 8 -7,3: 2: 39417 -7,4: @@ -3014,7 +3015,8 @@ entities: -6,-2: 0: 57309 -6,-5: - 0: 28260 + 0: 27748 + 4: 512 -5,-5: 0: 65535 0,-8: @@ -3065,7 +3067,8 @@ entities: 4,-5: 0: 65535 -4,-8: - 0: 3064 + 0: 2808 + 4: 256 -4,-9: 0: 49147 -5,-8: @@ -3125,7 +3128,8 @@ entities: -6,-6: 0: 28671 -6,-8: - 0: 3726 + 4: 2 + 0: 3724 -6,-9: 0: 61180 -5,-9: @@ -3374,7 +3378,8 @@ entities: 2,-13: 0: 61440 3,-12: - 0: 30479 + 0: 29455 + 4: 1024 3,-11: 0: 61414 3,-10: @@ -3580,7 +3585,8 @@ entities: 2: 13 0: 30578 6,-11: - 0: 61296 + 0: 61040 + 4: 256 6,-10: 0: 61408 6,-9: @@ -3692,7 +3698,8 @@ entities: 0: 15 2: 12032 7,1: - 0: 61695 + 0: 61567 + 9: 128 7,2: 0: 47359 7,3: @@ -3834,7 +3841,8 @@ entities: 9,-11: 0: 65421 9,-10: - 0: 15 + 0: 13 + 4: 2 9,-13: 0: 12919 2: 49288 @@ -3844,9 +3852,11 @@ entities: 2: 15 0: 65280 10,-11: - 0: 65391 + 0: 65135 + 4: 256 10,-10: - 0: 52239 + 0: 52237 + 4: 2 10,-13: 2: 55281 11,-12: @@ -4219,6 +4229,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 21.823984 + - 82.09976 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 chunkSize: 4 - type: OccluderTree - type: Shuttle @@ -6687,13 +6712,6 @@ entities: parent: 2 - proto: AirlockMedicalLocked entities: - - uid: 280 - components: - - type: MetaData - name: surgery room - - type: Transform - pos: 8.5,-28.5 - parent: 2 - uid: 281 components: - type: MetaData @@ -6970,7 +6988,7 @@ entities: pos: 18.5,-7.5 parent: 2 - type: Door - secondsUntilStateChange: -220923.66 + secondsUntilStateChange: -222414.52 state: Opening - type: DeviceLinkSource lastSignals: @@ -7077,6 +7095,13 @@ entities: - type: Transform pos: -14.5,1.5 parent: 2 +- proto: AirlockSurgeryLocked + entities: + - uid: 280 + components: + - type: Transform + pos: 8.5,-28.5 + parent: 2 - proto: AirlockTheatreLocked entities: - uid: 334 @@ -34442,6 +34467,24 @@ entities: - type: Transform pos: -15.5,-29.5 parent: 2 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14673 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - uid: 5083 components: - type: Transform @@ -34452,6 +34495,35 @@ entities: - type: Transform pos: -22.5,-31.5 parent: 2 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14673 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - type: ContainerContainer + containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 10544 + paper_label: !type:ContainerSlot + showEnts: False + occludes: True + ent: null - uid: 5085 components: - type: Transform @@ -34462,16 +34534,70 @@ entities: - type: Transform pos: 14.5,-45.5 parent: 2 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14673 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - uid: 5087 components: - type: Transform pos: -22.5,-17.5 parent: 2 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14673 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - uid: 5088 components: - type: Transform pos: -24.5,-3.5 parent: 2 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14673 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - uid: 5089 components: - type: Transform @@ -34500,11 +34626,47 @@ entities: - type: Transform pos: 37.5,-39.5 parent: 2 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14673 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - uid: 5091 components: - type: Transform pos: 40.5,-41.5 parent: 2 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14673 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - uid: 5092 components: - type: Transform @@ -34632,6 +34794,24 @@ entities: - type: Transform pos: 24.5,-40.5 parent: 2 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14673 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - uid: 5116 components: - type: Transform @@ -34643,6 +34823,24 @@ entities: - type: Transform pos: 41.5,-38.5 parent: 2 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14673 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - uid: 15963 components: - type: Transform @@ -37274,7 +37472,7 @@ entities: pos: 31.5,-36.5 parent: 2 - type: Door - secondsUntilStateChange: -55115.11 + secondsUntilStateChange: -56605.984 state: Closing - uid: 5409 components: @@ -40907,6 +41105,13 @@ entities: - type: Transform pos: -55.40976,-1.432474 parent: 2 +- proto: DrinkJuiceAppleJuicebox + entities: + - uid: 16029 + components: + - type: Transform + pos: 33.709957,-34.81473 + parent: 2 - proto: DrinkLithiumFlask entities: - uid: 15030 @@ -44622,6 +44827,13 @@ entities: - type: Transform pos: 33.450184,-29.531673 parent: 2 +- proto: FoodBurgerMcrib + entities: + - uid: 16028 + components: + - type: Transform + pos: 33.163082,-34.986607 + parent: 2 - proto: FoodButter entities: - uid: 15573 @@ -69999,8 +70211,8 @@ entities: immutable: False temperature: 293.14673 moles: - - 1.8968438 - - 7.1357465 + - 1.8977377 + - 7.139109 - 0 - 0 - 0 @@ -70017,8 +70229,8 @@ entities: showEnts: False occludes: True ents: - - 10083 - 10082 + - 10083 paper_label: !type:ContainerSlot showEnts: False occludes: True @@ -70553,11 +70765,6 @@ entities: - type: Transform pos: 31.5,-8.5 parent: 2 - - uid: 15950 - components: - - type: Transform - pos: 34.5,-6.5 - parent: 2 - proto: HolopadSecurityBrig entities: - uid: 15932 @@ -71629,6 +71836,13 @@ entities: - Pressed: Toggle 11663: - Pressed: Toggle +- proto: LockerAdministrativeAssistantFilled + entities: + - uid: 16021 + components: + - type: Transform + pos: 45.5,-31.5 + parent: 2 - proto: LockerAtmosphericsFilled entities: - uid: 10039 @@ -71951,6 +72165,13 @@ entities: - type: Transform pos: 22.5,-20.5 parent: 2 +- proto: LockerSurgeonFilled + entities: + - uid: 16023 + components: + - type: Transform + pos: 10.5,-29.5 + parent: 2 - proto: LockerWallMedicalDoctorFilled entities: - uid: 10090 @@ -72045,6 +72266,13 @@ entities: - type: Transform pos: 33.5,-9.5 parent: 2 +- proto: LunchboxEngineering + entities: + - uid: 16027 + components: + - type: Transform + pos: 33.26244,-34.56473 + parent: 2 - proto: LunchboxEpistemics entities: - uid: 10097 @@ -81476,13 +81704,6 @@ entities: - type: Transform pos: 17.5,-37.5 parent: 2 -- proto: SecureCabinetCommand - entities: - - uid: 10544 - components: - - type: Transform - pos: 45.5,-31.5 - parent: 2 - proto: SecureCabinetMantis entities: - uid: 4636 @@ -81959,6 +82180,14 @@ entities: - 15317 - 15319 - 15318 +- proto: ShellShotgun + entities: + - uid: 16020 + components: + - type: Transform + parent: 10544 + - type: Physics + canCollide: False - proto: Shinai entities: - uid: 11616 @@ -84694,6 +84923,13 @@ entities: - type: Transform pos: -27.5,-17.5 parent: 2 +- proto: SpawnPointAdminAssistant + entities: + - uid: 16024 + components: + - type: Transform + pos: 45.5,-34.5 + parent: 2 - proto: SpawnPointAtmos entities: - uid: 11962 @@ -85678,6 +85914,13 @@ entities: - type: Transform pos: -32.5,-30.5 parent: 2 +- proto: SpawnPointSurgeon + entities: + - uid: 16022 + components: + - type: Transform + pos: 10.5,-27.5 + parent: 2 - proto: SpawnPointTechnicalAssistant entities: - uid: 12123 @@ -90555,6 +90798,11 @@ entities: - type: Transform pos: 7.466408,-39.151566 parent: 2 + - uid: 16026 + components: + - type: Transform + pos: 34.215565,-34.06473 + parent: 2 - proto: ToolboxMechanicalFilled entities: - uid: 12084 @@ -90739,6 +90987,13 @@ entities: - type: Transform pos: 3.415373,10.654667 parent: 2 +- proto: ToyNuke + entities: + - uid: 16025 + components: + - type: Transform + pos: 36.02102,-43.760437 + parent: 2 - proto: ToyRenault entities: - uid: 11803 @@ -100703,12 +100958,31 @@ entities: - uid: 10082 components: - type: MetaData - desc: The iconic sidearm of the NT's finest. Uses .45 magnum ammo. + desc: The iconic sidearm of the NT's finest. It has the HOS's name carved in the grip... when did they get such a beautiful revovler. Uses .45 magnum ammo. - type: Transform parent: 9899 - type: Physics canCollide: False - type: InsideEntityStorage +- proto: WeaponShotgunHandmade + entities: + - uid: 10544 + components: + - type: Transform + parent: 5084 + - type: BallisticAmmoProvider + entities: + - 16020 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + showEnts: False + occludes: True + ents: + - 16020 + - type: Physics + canCollide: False + - type: InsideEntityStorage - proto: WeaponTurretSyndicateBroken entities: - uid: 14458 diff --git a/Resources/Prototypes/Maps/shoukou.yml b/Resources/Prototypes/Maps/shoukou.yml index cbdd70c452ab..6c76b9ad9a54 100644 --- a/Resources/Prototypes/Maps/shoukou.yml +++ b/Resources/Prototypes/Maps/shoukou.yml @@ -17,8 +17,11 @@ emergencyShuttlePath: /Maps/_DV/Shuttles/NTES_Kaeri.yml - type: StationJobs availableJobs: + #Command + Captain: [ 1, 1 ] + AdministrativeAssistant: [ 1, 1 ] #Service - Passenger: [ -1, -1 ] + HeadOfPersonnel: [ 1, 1 ] Librarian: [ 1, 1 ] ServiceWorker: [ 1, 2 ] Reporter: [ 0, 1 ] @@ -30,40 +33,40 @@ Janitor: [ 1, 2 ] Musician: [ 1, 1 ] Mime: [ 1, 1 ] - Captain: [ 1, 1 ] - HeadOfPersonnel: [ 1, 1 ] + Passenger: [ -1, -1 ] #Justice ChiefJustice: [ 1, 1 ] - Lawyer: [ 1, 1 ] Clerk: [ 1, 1 ] + Lawyer: [ 1, 1 ] Prosecutor: [ 1, 1 ] #Engineering ChiefEngineer: [ 1, 1 ] + AtmosphericTechnician: [ 1, 2 ] StationEngineer: [ 2, 5 ] TechnicalAssistant: [ 2, 3 ] - AtmosphericTechnician: [ 1, 2 ] #Medical ChiefMedicalOfficer: [ 1, 1 ] Paramedic: [ 1, 2 ] - MedicalDoctor: [ 3, 3 ] Chemist: [ 1, 2 ] - MedicalIntern: [ 2, 3 ] Psychologist: [ 1, 1 ] + Surgeon: [ 1, 1 ] + MedicalDoctor: [ 3, 3 ] + MedicalIntern: [ 2, 3 ] #Security HeadOfSecurity: [ 1, 1 ] - SecurityOfficer: [ 2, 4 ] - Detective: [ 1, 1 ] Warden: [ 1, 1 ] - SecurityCadet: [ 1, 3 ] + Detective: [ 1, 1 ] Brigmedic: [ 1, 1 ] + SecurityOfficer: [ 2, 4 ] + SecurityCadet: [ 1, 3 ] Prisoner: [ 2, 2 ] #Science ResearchDirector: [ 1, 1 ] Roboticist: [ 1, 1 ] - Scientist: [ 2, 4 ] - ResearchAssistant: [ 2, 3 ] Chaplain: [ 1, 1 ] ForensicMantis: [ 1, 1 ] + Scientist: [ 2, 4 ] + ResearchAssistant: [ 2, 3 ] #Logistics Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 2, 4 ] From 05ba244f87df17a2ba80226d834e27424ae15310 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Sat, 18 Jan 2025 10:35:29 +0100 Subject: [PATCH 166/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index e16c21cc09f1..b11d797a3c93 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Velcroboy - changes: - - message: Fixed shuttle windows being too easy to deconstruct - type: Fix - id: 435 - time: '2024-07-21T16:15:05.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1519 - author: deltanedas changes: - message: Fixed Senior Researcher's PDA not having the Glimmer Monitor program. @@ -3857,3 +3850,10 @@ id: 934 time: '2025-01-18T09:33:50.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2662 +- author: Unkn0wnGh0st333 + changes: + - message: Shoukou now has a certified surgeon position and an admin assistant. + type: Tweak + id: 935 + time: '2025-01-18T09:35:10.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2725 From ef5513104ae9b1dd5037a592ea5865d8c50bfb33 Mon Sep 17 00:00:00 2001 From: Michelle Szinger Date: Sat, 18 Jan 2025 04:56:07 -0700 Subject: [PATCH 167/205] Allow tying jumpsuits around waists (Impstation port) (#2742) * Add foldable uniform jumpsuit base component Initial work on porting impstation/imp-station-14#375. Component gets the Impstation suffix to not conflict with the existing DeltaV component for rolled-up sleeves on some security uniforms. * Add folded jumpsuit sprites for (some) upstream jumpsuits Once again ported from impstation/imp-station-14#375. Only some of our many, many jumpsuits are affected, and all of them are in the default namespace. Some of these sprites aren't even used because our own (unmodified) _DV sprites take priority, so there is a lot of cleanup to be done. * Make (some) jumpsuits foldable Still porting impstation/imp-station-14#375. Notable jumpsuits NOT made foldable include: - The Salvage Specialist and HoP jumpsuits, which use _DV sprites at the moment. - Numerous security jumpsuits (due to rollable sleeves). - Pretty much all the colored jumpsuits for some reason. - The prisoner jumpsuit (this one in particular feels like a huge oversight). - All DeltaV-, Nyano-, EE-, and Impstation-specific jumpsuits. - Several seemingly random upstream jumpsuits including the reporter's jumpsuit and all variant bartender uniforms. - All skirts. Uncertain at this time whether to let those come in a separate PR. --- .../components/foldable-component.ftl | 2 + .../Clothing/Uniforms/color_jumpsuits.yml | 2 +- .../Entities/Clothing/Uniforms/jumpsuits.yml | 60 +++++++++--------- .../Uniforms/base_clothinguniforms.yml | 10 +++ .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 776 bytes .../Uniforms/Jumpsuit/ancient.rsi/meta.json | 6 +- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 802 bytes .../Uniforms/Jumpsuit/atmos.rsi/meta.json | 6 +- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 788 bytes .../Jumpsuit/atmos_casual.rsi/meta.json | 6 +- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 825 bytes .../Uniforms/Jumpsuit/bartender.rsi/meta.json | 6 +- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 1014 bytes .../Uniforms/Jumpsuit/brigmedic.rsi/meta.json | 6 +- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 962 bytes .../Uniforms/Jumpsuit/captain.rsi/meta.json | 6 +- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 704 bytes .../Uniforms/Jumpsuit/cargotech.rsi/meta.json | 6 +- .../ce.rsi/folded-equipped-INNERCLOTHING.png | Bin 0 -> 889 bytes .../Uniforms/Jumpsuit/ce.rsi/meta.json | 6 +- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 727 bytes .../Uniforms/Jumpsuit/chaplain.rsi/meta.json | 6 +- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 873 bytes .../Uniforms/Jumpsuit/chemistry.rsi/meta.json | 6 +- .../cmo.rsi/folded-equipped-INNERCLOTHING.png | Bin 0 -> 902 bytes .../Uniforms/Jumpsuit/cmo.rsi/meta.json | 6 +- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 869 bytes .../Uniforms/Jumpsuit/detective.rsi/meta.json | 6 +- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 1004 bytes .../Jumpsuit/detective_grey.rsi/meta.json | 6 +- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 793 bytes .../Jumpsuit/engineering.rsi/meta.json | 6 +- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 876 bytes .../Jumpsuit/engineering_hazard.rsi/meta.json | 6 +- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 623 bytes .../Uniforms/Jumpsuit/flannel.rsi/meta.json | 6 +- .../hop.rsi/folded-equipped-INNERCLOTHING.png | Bin 0 -> 738 bytes .../Uniforms/Jumpsuit/hop.rsi/meta.json | 6 +- .../hos.rsi/folded-equipped-INNERCLOTHING.png | Bin 0 -> 834 bytes .../Uniforms/Jumpsuit/hos.rsi/meta.json | 6 +- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 820 bytes .../Uniforms/Jumpsuit/hos_alt.rsi/meta.json | 6 +- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 946 bytes .../Uniforms/Jumpsuit/hydro.rsi/meta.json | 6 +- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 971 bytes .../Uniforms/Jumpsuit/janitor.rsi/meta.json | 6 +- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 859 bytes .../Uniforms/Jumpsuit/medical.rsi/meta.json | 6 +- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 711 bytes .../Uniforms/Jumpsuit/ninja.rsi/meta.json | 6 +- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 882 bytes .../Uniforms/Jumpsuit/paramedic.rsi/meta.json | 6 +- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 853 bytes .../Jumpsuit/psychologist.rsi/meta.json | 6 +- .../qm.rsi/folded-equipped-INNERCLOTHING.png | Bin 0 -> 902 bytes .../Uniforms/Jumpsuit/qm.rsi/meta.json | 6 +- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 1048 bytes .../Uniforms/Jumpsuit/rainbow.rsi/meta.json | 6 +- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 784 bytes .../Jumpsuit/roboticist.rsi/meta.json | 6 +- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 871 bytes .../Uniforms/Jumpsuit/salvage.rsi/meta.json | 6 +- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 919 bytes .../Uniforms/Jumpsuit/scientist.rsi/meta.json | 6 +- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 855 bytes .../Jumpsuit/scientist_formal.rsi/meta.json | 6 +- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 790 bytes .../Uniforms/Jumpsuit/security.rsi/meta.json | 6 +- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 958 bytes .../Jumpsuit/security_blue.rsi/meta.json | 6 +- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 812 bytes .../Jumpsuit/security_grey.rsi/meta.json | 6 +- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 886 bytes .../Jumpsuit/senior_engineer.rsi/meta.json | 6 +- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 876 bytes .../Jumpsuit/senior_officer.rsi/meta.json | 6 +- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 912 bytes .../Jumpsuit/senior_physician.rsi/meta.json | 6 +- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 957 bytes .../Jumpsuit/senior_researcher.rsi/meta.json | 6 +- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 833 bytes .../Uniforms/Jumpsuit/warden.rsi/meta.json | 6 +- 82 files changed, 238 insertions(+), 70 deletions(-) create mode 100644 Resources/Locale/en-US/_Impstation/foldable/components/foldable-component.ftl create mode 100644 Resources/Prototypes/_Impstation/Entities/Clothing/Uniforms/base_clothinguniforms.yml create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/folded-equipped-INNERCLOTHING.png diff --git a/Resources/Locale/en-US/_Impstation/foldable/components/foldable-component.ftl b/Resources/Locale/en-US/_Impstation/foldable/components/foldable-component.ftl new file mode 100644 index 000000000000..406867d4dfb3 --- /dev/null +++ b/Resources/Locale/en-US/_Impstation/foldable/components/foldable-component.ftl @@ -0,0 +1,2 @@ +fold-verb-clothing-jacket = Take off jacket +unfold-verb-clothing-jacket = Put on jacket diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpsuits.yml index 7a44409079bb..f4f2600f1973 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpsuits.yml @@ -492,7 +492,7 @@ # Rainbow Jumpsuit - type: entity - parent: ClothingUniformBase + parent: [ ClothingUniformBase, ClothingUniformFoldableBaseImpstation ] # imp - Add foldable uniform jumpsuits id: ClothingUniformColorRainbow name: rainbow jumpsuit description: A multi-colored jumpsuit! diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index cdfdf486a8af..64af043c2b99 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -10,7 +10,7 @@ sprite: Clothing/Uniforms/Jumpsuit/deathsquad.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitAncient name: ancient jumpsuit description: A terribly ragged and frayed grey jumpsuit. It looks like it hasn't been washed in over a decade. @@ -21,7 +21,7 @@ sprite: Clothing/Uniforms/Jumpsuit/ancient.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitBartender name: bartender's uniform description: A nice and tidy uniform. Shame about the bar though. @@ -58,7 +58,7 @@ sprite: Clothing/Uniforms/Jumpsuit/bartender_purple.rsi - type: entity - parent: [ClothingUniformBase, BaseCommandContraband] + parent: [ClothingUniformBase, BaseCommandContraband, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitCaptain name: captain's jumpsuit description: It's a blue jumpsuit with some gold markings denoting the rank of "Captain". @@ -69,7 +69,7 @@ sprite: Clothing/Uniforms/Jumpsuit/captain.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitCargo name: cargo tech jumpsuit description: A sturdy jumpsuit, issued to members of the Logistics department. # DeltaV - Logistics Department replacing Cargo @@ -91,7 +91,7 @@ sprite: _DV/Clothing/Uniforms/Jumpsuit/explorer.rsi # DeltaV - Salvage better looking uniform - type: entity - parent: [ClothingUniformBase, BaseCommandContraband] + parent: [ClothingUniformBase, BaseCommandContraband, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitChiefEngineer name: chief engineer's jumpsuit description: It's a high visibility jumpsuit given to those engineers insane enough to achieve the rank of Chief Engineer. @@ -113,7 +113,7 @@ sprite: Clothing/Uniforms/Jumpsuit/ce_turtle.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitChaplain name: chaplain's jumpsuit description: It's a black jumpsuit, often worn by religious folk. @@ -168,7 +168,7 @@ sprite: Clothing/Uniforms/Jumpsuit/chef.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitChemistry name: chemistry jumpsuit description: There's some odd stains on this jumpsuit. Hm. @@ -253,7 +253,7 @@ sprite: Clothing/Uniforms/Jumpsuit/jester2.rsi - type: entity - parent: [ClothingUniformBase, BaseCommandContraband] + parent: [ClothingUniformBase, BaseCommandContraband, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitCMO name: chief medical officer's jumpsuit description: It's a jumpsuit worn by those with the experience to be Chief Medical Officer. It provides minor biological protection. @@ -275,7 +275,7 @@ sprite: Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitDetective name: hard-worn suit description: Someone who wears this means business. @@ -286,7 +286,7 @@ sprite: Clothing/Uniforms/Jumpsuit/detective.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitDetectiveGrey name: noir suit description: A hard-boiled private investigator's grey suit, complete with tie clip. @@ -297,7 +297,7 @@ sprite: Clothing/Uniforms/Jumpsuit/detective_grey.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitEngineering name: engineering jumpsuit description: If this suit was non-conductive, maybe engineers would actually do their damn job. @@ -308,7 +308,7 @@ sprite: Clothing/Uniforms/Jumpsuit/engineering.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitEngineeringHazard name: hazard jumpsuit description: Woven in a grungy, warm orange. Lets others around you know that you really mean business when it comes to work. @@ -341,7 +341,7 @@ sprite: _DV/Clothing/Uniforms/Jumpsuit/hos.rsi # DeltaV - resprite - type: entity - parent: [ClothingUniformBase, BaseCommandContraband] + parent: [ClothingUniformBase, BaseCommandContraband, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitHoSAlt name: head of security's turtleneck description: It's a turtleneck worn by those strong and disciplined enough to achieve the position of Head of Security. @@ -385,7 +385,7 @@ sprite: Clothing/Uniforms/Jumpsuit/hos_parade.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitHydroponics name: hydroponics jumpsuit description: Has a strong earthy smell to it. Hopefully it's merely dirty as opposed to soiled. @@ -396,7 +396,7 @@ sprite: Clothing/Uniforms/Jumpsuit/hydro.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitJanitor name: janitor jumpsuit description: The jumpsuit for the poor sop with a mop. @@ -418,7 +418,7 @@ sprite: Clothing/Uniforms/Jumpsuit/kimono.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitMedicalDoctor name: medical doctor jumpsuit description: It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel. @@ -440,7 +440,7 @@ sprite: Clothing/Uniforms/Jumpsuit/mime.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitParamedic name: paramedic jumpsuit description: It's got a plus on it, that's a good thing right? @@ -501,7 +501,7 @@ - WhitelistChameleon - type: entity - parent: [ClothingUniformBase, BaseCommandContraband] + parent: [ClothingUniformBase, BaseCommandContraband, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitQM name: logistics officer's jumpsuit # DeltaV - Logistics Department replacing Cargo description: 'What can brown do for you?' @@ -547,7 +547,7 @@ sprite: Clothing/Uniforms/Jumpsuit/rnd.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitScientist name: scientist jumpsuit description: It's made of a special fiber that increases perceived intelligence and decreases personal ethics. It has markings that denote the wearer as a scientist. @@ -558,7 +558,7 @@ sprite: Clothing/Uniforms/Jumpsuit/scientist.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitScientistFormal name: scientist's formal jumpsuit description: A uniform for sophisticated scientists, best worn with its matching tie. @@ -569,7 +569,7 @@ sprite: Clothing/Uniforms/Jumpsuit/scientist_formal.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitRoboticist name: roboticist jumpsuit description: It's a slimming black with reinforced seams; great for industrial work. @@ -826,7 +826,7 @@ sprite: Clothing/Uniforms/Jumpsuit/mercenary.rsi - type: entity - parent: UnsensoredClothingUniformBase + parent: [UnsensoredClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitNinja name: ninja jumpsuit description: Comfortable ninja suit, for convenience when relaxing and when you need to practice. @@ -837,7 +837,7 @@ sprite: Clothing/Uniforms/Jumpsuit/ninja.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitAtmos name: atmospheric technician jumpsuit description: I am at work. I can't leave work. Work is breathing. I am testing air quality. @@ -848,7 +848,7 @@ sprite: Clothing/Uniforms/Jumpsuit/atmos.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitAtmosCasual name: atmospheric technician's casual jumpsuit description: Might as well relax with a job as easy as yours. @@ -859,7 +859,7 @@ sprite: Clothing/Uniforms/Jumpsuit/atmos_casual.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitPsychologist name: psychologist suit description: I don't lose things. I place things in locations which later elude me. @@ -1105,7 +1105,7 @@ sprite: Clothing/Uniforms/Jumpsuit/syndieformal.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitFlannel name: flannel jumpsuit description: Smells like someones been grillin'. @@ -1116,7 +1116,7 @@ sprite: Clothing/Uniforms/Jumpsuit/flannel.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitSeniorEngineer name: senior engineer jumpsuit description: A sign of skill and prestige within the engineering department. @@ -1127,7 +1127,7 @@ sprite: Clothing/Uniforms/Jumpsuit/senior_engineer.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitSeniorResearcher name: senior researcher jumpsuit description: A sign of skill and prestige within the epistemics department. # DeltaV - Epistemics Department replacing Science @@ -1138,7 +1138,7 @@ sprite: Clothing/Uniforms/Jumpsuit/senior_researcher.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitSeniorPhysician name: senior physician jumpsuit description: A sign of skill and prestige within the medical department. @@ -1149,7 +1149,7 @@ sprite: Clothing/Uniforms/Jumpsuit/senior_physician.rsi - type: entity - parent: [ClothingUniformBase, BaseRestrictedContraband] + parent: [ClothingUniformBase, BaseRestrictedContraband, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitSeniorOfficer name: senior officer jumpsuit description: A sign of skill and prestige within the security department. diff --git a/Resources/Prototypes/_Impstation/Entities/Clothing/Uniforms/base_clothinguniforms.yml b/Resources/Prototypes/_Impstation/Entities/Clothing/Uniforms/base_clothinguniforms.yml new file mode 100644 index 000000000000..5e1ff2e5446f --- /dev/null +++ b/Resources/Prototypes/_Impstation/Entities/Clothing/Uniforms/base_clothinguniforms.yml @@ -0,0 +1,10 @@ +- type: entity + abstract: true + id: ClothingUniformFoldableBaseImpstation # Impstation suffix because DV already has its own ClothingUniformFoldableBase + components: + - type: Foldable + canFoldInsideContainer: true + unfoldVerbText: unfold-verb-clothing-jacket + foldVerbText: fold-verb-clothing-jacket + - type: FoldableClothing + foldedEquippedPrefix: folded diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..abfb30f06190738cd11c35e75b29c24fb97ea264 GIT binary patch literal 776 zcmV+j1NZ!iP)KokbxpPLJ!2uuwITV!i!2xbfh0dIg9!y8mr zV|arK-hdSt48f4CSqpXyrlus-z2fdP-KEQN3T5w2&X*8q2hKS&ohf1pFvb{Tj4{R- zV~nw{d7hWv)BZ2|{nG{9N=liUriuA{UMp(XgC9i^f*>gTPLW^KLUf|9-k-_yyi~u+ z#vspt(P#t!sbLuKeLodKz%Y!bbl!2C4+H&POJ==ZlVjdI13b@5bwa~1AcOz_ESF0F zfMr<_LcsU^N(aMn9E?Vzi_YsdD)JK8ZnqFZV7uKyDTU#12&EK`$0IrUqnu7BoKB}w zzrA@0L{W5+#C2V4HX8uQ2Bj)N5Y$Z5OdZE5?5wVXasvcP{tJBW=x{g$04Sx<>2%73 zyxH5^+lS*QiU0soO1!+hkmHe-z-F_75CWEEK`BK}_6Xzg7?x!L0Os>~%`{C627}V^ zZXSRj2x|GO+v#*Lo6RoH`Myt@f*L5+OOtNFWQyYe1_N+jabmx1$9sr=-ZhvTx zh*f1cmKTi94P?o_j~mF{k!6kXFy)F+5BACQ{;2y zYbc}i0344;>~=de8jYuRUJHVt)@U@a+wFez2{p$4bAJF?j52@(3h>1M0000O|Dx6xkV6n5!e$D1nBjf zB)8ZZBN%jdJBQ+2Y-d5!X~6V!yNwDKR3SXZvc)?&jg`H``5fR_7&Zr3@T5 zSbZ3H2iRFqX*@E}dyfGC&-39i6)ZTyOy?9phZ=rYzL={QpM{V95!0K<+89{DvKW zV5K!Ex0s<|&1#j-wX1$?wy)#dmo))_V9@Itn3x3a-1Lw0zcqUca(VkrtZM-92OKQO zs}%!dFC730J_4qvvE%>`ANT_wHPh3WePSRrW#HfxFc+aFCjI`zHSh!sy0y4l@S?F_ zg0+qCzquF=Hrk$~FCTieyUnvt^uc}yR6lhdA2on#qjfMIs}C%d?cgh`01ys6g~QLS zrYp(E7eWXjgb+dqA%qY@2qDnQ-RE@j6(Tu3R6Rg9Ru;!Cf?mA41ps(G|E=Sk>1p8F zBs)LPlG7B#a8sQ*z-Ygs37dXciIMtVIB+vfpqVg^t1Xzvtw~5qWbo1Y0JTYQW>ve7 z9PHGXsmd_ZXYWA!!~zyF$>jzYGOAbhIe(jwzglMBGFEyV0BA{>%@fz6U^u zG09O-oAF)??A7Wnh6;)#N;k@|e`FHR4%=B!5Gz`s5g1K&I;UxC6-2*4TdS?ow70}A zQHvuQE82&+U!d5J003-n0AIhiI#yL9nf=lllnq5d7<(A!Rwy~j!ie*X73)UbTm7P{ gLM}@`g!qsB0eU(V_K86(-v9sr07*qoM6N<$g5yVRlmGw# literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json index 1ec7ec28283d..0f70cc89c89e 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/tgstation/tgstation/commit/beaea876ea426c0e215cee64619862dc19bd9cd8, monkey made by brainfood1183 (github)", + "copyright": "https://github.com/tgstation/tgstation/commit/beaea876ea426c0e215cee64619862dc19bd9cd8, monkey made by brainfood1183 (github) | Folded version taken from tgstation (https://github.com/tgstation/tgstation/blob/5ed5566dbf09507cb99768faa696f8c3f8f65660/icons/mob/uniform.dmi) and edited by Pinkbat5 (github)", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..e8eb209150b97ef742750b90fb7b1d87a4166dd2 GIT binary patch literal 788 zcmV+v1MB>WP)!487B2yLKKC<^HiBpsy1rAwBWLkiJ?g9<`EhnHL~jj8$Wa%t7? z2ak8}`yTK6?tAy%J@_6V2!bF8f*=TjAP9mWj3#>z6hwa(nc;NqoL7PLL9mkQ|K$B(MVDb!1c>DrSL(+P%_+I|=8wKG=y4kO0~BB4C2-cnY{sB-`zg<_+2tBL&895NePXMHze?>+G4#5mZ`Ndbzg za|UkS9@alzRGxn0!`=e`0DJEM0EZ4h>$$#s@fq6zE|r=>r8X>IULiLK99RMP^jU${ zbJ*De_78xJ4Rt9Bx_%A6os}?HUZDZ|c}v^(%h-EB*fV=tus6Y-EuMVROxiwc3C#Q; zY`-0p9Xi0a)76K35H{{;ft zMxzY09c?=x6FCTFkJ7-BF}=mOWT@=XWUk}+a{Bmf%qK7XjT4l!;)fvo#ry*8eiTt0 SqVE0x0000q$gGRCt{2+P_O1VHgMSZ_2r-ga1Q9Vh}D^$Zi-js!ieMH8*DMZ!4AF3b(ltv4jl;e0c1Z7<(-ZT&=c&WCn!ars;o=Qm@uiV6dZ&MgxXnU}R(jXJ=>l_$j_Y__}KW z2-feNJ+)d5H#axrI!ObtySE3&ap1Zxq?AaevgCkKec%7)$G^C^NK8&nDsKXG41EUJ zww-7+8vg%=VT3-D?|V+aROCbOxw)=O`uri}GaziANhu+v)M@}#Se&Pd%@|{hF~%5U zj4{R-V~qVHgivv3hU17s$_oe~RJ~ru^2+L+vbNJiu~-BEMNLpr;uniWn5G$eA>-%K z59ITCQi7D67+GFf4dmv%Ozlbae}*vdB&K0}kfo z2OAOB?BA~2i#gbi+*F#Ju#I#{>ZE$w|D$^9Zvor3qg44IZwm}whtati;vvu0?Y(z+ zu#cIU8NXq1t^go-4xFE#jA)%%s$|s0}23oy>KMgq~+1!!N8kWxNd=LchUyIsB?z?i|(Gh|aM5$nkbwwELqUbtW$I9HGb6JVn3%9O}fxa}!oGx>VIPG__u?KSCmMb#0r3g&uWNLt(4 z4fEwxhjIn%-noO5=X;Hl=X-Jcwj1_!uG#E)C*_z`S8Yv^-?=@2-mfd^%s2tf$6Jiu zJ9k*?f}%A{B<>P9++?kLKH1L)`!I$t|CDhFs^a(hcw@zDX=O$3x0LlM9f7e2PuLPV zWCdSdm`C`dFy)1L1YCcU82(e)fow1}InC7Mw4>ixp^XPWu%KUUjJG8gguQP&`!L-31YiY5rQ_<__F3|khF#w)TPE%I4 znP6qml5MGYkM46_PSj?^h2JiutZ&}91whUAT7JLutFk_&Bk=XN-}7_pryM=fM9J!6 z0G2Jy17?oLLJ+JB608i898Gfc<3`QpTF$`(^%NDo$)iV)mGxzufG^rU*Gg6wlSqsJ zFfceoXS74Rdv6ecL}G-3{QNoZ)7c<7nzZb%EL;g-1)WHY;BqZj)~Qqhc4Gzk`PTQQ zQxi|0Dm&oResVNv*|cwpDoVT6?I|+=uKx85fD^al+M%@@41o7vT?Rmv{zuL#V6p8B zf*=TjAP9mW2!bF8f*=UOe}uwyhC5K3^BDnmpw#}A?=^1(`TxZ<6ah>X#U9)6u zzg(eURWTFyhZw$iE+^0C-GN%ev=RBxJ4^oK4_&NVzfq|{s@xo{uGy6`m|*V-nn}nN z_Tc?qAHb|x0o4HsrPi3I)MFVQd+@{x-tI)a>qO2vGj`pkO}ig{uMbbDM@i=k4M|

0uO)4mCS za(7yJN~|GLuj&0dey?xVkkVpMU9}az*N5J(J8I1AkifyALoP@6!T% z_R`aPEyV{XvjN~R0Rw|WR!=^5HpaG!O$!pd$#}d^+g7oO*x48`GcVv|HUJ#_2LQY* kJ^6I=0*m2?ApDQ{7k3DNN-R07*qoM6N<$g5{CuAOHXW literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/meta.json index d2d511d51725..2a68c2d38488 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by PuroSlavKing (github) for SS14 | Resprited by Hülle#2562 (Discord), monkey made by brainfood1183 (github) for ss14", + "copyright": "Made by PuroSlavKing (github) for SS14 | Resprited by Hülle#2562 (Discord), monkey made by brainfood1183 (github) for ss14 | Folded version taken from tgstation (https://github.com/tgstation/tgstation/blob/5ed5566dbf09507cb99768faa696f8c3f8f65660/icons/mob/uniform.dmi) spritework and edited by Pinkbat5 (github)", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..f8e1e2fa0f12f8bb6b8769feba3b7a475e008724 GIT binary patch literal 962 zcmV;z13mnSP)I9W>yzxVH!-w$AnF~%5Uj4{R-V~6V>&WU!~|3*E3I)GNilcvx#4co<8rCEEp_(X*2 zYQE`rnu*B<5)O3OXE*f^=S27ywGZhNU>F8$|8P!(13pM^VCTg}SlIy1n`v0t06Q-(V#>`Ro-{jp5_DaM zVHgdQ58Gr(UxB5iB}};)^xRs;`1B|24w)FA{)C=e%P2msV&S25mu>TXAHMHL`fbZs zfQaDxJ{BIvkV;qa?D;o5dV3w4`Bwmd(Y`GhH(p^t>x~r1QL3wX#nm*S>w444mP)1C z_hkB&eh1vPzFYBin6D=Eo|yHc|hKhyd(uz|*?} zxN=9XPpJhcl}Z@x>xD;w+$hH=qd4#=fJXs7f89_9&z}{08xZZ}wR~Z#t9ixB)=zx( z^~<{BHZxagcy^p-<|=KqHzWPVI&Am5bt;Z~e5or?cKxOUh0n@vv^Vj;GCpIBF~%5U zj4{R-V~jEOOFU_c#mSM5*9a_5j)>#TKuhHX;z?7S`t||4LuNzUgY*Vc>8n_rgt&6& zT}QG*i<2WFmA(KgTY#lC7DdF?^7wx4l2n3JIyt&KWY*>8!%VI99>7Ea_r|UQcqiL! zOH%0zcrsCd_5N(F7C=?iTDuJZzmlb`lG>^M;hfNQ9jdCBo?^*K?5wL*qr zG{oThK3vy5w2r8mwu+=&*R6e$2q>`iC#aYF5UD&o=n|wxbKtxC+ z5|M+Dl}IE&M93(6bqM=olG%MALUwq&IIG0g^2jI-=Er`gqZ3{MDP>)@J83Cp9SN^c z`+t6{f{fxIww9NkJP=_4fW4}agF$%|ps?a}^!@`tVZ~8A3K|ysU`(xw{0{Iaz|33) z9tE(=TiEb%707*qoM6N<$g1I)wCIA2c literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json index 6eb08f0f320f..7d838fc3a1a1 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "monkey derivative derived by brainfood1183 (github) for ss14 from tgstation at commit https://github.com/tgstation/tgstation/commit/dd97a0e45d904fffadd9d2caad22aedd0d09f3ab then edited by Skarletto (github). Other sprites taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 and edited by Skarletto (github), edited by Emisse for ss14", + "copyright": "monkey derivative derived by brainfood1183 (github) for ss14 from tgstation at commit https://github.com/tgstation/tgstation/commit/dd97a0e45d904fffadd9d2caad22aedd0d09f3ab then edited by Skarletto (github). Other sprites taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 and edited by Skarletto (github), edited by Emisse for ss14 | Folded version taken from tgstation (https://github.com/tgstation/tgstation/blob/5ed5566dbf09507cb99768faa696f8c3f8f65660/icons/mob/uniform.dmi) spritework and edited by Pinkbat5 (github)", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..3241a0829112f1f0599635dcbc9a26504767213d GIT binary patch literal 704 zcmV;x0zdtUP)%q2@mrYi6g7Yt@u?Gq<%?o~j7IK&wsBTbm-M0s5ykoDKy%Pq_AlQjG(y!U&* zzSjJH0Aq|X#u#IaF~%4>ZP2YJe{=p{^z5kvD5^;E^+6ezoB%z+saKN@=P0}Ayyw(E zTwYiJkf^u=A&|7JuMnb>s966ZC>zTkwX6mPU1W>h#ge(bi*dhLlEy5YfI+vOTwYih zPZm&d2d?WvN{MgN_W%IfwqaRma)KbJkfI=HpP#{LzdCyEW$h<YuI)Vj^hAG6HAq>Opcccgi;%0B}&@si$UbZV4V~jDz7-Nhv#u#IaF~*o_LWo2N zVZ2A+vF9O`u?F3G(jTrWry3F(Z$3gw2~*{9Aw=T3E|%Xv96hgNqm<{!#nC~xp0v-; zvd_9!Kb|a%R);kyC7jyt=7@Y*Jl{M~6uCvFWixf@+JH3uvLbFv;%aLLNwiEi+8VX_F864lTyNU-E_{Y8vyBr zh^8CdFP7#TB>KZu#rOThaU5*7+pI6(DTHB&*Ka?eTCGAU1>g6{w_oX7;IJXVLIk}X-c8%T z_CD{+s}jEtyln6L=j7YYP5E9ECq({We8s79Tej6qAr zps@}Da|e_X)cdqkG6t>kzI2(5d5ZNPqJtSk2cZc+-y+FF^Y}8j%0mM(80qAIRkKxT z%;PKX1dp%0{MO?O=)TAn({KlbLLn{MpT<@W80qAo4X9Y21-5c}`S3I_(yRjDG>oYZ zwrUvTzph^gD#pG4LjcP54pU6yOF;c~n0G*hqgnqxJgt8&&jQj*Ao*2gssM}F)VSX0 z(p4nyX7T*hf~lB>M=BHuYHpVk-ZP8v`1Fx~|1E;c=TZQGOOY%dPRs)U(yJL;X29LC zam~$pp~(5FveNUXiAAQ|%BW*n8LQ><*yTdHv7;mD)tfaA%#3?L%f)s;=kXNv<@S$yO1i?Zg zct8n9>%ZNtMfBkuYfp?O&Ep%03xb_=XqWwCxk$s*=WPY zc`n|LxpLkDd7eWEfjrNlwZ?2VgVq{Egw1Ay)oSIOL|;lND5X06Z|fI8L@z<6(`mH= zgb>KGtWy$gq-pBeZDtFu7k<0laJ$`{4nUy88L(cjF`v(oWf^w69fBaJmfm)|?X(PC zJfAgMYXHD}KCdRjh0_ZlBJB5jD5XF|A1}7aY&OIFen(LhNRq^pQkuzR()oF2!J-vz_8R&z&2TF7a)QAb4$QEEWqKk4LBY&W(}N>GaT> zx7}GH>eQTcWsA3cNqc9(=H|+&HC7K?Z%x;e_|)t_KikHv=P@3S8&}4^^tvQv+hIgh zwW)`owSH*P_32VOt$-v+JR-vNdaa5VLR9;IDE3y0-HP>`-rXX5$GJP4B#CE?f$#ee zLUg{G@*R{?5JJHBeHde$iwAnP$CXkj%Mt)SdivL;Y3kX-wk*ru6VU4gj7B2>fbaW* z6mO+z>iNF^kV99UUx3ycm&*kJa6X?0zZGI*UM`nG4`9ZAnJ?fjROGnT%q0K-002ov JPDHLkV1jS|RUH5T literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/meta.json index 1fb9cf1b666b..4f96eafe6c21 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14 | Folded version taken from tgstation (https://github.com/tgstation/tgstation/blob/5ed5566dbf09507cb99768faa696f8c3f8f65660/icons/mob/uniform.dmi) spritework and edited by Pinkbat5 (github)", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..d42d3ec66ab72651f270ce604dd78403dfcaf250 GIT binary patch literal 873 zcmV-v1D5=WP)riu2GP;;4F@wRs z;7mw!PC`bZlZKGyhLTa}V9lgUa0;5(rMQKL1WJcG6#sc10jSELI@#*5JCuXx81$6eV_AB(euadz^Dwvu!ErpTV_@pcHSBMUbl^9 zSwpWG=9y|ooQCfDen`7}W!w39twVVR#8+3)Pq8`8(oA4a_LcoMKNlVtXfvM~IKNkX zuUzNIGhlbGY{yqu+_D~<2B1(VxMls&rkTLknGjuC#LQ=I-8@`B997CQ;A(poJvL3N zaY=C^#m>$Sg#zq%rl=@4KOUV<$MbJT9)MoA&G&C%UI65Nu;1Av8j83xpi-&ON{+nu zD6=d}3x*8Dxr*fdQp z?d2N2M2DIQY&|v&4U6EAq=>^$A6ZyfPzsPL2S<}@>jSZQCsKPv85-AvK2%zi@9%{6_R_c5V1M0CoBjQmp9|9;s~p9> zlBC>l^l_bDw~cKTc$BP=r_v80{$qatm&`4+NXp}W00000NkvXXu0mjfpUa=x literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/meta.json index 3f72fb446001..933405cfd7b6 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14 | Folded version taken from tgstation (https://github.com/tgstation/tgstation/blob/5ed5566dbf09507cb99768faa696f8c3f8f65660/icons/mob/uniform.dmi) and edited by Pinkbat5 (github)", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..f4e92a4ed71a955d765ca3ad96caabd37ec21102 GIT binary patch literal 902 zcmV;119|+3P)sBA8`}P`h@l>OgiVLQ&eo z+8sO$+S?wMl6dvlYZd7hx*`_5c9)GgA$S-CX9w$O2Svyf#`L!H4m)KBO^B`1yr^vl z-w(u?7r*zCyq6rl4*p$QIjE zesgmZABrk>Jgz0Mm&@TKy@uD%L_GQXmAkWHkfj9XA3p>DB;^g4NAMyZk3$s2Oa9rL z?F*nNiYpKdo4-AR7h}aY@CaUWUmzIn`<}k3xF3R*O2yo^t~cxcQR>%^)Bd@h0Y}wC z990i5-8U-N-9I6O5JCtcgb+dqA%qap!5Gv1Qhww$0)8p4GscG24_6k4F{YoLondKt z$CV)EPL3`uuXGhAm}%*vibDAq!G$@T zW_Y98V?BAJR^fb3uu&gjeSk;sV%pd4(3+FC4q`XzA6ahD8r$g8I*w_d*p;iaW1u1_ zGaX%2QD{yK5{gTqIRRM8VT{?}1oz!KUyvkA3Czg*BVYdp>vP~Fy>_84h&MaUogGff z8?HvZhFCNLSxTU+@)soxOIcMRONmb5R?Sgr-q8{;)>&Cqv6ssMlZ#h!_W^YJXuodv zaybCNl-td{_6^)Kz-r3v2GA~zxr&oFoMzTtVyo0O2B#bidUbWR>p5_6aBwYEAva|l cg#5?;0epx?NX1#>)&Kwi07*qoM6N<$f@oZpo&W#< literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/meta.json index 3f72fb446001..933405cfd7b6 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14 | Folded version taken from tgstation (https://github.com/tgstation/tgstation/blob/5ed5566dbf09507cb99768faa696f8c3f8f65660/icons/mob/uniform.dmi) and edited by Pinkbat5 (github)", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..98aca4d3a2c7637e1efb901a97d4d926f26bac11 GIT binary patch literal 869 zcmV-r1DgDaP)CR#PeA%G)KI%_5u4TKaF(OF+x1`1aLj zx)!{1*O&og?sbGhmfFx1MNu3cub&4;hwFA$k|g7IB5^G}1wu7F?c93@PoE2b8|Cd~ z1RgxI60#{@-aH0ij<4@MWA1fqd?*UX6dHilR0?D6b*PymXa^O*YhPy@xv~G;sQ=Z+ zlH<`xH}~|pfI+vVcunsCilR8m+smeF^`6O%p40y-;Z0D@90^@-w|3Vrv;+#J6BJ4( zf4ydxi>{v#LI@#*5JCtcgb+dq`HeBg?amC_QIAkwfHB5bR#p&OSUgjv5dh$# z2}+UrBasLsNveAwBmVRWW@cuD5~RY((b&SGDL1cYYBx6jWN7UqNfJC>zi}48=QC%l zMGtBSrN%s7KLSJ53Tt!nwT-ar?w^jW*IC<+z>p6fuU{x;ONXR3Hn*xDHn)UFz7<+d zH64esaxz3Ge78=oz3#m=d_Eq8zBcWg0f2cQxYdzC>E=CCxoCD;cm~Wz!;bKHKOea2 zLTBFqiscG$Su{#}6w4L#?5*MOU>CbTDoDQnER=3sI5@Bwc8viEBu!(wu+T&#$6fC2K#y{YmiO*BwZ5N( z0Pk_n_j#Xt-uHm#0T>JhgTY`h7>uqN!CP|Qdq?zV-V?*KKaw4eAV-o1F%b zB;`^bf*_E&*=dwZ0x6gBW_{?Iu~EMv(9z{Z!|}w%7PZZ;GhjWDB+bb;(@c^i06;7j z0|305pNAw#5Coy8nJ_sqj_C5@t;qxW#i4_G35cQyNsJde6kDI8 zv1{rs&_2<#vop9{F7P~$Y&MJ6Z+aJm&z~d!M*I5Sb8>P5S(d47QU%~3oklK~gDlI? zG!0%~h+5Dp-@blAcQ>@@ZiGr%_X zH$gI~-Zx7;>ZXimeHRb}fjG4X*ja(5s-g&jKz4R^5L;clb*x;YAZ8uUBdhGk+_zy+oh9-V5OO8!OhdjT%%-!0QWPY_uuZ zUXyQkqE}b{rfprb-H)+RKXt*@Qj^qS=D7JHb4(q1E0jxlLpzL_&JZ1{3|NUSai`}+ zBsR8Mli%CjZmoZ(h(sbNm-5)#-3HLS5Q&W~oSql&>>|4h>I_(kE^&cCfVkamcsw4{ zRarYw6a{;`+o;uQP*oKd7Z=pa&(ac56b0AU*8tGd-M^hb8Uz4pwHiDgk0pDi9M&^n zU|;~%Y83!XMc)d6K!6ZJFf=rTtE(&18DRR0kgBS!$u}Aevt~@wXf(ia9IDkS>k(iu a%<~(+?YLnnZ#&vo#mn;>2Q zUqQV#PFyFf!*{xNT*4LU2f8{Sox-DN+VKn|i>4nZ$s#2BY+R>&=6a+mPQj&&fz8$jGhu-?A3qv9o8f^TmwZxO~6F6-7}LMNt$*Q4~c{ z6h%>#%ZcmYrBm_$FP%;`R}WB&D2wAdc&|R(0^rT#_0Zhr65MNnwGur47Eg94ox<~V zwDpJQs_m*y*qnqYF|xW5I6hbg#)7$dV6CzUaZ&Ajs6HSATLbHdHcAku#;$*_IDZ7Y zozT4)Uv98_5vyMIdGspWUO#&7I3lIT0T>I?D+|Vk-X2p# z6=m_GAAyPiKYp6$$=_#F8!$76MI{P--OX@ng_37k7;&1qA_=O!2hOW1+r`Y48s$A%(Kw#%=`S>o7a3u50d_b+p6p z1H;UFZ}|Ow?>E1FEd0J82!bF8f*=TjAP9mW9F3hs*R%dV(s0h;+@5g- zEcL+DGl#qPq4N)X zKw$>XyD-w^mHOnoH-FQG>5w)L-r;9Ytm#X=QJV8bwwt0{0Cs1gIbST5|C-SO2!;vx zyiq!3H@$JZ72cmy#9}cX6uq zrIfZ32{L(A_FGGg|H8OCY$wsaOl5gAs+;p(lQO>QkXZpMk-%}n=^0vy1n$ZTBTY_O zAMo%-RQIHd5kEFln?`*!JBhw_1sZp~7WIC7b;eN|o|D4gWTil2yD7>}Ly=Ek%wniZ zBvmO%348Ot4?Bt8@4K2>q*jart}L^+jeX@-b?`9E@!R5ecIFPun|_2qLHo{qh6mRg>&c%* zdpf%b@rpQt5GVnaJ$X}M(n&D6P9z0dv;l%p7k>dDct~NJ)=PE(0000|0 znerrk2!jp|qzx?;@&=+{nU2c#P;H_lR;-nnI4%EonIM^+@$NhU_eipBdwqBFKzEhrzb04L+|fqQ>kz0ZS3&Qo*_uQxPoB zzg%CRieRkx#hZ!`GfYKrRsBZ3x=1E7>!+jVy~peP9*|3wEYdkj5dgqsW&t3nBT5l0 z(m8UelHS#H5b}4uzDv}LQ29&l{k`p)7LEMTuWrS9)9IR)edi}4A|fIpA|fIpB7*+; z0IfW+=L3ARFW=Iq_h;);r8^Yzhdga{#N>~ffYAHf6}4#O?|VX|H7fT8lgt?ZP=3ws zG@#I*kF~cGBDH%fU|kC2tL6@f95POGrL9YGShwl>?!f5g=-IkVKD~eEi^G?gl$((B zR@4;EDFA>4aP{^WcKiaD#ZTm4zeWH1MYYG9iu%hJ<)-;;P(2#}{9WOYuUSK1y(a*; z>Bql%a~$>4GgK~Ba(VRnRtAOjaHcZepY`?5@ zl_M3BSbtkKMu0*vhVRI#ew4$qSCer3c6EMwN4{nG1h}4pWdo0MjG_=d0Ji}A#dHq< zPR;>9Aqrb$Ps(E1KwE5{BSNl#Q83PecO=l4%OpG-v$XQ1Gqs<8O|EUsLk!XbDJS`0uWD_J4lM#%Jl~=W?GUu?`f_!A4;Vj#SIB z3Y7mFe5$m9ak;U5^Xm2X-vsFI0h>0Q8XFObO~F=70{uN8U;5j|nj-()ZyRG6hG7_n zVHk#C7=~dOhGCcnaXmE@qVXPqp%AtD0gBL69MgSaG{GE3HU2CFuG6#;b!aGrx=d3o zz`EZ02}U0v2&8mnsMFOtyk+YKg~i8rJ=_AgOq)}PR)WvjUi$OI!t8>!Qh9kg&n(rd zZ4#5^X);Ep-{uEFpRCp*W0>A$$A^@sl31^{k;#j#G6d+WRos9~;3wx=BRoU}7+b)4 z*%Q@i`W_IBTX?w7_JACtMdL)1tl2Poz{7ndX};bguwW8}KonxoRBKEQA81WJeoz2( zM@mihl7PYK74YLz^NkV49?-(+)n48OswW`d6L7%bS8O^`Et{jPql3G^F#iF60p6k6 Unc7sUbpQYW07*qoM6N<$f<&oPt^fc4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/meta.json index 3f72fb446001..933405cfd7b6 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14 | Folded version taken from tgstation (https://github.com/tgstation/tgstation/blob/5ed5566dbf09507cb99768faa696f8c3f8f65660/icons/mob/uniform.dmi) and edited by Pinkbat5 (github)", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..3343ef624f61e5f7ebb6bf14f7f829f696d5442e GIT binary patch literal 834 zcmV-I1HJr-P)ZR)TYd!j{3>+zSLO#OexDc@Q7s zh=pZ}ggk@+lPbkkl0vvQNRviV9Sf$&2v*B(p|Dr1YmAzUvu2YV{67#vc9Na{?9PmV z-+&N82qAa^18BRu{_wO z*3a56l`_8P)-&MBwu6e}0C0EU(5QviPt(~&ag7=rw@7p*lr4*<)@y^0+DsYGfJ>!l zbv0e!apKaRd7MswJX8)LqZF`ST#{~WJNDmh{Q!o(54H`y4?w1`s1_|wAI3m99lI@n zWR}6j%uAJgKPX$)#sLrJb(m~`5Mu^R>l(KP(;E%HZA$rEIQ1Nd$6l6du>d%xx82%s z{sJPSi3>orSP0v+XLLWKPl3V1m{u3=f7)dFYOR<}1-`YW){C`%qIIg2&rvNFi1sH_ zTR(uPv(;zklJe303n7FMLI@#*5JCtc zgb;HbrGliBVF=UbUCslnGRg%yN(H|P1-_5RYi-lIjw18mtV<&4&~b~PQG;tVo&Nem zh-x!Qr;NkVZ})#_&Yl9uD3KZTvRvcQsKHr6ha?&`xV~W?!iM?aawa&MxUdr6y~ZdS z8%^AK`Wp^B8hlhlrmxsPOy=za>>rZK^wqOIm+Pn&3yZXPTRR<+iZb~@I?HNsnxs-b z7aq!(_aD8KIE>%cQ9Ao9=?8gomUOHmz&+&Yz}#d*)Fs7AWO&#)F3)m%y!UGk6&D^@qpx4J5VuFPrxf zP}dB4+3?uT4&LOT*>dJ)+M#N6yu6j^lIntIrz_5hY9R*I@l z>5#EY$Es4sO!+A7n%NQymS8z#L*)TGnk~(`$-Y95ANL^&zC6g073{M zgb+dqA%qaJp6j}5llGUW_S^#~>hSPTan9j+o{`s{Eq)LL7z_rv@5%E@cOY4yb+5bR zx~|H8%J!k10hVRKbzODY?c&05lx11CX*LzQU0iTpb{vH;#+DY^vaF@{FbuW(EW7}& z>#8i^Ww(o~b{p`0bUGbea1PtH@s2S7Q2lTjDbDG$!*i6{RsHJkE?bYzV9QB zW1O6vAdX`QA+&>Uif3t*kKT9Gy-F0ALsfKHlB}0M1Gc!2SeQGU$5CUHg4iLvN>YSsc9d2`JnnFs6>2wMqgkjsZYBU<9`zyQ$^!t6| z{{DV`og@i7&s(}To6Xk#o_?vcH^Jw&ZnLX=6U>aqwZ!I literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/meta.json index 1fb9cf1b666b..4f96eafe6c21 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14 | Folded version taken from tgstation (https://github.com/tgstation/tgstation/blob/5ed5566dbf09507cb99768faa696f8c3f8f65660/icons/mob/uniform.dmi) spritework and edited by Pinkbat5 (github)", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..eeb409a99e8967f18aef634bb98dd77fd385ea4d GIT binary patch literal 946 zcmV;j15NyiP);Ki zAIOkWAr4&}3WbVu3f){fRIuRS(y?}Eq!g7bB8Z7P1u9yi$yu)^UJ~)-I>elbRFe17 z7z@t_Lb!X$`#$e;Z<678073{Mgb+dqA%qZey}`*2rIPX6sIJxll&hTN=U*)IGAAIv zz;*A{baf4_n=Zs@`H;tNRwO}&$8T0zcn%)FSy_$DUW|@tjisa(o-0a1kGHL8Jn=1s zWL##Nv+M*6PIf3QJcndl#@4|cy7^%kbnV#R%mM(q`C;65c46OYRzfpJI;JQX+%uhi2}4Z%P{SNL@En@(?LVQ@4c7S13R&L9{_Fr7Y4zX3aQI{U^eU%Cg1686cb~z8TJ-%WJ~?n@<2-O!G0FfThSHToV@b^f$q1 z(UiN2EJYU4>u!uhHim zQ|}iRXs*Us3Uh()>ZbGhoMTvx%))NfoKZJ#bGRW1 zvf3$f6I>G(NP-NT!wmosS8_2W<1%w~nz=e03?y_}xgNpLRBrQP^}0ezk;E))4mX0K zDP-k(O{MvYx*Q}ii}jUl7@L8OX`$-he*pP46aZLX*~X(My%o(@QKO`>E!P^8I_7R< z^Le3}BVFp4D~drYO+oj+zN@5#Gxd7yW4tC^A&+11>ffKiqQ~;PpZ`^N3L&?^9|72F Uv5YTar~m)}07*qoM6N<$f;7La6951J literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/meta.json index 3f72fb446001..933405cfd7b6 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14 | Folded version taken from tgstation (https://github.com/tgstation/tgstation/blob/5ed5566dbf09507cb99768faa696f8c3f8f65660/icons/mob/uniform.dmi) and edited by Pinkbat5 (github)", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..a61db7ffe574db919e32ba7b1a9f5b48fee1ecde GIT binary patch literal 971 zcmV;+12p`JP)T%H#ogb+dqA%qY@2qF8^G|jH1{9jae)D7@TRn-FrU(+=Epy&4D z9sp;S_xlaf-a4F4*HU-A--d+dW4O^ZW;e!w8(m{I=KVIoyY}|>szFdywW{1SO{}b} zaK-ez0yIst2L}fM0HOI9PD=>@z}J~d`DrPESVK!?FanfHrJ$Wxr}nT?CV|6Tfnj`OifK8gqYje#sT2X%qsvu>P|22 z4&V3H2rmr75F|;momt-9;nmeucj+63A@IcI{s!cWS>%gZ0KoUn z2qA`=cvWIJ`VUOMqxxvuMi(?+i`xl<`4BO`V)nRKsZxsoGHBaOAWMTF`?ydgac)rH*7 zr&1{ZKsKALY8!8woGUphNs^lhmSx%PyeNup1E<#~1IrCguTKij06TT=Zbu@KfFwy= zF?}78aqLc2=jV!OiJYn>oF^y6X5{B`Fkra%oYmk5_iXLm|B9j@ee*faHl0JE^cfSG z@j$b~*E&b-riNy$6&8`Ybsh@~3svR3*=g=0GPl?83Bm#&L zG#Y!o~Pid;7J3t!)us-`m(KM|{Qdy#hXd%V7EK62gLrrvZNX t_w#gpQV0tomftSn5^Ay`-Tna&BG^ml4ho_>YzILyLIPvg`~$mXhng&LE#{?*b@2N@ zX~}Ef@4c7zn#1o05JCtcgb+dqA%u|8_S&6roc71)>7)mc6=N(EB^fQfDGY0m7T@t)cZr)Yj?uvmA4P>9k9Bx44@PGo&&~MxVo|o-(#WgIeEvB+4NL3 zwa~hzq}tp22i$#T-T`~{sM-Ua}?UR#4{nqZ6-x)W-1Gte~!x~AaO z+rv~_G(H~ON5C))n5K!Xtt|vWfZg3)1VMn~lN0XX<9PGFAHTb<3)gjX^^^Gs_@0BG zKdPx~wfTj32Skff6w9&%QIf;j+zedT#m-V0?>+-NOJx9q8xwtxr{7#pfoP&%pFKyZ zhk>FYekuKd_o8zgb+dqA%qY@2qEMaV=OE>Gh9R*uDk$a zEId0q!}`YNUv0kUKvh)$2ze8fJn>akg<%*&3o<@^{D8&9MXm%XcXD)nV>4Bl5T&J0 zdw(*tMKTNnq9n()0C#hOyoDNEsWDNKF+DX1n9Rv12T|1BzuR{dGdYgwscI@$nZ;N| zQgJ%EXLGOoIDF4ZmBZwz42f{za~0{|`b{RrsD0AH~z2jrRTl zu5VoK>@;_FxTQA*-*d3KvJ72Q(6{-E68@FGZ9~@-3<|ZJT&ek7M<6<9ecQ%iw~JD# z1j8^2J^zv07$Gny*Z_cXrNVvoBiuV6sa&Z57?j35#N;EEWeGtLq{fg}u0hx9_0%)? l=;&x7RUwaM9EAMGegox(N?%pI$4vkL002ovPDHLkV1hyih4cUb literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/meta.json index 3f72fb446001..933405cfd7b6 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14 | Folded version taken from tgstation (https://github.com/tgstation/tgstation/blob/5ed5566dbf09507cb99768faa696f8c3f8f65660/icons/mob/uniform.dmi) and edited by Pinkbat5 (github)", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..402d66a7ce80cb4861ec7f6e023161a73997f577 GIT binary patch literal 711 zcmV;&0yzDNP))*qgrWG z(U6D&i)JWY`3ly#gbyiW2y8JwDMG}=Zyd&UlsAAN2!bF8f*=TjAP9nRnW8BCHSOP# zpN|e;D8?ACwMJQ%$+`A$^N9#mRh|9KIeu^h2||}X?@3V>qX93P)c)Xf@i`8(=n4Qnl1{8nst4Ys=`>e|6mfQXQ$Y42S2 z^4ewq0DOEdqk$7eE5uJ#4gBbf+U<`fMgHTvukN0}+<7X^YRVC-1Gs3{{5rZHI zf*=TjAP9mW2!bF8f&d)e6p!r;kDf*LjtS}D9bW&&Y|9{+QA2_`WlOxOPZ!2qITfjn7HmV z+Z_%9p;qV7gn9ws)UF@G&FTclT>ZOzY20iZj4F`{1g~CeeOG5T6l>g~E+Hxdh^Sp{ t@45IL#{l5!IHIS(qdoacwF-j3;~z6bTp}dH1GE4D002ovPDHLkV1gYILa_h< literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/meta.json index 35a7a9f9df53..ffdfad0b97b4 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "sprite by prazat911 and modified by jackal298", + "copyright": "sprite by prazat911 and modified by jackal298 | Folded version taken from tgstation (https://github.com/tgstation/tgstation/blob/5ed5566dbf09507cb99768faa696f8c3f8f65660/icons/mob/uniform.dmi) spritework and edited by Pinkbat5 (github)", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..1e407367f8cfc2d131af30647e68c7661a370613 GIT binary patch literal 882 zcmV-&1C9KNP)6*Aa>!9h7NLIPQm(xE~jiy=}- zrxYAI^(7%_AWJi*8459o<(fr`&`wDRmShPPQb?$40#-N_Y88x?49U_(@;cZ%?rNmI zGa3uu4@A8?-}k+{cjxeZ03n1BLI@#*5JCuPZ6g}zo$T*N*1JxiU5qjA_IR-zS+v}= zUp@JSd=9cK-+0VT?ujO%25R-*OB>NRS6^nw5MBY(fhhoSo=9iF7~|7{DHQUI7xFnA z6)(-^(Uwu4WH`~0@Pc7~bn~t7m~F3sjcA-VCJ!Xi8CZv10D#riRRF-#U=Y?}7e)ee zU0n&26XS@47Z3?Az&HKeuusiTgzzm8i^Y)L|A2a_h+3_NwY4?WYBlVoQaFA08h)2e zI0-YxUcS=a6-9xfD5l0~`xYqVbNKOH(!Tp$Hn=@rZ3P@(+c7^sZz_p)$g*s4d%S#d zVjPO1U^^Vbv&|&7!yy2T3!@$l9`iw` z6V_q7sqxx=2FS8(**(b`wuPjjrsG=uPxmX~hhV)_)IRGctKZ&Dt>T!CFLVoBomX&m zUis&?Zn^9Dgb+dqA%qY@2qAQ*5U|NaTsGfo6TY-*j)cp zOXl@b5#J6zcBMKr5}4y^j2BNPoA!T7?ZD^r2^C0%i=#8aSwmxjzAUZp8|Vi8XYF1c!kF7 zs7Y%7;IQ%G;86I?ccPHb8QNjYbcU#euh!oUNr`j@ewPhPOG}8wV!{myq8MXbjdfJK zYp`jyeO9em#rsPAJAH0xEj0D3vnxrlJ9pv z<5yMbS!0AO%a#F$#P2_7ZqN{AD(L}-WOxqra`OF{2OAiRF z-kogzCx9Rbf*=Tjc$*YdF48oOkH_P}yzgnFX&Qgors`ig=x7jGc7COpH4?9lcX}+qLadtA*c|Z(~9MV(3Fbr6hg?hb? z;c$pntA*ikh}&LI+WE3@T^FwFDqWj+3izIbU(eN8+s=oNlM1kH8})i!DTpL=yWK*$ zQsX<@TQfUr7{=s08M{h%foMnj{XR;i5{ktlZf*xcNd5=fJghJkXWHrWeMt;Q8=*^L@fi(t7@!^V2( zFsjK%gGg)iU)mNvqj7AkS5dCiq--vnk%l|1&|?b@-lx>njsLI1rtSOFTZgb9a%=L%IUa8>cZzIxAIp7C{h9 z?H7=>vCtF{j)8D-N^|}T{`lZPs0x=#rG@M%KQJL2iv(o-%z*e?9F0RI2IT}qzvuP9 f#Hz$W5U-fuYRHJhM%h1r00000NkvXXu0mjfvvZ8Y literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/meta.json index 483e615ceb5e..fbc0695d6cc8 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/78a56e1a22ba1d8d6023ed9bdae55a6de7fe8a39 and modified by emisse, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/78a56e1a22ba1d8d6023ed9bdae55a6de7fe8a39 and modified by emisse, monkey made by brainfood1183 (github) for ss14 | Folded version taken from tgstation (https://github.com/tgstation/tgstation/blob/5ed5566dbf09507cb99768faa696f8c3f8f65660/icons/mob/uniform.dmi) spritework and edited by Pinkbat5 (github)", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..05dc2931363596f8247f265b6a4d6660f238e28c GIT binary patch literal 902 zcmV;119|+3P)d3E z2D3C+JmO{HphxH?2yXzt%O`y{Q~ywXn|%f2*J8qJY0S%_KXAGnh)2L=MMXI1VNRC= z;h?IuZ!4C9Fe{M>fTce$T+`aA-uCx+knZb3A|bQ0zm9N zB=j$k%$6}ZHK8x~Jh(^h!|wAVv)hAEG;ga)?o-8MdIMrBimfWS^>$Tq>j7|AZ(K(x zns3?*uo;9O0r}InBYlNp1%+beOaf|T=f_W>{zim1piul{s;^mA(_5zc2qAS+8hos2R(a8X2lB>MDfLIwE%#x;Mh{QC3XD&qqV$chTP&ksPm z5j-Z*?6h!|SSXseWp;aD_xWM>`CFD1K2D)n(c|Ft0-|GBsu1Cm13+J|gssnL>f7Jw za1O@jKJ5*#TqxPsE9n7LC3i~}&+%f7Lb0O9VU^_*V9d!c#MfG06|xXtvporou~yb5 c5b_`T2Y-oY9VpI0umAu607*qoM6N<$g3tPoCIA2c literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/meta.json index 12bdb72c4a0a..75264880a12a 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, edited by Flareguy. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, edited by Flareguy. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14 | Folded version taken from tgstation (https://github.com/tgstation/tgstation/blob/5ed5566dbf09507cb99768faa696f8c3f8f65660/icons/mob/uniform.dmi) spritework and edited by Pinkbat5 (github)", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..8352a048407be1f2c6deb661fbd5e1abbab443fa GIT binary patch literal 1048 zcmV+z1n2vSP)ye zHg$UG*~3k4k`-r;Hrm1O^Kx^42hZ=E-@ROf^8+D-5JCtcgb+dqv9^%guQoIOI4axj z1r#gf_Nx)UZ_NUa_hvf^@k=O< zt1*e`1?!@(VB>XX61m?eVB#F5DL__V-sbPe`~*D~;h3L3l618}e69*u(w%l)MiZ1j zX99E7HT-MvgnhaEqsj1oOKaYu3t%*55=C>d<}VirpWFq&>Env{XFIf#>*(siICjBO zr;eD={_rN>7y__}1ohrN?KdDkSH;Oe`}ZN1={|lI4%7oM(9*-DSI#i-zV58W85}(i zt)29b%ZjX&%_GyYtE_te?a`+gjW1fd(`>0z5$Er6!G-6bz`Nn-T8$OLI@#*5JCtc zgb+fAjF8)}-JI|^OuEy_lAI2O+hr;5+7U4U9Dc<0FnPHd{#KA#_-&mEV0XBSFRfcctT zDx5NLH70r4YsdEfTe#tHeJe&=bz{N! z;L#E{NDLmuIg|HQR#JO=+8HZVdrZFk9JRNni4tROWhK`yph>#`0D++y_B`RC%$4Ta z{6*r`cGt+j_)o1!5TJdLyHd7e4-YuJI?*3yI*bD=JUO_`vd2Dw8MOw$ZXHHtV4+Zv3~%j@o-T7 S@xkB#0000gZ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/meta.json index cb7720cb85a7..732472ca0dcd 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-3.0", - "copyright": "Taken from goonstation at commit https://github.com/goonstation/goonstation/commit/4059e4be90832b02b1228b1bee3db342094e4f1e. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from goonstation at commit https://github.com/goonstation/goonstation/commit/4059e4be90832b02b1228b1bee3db342094e4f1e. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14 | Folded version taken from tgstation (https://github.com/tgstation/tgstation/blob/5ed5566dbf09507cb99768faa696f8c3f8f65660/icons/mob/uniform.dmi) spritework and edited by Pinkbat5 (github)", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..dd7ef715a9a58d2b40faa9a9cbc975c804896dfd GIT binary patch literal 784 zcmV+r1MmEaP)TI~0G)}DA`1F6yeuV##T4U;p02^a^d7dMRqSpG21K?BZBOzl9D+RgSz0dI&C9u|BWWTfi2vwcEltCYH zN#}tUHK1My0U*n=ix|Vv55us0J!X?22!bF8f*=TjAP9mW2!bGV$hm#`uhL<4afm3d zHbd%$D5a2PS!dlLBFeo+mAXwFeRgA{>aZqHLSJBvaB?!%ky8wkLvki=sU!10?=wcz!w|e zqFxQ?)0_v2K>G<5Z$p~`2()+%0>wN)^;z8Yxj%+6rbk4%%mxU;S^NgfOgp~_N@ivN O0000xFTry-Rm?1-AR5FMV2#w-_fxxfBdDkQo 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi/meta.json index ef2dfd5434ed..021e4404df16 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Edited from the scientist jumpsuit by Flareguy for Space Station 14. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Edited from the scientist jumpsuit by Flareguy for Space Station 14. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14 | Folded version taken from tgstation (https://github.com/tgstation/tgstation/blob/5ed5566dbf09507cb99768faa696f8c3f8f65660/icons/mob/uniform.dmi) spritework and edited by Pinkbat5 (github)", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..6917ba952e579db05660e4d1bce20f0ab91ddebd GIT binary patch literal 790 zcmV+x1L^#UP)+ySt~gicmW6;ZHQsCxFsAO(v~CWSjq;fK^;C$x@k_>xuUYv7 zTyd_(n+*Wq+_EtAJOIGF+bfcr3V|lOQH73Ep1dA2WqblI8N<&o#5Vx8j4{g+%q0LD z7#oLwAGe&>{@cn6aF?b4=RkhcPo>1jbufR}0@xkLdAA41xOOtHS!79Pkfv&6SqCS) z%JVRJ00K2mKqTX0q9fPB!0zvkUVeK_TnCH%=Qfm|HBr9c6W7^|iNxr7MxO$!hb?AV zf{E*3VE3OTb11?0HWi|{*Dr+V4D3E8u7h#SMX$U7I#~I=r>|f8oc^qg{||WSfz#wc z^pWw6o&k}J5g~r_y|#RGd_o8zgb+dqA%qY@2q7dFFs6LpZ@ovr_x(ow0A)sXfq*gf z!*TF^yL~oxZQHtJuEH>Er8?yMz8ZQSuGeb>z_UfrxtUa_jEkdRfB(fadn`ceipqqXB&BQet8NeF!fBfZc7NBDk;m7YQit(woppPA z_uec^aLE`(mW8`CZM`}iFs5{@qABAE(*_CS>hK~%bUFAjC;u7qAml&x4-t?! U(6AuAfB*mh07*qoM6N<$g46tHWB>pF literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json index c11c48fe7471..b07c0a7be8f8 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14. equipped-INNERCLOTHING edited by Dutch-VanDerLinde (github).", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14. equipped-INNERCLOTHING edited by Dutch-VanDerLinde (github) | Folded version taken from tgstation (https://github.com/tgstation/tgstation/blob/5ed5566dbf09507cb99768faa696f8c3f8f65660/icons/mob/uniform.dmi) and edited by Pinkbat5 (github)", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..189e2cdaad49398e72a71d3110e394f9040e33c0 GIT binary patch literal 958 zcmV;v13~{>jR+Cwi^D0RYMFn8^+y@om1rNgyeN{3LW^)P0HTudna!)PI;>S4RQ9Y%t-y82=? zmc9=J%zN?o`@Wao%ZvVg0E59`Fc=I5<9@=K`4Z3bq*AGHtVFouKt|XR;Q%WS)w0iZBR$R(4Y%qCQoWr z4XJdN3=O)FN@q!}s+rZ$HV&r?^@9}zPeZ?|mZ@#F9RXq{Plg6v0DxLmGo0`4Y#Cw% z!GmZ#+0{sJI9-OXW_`3!M}Vr9AqXC*Y8i?wVeZ*W?CxwqktMjjK57A0aDHJv`r4iV zJ;W7Rf*^RH$Py-J0!9QJDOUg_(?V_|5sPrCbe1@ruBHPn7IMaQG`K2OdB%$RJ8*wPAWRjuJD7IG*SayU}1u(>W$+oW0owW@|A{59rlw~}vmCu$bfTxD zKQDBrYFX}ijR4Q{MDTb4m@kg7lwQ^f^le>2FN9g`gJp;97GO7Q0_+xGH*5l|G8By` z$-?rQRpwf3pwfpC5?aGN3%@y=7&|xJ%2^z zpE@xzzqs0vo7Xe7Zm-YC&~_7j@OmwPUbCQUQ)Id%3Dpv)cYJ=K8H2AE(XG3G-L~$t zUWdc!qOMWss7Ok$8K_k?>Y49^>%PoXhUid5KsXfSYE=!YS~dnRZiqdv4sm;ZP-F?> z#=m-idQGjW$XY=i0pU=P8y@qM37-!mqXJ5jgeQSVv}P=!BuUuY-pA>QijpMZ?D&9s z`B}CN($?phB@v5oRxUS73MJpYd5b^4fA#D)c_J3!oK7d<2PQhUWlHq$n7`pg#7yW} gLBHr=Fzzsa0d~QDKF$SuHUIzs07*qoM6N<$g2HpY$p8QV literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/meta.json index 3f72fb446001..31976b9c85b4 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14 | Folded version taken from tgstation (https://github.com/tgstation/tgstation/blob/5ed5566dbf09507cb99768faa696f8c3f8f65660/icons/mob/uniform.dmi) spritework and edited by Pinkbat5 (github)", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..89fad18b84fd2fc44b5120a94fb92bab865d1ae5 GIT binary patch literal 812 zcmV+{1JnG8P)vG-hZ(c$?lN#0A| z=XrnR5_lhgF~%5Uj4{R-V~kDbx~`h#`fK#&r4vZ1R4S?GCfIdd<+`pal}e;VAWwi! zV%p;(=|RsDdx`piYPAXgYQ5dY$F()}u3E) zO4MpKgkgvu$H%ajm+_(BhfhvpHr;MF^=A{Wlx^FpUaw>I^c3ZM9=H8IzVGcJ3_}3G z{{B9e&dvY;pYHB5*#SC-NzTvD0RWv&hZLK<1MYJ<-1hsp&;5i79b2mbUGbUf23c5APDg5-~iutchM>oNP*_1R;!_0E<;KQeXrTs z*-71B;t7~^V{0~>iP~N>^8bJ+ib(DA_VDmPYX2YdJ>cro_^Fa@G#YAUWd*%n4*>A~@)G5I9{$r)X4N6u=haoED^$L0 zZvy~yF0EFJ9D6Qxg1TxX>%jxSVHD-!6)LkxJpp?4rIhe33x`p(u)>JLD9ZVkHQfF> qmo&&fgIfH%_fm8oTpPexD!&1#kvqI@+qY2w0000Cw}ws`mcr-?y*1k`jMl?oTX%56^N@A4 zU2F4FGlzUXC{6R&_kH=27Y6SEgb+dqA%qY@2qC1q;Bebx14=nBj zqifZx@9 zJo_`i9n<&}I66K(bgTjP$NI5f(7)9@pnkL=uFP^5VbpTD^93%K16VEx;29g`j>$Cz zK3$E#RegiQ3Xp#aY)piKd;$P)_pOR|5B%H(7$v6_Tl7hUb!viVY!seJFSKF_a$4bf z`ncZ#J3sUf032L9K;>oxo=GnNVBlT^T5T85WZtlb#a=x}MlC=qmN0b1f&JYYJd<9C z{u|JWCGL3K4Ve3|j$AIMC#&spC%kA3zXN(bTDFr>S(Yt%0d}&qwA6Pl?*9XFx!mb- z^TlS=Lcg^b(k+kK{9IE&+uDJ)wbS#QRW=Hn*eGoFJVyv2gb+dqA%qY@2qA=6EbaqK zt(sq_H!POyYd=6cu62QMILx-Uw-Fms&y3}(fNKIst%BWu2y0e{Vo8SaAOJv}IopKA zeLvi8Hxh}2;rv_;sMqU=4XGIHutqNc`1%>Br+6ari7T^+-dcg+M8_Ip6&0`RA+DIF z_6QwTI{&Vxfao`i?mqO`@%8yX*1(HIk13!POQ$Li*FTwWZaL?H2xmJqUKK@q2tK_N{Hono3cNc9d9?>fj!Jx%Dn=OtSB zeh`E^?|t8U`R*?8J%A8G2qAywjRtNy0k6{0xTA!ESlcg1ozAnx zFPj#!m14*L=|tvDgazvMx1Tb}l*2xvV{li%d|&`brkwGWWu)J{bz-uNbTsaiO-nQf z&tkIdTIl(JJN;a<#XY9y3dkf=4huNGvJ6#K0RSKCKLG%9;X%9_x{Gu)-qT8m$ui~x z16L-`&hg^D;=}Q8B;UPzNXO1AC#u!)a7e}=<}G43(B9)c{8RIOrncb7YuAIzsu&}cM} z&*yP)a3D=hO*u0&Gs5F}u7GT%C|zFRPVeMy@9Eo$`xdBHt6azZ)@U@ij{ghy?|@FF z&yJ0bjtV8gBcIQAJ=Tx-gb+dqA%qY@2qA_BssOF9~Nz7B=3(7YP|`=bX?RTYL|I7>@QJ?Rb^hT*8HitX)fWOjmA zlK2#maR1okYLIf@FAGh_)thg3jCb~+>pE6fS9yo@OjT9rx{isRz4l&!*qsYi-)y1G zIVRUVqlAL(z!zK7EQ!|U78FJ4S#MBL6sfhj<%;RbLzbb0f?Q)>>xtR!*V{Jwu|}*Yx@PMWZTF!TkXjgrV}We7Usf(!b$L&3lE}fS}05>0GxjTEGORX zG(%_gm4A0;5UusL3;xT5%LEDxmbMNO%X}}0000>5yea5>2@=P|9=8~aTMTp1LqSBnGzGH}2x9som@aO2q(iV4MnkQK9&QhMFZZgW zojW%Tejkv{d#=CV+1)wEhu;q%gb+dqA%qY@2qBsI10gAw@$=}ySx+Ea9LGskn*$@B zLBmPo^21Mvaqv8U;youRVx5SbDAQ{p`2!(I{?QwQc?ER1T}X(Wln~?KI8N$tyAVr9 zq*xlbx7x3F9$BfYwrd`=XLvv}9(eGOIcC-?z#j-n9c~u@V6(IlKWnFsR(e5|{Z5NC}Hb9X{-2?+}txZ4;#I0RyZ0`fT zL(BJ3RI0RGLP>eCu6S9W0X)welJWPNYk%H`j@_5(|MYpqdYc11v!?#=axZ}0uB})n#5hw-rqY4LCa0AxHiY5bL5KbaYTbY8-TJ zZHK24JfSX*E*6Xg<+|CyLL*c~s1EMpD*kCqxX{{3$P#**1n=N=NG~-t!Fv~@rTji1 z>b=YRz4yEKF2nBugb+dqA%qY@2qC1p#pp7xrTt&zeCz>O#TesWDTo<)%2BD^OnzET zKv9&6_f+ykbRcG+YQG=SVsx3CKX&^NUIBvxeE^pEzMKPNj1La|A&dwMwN@NTpJ? zK5Kakq}2p|eD{_9Z)4~1O3zCx;Nai@VaGcF_1OlBqBy)#koRo5!hy_gUVSgVg~tI%~Fg+c+UsyZY|;*E`saJgKz`V(3%fk1#aH8nxk zbpXK0$%!Kn2yk-+b!CYXG7Og@UDPgb+dqA%qY@2qAUyo6vh}o zJUm2rWb9U(Su)?%;@HG&U8+OFSm0)i-l+Rl`^M)_=c*0en7R**#{l)GDFUm{$s-BUB7{vnFp2qK%znTx+jeZE##` zcbMl7%$PUF(Gl{&D+Pu6tm%-{mz}-hA3J-(nXg4!O_Uvnv2!xSB(wr%>dz?f*CP z>-N;Y3b)&h>+9>sNkB_W3$ocP0N4s%3%}pb0id_=?}UvujWxVEgI??rcAH{8N8_;%%+m4P zwr5|CVHsRb$BBaP2gOus!t;YL$Df8FagFb3-AUnWdiVGP!6`&gY14 z7no1PlHPCxKsleAwRvNs>lr--I*)yRI1YbKPB?70*Miv;;9IMC-eRqvd0wKB%}~zg z2=^ybTi<}Nv(?X*|Nhr=`lB-bKj5VeXP1rWJ^MG>1A4;|Jw~s77MJ(#UkD+D5JCtc zgb+dqA%vK#D;30D83wRzd#CdNtBmRbb)|xzxg1~n{k671wHlVp1IKYiRqAp)|zg&%jBX(F`ol?Ruk+E zN3c@9dyUad9VgR4ScqIMMU`BaMl!vZ+F)I&pf^94uo}aiWzl);8#B*jLT-7DseKrUxX9tHYPm z@uDWboQ4O@=IoGE%m&pe2hAoh+kZ}{W6Jp)g>1%n@DL#b;As|MwhTUh{{}!@yZ@^2 zaT}gU0U~GLn;ev!T(lzH{iqzrNvtl#s3HZu+W9^Q{}JO5;y?BmQ(Q~wgGQ0!00000 LNkvXXu0mjfxT1ea literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json index 3f72fb446001..31976b9c85b4 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14 | Folded version taken from tgstation (https://github.com/tgstation/tgstation/blob/5ed5566dbf09507cb99768faa696f8c3f8f65660/icons/mob/uniform.dmi) spritework and edited by Pinkbat5 (github)", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 From 4c77de964c4f894abbcbd4f65c8b7d8c4cb400c7 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Sat, 18 Jan 2025 12:56:26 +0100 Subject: [PATCH 168/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index b11d797a3c93..6ffb403cf4cb 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: deltanedas - changes: - - message: Fixed Senior Researcher's PDA not having the Glimmer Monitor program. - type: Fix - id: 436 - time: '2024-07-21T16:24:04.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1515 - author: Colin_Tel, DLondon changes: - message: Some traitors seem to have nothing else to lose. @@ -3857,3 +3850,11 @@ id: 935 time: '2025-01-18T09:35:10.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2725 +- author: alterae + changes: + - message: Ported the ability to tie (some) jumpsuit jackets around your waist from + Impstation. Jumpskirts not included + type: Add + id: 936 + time: '2025-01-18T11:56:07.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2742 From 2a25a1e7197c479d81d81d31b28898331d1f909c Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Sat, 18 Jan 2025 13:56:47 +0200 Subject: [PATCH 169/205] Add EMP Blast effect shader (Frontier #2262) (#2762) * Add EMP Blast effect shader (#2262) * Update emp.swsl Signed-off-by: Dvir <39403717+dvir001@users.noreply.github.com> * Update shaders.yml Signed-off-by: Dvir <39403717+dvir001@users.noreply.github.com> * Update emp.yml Signed-off-by: Dvir <39403717+dvir001@users.noreply.github.com> --------- Signed-off-by: Dvir <39403717+dvir001@users.noreply.github.com> --- Content.Client/Entry/EntryPoint.cs | 2 + .../_NF/Emp/Overlays/EmpBlastOverlay.cs | 145 ++++++++++++++++++ Content.Server/Emp/EmpSystem.cs | 18 ++- .../_NF/Emp/Components/EmpBlastComponent.cs | 30 ++++ .../_NF/Emp/Systems/EmpBlastSystem.cs | 27 ++++ .../Prototypes/_NF/Entities/Effects/emp.yml | 16 ++ Resources/Prototypes/_NF/Shaders/shaders.yml | 7 + Resources/Textures/_NF/Shaders/emp.swsl | 99 ++++++++++++ 8 files changed, 342 insertions(+), 2 deletions(-) create mode 100644 Content.Client/_NF/Emp/Overlays/EmpBlastOverlay.cs create mode 100644 Content.Shared/_NF/Emp/Components/EmpBlastComponent.cs create mode 100644 Content.Shared/_NF/Emp/Systems/EmpBlastSystem.cs create mode 100644 Resources/Prototypes/_NF/Entities/Effects/emp.yml create mode 100644 Resources/Prototypes/_NF/Shaders/shaders.yml create mode 100644 Resources/Textures/_NF/Shaders/emp.swsl diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs index 602c13149b19..210720c45dbd 100644 --- a/Content.Client/Entry/EntryPoint.cs +++ b/Content.Client/Entry/EntryPoint.cs @@ -36,6 +36,7 @@ using Robust.Shared.Prototypes; using Robust.Shared.Replays; using Robust.Shared.Timing; +using Content.Client._NF.Emp.Overlays; // Frontier namespace Content.Client.Entry { @@ -161,6 +162,7 @@ public override void PostInit() _overlayManager.AddOverlay(new SingularityOverlay()); _overlayManager.AddOverlay(new RadiationPulseOverlay()); + _overlayManager.AddOverlay(new EmpBlastOverlay()); // Frontier _chatManager.Initialize(); _clientPreferencesManager.Initialize(); _euiManager.Initialize(); diff --git a/Content.Client/_NF/Emp/Overlays/EmpBlastOverlay.cs b/Content.Client/_NF/Emp/Overlays/EmpBlastOverlay.cs new file mode 100644 index 000000000000..89e4e6fdefbd --- /dev/null +++ b/Content.Client/_NF/Emp/Overlays/EmpBlastOverlay.cs @@ -0,0 +1,145 @@ +using System.Numerics; +using Content.Shared._NF.Emp.Components; +using Robust.Client.GameObjects; +using Robust.Client.Graphics; +using Robust.Shared.Enums; +using Robust.Shared.Graphics; +using Robust.Shared.Map; +using Robust.Shared.Prototypes; +using Robust.Shared.Timing; + +namespace Content.Client._NF.Emp.Overlays +{ + public sealed class EmpBlastOverlay : Overlay + { + [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private readonly IGameTiming _gameTiming = default!; + private TransformSystem? _transform; + + private const float PvsDist = 25.0f; + + public override OverlaySpace Space => OverlaySpace.WorldSpace; + public override bool RequestScreenTexture => true; + + private readonly ShaderInstance _baseShader; + private readonly Dictionary _blasts = new(); + + public EmpBlastOverlay() + { + IoCManager.InjectDependencies(this); + _baseShader = _prototypeManager.Index("Emp").Instance().Duplicate(); + } + + protected override bool BeforeDraw(in OverlayDrawArgs args) + { + EmpQuery(args.Viewport.Eye); + return _blasts.Count > 0; + } + + protected override void Draw(in OverlayDrawArgs args) + { + if (ScreenTexture == null) + return; + + var worldHandle = args.WorldHandle; + var viewport = args.Viewport; + + foreach ((var shd, var instance) in _blasts.Values) + { + if (instance.CurrentMapCoords.MapId != args.MapId) + continue; + + // To be clear, this needs to use "inside-viewport" pixels. + // In other words, specifically NOT IViewportControl.WorldToScreen (which uses outer coordinates). + var tempCoords = viewport.WorldToLocal(instance.CurrentMapCoords.Position); + tempCoords.Y = viewport.Size.Y - tempCoords.Y; + shd?.SetParameter("renderScale", viewport.RenderScale); + shd?.SetParameter("positionInput", tempCoords); + shd?.SetParameter("range", instance.Range); + var life = (_gameTiming.RealTime - instance.Start).TotalSeconds / instance.Duration; + shd?.SetParameter("life", (float)life); + + // There's probably a very good reason not to do this. + // Oh well! + shd?.SetParameter("SCREEN_TEXTURE", viewport.RenderTarget.Texture); + + worldHandle.UseShader(shd); + worldHandle.DrawRect(Box2.CenteredAround(instance.CurrentMapCoords.Position, new Vector2(instance.Range, instance.Range) * 2f), Color.White); + } + + worldHandle.UseShader(null); + } + + //Queries all blasts on the map and either adds or removes them from the list of rendered blasts based on whether they should be drawn (in range? on the same z-level/map? blast entity still exists?) + private void EmpQuery(IEye? currentEye) + { + _transform ??= _entityManager.System(); + + if (currentEye == null) + { + _blasts.Clear(); + return; + } + + var currentEyeLoc = currentEye.Position; + + var blasts = _entityManager.EntityQueryEnumerator(); + //Add all blasts that are not added yet but qualify + while (blasts.MoveNext(out var blastEntity, out var blast)) + { + if (!_blasts.ContainsKey(blastEntity) && BlastQualifies(blastEntity, currentEyeLoc, blast)) + { + _blasts.Add( + blastEntity, + ( + _baseShader.Duplicate(), + new EmpShaderInstance( + _transform.GetMapCoordinates(blastEntity), + blast.VisualRange, + blast.StartTime, + blast.VisualDuration + ) + ) + ); + } + } + + var activeShaderIds = _blasts.Keys; + foreach (var blastEntity in activeShaderIds) //Remove all blasts that are added and no longer qualify + { + if (_entityManager.EntityExists(blastEntity) && + _entityManager.TryGetComponent(blastEntity, out EmpBlastComponent? blast) && + BlastQualifies(blastEntity, currentEyeLoc, blast)) + { + var shaderInstance = _blasts[blastEntity]; + shaderInstance.instance.CurrentMapCoords = _transform.GetMapCoordinates(blastEntity); + shaderInstance.instance.Range = blast.VisualRange; + } + else + { + _blasts[blastEntity].shd.Dispose(); + _blasts.Remove(blastEntity); + } + } + + } + + private bool BlastQualifies(EntityUid blastEntity, MapCoordinates currentEyeLoc, EmpBlastComponent blast) + { + var transformComponent = _entityManager.GetComponent(blastEntity); + var transformSystem = _entityManager.System(); + return transformComponent.MapID == currentEyeLoc.MapId + && transformSystem.InRange(transformComponent.Coordinates, transformSystem.ToCoordinates(transformComponent.ParentUid, currentEyeLoc), PvsDist + blast.VisualRange); + } + + private sealed record EmpShaderInstance(MapCoordinates CurrentMapCoords, float Range, TimeSpan Start, float Duration) + { + public MapCoordinates CurrentMapCoords = CurrentMapCoords; + public float Range = Range; + public TimeSpan Start = Start; + public float Duration = Duration; + }; + } +} + diff --git a/Content.Server/Emp/EmpSystem.cs b/Content.Server/Emp/EmpSystem.cs index d8eab0c5d1f1..7b575e4b9ab2 100644 --- a/Content.Server/Emp/EmpSystem.cs +++ b/Content.Server/Emp/EmpSystem.cs @@ -6,6 +6,10 @@ using Content.Shared.Examine; using Robust.Server.GameObjects; using Robust.Shared.Map; +using Content.Shared._NF.Emp.Components; // Frontier +using Robust.Server.GameStates; // Frontier: EMP Blast PVS +using Robust.Shared.Configuration; // Frontier: EMP Blast PVS +using Robust.Shared; // Frontier: EMP Blast PVS namespace Content.Server.Emp; @@ -13,8 +17,10 @@ public sealed class EmpSystem : SharedEmpSystem { [Dependency] private readonly EntityLookupSystem _lookup = default!; [Dependency] private readonly TransformSystem _transform = default!; + [Dependency] private readonly PvsOverrideSystem _pvs = default!; // Frontier: EMP Blast PVS + [Dependency] private readonly IConfigurationManager _cfg = default!; // Frontier: EMP Blast PVS - public const string EmpPulseEffectPrototype = "EffectEmpPulse"; + public const string EmpPulseEffectPrototype = "EffectEmpBlast"; // Frontier: EffectEmpPulse public override void Initialize() { @@ -41,7 +47,15 @@ public void EmpPulse(MapCoordinates coordinates, float range, float energyConsum { TryEmpEffects(uid, energyConsumption, duration); } - Spawn(EmpPulseEffectPrototype, coordinates); + + var empBlast = Spawn(EmpPulseEffectPrototype, coordinates); // Frontier: Added visual effect + EnsureComp(empBlast, out var empBlastComp); // Frontier + empBlastComp.VisualRange = range; // Frontier + + if (range > _cfg.GetCVar(CVars.NetMaxUpdateRange)) // Frontier + _pvs.AddGlobalOverride(empBlast); // Frontier + + Dirty(empBlast, empBlastComp); // Frontier } ///

diff --git a/Content.Shared/_NF/Emp/Components/EmpBlastComponent.cs b/Content.Shared/_NF/Emp/Components/EmpBlastComponent.cs new file mode 100644 index 000000000000..ea58235bd618 --- /dev/null +++ b/Content.Shared/_NF/Emp/Components/EmpBlastComponent.cs @@ -0,0 +1,30 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared._NF.Emp.Components; + +/// +/// Create circle pulse animation of emp around object. +/// Drawn on client after creation only once per component lifetime. +/// +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState] +public sealed partial class EmpBlastComponent : Component +{ + /// + /// Timestamp when component was assigned to this entity. + /// + [AutoNetworkedField] + public TimeSpan StartTime; + + /// + /// How long will animation play in seconds. + /// Can be overridden by . + /// + [DataField, AutoNetworkedField] + public float VisualDuration = 1f; + + /// + /// The range of animation. + /// + [DataField, AutoNetworkedField] + public float VisualRange = 5f; +} diff --git a/Content.Shared/_NF/Emp/Systems/EmpBlastSystem.cs b/Content.Shared/_NF/Emp/Systems/EmpBlastSystem.cs new file mode 100644 index 000000000000..e5476ab693b8 --- /dev/null +++ b/Content.Shared/_NF/Emp/Systems/EmpBlastSystem.cs @@ -0,0 +1,27 @@ +using Content.Shared._NF.Emp.Components; +using Robust.Shared.Spawners; +using Robust.Shared.Timing; + +namespace Content.Shared._NF.Emp.Systems; + +public sealed class EmpBlastSystem : EntitySystem +{ + [Dependency] private readonly IGameTiming _timing = default!; + + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnStartup); + } + + private void OnStartup(EntityUid uid, EmpBlastComponent component, ComponentStartup args) + { + component.StartTime = _timing.RealTime; + + // try to get despawn time or keep default duration time + if (TryComp(uid, out var despawn)) + { + component.VisualDuration = despawn.Lifetime; + } + } +} diff --git a/Resources/Prototypes/_NF/Entities/Effects/emp.yml b/Resources/Prototypes/_NF/Entities/Effects/emp.yml new file mode 100644 index 000000000000..24e775744e0b --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Effects/emp.yml @@ -0,0 +1,16 @@ +- type: entity + name: emp blast + id: EffectEmpBlast + description: Looking at this anomaly makes you feel an electric tingling all over your body. + categories: [ HideSpawnMenu ] + components: + - type: EmpBlast + - type: TimedDespawn + lifetime: 1 + - type: Tag + tags: + - HideContextMenu + - type: EmitSoundOnSpawn + sound: + path: /Audio/Effects/Lightning/lightningbolt.ogg + - type: AnimationPlayer diff --git a/Resources/Prototypes/_NF/Shaders/shaders.yml b/Resources/Prototypes/_NF/Shaders/shaders.yml new file mode 100644 index 000000000000..ed2b4c30f0e3 --- /dev/null +++ b/Resources/Prototypes/_NF/Shaders/shaders.yml @@ -0,0 +1,7 @@ +- type: shader + id: Emp + kind: source + path: "/Textures/_NF/Shaders/emp.swsl" + params: + positionInput: 0,0 + life: 0 diff --git a/Resources/Textures/_NF/Shaders/emp.swsl b/Resources/Textures/_NF/Shaders/emp.swsl new file mode 100644 index 000000000000..22c3930c8693 --- /dev/null +++ b/Resources/Textures/_NF/Shaders/emp.swsl @@ -0,0 +1,99 @@ +// From https://godotshaders.com/snippet/2d-noise/ + +uniform sampler2D SCREEN_TEXTURE; +uniform highp vec2 positionInput; +uniform highp vec2 renderScale; +uniform highp float life; +uniform highp float range; + +highp vec2 random(highp vec2 uv){ + uv = vec2( dot(uv, vec2(127.1,311.7) ), + dot(uv, vec2(269.5,183.3) ) ); + return -1.0 + 2.0 * fract(sin(uv) * 43758.5453123); +} + +highp float noise(highp vec2 uv) { + highp vec2 uv_index = floor(uv); + highp vec2 uv_fract = fract(uv); + + highp vec2 blur = smoothstep(0.0, 1.0, uv_fract); + + return mix( mix( dot( random(uv_index + vec2(0.0,0.0) ), uv_fract - vec2(0.0,0.0) ), + dot( random(uv_index + vec2(1.0,0.0) ), uv_fract - vec2(1.0,0.0) ), blur.x), + mix( dot( random(uv_index + vec2(0.0,1.0) ), uv_fract - vec2(0.0,1.0) ), + dot( random(uv_index + vec2(1.0,1.0) ), uv_fract - vec2(1.0,1.0) ), blur.x), blur.y) * 0.5 + 0.5; +} + +highp float fbm(highp vec2 uv) { + const int octaves = 6; + highp float amplitude = 0.5; + highp float frequency = 3.0; + highp float value = 0.0; + + for(int i = 0; i < octaves; i++) { + value += amplitude * noise(frequency * uv); + amplitude *= 0.5; + frequency *= 2.0; + } + return value; +} + +void fragment() { + highp vec2 finalCoords = (FRAGCOORD.xy - positionInput) / (renderScale * 32.0); + highp float distanceToCenter = length(finalCoords); + highp float nlife = pow(sin(clamp(life, 0.0, 1.0) * 3.141592), 0.5); + highp float on = ((range - distanceToCenter) / range); + highp float n = on; + highp vec2 fcOffset = vec2(fbm(finalCoords.xy + life / 2.0),fbm(finalCoords.yx + life / 2.0)); + n *= fbm((finalCoords + fcOffset) / (nlife / (n * 1.5))) * 1.1; + n *= clamp(nlife, 0.0, 1.0); + highp float a = 0.0; // Alpha + highp float p = 0.0; // Position between L and R stops + lowp vec3 lCol = vec3(0.0); // Left stop color + lowp vec3 rCol = vec3(0.0); // Right stop color + + if (n <= 0.05) { + p = 0.0; + a = 0.0; + lCol = vec3(0.0); + rCol = vec3(0.0); + } else if (n < 0.132) { + p = (n - 0.05) / (0.132 - 0.05); + a = p; + lCol = vec3(0.0); + rCol = vec3(0.098, 0.112, 0.406); + } else if (n < 0.186) { + p = (n - 0.132) / (0.186 - 0.132); + a = 1.0; + lCol = vec3(0.098, 0.112, 0.406); + rCol = vec3(0.168, 0.288, 1.000); + } else if (n < 0.388) { + p = (n - 0.186) / (0.388 - 0.186); + a = 1.0; + lCol = vec3(0.168, 0.288, 1.000); + rCol = vec3(0.583, 0.640, 1.000); + } else if (n >= 0.388) { + p = (n - 0.388) / 0.5; + a = 1.0; + lCol = vec3(0.583, 0.640, 1.000); + rCol = vec3(1.000, 1.000, 1.000); + } + + p = clamp(p, 0.0, 1.0); + + highp vec4 warped = zTextureSpec(SCREEN_TEXTURE, (FRAGCOORD.xy*SCREEN_PIXEL_SIZE)+clamp(on*nlife*(fcOffset/8.0), 0.0, 1.0)); + + // Extremely hacky way to detect FoV cones + highp float osum = warped.r + warped.g + warped.b; + highp float osr = osum > 0.1 ? 1.0 : 10.0 * osum; + + // Apply overlay + // FYI: If you want a smoother mix, swap lCol and rCol. + warped += mix( + vec4(0.0), + vec4(mix(rCol, lCol, vec3(p)), a), + osr + ); + + COLOR = warped; +} From e66d9e91b6ae172bf88603e19a422e7531bdce5d Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Sat, 18 Jan 2025 12:57:06 +0100 Subject: [PATCH 170/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 6ffb403cf4cb..ce9963421052 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Colin_Tel, DLondon - changes: - - message: Some traitors seem to have nothing else to lose. - type: Add - id: 437 - time: '2024-07-21T16:35:16.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1487 - author: Colin-Tel changes: - message: Playtime requirements across "newbie jobs" have been adjusted. @@ -3858,3 +3851,10 @@ id: 936 time: '2025-01-18T11:56:07.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2742 +- author: dvir001 + changes: + - message: EMP Pulse got a new visual look. + type: Tweak + id: 937 + time: '2025-01-18T11:56:47.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2762 From 71932a3f1c8b2c902d69bcbc54e4b1d8316bba79 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Sat, 18 Jan 2025 12:06:08 +0000 Subject: [PATCH 171/205] bodypart refactor (#2718) * automatically pick body part appearance from species * automatically pick body part appearance from species when attaching * make setting organs and children on parts yml work * giant body part refactor * refactor deltav species body parts * ??? * ??? --------- Co-authored-by: deltanedas <@deltanedas:kde.org> --- .../Body/Systems/SharedBodySystem.Organs.cs | 4 + .../Body/Systems/SharedBodySystem.Parts.cs | 9 + .../Body/Part/BodyPartAppearanceComponent.cs | 7 +- Resources/Prototypes/Body/Parts/animal.yml | 65 ++--- Resources/Prototypes/Body/Parts/arachnid.yml | 2 + Resources/Prototypes/Body/Parts/base.yml | 206 ++++++++------ Resources/Prototypes/Body/Parts/diona.yml | 4 + .../Prototypes/Body/Parts/gingerbread.yml | 4 + Resources/Prototypes/Body/Parts/human.yml | 4 + Resources/Prototypes/Body/Parts/moth.yml | 4 + Resources/Prototypes/Body/Parts/rat.yml | 5 +- Resources/Prototypes/Body/Parts/reptilian.yml | 4 + Resources/Prototypes/Body/Parts/silicon.yml | 76 +---- Resources/Prototypes/Body/Parts/skeleton.yml | 206 ++++---------- Resources/Prototypes/Body/Parts/slime.yml | 51 +--- Resources/Prototypes/Body/Parts/vox.yml | 262 ++---------------- Resources/Prototypes/_DV/Body/Parts/harpy.yml | 232 ++-------------- .../Prototypes/_DV/Body/Parts/rodentia.yml | 207 +------------- .../Prototypes/_DV/Body/Parts/vulpkanin.yml | 243 ++-------------- .../_Shitmed/Body/Parts/Animal/carp.yml | 37 +++ .../Body/{Organs => Parts}/Animal/kobold.yml | 37 +-- .../Body/{Organs => Parts}/Animal/monkey.yml | 37 +-- .../Prototypes/_Shitmed/Body/Parts/animal.yml | 41 +-- .../Prototypes/_Shitmed/Body/Parts/base.yml | 88 ++++++ .../_Shitmed/Body/Parts/cybernetic.yml | 105 +++---- .../Prototypes/_Shitmed/Species/cyborg.yml | 59 ++++ 26 files changed, 590 insertions(+), 1409 deletions(-) create mode 100644 Resources/Prototypes/_Shitmed/Body/Parts/Animal/carp.yml rename Resources/Prototypes/_Shitmed/Body/{Organs => Parts}/Animal/kobold.yml (84%) rename Resources/Prototypes/_Shitmed/Body/{Organs => Parts}/Animal/monkey.yml (84%) create mode 100644 Resources/Prototypes/_Shitmed/Body/Parts/base.yml create mode 100644 Resources/Prototypes/_Shitmed/Species/cyborg.yml diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs b/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs index 7065284a1f0e..6f68e9f10e0c 100644 --- a/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs +++ b/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs @@ -88,6 +88,10 @@ private void RemoveOrgan(Entity organEnt, EntityUid parentPartUi return null; Containers.EnsureContainer(parentEnt, GetOrganContainerId(slotId)); + // Shitmed Change: Don't throw when a slot already exists + if (parentEnt.Comp.Organs.TryGetValue(slotId, out var existing)) + return existing; + var slot = new OrganSlot(slotId); parentEnt.Comp.Organs.Add(slotId, slot); return slot; diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs index d0f5b2cd7e21..48b48baf1874 100644 --- a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs +++ b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs @@ -59,6 +59,11 @@ private void OnMapInit(Entity ent, ref MapInitEvent args) { Containers.EnsureContainer(ent, GetPartSlotContainerId(connection)); } + + foreach (var organ in ent.Comp.Organs.Keys) + { + Containers.EnsureContainer(ent, GetOrganContainerId(organ)); + } } private void OnBodyPartRemove(Entity ent, ref ComponentRemove args) @@ -465,6 +470,10 @@ public bool TryGetParentBodyPart( return null; Containers.EnsureContainer(partUid, GetPartSlotContainerId(slotId)); + // Shitmed Change: Don't throw if the slot already exists + if (part.Children.TryGetValue(slotId, out var existing)) + return existing; + var partSlot = new BodyPartSlot(slotId, partType); part.Children.Add(slotId, partSlot); Dirty(partUid, part); diff --git a/Content.Shared/_Shitmed/Body/Part/BodyPartAppearanceComponent.cs b/Content.Shared/_Shitmed/Body/Part/BodyPartAppearanceComponent.cs index 2e7da47fa583..a192ead4e1c3 100644 --- a/Content.Shared/_Shitmed/Body/Part/BodyPartAppearanceComponent.cs +++ b/Content.Shared/_Shitmed/Body/Part/BodyPartAppearanceComponent.cs @@ -1,8 +1,8 @@ using Content.Shared.Humanoid; using Content.Shared.Humanoid.Prototypes; using Content.Shared.Humanoid.Markings; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; namespace Content.Shared._Shitmed.Body.Part; @@ -23,10 +23,9 @@ public sealed partial class BodyPartAppearanceComponent : Component /// /// ID of this custom base layer. Must be a . - /// I don't actually know if these serializer props are necessary. I just lifted this from MS14 lol. /// - [DataField(customTypeSerializer: typeof(PrototypeIdSerializer)), AutoNetworkedField] - public string? ID { get; set; } + [DataField, AutoNetworkedField] + public ProtoId? ID { get; set; } /// /// Color of this custom base layer. Null implies skin colour if the corresponding is set to match skin. diff --git a/Resources/Prototypes/Body/Parts/animal.yml b/Resources/Prototypes/Body/Parts/animal.yml index 351e23783111..03f765e40fac 100644 --- a/Resources/Prototypes/Body/Parts/animal.yml +++ b/Resources/Prototypes/Body/Parts/animal.yml @@ -1,99 +1,76 @@ +# Shitmed Change: This file was mostly reorganized by shitmed to use composition + # Just copypasta of some human basic body parts for interaction, # only differences for now is that limbs work in pairs, -# they are unextractable and can't be spawned (no surgery on Animals!?). - type: entity - id: PartAnimal - parent: BaseItem - name: "animal body part" abstract: true + parent: BasePart + id: PartAnimalBase components: # yes these sprites dont make sense i dont care its better than them being invisible - type: Sprite sprite: Mobs/Species/Reptilian/parts.rsi - - type: Damageable - damageContainer: OrganicPart # Shitmed - - type: BodyPart - - type: ContainerContainer - containers: - bodypart: !type:Container - ents: [] + - type: Icon + sprite: Mobs/Species/Reptilian/parts.rsi - type: StaticPrice price: 50 - - type: Tag - tags: - - Trash - - type: Gibbable - - type: Extractable - juiceSolution: - reagents: - - ReagentId: Fat - Quantity: 3 - - ReagentId: Blood - Quantity: 10 - type: entity + parent: PartAnimalBase id: HandsAnimal name: animal hands - parent: PartAnimal - categories: [ HideSpawnMenu ] components: - type: Sprite layers: - state: l_hand - state: r_hand + - type: Icon + state: l_hand # cba to make a state for it - type: BodyPart partType: Hand #symmetry: Left slotId: hands # Shitmed - type: entity + parent: PartAnimalBase id: LegsAnimal name: animal legs - parent: PartAnimal - categories: [ HideSpawnMenu ] components: - type: Sprite layers: - state: l_leg - state: r_leg + - type: Icon + state: l_leg # cba to make a state for it - type: BodyPart partType: Leg slotId: legs # Shitmed - type: MovementBodyPart - type: entity + parent: PartAnimalBase id: FeetAnimal name: animal feet - parent: PartAnimal - categories: [ HideSpawnMenu ] components: - type: Sprite layers: - state: r_foot - state: l_foot + - type: Icon + state: l_foot # cba to make a state for it - type: BodyPart partType: Foot slotId: feet # Shitmed - type: entity + parent: [ PartAnimalBase, BaseTorso ] id: TorsoAnimal name: animal torso - parent: PartAnimal - categories: [ HideSpawnMenu ] components: - - type: Sprite - layers: - - state: torso_m - type: BodyPart - partType: Torso - - type: Damageable - damageContainer: Biological - - type: Extractable - juiceSolution: - reagents: - - ReagentId: Fat - Quantity: 10 - - ReagentId: Blood - Quantity: 20 - + # standard organs are good for most animals + children: # most animals have no hands (primate is unused) so just legs by default + legs: + id: legs + type: Leg diff --git a/Resources/Prototypes/Body/Parts/arachnid.yml b/Resources/Prototypes/Body/Parts/arachnid.yml index d275bd91c63b..23f76fbfad2c 100644 --- a/Resources/Prototypes/Body/Parts/arachnid.yml +++ b/Resources/Prototypes/Body/Parts/arachnid.yml @@ -6,6 +6,8 @@ name: "arachnid body part" abstract: true components: + - type: BodyPart # Shitmed Change + species: Arachnid - type: Extractable juiceSolution: reagents: diff --git a/Resources/Prototypes/Body/Parts/base.yml b/Resources/Prototypes/Body/Parts/base.yml index 81f16b1ede0f..e8d1066e3d6c 100644 --- a/Resources/Prototypes/Body/Parts/base.yml +++ b/Resources/Prototypes/Body/Parts/base.yml @@ -1,12 +1,24 @@ +# Shitmed Change: this entire file is reorganized for shitmed: +# Instead of random species parts inheriting BaseItem and copy pasting stuff, +# EVERYTHING inherits either BasePart or BasePartInorganic. +# Then individual part LS just inherits from PartSBase and BaseL where S and L are the species and limb. +# All limbs have the usual state, PartSBase just needs to set the rsi for sprite and icon - type: entity - id: BasePart + abstract: true parent: BaseItem + id: BasePartInorganic name: "body part" - abstract: true components: + - type: Icon + sprite: Mobs/Species/Human/parts.rsi - type: Damageable - damageContainer: OrganicPart # Shitmed Change + damageContainer: Inorganic # Shitmed Change - type: BodyPart + - type: SurgeryTool # Shitmed Change + startSound: + path: /Audio/_Shitmed/Medical/Surgery/organ1.ogg + endSound: + path: /Audio/_Shitmed/Medical/Surgery/organ2.ogg - type: Gibbable - type: ContainerContainer containers: @@ -16,99 +28,72 @@ price: 100 - type: Tag tags: - - Trash - # Shitmed Change Start - - type: SurgeryTool - startSound: - path: /Audio/_Shitmed/Medical/Surgery/organ1.ogg - endSound: - path: /Audio/_Shitmed/Medical/Surgery/organ2.ogg - - type: Destructible - thresholds: - - trigger: - !type:DamageTypeTrigger - damageType: Blunt - damage: 110 - behaviors: - - !type:GibPartBehavior { } - - trigger: - !type:DamageTypeTrigger - damageType: Slash - damage: 100 # DeltaV - behaviors: - - !type:GibPartBehavior { } - - trigger: - !type:DamageTypeTrigger - damageType: Heat - damage: 2000 # DeltaV - behaviors: - - !type:SpawnEntitiesBehavior - spawnInContainer: true - spawn: - Ash: - min: 1 - max: 1 - - !type:BurnBodyBehavior { } - - !type:PlaySoundBehavior - sound: - collection: MeatLaserImpact - # Shitmed Change End + - Trash - type: entity - id: BaseTorso - name: "torso" - parent: BasePart abstract: true + id: BaseTorsoInorganic + name: "torso" components: + - type: Sprite + state: "torso_m" + - type: Icon + state: "torso_m" - type: BodyPart partType: Torso # Shitmed Change Start toolName: "a torso" containerName: "torso_slot" + children: + right arm: + id: right arm + type: Arm + left arm: + id: left arm + type: Arm + right leg: + id: right leg + type: Leg + left leg: + id: left leg + type: Leg + head: + id: head + type: Head + organs: + heart: + id: heart + lungs: + id: lungs + stomach: + id: stomach + liver: + id: liver + kidneys: + id: kidneys - type: ContainerContainer containers: torso_slot: !type:ContainerSlot {} - - type: Destructible - thresholds: - - trigger: - !type:DamageTypeTrigger - damageType: Blunt - damage: 400 - behaviors: - - !type:GibPartBehavior { } - - trigger: - !type:DamageTypeTrigger - damageType: Slash - damage: 400 - behaviors: - - !type:GibPartBehavior { } - - trigger: - !type:DamageTypeTrigger - damageType: Heat - damage: 4000 # DeltaV - behaviors: - - !type:SpawnEntitiesBehavior - spawnInContainer: true - spawn: - Ash: - min: 1 - max: 1 - - !type:BurnBodyBehavior { } - - !type:PlaySoundBehavior - sound: - collection: MeatLaserImpact # Shitmed Change End - type: entity + abstract: true id: BaseHead name: "head" - parent: BasePart - abstract: true components: + - type: Sprite + state: "head_m" + - type: Icon + state: "head_m" - type: BodyPart partType: Head toolName: "a head" # Shitmed Change vital: true + organs: # Shitmed Change + brain: + id: brain + eyes: + id: eyes - type: Input context: "ghost" - type: Tag @@ -116,89 +101,130 @@ - Head - type: entity + abstract: true id: BaseLeftArm name: "left arm" - parent: BasePart - abstract: true components: + - type: Sprite + state: "l_arm" + - type: Icon + state: "l_arm" - type: BodyPart partType: Arm symmetry: Left toolName: "a left arm" # Shitmed Change + children: # Shitmed Change + left hand: + id: left hand + type: Hand - type: entity + abstract: true id: BaseRightArm name: "right arm" - parent: BasePart - abstract: true components: + - type: Sprite + state: "r_arm" + - type: Icon + state: "r_arm" - type: BodyPart partType: Arm symmetry: Right toolName: "a right arm" # Shitmed Change + children: # Shitmed Change + right hand: + id: right hand + type: Hand - type: entity + abstract: true id: BaseLeftHand name: "left hand" - parent: BasePart - abstract: true components: + - type: Sprite + state: "l_hand" + - type: Icon + state: "l_hand" - type: BodyPart partType: Hand symmetry: Left toolName: "a left hand" # Shitmed Change - type: entity + abstract: true id: BaseRightHand name: "right hand" - parent: BasePart - abstract: true components: + - type: Sprite + state: "r_hand" + - type: Icon + state: "r_hand" - type: BodyPart partType: Hand symmetry: Right toolName: "a right hand" # Shitmed Change - type: entity + abstract: true id: BaseLeftLeg name: "left leg" - parent: BasePart - abstract: true components: + - type: Sprite + state: "l_leg" + - type: Icon + state: "l_leg" - type: BodyPart partType: Leg symmetry: Left toolName: "a left leg" # Shitmed Change + children: # Shitmed Change + left foot: + id: left foot + type: Foot - type: MovementBodyPart - type: entity + abstract: true id: BaseRightLeg name: "right leg" - parent: BasePart - abstract: true components: + - type: Sprite + state: "r_leg" + - type: Icon + state: "r_leg" - type: BodyPart partType: Leg symmetry: Right toolName: "a right leg" # Shitmed Change + children: # Shitmed Change + right foot: + id: right foot + type: Foot - type: MovementBodyPart - type: entity + abstract: true id: BaseLeftFoot name: "left foot" - parent: BasePart - abstract: true components: + - type: Sprite + state: "l_foot" + - type: Icon + state: "l_foot" - type: BodyPart partType: Foot symmetry: Left toolName: "a left foot" # Shitmed Change + - type: entity + abstract: true id: BaseRightFoot name: "right foot" - parent: BasePart - abstract: true components: + - type: Sprite + state: "r_foot" + - type: Icon + state: "r_foot" - type: BodyPart partType: Foot symmetry: Right diff --git a/Resources/Prototypes/Body/Parts/diona.yml b/Resources/Prototypes/Body/Parts/diona.yml index 0ef08fa36154..cc1382d0d602 100644 --- a/Resources/Prototypes/Body/Parts/diona.yml +++ b/Resources/Prototypes/Body/Parts/diona.yml @@ -6,6 +6,10 @@ components: - type: Sprite sprite: Mobs/Species/Diona/parts.rsi + - type: Icon # Shitmed Change + sprite: Mobs/Species/Diona/parts.rsi + - type: BodyPart # Shitmed Change + species: Diona - type: entity id: TorsoDiona diff --git a/Resources/Prototypes/Body/Parts/gingerbread.yml b/Resources/Prototypes/Body/Parts/gingerbread.yml index f95e66145be1..5f1d1d4eb87d 100644 --- a/Resources/Prototypes/Body/Parts/gingerbread.yml +++ b/Resources/Prototypes/Body/Parts/gingerbread.yml @@ -4,6 +4,10 @@ name: "gingerbread body part" abstract: true components: + - type: Icon # Shitmed Change + sprite: Mobs/Species/Gingerbread/parts.rsi + - type: BodyPart # Shitmed Change + species: Gingerbread - type: Extractable juiceSolution: reagents: diff --git a/Resources/Prototypes/Body/Parts/human.yml b/Resources/Prototypes/Body/Parts/human.yml index a1510fcdbb19..e24271066110 100644 --- a/Resources/Prototypes/Body/Parts/human.yml +++ b/Resources/Prototypes/Body/Parts/human.yml @@ -6,6 +6,10 @@ name: "human body part" abstract: true components: + - type: Icon # Shitmed Change + sprite: Mobs/Species/Human/parts.rsi + - type: BodyPart # Shitmed Change + species: Human - type: Extractable juiceSolution: reagents: diff --git a/Resources/Prototypes/Body/Parts/moth.yml b/Resources/Prototypes/Body/Parts/moth.yml index bb96430383a9..de11ed27ca29 100644 --- a/Resources/Prototypes/Body/Parts/moth.yml +++ b/Resources/Prototypes/Body/Parts/moth.yml @@ -6,6 +6,10 @@ name: "moth body part" abstract: true components: + - type: Icon # Shitmed Change + sprite: Mobs/Species/Moth/parts.rsi + - type: BodyPart # Shitmed Change + species: Moth - type: Extractable juiceSolution: reagents: diff --git a/Resources/Prototypes/Body/Parts/rat.yml b/Resources/Prototypes/Body/Parts/rat.yml index bd51e006f70f..b80adf534ac4 100644 --- a/Resources/Prototypes/Body/Parts/rat.yml +++ b/Resources/Prototypes/Body/Parts/rat.yml @@ -3,7 +3,7 @@ - type: entity id: TorsoRat name: "animal torso" - parent: PartAnimal + parent: TorsoAnimal # Shitmed Change categories: [ HideSpawnMenu ] components: - type: BodyPart @@ -18,3 +18,6 @@ - type: Sprite sprite: Mobs/Animals/mouse.rsi state: splat-0 + - type: Icon # Shitmed Change + sprite: Mobs/Animals/mouse.rsi + state: splat-0 diff --git a/Resources/Prototypes/Body/Parts/reptilian.yml b/Resources/Prototypes/Body/Parts/reptilian.yml index a299636352a6..644c19ceca9f 100644 --- a/Resources/Prototypes/Body/Parts/reptilian.yml +++ b/Resources/Prototypes/Body/Parts/reptilian.yml @@ -6,6 +6,10 @@ name: "reptilian body part" abstract: true components: + - type: Icon # Shitmed Change + sprite: Mobs/Species/Reptilian/parts.rsi + - type: BodyPart # Shitmed Change + species: Reptilian - type: Extractable juiceSolution: reagents: diff --git a/Resources/Prototypes/Body/Parts/silicon.yml b/Resources/Prototypes/Body/Parts/silicon.yml index 2d30fe9fbbd3..c23fea484a29 100644 --- a/Resources/Prototypes/Body/Parts/silicon.yml +++ b/Resources/Prototypes/Body/Parts/silicon.yml @@ -1,24 +1,20 @@ +# Shitmed Change: this file is mostly reorganized by shitmed to use composition - type: entity - id: PartSilicon - parent: BaseItem abstract: true + parent: BasePartInorganic + id: PartSiliconBase components: - type: Sprite sprite: Objects/Specific/Robotics/cyborg_parts.rsi - type: Icon sprite: Objects/Specific/Robotics/cyborg_parts.rsi - - type: Damageable - damageContainer: Inorganic - - type: BodyPart - - type: ContainerContainer - containers: - bodypart: !type:Container - ents: [] - type: StaticPrice price: 5 + - type: BodyPart # Shitmed Change + species: Cyborg - type: Tag tags: - - Trash + - Trash - type: PhysicalComposition materialComposition: Steel: 25 @@ -26,28 +22,12 @@ guides: - Cyborgs - Robotics - # Shitmed Change Start - - type: SurgeryTool - startSound: - path: /Audio/_Shitmed/Medical/Surgery/organ1.ogg - endSound: - path: /Audio/_Shitmed/Medical/Surgery/organ2.ogg - - type: Gibbable - # Shitmed Change End - type: entity + parent: [ PartSiliconBase, BaseLeftArm ] id: LeftArmBorg - parent: PartSilicon name: cyborg left arm components: - - type: BodyPart - partType: Arm # Shitmed Change - symmetry: Left - toolName: "a left arm" # Shitmed Change - children: # Shitmed Change - left hand: - id: "left hand" - type: Hand - type: Sprite state: borg_l_arm - type: Icon @@ -59,18 +39,10 @@ - BorgLArm - type: entity + parent: [ PartSiliconBase, BaseRightArm ] id: RightArmBorg - parent: PartSilicon name: cyborg right arm components: - - type: BodyPart - partType: Arm # Shitmed Change - symmetry: Right - toolName: "a right arm" # Shitmed Change - children: # Shitmed Change - right hand: - id: "right hand" - type: Hand - type: Sprite state: borg_r_arm - type: Icon @@ -82,19 +54,10 @@ - BorgRArm - type: entity + parent: [ PartSiliconBase, BaseLeftLeg ] id: LeftLegBorg - parent: PartSilicon name: cyborg left leg components: - - type: BodyPart - partType: Leg - symmetry: Left - toolName: "a left leg" # Shitmed Change - children: # Shitmed Change - left foot: - id: "left foot" - type: Foot - - type: MovementBodyPart - type: Sprite state: borg_l_leg - type: Icon @@ -106,19 +69,10 @@ - BorgLLeg - type: entity + parent: [ PartSiliconBase, BaseRightLeg ] id: RightLegBorg - parent: PartSilicon name: cyborg right leg components: - - type: BodyPart - partType: Leg - symmetry: Right - toolName: "a right leg" # Shitmed Change - children: # Shitmed Change - right foot: - id: "right foot" - type: Foot - - type: MovementBodyPart - type: Sprite state: borg_r_leg - type: Icon @@ -130,13 +84,10 @@ - BorgRLeg - type: entity + parent: [ PartSiliconBase, BaseHead ] id: LightHeadBorg - parent: PartSilicon name: cyborg head components: - - type: BodyPart - partType: Head - toolName: "a head" # Shitmed Change - type: Sprite state: borg_head - type: Icon @@ -147,13 +98,10 @@ - BorgHead - type: entity + parent: [ PartSiliconBase, BaseTorsoInorganic ] id: TorsoBorg - parent: PartSilicon name: cyborg torso components: - - type: BodyPart - partType: Torso - toolName: "a torso" # Shitmed Change - type: Sprite state: borg_chest - type: Icon diff --git a/Resources/Prototypes/Body/Parts/skeleton.yml b/Resources/Prototypes/Body/Parts/skeleton.yml index ceb95fcc44e9..015dbced18bf 100644 --- a/Resources/Prototypes/Body/Parts/skeleton.yml +++ b/Resources/Prototypes/Body/Parts/skeleton.yml @@ -1,196 +1,106 @@ -# TODO BODY: Part damage +# this file is fully reorganized by shitmed - type: entity - id: PartSkeleton - parent: BaseItem - name: "skeleton body part" abstract: true + parent: BasePartInorganic + id: PartSkeletonBase + name: skeleton body part components: - - type: Damageable - damageContainer: OrganicPart # Shitmed Change + - type: Sprite + sprite: Mobs/Species/Skeleton/parts.rsi + - type: Icon + sprite: Mobs/Species/Skeleton/parts.rsi + - type: Destructible # Shitmed Change: Let blunt weapons break bones + thresholds: + - trigger: !type:DamageTypeTrigger + damageType: Blunt + damage: 110 + behaviors: + - !type:GibPartBehavior - type: BodyPart - - type: ContainerContainer - containers: - bodypart: !type:Container - ents: [] + species: Skeleton # Shitmed Change - type: StaticPrice price: 20 - - type: Gibbable - type: Tag tags: - - Trash + - Trash - type: entity + parent: [ PartSkeletonBase, BaseTorsoInorganic ] id: TorsoSkeleton - name: "skeleton torso" - parent: PartSkeleton - components: - - type: Sprite - sprite: Mobs/Species/Skeleton/parts.rsi - state: "torso_m" - - type: Icon - sprite: Mobs/Species/Skeleton/parts.rsi - state: "torso_m" - - type: BodyPart - partType: Torso + name: skeleton torso - type: entity + parent: [ PartSkeletonBase, BaseHead ] id: HeadSkeleton - name: "skull" + name: skull description: Alas poor Yorick... - parent: PartSkeleton components: - - type: Sprite - sprite: Mobs/Species/Skeleton/parts.rsi - state: "skull_icon" - scale: 0.5, 0.5 # DeltaV - Scale down sprite because it looks too big - - type: Icon - sprite: Mobs/Species/Skeleton/parts.rsi - state: "skull_icon" - - type: BodyPart - partType: Head - - type: Input - context: "human" - - type: Speech - speechVerb: Skeleton - - type: SkeletonAccent - - type: Actions - - type: Vocal - sounds: - Male: Skeleton - Female: Skeleton - Unsexed: Skeleton - - type: Emoting - - type: Grammar - attributes: - proper: true - - type: Examiner - - type: DoAfter - - type: MobState - allowedStates: - - Alive - - type: Tag - tags: - - MindTransferTarget - - Head + - type: Sprite + state: "skull_icon" + scale: 0.5, 0.5 # DeltaV - Scale down sprite because it looks too big + - type: Icon + state: "skull_icon" + - type: Input + context: "human" + - type: Speech + speechVerb: Skeleton + - type: SkeletonAccent + - type: Actions + - type: Vocal + sounds: + Male: Skeleton + Female: Skeleton + Unsexed: Skeleton + - type: Emoting + - type: Grammar + attributes: + proper: true + - type: Examiner + - type: DoAfter + - type: MobState + allowedStates: + - Alive + - type: Tag + tags: + - MindTransferTarget + - Head - type: entity + parent: [ PartSkeletonBase, BaseLeftArm ] id: LeftArmSkeleton name: "left skeleton arm" - parent: PartSkeleton - components: - - type: Sprite - sprite: Mobs/Species/Skeleton/parts.rsi - state: "l_arm" - - type: Icon - sprite: Mobs/Species/Skeleton/parts.rsi - state: "l_arm" - - type: BodyPart - partType: Arm - symmetry: Left - type: entity + parent: [ PartSkeletonBase, BaseRightArm ] id: RightArmSkeleton name: "right skeleton arm" - parent: PartSkeleton - components: - - type: Sprite - sprite: Mobs/Species/Skeleton/parts.rsi - state: "r_arm" - - type: Icon - sprite: Mobs/Species/Skeleton/parts.rsi - state: "r_arm" - - type: BodyPart - partType: Arm - symmetry: Right - type: entity + parent: [ PartSkeletonBase, BaseLeftHand ] id: LeftHandSkeleton name: "left skeleton hand" - parent: PartSkeleton - components: - - type: Sprite - sprite: Mobs/Species/Skeleton/parts.rsi - state: "l_hand" - - type: Icon - sprite: Mobs/Species/Skeleton/parts.rsi - state: "l_hand" - - type: BodyPart - partType: Hand - symmetry: Left - type: entity + parent: [ PartSkeletonBase, BaseRightHand ] id: RightHandSkeleton name: "right skeleton hand" - parent: PartSkeleton - components: - - type: Sprite - sprite: Mobs/Species/Skeleton/parts.rsi - state: "r_hand" - - type: Icon - sprite: Mobs/Species/Skeleton/parts.rsi - state: "r_hand" - - type: BodyPart - partType: Hand - symmetry: Right - type: entity + parent: [ PartSkeletonBase, BaseLeftLeg ] id: LeftLegSkeleton name: "left skeleton leg" - parent: PartSkeleton - components: - - type: Sprite - sprite: Mobs/Species/Skeleton/parts.rsi - state: "l_leg" - - type: Icon - sprite: Mobs/Species/Skeleton/parts.rsi - state: "l_leg" - - type: BodyPart - partType: Leg - symmetry: Left - - type: MovementBodyPart - type: entity + parent: [ PartSkeletonBase, BaseRightLeg ] id: RightLegSkeleton name: "right skeleton leg" - parent: PartSkeleton - components: - - type: Sprite - sprite: Mobs/Species/Skeleton/parts.rsi - state: "r_leg" - - type: Icon - sprite: Mobs/Species/Skeleton/parts.rsi - state: "r_leg" - - type: BodyPart - partType: Leg - symmetry: Right - - type: MovementBodyPart - type: entity + parent: [ PartSkeletonBase, BaseLeftFoot ] id: LeftFootSkeleton name: "left skeleton foot" - parent: PartSkeleton - components: - - type: Sprite - sprite: Mobs/Species/Skeleton/parts.rsi - state: "l_foot" - - type: Icon - sprite: Mobs/Species/Skeleton/parts.rsi - state: "l_foot" - - type: BodyPart - partType: Foot - symmetry: Left - type: entity + parent: [ PartSkeletonBase, BaseRightFoot ] id: RightFootSkeleton name: "right skeleton foot" - parent: PartSkeleton - components: - - type: Sprite - sprite: Mobs/Species/Skeleton/parts.rsi - state: "r_foot" - - type: Icon - sprite: Mobs/Species/Skeleton/parts.rsi - state: "r_foot" - - type: BodyPart - partType: Foot - symmetry: Right diff --git a/Resources/Prototypes/Body/Parts/slime.yml b/Resources/Prototypes/Body/Parts/slime.yml index 4b0e94b008f2..3f5932a89493 100644 --- a/Resources/Prototypes/Body/Parts/slime.yml +++ b/Resources/Prototypes/Body/Parts/slime.yml @@ -1,96 +1,63 @@ -# TODO BODY: Part damage +# Shitmed Change: Removed components from each part, instead using composition for sprites - type: entity id: PartSlime parent: [BaseItem, BasePart] name: "slime body part" abstract: true + components: # Shitmed Change + - type: Sprite + sprite: Mobs/Species/Slime/parts.rsi + - type: Icon + sprite: Mobs/Species/Slime/parts.rsi + - type: BodyPart + species: SlimePerson - type: entity id: TorsoSlime name: "slime torso" parent: [PartSlime, BaseTorso] - components: - - type: Sprite - sprite: Mobs/Species/Slime/parts.rsi - state: "torso_m" - type: entity id: HeadSlime name: "slime head" parent: [PartSlime, BaseHead] - components: - - type: Sprite - sprite: Mobs/Species/Slime/parts.rsi - state: "head_m" - + - type: entity id: LeftArmSlime name: "left slime arm" parent: [PartSlime, BaseLeftArm] - components: - - type: Sprite - sprite: Mobs/Species/Slime/parts.rsi - state: "l_arm" - type: entity id: RightArmSlime name: "right slime arm" parent: [PartSlime, BaseRightArm] - components: - - type: Sprite - sprite: Mobs/Species/Slime/parts.rsi - state: "r_arm" - type: entity id: LeftHandSlime name: "left slime hand" parent: [PartSlime, BaseLeftHand] - components: - - type: Sprite - sprite: Mobs/Species/Slime/parts.rsi - state: "l_hand" - type: entity id: RightHandSlime name: "right slime hand" parent: [PartSlime, BaseRightHand] - components: - - type: Sprite - sprite: Mobs/Species/Slime/parts.rsi - state: "r_hand" - type: entity id: LeftLegSlime name: "left slime leg" parent: [PartSlime, BaseLeftLeg] - components: - - type: Sprite - sprite: Mobs/Species/Slime/parts.rsi - state: "l_leg" - type: entity id: RightLegSlime name: "right slime leg" parent: [PartSlime, BaseRightLeg] - components: - - type: Sprite - sprite: Mobs/Species/Slime/parts.rsi - state: "r_leg" - type: entity id: LeftFootSlime name: "left slime foot" parent: [PartSlime, BaseLeftFoot] - components: - - type: Sprite - sprite: Mobs/Species/Slime/parts.rsi - state: "l_foot" - type: entity id: RightFootSlime name: "right slime foot" parent: [PartSlime, BaseRightFoot] - components: - - type: Sprite - sprite: Mobs/Species/Slime/parts.rsi - state: "r_foot" diff --git a/Resources/Prototypes/Body/Parts/vox.yml b/Resources/Prototypes/Body/Parts/vox.yml index 1610d67304b2..dfbd511fe661 100644 --- a/Resources/Prototypes/Body/Parts/vox.yml +++ b/Resources/Prototypes/Body/Parts/vox.yml @@ -1,279 +1,73 @@ -# TODO: Add descriptions (many) -# TODO BODY: Part damage +# Shitmed Change: This file was fully reorganized to use composition - type: entity - id: PartVox - parent: BaseItem - name: "vox body part" abstract: true + parent: BasePart # Shitmed Change + id: PartVoxBase + name: "vox body part" components: - - type: Damageable - damageContainer: OrganicPart # Shitmed Change - - type: BodyPart - - type: ContainerContainer - containers: - bodypart: !type:Container - ents: [] - - type: StaticPrice - price: 100 - - type: Tag - tags: - - Trash - - type: Extractable - juiceSolution: - reagents: - - ReagentId: Fat - Quantity: 3 - - ReagentId: Blood - Quantity: 10 -# Shitmed Change Start - - type: Gibbable - - type: SurgeryTool - startSound: - path: /Audio/_Shitmed/Medical/Surgery/organ1.ogg - endSound: - path: /Audio/_Shitmed/Medical/Surgery/organ2.ogg - - type: Destructible - thresholds: - - trigger: - !type:DamageTypeTrigger - damageType: Blunt - damage: 110 - behaviors: - - !type:GibPartBehavior { } - - trigger: - !type:DamageTypeTrigger - damageType: Slash - damage: 100 # DeltaV - behaviors: - - !type:GibPartBehavior { } - - trigger: - !type:DamageTypeTrigger - damageType: Heat - damage: 2000 # DeltaV - behaviors: - - !type:SpawnEntitiesBehavior - spawnInContainer: true - spawn: - Ash: - min: 1 - max: 1 - - !type:BurnBodyBehavior { } - - !type:PlaySoundBehavior - sound: - collection: MeatLaserImpact - # Shitmed Change End + - type: Sprite + sprite: Mobs/Species/Vox/parts.rsi + - type: Icon + sprite: Mobs/Species/Vox/parts.rsi + - type: BodyPart # Shitmed Change + species: Vox - type: entity + parent: [ PartVoxBase, BaseTorso ] id: TorsoVox name: "vox torso" - parent: PartVox components: - - type: Sprite - sprite: Mobs/Species/Vox/parts.rsi - state: "torso" - - type: Icon - sprite: Mobs/Species/Vox/parts.rsi - state: "torso" - - type: Extractable - juiceSolution: - reagents: - - ReagentId: Fat - Quantity: 3 - - ReagentId: Blood - Quantity: 10 - # Shitmed Change Start - - type: BodyPart - partType: Torso - toolName: "a torso" - containerName: "torso_slot" - - type: ContainerContainer - containers: - torso_slot: !type:ContainerSlot {} - - type: Destructible - thresholds: - - trigger: - !type:DamageTypeTrigger - damageType: Blunt - damage: 400 - behaviors: - - !type:GibPartBehavior { } - - trigger: - !type:DamageTypeTrigger - damageType: Slash - damage: 400 - behaviors: - - !type:GibPartBehavior { } - - trigger: - !type:DamageTypeTrigger - damageType: Heat - damage: 4000 # DeltaV - behaviors: - - !type:SpawnEntitiesBehavior - spawnInContainer: true - spawn: - Ash: - min: 1 - max: 1 - - !type:BurnBodyBehavior { } - - !type:PlaySoundBehavior - sound: - collection: MeatLaserImpact - # Shitmed Change End + - type: Sprite + state: "torso" + - type: Icon + state: "torso" - type: entity + parent: [ PartVoxBase, BaseHead ] id: HeadVox name: "vox head" - parent: PartVox components: - - type: Sprite - sprite: Mobs/Species/Vox/parts.rsi - state: "head" - - type: Icon - sprite: Mobs/Species/Vox/parts.rsi - state: "head" - - type: BodyPart - partType: Head - vital: true - toolName: "a head" # Shitmed Change - - type: Input - context: "ghost" - - type: Tag - tags: - - Head - - type: Extractable - juiceSolution: - reagents: - - ReagentId: Fat - Quantity: 5 - - ReagentId: Blood - Quantity: 10 + - type: Sprite + state: "head" + - type: Icon + state: "head" - type: entity + parent: [ PartVoxBase, BaseLeftArm ] id: LeftArmVox name: "left vox arm" - parent: PartVox - components: - - type: Sprite - sprite: Mobs/Species/Vox/parts.rsi - state: "l_arm" - - type: Icon - sprite: Mobs/Species/Vox/parts.rsi - state: "l_arm" - - type: BodyPart - partType: Arm - symmetry: Left - toolName: "a left arm" # Shitmed Change - type: entity + parent: [ PartVoxBase, BaseRightArm ] id: RightArmVox name: "right vox arm" - parent: PartVox - components: - - type: Sprite - sprite: Mobs/Species/Vox/parts.rsi - state: "r_arm" - - type: Icon - sprite: Mobs/Species/Vox/parts.rsi - state: "r_arm" - - type: BodyPart - partType: Arm - symmetry: Right - toolName: "a right arm" # Shitmed Change - type: entity + parent: [ PartVoxBase, BaseLeftHand ] id: LeftHandVox name: "left vox hand" - parent: PartVox - components: - - type: Sprite - sprite: Mobs/Species/Vox/parts.rsi - state: "l_hand" - - type: Icon - sprite: Mobs/Species/Vox/parts.rsi - state: "l_hand" - - type: BodyPart - partType: Hand - symmetry: Left - toolName: "a left hand" # Shitmed Change - type: entity + parent: [ PartVoxBase, BaseRightHand ] id: RightHandVox name: "right vox hand" - parent: PartVox - components: - - type: Sprite - sprite: Mobs/Species/Vox/parts.rsi - state: "r_hand" - - type: Icon - sprite: Mobs/Species/Vox/parts.rsi - state: "r_hand" - - type: BodyPart - partType: Hand - symmetry: Right - toolName: "a right hand" # Shitmed Change - type: entity + parent: [ PartVoxBase, BaseLeftLeg ] id: LeftLegVox name: "left vox leg" - parent: PartVox - components: - - type: Sprite - sprite: Mobs/Species/Vox/parts.rsi - state: "l_leg" - - type: Icon - sprite: Mobs/Species/Vox/parts.rsi - state: "l_leg" - - type: BodyPart - partType: Leg - symmetry: Left - toolName: "a left leg" # Shitmed Change - - type: MovementBodyPart - type: entity + parent: [ PartVoxBase, BaseRightLeg ] id: RightLegVox name: "right vox leg" - parent: PartVox - components: - - type: Sprite - sprite: Mobs/Species/Vox/parts.rsi - state: "r_leg" - - type: Icon - sprite: Mobs/Species/Vox/parts.rsi - state: "r_leg" - - type: BodyPart - partType: Leg - symmetry: Right - toolName: "a right leg" # Shitmed Change - - type: MovementBodyPart - type: entity + parent: [ PartVoxBase, BaseLeftFoot ] id: LeftFootVox name: "left vox foot" - parent: PartVox - components: - - type: Sprite - sprite: Mobs/Species/Vox/parts.rsi - state: "l_foot" - - type: Icon - sprite: Mobs/Species/Vox/parts.rsi - state: "l_foot" - - type: BodyPart - partType: Foot - symmetry: Left - toolName: "a left foot" # Shitmed Change - type: entity + parent: [ PartVoxBase, BaseRightFoot ] id: RightFootVox name: "right vox foot" - parent: PartVox - components: - - type: Sprite - sprite: Mobs/Species/Vox/parts.rsi - state: "r_foot" - - type: Icon - sprite: Mobs/Species/Vox/parts.rsi - state: "r_foot" - - type: BodyPart - partType: Foot - symmetry: Right - toolName: "a right foot" # Shitmed Change diff --git a/Resources/Prototypes/_DV/Body/Parts/harpy.yml b/Resources/Prototypes/_DV/Body/Parts/harpy.yml index df4452b904cc..28b050b5e5de 100644 --- a/Resources/Prototypes/_DV/Body/Parts/harpy.yml +++ b/Resources/Prototypes/_DV/Body/Parts/harpy.yml @@ -1,257 +1,61 @@ - type: entity - id: PartHarpy - parent: BaseItem - name: "harpy body part" abstract: true - components: - - type: Damageable - damageContainer: OrganicPart # Shitmed Change - - type: BodyPart - - type: ContainerContainer - containers: - bodypart: !type:Container - ents: [] - - type: StaticPrice #DynamicPrice - price: 100 - - type: Tag - tags: - - Trash - # Shitmed Change Start - - type: Gibbable - - type: SurgeryTool - startSound: - path: /Audio/_Shitmed/Medical/Surgery/organ1.ogg - endSound: - path: /Audio/_Shitmed/Medical/Surgery/organ2.ogg - - type: Destructible - thresholds: - - trigger: - !type:DamageTypeTrigger - damageType: Blunt - damage: 150 # DeltaV - behaviors: - - !type:GibPartBehavior { } - - trigger: - !type:DamageTypeTrigger - damageType: Slash - damage: 100 # DeltaV - behaviors: - - !type:GibPartBehavior { } - - trigger: - !type:DamageTypeTrigger - damageType: Heat - damage: 2000 # DeltaV - behaviors: - - !type:SpawnEntitiesBehavior - spawnInContainer: true - spawn: - Ash: - min: 1 - max: 1 - - !type:BurnBodyBehavior { } - - !type:PlaySoundBehavior - sound: - collection: MeatLaserImpact - # Shitmed Change End - -- type: entity - id: TorsoHarpy - name: "harpy torso" - parent: PartHarpy + parent: BasePart + id: PartHarpyBase components: - type: Sprite sprite: _DV/Mobs/Species/Harpy/parts.rsi - state: "torso_m" - type: Icon sprite: _DV/Mobs/Species/Harpy/parts.rsi - state: "torso_m" - type: BodyPart - partType: Torso - # Shitmed Change Start - toolName: "a torso" - containerName: "torso_slot" - - type: ContainerContainer - containers: - torso_slot: !type:ContainerSlot {} - - type: Destructible - thresholds: - - trigger: - !type:DamageTypeTrigger - damageType: Blunt - damage: 400 - behaviors: - - !type:GibPartBehavior { } - - trigger: - !type:DamageTypeTrigger - damageType: Slash - damage: 400 - behaviors: - - !type:GibPartBehavior { } - - trigger: - !type:DamageTypeTrigger - damageType: Heat - damage: 4000 # DeltaV - behaviors: - - !type:SpawnEntitiesBehavior - spawnInContainer: true - spawn: - Ash: - min: 1 - max: 1 - - !type:BurnBodyBehavior { } - - !type:PlaySoundBehavior - sound: - collection: MeatLaserImpact - # Shitmed Change End + species: Harpy - type: entity + parent: [ PartHarpyBase, BaseTorso ] + id: TorsoHarpy + name: "harpy torso" + +- type: entity + parent: [ PartHarpyBase, BaseHead ] id: HeadHarpy name: "harpy head" - parent: PartHarpy - components: - - type: Sprite - sprite: _DV/Mobs/Species/Harpy/parts.rsi - state: "head_m" - - type: Icon - sprite: _DV/Mobs/Species/Harpy/parts.rsi - state: "head_m" - - type: BodyPart - partType: Head - vital: true - toolName: "a head" # Shitmed Change - - type: Input - context: "ghost" - - type: InputMover - - type: GhostOnMove - - type: Tag - tags: - - Head - type: entity + parent: [ PartHarpyBase, BaseLeftArm ] id: LeftArmHarpy name: "left harpy arm" - parent: PartHarpy - components: - - type: Sprite - sprite: _DV/Mobs/Species/Harpy/parts.rsi - state: "l_arm" - - type: Icon - sprite: _DV/Mobs/Species/Harpy/parts.rsi - state: "l_arm" - - type: BodyPart - partType: Arm - symmetry: Left - toolName: "a left arm" # Shitmed Change - type: entity + parent: [ PartHarpyBase, BaseRightArm ] id: RightArmHarpy name: "right harpy arm" - parent: PartHarpy - components: - - type: Sprite - sprite: _DV/Mobs/Species/Harpy/parts.rsi - state: "r_arm" - - type: Icon - sprite: _DV/Mobs/Species/Harpy/parts.rsi - state: "r_arm" - - type: BodyPart - partType: Arm - symmetry: Right - toolName: "a right arm" # Shitmed Change - type: entity + parent: [ PartHarpyBase, BaseLeftHand ] id: LeftHandHarpy name: "left harpy hand" - parent: PartHarpy - components: - - type: Sprite - sprite: _DV/Mobs/Species/Harpy/parts.rsi - state: "l_hand" - - type: Icon - sprite: _DV/Mobs/Species/Harpy/parts.rsi - state: "l_hand" - - type: BodyPart - partType: Hand - symmetry: Left - toolName: "a left hand" # Shitmed Change - type: entity + parent: [ PartHarpyBase, BaseRightHand ] id: RightHandHarpy name: "right harpy hand" - parent: PartHarpy - components: - - type: Sprite - sprite: _DV/Mobs/Species/Harpy/parts.rsi - state: "r_hand" - - type: Icon - sprite: _DV/Mobs/Species/Harpy/parts.rsi - state: "r_hand" - - type: BodyPart - partType: Hand - symmetry: Right - toolName: "a right hand" # Shitmed Change + - type: entity + parent: [ PartHarpyBase, BaseLeftLeg ] id: LeftLegHarpy name: "left harpy leg" - parent: PartHarpy - components: - - type: Sprite - sprite: _DV/Mobs/Species/Harpy/parts.rsi - state: "l_leg" - - type: Icon - sprite: _DV/Mobs/Species/Harpy/parts.rsi - state: "l_leg" - - type: BodyPart - partType: Leg - symmetry: Left - toolName: "a left leg" # Shitmed Change - - type: MovementBodyPart - type: entity + parent: [ PartHarpyBase, BaseRightLeg ] id: RightLegHarpy name: "right harpy leg" - parent: PartHarpy - components: - - type: Sprite - sprite: _DV/Mobs/Species/Harpy/parts.rsi - state: "r_leg" - - type: Icon - sprite: _DV/Mobs/Species/Harpy/parts.rsi - state: "r_leg" - - type: BodyPart - partType: Leg - symmetry: Right - toolName: "a right leg" # Shitmed Change - - type: MovementBodyPart - type: entity + parent: [ PartHarpyBase, BaseLeftFoot ] id: LeftFootHarpy name: "left harpy foot" - parent: PartHarpy - components: - - type: Sprite - sprite: _DV/Mobs/Species/Harpy/parts.rsi - state: "l_foot" - - type: Icon - sprite: _DV/Mobs/Species/Harpy/parts.rsi - state: "l_foot" - - type: BodyPart - partType: Foot - symmetry: Left - toolName: "a left foot" # Shitmed Change - type: entity + parent: [ PartHarpyBase, BaseRightFoot ] id: RightFootHarpy name: "right harpy foot" - parent: PartHarpy - components: - - type: Sprite - sprite: _DV/Mobs/Species/Harpy/parts.rsi - state: "r_foot" - - type: Icon - sprite: _DV/Mobs/Species/Harpy/parts.rsi - state: "r_foot" - - type: BodyPart - partType: Foot - symmetry: Right - toolName: "a right foot" # Shitmed Change diff --git a/Resources/Prototypes/_DV/Body/Parts/rodentia.yml b/Resources/Prototypes/_DV/Body/Parts/rodentia.yml index b8eec27314d8..50aecc12f476 100644 --- a/Resources/Prototypes/_DV/Body/Parts/rodentia.yml +++ b/Resources/Prototypes/_DV/Body/Parts/rodentia.yml @@ -1,242 +1,61 @@ - type: entity - id: PartRodentia - parent: BaseItem - name: "rodentia body part" abstract: true + parent: BasePart + id: PartRodentiaBase components: - type: Sprite sprite: _DV/Mobs/Species/Rodentia/parts.rsi - type: Icon sprite: _DV/Mobs/Species/Rodentia/parts.rsi - - type: Damageable - damageContainer: OrganicPart # Shitmed Change - type: BodyPart - - type: ContainerContainer - containers: - bodypart: !type:Container - ents: [] - - type: StaticPrice #DynamicPrice - price: 100 - - type: Tag - tags: - - Trash -# Shitmed Change Start - - type: Gibbable - - type: SurgeryTool - startSound: - path: /Audio/_Shitmed/Medical/Surgery/organ1.ogg - endSound: - path: /Audio/_Shitmed/Medical/Surgery/organ2.ogg - - type: Destructible - thresholds: - - trigger: - !type:DamageTypeTrigger - damageType: Blunt - damage: 110 - behaviors: - - !type:GibPartBehavior { } - - trigger: - !type:DamageTypeTrigger - damageType: Slash - damage: 100 # DeltaV - behaviors: - - !type:GibPartBehavior { } - - trigger: - !type:DamageTypeTrigger - damageType: Heat - damage: 2000 # DeltaV - behaviors: - - !type:SpawnEntitiesBehavior - spawnInContainer: true - spawn: - Ash: - min: 1 - max: 1 - - !type:BurnBodyBehavior { } - - !type:PlaySoundBehavior - sound: - collection: MeatLaserImpact - # Shitmed Change End + species: Rodentia - type: entity + parent: [ PartRodentiaBase, BaseTorso ] id: TorsoRodentia name: "rodentia torso" - parent: PartRodentia - components: - - type: Sprite - state: "torso_m" - - type: Icon - state: "torso_m" - - type: BodyPart - partType: Torso - # Shitmed Change Start - toolName: "a torso" - containerName: "torso_slot" - - type: ContainerContainer - containers: - torso_slot: !type:ContainerSlot {} - - type: Destructible - thresholds: - - trigger: - !type:DamageTypeTrigger - damageType: Blunt - damage: 400 - behaviors: - - !type:GibPartBehavior { } - - trigger: - !type:DamageTypeTrigger - damageType: Slash - damage: 400 - behaviors: - - !type:GibPartBehavior { } - - trigger: - !type:DamageTypeTrigger - damageType: Heat - damage: 4000 # DeltaV - behaviors: - - !type:SpawnEntitiesBehavior - spawnInContainer: true - spawn: - Ash: - min: 1 - max: 1 - - !type:BurnBodyBehavior { } - - !type:PlaySoundBehavior - sound: - collection: MeatLaserImpact - # Shitmed Change End - type: entity + parent: [ PartRodentiaBase, BaseHead ] id: HeadRodentia name: "rodentia head" - parent: PartRodentia - components: - - type: Sprite - state: "head_m" - - type: Icon - state: "head_m" - - type: BodyPart - partType: Head - toolName: "a head" # Shitmed Change - vital: true - - type: Input - context: "ghost" - - type: InputMover - - type: GhostOnMove - - type: Tag - tags: - - Head - type: entity + parent: [ PartRodentiaBase, BaseLeftArm ] id: LeftArmRodentia name: "left rodentia arm" - parent: PartRodentia - components: - - type: Sprite - state: "l_arm" - - type: Icon - state: "l_arm" - - type: BodyPart - partType: Arm - symmetry: Left - toolName: "a left arm" # Shitmed Change - type: entity + parent: [ PartRodentiaBase, BaseRightArm ] id: RightArmRodentia name: "right rodentia arm" - parent: PartRodentia - components: - - type: Sprite - state: "r_arm" - - type: Icon - state: "r_arm" - - type: BodyPart - partType: Arm - symmetry: Right - toolName: "a right arm" # Shitmed Change - type: entity + parent: [ PartRodentiaBase, BaseLeftHand ] id: LeftHandRodentia name: "left rodentia hand" - parent: PartRodentia - components: - - type: Sprite - state: "l_hand" - - type: Icon - state: "l_hand" - - type: BodyPart - partType: Hand - symmetry: Left - toolName: "a left hand" # Shitmed Change - type: entity + parent: [ PartRodentiaBase, BaseRightHand ] id: RightHandRodentia name: "right rodentia hand" - parent: PartRodentia - components: - - type: Sprite - state: "r_hand" - - type: Icon - state: "r_hand" - - type: BodyPart - partType: Hand - symmetry: Right - toolName: "a right hand" # Shitmed Change - type: entity + parent: [ PartRodentiaBase, BaseLeftLeg ] id: LeftLegRodentia name: "left rodentia leg" - parent: PartRodentia - components: - - type: Sprite - state: "l_leg" - - type: Icon - state: "l_leg" - - type: BodyPart - partType: Leg - symmetry: Left - toolName: "a left leg" # Shitmed Change - - type: MovementBodyPart - type: entity + parent: [ PartRodentiaBase, BaseRightLeg ] id: RightLegRodentia name: "right rodentia leg" - parent: PartRodentia - components: - - type: Sprite - state: "r_leg" - - type: Icon - state: "r_leg" - - type: BodyPart - partType: Leg - symmetry: Right - toolName: "a right leg" # Shitmed Change - - type: MovementBodyPart - type: entity + parent: [ PartRodentiaBase, BaseLeftFoot ] id: LeftFootRodentia name: "left rodentia foot" - parent: PartRodentia - components: - - type: Sprite - state: "l_foot" - - type: Icon - state: "l_foot" - - type: BodyPart - partType: Foot - symmetry: Left - toolName: "a left foot" # Shitmed Change - type: entity + parent: [ PartRodentiaBase, BaseRightFoot ] id: RightFootRodentia name: "right rodentia foot" - parent: PartRodentia - components: - - type: Sprite - state: "r_foot" - - type: Icon - state: "r_foot" - - type: BodyPart - partType: Foot - symmetry: Right - toolName: "a right foot" # Shitmed Change diff --git a/Resources/Prototypes/_DV/Body/Parts/vulpkanin.yml b/Resources/Prototypes/_DV/Body/Parts/vulpkanin.yml index a2fe99bfbf53..5a4a6e8753a8 100644 --- a/Resources/Prototypes/_DV/Body/Parts/vulpkanin.yml +++ b/Resources/Prototypes/_DV/Body/Parts/vulpkanin.yml @@ -1,270 +1,61 @@ -# TODO: Add descriptions (many) -# TODO BODY: Part damage - type: entity - id: PartVulpkanin - parent: BaseItem - name: "vulpkanin body part" abstract: true - components: - - type: Damageable - damageContainer: OrganicPart # Shitmed Change - - type: BodyPart - - type: ContainerContainer - containers: - bodypart: !type:Container - ents: [] - - type: StaticPrice #DynamicPrice - price: 100 - - type: Tag - tags: - - Trash - # Shitmed Change Start - - type: Gibbable - - type: SurgeryTool - startSound: - path: /Audio/_Shitmed/Medical/Surgery/organ1.ogg - endSound: - path: /Audio/_Shitmed/Medical/Surgery/organ2.ogg - - type: Destructible - thresholds: - - trigger: - !type:DamageTypeTrigger - damageType: Blunt - damage: 110 - behaviors: - - !type:GibPartBehavior { } - - trigger: - !type:DamageTypeTrigger - damageType: Slash - damage: 100 # DeltaV - behaviors: - - !type:GibPartBehavior { } - - trigger: - !type:DamageTypeTrigger - damageType: Heat - damage: 2000 # DeltaV - behaviors: - - !type:SpawnEntitiesBehavior - spawnInContainer: true - spawn: - Ash: - min: 1 - max: 1 - - !type:BurnBodyBehavior { } - - !type:PlaySoundBehavior - sound: - collection: MeatLaserImpact - # Shitmed Change End - -- type: entity - id: TorsoVulpkanin - name: "vulpkanin torso" - parent: PartVulpkanin + parent: BasePart + id: PartVulpkaninBase components: - type: Sprite - netsync: false sprite: _DV/Mobs/Species/Vulpkanin/parts.rsi - state: "torso_m" - type: Icon sprite: _DV/Mobs/Species/Vulpkanin/parts.rsi - state: "torso_m" - # Shitmed Change Start - type: BodyPart - partType: Torso - toolName: "a torso" - containerName: "torso_slot" - - type: ContainerContainer - containers: - torso_slot: !type:ContainerSlot {} - - type: Destructible - thresholds: - - trigger: - !type:DamageTypeTrigger - damageType: Blunt - damage: 4000 # DeltaV - behaviors: - - !type:GibPartBehavior { } - - trigger: - !type:DamageTypeTrigger - damageType: Slash - damage: 400 - behaviors: - - !type:GibPartBehavior { } - - trigger: - !type:DamageTypeTrigger - damageType: Heat - damage: 400 - behaviors: - - !type:SpawnEntitiesBehavior - spawnInContainer: true - spawn: - Ash: - min: 1 - max: 1 - - !type:BurnBodyBehavior { } - - !type:PlaySoundBehavior - sound: - collection: MeatLaserImpact - # Shitmed Change End + species: Vulpkanin + +- type: entity + parent: [ PartVulpkaninBase, BaseTorso ] + id: TorsoVulpkanin + name: "vulpkanin torso" - type: entity + parent: [ PartVulpkaninBase, BaseHead ] id: HeadVulpkanin name: "vulpkanin head" - parent: PartVulpkanin - components: - - type: Sprite - netsync: false - sprite: _DV/Mobs/Species/Vulpkanin/parts.rsi - state: "head_m" - - type: Icon - sprite: _DV/Mobs/Species/Vulpkanin/parts.rsi - state: "head_m" - - type: BodyPart - partType: Head - vital: true - toolName: "a head" # Shitmed Change - - type: Input - context: "ghost" - - type: InputMover - - type: GhostOnMove - - type: Tag - tags: - - Head - type: entity + parent: [ PartVulpkaninBase, BaseLeftArm ] id: LeftArmVulpkanin name: "left vulpkanin arm" - parent: PartVulpkanin - components: - - type: Sprite - netsync: false - sprite: _DV/Mobs/Species/Vulpkanin/parts.rsi - state: "l_arm" - - type: Icon - sprite: _DV/Mobs/Species/Vulpkanin/parts.rsi - state: "l_arm" - - type: BodyPart - partType: Arm - symmetry: Left - toolName: "a left arm" # Shitmed Change - type: entity + parent: [ PartVulpkaninBase, BaseRightArm ] id: RightArmVulpkanin name: "right vulpkanin arm" - parent: PartVulpkanin - components: - - type: Sprite - netsync: false - sprite: _DV/Mobs/Species/Vulpkanin/parts.rsi - state: "r_arm" - - type: Icon - sprite: _DV/Mobs/Species/Vulpkanin/parts.rsi - state: "r_arm" - - type: BodyPart - partType: Arm - symmetry: Right - toolName: "a right arm" # Shitmed Change - type: entity + parent: [ PartVulpkaninBase, BaseLeftHand ] id: LeftHandVulpkanin name: "left vulpkanin hand" - parent: PartVulpkanin - components: - - type: Sprite - netsync: false - sprite: _DV/Mobs/Species/Vulpkanin/parts.rsi - state: "l_hand" - - type: Icon - sprite: _DV/Mobs/Species/Vulpkanin/parts.rsi - state: "l_hand" - - type: BodyPart - partType: Hand - symmetry: Left - toolName: "a left hand" # Shitmed Change - type: entity + parent: [ PartVulpkaninBase, BaseRightHand ] id: RightHandVulpkanin name: "right vulpkanin hand" - parent: PartVulpkanin - components: - - type: Sprite - netsync: false - sprite: _DV/Mobs/Species/Vulpkanin/parts.rsi - state: "r_hand" - - type: Icon - sprite: _DV/Mobs/Species/Vulpkanin/parts.rsi - state: "r_hand" - - type: BodyPart - partType: Hand - symmetry: Right - toolName: "a right hand" # Shitmed Change - type: entity + parent: [ PartVulpkaninBase, BaseLeftLeg ] id: LeftLegVulpkanin name: "left vulpkanin leg" - parent: PartVulpkanin - components: - - type: Sprite - netsync: false - sprite: _DV/Mobs/Species/Vulpkanin/parts.rsi - state: "l_leg" - - type: Icon - sprite: _DV/Mobs/Species/Vulpkanin/parts.rsi - state: "l_leg" - - type: BodyPart - partType: Leg - symmetry: Left - toolName: "a left leg" # Shitmed Change - - type: MovementBodyPart - type: entity + parent: [ PartVulpkaninBase, BaseRightLeg ] id: RightLegVulpkanin name: "right vulpkanin leg" - parent: PartVulpkanin - components: - - type: Sprite - netsync: false - sprite: _DV/Mobs/Species/Vulpkanin/parts.rsi - state: "r_leg" - - type: Icon - sprite: _DV/Mobs/Species/Vulpkanin/parts.rsi - state: "r_leg" - - type: BodyPart - partType: Leg - symmetry: Right - toolName: "a right leg" # Shitmed Change - - type: MovementBodyPart - type: entity + parent: [ PartVulpkaninBase, BaseLeftFoot ] id: LeftFootVulpkanin name: "left vulpkanin foot" - parent: PartVulpkanin - components: - - type: Sprite - netsync: false - sprite: _DV/Mobs/Species/Vulpkanin/parts.rsi - state: "l_foot" - - type: Icon - sprite: _DV/Mobs/Species/Vulpkanin/parts.rsi - state: "l_foot" - - type: BodyPart - partType: Foot - symmetry: Left - toolName: "a left foot" # Shitmed Change - type: entity + parent: [ PartVulpkaninBase, BaseRightFoot ] id: RightFootVulpkanin name: "right vulpkanin foot" - parent: PartVulpkanin - components: - - type: Sprite - netsync: false - sprite: _DV/Mobs/Species/Vulpkanin/parts.rsi - state: "r_foot" - - type: Icon - sprite: _DV/Mobs/Species/Vulpkanin/parts.rsi - state: "r_foot" - - type: BodyPart - partType: Foot - symmetry: Right - toolName: "a right foot" # Shitmed Change diff --git a/Resources/Prototypes/_Shitmed/Body/Parts/Animal/carp.yml b/Resources/Prototypes/_Shitmed/Body/Parts/Animal/carp.yml new file mode 100644 index 000000000000..221148f33ffc --- /dev/null +++ b/Resources/Prototypes/_Shitmed/Body/Parts/Animal/carp.yml @@ -0,0 +1,37 @@ +- type: entity + abstract: true + parent: PartBase + id: PartCarpBase + components: + - type: Sprite + sprite: _Shitmed/Mobs/Aliens/Carps/carp_parts.rsi + - type: Icon + sprite: _Shitmed/Mobs/Aliens/Carps/carp_parts.rsi + +- type: entity + parent: PartCarpBase + id: TailCarp + name: carp tail + description: Unique glands in this tail let space carp fly in a vacuum. + components: + - type: Sprite + state: tail + - type: Icon + state: tail + - type: BodyPart + partType: Tail + - type: MovementBodyPart + walkSpeed: 2.5 + sprintSpeed: 3.5 + # TODO: Make it actually needed. Legs are hardcoded to be the only parts that matter for movement. + # TODO: space flight stuff + +- type: entity + parent: [ PartCarpBase, BaseTorso ] + id: TorsoCarp + name: carp torso + components: + - type: Sprite + state: torso + - type: Icon + state: torso diff --git a/Resources/Prototypes/_Shitmed/Body/Organs/Animal/kobold.yml b/Resources/Prototypes/_Shitmed/Body/Parts/Animal/kobold.yml similarity index 84% rename from Resources/Prototypes/_Shitmed/Body/Organs/Animal/kobold.yml rename to Resources/Prototypes/_Shitmed/Body/Parts/Animal/kobold.yml index 5493846e3534..7036ebdbab1e 100644 --- a/Resources/Prototypes/_Shitmed/Body/Organs/Animal/kobold.yml +++ b/Resources/Prototypes/_Shitmed/Body/Parts/Animal/kobold.yml @@ -1,11 +1,12 @@ # TODO: Add descriptions (many) - type: entity - id: PartKobold - parent: [BaseItem, BasePart] - name: "kobold body part" abstract: true + parent: BasePart + id: PartKobold components: + - type: Sprite + sprite: Mobs/Animals/kobold.rsi - type: Extractable juiceSolution: reagents: @@ -15,12 +16,11 @@ Quantity: 10 - type: entity + parent: [PartKobold, BaseTorso] id: TorsoKobold name: "kobold torso" - parent: [PartKobold, BaseTorso] components: - type: Sprite - sprite: Mobs/Animals/kobold.rsi state: "torso_m" - type: Extractable juiceSolution: @@ -31,12 +31,11 @@ Quantity: 20 - type: entity + parent: [PartKobold, BaseHead] id: HeadKobold name: "kobold head" - parent: [PartKobold, BaseHead] components: - type: Sprite - sprite: Mobs/Animals/kobold.rsi state: "head_m" - type: Extractable juiceSolution: @@ -47,73 +46,65 @@ Quantity: 10 - type: entity + parent: [PartKobold, BaseLeftArm] id: LeftArmKobold name: "left kobold arm" - parent: [PartKobold, BaseLeftArm] components: - type: Sprite - sprite: Mobs/Animals/kobold.rsi state: "l_arm" - type: entity + parent: [PartKobold, BaseRightArm] id: RightArmKobold name: "right kobold arm" - parent: [PartKobold, BaseRightArm] components: - type: Sprite - sprite: Mobs/Animals/kobold.rsi state: "r_arm" - type: entity + parent: [PartKobold, BaseLeftHand] id: LeftHandKobold name: "left kobold hand" - parent: [PartKobold, BaseLeftHand] components: - type: Sprite - sprite: Mobs/Animals/kobold.rsi state: "l_hand" - type: entity + parent: [PartKobold, BaseRightHand] id: RightHandKobold name: "right kobold hand" - parent: [PartKobold, BaseRightHand] components: - type: Sprite - sprite: Mobs/Animals/kobold.rsi state: "r_hand" - type: entity + parent: [PartKobold, BaseLeftLeg] id: LeftLegKobold name: "left kobold leg" - parent: [PartKobold, BaseLeftLeg] components: - type: Sprite - sprite: Mobs/Animals/kobold.rsi state: "l_leg" - type: entity + parent: [PartKobold, BaseRightLeg] id: RightLegKobold name: "right kobold leg" - parent: [PartKobold, BaseRightLeg] components: - type: Sprite - sprite: Mobs/Animals/kobold.rsi state: "r_leg" - type: entity + parent: [PartKobold, BaseLeftFoot] id: LeftFootKobold name: "left kobold foot" - parent: [PartKobold, BaseLeftFoot] components: - type: Sprite - sprite: Mobs/Animals/kobold.rsi state: "l_foot" - type: entity + parent: [PartKobold, BaseRightFoot] id: RightFootKobold name: "right kobold foot" - parent: [PartKobold, BaseRightFoot] components: - type: Sprite - sprite: Mobs/Animals/kobold.rsi state: "r_foot" diff --git a/Resources/Prototypes/_Shitmed/Body/Organs/Animal/monkey.yml b/Resources/Prototypes/_Shitmed/Body/Parts/Animal/monkey.yml similarity index 84% rename from Resources/Prototypes/_Shitmed/Body/Organs/Animal/monkey.yml rename to Resources/Prototypes/_Shitmed/Body/Parts/Animal/monkey.yml index 01b8aa4de8a9..dfd8199b381f 100644 --- a/Resources/Prototypes/_Shitmed/Body/Organs/Animal/monkey.yml +++ b/Resources/Prototypes/_Shitmed/Body/Parts/Animal/monkey.yml @@ -1,11 +1,12 @@ # TODO: Add descriptions (many) - type: entity - id: PartMonkey - parent: [BaseItem, BasePart] - name: "monkey body part" abstract: true + parent: BasePart + id: PartMonkey components: + - type: Sprite + sprite: Mobs/Animals/monkey.rsi - type: Extractable juiceSolution: reagents: @@ -15,12 +16,11 @@ Quantity: 10 - type: entity + parent: [PartMonkey, BaseTorso] id: TorsoMonkey name: "monkey torso" - parent: [PartMonkey, BaseTorso] components: - type: Sprite - sprite: Mobs/Animals/monkey.rsi state: "torso_m" - type: Extractable juiceSolution: @@ -31,12 +31,11 @@ Quantity: 20 - type: entity + parent: [PartMonkey, BaseHead] id: HeadMonkey name: "monkey head" - parent: [PartMonkey, BaseHead] components: - type: Sprite - sprite: Mobs/Animals/monkey.rsi state: "head_m" - type: Extractable juiceSolution: @@ -47,73 +46,65 @@ Quantity: 10 - type: entity + parent: [PartMonkey, BaseLeftArm] id: LeftArmMonkey name: "left monkey arm" - parent: [PartMonkey, BaseLeftArm] components: - type: Sprite - sprite: Mobs/Animals/monkey.rsi state: "l_arm" - type: entity + parent: [PartMonkey, BaseRightArm] id: RightArmMonkey name: "right monkey arm" - parent: [PartMonkey, BaseRightArm] components: - type: Sprite - sprite: Mobs/Animals/monkey.rsi state: "r_arm" - type: entity + parent: [PartMonkey, BaseLeftHand] id: LeftHandMonkey name: "left monkey hand" - parent: [PartMonkey, BaseLeftHand] components: - type: Sprite - sprite: Mobs/Animals/monkey.rsi state: "l_hand" - type: entity + parent: [PartMonkey, BaseRightHand] id: RightHandMonkey name: "right monkey hand" - parent: [PartMonkey, BaseRightHand] components: - type: Sprite - sprite: Mobs/Animals/monkey.rsi state: "r_hand" - type: entity + parent: [PartMonkey, BaseLeftLeg] id: LeftLegMonkey name: "left monkey leg" - parent: [PartMonkey, BaseLeftLeg] components: - type: Sprite - sprite: Mobs/Animals/monkey.rsi state: "l_leg" - type: entity + parent: [PartMonkey, BaseRightLeg] id: RightLegMonkey name: "right monkey leg" - parent: [PartMonkey, BaseRightLeg] components: - type: Sprite - sprite: Mobs/Animals/monkey.rsi state: "r_leg" - type: entity + parent: [PartMonkey, BaseLeftFoot] id: LeftFootMonkey name: "left monkey foot" - parent: [PartMonkey, BaseLeftFoot] components: - type: Sprite - sprite: Mobs/Animals/monkey.rsi state: "l_foot" - type: entity + parent: [PartMonkey, BaseRightFoot] id: RightFootMonkey name: "right monkey foot" - parent: [PartMonkey, BaseRightFoot] components: - type: Sprite - sprite: Mobs/Animals/monkey.rsi state: "r_foot" diff --git a/Resources/Prototypes/_Shitmed/Body/Parts/animal.yml b/Resources/Prototypes/_Shitmed/Body/Parts/animal.yml index 91c452ee9613..2c89f9a8bfa6 100644 --- a/Resources/Prototypes/_Shitmed/Body/Parts/animal.yml +++ b/Resources/Prototypes/_Shitmed/Body/Parts/animal.yml @@ -1,48 +1,9 @@ # Monkey head for borging/transplanting pun pun - type: entity - parent: [PartAnimal, BaseHead] + parent: [PartAnimalBase, BaseHead] id: HeadAnimal name: animal head - categories: [ HideSpawnMenu ] components: - type: Sprite layers: - state: head_m - -- type: entity - abstract: true - parent: PartAnimal - id: BaseCarpPart - components: - - type: Sprite - sprite: _Shitmed/Mobs/Aliens/Carps/carp_parts.rsi - -- type: entity - categories: [ HideSpawnMenu ] - parent: BaseCarpPart - id: TailCarp - name: carp tail - description: Unique glands in this tail let space carp fly in a vacuum. - components: - - type: Sprite - layers: - - state: tail - - type: BodyPart - partType: Tail - - type: MovementBodyPart - walkSpeed: 2.5 - sprintSpeed: 3.5 - # TODO: Make it actually needed. Legs are hardcoded to be the only parts that matter for movement. - # TODO: space flight stuff - -- type: entity - categories: [ HideSpawnMenu ] - parent: BaseCarpPart - id: TorsoCarp - name: carp torso - components: - - type: Sprite - layers: - - state: torso - - type: BodyPart - partType: Torso diff --git a/Resources/Prototypes/_Shitmed/Body/Parts/base.yml b/Resources/Prototypes/_Shitmed/Body/Parts/base.yml new file mode 100644 index 000000000000..111a3adbda14 --- /dev/null +++ b/Resources/Prototypes/_Shitmed/Body/Parts/base.yml @@ -0,0 +1,88 @@ +# body part with regular organic destruction +- type: entity + abstract: true + parent: BasePartInorganic + id: BasePart + components: + - type: Damageable + damageContainer: OrganicPart # Shitmed Change + - type: Destructible + thresholds: + - trigger: + !type:DamageTypeTrigger + damageType: Blunt + damage: 110 + behaviors: + - !type:GibPartBehavior { } + - trigger: + !type:DamageTypeTrigger + damageType: Slash + damage: 100 # DeltaV - was 150 + behaviors: + - !type:GibPartBehavior { } + - trigger: + !type:DamageTypeTrigger + damageType: Heat + damage: 2000 # DeltaV - was 200 + behaviors: + - !type:SpawnEntitiesBehavior + spawnInContainer: true + spawn: + Ash: + min: 1 + max: 1 + - !type:BurnBodyBehavior { } + - !type:PlaySoundBehavior + sound: + collection: MeatLaserImpact + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Fat + Quantity: 3 + - ReagentId: Blood + Quantity: 10 + +# organic torsos have higher health +# this doesn't affect gibbing bodies as there is code to prevent torso gibbing while part of a body +- type: entity + abstract: true + parent: BaseTorsoInorganic + id: BaseTorso + components: + - type: Destructible + thresholds: + - trigger: + !type:DamageTypeTrigger + damageType: Blunt + damage: 400 + behaviors: + - !type:GibPartBehavior { } + - trigger: + !type:DamageTypeTrigger + damageType: Slash + damage: 400 + behaviors: + - !type:GibPartBehavior { } + - trigger: + !type:DamageTypeTrigger + damageType: Heat + damage: 4000 # DeltaV - was 400 + behaviors: + - !type:SpawnEntitiesBehavior + spawnInContainer: true + spawn: + Ash: + min: 1 + max: 1 + - !type:BurnBodyBehavior { } + - !type:PlaySoundBehavior + sound: + collection: MeatLaserImpact + - type: Extractable # torso is meatier + juiceSolution: + reagents: + - ReagentId: Fat + Quantity: 10 + - ReagentId: Blood + Quantity: 20 diff --git a/Resources/Prototypes/_Shitmed/Body/Parts/cybernetic.yml b/Resources/Prototypes/_Shitmed/Body/Parts/cybernetic.yml index c4298ed57c66..e42fd277a526 100644 --- a/Resources/Prototypes/_Shitmed/Body/Parts/cybernetic.yml +++ b/Resources/Prototypes/_Shitmed/Body/Parts/cybernetic.yml @@ -1,125 +1,106 @@ - type: entity - id: LeftArmCybernetic - parent: LeftArmHuman abstract: true + parent: BasePartInorganic + id: CyberneticPartBase components: + - type: Sprite + sprite: _Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi + - type: Icon + sprite: _Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi - type: Damageable damageContainer: Silicon + - type: Cybernetics + +- type: entity + abstract: true + parent: [ CyberneticPartBase, BaseLeftArm ] + id: LeftArmCyberneticBase + components: + - type: Sprite + state: "l_arm-combined" + - type: Icon + state: "l_arm-combined" - type: BodyPart baseLayerId: MobCyberneticBishopLArm - type: GenerateChildPart id: LeftHandCybernetic - - type: Cybernetics - - type: Sprite - sprite: _Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi - state: "l_arm-combined" - type: entity - id: RightArmCybernetic - parent: RightArmHuman abstract: true + parent: [ CyberneticPartBase, BaseRightArm ] + id: RightArmCyberneticBase components: - - type: Damageable - damageContainer: Silicon + - type: Sprite + state: "r_arm-combined" + - type: Icon + state: "r_arm-combined" - type: BodyPart baseLayerId: MobCyberneticBishopRArm - type: GenerateChildPart id: RightHandCybernetic - - type: Cybernetics - - type: Sprite - sprite: _Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi - state: "r_arm-combined" - type: entity - id: LeftLegCybernetic - parent: LeftLegHuman abstract: true + parent: [ CyberneticPartBase, BaseLeftLeg ] + id: LeftLegCyberneticBase components: - - type: Damageable - damageContainer: Silicon + - type: Sprite + state: "l_leg-combined" + - type: Icon + state: "l_leg-combined" - type: BodyPart baseLayerId: MobCyberneticBishopLLeg - type: GenerateChildPart id: LeftFootCybernetic - - type: Cybernetics - - type: Sprite - sprite: _Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi - state: "l_leg-combined" - type: entity - id: RightLegCybernetic - parent: RightLegHuman abstract: true + parent: [ CyberneticPartBase, BaseRightLeg ] + id: RightLegCyberneticBase components: - - type: Damageable - damageContainer: Silicon + - type: Sprite + state: "r_leg-combined" + - type: Icon + state: "r_leg-combined" - type: BodyPart baseLayerId: MobCyberneticBishopRLeg - type: GenerateChildPart id: RightFootCybernetic - - type: Cybernetics - - type: Sprite - sprite: _Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi - state: "r_leg-combined" - type: entity + parent: [ CyberneticPartBase, BaseLeftHand ] id: LeftHandCybernetic - parent: LeftHandHuman name: cybernetic left hand components: - - type: Damageable - damageContainer: Silicon - type: BodyPart baseLayerId: MobCyberneticBishopLHand - - type: Cybernetics - - type: Sprite - sprite: _Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi - state: "l_hand" - type: entity + parent: [ CyberneticPartBase, BaseRightHand ] id: RightHandCybernetic - parent: RightHandHuman name: cybernetic right hand components: - - type: Damageable - damageContainer: Silicon - type: BodyPart baseLayerId: MobCyberneticBishopRHand - - type: Cybernetics - - type: Sprite - sprite: _Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi - state: "r_hand" - type: entity + parent: [ CyberneticPartBase, BaseLeftFoot ] id: LeftFootCybernetic - parent: LeftFootHuman name: cybernetic left foot components: - - type: Damageable - damageContainer: Silicon - type: BodyPart baseLayerId: MobCyberneticBishopLFoot - - type: Cybernetics - - type: Sprite - sprite: _Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi - state: "l_foot" - type: entity + parent: [ CyberneticPartBase, BaseRightFoot ] id: RightFootCybernetic - parent: RightFootHuman name: cybernetic right foot components: - - type: Damageable - damageContainer: Silicon - type: BodyPart baseLayerId: MobCyberneticBishopRFoot - - type: Cybernetics - - type: Sprite - sprite: _Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi - state: "r_foot" - type: entity - parent: LeftArmCybernetic + parent: LeftArmCyberneticBase id: JawsOfLifeLeftArm name: J.W.L left arm description: A cybernetic left arm with the ability to pry doors open. @@ -131,7 +112,7 @@ pryPowered: true - type: entity - parent: RightArmCybernetic + parent: RightArmCyberneticBase id: JawsOfLifeRightArm name: J.W.L right arm description: A cybernetic right arm with the ability to pry doors open. @@ -143,7 +124,7 @@ pryPowered: true - type: entity - parent: LeftLegCybernetic + parent: LeftLegCyberneticBase id: SpeedLeftLeg name: S.P.E.E.D left leg description: A cybernetic left leg that allows its wearer to run faster. @@ -157,7 +138,7 @@ - type: ProtectedFromStepTriggers - type: entity - parent: RightLegCybernetic + parent: RightLegCyberneticBase id: SpeedRightLeg name: S.P.E.E.D right leg description: A cybernetic left leg that allows its wearer to run faster. diff --git a/Resources/Prototypes/_Shitmed/Species/cyborg.yml b/Resources/Prototypes/_Shitmed/Species/cyborg.yml new file mode 100644 index 000000000000..232a67db48bb --- /dev/null +++ b/Resources/Prototypes/_Shitmed/Species/cyborg.yml @@ -0,0 +1,59 @@ +# DO NOT use this as an actual species, its for borg part appearance to Just Work +- type: species + id: Cyborg + name: species-name-human + roundStart: false + prototype: BorgChassisSelectable + sprites: CyborgSprites + defaultSkinTone: "#fff9e2" + markingLimits: MobHumanMarkingLimits + maleFirstNames: names_borg + femaleFirstNames: names_borg + dollPrototype: BorgChassisSelectable + skinColoration: TintedHues + +- type: speciesBaseSprites + id: CyborgSprites + sprites: + Head: CyborgHead + Chest: CyborgTorso + LArm: CyborgLArm + RArm: CyborgRArm + LLeg: CyborgLLeg + RLeg: CyborgRLeg + +- type: humanoidBaseSprite + id: CyborgHead + baseSprite: + sprite: Objects/Specific/Robotics/cyborg_parts.rsi + state: borg_head + +- type: humanoidBaseSprite + id: CyborgTorso + baseSprite: + sprite: Objects/Specific/Robotics/cyborg_parts.rsi + state: borg_chest + +- type: humanoidBaseSprite + id: CyborgLLeg + baseSprite: + sprite: Objects/Specific/Robotics/cyborg_parts.rsi + state: borg_l_leg + +- type: humanoidBaseSprite + id: CyborgLArm + baseSprite: + sprite: Objects/Specific/Robotics/cyborg_parts.rsi + state: borg_l_arm + +- type: humanoidBaseSprite + id: CyborgRLeg + baseSprite: + sprite: Objects/Specific/Robotics/cyborg_parts.rsi + state: borg_r_leg + +- type: humanoidBaseSprite + id: CyborgRArm + baseSprite: + sprite: Objects/Specific/Robotics/cyborg_parts.rsi + state: borg_r_arm From 604e2b1e60ad59086ada10c5283e0013420555ee Mon Sep 17 00:00:00 2001 From: "Tad \"Taddy\" Johnson" <120885811+TadJohnson00@users.noreply.github.com> Date: Sun, 19 Jan 2025 06:51:08 +1100 Subject: [PATCH 172/205] webeditops fix prisonguard outerclothing (#2768) Signed-off-by: Tad "Taddy" Johnson <120885811+TadJohnson00@users.noreply.github.com> --- Resources/Prototypes/Nyanotrasen/Loadouts/role_loadouts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nyanotrasen/Loadouts/role_loadouts.yml b/Resources/Prototypes/Nyanotrasen/Loadouts/role_loadouts.yml index 0f8a18bde27b..d2f527f22bbd 100644 --- a/Resources/Prototypes/Nyanotrasen/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Nyanotrasen/Loadouts/role_loadouts.yml @@ -34,7 +34,7 @@ - SecurityNeck # DeltaV - PrisonGuardJumpsuit - SecurityBackpack - - SecurityOuterClothing + - SecurityOuterClothingDeltaV # DeltaV - Switched to DeltaV version, was SecurityOuterClothing - SecurityShoes - SecurityBelt - SurvivalSecurity From 01a9e61ce9e286a7407f64d9e04d96858772e49d Mon Sep 17 00:00:00 2001 From: hivehum Date: Sat, 18 Jan 2025 18:50:21 -0500 Subject: [PATCH 173/205] Animated Emotes from Impstation (#2746) * when the emotes are animated * hopefully untouched * INCORRECT * can this work. * flipping out --- .../Emoting/AnimatedEmotesSystem.cs | 137 ++++++++++++++++++ .../Emoting/AnimatedEmotesSystem.cs | 28 ++++ .../Chat/Prototypes/EmotePrototype.cs | 4 + .../Emoting/AnimatedEmotesComponent.cs | 28 ++++ .../Emoting/SharedAnimatedEmotesSystem.cs | 18 +++ .../Locale/en-US/_Goobstation/emotes.ftl | 5 + .../Entities/Mobs/Player/guardian.yml | 1 + Resources/Prototypes/Entities/Mobs/base.yml | 1 + .../_Goobstation/Actions/emotes.yml | 27 ++++ .../Interface/Emotes/attributions.yml | 6 + .../_Impstation/Interface/Emotes/jump.png | Bin 0 -> 1197 bytes .../_Impstation/Interface/Emotes/spin.png | Bin 0 -> 1083 bytes 12 files changed, 255 insertions(+) create mode 100644 Content.Client/_Goobstation/Emoting/AnimatedEmotesSystem.cs create mode 100644 Content.Server/_Goobstation/Emoting/AnimatedEmotesSystem.cs create mode 100644 Content.Shared/_Goobstation/Emoting/AnimatedEmotesComponent.cs create mode 100644 Content.Shared/_Goobstation/Emoting/SharedAnimatedEmotesSystem.cs create mode 100644 Resources/Locale/en-US/_Goobstation/emotes.ftl create mode 100644 Resources/Prototypes/_Goobstation/Actions/emotes.yml create mode 100644 Resources/Textures/_Impstation/Interface/Emotes/attributions.yml create mode 100644 Resources/Textures/_Impstation/Interface/Emotes/jump.png create mode 100644 Resources/Textures/_Impstation/Interface/Emotes/spin.png diff --git a/Content.Client/_Goobstation/Emoting/AnimatedEmotesSystem.cs b/Content.Client/_Goobstation/Emoting/AnimatedEmotesSystem.cs new file mode 100644 index 000000000000..33b89fbed102 --- /dev/null +++ b/Content.Client/_Goobstation/Emoting/AnimatedEmotesSystem.cs @@ -0,0 +1,137 @@ +using Robust.Client.Animations; +using Robust.Shared.Animations; +using Robust.Shared.GameStates; +using Robust.Client.GameObjects; +using Content.Shared.Emoting; +using System.Numerics; +using Robust.Shared.Prototypes; +using Content.Shared.Chat.Prototypes; +using Content.Shared.Rotation; + +namespace Content.Client.Emoting; + +public sealed partial class AnimatedEmotesSystem : SharedAnimatedEmotesSystem +{ + [Dependency] private readonly AnimationPlayerSystem _anim = default!; + [Dependency] private readonly AppearanceSystem _appearance = default!; + [Dependency] private readonly IPrototypeManager _prot = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnHandleState); + + SubscribeLocalEvent(OnFlip); + SubscribeLocalEvent(OnSpin); + SubscribeLocalEvent(OnJump); + } + + public void PlayEmote(EntityUid uid, Animation anim, string animationKey = "emoteAnimKeyId") + { + if (_anim.HasRunningAnimation(uid, animationKey)) + return; + + _anim.Play(uid, anim, animationKey); + } + + private void OnHandleState(EntityUid uid, AnimatedEmotesComponent component, ref ComponentHandleState args) + { + if (args.Current is not AnimatedEmotesComponentState state + || !_prot.TryIndex(state.Emote, out var emote)) + return; + + if (emote.Event != null) + RaiseLocalEvent(uid, emote.Event); + } + + private void OnFlip(Entity ent, ref AnimationFlipEmoteEvent args) + { + var angle = Angle.Zero; + + if (TryComp(ent, out var rotation)) + { + _appearance.TryGetData(ent, RotationVisuals.RotationState, out var state); + + angle = state switch + { + RotationState.Vertical => rotation.VerticalRotation, + RotationState.Horizontal => rotation.HorizontalRotation, + _ => Angle.Zero + }; + } + + var a = new Animation + { + Length = TimeSpan.FromMilliseconds(500), + AnimationTracks = + { + new AnimationTrackComponentProperty + { + ComponentType = typeof(SpriteComponent), + Property = nameof(SpriteComponent.Rotation), + InterpolationMode = AnimationInterpolationMode.Linear, + KeyFrames = + { + new AnimationTrackProperty.KeyFrame(angle, 0f), + new AnimationTrackProperty.KeyFrame(angle + Angle.FromDegrees(180), 0.25f), + new AnimationTrackProperty.KeyFrame(angle + Angle.FromDegrees(360), 0.25f), + } + } + } + }; + PlayEmote(ent, a); + } + private void OnSpin(Entity ent, ref AnimationSpinEmoteEvent args) + { + var a = new Animation + { + Length = TimeSpan.FromMilliseconds(600), + AnimationTracks = + { + new AnimationTrackComponentProperty + { + ComponentType = typeof(TransformComponent), + Property = nameof(TransformComponent.LocalRotation), + InterpolationMode = AnimationInterpolationMode.Linear, + KeyFrames = + { + new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(0), 0f), + new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(90), 0.075f), + new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(180), 0.075f), + new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(270), 0.075f), + new AnimationTrackProperty.KeyFrame(Angle.Zero, 0.075f), + new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(90), 0.075f), + new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(180), 0.075f), + new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(270), 0.075f), + new AnimationTrackProperty.KeyFrame(Angle.Zero, 0.075f), + } + } + } + }; + PlayEmote(ent, a, "emoteAnimSpin"); + } + private void OnJump(Entity ent, ref AnimationJumpEmoteEvent args) + { + var a = new Animation + { + Length = TimeSpan.FromMilliseconds(250), + AnimationTracks = + { + new AnimationTrackComponentProperty + { + ComponentType = typeof(SpriteComponent), + Property = nameof(SpriteComponent.Offset), + InterpolationMode = AnimationInterpolationMode.Cubic, + KeyFrames = + { + new AnimationTrackProperty.KeyFrame(Vector2.Zero, 0f), + new AnimationTrackProperty.KeyFrame(new Vector2(0, .35f), 0.125f), + new AnimationTrackProperty.KeyFrame(Vector2.Zero, 0.125f), + } + } + } + }; + PlayEmote(ent, a); + } +} diff --git a/Content.Server/_Goobstation/Emoting/AnimatedEmotesSystem.cs b/Content.Server/_Goobstation/Emoting/AnimatedEmotesSystem.cs new file mode 100644 index 000000000000..cc4863d31f7e --- /dev/null +++ b/Content.Server/_Goobstation/Emoting/AnimatedEmotesSystem.cs @@ -0,0 +1,28 @@ +using Robust.Shared.GameStates; +using Content.Server.Chat.Systems; +using Content.Shared.Chat.Prototypes; +using Content.Shared.Emoting; +using Robust.Shared.Prototypes; + +namespace Content.Server.Emoting; + +public sealed partial class AnimatedEmotesSystem : SharedAnimatedEmotesSystem +{ + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnEmote); + } + + private void OnEmote(EntityUid uid, AnimatedEmotesComponent component, ref EmoteEvent args) + { + PlayEmoteAnimation(uid, component, args.Emote.ID); + } + + public void PlayEmoteAnimation(EntityUid uid, AnimatedEmotesComponent component, ProtoId prot) + { + component.Emote = prot; + Dirty(uid, component); + } +} diff --git a/Content.Shared/Chat/Prototypes/EmotePrototype.cs b/Content.Shared/Chat/Prototypes/EmotePrototype.cs index 7ee958ee6a71..34d54bc3600b 100644 --- a/Content.Shared/Chat/Prototypes/EmotePrototype.cs +++ b/Content.Shared/Chat/Prototypes/EmotePrototype.cs @@ -68,6 +68,10 @@ public sealed partial class EmotePrototype : IPrototype /// [DataField] public HashSet ChatTriggers = new(); + + // goob edit - animations + [DataField] + public object? Event = null; } /// diff --git a/Content.Shared/_Goobstation/Emoting/AnimatedEmotesComponent.cs b/Content.Shared/_Goobstation/Emoting/AnimatedEmotesComponent.cs new file mode 100644 index 000000000000..fc8121bbe5a3 --- /dev/null +++ b/Content.Shared/_Goobstation/Emoting/AnimatedEmotesComponent.cs @@ -0,0 +1,28 @@ +using Content.Shared.Chat.Prototypes; +using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization; + +namespace Content.Shared.Emoting; + +// use as a template +//[Serializable, NetSerializable, DataDefinition] public sealed partial class AnimationNameEmoteEvent : EntityEventArgs { } + +[Serializable, NetSerializable, DataDefinition] public sealed partial class AnimationFlipEmoteEvent : EntityEventArgs { } +[Serializable, NetSerializable, DataDefinition] public sealed partial class AnimationSpinEmoteEvent : EntityEventArgs { } +[Serializable, NetSerializable, DataDefinition] public sealed partial class AnimationJumpEmoteEvent : EntityEventArgs { } + +[RegisterComponent, NetworkedComponent] public sealed partial class AnimatedEmotesComponent : Component +{ + [DataField] public ProtoId? Emote; +} + +[Serializable, NetSerializable] public sealed partial class AnimatedEmotesComponentState : ComponentState +{ + public ProtoId? Emote; + + public AnimatedEmotesComponentState(ProtoId? emote) + { + Emote = emote; + } +} diff --git a/Content.Shared/_Goobstation/Emoting/SharedAnimatedEmotesSystem.cs b/Content.Shared/_Goobstation/Emoting/SharedAnimatedEmotesSystem.cs new file mode 100644 index 000000000000..b19e8c26a1ea --- /dev/null +++ b/Content.Shared/_Goobstation/Emoting/SharedAnimatedEmotesSystem.cs @@ -0,0 +1,18 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.Emoting; + +public abstract class SharedAnimatedEmotesSystem : EntitySystem +{ + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnGetState); + } + + private void OnGetState(Entity ent, ref ComponentGetState args) + { + args.State = new AnimatedEmotesComponentState(ent.Comp.Emote); + } +} diff --git a/Resources/Locale/en-US/_Goobstation/emotes.ftl b/Resources/Locale/en-US/_Goobstation/emotes.ftl new file mode 100644 index 000000000000..f212a413abf8 --- /dev/null +++ b/Resources/Locale/en-US/_Goobstation/emotes.ftl @@ -0,0 +1,5 @@ + +chat-emote-name-spin = Spin +chat-emote-name-jump = Jump +chat-emote-msg-spin = spins! +chat-emote-msg-jump = jumps! diff --git a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml index e553ed97f30f..d2da2240f30f 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml @@ -111,6 +111,7 @@ - type: Tag tags: - CannotSuicide + - type: AnimatedEmotes # goob edit - animated emotes # From the uplink injector - type: entity diff --git a/Resources/Prototypes/Entities/Mobs/base.yml b/Resources/Prototypes/Entities/Mobs/base.yml index 90f3e8380f39..84428577471a 100644 --- a/Resources/Prototypes/Entities/Mobs/base.yml +++ b/Resources/Prototypes/Entities/Mobs/base.yml @@ -43,6 +43,7 @@ - type: MovementSpeedModifier - type: RequireProjectileTarget active: False + - type: AnimatedEmotes # goob edit - animated emotes - type: entity save: false diff --git a/Resources/Prototypes/_Goobstation/Actions/emotes.yml b/Resources/Prototypes/_Goobstation/Actions/emotes.yml new file mode 100644 index 000000000000..a7485248db2f --- /dev/null +++ b/Resources/Prototypes/_Goobstation/Actions/emotes.yml @@ -0,0 +1,27 @@ +- type: emote + id: Spin + name: chat-emote-name-spin + chatMessages: ["chat-emote-msg-spin"] + icon: _Impstation/Interface/Emotes/spin.png #imp + chatTriggers: + - spin + - spins + - spins. + - spins! + event: !type:AnimationSpinEmoteEvent + +- type: emote + id: Jump + name: chat-emote-name-jump + chatMessages: ["chat-emote-msg-jump"] + icon: _Impstation/Interface/Emotes/jump.png #imp + chatTriggers: + - jump + - jumps + - jumps. + - jumps! + - bounce + - bounces + - bounces. + - bounces! + event: !type:AnimationJumpEmoteEvent diff --git a/Resources/Textures/_Impstation/Interface/Emotes/attributions.yml b/Resources/Textures/_Impstation/Interface/Emotes/attributions.yml new file mode 100644 index 000000000000..dc86ad5ba968 --- /dev/null +++ b/Resources/Textures/_Impstation/Interface/Emotes/attributions.yml @@ -0,0 +1,6 @@ +- files: + - jump.png + - spin.png + license: "CC-BY-SA-4.0" + copyright: "Created by Carousel for Impstation" + source: "https://github.com/impstation/imp-station-14" diff --git a/Resources/Textures/_Impstation/Interface/Emotes/jump.png b/Resources/Textures/_Impstation/Interface/Emotes/jump.png new file mode 100644 index 0000000000000000000000000000000000000000..d0de87ef6170b3e7057e32153c295ed6474f8084 GIT binary patch literal 1197 zcmV;e1XBBnP)EX>4Tx04R}tkv&MmP!xqvQ>7v;4(%W!lA$`;MMWG-6^me@v=v%)FnQ@8G-*gu zTpR`0f`dPcRRUL0ade% zOfn(n3#($_6+VOz#u)q(Gxbz%?)$SsO3`G1Pb7{r-LQx^h-Wt~ zo%23%gjFPk_?&pspbHW|a$R=$jdR&yfoDdHTxOm)LM)bhSngp~F;wCi;;5o(lrQ96 zRyc2QR%;E`xhH>Nu&AwMxlU^oNh~3SG(^Z~po$tS#Aw$@F_EG3gol5`@u$fpldB3w zjs?`ALUR1zfAD*@W@&oLO$sJ}{ukT+7zYBoK)Y$%-^aGyJ^}pCz?IhZ*IU5cC+W?u z7Ci!nwtZNBBrS`zbff?P02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{00MVZsAIqn(YV@&IRHz9=KZ&hG6(B207P*qxtmXTF^| zqP47Lr6tlXygb@$m0y$On@MLm)-0dcb^#ASYeX+embbj~Q z=x>?*$Z8EE@Jgl8D3#_pNYw2ni3G&n-e~mpCI|5JR4f(>fA=A9ll_MWYSDn`{H{a& zMWzx0!;_yB-skhVT)8YiIY7|E^)I{xY=PkK$K&1IdY$OyrCP1k$TfN+uP62 zH#hnW@eY8g)*z;o)CO(~#81k%T7!XEpHz}r*IMHNa^a4HoJ=H&bwp8*+GabI%6x#d z-1LX-r3~P;jCI(DC$DY34!@=Md_ULE*GZ+v^*eI_3`i+0oiI}QVn4Z{D}4quAEPFn z+1o+pX}Kcfi%j4!9DyJJ{IAu+1BYI%9<8JXKucCy5;U!Y9S-!;00`}%7GPIVcY>%X za6uf;X5~eTYwcSDV7lfOExznK10dbYwl%Ni1XISj0-^>$dky}Q5e@yFIIdAXoc)x- zw_otn+cjtkT$&nvi%Bp1f}h%<$+-l0!-Cee8BcYvAwFSD+0iyw-T;`9>PsO-&Oy=) z;T-^u^a)Xw=8%-@^~6hW4#`e&jco>cn+2o{L5XOA;C4*pm$n}W&{m=S387VWQlr)`? zt-fF)A!(Z-X)`R8UzueA7z!Bg-vcD_uqKs2lGeXWT0{S3-^$7thuk=%-h=9{00000 LNkvXXu0mjfmjNXQ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Interface/Emotes/spin.png b/Resources/Textures/_Impstation/Interface/Emotes/spin.png new file mode 100644 index 0000000000000000000000000000000000000000..c5de318e63b2564a6cf8e603226c95d0c0ff74fb GIT binary patch literal 1083 zcmV-B1jPG^P)EX>4Tx04R}tkv&MmP!xqvQ>7v;4(%W!lA$`;MMWG-6^me@v=v%)FnQ@8G-*gu zTpR`0f`dPcRRUL0ade% zOfn(n3#($_6+VOz#u)q(Gxbz%?)$SsO3`G1Pb7{r-LQx^h-Wt~ zo%23%gjFPk_?&pspbHW|a$R=$jdR&yfoDdHTxOm)LM)bhSngp~F;wCi;;5o(lrQ96 zRyc2QR%;E`xhH>Nu&AwMxlU^oNh~3SG(^Z~po$tS#Aw$@F_EG3gol5`@u$fpldB3w zjs?`ALUR1zfAD*@W@&oLO$sJ}{ukT+7zYBoK)Y$%-^aGyJ^}pCz?IhZ*IU5cC+W?u z7Ci!nwtZNBE*rk!3AX?M02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{00I+9L_t(&-tAaBO9Md=-i?QaBEc#MDQuI*D#CRsBQf|V zu1lZ7N9Ciix67Z9D5ktF5UVt~)*>LOB#0KG#A=AnG3?#$%w2*`bKKpsyWjWC&SRDO zx4&&#YT|l*Jf2MEbNoFFtJQK@YuE8hYXGEFDi#}!_!9$7JD%G-Zs1Ym`$3@8>&MAw z>png%ihMt4+K=b<2u~XL*7~K_Yntc5<6s_mN)e%@fmbSnLAQ$(4dU}r<4p6q5>enj zQzqb8*M5QpA|DLvDo-m6uH$hO_MY9|u3YpW*1PcDtk0`%CAoy=D%MYy?Ot zCk5P^0En{tdxwul&+#;rw7{{=CfIC&XC4H(3;@YTom{1rkfou<08~^ zU4W|1p#YLH5QGva^E62H1XQ!cZMH;+#Q-406wULB{zd{QCaL@Ttb-TVy4rQYv@VD1 z2b1zif!f9ZEv1BMLuv2#xddP*AS>5i) Date: Sun, 19 Jan 2025 00:50:40 +0100 Subject: [PATCH 174/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index ce9963421052..64f30a66aef2 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Colin-Tel - changes: - - message: Playtime requirements across "newbie jobs" have been adjusted. - type: Tweak - id: 438 - time: '2024-07-21T16:39:02.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1500 - author: Colin-Tel changes: - message: Service Workers can now choose green clothes in their loadouts! @@ -3858,3 +3851,10 @@ id: 937 time: '2025-01-18T11:56:47.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2762 +- author: whateverusername0, AirFryerBuyOneGetOneFree, Darkmajia, hivehum, crocodilecarousel + changes: + - message: 'Added two new animated emotes from Impstation: jump and spin.' + type: Add + id: 938 + time: '2025-01-18T23:50:21.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2746 From 6cf83b37009fcea60ec8ca365a85c443ef0f4bd3 Mon Sep 17 00:00:00 2001 From: Lyndomen <49795619+Lyndomen@users.noreply.github.com> Date: Sat, 18 Jan 2025 19:33:44 -0500 Subject: [PATCH 175/205] [Port]Game presets can now have cooldowns to prevent back-to-back modes (#2744) * nukeblops * Update game_presets.yml i hate whitespace Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update GamePresetPrototype.cs Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update game_presets.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update game_presets.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update game_presets.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * cvar making * untroll --------- Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> --- .../Presets/GamePresetPrototype.cs | 9 +++++++ .../GameTicking/Rules/SecretRuleSystem.cs | 24 +++++++++++++++++++ Content.Shared/_DV/CCVars/DCCVars.cs | 6 +++++ Resources/Prototypes/game_presets.yml | 4 ++++ 4 files changed, 43 insertions(+) diff --git a/Content.Server/GameTicking/Presets/GamePresetPrototype.cs b/Content.Server/GameTicking/Presets/GamePresetPrototype.cs index 4731364ace2a..f82f0c25c701 100644 --- a/Content.Server/GameTicking/Presets/GamePresetPrototype.cs +++ b/Content.Server/GameTicking/Presets/GamePresetPrototype.cs @@ -33,6 +33,15 @@ public sealed partial class GamePresetPrototype : IPrototype [DataField("maxPlayers")] public int? MaxPlayers; + // Begin Imp + /// + /// Ensures that this gamemode does not get selected for a number of rounds + /// by something like Secret. This is not considered when the preset is forced. + /// + [DataField] + public int Cooldown = 0; + // End Imp + [DataField("rules", customTypeSerializer: typeof(PrototypeIdListSerializer))] public IReadOnlyList Rules { get; private set; } = Array.Empty(); diff --git a/Content.Server/GameTicking/Rules/SecretRuleSystem.cs b/Content.Server/GameTicking/Rules/SecretRuleSystem.cs index e82cecde3683..d38b798bc581 100644 --- a/Content.Server/GameTicking/Rules/SecretRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/SecretRuleSystem.cs @@ -4,6 +4,7 @@ using Content.Server.Chat.Managers; using Content.Server.GameTicking.Presets; using Content.Server.GameTicking.Rules.Components; +using Content.Shared._DV.CCVars; // DeltaV using Content.Shared.GameTicking.Components; using Content.Shared.Random; using Content.Shared.CCVar; @@ -22,6 +23,11 @@ public sealed class SecretRuleSystem : GameRuleSystem [Dependency] private readonly IConfigurationManager _configurationManager = default!; [Dependency] private readonly IAdminLogManager _adminLogger = default!; [Dependency] private readonly IComponentFactory _compFact = default!; + [Dependency] private readonly GameTicker _ticker = default!; // begin Imp + + // Dictionary that contains the minimum round number for certain preset + // prototypes to be allowed to roll again + private static Dictionary, int> _nextRoundAllowed = new(); // end Imp private string _ruleCompName = default!; @@ -46,6 +52,15 @@ protected override void Added(EntityUid uid, SecretRuleComponent component, Game Log.Info($"Selected {preset.ID} as the secret preset."); _adminLogger.Add(LogType.EventStarted, $"Selected {preset.ID} as the secret preset."); + if (_configurationManager.GetCVar(DCCVars.EnableBacktoBack) == true) // DeltaV + { + if (preset.Cooldown > 0) // Begin Imp + { + _nextRoundAllowed[preset.ID] = _ticker.RoundId + preset.Cooldown + 1; + Log.Info($"{preset.ID} is now on cooldown until {_nextRoundAllowed[preset.ID]}"); + } // End Imp + } // DeltaV + foreach (var rule in preset.Rules) { EntityUid ruleEnt; @@ -167,6 +182,15 @@ private bool CanPick([NotNullWhen(true)] GamePresetPrototype? selected, int play return false; } + if (_configurationManager.GetCVar(DCCVars.EnableBacktoBack) == true) // DeltaV + { + if (_nextRoundAllowed.ContainsKey(selected.ID) && _nextRoundAllowed[selected.ID] > _ticker.RoundId) // Begin Imp + { + Log.Info($"Skipping preset {selected.ID} (Not available until round {_nextRoundAllowed[selected.ID]}"); + return false; + } // End Imp + } // DeltaV + return true; } } diff --git a/Content.Shared/_DV/CCVars/DCCVars.cs b/Content.Shared/_DV/CCVars/DCCVars.cs index d28faf854d20..059f16732dab 100644 --- a/Content.Shared/_DV/CCVars/DCCVars.cs +++ b/Content.Shared/_DV/CCVars/DCCVars.cs @@ -155,4 +155,10 @@ public sealed class DCCVars /// public static readonly CVarDef DiscordReplyColor = CVarDef.Create("admin.discord_reply_color", string.Empty, CVar.SERVERONLY); + + /// + /// Whether or not to disable the preset selecting test rule from running. Should be disabled in production. DeltaV specific, attached to Impstation Secret concurrent feature. + /// + public static readonly CVarDef EnableBacktoBack = + CVarDef.Create("game.disable_preset_test", false, CVar.SERVERONLY); } diff --git a/Resources/Prototypes/game_presets.yml b/Resources/Prototypes/game_presets.yml index 5eaafddfaf96..39ffa1d4b264 100644 --- a/Resources/Prototypes/game_presets.yml +++ b/Resources/Prototypes/game_presets.yml @@ -5,6 +5,7 @@ name: survival-title showInVote: true # secret # DeltaV - Me when the survival. Used for periapsis. description: survival-description + cooldown: 2 # Imp - Can't occur thrice rules: - MeteorSwarmScheduler - RampingStationEventScheduler @@ -155,6 +156,7 @@ - tator name: traitor-title description: traitor-description + cooldown: 2 # Imp - Can't occur thrice showInVote: false rules: - Traitor @@ -185,6 +187,7 @@ name: nukeops-title description: nukeops-description showInVote: false + cooldown: 2 # Imp - Can't occur thrice rules: - Nukeops - SubGamemodesRule @@ -222,6 +225,7 @@ - zomber name: zombie-title description: zombie-description + cooldown: 2 # Imp - Can't occur thrice showInVote: false rules: - Zombie From ccb9f39e8d145759428eccb84b22bc6f4e12066e Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Sun, 19 Jan 2025 01:34:04 +0100 Subject: [PATCH 176/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 64f30a66aef2..8f7b312f0c09 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Colin-Tel - changes: - - message: Service Workers can now choose green clothes in their loadouts! - type: Add - id: 439 - time: '2024-07-21T16:44:24.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1499 - author: jimmy12or changes: - message: Adds Crystalthistle! A plant that produces Quartzite! @@ -3858,3 +3851,11 @@ id: 938 time: '2025-01-18T23:50:21.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2746 +- author: TGRCDev, Lyndomen + changes: + - message: Gamemodes now have cooldowns to prevent back-to-back modes. Modes that + have been voted on are exempt from this. + type: Add + id: 939 + time: '2025-01-19T00:33:45.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2744 From f2ad3e278fed85b8a0b8a8bb816b164e1f40ac78 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 19 Jan 2025 03:41:35 +0000 Subject: [PATCH 177/205] Update Credits (#2771) Co-authored-by: DeltaV-Bot --- Resources/Credits/GitHub.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt index a2507a874c3e..89ed3ccb7a26 100644 --- a/Resources/Credits/GitHub.txt +++ b/Resources/Credits/GitHub.txt @@ -1 +1 @@ -0tito, 0x6273, 12rabbits, 13spacemen, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 2digitman, 3nderall, 4310v343k, 4dplanner, 612git, 778b, Ablankmann, abregado, Absolute-Potato, Acruid, actioninja, ActiveMammmoth, actually-reb, ada-please, adamsong, Adeinitas, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, Agoichi, Ahion, aiden, Aikakakah, aitorlogedo, ajcm, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexum418, alexumandxgabriel08x, Alithsko, ALMv1, Alpaccalypse, Alpha-Two, AlphaQwerty, Altoids1, amatwiedle, amylizzle, ancientpower, Andre19926, AndrewEyeke, AndreyCamper, angelofallars, Anzarot121, Appiah, ar4ill, ArchPigeon, ArchRBX, areitpog, Arendian, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, AruMoon, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringlich, aspiringLich, astriloqua, august-sun, AutoOtter, Avalon-Proto, AverageNotDoingAnythingEnjoyer, avghdev, Awlod, azzy, AzzyIsNotHere, baa14453, BackeTako, BananaFlambe, Baptr0b0t, BarryNorfolk, BasedPugilist, BasedUser, Batuh1n, beck-thompson, BellwetherLogic, ben, benev0, benjamin-burges, BGare, bhespiritu, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, BlitzTheSquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, Booblesnoot42, boogiebogus, Boolean-Buckeye, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, Bribrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, capnsockless, CaptainMaru, CaptainSqrBeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, Catofquestionableethics, CatTheSystem, Centronias, chairbender, Charlese2, charlie, ChaseFlorom, chavonadelal, Cheackraze, CheddaCheez, cheesePizza2, cheeseplated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbygummibear, Ciac32, civilCornball, Clement-O, clyf, Clyybber, CMDR-Piboy314, CodedCrow, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, CookieMasterT, coolboy911, coolmankid12345, Coolsurf6, corentt, CormosLemming, CrafterKolyan, crazybrain23, creadth, CrigCrag, croilbird, Crotalus, CrudeWax, CrzyPotato, cutemoongod, Cyberboss, d34d10cc, dabigoose, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, DangerRevolution, daniel-cr, DanSAussieITS, Daracke, DarkenedSynergy, Darkenson, DawBla, Daxxi3, dch-GH, de0rix, Deahaka, dean, DEATHB4DEFEAT, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DefinitelyNotFurryXD, degradka, Delete69, deltanedas, DeltaV-Bot, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, dexlerxd, dffdff2423, dge21, DieselMohawk, digitalic, Dimastra, DinoWattz, DisposableCrewmember42, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DoctorBeard, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, dootythefrooty, Dorragon, Doru991, dotcatshark, DoubleRiceEddiedd, DoutorWhite, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, dylanstrategie, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, ElectroSR, elsie, elthundercloud, Elysium206, Emily9031, Emisse, emmafornash, EmoGarbage404, Endecc, eoineoineoin, eris, erohrs2, ERORR404V1, Errant-4, esguard, estacaoespacialpirata, Eternally-Confused, eugene, ewokswagger, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, FATFSAAM2, Feluk6174, ficcialfaint, FieldCommand, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, firenamefn, FirinMaLazors, Fishfish458, fl-oz, Flareguy, flashgnash, FluffiestFloof, FluffMe, FluidRock, flyingkarii, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, Fouin, foxhorn, freeman2651, freeze2222, Froffy025, Fromoriss, froozigiusz, FrostMando, FryOfDestiny, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, gamer3107, gansulalan, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, gluesniffler, GNF54, godisdeadLOL, goet, Goldminermac, Golinth, GoodWheatley, Gorox221, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, greggthefather, GreyMario, GTRsound, Guess-My-Name, gusxyz, Gyrandola, h3half, Haltell, Hanzdegloker, HappyRoach, Hardly3D, harikattar, HawkeyeBlade, he1acdvv, Hebi, Henry, HerCoyote23, HighTechPuddle, hitomishirichan, hiucko, Hmeister-fake, Hmeister-real, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hreno, htmlsystem, hubismal, Hugal31, Huxellberger, Hyenh, hyphenationc, i-justuser-i, iacore, iamnotgray, IamVelcroboy, ian, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imrenq, imweax, indeano, Injazz, Insineer, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jaskanbe, JasperJRoth, jerryimmouse, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jmcb, joe, JoeHammad1844, JohnGinnane, johnku1, Jophire, joshepvodka, Jrpl, jtbill123, juliangiebel, juniwoofs, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, JustinWinningham, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, KaiShibaa, kalane15, kalanosh, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KieueCaprie, Killerqu00, Kimpes, KingFroozy, kira-er, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kosticia, koteq, Kr8art, KrasnoshchekovPavel, Krunklehorn, Kupie, Kurzaen, kxvvv, kyupolaris, kzhanik, lajolico, Lamrr, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonidussaks, leonsfriedrich, LetterN, lettern, Level10Cybermancer, LEVELcat, lever1209, LevitatingTree, Lgibb18, lgruthes, LightVillet, liltenhead, LinkUyx, LioValkyria, Litraxx, LittleBuilderJane, LittleNyanCat, lizelive, lleftTheDragon, localcc, lokachop, Lomcastar, LordCarve, LordEclipse, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luizwritescode, Lukasz825700516, luminight, lunarcomets, luringens, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M3739, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, MagnusCrowe, malchanceux, MaloTV, manelnavola, ManelNavola, Mangohydra, marboww, Markek1, Matz05, max, MaxNox7, maylokana, mazzie, MehimoNemo, MeltedPixel, MemeProof, memoblob, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, mifia, MilenVolf, MilonPL, Minemoder5000, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterMecky, Mith-randalf, MjrLandWhale, mkanke-real, MLGTASTICa, mnemotechnician, moderatelyaware, modern-nm, mokiros, Moneyl, Monotheonist, Moomoobeef, moony, Morb0, MossyGreySlope, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, muburu, MureixloI, musicmanvr, MWKane, Myakot, Myctai, N3X15, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, NIXC, NkoKirkto, nmajask, noctyrnal, noelkathegod, nok-ko, NonchalantNoob, NoobyLegion, Nopey, not-gavnaed, notafet, notquitehadouken, notsodana, noudoit, noverd, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, NullWanderer, nyeogmi, Nylux, Nyranu, och-och, ocotheomega, OctoRocket, OldDanceJacket, onesch, OnyxTheBrave, OrangeMoronage9622, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paige404, paigemaeforrest, pali6, Pangogie, panzer-iv1, paolordls, partyaddict, patrikturi, PaulRitter, peccneck, Peptide90, peptron1, PeterFuto, PetMudstone, pewter-wiz, Pgriha, Phantom-Lily, PHCodes, pheenty, Phill101, phunnyguy, PilgrimViis, Pill-U, pinkbat5, Piras314, Pireax, pissdemon, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, pofitlo, pointer-to-null, pok27, poklj, PolterTzi, pontaoski, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, PPooch, ProfanedBane, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykana, psykzz, PuceTint, PuroSlavKing, PursuitInAshes, Putnam3145, qrtDaniil, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, RedBookcase, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, ReeZer2, RemberBM, RemieRichards, RemTim, Remuchi, rene-descartes2021, Renlou, retequizzle, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, RobbyTheFish, Rockdtben, Rohesie, rok-povsic, rolfero, RomanNovo, rosieposieeee, Roudenn, router, RumiTiger, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, SaphireLattice, SapphicOverload, sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, schrodinger71, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, Segonist, sephtasm, Serkket, sewerpig, sh18rw, Shaddap1, ShadeAware, ShadowCommander, shadowtheprotogen546, shadowwailker, shaeone, shampunj, shariathotpatrol, ShatteredSwords, SignalWalker, siigiil, SimpleStation14, Simyon264, sirdragooon, Sirionaut, SirSmith148, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, sleepyyapril, Slyfox333, Smugman, snebl, sniperchance, Snowni, snowsignal, solaris7518, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, southbridge-fur, Soydium, spacelizard, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, Spanky, spartak, SpartanKadence, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, Squishy77, SsalamethVersaach, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, Stealthbomber16, stellar-novas, stomf, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, superjj18, Supernorn, SweptWasTaken, Sybil, SYNCHRONIC, Szunti, TadJohnson00, Tainakov, takemysoult, tap, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, TGRCdev, tgrkzus, ThataKat, ThatGuyUSA, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, theashtronaut, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheIntoxicatedCat, thekilk, themias, theomund, TheOneWhoIsManyFrame, TherapyGoth, therealDLondon, TheShuEd, thetolbean, thevinter, TheWaffleJesus, Thinbug0, ThunderBear2006, Timemaster99, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, Titian3, tk-a369, tkdrg, tmtmtl30, toasterpm87, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomce795, Tomeno, Tonydatguy, topy, Tornado-Technology, tosatur, TotallyLemon, Tr1bute, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, Tyzemol, UbaserB, ubis1, UBlueberry, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, Unkn0wnGh0st333, unusualcrow, Uriende, UristMcDorf, user424242420, Vaaankas, valentfingerov, Varen, Vasilis, VasilisThePikachu, Velcroboy, veliebm, VelonacepsCalyxEggs, venn, veprolet, veritable-calamity, Veritius, Vermidia, vero5123, Verslebas, Vexerot, VigersRay, violet754, Visne, vitalvitriol, vlados1408, VMSolidus, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, vulppine, wafehling, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, widgetbeck, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, wrexbe, WTCWR68, xkreksx, xprospero, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, Yousifb26, youtissoum, yunii, yuriykiss, YuriyKiss, zach-hill, Zadeon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zHonys, zionnBE, ZNixian, ZoldorfTheWizard, zonespace27, ZweiHawke, Zylofan, Zymem, zzylex +0tito, 0x6273, 12rabbits, 13spacemen, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 2digitman, 3nderall, 4310v343k, 4dplanner, 612git, 778b, Ablankmann, abregado, Absolute-Potato, Acruid, actioninja, ActiveMammmoth, actually-reb, ada-please, adamsong, Adeinitas, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, Agoichi, Ahion, aiden, Aikakakah, aitorlogedo, ajcm, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexum418, alexumandxgabriel08x, Alithsko, ALMv1, Alpaccalypse, Alpha-Two, AlphaQwerty, Altoids1, amatwiedle, amylizzle, ancientpower, Andre19926, AndrewEyeke, AndreyCamper, angelofallars, Anzarot121, Appiah, ar4ill, ArchPigeon, ArchRBX, areitpog, Arendian, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringlich, aspiringLich, astriloqua, august-sun, AutoOtter, Avalon-Proto, AverageNotDoingAnythingEnjoyer, avghdev, Awlod, azzy, azzyisnothere, AzzyIsNotHere, baa14453, BackeTako, BananaFlambe, Baptr0b0t, BarryNorfolk, BasedPugilist, BasedUser, Batuh1n, beck-thompson, BellwetherLogic, ben, benev0, benjamin-burges, BGare, bhespiritu, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, BlitzTheSquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, Booblesnoot42, boogiebogus, Boolean-Buckeye, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, Bribrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, capnsockless, CaptainMaru, CaptainSqrBeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, Catofquestionableethics, CatTheSystem, Centronias, chairbender, Charlese2, charlie, ChaseFlorom, chavonadelal, Cheackraze, CheddaCheez, cheesePizza2, cheeseplated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbygummibear, Ciac32, civilCornball, Clement-O, clyf, Clyybber, CMDR-Piboy314, CodedCrow, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, CookieMasterT, coolboy911, coolmankid12345, Coolsurf6, corentt, CormosLemming, CrafterKolyan, crazybrain23, creadth, CrigCrag, croilbird, Crotalus, CrudeWax, CrzyPotato, cutemoongod, Cyberboss, d34d10cc, dabigoose, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, DangerRevolution, daniel-cr, DanSAussieITS, Daracke, DarkenedSynergy, Darkenson, DawBla, Daxxi3, dch-GH, de0rix, Deahaka, dean, DEATHB4DEFEAT, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DefinitelyNotFurryXD, degradka, Delete69, deltanedas, DeltaV-Bot, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, dexlerxd, dffdff2423, dge21, DieselMohawk, digitalic, Dimastra, DinoWattz, Dirius77, DisposableCrewmember42, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DoctorBeard, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, dootythefrooty, Dorragon, Doru991, dotcatshark, DoubleRiceEddiedd, DoutorWhite, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, dylanstrategie, dylanwhittingham, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, ElectroSR, elsie, elthundercloud, Elysium206, Emily9031, Emisse, emmafornash, EmoGarbage404, Endecc, eoineoineoin, eris, erohrs2, ERORR404V1, Errant-4, esguard, estacaoespacialpirata, Eternally-Confused, eugene, ewokswagger, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, FATFSAAM2, Feluk6174, ficcialfaint, FieldCommand, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, firenamefn, FirinMaLazors, Fishfish458, fl-oz, Flareguy, flashgnash, FluffiestFloof, FluffMe, FluidRock, flyingkarii, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, Fouin, foxhorn, freeman2651, freeze2222, Froffy025, Fromoriss, froozigiusz, FrostMando, FryOfDestiny, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, gamer3107, gansulalan, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, gluesniffler, GNF54, godisdeadLOL, goet, Goldminermac, Golinth, GoodWheatley, Gorox221, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, greggthefather, GreyMario, GTRsound, Guess-My-Name, gusxyz, Gyrandola, h3half, Haltell, Hanzdegloker, HappyRoach, Hardly3D, harikattar, HawkeyeBlade, he1acdvv, Hebi, Henry, HerCoyote23, HighTechPuddle, hitomishirichan, hiucko, hivehum, Hmeister-fake, Hmeister-real, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hreno, HTMLSystem, hubismal, Hugal31, Huxellberger, Hyenh, hyphenationc, i-justuser-i, iacore, iamnotgray, IamVelcroboy, ian, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imrenq, imweax, indeano, Injazz, Insineer, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jaskanbe, JasperJRoth, jerryimmouse, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jmcb, joe, JoeHammad1844, JohnGinnane, johnku1, Jophire, joshepvodka, Jrpl, jtbill123, juliangiebel, juniwoofs, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, JustinWinningham, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, KaiShibaa, kalane15, kalanosh, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KieueCaprie, Killerqu00, Kimpes, KingFroozy, kira-er, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kosticia, koteq, Kr8art, KrasnoshchekovPavel, Krunklehorn, Kupie, Kurzaen, kxvvv, kyupolaris, kzhanik, lajolico, Lamrr, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonidussaks, leonsfriedrich, LetterN, lettern, Level10Cybermancer, LEVELcat, lever1209, LevitatingTree, Lgibb18, lgruthes, LightVillet, liltenhead, LinkUyx, LioValkyria, Litraxx, LittleBuilderJane, LittleNyanCat, lizelive, lleftTheDragon, localcc, lokachop, Lomcastar, LordCarve, LordEclipse, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luizwritescode, Lukasz825700516, luminight, lunarcomets, luringens, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M3739, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, MagnusCrowe, malchanceux, MaloTV, manelnavola, ManelNavola, Mangohydra, marboww, Markek1, Matz05, max, MaxNox7, maylokana, mazzie, MehimoNemo, MeltedPixel, MemeProof, memoblob, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, mifia, MilenVolf, MilonPL, Minemoder5000, Minty642, minus1over12, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterMecky, Mith-randalf, MjrLandWhale, mkanke-real, MLGTASTICa, mnemotechnician, moderatelyaware, modern-nm, mokiros, Moneyl, Monotheonist, Moomoobeef, moony, Morb0, MossyGreySlope, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, muburu, MureixloI, musicmanvr, MWKane, Myakot, Myctai, N3X15, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, NIXC, NkoKirkto, nmajask, noctyrnal, noelkathegod, nok-ko, NonchalantNoob, NoobyLegion, Nopey, not-gavnaed, notafet, notquitehadouken, notsodana, noudoit, noverd, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, NullWanderer, nyeogmi, Nylux, Nyranu, och-och, ocotheomega, OctoRocket, OldDanceJacket, onesch, OnyxTheBrave, OrangeMoronage9622, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paige404, paigemaeforrest, pali6, Pangogie, panzer-iv1, paolordls, partyaddict, patrikturi, PaulRitter, peccneck, Peptide90, peptron1, PeterFuto, PetMudstone, pewter-wiz, Pgriha, Phantom-Lily, PHCodes, pheenty, Phill101, phunnyguy, PilgrimViis, Pill-U, pinkbat5, Piras314, Pireax, pissdemon, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, pofitlo, pointer-to-null, pok27, poklj, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, PPooch, ProfanedBane, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykana, psykzz, PuceTint, PuroSlavKing, PursuitInAshes, Putnam3145, qrtDaniil, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, RedBookcase, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, ReeZer2, RemberBM, RemieRichards, RemTim, Remuchi, rene-descartes2021, Renlou, retequizzle, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, RobbyTheFish, Rockdtben, Rohesie, rok-povsic, rolfero, RomanNovo, rosieposieeee, Roudenn, router, RumiTiger, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, SaphireLattice, SapphicOverload, sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, schrodinger71, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, Segonist, sephtasm, Serkket, sewerpig, sh18rw, Shaddap1, ShadeAware, ShadowCommander, shadowtheprotogen546, shadowwailker, shaeone, shampunj, shariathotpatrol, ShatteredSwords, SignalWalker, siigiil, SimpleStation14, Simyon264, sirdragooon, Sirionaut, SirSmith148, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, sleepyyapril, Slyfox333, Smugman, snebl, sniperchance, Snowni, snowsignal, solaris7518, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, southbridge-fur, sowelipililimute, Soydium, spacelizard, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, Spanky, spartak, SpartanKadence, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, Squishy77, SsalamethVersaach, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, Stealthbomber16, stellar-novas, stomf, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, superjj18, Supernorn, SweptWasTaken, Sybil, SYNCHRONIC, Szunti, TadJohnson00, Tainakov, takemysoult, tap, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TeenSarlacc, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, TGRCdev, tgrkzus, ThataKat, ThatGuyUSA, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, theashtronaut, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheIntoxicatedCat, thekilk, themias, theomund, TheOneWhoIsManyFrame, TherapyGoth, therealDLondon, TheShuEd, thetolbean, thevinter, TheWaffleJesus, Thinbug0, ThunderBear2006, Timemaster99, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, Titian3, tk-a369, tkdrg, tmtmtl30, toasterpm87, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomce795, Tomeno, Tonydatguy, topy, Tornado-Technology, tosatur, TotallyLemon, Tr1bute, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, Tyzemol, UbaserB, ubis1, UBlueberry, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, Unkn0wnGh0st333, unusualcrow, Uriende, UristMcDorf, user424242420, Vaaankas, valentfingerov, Varen, Vasilis, VasilisThePikachu, Velcroboy, veliebm, VelonacepsCalyxEggs, venn, veprolet, veritable-calamity, Veritius, Vermidia, vero5123, Verslebas, Vexerot, VigersRay, violet754, Visne, vitalvitriol, vlados1408, VMSolidus, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, vulppine, wafehling, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, widgetbeck, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, wrexbe, WTCWR68, xkreksx, xprospero, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, Yousifb26, youtissoum, yunii, YuriyKiss, yuriykiss, zach-hill, Zadeon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zHonys, zionnBE, ZNixian, ZoldorfTheWizard, zonespace27, ZweiHawke, Zylofan, Zymem, zzylex From 2e491e91b5d9f7359792db71b167c503f3c053e8 Mon Sep 17 00:00:00 2001 From: TadJohnson00 Date: Sun, 19 Jan 2025 18:31:23 +1100 Subject: [PATCH 178/205] sec jobicon visibility ops --- Resources/Prototypes/StatusIcon/job.yml | 2 +- .../Interface/Misc/job_icons.rsi/Prisoner.png | Bin 0 -> 529 bytes .../Misc/job_icons.rsi/SecurityOfficer.png | Bin 554 -> 534 bytes .../_DV/Interface/Misc/job_icons.rsi/Warden.png | Bin 531 -> 544 bytes .../_DV/Interface/Misc/job_icons.rsi/meta.json | 5 ++++- .../Misc/job_icons.rsi/nyanoPrisonGuard.png | Bin 534 -> 530 bytes .../Misc/id_cards.rsi/idsecurityofficer.png | Bin 638 -> 608 bytes .../_DV/Objects/Misc/id_cards.rsi/idwarden.png | Bin 606 -> 631 bytes .../_DV/Objects/Misc/id_cards.rsi/meta.json | 2 +- .../Objects/Misc/id_cards.rsi/nyanoprisoner.png | Bin 211 -> 608 bytes .../Misc/id_cards.rsi/nyanoprisonguard.png | Bin 608 -> 606 bytes 11 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/_DV/Interface/Misc/job_icons.rsi/Prisoner.png diff --git a/Resources/Prototypes/StatusIcon/job.yml b/Resources/Prototypes/StatusIcon/job.yml index 4cecbc99e416..9299673b6c7f 100644 --- a/Resources/Prototypes/StatusIcon/job.yml +++ b/Resources/Prototypes/StatusIcon/job.yml @@ -73,7 +73,7 @@ parent: JobIcon id: JobIconPrisoner icon: - sprite: /Textures/Interface/Misc/job_icons.rsi + sprite: /Textures/_DV/Interface/Misc/job_icons.rsi # DeltaV - resprite prisoner jobicon state: Prisoner jobName: job-name-prisoner diff --git a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/Prisoner.png b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/Prisoner.png new file mode 100644 index 0000000000000000000000000000000000000000..cf2b09f453098a27ff2f314073c77634451c1144 GIT binary patch literal 529 zcmV+s0`C2ZP)-gRALxTx9;@C_2rF^fCIN#e|wV+r0P9%W^@ zNPI#Z<8(mcTcIl+zX>jR{3V#@vkQP<^pr{+taLCdbAx!AIBMus);f>4Nk}zUa+Jqu zO~6JLX`~=QK^2?O;UG@gq?vX1C7QlvRLH|;9g)ZsQCHya3l`+h3tM&3}_#Z)?$GAiM)y-n2F4 z0Jz!(#-1&i%S|aj%dcs`#|1D_03!Fm(7HFP)_njhPZ!4!3CZLX1}0O}t^XCIWbf=M?Vc#8qN$_PrpNwlf9>zCMpm`r zH#ZU`gngnTZ#HGBi3IA%JQ6+7!y?&qrfoN4EK{1aa!2F&*$f$Zg41^FRPkc~0#8>z Jmvv4FO#tNXCF%eG delta 125 zcmV-@0D}LP1gZqEwE=ZtNklpFJqFftdy2C0GpOG}&oAPfUUnZSf>rj?Z~0|+AnMwlbf?FT7*`}P$BBSih?+n zkxDRs;qHC-=6xS`?*M;BXNKLE01VUN*>p-;Ev!kwclZ#&fY@bbTT8jcJbK2@Bh^tn z#6_>(bzNh)sM-wh4HC~Wi#x?y~3Em?fWo5ZYd_o-KbU@-;p(`H02`+j3C79>4 z3xHqrlu8|}bTBJ(gLs-aYUowgI*+(XNHte~a+JquO~6JLX`~=QK^2?O;UG@gq?vX1 zC7QlvRLH|;9g)ZsQCHya3l`+h3tM&3}_#Z)?$GAiM)y-n2F40Jz!(#-1&i%S|aj%dcs`#|1DX zQUD_Nz|guktJZ&i>afUF%R0TW{ZG0+8Jk|3H9MBwu#0DG$~zKWVs>;M1&07*qoM6N<$f&}c(8UO$Q delta 441 zcmV;q0Y?6y1d{}iBqnfaLqkw$V`BgSD3NuMze~eF6vw}9m5Np>*g?c0Ln{s~6a{gV zkxDRs$K`$a=6xS`?*M;BXNKLE1Ps&R*>p-;Ev!kwcla7Y-=gEm`Bg}d8BHJ zhlJ?WyRK^t6;+!7z5(J{W^spjo;b7RSc3P6BdjbJiBE{*oDN8QD|E%HlUl@4ZQZV*oqM-9EoTIUfr3906PN{;e4?Frb(B8?OzD5zo+IvgY@n>4fT zzGTz4j0$-eeJ#|$$x%X?ym3;i)K#Udk*?CxQ4@3jKTlhmnfAJeQb7N!>wd<7;6Bi( zyYBC)>o(4Szzc9~w*3{F)7&@d^|ls02EseQnFx!jZjwEda}d|Ut} z!v$dU9vEErX4U$S^Cuv`O;21M-n*1i;}fW0RZ#7+y(9L_t&-8DnGs z0yQ!aY-o)00000NkvXXu0mjf(ptq* diff --git a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/meta.json index 3780cba03941..ca21f0803d40 100644 --- a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoPrisonGuard, nyanoMartialArtist, nyanoGladiator made by Floofers | ChiefJustice, Clerk by leonardo_dabepis (Discord), SecurityBorg recoloured from MedicalBorg by DangerRevolution(github), CargoAssistant recoloured from MedicalIntern by Radezolid, AdminAssistant made by noctyrnal (github), Surgeon by Janet Blackquill 2024. Security cards modified by TJohnson.", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | SecurityOfficer, nyanoMartialArtist, nyanoGladiator made by Floofers | ChiefJustice, Clerk by leonardo_dabepis (Discord), SecurityBorg recoloured from MedicalBorg by DangerRevolution(github), CargoAssistant recoloured from MedicalIntern by Radezolid, AdminAssistant made by noctyrnal (github), Surgeon by Janet Blackquill 2024. Security cards modified by TJohnson.", "size": { "x": 8, "y": 8 @@ -69,6 +69,9 @@ }, { "name": "SeniorOfficer" + }, + { + "name": "Prisoner" } ] } diff --git a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/nyanoPrisonGuard.png b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/nyanoPrisonGuard.png index 4f4ec66fbe7fa8ee90ca9723e86ce1021952e4ad..0e7c51ff1ddadc1abfdb469e32e0ee2ee134ac1f 100644 GIT binary patch delta 440 zcmV;p0Z0Cp1d;@hBqncZLqkw$V`BgSD3NuMze~eF6vw}9)rwX+)Ir1{LluV>ih?+n zkxDRs;qHC-=6xS`?*M;BXNKLE01VUN*>p-;Ev!kwclZ#&fY@bbTT8jcJbK2@Bh^tn z#6_>(bzNh)sM-wh4HC~Wi#x?y~3Em?fWo5ZYd_o-KbU@-;p(`H02`+j3C79>4 z3xHqrlu8|}bTBJ(gLs-aYUowgI*+(XNHte~a+JquO~6JLX`~=QK^2?O;UG@gq?vX1 zC7QlvRLH|;9g)ZsQCHya3l`+h3tM&3}_#Z)?$GAiM)y-n2F40Jz!(#-1&i%S|aj%dcs`#|1DX zQUD_Nz|guktJZ&*g?c0Ln{s~6a{gV zkxDRs$K`$a=6xS`?*M;BXNKLE1Ps&R*>p-;Ev!kwcla7Y-=gEm`Bg}d8BHJ zhlJ?WyRK^t6;+!7z5(J{W^spjo;b7RSc3P6BdjbJiBE{*oDN8QD|E%HlUl@4ZQZV*oqM-9EoTIUfr3906PN{;e4?Frb(B8?OzD5zo+IvgY@n>4fT zzGTz4j0$-eeJ#|$$x%X?ym3;i)K#Udk*?CxQ4@3jKTlhmnfAJeQb7N!>wd<7;6Bi( zyYBC)>o(4Szzc9~w*3{F)7&@d^|ls02EseQnFx!jZjwEda}d|Ut} z!v$dU9vEErX4U$S^Cuv`O;21M-n*1i;}fW0RZ#7-39FL_t&-8DnGs z0yQEYL mg3N}y0bK%S8zYE;&zk^fZV{Haxg<^i0000F6XAut*OqaiTTLx7Rk z08mp?`;V^n)~#Da>qplM;}c~7$Z}y}F_<1W{r2rE21*^l0ym8a#<63E;i{~xY~gH5 z7)+FCriR|3s1nw!S&w00000NkvXXu0mjf`rt`2 delta 223 zcmV<503iS11pWlDr~!Wx000XT0n*)m`~Uy|v`IukR9Fe^luZhNAP|M8=mtVZ&^rX3 zKJX5DgupWtvoHn`d1b2_H#+Fddw%{9X;T79KneVvz<>g<)*j{B7$clt=H__JgI3St z#>^B#AlcVUwd&O7AOkYd`%Q-3;|Z<6!ppK=%Q<$=UGdWaY=Bn<-rhaeyk(#yzy*36 zY=Ffj0cobk1pJI@H~x)h*kk@1xzG{hkLb>pQ`!kRBFF#>*X}^e5F*~n*EuDi1eCyk Z2%MVFEZFL&Nyz{J002ovPDHLkV1jrAXH5VA diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idwarden.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idwarden.png index edada474506844278eca4fe3609f093d680a3b62..4221aae0ddc85ba63af04afb78e5e1f45b129bd8 100644 GIT binary patch delta 562 zcmV-20?qy21os4xBqncZLqkw$V`BgSD3NuMze~eF6vw}9)rwX+)Ir1{LluV>ih?+n zkxDRs;qHC-=6xS`?*M;BXNKLE01VUN*>p-;Ev!kwclZ#&fY@bbTT8jcJbK2@Bh^tn z#6_>(bzNh)sM-wh4HC~Wi#x?y~3Em?fWo5ZYd_o-KbU@-;p(`H02`+j3C79>4 z3xHqrlu8|}bTBJ(gLs-aYUowgI*+(XNHte~a+JquO~6JLX`~=QK^2?O;UG@gq?vX1 zC7QlvRLH|;9g)ZsQCHya3l`+h3tM&3}_#Z)?$GAiM)y-n2F40Jz!(#-1&i%S|aj%dcs`#|1Ed zQUD_Nz|guktJZ&Zp#9{p1?@ z1=d4UBZ59skO2`Y^+3%4`=dsOXCy!ZB%leL5dJozc-E||00000NkvXXu0mh|g1Djr AU;qFB delta 536 zcmV+z0_Xkr1l|OYBqnfaLqkw$V`BgSD3NuMze~eF6vw}9m5Np>*g?c0Ln{s~6a{gV zkxDRs$K`$a=6xS`?*M;BXNKLE1Ps&R*>p-;Ev!kwcla7Y-=gEm`Bg}d8BHJ zhlJ?WyRK^t6;+!7z5(J{W^spjo;b7RSc3P6BdjbJiBE{*oDN8QD|E%HlUl@4ZQZV*oqM-9EoTIUfr3906PN{;e4?Frb(B8?OzD5zo+IvgY@n>4fT zzGTz4j0$-eeJ#|$$x%X?ym3;i)K#Udk*?CxQ4@3jKTlhmnfAJeQb7N!>wd<7;6Bi( zyYBC)>o(4Szzc9~w*3{F)7&@d^|ls02EseQnFx!jZjwEda}d|Uv3 z!v$dU9vEErX4U$S^Cuv`O;21M-n*1i;}fV*mgE32;bRa{vGf5&!@T z5&_cPe*6Fc0F+5YK~z`?V_+BsqaiRF0;3@?(nEle*Z@#dQ~Qsu_SUUiMC(V_OA;Ss zIS5!<+Mv+b97U4BK*da?Y8Vjpun+)edmo9Qdk9!r*@6QAMpGj+20RJ|+yO*qBW&?a zw`@p_xE{1-5ETWW;1?DaBgqqQ-@alXCW?r10LW%+X#k&#h_M`>{!zKn5Eu=C(GVCp aApiiAQ$1~=lYY$r0000 2024. Security sprites modified by TJohnson.", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | idsecurityofficer, nyanogladiator, nyanomartialartist made by Floofers, idchiefjustice idclerk and idlawyer made by leonardo_dabepis (Discord), idprosecutor made by Timemaster99 (Discord), idcargoassistant made by Radezolid, idadminassistant by noctyrnal (github), idsurgeon by Janet Blackquill 2024. Security sprites modified by TJohnson.", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/nyanoprisoner.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/nyanoprisoner.png index 96c8f4d98256ce8784f67055fdfa004b2aa89c47..33752f69a1779f04dded3267aeebc198e5f64ce3 100644 GIT binary patch delta 584 zcmV-O0=NCs0pJ9XBYy#JX+uL$X=7sm04R}lk-tmBKorNnZPkiaI@CeLAww017K(y6 zmI`*M4s8XiF3B}%g(MA^6e+HPi$lRdbn(~Vf1s=2svro8AmZxkuSH6H*A!Z$ec|qX z_~v~dckcjyMrVfImjDdY;n{RbS}m+e!FTu&!GPFhW?M_S#eY0{#?K?wQ9Q&&uikZC zW4Nf=4DbyS&oPTT#7W}JmSYLtBOYaCxk!9M9OHCA;#;9B9={1LdHf}q=d%ldU-Xnp z9jtUPD|3T*nmB6cRn|I>xJgJgS8|lcX-&XJ7HOm)K|vLp(BU9X*`%3u_a&OXWmL$+ zXtz)UCr1fo@_)uitx{K&vPQZ}pN^WC`~P{`+U$(iJ(L3aUtRZe5(w@Cjk@dpp1N-1 z3<$gc*Jj&ap*hWelU{FY(PJRI16__rTD) zH>=ivoIe5iZF-_R;P42TqWbX0ACo6%*on8L#{d8T34d@%S#tmY3labT3lag+-G2N4 z005UsL_t(o3GI|&3Vpxsfa(H5n4h2jKQ;grXP^X=lm@i4v{2~LTreygz%fW{gM?Puka4s{H0pp+ m2aGyk)B&Ro81W7O2rvM`X?~RLn`xu~0000xL&_U$VM zN*%!hH;o9!v15nfs;sPR;cQA6Oq6J*hTfs&09dfY=m7}xtG5M=hq z21G>xu7U_(&=Ffm5#<1oMcC2+J_k@*LgF)fRBki`MnhmU1cp}#008L&A0@WFIp6>Q O002ovP6b4+LSTZ>5IU#; From 7b05aee437a564535049f9787a8d08c1179e6473 Mon Sep 17 00:00:00 2001 From: BarryNorfolk Date: Sun, 19 Jan 2025 13:38:43 +0100 Subject: [PATCH 179/205] Ensure the Horizontal state is set when buckling/unbuckling (#2769) Allow standing system to handle up/down before buckling occurs --- Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs index 8d04c9dcacf1..14fa3932722b 100644 --- a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs +++ b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs @@ -362,7 +362,6 @@ private void Buckle(Entity buckle, Entity strap _audio.PlayPredicted(strap.Comp.BuckleSound, strap, user); - SetBuckledTo(buckle, strap!); Appearance.SetData(strap, StrapVisuals.State, true); Appearance.SetData(buckle, BuckleVisuals.Buckled, true); @@ -384,6 +383,8 @@ private void Buckle(Entity buckle, Entity strap break; } + SetBuckledTo(buckle, strap!); // DeltaV - Allow standing system to handle Down/Stand before buckling + var ev = new StrappedEvent(strap, buckle); RaiseLocalEvent(strap, ref ev); From c6451e70a4d761a68940c373fee429d1577f261d Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Sun, 19 Jan 2025 13:39:02 +0100 Subject: [PATCH 180/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 8f7b312f0c09..2a68a90c25b9 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,13 +1,4 @@ Entries: -- author: jimmy12or - changes: - - message: Adds Crystalthistle! A plant that produces Quartzite! - type: Add - - message: Adds Quartzite! A reagent that turns into glass when heated! - type: Add - id: 440 - time: '2024-07-22T04:28:46.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1462 - author: NullWanderer changes: - message: The security resprite has been reverted after admin discussion @@ -3859,3 +3850,10 @@ id: 939 time: '2025-01-19T00:33:45.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2744 +- author: BarryNorfolk + changes: + - message: Fix the up/down when entities are buckled. + type: Fix + id: 940 + time: '2025-01-19T12:38:44.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2769 From ab9939ddeb95d01ba7ae9560013710977bc403f6 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Sun, 19 Jan 2025 18:56:45 +0000 Subject: [PATCH 181/205] add nitrous tank to surgeon locker (#2773) Co-authored-by: deltanedas <@deltanedas:kde.org> --- Resources/Prototypes/_DV/Catalog/Fills/Lockers/medical.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/medical.yml index 357c0d719025..c3215d69c5f3 100644 --- a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/medical.yml +++ b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/medical.yml @@ -100,6 +100,7 @@ - id: ClothingEyesHudMedical - id: ClothingBackpackDuffelSurgeryFilled - id: ClothingOuterVestTank + - id: NitrousOxideTankFilled - id: LunchboxMedicalFilledRandom prob: 0.3 - id: BoxSyringe From 19a58d84fccedd57c243ca0f6fff4a01fd2189e2 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Sun, 19 Jan 2025 19:57:04 +0100 Subject: [PATCH 182/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 2a68a90c25b9..ae92f0813aff 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: NullWanderer - changes: - - message: The security resprite has been reverted after admin discussion - type: Remove - id: 441 - time: '2024-07-22T07:56:03.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1517 - author: DangerRevolution changes: - message: Security Cyborgs have been authorised for use aboard Delta-V class stations. @@ -3857,3 +3850,10 @@ id: 940 time: '2025-01-19T12:38:44.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2769 +- author: deltanedas + changes: + - message: Added a nitrous oxide tank to surgeon lockers. + type: Add + id: 941 + time: '2025-01-19T18:56:46.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2773 From 0ff1dc075fbb222c98cbdfaa8d69789558542346 Mon Sep 17 00:00:00 2001 From: deltanedas <@deltanedas:kde.org> Date: Tue, 21 Jan 2025 15:13:28 +0000 Subject: [PATCH 183/205] fix skeleton mind role --- Resources/Prototypes/Entities/Mobs/Player/skeleton.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml index 54374328fc8d..d38abb96c073 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml @@ -56,7 +56,7 @@ description: ghost-role-information-closet-skeleton-description rules: ghost-role-information-closet-skeleton-rules # DeltaV - No longer free agent, now a non-antag (Some leeway given). mindRoles: - - MindRoleGhostRoleFreeAgent + - MindRoleGhostRoleNeutral # DeltaV - neutral ghost role instead of free agent raffle: settings: default requirements: # DeltaV From 190521d96d795222b549102d7f5b8e188e795ed1 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Wed, 22 Jan 2025 09:58:03 -0600 Subject: [PATCH 184/205] Compression of Arsenal techs (#2759) * the PR * unfucks FTL * should be fixed * yml typo * per maint request * 1 more maint request --- .../Nyanotrasen/Research/experimental.yml | 3 +- Resources/Prototypes/Research/arsenal.yml | 83 +++++++++---------- Resources/Prototypes/_DV/Research/arsenal.yml | 23 ++++- 3 files changed, 64 insertions(+), 45 deletions(-) diff --git a/Resources/Prototypes/Nyanotrasen/Research/experimental.yml b/Resources/Prototypes/Nyanotrasen/Research/experimental.yml index 7c89c0f7d04d..9d5be497e518 100644 --- a/Resources/Prototypes/Nyanotrasen/Research/experimental.yml +++ b/Resources/Prototypes/Nyanotrasen/Research/experimental.yml @@ -12,7 +12,8 @@ recipeUnlocks: - ClothingHeadHelmetInsulated - ClothingHeadCage - # - ShellSoulbreaker # DeltaV - Placing it under Exotic Ammunition because that's what it is. + - MagazineBoxSpecialMindbreaker + - BoxShellSoulbreaker - type: technology id: Metempsychosis diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index a8192a0284cb..871d15e14c88 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -1,26 +1,25 @@ # Tier 1 -- type: technology - id: DraconicMunitions - name: research-technology-draconic-munitions - icon: - sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi - state: incendiarydisplay - discipline: Arsenal - tier: 2 # DeltaV moved to t2 from t1 - cost: 10000 - recipeUnlocks: - - BoxShotgunIncendiary - - MagazineRifleIncendiary - - MagazinePistolIncendiary - - MagazineLightRifleIncendiary - - SpeedLoaderMagnumIncendiary - - MagazineShotgunIncendiary - - MagazineBoxPistolIncendiary - - MagazineBoxMagnumIncendiary - - MagazineBoxLightRifleIncendiary - - MagazineBoxRifleIncendiary - - MagazineBoxSpecialIncendiary # DeltaV +#- type: technology # DeltaV merged draconic and uranium munitions and moved to our namespace +# id: DraconicMunitions +# name: research-technology-draconic-muntions +# icon: +# sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi +# state: incendiarydisplay +# discipline: Arsenal +# tier: 1 +# cost: 10000 +# recipeUnlocks: +# - BoxShotgunIncendiary +# - MagazineRifleIncendiary +# - MagazinePistolIncendiary +# - MagazineLightRifleIncendiary +# - SpeedLoaderMagnumIncendiary +# - MagazineShotgunIncendiary +# - MagazineBoxPistolIncendiary +# - MagazineBoxMagnumIncendiary +# - MagazineBoxLightRifleIncendiary +# - MagazineBoxRifleIncendiary - type: technology id: WeaponizedLaserManipulation @@ -50,28 +49,28 @@ # - BoxBeanbag # - WeaponDisabler -- type: technology - id: UraniumMunitions - name: research-technology-uranium-munitions - icon: - sprite: Objects/Materials/Sheets/other.rsi - state: uranium - discipline: Arsenal - tier: 2 # DeltaV moved to t2 from t1 - cost: 7500 - recipeUnlocks: - - MagazineRifleUranium - - MagazinePistolUranium - - MagazineLightRifleUranium - - SpeedLoaderMagnumUranium - - MagazineBoxPistolUranium - - MagazineBoxMagnumUranium - - MagazineBoxLightRifleUranium - - MagazineBoxRifleUranium - - BoxShotgunUranium +#- type: technology # DeltaV merged draconic and uranium munitions and moved to our namespace +# id: UraniumMunitions +# name: research-technology-uranium-munitions +# icon: +# sprite: Objects/Materials/Sheets/other.rsi +# state: uranium +# discipline: Arsenal +# tier: 1 +# cost: 7500 +# recipeUnlocks: +# - MagazineRifleUranium +# - MagazinePistolUranium +# - MagazineLightRifleUranium +# - SpeedLoaderMagnumUranium +# - MagazineBoxPistolUranium +# - MagazineBoxMagnumUranium +# - MagazineBoxLightRifleUranium +# - MagazineBoxRifleUranium +# - BoxShotgunUranium # DeltaV - .38 special uranium ammo - Adds .38 special uranium ammo to the research tree - - SpeedLoaderSpecialUranium - - MagazineBoxSpecialUranium +# - SpeedLoaderSpecialUranium +# - MagazineBoxSpecialUranium # End of modified code - type: technology diff --git a/Resources/Prototypes/_DV/Research/arsenal.yml b/Resources/Prototypes/_DV/Research/arsenal.yml index 33bb8cd88d7b..87e0fb0c7c22 100644 --- a/Resources/Prototypes/_DV/Research/arsenal.yml +++ b/Resources/Prototypes/_DV/Research/arsenal.yml @@ -10,9 +10,28 @@ tier: 1 cost: 7500 recipeUnlocks: + - MagazineRifleUranium + - MagazinePistolUranium + - MagazineLightRifleUranium + - SpeedLoaderMagnumUranium + - MagazineBoxPistolUranium + - MagazineBoxMagnumUranium + - MagazineBoxLightRifleUranium + - MagazineBoxRifleUranium + - BoxShotgunUranium + - SpeedLoaderSpecialUranium + - MagazineBoxSpecialUranium + - BoxShotgunIncendiary + - MagazineRifleIncendiary + - MagazinePistolIncendiary + - MagazineLightRifleIncendiary + - SpeedLoaderMagnumIncendiary + - MagazineShotgunIncendiary + - MagazineBoxPistolIncendiary + - MagazineBoxMagnumIncendiary + - MagazineBoxLightRifleIncendiary + - MagazineBoxRifleIncendiary - MagazineBoxSpecialHoly - - MagazineBoxSpecialMindbreaker - - BoxShellSoulbreaker # Nyanotrasen - Soulbreaker shotgun ammo - type: technology id: EnergyGuns From c1a23e1a975ab0b492e65189e9e503455c7e4c41 Mon Sep 17 00:00:00 2001 From: Emily <182209267+Emily9031@users.noreply.github.com> Date: Wed, 22 Jan 2025 13:58:26 -0700 Subject: [PATCH 185/205] Dead Man's Signaller (#2775) * Sorta working * Made it able to be activated and deactivated * Moved everything to Delta V folders * Adds to research and protolathe * Added signaller to uplink * Sprites * Range * Fixes and moving things. * yaml fix * Fixes and clarified descriptions * More code fixes * please i beg * i hate --- .../Components/DeadMansSignallerComponent.cs | 14 +++++++++ .../Systems/DeadMansSignallerSystem.cs | 27 ++++++++++++++++++ .../Locale/en-US/_DV/store/uplink-catalog.ftl | 5 +++- .../Entities/Structures/Machines/lathe.yml | 1 + Resources/Prototypes/Research/arsenal.yml | 1 + .../Prototypes/_DV/Catalog/uplink_catalog.yml | 13 +++++++++ .../Electronics/dead-mans-signaller.yml | 25 ++++++++++++++++ .../Prototypes/_DV/Recipes/Lathes/devices.yml | 9 ++++++ .../Devices/deadmanssignaller.rsi/active.png | Bin 0 -> 408 bytes .../deadmanssignaller.rsi/inactive.png | Bin 0 -> 364 bytes .../deadmanssignaller.rsi/inhand-left.png | Bin 0 -> 331 bytes .../deadmanssignaller.rsi/inhand-right.png | Bin 0 -> 328 bytes .../Devices/deadmanssignaller.rsi/meta.json | 25 ++++++++++++++++ 13 files changed, 119 insertions(+), 1 deletion(-) create mode 100644 Content.Server/_DV/DeviceLinking/Components/DeadMansSignallerComponent.cs create mode 100644 Content.Server/_DV/DeviceLinking/Systems/DeadMansSignallerSystem.cs create mode 100644 Resources/Prototypes/_DV/Entities/Objects/Devices/Electronics/dead-mans-signaller.yml create mode 100644 Resources/Textures/_DV/Objects/Devices/deadmanssignaller.rsi/active.png create mode 100644 Resources/Textures/_DV/Objects/Devices/deadmanssignaller.rsi/inactive.png create mode 100644 Resources/Textures/_DV/Objects/Devices/deadmanssignaller.rsi/inhand-left.png create mode 100644 Resources/Textures/_DV/Objects/Devices/deadmanssignaller.rsi/inhand-right.png create mode 100644 Resources/Textures/_DV/Objects/Devices/deadmanssignaller.rsi/meta.json diff --git a/Content.Server/_DV/DeviceLinking/Components/DeadMansSignallerComponent.cs b/Content.Server/_DV/DeviceLinking/Components/DeadMansSignallerComponent.cs new file mode 100644 index 000000000000..1d887c205a29 --- /dev/null +++ b/Content.Server/_DV/DeviceLinking/Components/DeadMansSignallerComponent.cs @@ -0,0 +1,14 @@ +using Content.Shared.DeviceLinking; +using Robust.Shared.Prototypes; + +namespace Content.Server._DV.DeviceLinking.Components; + +[RegisterComponent] +public sealed partial class DeadMansSignallerComponent : Component +{ + /// + /// The port that gets signaled when the switch turns on. + /// + [DataField] + public ProtoId Port = "Pressed"; +} diff --git a/Content.Server/_DV/DeviceLinking/Systems/DeadMansSignallerSystem.cs b/Content.Server/_DV/DeviceLinking/Systems/DeadMansSignallerSystem.cs new file mode 100644 index 000000000000..6f18a12b69c0 --- /dev/null +++ b/Content.Server/_DV/DeviceLinking/Systems/DeadMansSignallerSystem.cs @@ -0,0 +1,27 @@ +using Content.Server._DV.DeviceLinking.Components; +using Content.Server.DeviceLinking.Systems; +using Content.Shared.Hands; +using Content.Shared.Item.ItemToggle; + +namespace Content.Server._DV.DeviceLinking.Systems; + +public sealed class DeadMansSignallerSystem : EntitySystem +{ + [Dependency] private readonly DeviceLinkSystem _link = default!; + [Dependency] private readonly ItemToggleSystem _toggle = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(DeadMans); + } + + private void DeadMans(Entity ent, ref GotUnequippedHandEvent args) + { + if (_toggle.IsActivated(ent.Owner)) + { + _link.InvokePort(ent.Owner, ent.Comp.Port); + } + } +} diff --git a/Resources/Locale/en-US/_DV/store/uplink-catalog.ftl b/Resources/Locale/en-US/_DV/store/uplink-catalog.ftl index b1f20825d796..e3f6a7a81ad3 100644 --- a/Resources/Locale/en-US/_DV/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/_DV/store/uplink-catalog.ftl @@ -35,4 +35,7 @@ uplink-storage-implanter-delta-desc = Hide goodies inside of yourself with new b uplink-hardsuit-syndieelite-delta-name = Syndicate Thermal Hardsuit uplink-objective-syndicate-board-name = Syndicate law board -uplink-objective-syndicate-board-desc = Its expensive, don't lose it! \ No newline at end of file +uplink-objective-syndicate-board-desc = Its expensive, don't lose it! + +uplink-dead-mans-signaller-name = Dead Man's Signaller +uplink-dead-mans-signaller-desc = A device that if armed, will send a signal to any linked devices (such as bombs) when it is dropped or put away. diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 69d74f956c09..6075671087c9 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -376,6 +376,7 @@ - FultonBeacon - PowerCellHyper - FireExtinguisherBluespace + - SignallerDeadMans # End DeltaV additions - EnergyScalpel # Shitmed Change - EnergyCautery # Shitmed Change diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 871d15e14c88..2333de04e66e 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -106,6 +106,7 @@ - FlashPayload - ExplosivePayload - ChemicalPayload + - SignallerDeadMans # DeltaV - Dead Man's Signaller - type: technology id: SpecialMeans diff --git a/Resources/Prototypes/_DV/Catalog/uplink_catalog.yml b/Resources/Prototypes/_DV/Catalog/uplink_catalog.yml index 8477f5760608..f9ed7503158a 100644 --- a/Resources/Prototypes/_DV/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/_DV/Catalog/uplink_catalog.yml @@ -166,3 +166,16 @@ blacklist: components: - SurplusBundle + +- type: listing + id: UplinkDeadMansSignaller + name: uplink-dead-mans-signaller-name + description: uplink-dead-mans-signaller-desc + productEntity: DeadMansSignaler + discountCategory: rareDiscounts + discountDownTo: + Telecrystal: 1 + cost: + Telecrystal: 2 + categories: + - UplinkDisruption diff --git a/Resources/Prototypes/_DV/Entities/Objects/Devices/Electronics/dead-mans-signaller.yml b/Resources/Prototypes/_DV/Entities/Objects/Devices/Electronics/dead-mans-signaller.yml new file mode 100644 index 000000000000..ae3222b9d191 --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Objects/Devices/Electronics/dead-mans-signaller.yml @@ -0,0 +1,25 @@ +#This signaller device will send a signal if it is dropped while activated + +- type: entity + parent: RemoteSignaller + id: DeadMansSignaler + name: dead man's signaler + description: A device that if armed will send signals to objects within 50 meters when dropped or put away. + components: + - type: DeadMansSignaller + - type: ItemToggle + - type: Sprite + drawdepth: Items + sprite: _DV/Objects/Devices/deadmanssignaller.rsi + layers: + - state: inactive + map: [ "enum.ToggleVisuals.Layer" ] + - type: Appearance + - type: GenericVisualizer + visuals: + enum.ToggleVisuals.Toggled: + enum.ToggleVisuals.Layer: + True: {state: active} + False: {state: inactive} + - type: WirelessNetworkConnection + range: 50 diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/devices.yml b/Resources/Prototypes/_DV/Recipes/Lathes/devices.yml index 4e3c5f121e40..e389151464ae 100644 --- a/Resources/Prototypes/_DV/Recipes/Lathes/devices.yml +++ b/Resources/Prototypes/_DV/Recipes/Lathes/devices.yml @@ -18,3 +18,12 @@ Silver: 750 Plasma: 500 Bluespace: 100 + +- type: latheRecipe + parent: BasePartRecipe + id: SignallerDeadMans + result: DeadMansSignaler + materials: + Steel: 100 + Plastic: 200 + Plasma: 100 diff --git a/Resources/Textures/_DV/Objects/Devices/deadmanssignaller.rsi/active.png b/Resources/Textures/_DV/Objects/Devices/deadmanssignaller.rsi/active.png new file mode 100644 index 0000000000000000000000000000000000000000..037224c50bb79aab96943cc3e4446b4874cbcd90 GIT binary patch literal 408 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFuHoWIEF;HC#Ogx9I!a>&A7)Z z!GxtPjYCCE?caR+db>~=|7nWM?-(*&PyY9RZ?As(vZY%rC#|+OMqT5#2t`3k{ z5G!(QL;2stTNVt@swea=5MZ!mkY2EoIYF#RXrXh1=;2HIlr{1?^fo10Y-sd*+OT!H zH#tW(~=Jsl-$<5<-)khcfq6!S57iyi_E!K-uR7=;U-Vfk%p_RSKghN5F!wG zyJ$k?Vm=98Muw2g8H(B-t=YhEzopr0G8mS Ang9R* literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Devices/deadmanssignaller.rsi/inactive.png b/Resources/Textures/_DV/Objects/Devices/deadmanssignaller.rsi/inactive.png new file mode 100644 index 0000000000000000000000000000000000000000..396e17942e0e83b2239ea31cd7bf66cb65f3ddc0 GIT binary patch literal 364 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{oCO|{#S9GG z!XV7ZFl&wkP%tXMC&U#esu=^6{_y*-J+c z>Rq2VWAd@S@0Sm{&Q?@>qI_KNgx`Y(hNsa2Z`d2s7c124N)p+jajem*!qi*#$e!E` zVdjgkedcw{vRc66BlBe$!@E*}(4hM^{*iJl9Zx>rN_ujC&l+V}iyc)v12k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`032l#}zCMG6ID@yV@OT-n01tfc_+G{f%5RNVk2Fh>x^-Tdtah3%61^BM|^tUuAA$)U+!{LRYK{S%hVjBcBoSk%OE%Vf%pIgYH{`@E%Db(^`w zZrpH?X`0(~*Rjw3S)DG2#*8AHL+ct#3gkIeI8-JmOmJvw;JjdU$D8Gctc$;n*n?mD z@?KlEvZh8SW&aGUxYl@k(m_6v3sn=Gn!10@I^tf@z#_z=&-zYU#kB57qQAi^pnDlS MUHx3vIVCg!0L}z=`~Uy| literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Devices/deadmanssignaller.rsi/inhand-right.png b/Resources/Textures/_DV/Objects/Devices/deadmanssignaller.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..751ae9080b7e8c7787d0dc7cce4854e35ba9e83f GIT binary patch literal 328 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`032l#}zCMG6ID@w){h4DH|1SESh9S~Nv*N!d>2FkC{c&HDgI7@>3g8xGS zL$H5^5J<4VBeIx*f$uN~Gak=hkpdK4=;`7Z65;-KnxjyI0*9-!_RjyElMlHCr=2j< z{dfDo0=o;ox_<;Y6a*B0^d?*inyad2C2armgydGs)(X|Uu(uH`g}2wA@y=nbY%woC zQGNQG(hhF9j Date: Thu, 23 Jan 2025 02:07:32 +0200 Subject: [PATCH 186/205] Fix small namespace issue (#2785) Move folders --- .../Components/MaterialReclaimerMagnetPickupComponent.cs | 2 +- .../Components/MaterialStorageMagnetPickupComponent.cs | 2 +- .../EntitySystems/MaterialReclaimerMagnetPickupSystem.cs | 4 ++-- .../EntitySystems/MaterialStorageMagnetPickupSystem.cs | 4 ++-- .../storage/components/magnet-pickup-components.ftl | 0 5 files changed, 6 insertions(+), 6 deletions(-) rename Content.Shared/{Frontier => _NF}/Storage/Components/MaterialReclaimerMagnetPickupComponent.cs (91%) rename Content.Shared/{Frontier => _NF}/Storage/Components/MaterialStorageMagnetPickupComponent.cs (91%) rename Content.Shared/{Frontier => _NF}/Storage/EntitySystems/MaterialReclaimerMagnetPickupSystem.cs (97%) rename Content.Shared/{Frontier => _NF}/Storage/EntitySystems/MaterialStorageMagnetPickupSystem.cs (97%) rename Resources/Locale/en-US/{frontier => _NF}/storage/components/magnet-pickup-components.ftl (100%) diff --git a/Content.Shared/Frontier/Storage/Components/MaterialReclaimerMagnetPickupComponent.cs b/Content.Shared/_NF/Storage/Components/MaterialReclaimerMagnetPickupComponent.cs similarity index 91% rename from Content.Shared/Frontier/Storage/Components/MaterialReclaimerMagnetPickupComponent.cs rename to Content.Shared/_NF/Storage/Components/MaterialReclaimerMagnetPickupComponent.cs index fb55184eb368..3adfe8a04dbd 100644 --- a/Content.Shared/Frontier/Storage/Components/MaterialReclaimerMagnetPickupComponent.cs +++ b/Content.Shared/_NF/Storage/Components/MaterialReclaimerMagnetPickupComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Shared.Frontier.Storage.Components; +namespace Content.Shared._NF.Storage.Components; /// /// Applies an ongoing pickup area around the attached entity. diff --git a/Content.Shared/Frontier/Storage/Components/MaterialStorageMagnetPickupComponent.cs b/Content.Shared/_NF/Storage/Components/MaterialStorageMagnetPickupComponent.cs similarity index 91% rename from Content.Shared/Frontier/Storage/Components/MaterialStorageMagnetPickupComponent.cs rename to Content.Shared/_NF/Storage/Components/MaterialStorageMagnetPickupComponent.cs index f83c81dc9aeb..7391559467d5 100644 --- a/Content.Shared/Frontier/Storage/Components/MaterialStorageMagnetPickupComponent.cs +++ b/Content.Shared/_NF/Storage/Components/MaterialStorageMagnetPickupComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Shared.Frontier.Storage.Components; +namespace Content.Shared._NF.Storage.Components; /// /// Applies an ongoing pickup area around the attached entity. diff --git a/Content.Shared/Frontier/Storage/EntitySystems/MaterialReclaimerMagnetPickupSystem.cs b/Content.Shared/_NF/Storage/EntitySystems/MaterialReclaimerMagnetPickupSystem.cs similarity index 97% rename from Content.Shared/Frontier/Storage/EntitySystems/MaterialReclaimerMagnetPickupSystem.cs rename to Content.Shared/_NF/Storage/EntitySystems/MaterialReclaimerMagnetPickupSystem.cs index bee489446f24..809ff268d806 100644 --- a/Content.Shared/Frontier/Storage/EntitySystems/MaterialReclaimerMagnetPickupSystem.cs +++ b/Content.Shared/_NF/Storage/EntitySystems/MaterialReclaimerMagnetPickupSystem.cs @@ -1,4 +1,4 @@ -using Content.Shared.Frontier.Storage.Components; +using Content.Shared._NF.Storage.Components; using Content.Shared.Materials; using Robust.Shared.Physics.Components; using Robust.Shared.Timing; @@ -7,7 +7,7 @@ using Content.Shared.Verbs; // Frontier using Robust.Shared.Utility; // Frontier -namespace Content.Shared.Frontier.Storage.EntitySystems; +namespace Content.Shared._NF.Storage.EntitySystems; /// /// diff --git a/Content.Shared/Frontier/Storage/EntitySystems/MaterialStorageMagnetPickupSystem.cs b/Content.Shared/_NF/Storage/EntitySystems/MaterialStorageMagnetPickupSystem.cs similarity index 97% rename from Content.Shared/Frontier/Storage/EntitySystems/MaterialStorageMagnetPickupSystem.cs rename to Content.Shared/_NF/Storage/EntitySystems/MaterialStorageMagnetPickupSystem.cs index 0efea1e793d5..f1c38296b467 100644 --- a/Content.Shared/Frontier/Storage/EntitySystems/MaterialStorageMagnetPickupSystem.cs +++ b/Content.Shared/_NF/Storage/EntitySystems/MaterialStorageMagnetPickupSystem.cs @@ -1,4 +1,4 @@ -using Content.Shared.Frontier.Storage.Components; +using Content.Shared._NF.Storage.Components; using Content.Shared.Materials; using Robust.Shared.Physics.Components; using Robust.Shared.Timing; @@ -7,7 +7,7 @@ using Content.Shared.Verbs; // Frontier using Robust.Shared.Utility; // Frontier -namespace Content.Shared.Frontier.Storage.EntitySystems; +namespace Content.Shared._NF.Storage.EntitySystems; /// /// diff --git a/Resources/Locale/en-US/frontier/storage/components/magnet-pickup-components.ftl b/Resources/Locale/en-US/_NF/storage/components/magnet-pickup-components.ftl similarity index 100% rename from Resources/Locale/en-US/frontier/storage/components/magnet-pickup-components.ftl rename to Resources/Locale/en-US/_NF/storage/components/magnet-pickup-components.ftl From 895aac28b45887d29d1a7e38c4f5f0defe9b0289 Mon Sep 17 00:00:00 2001 From: keekee38 Date: Wed, 22 Jan 2025 20:12:22 -0500 Subject: [PATCH 187/205] a few new AAC phrases (#2748) * *waves* * hi * hihi --- Resources/Locale/en-US/_DV/phrases/common.ftl | 13 +++- .../Locale/en-US/_DV/phrases/species.ftl | 2 +- .../Locale/en-US/_DV/phrases/subjects.ftl | 14 +++- .../_DV/QuickPhrases/Common/actions.yml | 70 +++++++++++++++++ .../_DV/QuickPhrases/Common/commands.yml | 75 ++++--------------- .../_DV/QuickPhrases/Common/numbers.yml | 6 ++ .../_DV/QuickPhrases/Common/qualitative.yml | 15 ++++ .../_DV/QuickPhrases/Common/questions.yml | 5 ++ .../_DV/QuickPhrases/Species/animals.yml | 11 +-- .../_DV/QuickPhrases/Species/crew.yml | 5 ++ .../_DV/QuickPhrases/Subjects/command.yml | 10 +++ .../_DV/QuickPhrases/Subjects/engineering.yml | 20 +++++ .../_DV/QuickPhrases/Subjects/epistemics.yml | 17 ++++- .../_DV/QuickPhrases/Subjects/generic.yml | 20 +++++ .../_DV/QuickPhrases/Subjects/logistics.yml | 5 ++ .../Prototypes/_DV/QuickPhrases/jobs.yml | 38 +++++++++- .../Prototypes/_DV/QuickPhrases/locations.yml | 18 ++++- 17 files changed, 266 insertions(+), 78 deletions(-) create mode 100644 Resources/Prototypes/_DV/QuickPhrases/Common/actions.yml diff --git a/Resources/Locale/en-US/_DV/phrases/common.ftl b/Resources/Locale/en-US/_DV/phrases/common.ftl index 8f1da4d93f2b..33b27b0f84f3 100644 --- a/Resources/Locale/en-US/_DV/phrases/common.ftl +++ b/Resources/Locale/en-US/_DV/phrases/common.ftl @@ -12,7 +12,7 @@ phrase-give-me = Give phrase-need = I need phrase-want = I want phrase-cant = I can't -phrase-show-me = Show +phrase-show = Show phrase-help = Help phrase-attack = Attack phrase-break = Break @@ -23,7 +23,7 @@ phrase-go-away = Go away phrase-leave = Leave phrase-stay = Stay phrase-come-here = Come here -phrase-take-this = Take this +phrase-take = Take phrase-go-to = Go to phrase-do-not = Do not phrase-wait = Wait @@ -94,3 +94,12 @@ phrase-i-am = I am phrase-you-are = You are phrase-mine = Mine phrase-yours = Yours +phrase-on = On +phrase-off = Off +phrase-day = day +phrase-which = Which +phrase-not = Not +phrase-call = Call +phrase-this = This +phrase-actiondrink = Drink +phrase-know = Know diff --git a/Resources/Locale/en-US/_DV/phrases/species.ftl b/Resources/Locale/en-US/_DV/phrases/species.ftl index 29f21cf7b326..fef94615ead2 100644 --- a/Resources/Locale/en-US/_DV/phrases/species.ftl +++ b/Resources/Locale/en-US/_DV/phrases/species.ftl @@ -8,7 +8,6 @@ phrase-species-mouse = mouse phrase-species-mothroach = mothroach phrase-species-cockroach = cockroach phrase-species-spider = spider -phrase-species-tarantula = tarantula phrase-species-bird = bird phrase-species-parrot = parrot phrase-species-snake = snake @@ -40,3 +39,4 @@ phrase-species-ghost = ghost phrase-species-pest = pest phrase-species-insect = insect phrase-species-pet = pet +phrase-species-chicken = chicken diff --git a/Resources/Locale/en-US/_DV/phrases/subjects.ftl b/Resources/Locale/en-US/_DV/phrases/subjects.ftl index 5033b5ddfc55..eec52101db70 100644 --- a/Resources/Locale/en-US/_DV/phrases/subjects.ftl +++ b/Resources/Locale/en-US/_DV/phrases/subjects.ftl @@ -41,6 +41,7 @@ phrase-wood = wood phrase-cloth = cloth phrase-cardboard = cardboard phrase-gold = gold +phrase-glass = glass phrase-silver = silver phrase-bluespace = bluespace phrase-access = access @@ -72,6 +73,7 @@ phrase-teg = TEG phrase-tesla = tesla phrase-tritium = tritium phrase-magboots = magboots +phrase-holofan = holofan phrase-anomaly = anomaly phrase-ape = A.P.E. phrase-anomaly-vessel = anomaly vessel @@ -84,7 +86,7 @@ phrase-research-console = R&D computer phrase-oracle = Oracle phrase-sophie = Sophie phrase-glimmer = glimmer -phrase-psionics = psionics +phrase-psionic = psionic phrase-lotophagol-oil = lotophagol oil phrase-mindbreak-phase = mindbreak phrase-protolathe = protolathe @@ -198,6 +200,16 @@ phrase-box = box phrase-locker = locker phrase-machine = machine phrase-blood = blood +phrase-nukedisk = nuclear disk +phrase-pinpointer = pinpointer +phrase-law = law +phrase-chassis = chassis +phrase-engi-on = on +phrase-engi-off = off +phrase-gas-analyzer = gas analyzer +phrase-planetside = planetside +phrase-holopad = holopad +phrase-upgrade = upgrade # colors phrase-color-red = red diff --git a/Resources/Prototypes/_DV/QuickPhrases/Common/actions.yml b/Resources/Prototypes/_DV/QuickPhrases/Common/actions.yml new file mode 100644 index 000000000000..2a8dc43a1e02 --- /dev/null +++ b/Resources/Prototypes/_DV/QuickPhrases/Common/actions.yml @@ -0,0 +1,70 @@ +- type: quickPhrase + id: BaseActionPhrase + parent: BaseCommonPhrase + group: Actions + abstract: true + +- type: quickPhrase + id: CallPhrase + parent: BaseActionPhrase + text: phrase-call + +- type: quickPhrase + id: DrinkActionPhrase + parent: BaseActionPhrase + text: phrase-actiondrink + +- type: quickPhrase + id: ShowMePhrase + parent: BaseActionPhrase + text: phrase-show + +- type: quickPhrase + id: HelpPhrase + parent: BaseActionPhrase + text: phrase-help + +- type: quickPhrase + id: AttackPhrase + parent: BaseActionPhrase + text: phrase-attack + +- type: quickPhrase + id: BreakPhrase + parent: BaseActionPhrase + text: phrase-break + +- type: quickPhrase + id: BuildPhrase + parent: BaseActionPhrase + text: phrase-build + +- type: quickPhrase + id: HealPhrase + parent: BaseActionPhrase + text: phrase-heal + +- type: quickPhrase + id: RunPhrase + parent: BaseActionPhrase + text: phrase-run + +- type: quickPhrase + id: GoPhrase + parent: BaseActionPhrase + text: phrase-go + +- type: quickPhrase + id: FixPhrase + parent: BaseActionPhrase + text: phrase-fix + +- type: quickPhrase + id: SwitchPhrase + parent: BaseActionPhrase + text: phrase-switch + +- type: quickPhrase + id: KnowPhrase + parent: BaseActionPhrase + text: phrase-know diff --git a/Resources/Prototypes/_DV/QuickPhrases/Common/commands.yml b/Resources/Prototypes/_DV/QuickPhrases/Common/commands.yml index c56cf6a7ad75..e038a2e18fa6 100644 --- a/Resources/Prototypes/_DV/QuickPhrases/Common/commands.yml +++ b/Resources/Prototypes/_DV/QuickPhrases/Common/commands.yml @@ -24,66 +24,16 @@ parent: BaseImperativePhrase text: phrase-cant -- type: quickPhrase - id: ShowMePhrase - parent: BaseImperativePhrase - text: phrase-show-me - -- type: quickPhrase - id: HelpPhrase - parent: BaseImperativePhrase - text: phrase-help - -- type: quickPhrase - id: AttackPhrase - parent: BaseImperativePhrase - text: phrase-attack - -- type: quickPhrase - id: BreakPhrase - parent: BaseImperativePhrase - text: phrase-break - -- type: quickPhrase - id: BuildPhrase - parent: BaseImperativePhrase - text: phrase-build - -- type: quickPhrase - id: HealPhrase - parent: BaseImperativePhrase - text: phrase-heal - -- type: quickPhrase - id: StopPhrase - parent: BaseImperativePhrase - text: phrase-stop - - type: quickPhrase id: GoAwayPhrase parent: BaseImperativePhrase text: phrase-go-away -- type: quickPhrase - id: LeavePhrase - parent: BaseImperativePhrase - text: phrase-leave - -- type: quickPhrase - id: StayPhrase - parent: BaseImperativePhrase - text: phrase-stay - - type: quickPhrase id: ComeHerePhrase parent: BaseImperativePhrase text: phrase-come-here -- type: quickPhrase - id: TakeThisPhrase - parent: BaseImperativePhrase - text: phrase-take-this - - type: quickPhrase id: GoToPhrase parent: BaseImperativePhrase @@ -100,26 +50,31 @@ text: phrase-wait - type: quickPhrase - id: GoPhrase + id: WillPhrase + parent: BaseImperativePhrase + text: phrase-will + +- type: quickPhrase + id: ThisPhrase parent: BaseImperativePhrase - text: phrase-go + text: phrase-this - type: quickPhrase - id: RunPhrase + id: TakePhrase parent: BaseImperativePhrase - text: phrase-run + text: phrase-take - type: quickPhrase - id: FixPhrase + id: LeavePhrase parent: BaseImperativePhrase - text: phrase-fix + text: phrase-leave - type: quickPhrase - id: SwitchPhrase + id: StayPhrase parent: BaseImperativePhrase - text: phrase-switch + text: phrase-stay - type: quickPhrase - id: WillPhrase + id: StopPhrase parent: BaseImperativePhrase - text: phrase-will + text: phrase-stop diff --git a/Resources/Prototypes/_DV/QuickPhrases/Common/numbers.yml b/Resources/Prototypes/_DV/QuickPhrases/Common/numbers.yml index e872d2d3f8f8..832cbdfde216 100644 --- a/Resources/Prototypes/_DV/QuickPhrases/Common/numbers.yml +++ b/Resources/Prototypes/_DV/QuickPhrases/Common/numbers.yml @@ -98,3 +98,9 @@ id: SecondPhrase parent: BaseNumberPhrase text: phrase-second + +- type: quickPhrase + id: DayPhrase + parent: BaseNumberPhrase + text: phrase-day + diff --git a/Resources/Prototypes/_DV/QuickPhrases/Common/qualitative.yml b/Resources/Prototypes/_DV/QuickPhrases/Common/qualitative.yml index e81b2ca8ccf6..e8a0f80ac582 100644 --- a/Resources/Prototypes/_DV/QuickPhrases/Common/qualitative.yml +++ b/Resources/Prototypes/_DV/QuickPhrases/Common/qualitative.yml @@ -68,3 +68,18 @@ id: BadPhrase parent: BaseQualitativePhrase text: phrase-bad + +- type: quickPhrase + id: OnPhrase + parent: BaseQualitativePhrase + text: phrase-on + +- type: quickPhrase + id: OffPhrase + parent: BaseQualitativePhrase + text: phrase-off + +- type: quickPhrase + id: NotPhrase + parent: BaseQualitativePhrase + text: phrase-not diff --git a/Resources/Prototypes/_DV/QuickPhrases/Common/questions.yml b/Resources/Prototypes/_DV/QuickPhrases/Common/questions.yml index 8869134401ad..99d6fdf7c55a 100644 --- a/Resources/Prototypes/_DV/QuickPhrases/Common/questions.yml +++ b/Resources/Prototypes/_DV/QuickPhrases/Common/questions.yml @@ -53,3 +53,8 @@ id: ShouldIPhrase parent: BaseQuestionPhrase text: phrase-should-i + +- type: quickPhrase + id: WhichPhrase + parent: BaseQuestionPhrase + text: phrase-which diff --git a/Resources/Prototypes/_DV/QuickPhrases/Species/animals.yml b/Resources/Prototypes/_DV/QuickPhrases/Species/animals.yml index 4468931a2723..ee1e5c95401e 100644 --- a/Resources/Prototypes/_DV/QuickPhrases/Species/animals.yml +++ b/Resources/Prototypes/_DV/QuickPhrases/Species/animals.yml @@ -54,11 +54,6 @@ parent: BaseAnimalSpeciesPhrase text: phrase-species-spider -- type: quickPhrase - id: SpeciesTarantulaPhrase - parent: BaseAnimalSpeciesPhrase - text: phrase-species-tarantula - - type: quickPhrase id: SpeciesBirdPhrase parent: BaseAnimalSpeciesPhrase @@ -163,3 +158,9 @@ id: SpeciesGoatPhrase parent: BaseAnimalSpeciesPhrase text: phrase-species-goat + +- type: quickPhrase + id: SpeciesChickenPhrase + parent: BaseAnimalSpeciesPhrase + text: phrase-species-chicken + diff --git a/Resources/Prototypes/_DV/QuickPhrases/Species/crew.yml b/Resources/Prototypes/_DV/QuickPhrases/Species/crew.yml index 1f93d7bf46a2..a93c664b8354 100644 --- a/Resources/Prototypes/_DV/QuickPhrases/Species/crew.yml +++ b/Resources/Prototypes/_DV/QuickPhrases/Species/crew.yml @@ -63,3 +63,8 @@ id: SpeciesVoxPhrase parent: BaseCrewSpeciesPhrase text: species-name-vox + +- type: quickPhrase + id: SpeciesRodentiaPhrase + parent: BaseCrewSpeciesPhrase + text: species-name-rodentia diff --git a/Resources/Prototypes/_DV/QuickPhrases/Subjects/command.yml b/Resources/Prototypes/_DV/QuickPhrases/Subjects/command.yml index 35e958e5c03b..b5d66fadbc82 100644 --- a/Resources/Prototypes/_DV/QuickPhrases/Subjects/command.yml +++ b/Resources/Prototypes/_DV/QuickPhrases/Subjects/command.yml @@ -32,3 +32,13 @@ id: ImplantPhrase parent: BaseCommandSubjectPhrase text: phrase-implant + +- type: quickPhrase + id: NukeDiskPhrase + parent: BaseCommandSubjectPhrase + text: phrase-nukedisk + +- type: quickPhrase + id: PinpointerPhrase + parent: BaseCommandSubjectPhrase + text: phrase-pinpointer diff --git a/Resources/Prototypes/_DV/QuickPhrases/Subjects/engineering.yml b/Resources/Prototypes/_DV/QuickPhrases/Subjects/engineering.yml index 967e0d5d2a97..e254eb76851c 100644 --- a/Resources/Prototypes/_DV/QuickPhrases/Subjects/engineering.yml +++ b/Resources/Prototypes/_DV/QuickPhrases/Subjects/engineering.yml @@ -117,3 +117,23 @@ id: MagbootsPhrase parent: BaseEngineeringSubjectPhrase text: phrase-magboots + +- type: quickPhrase + id: HolofanPhrase + parent: BaseEngineeringSubjectPhrase + text: phrase-holofan + +- type: quickPhrase + id: EngiOnPhrase + parent: BaseEngineeringSubjectPhrase + text: phrase-engi-on + +- type: quickPhrase + id: EngiOffPhrase + parent: BaseEngineeringSubjectPhrase + text: phrase-engi-off + +- type: quickPhrase + id: GasAnalyzerPhrase + parent: BaseEngineeringSubjectPhrase + text: phrase-gas-analyzer diff --git a/Resources/Prototypes/_DV/QuickPhrases/Subjects/epistemics.yml b/Resources/Prototypes/_DV/QuickPhrases/Subjects/epistemics.yml index 5b50ef40d8ac..b84a6fc0ecb5 100644 --- a/Resources/Prototypes/_DV/QuickPhrases/Subjects/epistemics.yml +++ b/Resources/Prototypes/_DV/QuickPhrases/Subjects/epistemics.yml @@ -66,7 +66,7 @@ - type: quickPhrase id: PsionicsPhrase parent: BaseEpistemicsSubjectPhrase - text: phrase-psionics + text: phrase-psionic - type: quickPhrase id: LotophagolOilPhrase @@ -87,3 +87,18 @@ id: CircuitImprinterPhrase parent: BaseEpistemicsSubjectPhrase text: phrase-circuit-imprinter + +- type: quickPhrase + id: EpistemicsBluespacePhrase + parent: BaseEpistemicsSubjectPhrase + text: phrase-bluespace-crystal + +- type: quickPhrase + id: EpiUpgradePhrase + parent: BaseEpistemicsSubjectPhrase + text: phrase-upgrade + +- type: quickPhrase + id: ChassisPhrase + parent: BaseEpistemicsSubjectPhrase + text: phrase-chassis diff --git a/Resources/Prototypes/_DV/QuickPhrases/Subjects/generic.yml b/Resources/Prototypes/_DV/QuickPhrases/Subjects/generic.yml index 256871fc4b31..8d4927ffd7f5 100644 --- a/Resources/Prototypes/_DV/QuickPhrases/Subjects/generic.yml +++ b/Resources/Prototypes/_DV/QuickPhrases/Subjects/generic.yml @@ -188,6 +188,21 @@ parent: BaseSubjectPhrase text: phrase-blood +- type: quickPhrase + id: LawPhrase + parent: BaseSubjectPhrase + text: phrase-law + +- type: quickPhrase + id: HolopadPhrase + parent: BaseSubjectPhrase + text: phrase-holopad + +- type: quickPhrase + id: UpgradePhrase + parent: BaseSubjectPhrase + text: phrase-upgrade + # Materials - type: quickPhrase @@ -246,6 +261,11 @@ parent: BaseMaterialPhrase text: phrase-gold +- type: quickPhrase + id: GlassPhrase + parent: BaseMaterialPhrase + text: phrase-glass + - type: quickPhrase id: SilverPhrase parent: BaseMaterialPhrase diff --git a/Resources/Prototypes/_DV/QuickPhrases/Subjects/logistics.yml b/Resources/Prototypes/_DV/QuickPhrases/Subjects/logistics.yml index a5ce44f32604..85a19efd9441 100644 --- a/Resources/Prototypes/_DV/QuickPhrases/Subjects/logistics.yml +++ b/Resources/Prototypes/_DV/QuickPhrases/Subjects/logistics.yml @@ -93,6 +93,11 @@ parent: BaseLogisticsSubjectPhrase text: phrase-expedition +- type: quickPhrase + id: PlanetsidePhrase + parent: BaseLogisticsSubjectPhrase + text: phrase-planetside + # Ores - type: quickPhrase diff --git a/Resources/Prototypes/_DV/QuickPhrases/jobs.yml b/Resources/Prototypes/_DV/QuickPhrases/jobs.yml index 71d9f0368048..df5dc38820b6 100644 --- a/Resources/Prototypes/_DV/QuickPhrases/jobs.yml +++ b/Resources/Prototypes/_DV/QuickPhrases/jobs.yml @@ -64,13 +64,18 @@ - type: quickPhrase parent: BaseCommandJobPhrase - id: HeadOfPersonnelPhrase - text: job-name-hop + id: CentralCommandOfficialPhrase + text: job-name-centcomoff - type: quickPhrase parent: BaseCommandJobPhrase - id: CentralCommandOfficialPhrase - text: job-name-centcomoff + id: AdminAssistantPhrase + text: job-name-admin-assistant + +- type: quickPhrase + parent: BaseCommandJobPhrase + id: StationAIPhrase + text: job-name-station-ai # Engineering @@ -116,6 +121,11 @@ id: ResearchAssistantPhrase text: job-name-research-assistant +- type: quickPhrase + parent: BaseEpistemicsJobPhrase + id: RoboticistPhrase + text: job-name-roboticist + - type: quickPhrase parent: BaseEpistemicsJobPhrase id: BorgPhrase @@ -143,6 +153,11 @@ id: CourierPhrase text: job-name-courier +- type: quickPhrase + parent: BaseLogisticsJobPhrase + id: CargoAssistantPhrase + text: job-name-cargo-assistant + # Justice - type: quickPhrase @@ -192,6 +207,11 @@ id: MedicalInternPhrase text: job-name-intern +- type: quickPhrase + parent: BaseMedicalJobPhrase + id: SurgeonPhrase + text: job-name-surgeon + # Security - type: quickPhrase @@ -256,6 +276,11 @@ id: MusicianPhrase text: job-name-musician +- type: quickPhrase + parent: BaseServiceJobPhrase + id: ServiceWorkerPhrase + text: job-name-serviceworker + - type: quickPhrase parent: BaseServiceJobPhrase id: ClownPhrase @@ -266,6 +291,11 @@ id: MimePhrase text: job-name-mime +- type: quickPhrase + parent: BaseServiceJobPhrase + id: HeadOfPersonnelPhrase + text: job-name-hop + # Wildcard - type: quickPhrase diff --git a/Resources/Prototypes/_DV/QuickPhrases/locations.yml b/Resources/Prototypes/_DV/QuickPhrases/locations.yml index 0f8102514f3c..15f6cc7e394b 100644 --- a/Resources/Prototypes/_DV/QuickPhrases/locations.yml +++ b/Resources/Prototypes/_DV/QuickPhrases/locations.yml @@ -131,13 +131,18 @@ - type: quickPhrase parent: BaseCommandLocationPhrase - id: LocationHopPhrase - text: station-beacon-hop + id: LocationConferenceRoomPhrase + text: station-beacon-conference-room - type: quickPhrase parent: BaseCommandLocationPhrase - id: LocationConferenceRoomPhrase - text: station-beacon-conference-room + id: LocationAICorePhrase + text: station-beacon-ai-core + +- type: quickPhrase + parent: BaseCommandLocationPhrase + id: LocationAISatPhrase + text: station-beacon-ai-sat # Engineering @@ -433,6 +438,11 @@ id: LocationTheaterPhrase text: station-beacon-theater +- type: quickPhrase + parent: BaseServiceLocationPhrase + id: LocationHopPhrase + text: station-beacon-hop + # Civilian - type: quickPhrase From 3480b5e5c26f670308b75c1b424421c38c2b48ca Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Wed, 22 Jan 2025 20:59:19 -0600 Subject: [PATCH 188/205] mrrp --- Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml b/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml index 086a708453bd..1358a8f58892 100644 --- a/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml +++ b/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml @@ -244,7 +244,7 @@ acts: ["Destruction"] - type: Gun projectileSpeed: 40 - fireRate: 0.3 + fireRate: 1 # DeltaV - buffed from 0.3 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/ship_duster.ogg params: From 905bc06406210dc9610db7f6bec0b09959158210 Mon Sep 17 00:00:00 2001 From: ElusiveCoin Date: Thu, 23 Jan 2025 00:27:44 -0700 Subject: [PATCH 189/205] Chitinid (#2707) * Start of the Chitinid Race My first work for ss14 and a new Species to play, worker drone ants! * Removed a uneeded bit * Removing the displacement section because it still is being weird Displacement map not working right but not really needed as well so just gonna do without it * Nukie Steamroll Preventative (#2658) * Update uplink_catalog.yml * Update uplink_catalog.yml * Update uplink_catalog.yml * Update uplink_catalog.yml * Automatic changelog update * most asked for changes * (hopefully) Fixed Linter Error * More clean up edits * 4 space indents!! * Direction desired name changes + More radiation mechanics Alienized the names of the little Ants and swapped their naming scheme. Added a radiation healing and purge mechanic to play into the radiation theme more. * Hopefully final changes! Adjustment to their resistances to make them less weak to blunt And the negative of being unable to be injected by normal syringes (hypo and pill gaming) * Forgot to add access to the new undergarments * Final Final change (hopefully) Added a little text pop up for failing to inject them * Code Tweeks * Quick Changes Removed some uneeded comments, removed uneeded Local info --------- Co-authored-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com> Co-authored-by: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> --- .../Chemistry/EntitySystems/InjectorSystem.cs | 10 + .../Chitinid/BlockInjectionComponent.cs | 4 + .../Abilities/Chitinid/ChitinidComponent.cs | 41 ++ .../_DV/Abilities/Chitinid/ChitinidSystem.cs | 97 ++++ .../Chitinid/CoughingUpChitziteComponent.cs | 14 + .../_DV/Actions/Events/ChitziteActionEvent.cs | 3 + .../Audio/_DV/Voice/Chitinid/attributions.yml | 9 + .../Audio/_DV/Voice/Chitinid/male_cough_1.ogg | Bin 0 -> 13330 bytes .../Audio/_DV/Voice/Chitinid/moth_chitter.ogg | Bin 0 -> 9381 bytes .../Audio/_DV/Voice/Chitinid/moth_laugh.ogg | Bin 0 -> 20555 bytes .../Audio/_DV/Voice/Chitinid/moth_scream.ogg | Bin 0 -> 31333 bytes .../Audio/_DV/Voice/Chitinid/moth_squeak.ogg | Bin 0 -> 8676 bytes .../Locale/en-US/_DV/abilities/chitinid.ftl | 2 + .../en-US/_DV/chat/managers/chat_manager.ftl | 6 + .../Locale/en-US/_DV/markings/chitinid.ftl | 164 +++++++ .../Locale/en-US/_DV/species/species.ftl | 1 + .../components/injector-component.ftl | 1 + .../Mobs/Customization/Markings/gauze.yml | 28 +- Resources/Prototypes/Guidebook/species.yml | 1 + .../Loadouts/Miscellaneous/survival.yml | 1 + .../Prototypes/Species/species_weights.yml | 1 + Resources/Prototypes/_DV/Actions/types.yml | 13 + .../Prototypes/_DV/Body/Organs/chitinid.yml | 33 ++ .../Prototypes/_DV/Body/Parts/chitinid.yml | 112 +++++ .../_DV/Body/Prototypes/chitinid.yml | 49 ++ .../Prototypes/_DV/Damage/modifier_sets.yml | 9 + .../Datasets/Names/chitinid_first_female.yml | 34 ++ .../Datasets/Names/chitinid_first_male.yml | 36 ++ .../Mobs/Customization/Markings/chitinid.yml | 458 ++++++++++++++++++ .../_DV/Entities/Mobs/Player/chitinid.yml | 5 + .../_DV/Entities/Mobs/Species/chitinid.yml | 163 +++++++ .../Objects/Specific/Species/chitinid.yml | 33 ++ .../Prototypes/_DV/Guidebook/species.yml | 5 + Resources/Prototypes/_DV/Species/chitinid.yml | 167 +++++++ .../_DV/Voice/speech_emote_sounds.yml | 34 ++ .../Prototypes/_DV/Voice/speech_sounds.yml | 9 + .../Prototypes/_DV/Voice/speech_verbs.yml | 9 + Resources/Prototypes/_DV/typing_indicator.yml | 5 + .../Customization/Markings/undershirt.yml | 20 +- .../Mobs/Customization/Markings/underwear.yml | 10 +- .../ServerInfo/Guidebook/Mobs/Species.xml | 1 + .../Guidebook/Mobs/_DV/Chitinid.xml | 28 ++ .../_DV/Effects/speech.rsi/chitinid0.png | Bin 0 -> 775 bytes .../_DV/Effects/speech.rsi/chitinid1.png | Bin 0 -> 637 bytes .../_DV/Effects/speech.rsi/chitinid2.png | Bin 0 -> 637 bytes .../Textures/_DV/Effects/speech.rsi/meta.json | 17 + .../Chitinid/chitinid_antennas.rsi/bee.png | Bin 0 -> 716 bytes .../Chitinid/chitinid_antennas.rsi/curly.png | Bin 0 -> 851 bytes .../chitinid_antennas.rsi/default.png | Bin 0 -> 755 bytes .../chitinid_antennas.rsi/firefly_primary.png | Bin 0 -> 812 bytes .../firefly_secondary.png | Bin 0 -> 743 bytes .../Chitinid/chitinid_antennas.rsi/gray.png | Bin 0 -> 687 bytes .../Chitinid/chitinid_antennas.rsi/long.png | Bin 0 -> 634 bytes .../Chitinid/chitinid_antennas.rsi/meta.json | 55 +++ .../Chitinid/chitinid_antennas.rsi/radar.png | Bin 0 -> 689 bytes .../Chitinid/chitinid_antennas.rsi/short.png | Bin 0 -> 671 bytes .../Chitinid/chitinid_antennas.rsi/slick.png | Bin 0 -> 656 bytes .../Chitinid/chitinid_antennas.rsi/speed.png | Bin 0 -> 687 bytes .../chitinid_parts.rsi/charred_chest.png | Bin 0 -> 1631 bytes .../chitinid_parts.rsi/charred_head.png | Bin 0 -> 1260 bytes .../chitinid_parts.rsi/charred_l_arm.png | Bin 0 -> 422 bytes .../chitinid_parts.rsi/charred_l_leg.png | Bin 0 -> 381 bytes .../chitinid_parts.rsi/charred_r_arm.png | Bin 0 -> 440 bytes .../chitinid_parts.rsi/charred_r_leg.png | Bin 0 -> 387 bytes .../Chitinid/chitinid_parts.rsi/meta.json | 143 ++++++ .../chitinid_parts.rsi/plated_chest.png | Bin 0 -> 1088 bytes .../chitinid_parts.rsi/plated_l_arm.png | Bin 0 -> 678 bytes .../chitinid_parts.rsi/plated_r_arm.png | Bin 0 -> 695 bytes .../chitinid_parts.rsi/radiant_chest.png | Bin 0 -> 697 bytes .../chitinid_parts.rsi/radiant_head.png | Bin 0 -> 557 bytes .../chitinid_parts.rsi/radiant_l_arm.png | Bin 0 -> 704 bytes .../chitinid_parts.rsi/radiant_l_leg.png | Bin 0 -> 638 bytes .../chitinid_parts.rsi/radiant_r_arm.png | Bin 0 -> 702 bytes .../chitinid_parts.rsi/radiant_r_leg.png | Bin 0 -> 616 bytes .../chitinid_parts.rsi/spotted_chest.png | Bin 0 -> 676 bytes .../chitinid_parts.rsi/spotted_head.png | Bin 0 -> 646 bytes .../chitinid_parts.rsi/spotted_l_arm.png | Bin 0 -> 539 bytes .../chitinid_parts.rsi/spotted_l_leg.png | Bin 0 -> 539 bytes .../chitinid_parts.rsi/spotted_r_arm.png | Bin 0 -> 520 bytes .../chitinid_parts.rsi/spotted_r_leg.png | Bin 0 -> 537 bytes .../chitinid_parts.rsi/stripes_chest.png | Bin 0 -> 656 bytes .../chitinid_parts.rsi/stripes_head.png | Bin 0 -> 617 bytes .../chitinid_parts.rsi/stripes_l_arm.png | Bin 0 -> 610 bytes .../chitinid_parts.rsi/stripes_l_leg.png | Bin 0 -> 568 bytes .../chitinid_parts.rsi/stripes_r_arm.png | Bin 0 -> 614 bytes .../chitinid_parts.rsi/stripes_r_leg.png | Bin 0 -> 568 bytes .../chitinid_parts.rsi/toxic_chest.png | Bin 0 -> 885 bytes .../chitinid_parts.rsi/toxic_head.png | Bin 0 -> 743 bytes .../chitinid_parts.rsi/toxic_l_arm.png | Bin 0 -> 569 bytes .../chitinid_parts.rsi/toxic_l_leg.png | Bin 0 -> 540 bytes .../chitinid_parts.rsi/toxic_r_arm.png | Bin 0 -> 571 bytes .../chitinid_parts.rsi/toxic_r_leg.png | Bin 0 -> 532 bytes .../chitinid_wings.rsi/bee_primary.png | Bin 0 -> 1640 bytes .../chitinid_wings.rsi/bee_secondary.png | Bin 0 -> 1429 bytes .../Chitinid/chitinid_wings.rsi/default.png | Bin 0 -> 1068 bytes .../chitinid_wings.rsi/firefly_primary.png | Bin 0 -> 1001 bytes .../chitinid_wings.rsi/firefly_secondary.png | Bin 0 -> 875 bytes .../chitinid_wings.rsi/honeypot_primary.png | Bin 0 -> 1064 bytes .../chitinid_wings.rsi/honeypot_secondary.png | Bin 0 -> 951 bytes .../Chitinid/chitinid_wings.rsi/meta.json | 47 ++ .../Chitinid/chitinid_wings.rsi/smooth.png | Bin 0 -> 1128 bytes .../Chitinid/chitinid_wings.rsi/stubby.png | Bin 0 -> 965 bytes .../Mobs/Species/Chitinid/parts.rsi/eyes.png | Bin 0 -> 153 bytes .../Mobs/Species/Chitinid/parts.rsi/full.png | Bin 0 -> 1253 bytes .../Species/Chitinid/parts.rsi/head_f.png | Bin 0 -> 894 bytes .../Species/Chitinid/parts.rsi/head_m.png | Bin 0 -> 898 bytes .../Mobs/Species/Chitinid/parts.rsi/l_arm.png | Bin 0 -> 752 bytes .../Species/Chitinid/parts.rsi/l_foot.png | Bin 0 -> 727 bytes .../Species/Chitinid/parts.rsi/l_hand.png | Bin 0 -> 727 bytes .../Mobs/Species/Chitinid/parts.rsi/l_leg.png | Bin 0 -> 1870 bytes .../Mobs/Species/Chitinid/parts.rsi/meta.json | 66 +++ .../Mobs/Species/Chitinid/parts.rsi/r_arm.png | Bin 0 -> 758 bytes .../Species/Chitinid/parts.rsi/r_foot.png | Bin 0 -> 597 bytes .../Species/Chitinid/parts.rsi/r_hand.png | Bin 0 -> 713 bytes .../Mobs/Species/Chitinid/parts.rsi/r_leg.png | Bin 0 -> 278 bytes .../Species/Chitinid/parts.rsi/torso_f.png | Bin 0 -> 1305 bytes .../Species/Chitinid/parts.rsi/torso_m.png | Bin 0 -> 1269 bytes .../Species/chitinid.rsi/chitzite.png | Bin 0 -> 1797 bytes .../Species/chitinid.rsi/chitzite_glow.png | Bin 0 -> 1035 bytes .../Specific/Species/chitinid.rsi/meta.json | 33 ++ 120 files changed, 1948 insertions(+), 29 deletions(-) create mode 100644 Content.Server/_DV/Abilities/Chitinid/BlockInjectionComponent.cs create mode 100644 Content.Server/_DV/Abilities/Chitinid/ChitinidComponent.cs create mode 100644 Content.Server/_DV/Abilities/Chitinid/ChitinidSystem.cs create mode 100644 Content.Server/_DV/Abilities/Chitinid/CoughingUpChitziteComponent.cs create mode 100644 Content.Shared/_DV/Actions/Events/ChitziteActionEvent.cs create mode 100644 Resources/Audio/_DV/Voice/Chitinid/attributions.yml create mode 100644 Resources/Audio/_DV/Voice/Chitinid/male_cough_1.ogg create mode 100644 Resources/Audio/_DV/Voice/Chitinid/moth_chitter.ogg create mode 100644 Resources/Audio/_DV/Voice/Chitinid/moth_laugh.ogg create mode 100644 Resources/Audio/_DV/Voice/Chitinid/moth_scream.ogg create mode 100644 Resources/Audio/_DV/Voice/Chitinid/moth_squeak.ogg create mode 100644 Resources/Locale/en-US/_DV/abilities/chitinid.ftl create mode 100644 Resources/Locale/en-US/_DV/markings/chitinid.ftl create mode 100644 Resources/Prototypes/_DV/Body/Organs/chitinid.yml create mode 100644 Resources/Prototypes/_DV/Body/Parts/chitinid.yml create mode 100644 Resources/Prototypes/_DV/Body/Prototypes/chitinid.yml create mode 100644 Resources/Prototypes/_DV/Datasets/Names/chitinid_first_female.yml create mode 100644 Resources/Prototypes/_DV/Datasets/Names/chitinid_first_male.yml create mode 100644 Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/chitinid.yml create mode 100644 Resources/Prototypes/_DV/Entities/Mobs/Player/chitinid.yml create mode 100644 Resources/Prototypes/_DV/Entities/Mobs/Species/chitinid.yml create mode 100644 Resources/Prototypes/_DV/Entities/Objects/Specific/Species/chitinid.yml create mode 100644 Resources/Prototypes/_DV/Species/chitinid.yml create mode 100644 Resources/ServerInfo/Guidebook/Mobs/_DV/Chitinid.xml create mode 100644 Resources/Textures/_DV/Effects/speech.rsi/chitinid0.png create mode 100644 Resources/Textures/_DV/Effects/speech.rsi/chitinid1.png create mode 100644 Resources/Textures/_DV/Effects/speech.rsi/chitinid2.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_antennas.rsi/bee.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_antennas.rsi/curly.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_antennas.rsi/default.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_antennas.rsi/firefly_primary.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_antennas.rsi/firefly_secondary.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_antennas.rsi/gray.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_antennas.rsi/long.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_antennas.rsi/meta.json create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_antennas.rsi/radar.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_antennas.rsi/short.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_antennas.rsi/slick.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_antennas.rsi/speed.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/charred_chest.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/charred_head.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/charred_l_arm.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/charred_l_leg.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/charred_r_arm.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/charred_r_leg.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/meta.json create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/plated_chest.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/plated_l_arm.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/plated_r_arm.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/radiant_chest.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/radiant_head.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/radiant_l_arm.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/radiant_l_leg.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/radiant_r_arm.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/radiant_r_leg.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/spotted_chest.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/spotted_head.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/spotted_l_arm.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/spotted_l_leg.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/spotted_r_arm.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/spotted_r_leg.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/stripes_chest.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/stripes_head.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/stripes_l_arm.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/stripes_l_leg.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/stripes_r_arm.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/stripes_r_leg.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/toxic_chest.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/toxic_head.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/toxic_l_arm.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/toxic_l_leg.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/toxic_r_arm.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/toxic_r_leg.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_wings.rsi/bee_primary.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_wings.rsi/bee_secondary.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_wings.rsi/default.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_wings.rsi/firefly_primary.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_wings.rsi/firefly_secondary.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_wings.rsi/honeypot_primary.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_wings.rsi/honeypot_secondary.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_wings.rsi/meta.json create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_wings.rsi/smooth.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_wings.rsi/stubby.png create mode 100644 Resources/Textures/_DV/Mobs/Species/Chitinid/parts.rsi/eyes.png create mode 100644 Resources/Textures/_DV/Mobs/Species/Chitinid/parts.rsi/full.png create mode 100644 Resources/Textures/_DV/Mobs/Species/Chitinid/parts.rsi/head_f.png create mode 100644 Resources/Textures/_DV/Mobs/Species/Chitinid/parts.rsi/head_m.png create mode 100644 Resources/Textures/_DV/Mobs/Species/Chitinid/parts.rsi/l_arm.png create mode 100644 Resources/Textures/_DV/Mobs/Species/Chitinid/parts.rsi/l_foot.png create mode 100644 Resources/Textures/_DV/Mobs/Species/Chitinid/parts.rsi/l_hand.png create mode 100644 Resources/Textures/_DV/Mobs/Species/Chitinid/parts.rsi/l_leg.png create mode 100644 Resources/Textures/_DV/Mobs/Species/Chitinid/parts.rsi/meta.json create mode 100644 Resources/Textures/_DV/Mobs/Species/Chitinid/parts.rsi/r_arm.png create mode 100644 Resources/Textures/_DV/Mobs/Species/Chitinid/parts.rsi/r_foot.png create mode 100644 Resources/Textures/_DV/Mobs/Species/Chitinid/parts.rsi/r_hand.png create mode 100644 Resources/Textures/_DV/Mobs/Species/Chitinid/parts.rsi/r_leg.png create mode 100644 Resources/Textures/_DV/Mobs/Species/Chitinid/parts.rsi/torso_f.png create mode 100644 Resources/Textures/_DV/Mobs/Species/Chitinid/parts.rsi/torso_m.png create mode 100644 Resources/Textures/_DV/Objects/Specific/Species/chitinid.rsi/chitzite.png create mode 100644 Resources/Textures/_DV/Objects/Specific/Species/chitinid.rsi/chitzite_glow.png create mode 100644 Resources/Textures/_DV/Objects/Specific/Species/chitinid.rsi/meta.json diff --git a/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs b/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs index eb2039604afd..c935326b13c4 100644 --- a/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs @@ -1,3 +1,4 @@ +using Content.Server.Abilities.Chitinid; using Content.Server.Body.Components; using Content.Server.Body.Systems; using Content.Shared.Chemistry; @@ -108,6 +109,12 @@ private void OnInjectorAfterInteract(Entity entity, ref After /// private void InjectDoAfter(Entity injector, EntityUid target, EntityUid user) { + if (HasComp(target)) // DeltaV + { + Popup.PopupEntity(Loc.GetString("injector-component-deny-user"), target, user); + return; + } + // Create a pop-up for the user if (injector.Comp.ToggleState == InjectorToggleMode.Draw) { @@ -253,6 +260,9 @@ private bool TryInjectIntoBloodstream(Entity injector, Entity private bool TryInject(Entity injector, EntityUid targetEntity, Entity targetSolution, EntityUid user, bool asRefill) { + if (HasComp(targetEntity)) // DeltaV + return false; + if (!SolutionContainers.TryGetSolution(injector.Owner, injector.Comp.SolutionName, out var soln, out var solution) || solution.Volume == 0) return false; diff --git a/Content.Server/_DV/Abilities/Chitinid/BlockInjectionComponent.cs b/Content.Server/_DV/Abilities/Chitinid/BlockInjectionComponent.cs new file mode 100644 index 000000000000..ed5d78874d63 --- /dev/null +++ b/Content.Server/_DV/Abilities/Chitinid/BlockInjectionComponent.cs @@ -0,0 +1,4 @@ +namespace Content.Server.Abilities.Chitinid; + +[RegisterComponent] +public sealed partial class BlockInjectionComponent : Component; diff --git a/Content.Server/_DV/Abilities/Chitinid/ChitinidComponent.cs b/Content.Server/_DV/Abilities/Chitinid/ChitinidComponent.cs new file mode 100644 index 000000000000..871d10a7c275 --- /dev/null +++ b/Content.Server/_DV/Abilities/Chitinid/ChitinidComponent.cs @@ -0,0 +1,41 @@ +using Content.Shared.Damage; +using Content.Shared.Damage.Prototypes; +using Content.Shared.FixedPoint; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; + +namespace Content.Server.Abilities.Chitinid; + +[RegisterComponent] +public sealed partial class ChitinidComponent : Component +{ + [DataField] + public EntProtoId ChitzitePrototype = "Chitzite"; + + [DataField] + public EntProtoId ChitziteActionId = "ActionChitzite"; + + [DataField] + public EntityUid? ChitziteAction; + + [DataField] + public FixedPoint2 AmountAbsorbed = 0f; + + [DataField] + public DamageSpecifier Healing = new() + { + DamageDict = new() + { + { "Radiation", -0.5 }, + } + }; + + [DataField] + public FixedPoint2 MaximumAbsorbed = 30f; + + [DataField] + public TimeSpan UpdateInterval = TimeSpan.FromSeconds(1); + + [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))] + public TimeSpan NextUpdate; +} diff --git a/Content.Server/_DV/Abilities/Chitinid/ChitinidSystem.cs b/Content.Server/_DV/Abilities/Chitinid/ChitinidSystem.cs new file mode 100644 index 000000000000..34d8244d5c9b --- /dev/null +++ b/Content.Server/_DV/Abilities/Chitinid/ChitinidSystem.cs @@ -0,0 +1,97 @@ +using Content.Server.Nutrition.Components; +using Content.Shared.Actions; +using Content.Shared.Actions.Events; +using Content.Shared.Audio; +using Content.Shared.Damage; +using Content.Shared.IdentityManagement; +using Content.Shared.Inventory; +using Content.Shared.Mobs.Systems; +using Content.Shared.Popups; +using Robust.Shared.Audio.Systems; +using Robust.Shared.Prototypes; +using Robust.Shared.Timing; + +namespace Content.Server.Abilities.Chitinid; + +public sealed partial class ChitinidSystem : EntitySystem +{ + [Dependency] private readonly SharedActionsSystem _actions = default!; + [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private readonly InventorySystem _inventory = default!; + [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private readonly DamageableSystem _damageable = default!; + [Dependency] private readonly MobStateSystem _mobState = default!; + + public override void Initialize() + { + SubscribeLocalEvent(OnChitzite); + SubscribeLocalEvent(OnMapInit); + } + + public override void Update(float frameTime) + { + base.Update(frameTime); + var query = EntityQueryEnumerator(); + while (query.MoveNext(out var uid, out var chitinid, out var damageable)) + { + if (_timing.CurTime < chitinid.NextUpdate) + continue; + + chitinid.NextUpdate += chitinid.UpdateInterval; + + if (chitinid.AmountAbsorbed >= chitinid.MaximumAbsorbed || _mobState.IsDead(uid)) + continue; + + if (_damageable.TryChangeDamage(uid, chitinid.Healing, damageable: damageable) is {} delta) + { + chitinid.AmountAbsorbed += -delta.GetTotal().Float(); + if (chitinid.ChitziteAction != null && chitinid.AmountAbsorbed >= chitinid.MaximumAbsorbed) + { + _actions.SetCharges(chitinid.ChitziteAction, 1); // You get the charge back and that's it. Tough. + _actions.SetEnabled(chitinid.ChitziteAction, true); + } + } + } + + var entQuery = EntityQueryEnumerator(); + while (entQuery.MoveNext(out var ent, out var chitzite, out var chitinid)) + { + if (_timing.CurTime < chitzite.NextCough) + continue; + + Spawn(chitinid.ChitzitePrototype, Transform(ent).Coordinates); + chitinid.AmountAbsorbed = 0f; + RemCompDeferred(ent, chitzite); + } + } + + private void OnMapInit(Entity ent, ref MapInitEvent args) + { + if (ent.Comp.ChitziteAction != null) + return; + + ent.Comp.NextUpdate = _timing.CurTime + ent.Comp.UpdateInterval; + + _actions.AddAction(ent, ref ent.Comp.ChitziteAction, ent.Comp.ChitziteActionId); + } + + private void OnChitzite(Entity ent, ref ChitziteActionEvent args) + { + if (_inventory.TryGetSlotEntity(ent, "mask", out var maskUid) && + TryComp(maskUid, out var blocker) && + blocker.Enabled) + { + _popup.PopupEntity(Loc.GetString("chitzite-mask", ("mask", maskUid)), ent, ent); + return; + } + + _popup.PopupEntity(Loc.GetString("chitzite-cough", ("name", Identity.Entity(ent, EntityManager))), ent); + _audio.PlayPvs("/Audio/Animals/cat_hiss.ogg", ent, AudioHelpers.WithVariation(0.15f)); + + var chitzite = EnsureComp(ent); + chitzite.NextCough = _timing.CurTime + chitzite.CoughUpTime; + args.Handled = true; + } +} diff --git a/Content.Server/_DV/Abilities/Chitinid/CoughingUpChitziteComponent.cs b/Content.Server/_DV/Abilities/Chitinid/CoughingUpChitziteComponent.cs new file mode 100644 index 000000000000..1dae46b9437a --- /dev/null +++ b/Content.Server/_DV/Abilities/Chitinid/CoughingUpChitziteComponent.cs @@ -0,0 +1,14 @@ +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; + +namespace Content.Server.Abilities.Chitinid; + +[RegisterComponent, AutoGenerateComponentPause] +public sealed partial class CoughingUpChitziteComponent : Component +{ + [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))] + [AutoPausedField] + public TimeSpan NextCough; + + [DataField] + public TimeSpan CoughUpTime = TimeSpan.FromSeconds(2.15); +} diff --git a/Content.Shared/_DV/Actions/Events/ChitziteActionEvent.cs b/Content.Shared/_DV/Actions/Events/ChitziteActionEvent.cs new file mode 100644 index 000000000000..a36bd148d611 --- /dev/null +++ b/Content.Shared/_DV/Actions/Events/ChitziteActionEvent.cs @@ -0,0 +1,3 @@ +namespace Content.Shared.Actions.Events; + +public sealed partial class ChitziteActionEvent : InstantActionEvent {} diff --git a/Resources/Audio/_DV/Voice/Chitinid/attributions.yml b/Resources/Audio/_DV/Voice/Chitinid/attributions.yml new file mode 100644 index 000000000000..5d6386b81d6f --- /dev/null +++ b/Resources/Audio/_DV/Voice/Chitinid/attributions.yml @@ -0,0 +1,9 @@ +- files: ["moth_scream.ogg"] + license: "CC-BY-SA-3.0" + copyright: "Taken from https://github.com/tgstation/tgstation/commit/31c19654e0f641166ecd80c672ea05362fd19488" + source: "https://github.com/tgstation/tgstation/commits/master/sound/voice/moth/scream_moth.ogg" + +- files: ["moth_laugh.ogg, moth_chitter.ogg, moth_squeak.ogg"] + license: "CC-BY-SA-3.0" + copyright: "Taken from https://github.com/BeeStation/BeeStation-Hornet/commit/11ba3fa04105c93dd96a63ad4afaef4b20c02d0d" + source: "https://github.com/BeeStation/BeeStation-Hornet/blob/11ba3fa04105c93dd96a63ad4afaef4b20c02d0d/sound/emotes/" diff --git a/Resources/Audio/_DV/Voice/Chitinid/male_cough_1.ogg b/Resources/Audio/_DV/Voice/Chitinid/male_cough_1.ogg new file mode 100644 index 0000000000000000000000000000000000000000..8ddc42024474f27604fe11b32badc9123224bc59 GIT binary patch literal 13330 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�Equ%G$d-k1< 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 literal 0 HcmV?d00001 diff --git a/Resources/Audio/_DV/Voice/Chitinid/moth_chitter.ogg b/Resources/Audio/_DV/Voice/Chitinid/moth_chitter.ogg new file mode 100644 index 0000000000000000000000000000000000000000..b7240a5653611bf7c7c56a38a1c69b4c3f7c80f4 GIT binary patch literal 9381 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 - /// The hairball prototype to use. - /// - [DataField("hairballPrototype", customTypeSerializer: typeof(PrototypeIdSerializer))] - public string HairballPrototype = "Hairball"; - - //[DataField("hairballAction", customTypeSerializer: typeof(PrototypeIdSerializer))] - //public string HairballAction = "ActionHairball"; - - [DataField("hairballActionId", - customTypeSerializer: typeof(PrototypeIdSerializer))] - public string? HairballActionId = "ActionHairball"; - - [DataField("hairballAction")] - public EntityUid? HairballAction; - - [DataField("eatActionId", - customTypeSerializer: typeof(PrototypeIdSerializer))] - public string? EatActionId = "ActionEatMouse"; - - [DataField("eatAction")] - public EntityUid? EatAction; - - [DataField("eatActionTarget")] - public EntityUid? EatActionTarget = null; -} diff --git a/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidFoodComponent.cs b/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidFoodComponent.cs deleted file mode 100644 index 5a6069ffab01..000000000000 --- a/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidFoodComponent.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace Content.Server.Abilities.Felinid; - -[RegisterComponent] -public sealed partial class FelinidFoodComponent : Component -{} diff --git a/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs b/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs deleted file mode 100644 index bf41a2948990..000000000000 --- a/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs +++ /dev/null @@ -1,195 +0,0 @@ -using Content.Shared.Actions; -using Content.Shared.Actions.Events; -using Content.Shared.Audio; -using Content.Shared.StatusEffect; -using Content.Shared.Throwing; -using Content.Shared.Item; -using Content.Shared.Inventory; -using Content.Shared.Hands; -using Content.Shared.IdentityManagement; -using Content.Shared.Nutrition.Components; -using Content.Shared.Nutrition.EntitySystems; -using Content.Server.Body.Components; -using Content.Server.Chemistry.Containers.EntitySystems; -using Content.Server.Medical; -using Content.Server.Nutrition.EntitySystems; -using Content.Server.Nutrition.Components; -using Content.Server.Chemistry.EntitySystems; -using Content.Server.Popups; -using Content.Shared.Chemistry.EntitySystems; -using Robust.Shared.Audio; -using Robust.Shared.Audio.Systems; -using Robust.Shared.Player; -using Robust.Shared.Random; -using Robust.Shared.Prototypes; - -namespace Content.Server.Abilities.Felinid; - -public sealed partial class FelinidSystem : EntitySystem -{ - - [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; - [Dependency] private readonly HungerSystem _hungerSystem = default!; - [Dependency] private readonly VomitSystem _vomitSystem = default!; - [Dependency] private readonly SolutionContainerSystem _solutionSystem = default!; - [Dependency] private readonly IRobustRandom _robustRandom = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly InventorySystem _inventorySystem = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - - public override void Initialize() - { - base.Initialize(); - SubscribeLocalEvent(OnInit); - SubscribeLocalEvent(OnHairball); - SubscribeLocalEvent(OnEatMouse); - SubscribeLocalEvent(OnEquipped); - SubscribeLocalEvent(OnUnequipped); - SubscribeLocalEvent(OnHairballHit); - SubscribeLocalEvent(OnHairballPickupAttempt); - } - - private Queue RemQueue = new(); - - public override void Update(float frameTime) - { - base.Update(frameTime); - foreach (var cat in RemQueue) - { - RemComp(cat); - } - RemQueue.Clear(); - - foreach (var (hairballComp, catComp) in EntityQuery()) - { - hairballComp.Accumulator += frameTime; - if (hairballComp.Accumulator < hairballComp.CoughUpTime.TotalSeconds) - continue; - - hairballComp.Accumulator = 0; - SpawnHairball(hairballComp.Owner, catComp); - RemQueue.Enqueue(hairballComp.Owner); - } - } - - private void OnInit(EntityUid uid, FelinidComponent component, ComponentInit args) - { - if (component.HairballAction != null) - return; - - //component.HairballAction = Spawn("ActionHairball"); - _actionsSystem.AddAction(uid, ref component.HairballAction, component.HairballActionId); - } - - private void OnEquipped(EntityUid uid, FelinidComponent component, DidEquipHandEvent args) - { - if (!HasComp(args.Equipped)) - return; - - component.EatActionTarget = args.Equipped; - - //component.EatAction = Spawn("ActionEatMouse"); - _actionsSystem.AddAction(uid, ref component.EatAction, component.EatActionId); - } - - private void OnUnequipped(EntityUid uid, FelinidComponent component, DidUnequipHandEvent args) - { - if (args.Unequipped == component.EatActionTarget) - { - component.EatActionTarget = null; - if (component.EatAction != null) - _actionsSystem.RemoveAction(uid, component.EatAction.Value); - } - } - - private void OnHairball(EntityUid uid, FelinidComponent component, HairballActionEvent args) - { - if (_inventorySystem.TryGetSlotEntity(uid, "mask", out var maskUid) && - EntityManager.TryGetComponent(maskUid, out var blocker) && - blocker.Enabled) - { - _popupSystem.PopupEntity(Loc.GetString("hairball-mask", ("mask", maskUid)), uid, uid); - return; - } - - _popupSystem.PopupEntity(Loc.GetString("hairball-cough", ("name", Identity.Entity(uid, EntityManager))), uid); - _audio.PlayPvs("/Audio/Nyanotrasen/Effects/Species/hairball.ogg", uid, AudioHelpers.WithVariation(0.15f)); - - EnsureComp(uid); - args.Handled = true; - } - - private void OnEatMouse(EntityUid uid, FelinidComponent component, EatMouseActionEvent args) - { - if (component.EatActionTarget == null) - return; - - if (!TryComp(uid, out var hunger)) - return; - - if (hunger.CurrentThreshold == Shared.Nutrition.Components.HungerThreshold.Overfed) - { - _popupSystem.PopupEntity(Loc.GetString("food-system-you-cannot-eat-any-more"), uid, uid, Shared.Popups.PopupType.SmallCaution); - return; - } - - if (_inventorySystem.TryGetSlotEntity(uid, "mask", out var maskUid) && - EntityManager.TryGetComponent(maskUid, out var blocker) && - blocker.Enabled) - { - _popupSystem.PopupEntity(Loc.GetString("hairball-mask", ("mask", maskUid)), uid, uid, Shared.Popups.PopupType.SmallCaution); - return; - } - - if (component.HairballAction != null) - { - _actionsSystem.SetCharges(component.HairballAction, 1); // You get the charge back and that's it. Tough. - _actionsSystem.SetEnabled(component.HairballAction, true); - } - Del(component.EatActionTarget.Value); - component.EatActionTarget = null; - - _audio.PlayPvs("/Audio/_DV/Items/eatfood.ogg", uid, AudioHelpers.WithVariation(0.15f)); - - _hungerSystem.ModifyHunger(uid, 50f, hunger); - - if (component.EatAction != null) - _actionsSystem.RemoveAction(uid, component.EatAction.Value); - } - - private void SpawnHairball(EntityUid uid, FelinidComponent component) - { - var hairball = EntityManager.SpawnEntity(component.HairballPrototype, Transform(uid).Coordinates); - var hairballComp = Comp(hairball); - - if (TryComp(uid, out var bloodstream) && bloodstream.ChemicalSolution.HasValue) - { - var temp = _solutionSystem.SplitSolution(bloodstream.ChemicalSolution.Value, 20); - - if (_solutionSystem.TryGetSolution(hairball, hairballComp.SolutionName, out var hairballSolution)) - { - _solutionSystem.TryAddSolution(hairballSolution.Value, temp); - } - } - } - private void OnHairballHit(EntityUid uid, HairballComponent component, ThrowDoHitEvent args) - { - if (HasComp(args.Target) || !HasComp(args.Target)) - return; - if (_robustRandom.Prob(0.2f)) - _vomitSystem.Vomit(args.Target); - } - - private void OnHairballPickupAttempt(EntityUid uid, HairballComponent component, GettingPickedUpAttemptEvent args) - { - if (HasComp(args.User) || !HasComp(args.User)) - return; - - if (_robustRandom.Prob(0.2f)) - { - _vomitSystem.Vomit(args.User); - args.Cancel(); - } - } -} diff --git a/Content.Server/Nyanotrasen/Abilities/Felinid/HairballComponent.cs b/Content.Server/Nyanotrasen/Abilities/Felinid/HairballComponent.cs deleted file mode 100644 index 01c01dbc2e52..000000000000 --- a/Content.Server/Nyanotrasen/Abilities/Felinid/HairballComponent.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Content.Server.Abilities.Felinid; - -[RegisterComponent] -public sealed partial class HairballComponent : Component -{ - public string SolutionName = "hairball"; -} diff --git a/Content.Server/_DV/Abilities/Chitinid/BlockInjectionComponent.cs b/Content.Server/_DV/Abilities/Chitinid/BlockInjectionComponent.cs deleted file mode 100644 index ed5d78874d63..000000000000 --- a/Content.Server/_DV/Abilities/Chitinid/BlockInjectionComponent.cs +++ /dev/null @@ -1,4 +0,0 @@ -namespace Content.Server.Abilities.Chitinid; - -[RegisterComponent] -public sealed partial class BlockInjectionComponent : Component; diff --git a/Content.Server/_DV/Abilities/Chitinid/ChitinidComponent.cs b/Content.Server/_DV/Abilities/Chitinid/ChitinidComponent.cs index 871d10a7c275..8f3f88ebc639 100644 --- a/Content.Server/_DV/Abilities/Chitinid/ChitinidComponent.cs +++ b/Content.Server/_DV/Abilities/Chitinid/ChitinidComponent.cs @@ -1,26 +1,30 @@ using Content.Shared.Damage; -using Content.Shared.Damage.Prototypes; using Content.Shared.FixedPoint; -using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; -namespace Content.Server.Abilities.Chitinid; +namespace Content.Server._DV.Abilities.Chitinid; -[RegisterComponent] +/// +/// Passively heals radiation up to a limit, which then uses ItemCougherComponent to cough up Chitzite. +/// After that it will heal radiation damage again. +/// +[RegisterComponent, Access(typeof(ChitinidSystem))] +[AutoGenerateComponentPause] public sealed partial class ChitinidComponent : Component { [DataField] - public EntProtoId ChitzitePrototype = "Chitzite"; - - [DataField] - public EntProtoId ChitziteActionId = "ActionChitzite"; - - [DataField] - public EntityUid? ChitziteAction; + public FixedPoint2 AmountAbsorbed = 0f; + /// + /// Once this much damage is absorbed, it will stop healing and require you to cough up chitzite. + /// [DataField] - public FixedPoint2 AmountAbsorbed = 0f; + public FixedPoint2 MaximumAbsorbed = 30f; + /// + /// What damage is healed, by adding, every . + /// This must be negative. + /// [DataField] public DamageSpecifier Healing = new() { @@ -30,12 +34,10 @@ public sealed partial class ChitinidComponent : Component } }; - [DataField] - public FixedPoint2 MaximumAbsorbed = 30f; - [DataField] public TimeSpan UpdateInterval = TimeSpan.FromSeconds(1); [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))] + [AutoPausedField] public TimeSpan NextUpdate; } diff --git a/Content.Server/_DV/Abilities/Chitinid/ChitinidSystem.cs b/Content.Server/_DV/Abilities/Chitinid/ChitinidSystem.cs index 34d8244d5c9b..1d2cf0522c9f 100644 --- a/Content.Server/_DV/Abilities/Chitinid/ChitinidSystem.cs +++ b/Content.Server/_DV/Abilities/Chitinid/ChitinidSystem.cs @@ -1,97 +1,57 @@ -using Content.Server.Nutrition.Components; -using Content.Shared.Actions; -using Content.Shared.Actions.Events; -using Content.Shared.Audio; +using Content.Shared._DV.Abilities; using Content.Shared.Damage; -using Content.Shared.IdentityManagement; -using Content.Shared.Inventory; using Content.Shared.Mobs.Systems; -using Content.Shared.Popups; -using Robust.Shared.Audio.Systems; using Robust.Shared.Prototypes; using Robust.Shared.Timing; -namespace Content.Server.Abilities.Chitinid; +namespace Content.Server._DV.Abilities.Chitinid; public sealed partial class ChitinidSystem : EntitySystem { - [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly InventorySystem _inventory = default!; [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private readonly ItemCougherSystem _cougher = default!; [Dependency] private readonly DamageableSystem _damageable = default!; [Dependency] private readonly MobStateSystem _mobState = default!; public override void Initialize() { - SubscribeLocalEvent(OnChitzite); SubscribeLocalEvent(OnMapInit); + SubscribeLocalEvent(OnItemCoughedUp); } public override void Update(float frameTime) { base.Update(frameTime); var query = EntityQueryEnumerator(); - while (query.MoveNext(out var uid, out var chitinid, out var damageable)) + while (query.MoveNext(out var uid, out var comp, out var damageable)) { - if (_timing.CurTime < chitinid.NextUpdate) + if (_timing.CurTime < comp.NextUpdate) continue; - chitinid.NextUpdate += chitinid.UpdateInterval; + comp.NextUpdate += comp.UpdateInterval; - if (chitinid.AmountAbsorbed >= chitinid.MaximumAbsorbed || _mobState.IsDead(uid)) + if (comp.AmountAbsorbed >= comp.MaximumAbsorbed || _mobState.IsDead(uid)) continue; - if (_damageable.TryChangeDamage(uid, chitinid.Healing, damageable: damageable) is {} delta) - { - chitinid.AmountAbsorbed += -delta.GetTotal().Float(); - if (chitinid.ChitziteAction != null && chitinid.AmountAbsorbed >= chitinid.MaximumAbsorbed) - { - _actions.SetCharges(chitinid.ChitziteAction, 1); // You get the charge back and that's it. Tough. - _actions.SetEnabled(chitinid.ChitziteAction, true); - } - } - } - - var entQuery = EntityQueryEnumerator(); - while (entQuery.MoveNext(out var ent, out var chitzite, out var chitinid)) - { - if (_timing.CurTime < chitzite.NextCough) + if (_damageable.TryChangeDamage(uid, comp.Healing, damageable: damageable) is not {} delta) continue; - Spawn(chitinid.ChitzitePrototype, Transform(ent).Coordinates); - chitinid.AmountAbsorbed = 0f; - RemCompDeferred(ent, chitzite); + // damage healed is subtracted, so the delta is negative. + comp.AmountAbsorbed -= delta.GetTotal(); + if (comp.AmountAbsorbed >= comp.MaximumAbsorbed) + _cougher.EnableAction(uid); } } private void OnMapInit(Entity ent, ref MapInitEvent args) { - if (ent.Comp.ChitziteAction != null) - return; - ent.Comp.NextUpdate = _timing.CurTime + ent.Comp.UpdateInterval; - - _actions.AddAction(ent, ref ent.Comp.ChitziteAction, ent.Comp.ChitziteActionId); } - private void OnChitzite(Entity ent, ref ChitziteActionEvent args) + private void OnItemCoughedUp(Entity ent, ref ItemCoughedUpEvent args) { - if (_inventory.TryGetSlotEntity(ent, "mask", out var maskUid) && - TryComp(maskUid, out var blocker) && - blocker.Enabled) - { - _popup.PopupEntity(Loc.GetString("chitzite-mask", ("mask", maskUid)), ent, ent); - return; - } - - _popup.PopupEntity(Loc.GetString("chitzite-cough", ("name", Identity.Entity(ent, EntityManager))), ent); - _audio.PlayPvs("/Audio/Animals/cat_hiss.ogg", ent, AudioHelpers.WithVariation(0.15f)); - - var chitzite = EnsureComp(ent); - chitzite.NextCough = _timing.CurTime + chitzite.CoughUpTime; - args.Handled = true; + // start healing radiation again + ent.Comp.AmountAbsorbed = 0f; } } diff --git a/Content.Server/_DV/Abilities/Chitinid/CoughingUpChitziteComponent.cs b/Content.Server/_DV/Abilities/Chitinid/CoughingUpChitziteComponent.cs deleted file mode 100644 index 1dae46b9437a..000000000000 --- a/Content.Server/_DV/Abilities/Chitinid/CoughingUpChitziteComponent.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; - -namespace Content.Server.Abilities.Chitinid; - -[RegisterComponent, AutoGenerateComponentPause] -public sealed partial class CoughingUpChitziteComponent : Component -{ - [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))] - [AutoPausedField] - public TimeSpan NextCough; - - [DataField] - public TimeSpan CoughUpTime = TimeSpan.FromSeconds(2.15); -} diff --git a/Content.Server/_DV/Abilities/Felinid/FelinidSystem.cs b/Content.Server/_DV/Abilities/Felinid/FelinidSystem.cs new file mode 100644 index 000000000000..47cb910ee470 --- /dev/null +++ b/Content.Server/_DV/Abilities/Felinid/FelinidSystem.cs @@ -0,0 +1,74 @@ +using Content.Server.Body.Components; +using Content.Server.Medical; +using Content.Shared._DV.Abilities; +using Content.Shared._DV.Abilities.Felinid; +using Content.Shared.Chemistry.EntitySystems; +using Content.Shared.Item; +using Content.Shared.StatusEffect; +using Content.Shared.Throwing; +using Robust.Shared.Random; + +namespace Content.Server._DV.Abilities.Felinid; + +/// +/// Handles felinid logic except for fitting in bags. +/// +/// +/// This could be moved to shared if: +/// 1. bloodstream was in shared +/// 2. vomiting was in shared +/// 3. this didn't use RNG. +/// +public sealed class FelinidSystem : SharedFelinidSystem +{ + [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private readonly SharedSolutionContainerSystem _solution = default!; + [Dependency] private readonly VomitSystem _vomit = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnItemCoughedUp); + + SubscribeLocalEvent(OnHairballHit); + SubscribeLocalEvent(OnHairballPickupAttempt); + } + + private void OnItemCoughedUp(Entity ent, ref ItemCoughedUpEvent args) + { + if (!TryComp(ent, out var blood) || blood.ChemicalSolution is not {} solution) + return; + + var item = args.Item; + var hairball = Comp(item); + var purged = _solution.SplitSolution(solution, ent.Comp.PurgedQuantity); + if (_solution.TryGetSolution(item, hairball.SolutionName, out var hairballSolution)) + { + _solution.TryAddSolution(hairballSolution.Value, purged); + } + } + + private void OnHairballHit(Entity ent, ref ThrowDoHitEvent args) + { + TryVomit(ent, args.Target); + } + + private void OnHairballPickupAttempt(Entity ent, ref GettingPickedUpAttemptEvent args) + { + if (TryVomit(ent, args.User)) + args.Cancel(); + } + + private bool TryVomit(Entity ent, EntityUid uid) + { + if (HasComp(uid) || !HasComp(uid)) + return false; + + if (!_random.Prob(ent.Comp.VomitProb)) + return false; + + _vomit.Vomit(uid); + return true; + } +} diff --git a/Content.Shared/_DV/Abilities/CoughingUpItemComponent.cs b/Content.Shared/_DV/Abilities/CoughingUpItemComponent.cs new file mode 100644 index 000000000000..07a4fa995fff --- /dev/null +++ b/Content.Shared/_DV/Abilities/CoughingUpItemComponent.cs @@ -0,0 +1,19 @@ +using Robust.Shared.GameStates; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; + +namespace Content.Shared._DV.Abilities; + +/// +/// Spawns the item from after the coughing sound is finished. +/// +/// +/// Client doesn't care about spawning so the field isn't networked. +/// +[RegisterComponent, NetworkedComponent, Access(typeof(ItemCougherSystem))] +[AutoGenerateComponentPause] +public sealed partial class CoughingUpItemComponent : Component +{ + [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))] + [AutoPausedField] + public TimeSpan NextCough; +} diff --git a/Content.Shared/_DV/Abilities/Felinid/FelinidComponent.cs b/Content.Shared/_DV/Abilities/Felinid/FelinidComponent.cs new file mode 100644 index 000000000000..2aa6f8994a5d --- /dev/null +++ b/Content.Shared/_DV/Abilities/Felinid/FelinidComponent.cs @@ -0,0 +1,20 @@ +using Content.Shared.FixedPoint; +using Robust.Shared.GameStates; + +namespace Content.Shared._DV.Abilities.Felinid; + +/// +/// Felenid god component controls 3 things: +/// 1. When you use to cough up a hairball, it purges chemicals from your bloodstream. +/// 2. Enables the cough hairball action after eating a mouse with FelinidFoodComponent. +/// 3. Full immunity to hairball vomiting chance. +/// +[RegisterComponent, NetworkedComponent, Access(typeof(SharedFelinidSystem))] +public sealed partial class FelinidComponent : Component +{ + /// + /// Quantity of reagents to purge from the bloodstream. + /// + [DataField] + public FixedPoint2 PurgedQuantity = 20; +} diff --git a/Content.Shared/_DV/Abilities/Felinid/FelinidFoodComponent.cs b/Content.Shared/_DV/Abilities/Felinid/FelinidFoodComponent.cs new file mode 100644 index 000000000000..b81573dd1ce5 --- /dev/null +++ b/Content.Shared/_DV/Abilities/Felinid/FelinidFoodComponent.cs @@ -0,0 +1,16 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared._DV.Abilities.Felinid; + +/// +/// Makes this food let felinids cough up a hairball when eaten. +/// +[RegisterComponent, NetworkedComponent, Access(typeof(SharedFelinidSystem))] +public sealed partial class FelinidFoodComponent : Component +{ + /// + /// Extra hunger to satiate for felinids. + /// + [DataField] + public float BonusHunger = 50f; +} diff --git a/Content.Shared/_DV/Abilities/Felinid/HairballComponent.cs b/Content.Shared/_DV/Abilities/Felinid/HairballComponent.cs new file mode 100644 index 000000000000..fa8b4c0726f7 --- /dev/null +++ b/Content.Shared/_DV/Abilities/Felinid/HairballComponent.cs @@ -0,0 +1,22 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared._DV.Abilities.Felinid; + +/// +/// Causes players to randomly vomit when trying to pick this up, or when it gets thrown at them. +/// +[RegisterComponent, NetworkedComponent, Access(typeof(SharedFelinidSystem))] +public sealed partial class HairballComponent : Component +{ + /// + /// The solution to put purged chemicals into. + /// + [DataField] + public string SolutionName = "hairball"; + + /// + /// Probability of someone vomiting when picking it up or getting it thrown at them. + /// + [DataField] + public float VomitProb = 0.2f; +} diff --git a/Content.Shared/_DV/Abilities/Felinid/SharedFelinidSystem.cs b/Content.Shared/_DV/Abilities/Felinid/SharedFelinidSystem.cs new file mode 100644 index 000000000000..d8ee9a30efb1 --- /dev/null +++ b/Content.Shared/_DV/Abilities/Felinid/SharedFelinidSystem.cs @@ -0,0 +1,34 @@ +using Content.Shared._DV.Abilities; +using Content.Shared._DV.Abilities.Felinid; +using Content.Shared.Nutrition; +using Content.Shared.Nutrition.Components; +using Content.Shared.Nutrition.EntitySystems; + +namespace Content.Shared._DV.Abilities.Felinid; + +/// +/// Makes eating enable a felinids hairball action. +/// Other interactions are in the server system. +/// +public abstract class SharedFelinidSystem : EntitySystem +{ + [Dependency] private readonly HungerSystem _hunger = default!; + [Dependency] private readonly ItemCougherSystem _cougher = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnMouseEaten); + } + + private void OnMouseEaten(Entity ent, ref BeforeFullyEatenEvent args) + { + var user = args.User; + if (!HasComp(user) || !TryComp(user, out var hunger)) + return; + + _hunger.ModifyHunger(user, ent.Comp.BonusHunger, hunger); + _cougher.EnableAction(user); + } +} diff --git a/Content.Shared/_DV/Abilities/ItemCougherComponent.cs b/Content.Shared/_DV/Abilities/ItemCougherComponent.cs new file mode 100644 index 000000000000..74936f5232b5 --- /dev/null +++ b/Content.Shared/_DV/Abilities/ItemCougherComponent.cs @@ -0,0 +1,48 @@ +using Robust.Shared.Audio; +using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; + +namespace Content.Shared._DV.Abilities; + +/// +/// Adds an action to cough up an item. +/// Other systems can enable this action when their conditions are met. +/// +[RegisterComponent, NetworkedComponent, Access(typeof(ItemCougherSystem))] +public sealed partial class ItemCougherComponent : Component +{ + /// + /// The item to spawn after the coughing sound plays. + /// + [DataField(required: true)] + public EntProtoId Item; + + /// + /// The action to give the player. + /// + [DataField(required: true)] + public EntProtoId Action; + + [DataField] + public EntityUid? ActionEntity; + + /// + /// Popup to show to everyone when coughing up an item. + /// Gets "name" passed as the identity of the mob. + /// + [DataField(required: true)] + public LocId CoughPopup; + + /// + /// Sound played + /// The sound length controls how long it takes for the item to spawn. + /// + [DataField] + public SoundSpecifier Sound = new SoundPathSpecifier("/Audio/Animals/cat_hiss.ogg") + { + Params = new AudioParams + { + Variation = 0.15f + } + }; +} diff --git a/Content.Shared/_DV/Abilities/ItemCougherSystem.cs b/Content.Shared/_DV/Abilities/ItemCougherSystem.cs new file mode 100644 index 000000000000..d170c613f121 --- /dev/null +++ b/Content.Shared/_DV/Abilities/ItemCougherSystem.cs @@ -0,0 +1,106 @@ +using Content.Shared.Actions; +using Content.Shared.Actions.Events; +using Content.Shared.Clothing.Components; +using Content.Shared.IdentityManagement; +using Content.Shared.Inventory; +using Content.Shared.Popups; +using Robust.Shared.Audio.Systems; +using Robust.Shared.Network; +using Robust.Shared.Timing; + +namespace Content.Shared._DV.Abilities; + +public sealed class ItemCougherSystem : EntitySystem +{ + [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private readonly INetManager _net = default!; + [Dependency] private readonly InventorySystem _inventory = default!; + [Dependency] private readonly SharedActionsSystem _actions = default!; + [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private readonly SharedPopupSystem _popup = default!; + + private EntityQuery _query; + + public override void Initialize() + { + base.Initialize(); + + _query = GetEntityQuery(); + + SubscribeLocalEvent(OnMapInit); + SubscribeLocalEvent(OnCoughItemAction); + } + + public override void Update(float frameTime) + { + base.Update(frameTime); + + if (_net.IsClient) + return; + + var query = EntityQueryEnumerator(); + while (query.MoveNext(out var uid, out var coughing, out var comp, out var xform)) + { + if (_timing.CurTime < coughing.NextCough) + continue; + + var spawned = Spawn(comp.Item, xform.Coordinates); + RemCompDeferred(uid, coughing); + + var ev = new ItemCoughedUpEvent(spawned); + RaiseLocalEvent(uid, ref ev); + } + } + + private void OnMapInit(Entity ent, ref MapInitEvent args) + { + if (ent.Comp.ActionEntity != null) + return; + + _actions.AddAction(ent, ref ent.Comp.ActionEntity, ent.Comp.Action); + } + + private void OnCoughItemAction(Entity ent, ref CoughItemActionEvent args) + { + if (_inventory.TryGetSlotEntity(ent, "mask", out var maskUid) && + TryComp(maskUid, out var mask) && + !mask.IsToggled) + { + _popup.PopupClient(Loc.GetString("item-cougher-mask", ("mask", maskUid)), ent, ent); + return; + } + + var msg = Loc.GetString(ent.Comp.CoughPopup, ("name", Identity.Entity(ent, EntityManager))); + _popup.PopupPredicted(msg, ent, ent); + _audio.PlayPredicted(ent.Comp.Sound, ent, ent); + + var path = _audio.GetSound(ent.Comp.Sound); + var coughing = EnsureComp(ent); + coughing.NextCough = _timing.CurTime + _audio.GetAudioLength(path); + args.Handled = true; + } + + /// + /// Adds a charge to the coughing action. + /// Other systems have to call this. + /// + public void EnableAction(Entity ent) + { + if (!_query.Resolve(ent, ref ent.Comp) || ent.Comp.ActionEntity is not {} action) + return; + + _actions.SetCharges(action, 1); + _actions.SetEnabled(action, true); + } +} + +/// +/// Raised on the mob after it coughs up an item. +/// +[ByRefEvent] +public record struct ItemCoughedUpEvent(EntityUid Item); + +/// +/// Action event that must use. +/// +public sealed partial class CoughItemActionEvent : InstantActionEvent; diff --git a/Content.Shared/_DV/Chemistry/Components/BlockInjectionComponent.cs b/Content.Shared/_DV/Chemistry/Components/BlockInjectionComponent.cs new file mode 100644 index 000000000000..321dcfc14454 --- /dev/null +++ b/Content.Shared/_DV/Chemistry/Components/BlockInjectionComponent.cs @@ -0,0 +1,10 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared._DV.Chemistry.Components; + +/// +/// Prevents syringes being used on this entity. +/// Hyposprays are unaffected. +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class BlockInjectionComponent : Component; diff --git a/Resources/Locale/en-US/_DV/abilities/chitinid.ftl b/Resources/Locale/en-US/_DV/abilities/chitinid.ftl index e2e10c0eb4e5..87759da4f7c5 100644 --- a/Resources/Locale/en-US/_DV/abilities/chitinid.ftl +++ b/Resources/Locale/en-US/_DV/abilities/chitinid.ftl @@ -1,2 +1 @@ -chitzite-mask = Take off your {$mask} first. chitzite-cough = {CAPITALIZE(THE($name))} starts coughing up a hunk of Chitzite! diff --git a/Resources/Locale/en-US/_DV/abilities/item-cougher.ftl b/Resources/Locale/en-US/_DV/abilities/item-cougher.ftl new file mode 100644 index 000000000000..56d80b02f2f8 --- /dev/null +++ b/Resources/Locale/en-US/_DV/abilities/item-cougher.ftl @@ -0,0 +1 @@ +item-cougher-mask = Take off your {$mask} first. diff --git a/Resources/Locale/en-US/nyanotrasen/abilities/felinid.ftl b/Resources/Locale/en-US/nyanotrasen/abilities/felinid.ftl index 921811941678..ebf1e1c72487 100644 --- a/Resources/Locale/en-US/nyanotrasen/abilities/felinid.ftl +++ b/Resources/Locale/en-US/nyanotrasen/abilities/felinid.ftl @@ -1,7 +1,3 @@ -action-name-hairball = Cough Up Hairball -action-description-hairball = Purge some of your chemstream, and gain a cool hairball to throw at people. - -hairball-mask = Take off your {$mask} first. hairball-cough = {CAPITALIZE(THE($name))} starts coughing up a hairball! action-name-eat-mouse = Eat Mouse diff --git a/Resources/Prototypes/Nyanotrasen/Actions/types.yml b/Resources/Prototypes/Nyanotrasen/Actions/types.yml deleted file mode 100644 index fb8194050af8..000000000000 --- a/Resources/Prototypes/Nyanotrasen/Actions/types.yml +++ /dev/null @@ -1,19 +0,0 @@ -- type: entity - id: ActionEatMouse - name: action-name-eat-mouse - description: action-description-eat-mouse - components: - - type: InstantAction - icon: Nyanotrasen/Icons/verbiconfangs.png - event: !type:EatMouseActionEvent - -- type: entity - id: ActionHairball - name: action-name-hairball - description: action-description-hairball - components: - - type: InstantAction - charges: 1 - icon: { sprite: Nyanotrasen/Objects/Specific/Species/felinid.rsi, state: icon } - useDelay: 30 - event: !type:HairballActionEvent diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml index 7416840a8351..c4a5896b1c18 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml @@ -64,6 +64,10 @@ Male: MaleFelinid Female: FemaleFelinid Unsexed: MaleFelinid + - type: ItemCougher + item: Hairball + action: ActionHairball + coughPopup: hairball-cough - type: Felinid - type: NoShoesSilentFootsteps diff --git a/Resources/Prototypes/_DV/Actions/types.yml b/Resources/Prototypes/_DV/Actions/types.yml index fd677762cd97..cceb6ea1e79c 100644 --- a/Resources/Prototypes/_DV/Actions/types.yml +++ b/Resources/Prototypes/_DV/Actions/types.yml @@ -46,4 +46,17 @@ maxCharges: 1 icon: { sprite: _DV/Objects/Specific/Species/chitinid.rsi, state: chitzite } useDelay: 300 - event: !type:ChitziteActionEvent + event: !type:CoughItemActionEvent + +- type: entity + id: ActionHairball + name: Cough Up Hairball + description: Purge some of your chemstream, and gain a cool hairball to throw at people. + components: + - type: InstantAction + charges: 1 + icon: + sprite: Nyanotrasen/Objects/Specific/Species/felinid.rsi + state: icon + useDelay: 30 + event: !type:CoughItemActionEvent diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Species/chitinid.yml b/Resources/Prototypes/_DV/Entities/Mobs/Species/chitinid.yml index 0b9a3077fcaa..b74046adc9ce 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/Species/chitinid.yml +++ b/Resources/Prototypes/_DV/Entities/Mobs/Species/chitinid.yml @@ -151,6 +151,10 @@ sprite: "Effects/creampie.rsi" state: "creampie_moth" visible: false + - type: ItemCougher + item: Chitzite + action: ActionChitzite + coughPopup: chitzite-cough - type: Chitinid - type: BlockInjection From 069dc1e97368d8899755034b4f36933320f45c83 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Thu, 23 Jan 2025 21:56:53 +0100 Subject: [PATCH 194/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 2a69de341fad..efc4d1c99a81 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,12 +1,4 @@ Entries: -- author: noctyrnal - changes: - - message: Walls, Airlocks and Tiles have received new sprites as per a visual resprite - project. - type: Tweak - id: 444 - time: '2024-07-22T19:14:30.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1470 - author: musicmanvr changes: - message: Added the Home Run Bat for Syndicate operatives. Send your foes flying! @@ -3854,3 +3846,11 @@ id: 943 time: '2025-01-23T18:24:19.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2686 +- author: deltanedas + changes: + - message: Felinids no longer need to use an action to eat mice, just eating them + normally works. + type: Tweak + id: 944 + time: '2025-01-23T20:56:34.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2790 From 2324562671f9f66a0db1a8fdb42fd89ca77e89da Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Sat, 25 Jan 2025 00:45:26 +0100 Subject: [PATCH 195/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index efc4d1c99a81..25525bb4154e 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: musicmanvr - changes: - - message: Added the Home Run Bat for Syndicate operatives. Send your foes flying! - type: Add - id: 445 - time: '2024-07-22T19:20:00.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1476 - author: DangerRevolution changes: - message: Construction of Security Cyborgs now requires extra steps. @@ -3854,3 +3847,10 @@ id: 944 time: '2025-01-23T20:56:34.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2790 +- author: Stop-Signs + changes: + - message: The duster fires faster + type: Tweak + id: 945 + time: '2025-01-24T23:45:07.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2787 From 13ccf597c267e722bb83554837f8f11bdd829f53 Mon Sep 17 00:00:00 2001 From: beck-thompson <107373427+beck-thompson@users.noreply.github.com> Date: Fri, 24 Jan 2025 17:29:41 -0800 Subject: [PATCH 196/205] Add hostage ops (Nuke ops alternative objective) (#2545) * first commit * Some fixes * final fixes * Partly working * More fixes + you can now win * More fixes * Forget * Final fixes * Update the number of hostages to 4 * Add feedback popups * Use mind rolls like a cool person * bruh * NOW I'm mad * Bruh * :trollface: Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com> * :trollface: Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com> * Bruh I forget --------- Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: deltanedas <@deltanedas:kde.org> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> --- .../Rules/Components/NukeopsRuleComponent.cs | 3 +- .../GameTicking/Rules/NukeopsRuleSystem.cs | 35 +++++++++- Content.Server/Nuke/NukeCodePaperSystem.cs | 11 +++ .../_DV/Antag/NukieOperationComponent.cs | 30 ++++++++ .../_DV/Antag/NukieOperationSystem.cs | 70 +++++++++++++++++++ .../NukeHostageFeedbackPopupSystem.cs | 60 ++++++++++++++++ .../KidnapHeadsConditionComponent.cs | 9 +++ .../NukeStationConditionComponent.cs | 9 +++ .../Systems/KidnapHeadsConditionSystem.cs | 68 ++++++++++++++++++ .../Systems/NukeStationConditionSystem.cs | 43 ++++++++++++ .../_DV/Antag/NukieOperationPrototype.cs | 20 ++++++ .../FeedbackPopupInformationComponent.cs | 17 +++++ .../SharedFeedbackOverwatchSystem.cs | 19 ++++- .../AddComponentsImplantComponent.cs | 26 +++++++ .../AddComponentsImplantSystem.cs | 39 +++++++++++ .../AddFactionsImplantComponent.cs | 23 ++++++ .../AddFactions/AddFactionsImplantSystem.cs | 39 +++++++++++ .../feedbackpopup/popups/nukeHostagepopup.ftl | 16 +++++ .../en-US/_DV/nukie-operations/operations.ftl | 6 ++ .../Locale/en-US/_DV/store/uplink-catalog.ftl | 7 ++ .../Entities/Objects/Misc/implanters.yml | 12 ++++ .../Objects/Misc/subdermal_implants.yml | 19 +++++ Resources/Prototypes/GameRules/roundstart.yml | 2 + .../_DV/Catalog/Fills/Boxes/general.yml | 46 +++++++++++- .../Prototypes/_DV/Catalog/uplink_catalog.yml | 43 ++++++++++++ .../feedbackpopupsNukeHostage.yml | 26 +++++++ .../Prototypes/_DV/Objectives/nukies.yml | 66 +++++++++++++++++ Resources/Prototypes/_DV/ai_factions.yml | 3 + Resources/Prototypes/ai_factions.yml | 2 + 29 files changed, 763 insertions(+), 6 deletions(-) create mode 100644 Content.Server/_DV/Antag/NukieOperationComponent.cs create mode 100644 Content.Server/_DV/Antag/NukieOperationSystem.cs create mode 100644 Content.Server/_DV/FeedbackPopup/NukeHostageFeedbackPopupSystem.cs create mode 100644 Content.Server/_DV/Objectives/Components/KidnapHeadsConditionComponent.cs create mode 100644 Content.Server/_DV/Objectives/Components/NukeStationConditionComponent.cs create mode 100644 Content.Server/_DV/Objectives/Systems/KidnapHeadsConditionSystem.cs create mode 100644 Content.Server/_DV/Objectives/Systems/NukeStationConditionSystem.cs create mode 100644 Content.Shared/_DV/Antag/NukieOperationPrototype.cs create mode 100644 Content.Shared/_DV/FeedbackOverwatch/FeedbackPopupInformationComponent.cs create mode 100644 Content.Shared/_DV/Implants/AddComponentsImplant/AddComponentsImplantComponent.cs create mode 100644 Content.Shared/_DV/Implants/AddComponentsImplant/AddComponentsImplantSystem.cs create mode 100644 Content.Shared/_DV/Implants/AddFactions/AddFactionsImplantComponent.cs create mode 100644 Content.Shared/_DV/Implants/AddFactions/AddFactionsImplantSystem.cs create mode 100644 Resources/Locale/en-US/_DV/feedbackpopup/popups/nukeHostagepopup.ftl create mode 100644 Resources/Locale/en-US/_DV/nukie-operations/operations.ftl create mode 100644 Resources/Prototypes/_DV/FeedbackPopup/feedbackpopupsNukeHostage.yml create mode 100644 Resources/Prototypes/_DV/Objectives/nukies.yml diff --git a/Content.Server/GameTicking/Rules/Components/NukeopsRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/NukeopsRuleComponent.cs index 5626f11e0e35..c66161d92e5b 100644 --- a/Content.Server/GameTicking/Rules/Components/NukeopsRuleComponent.cs +++ b/Content.Server/GameTicking/Rules/Components/NukeopsRuleComponent.cs @@ -141,5 +141,6 @@ public enum WinCondition : byte NukiesAbandoned, AllNukiesDead, SomeNukiesAlive, - AllNukiesAlive + AllNukiesAlive, + NukiesKidnappedHeads, // DeltaV - Hostage ops } diff --git a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs index e22626594f6c..9ebbd9be8e84 100644 --- a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs @@ -1,3 +1,5 @@ +using Content.Server._DV.Objectives.Components; // DeltaV +using Content.Server._DV.Objectives.Systems; // DeltaV using Content.Server.Antag; using Content.Server.Communications; using Content.Server.GameTicking.Rules.Components; @@ -37,6 +39,8 @@ public sealed class NukeopsRuleSystem : GameRuleSystem [Dependency] private readonly RoundEndSystem _roundEndSystem = default!; [Dependency] private readonly StoreSystem _store = default!; [Dependency] private readonly TagSystem _tag = default!; + [Dependency] private readonly KidnapHeadsConditionSystem _kidnap = default!; // DeltaV + [Dependency] private readonly SharedMapSystem _map = default!; // DeltaV [ValidatePrototypeId] private const string TelecrystalCurrencyPrototype = "Telecrystal"; @@ -49,6 +53,7 @@ public override void Initialize() base.Initialize(); SubscribeLocalEvent(OnNukeExploded); + SubscribeLocalEvent(OnFTLCompleted); // DeltaV - Kidnap heads objective SubscribeLocalEvent(OnRunLevelChanged); SubscribeLocalEvent(OnNukeDisarm); @@ -156,6 +161,34 @@ private void OnNukeExploded(NukeExplodedEvent ev) } } + // DeltaV - Kidnap heads nukie objective + private void OnFTLCompleted(Entity ent, ref FTLCompletedEvent args) + { + var query = QueryActiveRules(); + while (query.MoveNext(out var uid, out _, out var nukeops, out _)) + { + // Get the nukie outpost map. + if (!TryComp(uid, out var ruleGridsComp) || ruleGridsComp.Map == null) + return; + + // Make sure your on the same map as the nukie outposts map. + if (args.MapUid == _map.GetMap(ruleGridsComp.Map.Value)) + { + // Now check of the kidnap heads objective is complete... (Yes this is suspect) + var objectives = EntityQueryEnumerator(); + if (!objectives.MoveNext(out var objUid, out var kidnapHeads)) // No kidnap head objectives + return; + + if (!_kidnap.IsCompleted((objUid, kidnapHeads))) + return; + + nukeops.WinConditions.Add(WinCondition.NukiesKidnappedHeads); + SetWinType((uid, nukeops), WinType.OpsMajor); + _roundEndSystem.EndRound(); + } + } + } + private void OnRunLevelChanged(GameRunLevelChangedEvent ev) { if (ev.New is not GameRunLevel.PostRound) @@ -487,7 +520,7 @@ private void OnAfterAntagEntSelected(Entity ent, ref After private void OnGetBriefing(Entity role, ref GetBriefingEvent args) { // TODO Different character screen briefing for the 3 nukie types - args.Append(Loc.GetString("nukeops-briefing")); + // args.Append(Loc.GetString("nukeops-briefing")); Delta-V - Nukie operations take care of this. } /// diff --git a/Content.Server/Nuke/NukeCodePaperSystem.cs b/Content.Server/Nuke/NukeCodePaperSystem.cs index aac2d2361d09..c0961bf16729 100644 --- a/Content.Server/Nuke/NukeCodePaperSystem.cs +++ b/Content.Server/Nuke/NukeCodePaperSystem.cs @@ -1,4 +1,5 @@ using System.Diagnostics.CodeAnalysis; +using Content.Server._DV.Antag; // DeltaV using Content.Server.Chat.Systems; using Content.Server.Fax; using Content.Shared.Fax.Components; @@ -35,6 +36,16 @@ private void SetupPaper(EntityUid uid, NukeCodePaperComponent? component = null, if (!Resolve(uid, ref component)) return; + // DeltaV - Not the best way of doing this + var evnt = new GetNukeCodePaperWriting(); + RaiseLocalEvent(ref evnt); + if (evnt.ToWrite != null) + { + if (TryComp(uid, out var deltavpaperComp)) + _paper.SetContent((uid, deltavpaperComp), evnt.ToWrite); + return; + } + // DeltaV - End if (TryGetRelativeNukeCode(uid, out var paperContent, station, onlyCurrentStation: component.AllNukesAvailable)) { if (TryComp(uid, out var paperComp)) diff --git a/Content.Server/_DV/Antag/NukieOperationComponent.cs b/Content.Server/_DV/Antag/NukieOperationComponent.cs new file mode 100644 index 000000000000..e3ce8a4a1223 --- /dev/null +++ b/Content.Server/_DV/Antag/NukieOperationComponent.cs @@ -0,0 +1,30 @@ +using Content.Shared._DV.Antag; +using Content.Shared.Random; +using Robust.Shared.Prototypes; + +namespace Content.Server._DV.Antag; + +/// +/// Component holds what operations are possible and their weights. +/// +[RegisterComponent, Access(typeof(NukieOperationSystem))] +public sealed partial class NukieOperationComponent : Component +{ + /// + /// The different nukie operations. + /// + [DataField(required: true)] + public ProtoId Operations; + + /// + /// The chosen operation. Is set after the first nukie spawns. + /// + [DataField] + public ProtoId? ChosenOperation; +} + +/// +/// Event to get update the nuke code paper to not actually have the code anymore. +/// +[ByRefEvent] +public record struct GetNukeCodePaperWriting(string? ToWrite); diff --git a/Content.Server/_DV/Antag/NukieOperationSystem.cs b/Content.Server/_DV/Antag/NukieOperationSystem.cs new file mode 100644 index 000000000000..6c3a8c8c37fc --- /dev/null +++ b/Content.Server/_DV/Antag/NukieOperationSystem.cs @@ -0,0 +1,70 @@ +using Content.Server.Antag; +using Content.Server.Objectives; +using Content.Shared._DV.FeedbackOverwatch; +using Content.Shared.Mind; +using Content.Shared.Random.Helpers; +using Robust.Shared.Prototypes; +using Robust.Shared.Random; + +namespace Content.Server._DV.Antag; + +public sealed class NukieOperationSystem : EntitySystem +{ + [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private readonly SharedMindSystem _mind = default!; + [Dependency] private readonly ObjectivesSystem _objectives = default!; + [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private readonly SharedFeedbackOverwatchSystem _feedback = default!; + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnAntagSelected); + SubscribeLocalEvent(OnNukeCodePaperWritingEvent); + } + + private void OnAntagSelected(Entity ent, ref AfterAntagEntitySelectedEvent args) + { + // Yes this is bad, but I couldn't easily find an event that would work. + if (ent.Comp.ChosenOperation == null) + { + if (!_proto.TryIndex(ent.Comp.Operations, out var opProto)) + return; + + ent.Comp.ChosenOperation = _random.Pick(opProto.Weights); + } + + if (!_mind.TryGetMind(args.Session, out var mindId, out var mind)) + return; + + if (!_proto.TryIndex(ent.Comp.ChosenOperation, out var chosenOp)) + return; + + foreach (var objectiveProto in chosenOp.OperationObjectives) + { + if (!_objectives.TryCreateObjective((mindId, mind), objectiveProto, out var objective)) + { + Log.Error("Couldn't create objective for nukie: " + mindId); // This should never happen. + continue; + } + + _mind.AddObjective(mindId, mind, objective.Value); + + // TODO: Remove once enough feedback has been received! + if (objectiveProto.Id == "KidnapHeadsObjective") + _feedback.SendPopupMind(mindId, "NukieHostageRoundStartPopup"); + } + } + + private void OnNukeCodePaperWritingEvent(ref GetNukeCodePaperWriting ev) + { + // This is suspect AT BEST + var query = EntityQueryEnumerator(); + while (query.MoveNext(out _, out var nukieOperation)) // this should only loop once. + { + if (!_proto.TryIndex(nukieOperation.ChosenOperation, out var opProto) || opProto.NukeCodePaperOverride == null) + continue; + ev.ToWrite = Loc.GetString(opProto.NukeCodePaperOverride); + } + } +} diff --git a/Content.Server/_DV/FeedbackPopup/NukeHostageFeedbackPopupSystem.cs b/Content.Server/_DV/FeedbackPopup/NukeHostageFeedbackPopupSystem.cs new file mode 100644 index 000000000000..eff4da3673d9 --- /dev/null +++ b/Content.Server/_DV/FeedbackPopup/NukeHostageFeedbackPopupSystem.cs @@ -0,0 +1,60 @@ +using Content.Server._DV.Objectives.Components; +using Content.Shared._DV.FeedbackOverwatch; +using Content.Shared.GameTicking; +using Content.Shared.Mind; +using Content.Shared.Mobs; +using Content.Shared.Roles; +using Content.Server.Roles; + +namespace Content.Server._DV.FeedbackPopup; + +/// +/// System to get feedback on the new objective! +/// +public sealed class NukeHostageFeedbackPopupSystem : EntitySystem +{ + [Dependency] private readonly SharedMindSystem _mind = default!; + [Dependency] private readonly SharedFeedbackOverwatchSystem _feedback = default!; + [Dependency] private readonly SharedRoleSystem _role = default!; + + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnRoundEnd); + SubscribeLocalEvent(OnMobStateChanged); + } + + private void OnRoundEnd(RoundEndMessageEvent ev) + { + if (!IsHostageOps()) + return; + + var allMinds = _mind.GetAliveHumans(); + + foreach (var mind in allMinds) + { + if (mind.Comp.OwnedEntity != null && _role.MindHasRole(mind)) + _feedback.SendPopupMind(mind, "NukieHostageRoundEndPopup"); + else + _feedback.SendPopupMind(mind, "NukieHostageRoundEndCrewPopup"); + } + } + + private void OnMobStateChanged(MobStateChangedEvent args) + { + if (args.NewMobState != MobState.Dead || !_mind.TryGetMind(args.Target, out var mindUid, out _) || !IsHostageOps()) + return; + + if (_role.MindHasRole(mindUid)) + _feedback.SendPopup(args.Target, "NukieHostageRoundEndPopup"); + } + + + /// + /// If even one person has the kidnap heads objective this will return true. + /// + private bool IsHostageOps() + { + return EntityQueryEnumerator().MoveNext(out _); + } +} diff --git a/Content.Server/_DV/Objectives/Components/KidnapHeadsConditionComponent.cs b/Content.Server/_DV/Objectives/Components/KidnapHeadsConditionComponent.cs new file mode 100644 index 000000000000..531644b8eff8 --- /dev/null +++ b/Content.Server/_DV/Objectives/Components/KidnapHeadsConditionComponent.cs @@ -0,0 +1,9 @@ +using Content.Server._DV.Objectives.Systems; + +namespace Content.Server._DV.Objectives.Components; + +/// +/// Kidnap some number of heads. Use the NumberObjective to set the exact number +/// +[RegisterComponent, Access(typeof(KidnapHeadsConditionSystem))] +public sealed partial class KidnapHeadsConditionComponent: Component; diff --git a/Content.Server/_DV/Objectives/Components/NukeStationConditionComponent.cs b/Content.Server/_DV/Objectives/Components/NukeStationConditionComponent.cs new file mode 100644 index 000000000000..55762fc9a234 --- /dev/null +++ b/Content.Server/_DV/Objectives/Components/NukeStationConditionComponent.cs @@ -0,0 +1,9 @@ +using Content.Server._DV.Objectives.Systems; + +namespace Content.Server._DV.Objectives.Components; + +/// +/// For nuclear operatives trying to nuke the station. Should only be completed if the correct station is exploded. +/// +[RegisterComponent, Access(typeof(NukeStationConditionSystem))] +public sealed partial class NukeStationConditionComponent : Component; diff --git a/Content.Server/_DV/Objectives/Systems/KidnapHeadsConditionSystem.cs b/Content.Server/_DV/Objectives/Systems/KidnapHeadsConditionSystem.cs new file mode 100644 index 000000000000..10502d7aa569 --- /dev/null +++ b/Content.Server/_DV/Objectives/Systems/KidnapHeadsConditionSystem.cs @@ -0,0 +1,68 @@ +using Content.Server._DV.Objectives.Components; +using Content.Server.Objectives.Systems; +using Content.Server.Revolutionary.Components; +using Content.Shared.Cuffs; +using Content.Shared.Cuffs.Components; +using Content.Shared.Mind; +using Content.Shared.Objectives.Components; + +namespace Content.Server._DV.Objectives.Systems; + +public sealed class KidnapHeadsConditionSystem : EntitySystem +{ + [Dependency] private readonly SharedMindSystem _mind = default!; + [Dependency] private readonly NumberObjectiveSystem _number = default!; + [Dependency] private readonly SharedCuffableSystem _cuffable = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnGetProgress); + } + + private void OnGetProgress(Entity condition, ref ObjectiveGetProgressEvent args) + { + args.Progress = GetProgress(condition); + } + + public float GetProgress(Entity condition) + { + GetTotalAndCuffedHeads(out var totalHeads, out var cuffedHeads); + + if (totalHeads == 0) + return 1.0f; + + return (float) cuffedHeads / Math.Min(totalHeads, _number.GetTarget(condition)); + } + + public bool IsCompleted(Entity condition) + { + GetTotalAndCuffedHeads(out var totalHeads, out var cuffedHeads); + if (totalHeads == 0) + return false; + + return cuffedHeads == Math.Min(totalHeads, _number.GetTarget(condition)); + } + + private void GetTotalAndCuffedHeads(out int totalHeads, out int cuffedHeads) + { + var allHumanMinds = _mind.GetAliveHumans(); + totalHeads = 0; + cuffedHeads = 0; + foreach (var mind in allHumanMinds) + { + if (mind.Comp.OwnedEntity is not { } mob) + continue; + + if (!HasComp(mob)) + continue; + totalHeads++; + + if (!TryComp(mob, out var cuffable) || !_cuffable.IsCuffed((mob, cuffable))) + continue; + cuffedHeads++; + } + } +} + diff --git a/Content.Server/_DV/Objectives/Systems/NukeStationConditionSystem.cs b/Content.Server/_DV/Objectives/Systems/NukeStationConditionSystem.cs new file mode 100644 index 000000000000..b851a66a7aa7 --- /dev/null +++ b/Content.Server/_DV/Objectives/Systems/NukeStationConditionSystem.cs @@ -0,0 +1,43 @@ +using Content.Server._DV.Objectives.Components; +using Content.Server.GameTicking.Rules.Components; +using Content.Server.Nuke; +using Content.Server.Objectives.Systems; +using Content.Server.Station.Components; +using Content.Shared.Objectives.Components; + +namespace Content.Server._DV.Objectives.Systems; + +public sealed class NukeStationConditionSystem : EntitySystem +{ + [Dependency] private readonly CodeConditionSystem _codeCondition = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnNukeExploded); + } + + private void OnNukeExploded(NukeExplodedEvent ev) + { + var nukeOpsQuery = EntityQueryEnumerator(); + while (nukeOpsQuery.MoveNext(out _, out var nukeopsRule)) // this should only loop once. + { + if (!TryComp(nukeopsRule.TargetStation, out var data)) + return; + + foreach (var grid in data.Grids) + { + if (grid != ev.OwningStation) // They nuked the target station! + continue; + + // Set all the objectives to true. + var nukeStationQuery = EntityQueryEnumerator(); + while (nukeStationQuery.MoveNext(out var uid, out _)) + { + _codeCondition.SetCompleted(uid); + } + } + } + } +} diff --git a/Content.Shared/_DV/Antag/NukieOperationPrototype.cs b/Content.Shared/_DV/Antag/NukieOperationPrototype.cs new file mode 100644 index 000000000000..c0dc4007fb52 --- /dev/null +++ b/Content.Shared/_DV/Antag/NukieOperationPrototype.cs @@ -0,0 +1,20 @@ +using Robust.Shared.Prototypes; + +namespace Content.Shared._DV.Antag; + +/// +/// This is for nukie operations. E.g nuke the station or kidnap x number of heads. +/// +[Prototype] +public sealed partial class NukieOperationPrototype : IPrototype +{ + /// + [IdDataField] + public string ID { get; } = default!; + + [DataField(required: true)] + public List OperationObjectives = new(); + + [DataField] + public LocId? NukeCodePaperOverride; +} diff --git a/Content.Shared/_DV/FeedbackOverwatch/FeedbackPopupInformationComponent.cs b/Content.Shared/_DV/FeedbackOverwatch/FeedbackPopupInformationComponent.cs new file mode 100644 index 000000000000..46fe6b947368 --- /dev/null +++ b/Content.Shared/_DV/FeedbackOverwatch/FeedbackPopupInformationComponent.cs @@ -0,0 +1,17 @@ +using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; + +namespace Content.Shared._DV.FeedbackOverwatch; + +/// +/// Component that stores information about feedback popups on a players mind. +/// +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState] +public sealed partial class FeedbackPopupInformationComponent : Component +{ + /// + /// List of popups that this mind has already seen. + /// + [DataField, AutoNetworkedField] + public HashSet> SeenPopups = new(); +} diff --git a/Content.Shared/_DV/FeedbackOverwatch/SharedFeedbackOverwatchSystem.cs b/Content.Shared/_DV/FeedbackOverwatch/SharedFeedbackOverwatchSystem.cs index f12bf691201c..2add4971b8ba 100644 --- a/Content.Shared/_DV/FeedbackOverwatch/SharedFeedbackOverwatchSystem.cs +++ b/Content.Shared/_DV/FeedbackOverwatch/SharedFeedbackOverwatchSystem.cs @@ -43,8 +43,9 @@ private void LoadPrototypes() ///

FT|| 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 literal 0 HcmV?d00001 diff --git a/Resources/Audio/_DV/Voice/Chitinid/moth_squeak.ogg b/Resources/Audio/_DV/Voice/Chitinid/moth_squeak.ogg new file mode 100644 index 0000000000000000000000000000000000000000..5b77d98e56541fa3ee34654737e9f78e0b5c58b8 GIT binary patch literal 8676 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 Sjk5^K8yUkeeT$BKhW`hii5zbL literal 0 HcmV?d00001 diff --git a/Resources/Locale/en-US/_DV/abilities/chitinid.ftl b/Resources/Locale/en-US/_DV/abilities/chitinid.ftl new file mode 100644 index 000000000000..e2e10c0eb4e5 --- /dev/null +++ b/Resources/Locale/en-US/_DV/abilities/chitinid.ftl @@ -0,0 +1,2 @@ +chitzite-mask = Take off your {$mask} first. +chitzite-cough = {CAPITALIZE(THE($name))} starts coughing up a hunk of Chitzite! diff --git a/Resources/Locale/en-US/_DV/chat/managers/chat_manager.ftl b/Resources/Locale/en-US/_DV/chat/managers/chat_manager.ftl index b1ff73f9a838..f58ade59f60c 100644 --- a/Resources/Locale/en-US/_DV/chat/managers/chat_manager.ftl +++ b/Resources/Locale/en-US/_DV/chat/managers/chat_manager.ftl @@ -21,3 +21,9 @@ chat-speech-verb-rodentia-1 = squeaks chat-speech-verb-rodentia-2 = pieps chat-speech-verb-rodentia-3 = chatters chat-speech-verb-rodentia-4 = squeals + +chat-speech-verb-name-chitinid = Chitinid +chat-speech-verb-chitinid-1 = clicks +chat-speech-verb-chitinid-2 = chitters +chat-speech-verb-chitinid-3 = hisses +chat-speech-verb-chitinid-4 = buzzes diff --git a/Resources/Locale/en-US/_DV/markings/chitinid.ftl b/Resources/Locale/en-US/_DV/markings/chitinid.ftl new file mode 100644 index 000000000000..be5ae5896a71 --- /dev/null +++ b/Resources/Locale/en-US/_DV/markings/chitinid.ftl @@ -0,0 +1,164 @@ +marking-ChitinidAntennasDefault-default = Antennae +marking-ChitinidAntennasDefault = Antennae (Default) + +marking-ChitinidAntennasCurly-curly = Antennae +marking-ChitinidAntennasCurly = Antennae (Curly) + +marking-ChitinidAntennasGray-gray = Antennae +marking-ChitinidAntennasGray = Antennae (Gray) + +marking-ChitinidAntennasSlick-slick = Antennae +marking-ChitinidAntennasSlick = Antennae (Slick) + +marking-ChitinidAntennasShort-short = Antennae +marking-ChitinidAntennasShort = Antennae (short) + +marking-ChitinidAntennasLong-long = Antennae +marking-ChitinidAntennasLong = Antennae (Long) + +marking-ChitinidAntennasBee-bee = Antennae +marking-ChitinidAntennasBee = Antennae (Bee) + +marking-ChitinidAntennasFirefly-firefly_primary = Primary +marking-ChitinidAntennasFirefly-firefly_secondary = Secondary +marking-ChitinidAntennasFirefly = Antennae (Firefly) + +marking-ChitinidAntennasRadar-radar = Antennae +marking-ChitinidAntennasRadar = Antennae (Radar) + +marking-ChitinidAntennasSpeed-speed = Antennae +marking-ChitinidAntennasSpeed = Antennae (Speed) + + + +marking-ChitinidWingsDefault-default = Wing +marking-ChitinidWingsDefault = Tail (Default) + +marking-ChitinidWingsSmooth-smooth = Wing +marking-ChitinidWingsSmooth = Tail (Smooth) + +marking-ChitinidWingsHoneypot-honeypot_primary = Primary +marking-ChitinidWingsHoneypot-honeypot_secondary = Secondary +marking-ChitinidWingsHoneypot = Tail (Honeypot) + +marking-ChitinidWingsStubby-stubby = Wing +marking-ChitinidWingsStubby = Tail (Stubby) + +marking-ChitinidWingsBee-bee_primary = Primary +marking-ChitinidWingsBee-bee_secondary = Secondary +marking-ChitinidWingsBee = Tail (Bee) + +marking-ChitinidWingsFirefly-firefly_primary = Primary +marking-ChitinidWingsFirefly-firefly_secondary = Secondary +marking-ChitinidWingsFirefly = Tail (Firefly) + + + +marking-ChitinidChestCharred-charred_chest = Chest +marking-ChitinidChestCharred = Chitinid Chest (Charred) + +marking-ChitinidHeadCharred-charred_head = Head +marking-ChitinidHeadCharred = Chitinid Head (Charred) + +marking-ChitinidLLegCharred-charred_l_leg = Left Leg +marking-ChitinidLLegCharred = Chitinid Left Leg (Charred) + +marking-ChitinidRLegCharred-charred_r_leg = Right Leg +marking-ChitinidRLegCharred = Chitinid Right Leg (Charred) + +marking-ChitinidLArmCharred-charred_l_arm = Left Arm +marking-ChitinidLArmCharred = Chitinid Left Arm (Charred) + +marking-ChitinidRArmCharred-charred_r_arm = Right Arm +marking-ChitinidRArmCharred = Chitinid Right Arm (Charred) + + + +marking-ChitinidChestPlated-plated_chest = Chest +marking-ChitinidChestPlated = Chitinid Chest (Plated) + +marking-ChitinidLArmPlated-plated_l_arm = Left Arm +marking-ChitinidLArmPlated = Chitinid Left Arm (Plated) + +marking-ChitinidRArmPlated-plated_r_arm = Right Arm +marking-ChitinidRArmPlated = Chitinid Right Arm (Plated) + + + +marking-ChitinidChestStripes-stripes_chest = Chest +marking-ChitinidChestStripes = Chitinid Chest (Stripes) + +marking-ChitinidHeadStripes-stripes_head = Head +marking-ChitinidHeadStripes = Chitinid Head (Stripes) + +marking-ChitinidLLegStripes-stripes_l_leg = Left Leg +marking-ChitinidLLegStripes = Chitinid Left Leg (Stripes) + +marking-ChitinidRLegStripes-stripes_r_leg = Right Leg +marking-ChitinidRLegStripes = Chitinid Right Leg (Stripes) + +marking-ChitinidLArmStripes-stripes_l_arm = Left Arm +marking-ChitinidLArmStripes = Chitinid Left Arm (Stripes) + +marking-ChitinidRArmStripes-stripes_r_arm = Right Arm +marking-ChitinidRArmStripes = Chitinid Right Arm (Stripes) + + + +marking-ChitinidChestRadiant-radiant_chest = Chest +marking-ChitinidChestRadiant = Chitinid Chest (Radiant) + +marking-ChitinidHeadRadiant-radiant_head = Head +marking-ChitinidHeadRadiant = Chitinid Head (Radiant) + +marking-ChitinidLLegRadiant-radiant_l_leg = Left Leg +marking-ChitinidLLegRadiant = Chitinid Left Leg (Radiant) + +marking-ChitinidRLegRadiant-radiant_r_leg = Right Leg +marking-ChitinidRLegRadiant = Chitinid Right Leg (Radiant) + +marking-ChitinidLArmRadiant-radiant_l_arm = Left Arm +marking-ChitinidLArmRadiant = Chitinid Left Arm (Radiant) + +marking-ChitinidRArmRadiant-radiant_r_arm = Right Arm +marking-ChitinidRArmRadiant = Chitinid Right Arm (Radiant) + + + +marking-ChitinidChestToxic-toxic_chest = Chest +marking-ChitinidChestToxic = Chitinid Chest (Toxic) + +marking-ChitinidHeadToxic-toxic_head = Head +marking-ChitinidHeadToxic = Chitinid Head (Toxic) + +marking-ChitinidLLegToxic-toxic_l_leg = Left Leg +marking-ChitinidLLegToxic = Chitinid Left Leg (Toxic) + +marking-ChitinidRLegToxic-toxic_r_leg = Right Leg +marking-ChitinidRLegToxic = Chitinid Right Leg (Toxic) + +marking-ChitinidLArmToxic-toxic_l_arm = Left Arm +marking-ChitinidLArmToxic = Chitinid Left Arm (Toxic) + +marking-ChitinidRArmToxic-toxic_r_arm = Right Arm +marking-ChitinidRArmToxic = Chitinid Right Arm (Toxic) + + + +marking-ChitinidChestSpotted-spotted_chest = Chest +marking-ChitinidChestSpotted = Chitinid Chest (Spotted) + +marking-ChitinidHeadSpotted-spotted_head = Head +marking-ChitinidHeadSpotted = Chitinid Head (Spotted) + +marking-ChitinidLLegSpotted-spotted_l_leg = Left Leg +marking-ChitinidLLegSpotted = Chitinid Left Leg (Spotted) + +marking-ChitinidRLegSpotted-spotted_r_leg = Right Leg +marking-ChitinidRLegSpotted = Chitinid Right Leg (Spotted) + +marking-ChitinidLArmSpotted-spotted_l_arm = Left Arm +marking-ChitinidLArmSpotted = Chitinid Left Arm (Spotted) + +marking-ChitinidRArmSpotted-spotted_r_arm = Right Arm +marking-ChitinidRArmSpotted = Chitinid Right Arm (Spotted) diff --git a/Resources/Locale/en-US/_DV/species/species.ftl b/Resources/Locale/en-US/_DV/species/species.ftl index 545858ef4ab4..b8cebd93d580 100644 --- a/Resources/Locale/en-US/_DV/species/species.ftl +++ b/Resources/Locale/en-US/_DV/species/species.ftl @@ -3,3 +3,4 @@ species-name-vulpkanin = Vulpkanin species-name-harpy = Harpy species-name-rodentia = Rodentia +species-name-chitinid = Chitinid diff --git a/Resources/Locale/en-US/chemistry/components/injector-component.ftl b/Resources/Locale/en-US/chemistry/components/injector-component.ftl index 24f524081e0d..43e24ce25dcb 100644 --- a/Resources/Locale/en-US/chemistry/components/injector-component.ftl +++ b/Resources/Locale/en-US/chemistry/components/injector-component.ftl @@ -27,3 +27,4 @@ injector-component-drawing-user = You start drawing the needle. injector-component-injecting-user = You start injecting the needle. injector-component-drawing-target = {CAPITALIZE(THE($user))} is trying to use a needle to draw from you! injector-component-injecting-target = {CAPITALIZE(THE($user))} is trying to inject a needle into you! +injector-component-deny-user = Exoskeleton too thick! diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml index 540d098e5051..71fe62451019 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml @@ -226,7 +226,7 @@ id: GauzeHead bodyPart: Head markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Moth] + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Moth, Chitinid] # Delta V - Chitinid coloring: default: type: @@ -312,7 +312,7 @@ id: GauzeMothBlindfold bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Moth] + speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid coloring: default: type: @@ -326,7 +326,7 @@ id: GauzeMothShoulder bodyPart: Chest markingCategory: Overlay - speciesRestriction: [Moth] + speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid coloring: default: type: @@ -340,7 +340,7 @@ id: GauzeMothStomach bodyPart: Chest markingCategory: Overlay - speciesRestriction: [Moth] + speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid coloring: default: type: @@ -354,7 +354,7 @@ id: GauzeMothLeftEyePatch bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Moth] + speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid coloring: default: type: @@ -368,7 +368,7 @@ id: GauzeMothLeftEyePad bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Moth] + speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid coloring: default: type: @@ -382,7 +382,7 @@ id: GauzeMothRightEyePatch bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Moth] + speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid coloring: default: type: @@ -396,7 +396,7 @@ id: GauzeMothRightEyePad bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Moth] + speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid coloring: default: type: @@ -410,7 +410,7 @@ id: GauzeMothUpperArmRight bodyPart: RArm markingCategory: Overlay - speciesRestriction: [Moth] + speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid coloring: default: type: @@ -424,7 +424,7 @@ id: GauzeMothUpperArmLeft bodyPart: LArm markingCategory: Overlay - speciesRestriction: [Moth] + speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid coloring: default: type: @@ -438,7 +438,7 @@ id: GauzeMothUpperLegRight bodyPart: RLeg markingCategory: Overlay - speciesRestriction: [Moth] + speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid coloring: default: type: @@ -452,7 +452,7 @@ id: GauzeMothUpperLegLeft bodyPart: LLeg markingCategory: Overlay - speciesRestriction: [Moth] + speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid coloring: default: type: @@ -466,7 +466,7 @@ id: GauzeMothLowerLegRight bodyPart: RFoot markingCategory: Overlay - speciesRestriction: [Moth] + speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid coloring: default: type: @@ -480,7 +480,7 @@ id: GauzeMothLowerLegLeft bodyPart: LFoot markingCategory: Overlay - speciesRestriction: [Moth] + speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid coloring: default: type: diff --git a/Resources/Prototypes/Guidebook/species.yml b/Resources/Prototypes/Guidebook/species.yml index 73e9056c01d6..998b06d24f35 100644 --- a/Resources/Prototypes/Guidebook/species.yml +++ b/Resources/Prototypes/Guidebook/species.yml @@ -17,6 +17,7 @@ - Felinid - Oni - Rodentia + - Chitinid - type: guideEntry id: Arachnid diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml b/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml index 41996dce543c..f9c1560d06ee 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml @@ -24,6 +24,7 @@ - Oni - Vulpkanin - Rodentia + - Chitinid # End DeltaV additions - type: loadoutEffectGroup diff --git a/Resources/Prototypes/Species/species_weights.yml b/Resources/Prototypes/Species/species_weights.yml index efe79057e3e6..1a5a0323e4a0 100644 --- a/Resources/Prototypes/Species/species_weights.yml +++ b/Resources/Prototypes/Species/species_weights.yml @@ -10,3 +10,4 @@ Vulpkanin: 3 # DeltaV - Vulpkanin, see Prototypes/_DV/Entities/Mobs/Species/vulpkanin.yml Rodentia: 3 # DeltaV - Rodentia, see Prototypes/_DV/Entities/Mobs/Species/rodentia.yml Diona: 2 + Chitinid: 3 # DeltaV - Chitinid, see Prototypes/_DV/Entities/Mobs/Species/chitinid.yml diff --git a/Resources/Prototypes/_DV/Actions/types.yml b/Resources/Prototypes/_DV/Actions/types.yml index bf5649feccba..cb4818527ef6 100644 --- a/Resources/Prototypes/_DV/Actions/types.yml +++ b/Resources/Prototypes/_DV/Actions/types.yml @@ -48,3 +48,16 @@ checkCanInteract: false checkConsciousness: false event: !type:PrecognitionPowerActionEvent + +- type: entity + id: ActionChitzite + name: Cough Up Chitzite + description: Purge the excess radiation build-up from your body, and gain a cool danger rock. + components: + - type: InstantAction + charges: 0 + enabled: false + maxCharges: 1 + icon: { sprite: _DV/Objects/Specific/Species/chitinid.rsi, state: chitzite } + useDelay: 300 + event: !type:ChitziteActionEvent diff --git a/Resources/Prototypes/_DV/Body/Organs/chitinid.yml b/Resources/Prototypes/_DV/Body/Organs/chitinid.yml new file mode 100644 index 000000000000..38a0e0b22191 --- /dev/null +++ b/Resources/Prototypes/_DV/Body/Organs/chitinid.yml @@ -0,0 +1,33 @@ +- type: entity + id: OrganChitinidStomach + parent: [OrganAnimalStomach, OrganHumanStomach] + name: stomach + description: "Gross. This is hard to stomach." + components: + - type: Organ # Shitmed Change + slotId: stomach # Shitmed Change + - type: Sprite + state: stomach + - type: Item + size: Small + heldPrefix: stomach + - type: SolutionContainerManager + solutions: + stomach: + maxVol: 50 + food: + maxVol: 5 + reagents: + - ReagentId: UncookedAnimalProteins + Quantity: 5 + - type: Stomach + # The stomach metabolizes stuff like foods and drinks. + # TODO: Have it work off of the ent's solution container, and move this + # to intestines instead. + - type: Metabolizer + # mm yummy + maxReagents: 3 + metabolizerTypes: [Human] + groups: + - id: Food + - id: Drink diff --git a/Resources/Prototypes/_DV/Body/Parts/chitinid.yml b/Resources/Prototypes/_DV/Body/Parts/chitinid.yml new file mode 100644 index 000000000000..fb346bb6ff33 --- /dev/null +++ b/Resources/Prototypes/_DV/Body/Parts/chitinid.yml @@ -0,0 +1,112 @@ +# TODO: Add descriptions (many) +# TODO BODY: Part damage +- type: entity + id: PartChitinidBase + parent: [BaseItem, BasePart] + name: "Chitinid body part" + abstract: true + components: + - type: Sprite + sprite: _DV/Mobs/Species/Chitinid/parts.rsi + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Fat + Quantity: 3 + - ReagentId: Blood + Quantity: 10 + +- type: entity + id: TorsoChitinid + name: "chitinid torso" + parent: [PartChitinidBase, BaseTorso] + components: + - type: Sprite + state: "torso_m" + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Fat + Quantity: 10 + - ReagentId: Blood + Quantity: 20 + + +- type: entity + id: HeadChitinid + name: "chitinid head" + parent: [PartChitinidBase, BaseHead] + components: + - type: Sprite + state: "head_m" + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Fat + Quantity: 5 + - ReagentId: Blood + Quantity: 10 + +- type: entity + id: LeftArmChitinid + name: "left chitinid arm" + parent: [PartChitinidBase, BaseLeftArm] + components: + - type: Sprite + state: "l_arm" + +- type: entity + id: RightArmChitinid + name: "right chitinid arm" + parent: [PartChitinidBase, BaseRightArm] + components: + - type: Sprite + state: "r_arm" + +- type: entity + id: LeftHandChitinid + name: "left chitinid hand" + parent: [PartChitinidBase, BaseLeftHand] + components: + - type: Sprite + state: "l_hand" + +- type: entity + id: RightHandChitinid + name: "right chitinid hand" + parent: [PartChitinidBase, BaseRightHand] + components: + - type: Sprite + state: "r_hand" + +- type: entity + id: LeftLegChitinid + name: "left chitinid leg" + parent: [PartChitinidBase, BaseLeftLeg] + components: + - type: Sprite + state: "l_leg" + +- type: entity + id: RightLegChitinid + name: "right chitinid leg" + parent: [PartChitinidBase, BaseRightLeg] + components: + - type: Sprite + state: "r_leg" + +- type: entity + id: LeftFootChitinid + name: "left chitinid foot" + parent: [PartChitinidBase, BaseLeftFoot] + components: + - type: Sprite + state: "l_foot" + +- type: entity + id: RightFootChitinid + name: "right chitinid foot" + parent: [PartChitinidBase, BaseRightFoot] + components: + - type: Sprite + state: "r_foot" diff --git a/Resources/Prototypes/_DV/Body/Prototypes/chitinid.yml b/Resources/Prototypes/_DV/Body/Prototypes/chitinid.yml new file mode 100644 index 000000000000..18428a67a6c4 --- /dev/null +++ b/Resources/Prototypes/_DV/Body/Prototypes/chitinid.yml @@ -0,0 +1,49 @@ +- type: body + id: Chitinid + name: "chitinid" + root: torso + slots: + head: + part: HeadChitinid + connections: + - torso + organs: + brain: OrganHumanBrain + eyes: OrganHumanEyes + torso: + part: TorsoChitinid + organs: + heart: OrganAnimalHeart + lungs: OrganHumanLungs + stomach: OrganChitinidStomach + liver: OrganAnimalLiver + kidneys: OrganHumanKidneys + connections: + - right arm + - left arm + - right leg + - left leg + right arm: + part: RightArmChitinid + connections: + - right hand + left arm: + part: LeftArmChitinid + connections: + - left hand + right hand: + part: RightHandChitinid + left hand: + part: LeftHandChitinid + right leg: + part: RightLegChitinid + connections: + - right foot + left leg: + part: LeftLegChitinid + connections: + - left foot + right foot: + part: RightFootChitinid + left foot: + part: LeftFootChitinid diff --git a/Resources/Prototypes/_DV/Damage/modifier_sets.yml b/Resources/Prototypes/_DV/Damage/modifier_sets.yml index a7a16dca9a0f..42a10a3b123e 100644 --- a/Resources/Prototypes/_DV/Damage/modifier_sets.yml +++ b/Resources/Prototypes/_DV/Damage/modifier_sets.yml @@ -29,3 +29,12 @@ Slash: 5 Piercing: 5 Heat: 5 + +- type: damageModifierSet + id: Chitinid + coefficients: + Blunt: 1.15 + Piercing: 1.25 + Slash: 0.9 + Cold: 1.1 + Radiation: 0.2 diff --git a/Resources/Prototypes/_DV/Datasets/Names/chitinid_first_female.yml b/Resources/Prototypes/_DV/Datasets/Names/chitinid_first_female.yml new file mode 100644 index 000000000000..be91ea315096 --- /dev/null +++ b/Resources/Prototypes/_DV/Datasets/Names/chitinid_first_female.yml @@ -0,0 +1,34 @@ +- type: dataset + id: NamesChitinidFirstFemale + values: + - Amer'ix + - An'bela + - An'ora + - Aza'ran + - Be'riah + - Bel'os + - Da'lrah + - Di'azo + - E'nzo + - Em'era + - Fi'n'rah + - He'teka + - Ir'iska + - Ish'kar + - Isha'ba + - Jes'sri'ka + - Kalz'za + - Kaz'zek + - Lot'tikz + - Ral'zol + - Ri'isano + - Talzz'ark + - Tess'ara + - Tez'mal'zar + - Thri'kis + - Vani'si'kar + - Ve'rai + - Vish'ra + - Zan'ova + - Zen'ofi + - Zzer'ak diff --git a/Resources/Prototypes/_DV/Datasets/Names/chitinid_first_male.yml b/Resources/Prototypes/_DV/Datasets/Names/chitinid_first_male.yml new file mode 100644 index 000000000000..355f5cffb9bc --- /dev/null +++ b/Resources/Prototypes/_DV/Datasets/Names/chitinid_first_male.yml @@ -0,0 +1,36 @@ +- type: dataset + id: NamesChitinidFirstMale + values: + - Al'vos + - Amue'val + - Barma'tos + - Ben'idar + - Bil'verrok + - Crik'xis + - Daru'nta + - Dee'aldas + - Drx'var + - Hen'sra + - Hux'von + - Ilv'imon + - Is'irax + - Ish'nax + - Jax'zaril'va + - L'ofa + - Lo'zok + - Lu'vurx + - Luc'irax + - Mer'tex + - Od'dalis + - Si'ley + - Sim'sker + - Tal'vos + - Ti'ril + - Vir'lker + - Vir'muel + - Vix'vol + - Von'draz + - Vu'lta'voss + - Xixa'ba + - Yarr'wat + - Zay'zz diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/chitinid.yml b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/chitinid.yml new file mode 100644 index 000000000000..eed5ebdcbd4d --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/chitinid.yml @@ -0,0 +1,458 @@ +# Antennas +- type: marking + id: ChitinidAntennasDefault + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_antennas.rsi + state: default + +- type: marking + id: ChitinidAntennasCurly + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_antennas.rsi + state: curly + +- type: marking + id: ChitinidAntennasGray + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_antennas.rsi + state: gray + +- type: marking + id: ChitinidAntennasSlick + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_antennas.rsi + state: slick + +- type: marking + id: ChitinidAntennasLong + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_antennas.rsi + state: long + +- type: marking + id: ChitinidAntennasBee + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_antennas.rsi + state: bee + +- type: marking + id: ChitinidAntennasShort + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_antennas.rsi + state: short + +- type: marking + id: ChitinidAntennasFirefly + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_antennas.rsi + state: firefly_primary + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_antennas.rsi + state: firefly_secondary + +- type: marking + id: ChitinidAntennasRadar + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_antennas.rsi + state: radar + +- type: marking + id: ChitinidAntennasSpeed + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_antennas.rsi + state: speed + + +# Wings +- type: marking + id: ChitinidWingsDefault + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_wings.rsi + state: default + +- type: marking + id: ChitinidWingsSmooth + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_wings.rsi + state: smooth + +- type: marking + id: ChitinidWingsHoneypot + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_wings.rsi + state: honeypot_primary + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_wings.rsi + state: honeypot_secondary + +- type: marking + id: ChitinidWingsStubby + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_wings.rsi + state: stubby + +- type: marking + id: ChitinidWingsBee + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_wings.rsi + state: bee_primary + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_wings.rsi + state: bee_secondary + +- type: marking + id: ChitinidWingsFirefly + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_wings.rsi + state: firefly_primary + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_wings.rsi + state: firefly_secondary + +# Body markings: +# Charred +- type: marking + id: ChitinidChestCharred + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_parts.rsi + state: charred_chest + +- type: marking + id: ChitinidHeadCharred + bodyPart: Head + markingCategory: Head + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_parts.rsi + state: charred_head + +- type: marking + id: ChitinidLLegCharred + bodyPart: LLeg + markingCategory: Legs + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_parts.rsi + state: charred_l_leg + +- type: marking + id: ChitinidRLegCharred + bodyPart: RLeg + markingCategory: Legs + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_parts.rsi + state: charred_r_leg + +- type: marking + id: ChitinidLArmCharred + bodyPart: LArm + markingCategory: Arms + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_parts.rsi + state: charred_l_arm + +- type: marking + id: ChitinidRArmCharred + bodyPart: RArm + markingCategory: Arms + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_parts.rsi + state: charred_r_arm + +# Plated +- type: marking + id: ChitinidChestPlated + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_parts.rsi + state: plated_chest + +- type: marking + id: ChitinidLArmPlated + bodyPart: LArm + markingCategory: Arms + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_parts.rsi + state: plated_l_arm + +- type: marking + id: ChitinidRArmPlated + bodyPart: RArm + markingCategory: Arms + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_parts.rsi + state: plated_r_arm + +# Stripes +- type: marking + id: ChitinidChestStripes + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_parts.rsi + state: stripes_chest + +- type: marking + id: ChitinidHeadStripes + bodyPart: Head + markingCategory: Head + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_parts.rsi + state: stripes_head + +- type: marking + id: ChitinidLLegStripes + bodyPart: LLeg + markingCategory: Legs + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_parts.rsi + state: stripes_l_leg + +- type: marking + id: ChitinidRLegStripes + bodyPart: RLeg + markingCategory: Legs + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_parts.rsi + state: stripes_r_leg + +- type: marking + id: ChitinidLArmStripes + bodyPart: LArm + markingCategory: Arms + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_parts.rsi + state: stripes_l_arm + +- type: marking + id: ChitinidRArmStripes + bodyPart: RArm + markingCategory: Arms + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_parts.rsi + state: stripes_r_arm + +# Radiant +- type: marking + id: ChitinidChestRadiant + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_parts.rsi + state: radiant_chest + +- type: marking + id: ChitinidHeadRadiant + bodyPart: Head + markingCategory: Head + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_parts.rsi + state: radiant_head + +- type: marking + id: ChitinidLLegRadiant + bodyPart: LLeg + markingCategory: Legs + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_parts.rsi + state: radiant_l_leg + +- type: marking + id: ChitinidRLegRadiant + bodyPart: RLeg + markingCategory: Legs + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_parts.rsi + state: radiant_r_leg + +- type: marking + id: ChitinidLArmRadiant + bodyPart: LArm + markingCategory: Arms + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_parts.rsi + state: radiant_l_arm + +- type: marking + id: ChitinidRArmRadiant + bodyPart: RArm + markingCategory: Arms + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_parts.rsi + state: radiant_r_arm + +# Toxic +- type: marking + id: ChitinidChestToxic + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_parts.rsi + state: toxic_chest + +- type: marking + id: ChitinidHeadToxic + bodyPart: Head + markingCategory: Head + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_parts.rsi + state: toxic_head + +- type: marking + id: ChitinidLLegToxic + bodyPart: LLeg + markingCategory: Legs + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_parts.rsi + state: toxic_l_leg + +- type: marking + id: ChitinidRLegToxic + bodyPart: RLeg + markingCategory: Legs + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_parts.rsi + state: toxic_r_leg + +- type: marking + id: ChitinidLArmToxic + bodyPart: LArm + markingCategory: Arms + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_parts.rsi + state: toxic_l_arm + +- type: marking + id: ChitinidRArmToxic + bodyPart: RArm + markingCategory: Arms + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_parts.rsi + state: toxic_r_arm + +# Spotted +- type: marking + id: ChitinidChestSpotted + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_parts.rsi + state: spotted_chest + +- type: marking + id: ChitinidHeadSpotted + bodyPart: Head + markingCategory: Head + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_parts.rsi + state: spotted_head + +- type: marking + id: ChitinidLLegSpotted + bodyPart: LLeg + markingCategory: Legs + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_parts.rsi + state: spotted_l_leg + +- type: marking + id: ChitinidRLegSpotted + bodyPart: RLeg + markingCategory: Legs + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_parts.rsi + state: spotted_r_leg + +- type: marking + id: ChitinidLArmSpotted + bodyPart: LArm + markingCategory: Arms + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_parts.rsi + state: spotted_l_arm + +- type: marking + id: ChitinidRArmSpotted + bodyPart: RArm + markingCategory: Arms + speciesRestriction: [Chitinid] + sprites: + - sprite: _DV/Mobs/Customization/Chitinid/chitinid_parts.rsi + state: spotted_r_arm diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Player/chitinid.yml b/Resources/Prototypes/_DV/Entities/Mobs/Player/chitinid.yml new file mode 100644 index 000000000000..4c8a78473152 --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Mobs/Player/chitinid.yml @@ -0,0 +1,5 @@ +- type: entity + save: false + name: Urist McAnt + parent: BaseMobChitinid + id: MobChitinid diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Species/chitinid.yml b/Resources/Prototypes/_DV/Entities/Mobs/Species/chitinid.yml new file mode 100644 index 000000000000..0b9a3077fcaa --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Mobs/Species/chitinid.yml @@ -0,0 +1,163 @@ +- type: entity + save: false + name: Urist McAnt + parent: BaseMobSpeciesOrganic + id: BaseMobChitinid + abstract: true + components: + - type: HumanoidAppearance + species: Chitinid + hideLayersOnEquip: + - HeadTop + + - type: Hunger + baseDecayRate: 0.0467 #needs to eat more to survive + - type: Thirst + + - type: UnpoweredFlashlight + - type: PointLight + enabled: false + radius: 3 + softness: 5 + color: "#2CFA1F" + autoRot: true + + - type: Carriable + + - type: Icon + sprite: _DV/Mobs/Species/Chitinid/parts.rsi + state: full + + - type: Body + prototype: Chitinid + requiredLegs: 2 + + - type: Damageable + damageContainer: Biological + damageModifierSet: Chitinid + + - type: Speech + speechVerb: Chitinid + allowedEmotes: ['Chitter', 'Click', 'Hiss'] + + - type: MeleeWeapon + animation: WeaponArcBite + soundHit: + path: /Audio/Effects/bite.ogg + damage: + types: + Piercing: 5 + + + - type: TypingIndicator + proto: Chitinid + + - type: Butcherable + butcheringType: Spike + spawned: + - id: FoodMeat + amount: 5 + + - type: Bloodstream + bloodReagent: InsectBlood + + - type: DamageVisuals + damageOverlayGroups: + Brute: + sprite: Mobs/Effects/brute_damage.rsi + color: "#808A51" + Burn: + sprite: Mobs/Effects/burn_damage.rsi + + - type: Vocal + sounds: + Male: UnisexChitinid + Female: UnisexChitinid + Unsexed: UnisexChitinid + + - type: Fixtures + fixtures: # TODO: This needs a second fixture just for mob collisions. + fix1: + shape: + !type:PhysShapeCircle + radius: 0.42 + density: 220 + restitution: 0.0 + mask: + - MobMask + layer: + - MobLayer + + - type: Temperature # Ants hate the cold + heatDamageThreshold: 320 + coldDamageThreshold: 230 + currentTemperature: 310.15 + specificHeat: 46 + coldDamage: + types: + Cold : 1.25 #per second, scales with temperature & other constants + heatDamage: + types: + Heat : 1.0 #per second, scales with temperature & other constants + - type: TemperatureSpeed + thresholds: + 289: 0.6 + 275: 0.4 + 250: 0.3 + + - type: Sprite # sprite again because we want different layer ordering + noRot: true + drawdepth: Mobs + layers: + - map: [ "enum.HumanoidVisualLayers.Chest" ] + - map: [ "enum.HumanoidVisualLayers.Head" ] + - map: [ "enum.HumanoidVisualLayers.Snout" ] + - map: [ "enum.HumanoidVisualLayers.Eyes" ] + - map: [ "enum.HumanoidVisualLayers.RArm" ] + - map: [ "enum.HumanoidVisualLayers.LArm" ] + - map: [ "enum.HumanoidVisualLayers.RLeg" ] + - map: [ "enum.HumanoidVisualLayers.LLeg" ] + - map: [ "enum.HumanoidVisualLayers.Underwear" ] # DeltaV + - map: [ "enum.HumanoidVisualLayers.Undershirt" ] # DeltaV + - map: [ "jumpsuit" ] + - map: [ "enum.HumanoidVisualLayers.LHand" ] + - map: [ "enum.HumanoidVisualLayers.RHand" ] + - map: [ "enum.HumanoidVisualLayers.LFoot" ] + - map: [ "enum.HumanoidVisualLayers.RFoot" ] + - map: [ "enum.HumanoidVisualLayers.Handcuffs" ] + color: "#ffffff" + sprite: Objects/Misc/handcuffs.rsi + state: body-overlay-2 + visible: false + - map: [ "gloves" ] + - map: [ "shoes" ] + - map: [ "ears" ] + - map: [ "outerClothing" ] + - map: [ "eyes" ] + - map: [ "belt" ] + - map: [ "id" ] + - map: [ "back" ] + - map: [ "neck" ] + - map: [ "enum.HumanoidVisualLayers.Tail" ] #in the utopian future we should probably have a wings enum inserted here so everyhting doesn't break + - map: [ "enum.HumanoidVisualLayers.FacialHair" ] + - map: [ "enum.HumanoidVisualLayers.Hair" ] + - map: [ "enum.HumanoidVisualLayers.HeadSide" ] + - map: [ "enum.HumanoidVisualLayers.HeadTop" ] + - map: [ "mask" ] + - map: [ "head" ] + - map: [ "pocket1" ] + - map: [ "pocket2" ] + - map: [ "clownedon" ] # Dynamically generated + sprite: "Effects/creampie.rsi" + state: "creampie_moth" + visible: false + - type: Chitinid + - type: BlockInjection + +- type: entity + parent: BaseSpeciesDummy + id: MobChitinidDummy + categories: [ HideSpawnMenu ] + components: + - type: HumanoidAppearance + species: Chitinid diff --git a/Resources/Prototypes/_DV/Entities/Objects/Specific/Species/chitinid.yml b/Resources/Prototypes/_DV/Entities/Objects/Specific/Species/chitinid.yml new file mode 100644 index 000000000000..1a9b5f0bcefb --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Objects/Specific/Species/chitinid.yml @@ -0,0 +1,33 @@ +- type: entity + parent: BaseItem + id: Chitzite + name: chitzite + description: A small radioactive stone formed in the chest cavity of a radioactive chitinid, gross.... but kinda pretty? + components: + - type: Sprite + sprite: _DV/Objects/Specific/Species/chitinid.rsi + layers: + - state: chitzite + - state: chitzite_glow + - type: RadiationSource + intensity: 0.5 + - type: Extractable + grindableSolutionName: chitzite + - type: SolutionContainerManager + solutions: + chitzite: + maxVol: 5 + reagents: + - ReagentId: Uranium + Quantity: 2.5 + - ReagentId: Radium + Quantity: 2.5 + - type: MeleeWeapon + damage: + types: + Blunt: 3 + Radiation: 3 + - type: Tag + tags: + - Recyclable + - Trash diff --git a/Resources/Prototypes/_DV/Guidebook/species.yml b/Resources/Prototypes/_DV/Guidebook/species.yml index f33f6d8c0972..a5c6c1df2480 100644 --- a/Resources/Prototypes/_DV/Guidebook/species.yml +++ b/Resources/Prototypes/_DV/Guidebook/species.yml @@ -22,3 +22,8 @@ id: Rodentia name: species-name-rodentia text: "/ServerInfo/Guidebook/Mobs/_DV/Rodentia.xml" + +- type: guideEntry + id: Chitinid + name: species-name-chitinid + text: "/ServerInfo/Guidebook/Mobs/_DV/Chitinid.xml" diff --git a/Resources/Prototypes/_DV/Species/chitinid.yml b/Resources/Prototypes/_DV/Species/chitinid.yml new file mode 100644 index 000000000000..b70c696f3a42 --- /dev/null +++ b/Resources/Prototypes/_DV/Species/chitinid.yml @@ -0,0 +1,167 @@ +- type: species + id: Chitinid + name: species-name-chitinid + roundStart: true + prototype: MobChitinid + sprites: MobChitinidSprites + defaultSkinTone: "#ffda93" + markingLimits: MobChitinidMarkingLimits + dollPrototype: MobChitinidDummy + skinColoration: Hues + maleFirstNames: NamesChitinidFirstMale + femaleFirstNames: NamesChitinidFirstFemale + naming: First + +- type: speciesBaseSprites + id: MobChitinidSprites + sprites: + Head: MobChitinidHead + Snout: MobHumanoidAnyMarking + Underwear: MobHumanoidAnyMarking + Undershirt: MobHumanoidAnyMarking + Chest: MobChitinidTorso + HeadTop: MobHumanoidAnyMarking + HeadSide: MobHumanoidAnyMarking + Tail: MobHumanoidAnyMarking + Eyes: MobChitinidEyes + LArm: MobChitinidLArm + RArm: MobChitinidRArm + LHand: MobChitinidLHand + RHand: MobChitinidRHand + LLeg: MobChitinidLLeg + RLeg: MobChitinidRLeg + LFoot: MobChitinidLFoot + RFoot: MobChitinidRFoot + +- type: humanoidBaseSprite + id: MobChitinidEyes + baseSprite: + sprite: _DV/Mobs/Species/Chitinid/parts.rsi + state: eyes + +- type: markingPoints + id: MobChitinidMarkingLimits + onlyWhitelisted: true + points: + Hair: + points: 0 + required: false + FacialHair: + points: 0 + required: false + Tail: + points: 1 + required: true + defaultMarkings: [ ChitinidWingsDefault ] + Snout: + points: 1 + required: false + HeadTop: + points: 1 + required: true + defaultMarkings: [ ChitinidAntennasDefault ] + HeadSide: + points: 1 + required: false + Head: + points: 1 + required: false + Chest: + points: 1 + required: false + Underwear: + points: 1 + required: false + Undershirt: + points: 1 + required: false + Legs: + points: 6 + required: false + Arms: + points: 6 + required: false + +- type: humanoidBaseSprite + id: MobChitinidHead + baseSprite: + sprite: _DV/Mobs/Species/Chitinid/parts.rsi + state: head_m + +- type: humanoidBaseSprite + id: MobChitinidHeadMale + baseSprite: + sprite: _DV/Mobs/Species/Chitinid/parts.rsi + state: head_m + +- type: humanoidBaseSprite + id: MobChitinidHeadFemale + baseSprite: + sprite: _DV/Mobs/Species/Chitinid/parts.rsi + state: head_f + +- type: humanoidBaseSprite + id: MobChitinidTorso + baseSprite: + sprite: _DV/Mobs/Species/Chitinid/parts.rsi + state: torso_m + +- type: humanoidBaseSprite + id: MobChitinidTorsoMale + baseSprite: + sprite: _DV/Mobs/Species/Chitinid/parts.rsi + state: torso_m + +- type: humanoidBaseSprite + id: MobChitinidTorsoFemale + baseSprite: + sprite: _DV/Mobs/Species/Chitinid/parts.rsi + state: torso_f + +- type: humanoidBaseSprite + id: MobChitinidLLeg + baseSprite: + sprite: _DV/Mobs/Species/Chitinid/parts.rsi + state: l_leg + +- type: humanoidBaseSprite + id: MobChitinidLHand + baseSprite: + sprite: _DV/Mobs/Species/Chitinid/parts.rsi + state: l_hand + +- type: humanoidBaseSprite + id: MobChitinidLArm + baseSprite: + sprite: _DV/Mobs/Species/Chitinid/parts.rsi + state: l_arm + +- type: humanoidBaseSprite + id: MobChitinidLFoot + baseSprite: + sprite: _DV/Mobs/Species/Chitinid/parts.rsi + state: l_foot + +- type: humanoidBaseSprite + id: MobChitinidRLeg + baseSprite: + sprite: _DV/Mobs/Species/Chitinid/parts.rsi + state: r_leg + +- type: humanoidBaseSprite + id: MobChitinidRHand + baseSprite: + sprite: _DV/Mobs/Species/Chitinid/parts.rsi + state: r_hand + +- type: humanoidBaseSprite + id: MobChitinidRArm + baseSprite: + sprite: _DV/Mobs/Species/Chitinid/parts.rsi + state: r_arm + +- type: humanoidBaseSprite + id: MobChitinidRFoot + baseSprite: + sprite: _DV/Mobs/Species/Chitinid/parts.rsi + state: r_foot diff --git a/Resources/Prototypes/_DV/Voice/speech_emote_sounds.yml b/Resources/Prototypes/_DV/Voice/speech_emote_sounds.yml index 02a332544d05..1a250450e853 100644 --- a/Resources/Prototypes/_DV/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/_DV/Voice/speech_emote_sounds.yml @@ -242,3 +242,37 @@ collection: FemaleGasp DefaultDeathgasp: collection: FemaleDeathGasp + +- type: emoteSounds + id: UnisexChitinid + params: + variation: 0.125 + sounds: + Buzz: + path: /Audio/_DV/Voice/Chitinid/moth_scream.ogg + Scream: + path: /Audio/Voice/Arachnid/arachnid_scream.ogg + Laugh: + path: /Audio/_DV/Voice/Chitinid/moth_laugh.ogg + Chitter: + path: /Audio/Voice/Arachnid/arachnid_chitter.ogg + Click: + path: /Audio/Voice/Arachnid/arachnid_click.ogg + Crying: + collection: FemaleCry + Weh: + collection: Weh + Hew: + collection: Hew + Sneeze: + collection: MaleSneezes + Cough: + collection: MaleCoughs + Yawn: + collection: MaleYawn + Hiss: + path: /Audio/Animals/snake_hiss.ogg + Gasp: + collection: MaleGasp + DefaultDeathgasp: + collection: MothDeathGasp diff --git a/Resources/Prototypes/_DV/Voice/speech_sounds.yml b/Resources/Prototypes/_DV/Voice/speech_sounds.yml index 47ffb1fcda50..583d71f186fb 100644 --- a/Resources/Prototypes/_DV/Voice/speech_sounds.yml +++ b/Resources/Prototypes/_DV/Voice/speech_sounds.yml @@ -15,3 +15,12 @@ path: /Audio/_DV/Voice/Harpy/chirp1.ogg exclaimSound: path: /Audio/_DV/Voice/Harpy/chirp1.ogg + +- type: speechSounds + id: Chitinid + saySound: + path: /Audio/Voice/Talk/speak_1.ogg + askSound: + path: /Audio/Voice/Talk/speak_1_ask.ogg + exclaimSound: + path: /Audio/Voice/Talk/speak_1_exclaim.ogg diff --git a/Resources/Prototypes/_DV/Voice/speech_verbs.yml b/Resources/Prototypes/_DV/Voice/speech_verbs.yml index a712223b1dca..e5c4b72724a1 100644 --- a/Resources/Prototypes/_DV/Voice/speech_verbs.yml +++ b/Resources/Prototypes/_DV/Voice/speech_verbs.yml @@ -33,3 +33,12 @@ - chat-speech-verb-rodentia-2 - chat-speech-verb-rodentia-3 - chat-speech-verb-rodentia-4 + +- type: speechVerb + id: Chitinid + name: chat-speech-verb-name-chitinid + speechVerbStrings: + - chat-speech-verb-chitinid-1 + - chat-speech-verb-chitinid-2 + - chat-speech-verb-chitinid-3 + - chat-speech-verb-chitinid-4 diff --git a/Resources/Prototypes/_DV/typing_indicator.yml b/Resources/Prototypes/_DV/typing_indicator.yml index f43f9e67ff84..2c45ee21b22a 100644 --- a/Resources/Prototypes/_DV/typing_indicator.yml +++ b/Resources/Prototypes/_DV/typing_indicator.yml @@ -10,3 +10,8 @@ typingState: rodentia0 offset: 0, 0.2 # 0625 +- type: typingIndicator + id: Chitinid + spritePath: /Textures/_DV/Effects/speech.rsi + typingState: chitinid0 + offset: -0.2, 0.1 # 0625 diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/undershirt.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/undershirt.yml index 5d5625a7f6a4..5161d4cb9bf6 100644 --- a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/undershirt.yml +++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/undershirt.yml @@ -2,7 +2,7 @@ id: UndershirtDefault bodyPart: Undershirt markingCategory: Undershirt - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid coloring: default: type: @@ -16,7 +16,7 @@ id: UndershirtRolled bodyPart: Undershirt markingCategory: Undershirt - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid coloring: default: type: @@ -30,7 +30,7 @@ id: UndershirtSleeveless bodyPart: Undershirt markingCategory: Undershirt - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid coloring: default: type: @@ -44,7 +44,7 @@ id: UndershirtRolledSleeveless bodyPart: Undershirt markingCategory: Undershirt - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid coloring: default: type: @@ -58,7 +58,7 @@ id: UndershirtGrossSleeveless bodyPart: Undershirt markingCategory: Undershirt - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid coloring: default: type: @@ -72,7 +72,7 @@ id: UndershirtNanotrasen bodyPart: Undershirt markingCategory: Undershirt - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid coloring: default: type: @@ -86,7 +86,7 @@ id: UndershirtBinder bodyPart: Undershirt markingCategory: Undershirt - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid coloring: default: type: @@ -100,7 +100,7 @@ id: UndershirtBraClassic bodyPart: Undershirt markingCategory: Undershirt - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid coloring: default: type: @@ -114,7 +114,7 @@ id: UndershirtBraSports bodyPart: Undershirt markingCategory: Undershirt - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid coloring: default: type: @@ -128,7 +128,7 @@ id: UndershirtBraStrapless bodyPart: Undershirt markingCategory: Undershirt - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid coloring: default: type: diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/underwear.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/underwear.yml index f43a6c9eb50a..35dd3fb66215 100644 --- a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/underwear.yml +++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/underwear.yml @@ -2,7 +2,7 @@ id: UnderwearDefault bodyPart: Underwear markingCategory: Underwear - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid coloring: default: type: @@ -16,7 +16,7 @@ id: UnderwearBriefs bodyPart: Underwear markingCategory: Underwear - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid coloring: default: type: @@ -30,7 +30,7 @@ id: UnderwearLowriders bodyPart: Underwear markingCategory: Underwear - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid coloring: default: type: @@ -44,7 +44,7 @@ id: UnderwearSatin bodyPart: Underwear markingCategory: Underwear - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid coloring: default: type: @@ -58,7 +58,7 @@ id: UnderwearTanga bodyPart: Underwear markingCategory: Underwear - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid coloring: default: type: diff --git a/Resources/ServerInfo/Guidebook/Mobs/Species.xml b/Resources/ServerInfo/Guidebook/Mobs/Species.xml index 0fc1779b2863..08bff6a62e03 100644 --- a/Resources/ServerInfo/Guidebook/Mobs/Species.xml +++ b/Resources/ServerInfo/Guidebook/Mobs/Species.xml @@ -23,6 +23,7 @@ + diff --git a/Resources/ServerInfo/Guidebook/Mobs/_DV/Chitinid.xml b/Resources/ServerInfo/Guidebook/Mobs/_DV/Chitinid.xml new file mode 100644 index 000000000000..29dde13c0f72 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/Mobs/_DV/Chitinid.xml @@ -0,0 +1,28 @@ + + # Chitinid + + + + + + An industrious worker drone species, the Chitinid are strong diligent workers. Thanks to their homeworld's enviroment, they have grown an acute resistance to radiation, but not without its side effects. + + ## Diet + - Nothing special. + + ## Benefits + - Takes 80% less Radiation, 10% less Slash. + - Their bodies naturally recover from light radiation damage up to a point, once they accumulate enough radiation they must purge it from their systems in the form of a small rock. + - Due to their worker drone nature they are Better at pulling and carrying things. + - Due to their radioactive homeworld they possess a bio light. + + ## Drawbacks + - Built for work rather than combat their hard shells are weaker to Blunt and piercing damage, they take 25% more piercing and 15% more Blunt damage. + - Due to their hard shells normal syringes can not pierce them, requiring hypos to bypass the toughness. + - Thanks to their overactive systems they get hungry 33% faster. + - The cold does not agree with their biology and makes their movement sluggish, the cold also harms them more than others. + - They are deceptivly heavy due to their lifestyle and diet. + - The Chitzite they expel is slightly radioactive. + - Bug Blood. + + diff --git a/Resources/Textures/_DV/Effects/speech.rsi/chitinid0.png b/Resources/Textures/_DV/Effects/speech.rsi/chitinid0.png new file mode 100644 index 0000000000000000000000000000000000000000..dc37e2d63bdb3537452e55e79d522a8819cf2fc2 GIT binary patch literal 775 zcmV+i1Ni)jP)aTcuJf1$7W{$WXjR{3V#@vkQP<%#=zUtaLCdbAx!AIBMus*1C`QlCWy7^q z`?R&$8E<+x1@ynV?&l;B+y@$U*Znw!cDqn)@cb-qxbWKx7BFylHF7 z0dTboj6GX2mzz?6(ywX2#|1D{07mYC(7Ly));Z3ffc!T7qC4R52$-V&$i^S#6=(h- z^0uA;000SaNLh0L01FZT01FZU(%pXi0003#Nklo{Yk%8BhN0;btCmw>b-$YruxGH zxRhnNd)B$Cs&l9gn$BD6ucnGeM$|Ghg{AXa`kT2g^hO3lygVu__iS$c^#VhVT?v;y zx0As+GyTmQ#??`9Qdt4PF*E%*26Q92eG!DT_Ww8NJ0HYbIfnY;<09=|OM8lbZX3p8 zKqKevUPii54s>4jayP@Ll)kjPoUv!^z65bDHQ2Ydeh}1VBQdgGYx%$NT`gN41XB0f zdb#@p00000000000NfxyU?@(0zzfI^_=o&}{{MXHKfOhMK+29>`b)Ne%e(?UqECK6 zYykNI_p_J$0Bgt((0^yPK9r@1E~)@40|KsWZdwhyjM_@Kho$t!CGx z;5&Ti!7!%KB{SPvN-t*6Hhvzdn&KfUdbO`>8GSj`W`M7oc$Qh*A)Y5rZaJ3VJ>nr& zkaNT*#1T#hB)%28;_;i{yvJXHc_y_0_(e}C-^5B2vjR7WCyB#`USjq0h?|5|b0tlA zl-3w*q>w-y5)_oM2^|iiluephYhSG9TSk#QjQ$qN;N-}oK;8(cCF-hD)<{?B(@_?4 z|36P#o0;~yhvGoztLuJ_1HpZuT5;XqQ`fDY0f86b+HClXG^e?5(kl%ud<+ci0GBrn zO*sIrc7c&+OXhM-3efUv8t`!e^k;#=d!TpSn^k=u=TAUpo1W+nI6ML-sD5DM58Ux* z`YQX7ga7~l32;bRa{vGf5&!@T5&_cPe*6Fc0J2F$K~z}7?Ud08gFp<1Q|Ytov;$Zt zxv_4Nl)mdaE^v*KLV9?%#S2vUKL`mqHGdM7=qRL=T%LPc$qgo+)VJ!d-U5aY!liU^ zjPW6^^Ahk@T#7ATa=D06C)2wMutIVXn!jtfOGvYISSqfQxy>da?-6kR^#-#7sxbk( zg1M9S!%J9o|2ZthlYWLTV{3ZOHH)sTpwuCIblv>hAD1^eWv?mF7vp9E0000008Tss XD&{=cxq5k@00000NkvXXu0mjftK}NC literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Effects/speech.rsi/chitinid2.png b/Resources/Textures/_DV/Effects/speech.rsi/chitinid2.png new file mode 100644 index 0000000000000000000000000000000000000000..91bcf88fe5eec28c13c1764f3979ca0bb0239954 GIT binary patch literal 637 zcmV-@0)qXCP)9r@1E~)@40|KsWZdwhyjM_@Kho$t!CGx z;5&Ti!7!%KB{SPvN-t*6Hhvzdn&KfUdbO`>8GSj`W`M7oc$Qh*A)Y5rZaJ3VJ>nr& zkaNT*#1T#hB)%28;_;i{yvJXHc_y_0_(e}C-^5B2vjR7WCyB#`USjq0h?|5|b0tlA zl-3w*q>w-y5)_oM2^|iiluephYhSG9TSk#QjQ$qN;N-}oK;8(cCF-hD)<{?B(@_?4 z|36P#o0;~yhvGoztLuJ_1HpZuT5;XqQ`fDY0f86b+HClXG^e?5(kl%ud<+ci0GBrn zO*sIrc7c&+OXhM-3efUv8t`!e^k;#=d!TpSn^k=u=TAUpo1W+nI6ML-sD5DM58Ux* z`YQX7ga7~l32;bRa{vGf5&!@T5&_cPe*6Fc0J2F$K~z}7V_+C6;Q#;sG%=SEi`WSy z_9rOK2c<1&?SK<0DJkZ-6wjG6XD^U)p{4_v@L3MD5JfRi-WeJ~yQt*=7E(3990_zB z%n@$XiUPdBk0)AoQ{o5~0)~Tpj4pN(DRELY1VBN`M<5ZxEO(ly9o7>Ee&T@0gO6pVsVFbYP&C>RB!fJOiS X38^?{kaRH000000NkvXXu0mjfP%I3l literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Effects/speech.rsi/meta.json b/Resources/Textures/_DV/Effects/speech.rsi/meta.json index 8c27bf1627ee..2136383e31ee 100644 --- a/Resources/Textures/_DV/Effects/speech.rsi/meta.json +++ b/Resources/Textures/_DV/Effects/speech.rsi/meta.json @@ -40,6 +40,23 @@ }, { "name": "rodentia2" + }, + { + "name": "chitinid0", + "delays": [ + [ + 0.2, + 0.3, + 0.3, + 0.3 + ] + ] + }, + { + "name": "chitinid1" + }, + { + "name": "chitinid2" } ] } diff --git a/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_antennas.rsi/bee.png b/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_antennas.rsi/bee.png new file mode 100644 index 0000000000000000000000000000000000000000..3c5faa4aa25900b242fa115f25376e569a4a771b GIT binary patch literal 716 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 Vkd07k;)MVJ002ovPDHLkV1nemJ}CeI literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_antennas.rsi/long.png b/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_antennas.rsi/long.png new file mode 100644 index 0000000000000000000000000000000000000000..9ff75a10104ac0fef0dc3b49ca26b766f5b8cdb8 GIT binary patch literal 634 zcmV-=0)_pFP)aTcu(v9aIo;$WX!9hqi)Mm*h2Rg(M9xDN&&ow5`bYkJd;XFtNAr4 z_zoXJ7^a+)nQbj)7jx(uKabQ+@emiYy7zUAP(igB;OirvVHS6Y=ZVu>jwN`Hc!-tc z0`UoPjMD{)Z-uUS{3f{Q@t0tp%PatXF;gnGvC_t@#0}y};;5llSo1#OOTwzTlBGII zIR+aUq>zLJ1r=;Uhl4m(lXlkGmuUEwQ6>+gw}mP=If^KeH%4lOrm9pm(p7qNRK?!^ z@6*<%r@ZOmB+&cnx}W1fa384GT=)0Xb?aw9;03rgTmCZbY4)4+T1$%_1Cbrz@}{LJ z2f)=XF!F54Ty97KO24K79~Zzt9vHj_`q#Z(HP3PW1mw2q7u^AeN5BO2M>hTd3MFU{ z>Bri<00009a7bBm000XT000XT0n*)m`~Uy|ut`KgRCwC$+A#{kKoAAc#oKttbapl# z!A7tX1dkx*5Q2D<$OHmbfrQN_#`l`ADe`Bh{Yhzr`f+di&Qr^oze#^?)B@hGXS!W4 z?bhQN=aO>f4_-i3Rofx&bDKNAb=dEkzVq7i0RR91003akqI`@VzVyEULv-_HFG{~Z z7aTcu(v9aIo;$WX!9hqi)Mm*h2Rg(M9xDN&&ow5`bYkJd;XFtNAr4 z_zoXJ7^a+)nQbj)7jx(uKabQ+@emiYy7zUAP(igB;OirvVHS6Y=ZVu>jwN`Hc!-tc z0`UoPjMD{)Z-uUS{3f{Q@t0tp%PatXF;gnGvC_t@#0}y};;5llSo1#OOTwzTlBGII zIR+aUq>zLJ1r=;Uhl4m(lXlkGmuUEwQ6>+gw}mP=If^KeH%4lOrm9pm(p7qNRK?!^ z@6*<%r@ZOmB+&cnx}W1fa384GT=)0Xb?aw9;03rgTmCZbY4)4+T1$%_1Cbrz@}{LJ z2f)=XF!F54Ty97KO24K79~Zzt9vHj_`q#Z(HP3PW1mw2q7u^AeN5BO2M>hTd3MFU{ z>Bri<00009a7bBm000XT000XT0n*)m`~Uy|=Sf6CRCwC$+OZ9TFc5`d(@-%29V5_F zc@S1$5>{XkDtbns^9WQlBzKBYqJTmahY02W8e{43S+=Mi#^Aq2uL{bte3&;)6QuSO z2herh?4SF-*D=p?QxrwCR(oILt<~;zME_lzyWXsBB+D|LCrM(es#@Ny>v|r?QJ;rl z@V6g@x}{(D2LJ#700000003})K?6idXq|J*JWW$GO_TPp*1ok?+qOE!as0IACyDb{ z4!}p#KB1L$C8Z7Ze}MdVa7%_YC6;t}D<(gjMAJULK9cm5-h9LW00000000000QR^5 X4BBa&z@Hez00000NkvXXu0mjfke@YJ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_antennas.rsi/short.png b/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_antennas.rsi/short.png new file mode 100644 index 0000000000000000000000000000000000000000..1dde872b7854e1105360b5c3c91f9fd24d311644 GIT binary patch literal 671 zcmV;Q0$}}#P)aTcu(v9aIo;$WX!9hqi)Mm*h2Rg(M9xDN&&ow5`bYkJd;XFtNAr4 z_zoXJ7^a+)nQbj)7jx(uKabQ+@emiYy7zUAP(igB;OirvVHS6Y=ZVu>jwN`Hc!-tc z0`UoPjMD{)Z-uUS{3f{Q@t0tp%PatXF;gnGvC_t@#0}y};;5llSo1#OOTwzTlBGII zIR+aUq>zLJ1r=;Uhl4m(lXlkGmuUEwQ6>+gw}mP=If^KeH%4lOrm9pm(p7qNRK?!^ z@6*<%r@ZOmB+&cnx}W1fa384GT=)0Xb?aw9;03rgTmCZbY4)4+T1$%_1Cbrz@}{LJ z2f)=XF!F54Ty97KO24K79~Zzt9vHj_`q#Z(HP3PW1mw2q7u^AeN5BO2M>hTd3MFU{ z>Bri<00009a7bBm000XT000XT0n*)m`~Uy|)k#D_RCwC$+OZ9TFc3gdgEAAtjgUTp{{mQbmTk)o8tjqjWRoQRiOX4G& zhhbQ4f~*KTtV{f;+mX%VII4M`7h`SPs%e^>Hef4%UDwX@KP5?G(=>gX zf?UhGkI(Sx`~Uy|00000006*0$@AR)N=@;Zo3z%dD2ia3Ahk$M-Wu=_8DoN({;QVA zYf?Fq&a&+Cw?Jz6JTCVpgfn^m3jhEB000000001XxdV7vZj~d=@Sgwx002ovPDHLk FV1oQDFbDtu literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_antennas.rsi/slick.png b/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_antennas.rsi/slick.png new file mode 100644 index 0000000000000000000000000000000000000000..f1e856667cdba877cc9e0704e428fcb13e6cf4f7 GIT binary patch literal 656 zcmV;B0&o3^P)aTcu(v9aIo;$WX!9hqi)Mm*h2Rg(M9xDN&&ow5`bYkJd;XFtNAr4 z_zoXJ7^a+)nQbj)7jx(uKabQ+@emiYy7zUAP(igB;OirvVHS6Y=ZVu>jwN`Hc!-tc z0`UoPjMD{)Z-uUS{3f{Q@t0tp%PatXF;gnGvC_t@#0}y};;5llSo1#OOTwzTlBGII zIR+aUq>zLJ1r=;Uhl4m(lXlkGmuUEwQ6>+gw}mP=If^KeH%4lOrm9pm(p7qNRK?!^ z@6*<%r@ZOmB+&cnx}W1fa384GT=)0Xb?aw9;03rgTmCZbY4)4+T1$%_1Cbrz@}{LJ z2f)=XF!F54Ty97KO24K79~Zzt9vHj_`q#Z(HP3PW1mw2q7u^AeN5BO2M>hTd3MFU{ z>Bri<00009a7bBm000XT000XT0n*)m`~Uy|#z{m$RCwC$+QA8gFc5{|WD5vbgC&>- zEXpc!wGLab0aJoC1k!-Z3#`{Qtmq>D2VtCm%tVh9V}L62Ja1ax_MTe5n5JnjsHptP zpKxaVSM3WSgl%0{)AzkquBcr5R~-KC`Tzg`000000000UZXCxg##q+B_W0>fy&iqX z))vte)_Y%`opU92U1#q)uwu@+aTcu(v9aIo;$WX!9hqi)Mm*h2Rg(M9xDN&&ow5`bYkJd;XFtNAr4 z_zoXJ7^a+)nQbj)7jx(uKabQ+@emiYy7zUAP(igB;OirvVHS6Y=ZVu>jwN`Hc!-tc z0`UoPjMD{)Z-uUS{3f{Q@t0tp%PatXF;gnGvC_t@#0}y};;5llSo1#OOTwzTlBGII zIR+aUq>zLJ1r=;Uhl4m(lXlkGmuUEwQ6>+gw}mP=If^KeH%4lOrm9pm(p7qNRK?!^ z@6*<%r@ZOmB+&cnx}W1fa384GT=)0Xb?aw9;03rgTmCZbY4)4+T1$%_1Cbrz@}{LJ z2f)=XF!F54Ty97KO24K79~Zzt9vHj_`q#Z(HP3PW1mw2q7u^AeN5BO2M>hTd3MFU{ z>Bri<00009a7bBm000XT000XT0n*)m`~Uy|(==6Cmg%M1c}=iXyVVi%Z(7{_X8l5vB=LP?j4Fy^`nN30vG04|?z%4A zzTWGW&Ym9t000000000004{GeL9OfBr?OELDd*fY9>?)lvG*@XJpR1KVHkWn&vX6J z0nAB69pY&r5%sIA{^*U%yMPdn3yH`NiO1zoB%42L^D=jMI{*Lx000000001B)eVL; VX`ERbWZ(b*002ovPDHLkV1lX`IG6wc literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/charred_chest.png b/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/charred_chest.png new file mode 100644 index 0000000000000000000000000000000000000000..8981bd797e8020bbfa72c4839eca7eb10d939c6a GIT binary patch literal 1631 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 JtaD0e0sv8Pd#3;Z literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/charred_l_leg.png b/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/charred_l_leg.png new file mode 100644 index 0000000000000000000000000000000000000000..5be58a196c58ac9c162835812e6e4f46a039994b GIT binary patch literal 381 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!8UuVnT-^(NEWkipTU!tYWMpK3 zVnCjOfdP;KB!O%V4GoAOP$iHJ1VCjFmAbmRKm{TqB0xc7V`D`{MIaj}2$Y2=1Ij|g zm6er&vTAB-Kv^IID9h(-zYFLX?UEqBUs7 zIQyWPzg}FiMc~nF6=~ms*Vm8tY*-@o_*$@GL+*@+Tb3yLM4uMfp0r&_BV25LQni9c zxUOC7YL3;xHM^!TdLW%)fyZ}1b zyd=mkn4vU1*2L9AG1o43nVa&AB9#gydt(>JX6L$6!z`!dY4dUuf`a-}y-R|#Q#}$h zr>17)#;17I$Ibu#3}{5Rr;B5Vgyh?U?qW?20uBfHo0=OepU)}Y^Z()<{@D+|o=Oj2 zIAv2wVYp(p(c##we#a78tk<{ZTAA!vE!n&@pXc4FV+oS%PcCw7_|o;{qE6E5mL1xy zDO(G}oivwTk@tvuZOL@<`ClD{g0E)gDtyQ9%6583RVZxq_m6gY^rFW@#??+~^-&>7 d`K5K2#cRH^x$iY*v;aDb!PC{xWt~$(69Boxg;xLo literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/charred_r_leg.png b/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/charred_r_leg.png new file mode 100644 index 0000000000000000000000000000000000000000..0ebd96c5dd8dcbc8225a1767a9d9bad3992440bc GIT binary patch literal 387 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/radiant_head.png b/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/radiant_head.png new file mode 100644 index 0000000000000000000000000000000000000000..5a19d265775b92dfa843b4ad39589a4483d5d325 GIT binary patch literal 557 zcmV+|0@D47P)aTcu(v9aIo;$WX!9hqi)Mm*h2Rg(M9xDN&&ow5`bYkJd;XFtNAr4 z_zoXJ7^a+)nQbj)7jx(uKabQ+@emiYy7zUAP(igB;OirvVHS6Y=ZVu>jwN`Hc!-tc z0`UoPjMD{)Z-uUS{3f{Q@t0tp%PatXF;gnGvC_t@#0}y};;5llSo1#OOTwzTlBGII zIR+aUq>zLJ1r=;Uhl4m(lXlkGmuUEwQ6>+gw}mP=If^KeH%4lOrm9pm(p7qNRK?!^ z@6*<%r@ZOmB+&cnx}W1fa384GT=)0Xb?aw9;03rgTmCZbY4)4+T1$%_1Cbrz@}{LJ z2f)=XF!F54Ty97KO24K79~Zzt9vHj_`q#Z(HP3PW1mw2q7u^AeN5BO2M>hTd3MFU{ z>Bri<00009a7bBm000XT000XT0n*)m`~Uy|V@X6oRCwC$*|814APfXRScC!TnSx1J zi$#cN(g!I)3U|Hzmh8?U030l?7S>uvN-6Z-Ln$SGJ^1eYdx)Le+no;p000000Kjo_ v&f||+kF?gtn?L*6duBK{000000DuJ-2SpaTcu(v9aIo;$WX!9hqi)Mm*h2Rg(M9xDN&&ow5`bYkJd;XFtNAr4 z_zoXJ7^a+)nQbj)7jx(uKabQ+@emiYy7zUAP(igB;OirvVHS6Y=ZVu>jwN`Hc!-tc z0`UoPjMD{)Z-uUS{3f{Q@t0tp%PatXF;gnGvC_t@#0}y};;5llSo1#OOTwzTlBGII zIR+aUq>zLJ1r=;Uhl4m(lXlkGmuUEwQ6>+gw}mP=If^KeH%4lOrm9pm(p7qNRK?!^ z@6*<%r@ZOmB+&cnx}W1fa384GT=)0Xb?aw9;03rgTmCZbY4)4+T1$%_1Cbrz@}{LJ z2f)=XF!F54Ty97KO24K79~Zzt9vHj_`q#Z(HP3PW1mw2q7u^AeN5BO2M>hTd3MFU{ z>Bri<00009a7bBm000XT000XT0n*)m`~Uy|_DMuRRCwC$+A#`)Fcik|G;|hMaq~zX z!$Wurui+WoJc)?lE>4!OU~wzr3pDos1HmO9F(%L9=^Ow6000yrmm7~0<7GRpDXm+a)vHg=Iae1D*x~?zn0*zPBvMj-lf%yWIW%=m3?tMSc^QEkP zyz-PwVU1x2^nJfsPc~#B^ww`l1#lck^NEJ41K#@l55r(m0FQ;RD2iZp!2Ag8pTMgH z@K^}fbv4Ta0000000000|LYbVSGCOc-l5uZXF5pFJ1l@6I!)8h{Tcoa3!rwK+Go0A m`a8v3RaKh<00000;Hww-|9KOjM|k4^0000aTcu(v9aIo;$WX!9hqi)Mm*h2Rg(M9xDN&&ow5`bYkJd;XFtNAr4 z_zoXJ7^a+)nQbj)7jx(uKabQ+@emiYy7zUAP(igB;OirvVHS6Y=ZVu>jwN`Hc!-tc z0`UoPjMD{)Z-uUS{3f{Q@t0tp%PatXF;gnGvC_t@#0}y};;5llSo1#OOTwzTlBGII zIR+aUq>zLJ1r=;Uhl4m(lXlkGmuUEwQ6>+gw}mP=If^KeH%4lOrm9pm(p7qNRK?!^ z@6*<%r@ZOmB+&cnx}W1fa384GT=)0Xb?aw9;03rgTmCZbY4)4+T1$%_1Cbrz@}{LJ z2f)=XF!F54Ty97KO24K79~Zzt9vHj_`q#Z(HP3PW1mw2q7u^AeN5BO2M>hTd3MFU{ z>Bri<00009a7bBm000XT000XT0n*)m`~Uy|v`IukRCwC$+A#`*Fc1aM=mo4jmk0AC zUPG|)5H@0KAr^v5gzXn~WwX53Ose@|l5#=-000000N`^?)9iiU@3DS6r)}F?bMm_y zt?QcP<6Ry=UDtb26rt<7P*qj-&CACAF(>B5+@Bc0JkMd?+2enOt|0Nx7|%d&)F7*6%bQ~$zO7bcP)fQ5;R YUVH*%{Z-2@x&QzG07*qoM6N<$f~f~4asU7T literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/radiant_r_arm.png b/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/radiant_r_arm.png new file mode 100644 index 0000000000000000000000000000000000000000..72dfcfde064c7b058592e6269ea9f98883553a25 GIT binary patch literal 702 zcmV;v0zv(WP)aTcu(v9aIo;$WX!9hqi)Mm*h2Rg(M9xDN&&ow5`bYkJd;XFtNAr4 z_zoXJ7^a+)nQbj)7jx(uKabQ+@emiYy7zUAP(igB;OirvVHS6Y=ZVu>jwN`Hc!-tc z0`UoPjMD{)Z-uUS{3f{Q@t0tp%PatXF;gnGvC_t@#0}y};;5llSo1#OOTwzTlBGII zIR+aUq>zLJ1r=;Uhl4m(lXlkGmuUEwQ6>+gw}mP=If^KeH%4lOrm9pm(p7qNRK?!^ z@6*<%r@ZOmB+&cnx}W1fa384GT=)0Xb?aw9;03rgTmCZbY4)4+T1$%_1Cbrz@}{LJ z2f)=XF!F54Ty97KO24K79~Zzt9vHj_`q#Z(HP3PW1mw2q7u^AeN5BO2M>hTd3MFU{ z>Bri<00009a7bBm000XT000XT0n*)m`~Uy|^hrcPRCwC$+A#`)Fcik|Sh_j6cq}JR z;c+~NgLnh?9Ku=L1qV}}kkX|zL1}&V|C<~{K0cG@5RCx<004kDx~_9q&3g-ZSf1yq zUYO(!E#YGU%d(htT~!qzc_sJm0_wVUS(cf3o=wvaTcu(v9aIo;$WX!9hqi)Mm*h2Rg(M9xDN&&ow5`bYkJd;XFtNAr4 z_zoXJ7^a+)nQbj)7jx(uKabQ+@emiYy7zUAP(igB;OirvVHS6Y=ZVu>jwN`Hc!-tc z0`UoPjMD{)Z-uUS{3f{Q@t0tp%PatXF;gnGvC_t@#0}y};;5llSo1#OOTwzTlBGII zIR+aUq>zLJ1r=;Uhl4m(lXlkGmuUEwQ6>+gw}mP=If^KeH%4lOrm9pm(p7qNRK?!^ z@6*<%r@ZOmB+&cnx}W1fa384GT=)0Xb?aw9;03rgTmCZbY4)4+T1$%_1Cbrz@}{LJ z2f)=XF!F54Ty97KO24K79~Zzt9vHj_`q#Z(HP3PW1mw2q7u^AeN5BO2M>hTd3MFU{ z>Bri<00009a7bBm000XT000XT0n*)m`~Uy|o=HSORCwC$+OZ9TFc1aMBMZ>77Q3;B zCt(aEBnCiKM2?gJY#JwiuW{qz`|CPi1ONa4002NIhLX!ErF)vD*!Ml=c^+DM#FJdF z-Y1}_fZXo7t}%{dEX#7Y@PM2n=gGNhrm}bfj^l{yx;|$Mp62Pk000000001>4^>MJ z--U#%wPlG?RSOc^w#9j#)qnCoU%)?oNq1iWy?XaTcu(v9aIo;$WX!9hqi)Mm*h2Rg(M9xDN&&ow5`bYkJd;XFtNAr4 z_zoXJ7^a+)nQbj)7jx(uKabQ+@emiYy7zUAP(igB;OirvVHS6Y=ZVu>jwN`Hc!-tc z0`UoPjMD{)Z-uUS{3f{Q@t0tp%PatXF;gnGvC_t@#0}y};;5llSo1#OOTwzTlBGII zIR+aUq>zLJ1r=;Uhl4m(lXlkGmuUEwQ6>+gw}mP=If^KeH%4lOrm9pm(p7qNRK?!^ z@6*<%r@ZOmB+&cnx}W1fa384GT=)0Xb?aw9;03rgTmCZbY4)4+T1$%_1Cbrz@}{LJ z2f)=XF!F54Ty97KO24K79~Zzt9vHj_`q#Z(HP3PW1mw2q7u^AeN5BO2M>hTd3MFU{ z>Bri<00009a7bBm000XT000XT0n*)m`~Uy|+DSw~RCwC$+QAjVAPj)v!W8Vu9E{O* zn1d~zWSLU_e|UY*&~w_1kZR2~1=6JXhe$z_69P`xR({tj2`Ic~*j%e9muMQ~d# zdG-JR00000006L~5iaTcu(v9aIo;$WX!9hqi)Mm*h2Rg(M9xDN&&ow5`bYkJd;XFtNAr4 z_zoXJ7^a+)nQbj)7jx(uKabQ+@emiYy7zUAP(igB;OirvVHS6Y=ZVu>jwN`Hc!-tc z0`UoPjMD{)Z-uUS{3f{Q@t0tp%PatXF;gnGvC_t@#0}y};;5llSo1#OOTwzTlBGII zIR+aUq>zLJ1r=;Uhl4m(lXlkGmuUEwQ6>+gw}mP=If^KeH%4lOrm9pm(p7qNRK?!^ z@6*<%r@ZOmB+&cnx}W1fa384GT=)0Xb?aw9;03rgTmCZbY4)4+T1$%_1Cbrz@}{LJ z2f)=XF!F54Ty97KO24K79~Zzt9vHj_`q#Z(HP3PW1mw2q7u^AeN5BO2M>hTd3MFU{ z>Bri<00009a7bBm000XT000XT0n*)m`~Uy|yh%hsRCwC$+OZ9TFc1L1gee$~Em(sw z=$Ve%kqb+NB2uvQ@8V8E$Zq_8W19ch3xMbLeJ{~#ZrfIVjsG$A2C^*6J96{ux|VsK zzvk+=&ZnGs8~2>TQ^#?XA+AAK_HT)=Pe$TXPJ5KZr~d!}0000003c9yZLrk@uW^LM zR2R>z3Enr_VyW-cVrgVjT3aTcu(v9aIo;$WX!9hqi)Mm*h2Rg(M9xDN&&ow5`bYkJd;XFtNAr4 z_zoXJ7^a+)nQbj)7jx(uKabQ+@emiYy7zUAP(igB;OirvVHS6Y=ZVu>jwN`Hc!-tc z0`UoPjMD{)Z-uUS{3f{Q@t0tp%PatXF;gnGvC_t@#0}y};;5llSo1#OOTwzTlBGII zIR+aUq>zLJ1r=;Uhl4m(lXlkGmuUEwQ6>+gw}mP=If^KeH%4lOrm9pm(p7qNRK?!^ z@6*<%r@ZOmB+&cnx}W1fa384GT=)0Xb?aw9;03rgTmCZbY4)4+T1$%_1Cbrz@}{LJ z2f)=XF!F54Ty97KO24K79~Zzt9vHj_`q#Z(HP3PW1mw2q7u^AeN5BO2M>hTd3MFU{ z>Bri<00009a7bBm000XT000XT0n*)m`~Uy|QAtEWRCwC$*uf0|AP597hGqX1)De8B zf!Ge933u`^0ssKufXp17&V}N2RecK(1D1TZaTcu(v9aIo;$WX!9hqi)Mm*h2Rg(M9xDN&&ow5`bYkJd;XFtNAr4 z_zoXJ7^a+)nQbj)7jx(uKabQ+@emiYy7zUAP(igB;OirvVHS6Y=ZVu>jwN`Hc!-tc z0`UoPjMD{)Z-uUS{3f{Q@t0tp%PatXF;gnGvC_t@#0}y};;5llSo1#OOTwzTlBGII zIR+aUq>zLJ1r=;Uhl4m(lXlkGmuUEwQ6>+gw}mP=If^KeH%4lOrm9pm(p7qNRK?!^ z@6*<%r@ZOmB+&cnx}W1fa384GT=)0Xb?aw9;03rgTmCZbY4)4+T1$%_1Cbrz@}{LJ z2f)=XF!F54Ty97KO24K79~Zzt9vHj_`q#Z(HP3PW1mw2q7u^AeN5BO2M>hTd3MFU{ z>Bri<00009a7bBm000XT000XT0n*)m`~Uy|QAtEWRCwC$+R+KXFbD;}kfq(i4V*Qd zA*Dz{?-mdq`t=+G000000AN#9t&TYnv82smy4SMn+yDRo00000j_^fEI&TjlGd0D( d=WPaf>jAhG5?Z!v$O!-d002ovPDHLkV1gv0>xuvX literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/spotted_r_arm.png b/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/spotted_r_arm.png new file mode 100644 index 0000000000000000000000000000000000000000..a83a50ec9799fb185cc77f0c28037a55812dfaf9 GIT binary patch literal 520 zcmV+j0{8uiP)aTcu(v9aIo;$WX!9hqi)Mm*h2Rg(M9xDN&&ow5`bYkJd;XFtNAr4 z_zoXJ7^a+)nQbj)7jx(uKabQ+@emiYy7zUAP(igB;OirvVHS6Y=ZVu>jwN`Hc!-tc z0`UoPjMD{)Z-uUS{3f{Q@t0tp%PatXF;gnGvC_t@#0}y};;5llSo1#OOTwzTlBGII zIR+aUq>zLJ1r=;Uhl4m(lXlkGmuUEwQ6>+gw}mP=If^KeH%4lOrm9pm(p7qNRK?!^ z@6*<%r@ZOmB+&cnx}W1fa384GT=)0Xb?aw9;03rgTmCZbY4)4+T1$%_1Cbrz@}{LJ z2f)=XF!F54Ty97KO24K79~Zzt9vHj_`q#Z(HP3PW1mw2q7u^AeN5BO2M>hTd3MFU{ z>Bri<00009a7bBm000XT000XT0n*)m`~Uy|K1oDDRCwC$*f9+N00;vx#LmA3aKKM! z6)f3!r~&{0SR`pVF@2eF4)SSUUH||9008*K?_Kj)0RR91aMA#7y%*Zx$|-RG0000< KMNUMnLSTX#b>a>H literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/spotted_r_leg.png b/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/spotted_r_leg.png new file mode 100644 index 0000000000000000000000000000000000000000..27e6854260f94e899596adfe9490d754123edafd GIT binary patch literal 537 zcmV+!0_OdRP)aTcu(v9aIo;$WX!9hqi)Mm*h2Rg(M9xDN&&ow5`bYkJd;XFtNAr4 z_zoXJ7^a+)nQbj)7jx(uKabQ+@emiYy7zUAP(igB;OirvVHS6Y=ZVu>jwN`Hc!-tc z0`UoPjMD{)Z-uUS{3f{Q@t0tp%PatXF;gnGvC_t@#0}y};;5llSo1#OOTwzTlBGII zIR+aUq>zLJ1r=;Uhl4m(lXlkGmuUEwQ6>+gw}mP=If^KeH%4lOrm9pm(p7qNRK?!^ z@6*<%r@ZOmB+&cnx}W1fa384GT=)0Xb?aw9;03rgTmCZbY4)4+T1$%_1Cbrz@}{LJ z2f)=XF!F54Ty97KO24K79~Zzt9vHj_`q#Z(HP3PW1mw2q7u^AeN5BO2M>hTd3MFU{ z>Bri<00009a7bBm000XT000XT0n*)m`~Uy|Pf0{URCwC$+Pe(^AP5COq$s}>d_hi00000z(Q4x6Z?vYVLE)eZl|6l00000008ii+k?rzQ=FMn*>8DC b0bVcx$z2j!Pp_AV00000NkvXXu0mjfqs{Eg literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/stripes_chest.png b/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/stripes_chest.png new file mode 100644 index 0000000000000000000000000000000000000000..29b41970dce883e15c5a944c89304a7076063236 GIT binary patch literal 656 zcmV;B0&o3^P)aTcu(v9aIo;$WX!9hqi)Mm*h2Rg(M9xDN&&ow5`bYkJd;XFtNAr4 z_zoXJ7^a+)nQbj)7jx(uKabQ+@emiYy7zUAP(igB;OirvVHS6Y=ZVu>jwN`Hc!-tc z0`UoPjMD{)Z-uUS{3f{Q@t0tp%PatXF;gnGvC_t@#0}y};;5llSo1#OOTwzTlBGII zIR+aUq>zLJ1r=;Uhl4m(lXlkGmuUEwQ6>+gw}mP=If^KeH%4lOrm9pm(p7qNRK?!^ z@6*<%r@ZOmB+&cnx}W1fa384GT=)0Xb?aw9;03rgTmCZbY4)4+T1$%_1Cbrz@}{LJ z2f)=XF!F54Ty97KO24K79~Zzt9vHj_`q#Z(HP3PW1mw2q7u^AeN5BO2M>hTd3MFU{ z>Bri<00009a7bBm000XT000XT0n*)m`~Uy|#z{m$RCwC$+QAKiKoA8`pc+b|9Lk|2 zxp$;gE%3IG5AIGys-8{4)W(zUMZqG_7N@4BuV`o5p;EsrRh zI=st2D*LHK3Y&*d59nyo`HK?S!@r!rd0fUZypCfUyRk%>`@b8Ve=iaF0*lTE00000 z002&6{+<38J5+muZ=a@z$iwgLQ0)m$>nPJ&OoYb{TOUHT=kQaBh$)!wBxUQdwvMv4 qw{!I2U-bwZ$DHAz2L%A&Ph0>;U#piOFM-hj0000aTcu(v9aIo;$WX!9hqi)Mm*h2Rg(M9xDN&&ow5`bYkJd;XFtNAr4 z_zoXJ7^a+)nQbj)7jx(uKabQ+@emiYy7zUAP(igB;OirvVHS6Y=ZVu>jwN`Hc!-tc z0`UoPjMD{)Z-uUS{3f{Q@t0tp%PatXF;gnGvC_t@#0}y};;5llSo1#OOTwzTlBGII zIR+aUq>zLJ1r=;Uhl4m(lXlkGmuUEwQ6>+gw}mP=If^KeH%4lOrm9pm(p7qNRK?!^ z@6*<%r@ZOmB+&cnx}W1fa384GT=)0Xb?aw9;03rgTmCZbY4)4+T1$%_1Cbrz@}{LJ z2f)=XF!F54Ty97KO24K79~Zzt9vHj_`q#Z(HP3PW1mw2q7u^AeN5BO2M>hTd3MFU{ z>Bri<00009a7bBm000XT000XT0n*)m`~Uy|pGibPRCwC$+RX`sFc1b%V>M}IJ4iW} zlaegJK3oR&;K79@>rcSaTcu(v9aIo;$WX!9hqi)Mm*h2Rg(M9xDN&&ow5`bYkJd;XFtNAr4 z_zoXJ7^a+)nQbj)7jx(uKabQ+@emiYy7zUAP(igB;OirvVHS6Y=ZVu>jwN`Hc!-tc z0`UoPjMD{)Z-uUS{3f{Q@t0tp%PatXF;gnGvC_t@#0}y};;5llSo1#OOTwzTlBGII zIR+aUq>zLJ1r=;Uhl4m(lXlkGmuUEwQ6>+gw}mP=If^KeH%4lOrm9pm(p7qNRK?!^ z@6*<%r@ZOmB+&cnx}W1fa384GT=)0Xb?aw9;03rgTmCZbY4)4+T1$%_1Cbrz@}{LJ z2f)=XF!F54Ty97KO24K79~Zzt9vHj_`q#Z(HP3PW1mw2q7u^AeN5BO2M>hTd3MFU{ z>Bri<00009a7bBm000XT000XT0n*)m`~Uy|m`OxIRCwC$+OZ9UAQT2*ycKW{Ysa8t z95=Fd0;jRH<$}qTmn)RSoZr{*DEJcyc@2aB0001w(_I}nO;Z`i@u=5zt@G{L=G z96-14d+7T<48w3LtFEs(HLu0yf$P=AwJb}i;~n#wH^EQiI@}M{P)aTcu(v9aIo;$WX!9hqi)Mm*h2Rg(M9xDN&&ow5`bYkJd;XFtNAr4 z_zoXJ7^a+)nQbj)7jx(uKabQ+@emiYy7zUAP(igB;OirvVHS6Y=ZVu>jwN`Hc!-tc z0`UoPjMD{)Z-uUS{3f{Q@t0tp%PatXF;gnGvC_t@#0}y};;5llSo1#OOTwzTlBGII zIR+aUq>zLJ1r=;Uhl4m(lXlkGmuUEwQ6>+gw}mP=If^KeH%4lOrm9pm(p7qNRK?!^ z@6*<%r@ZOmB+&cnx}W1fa384GT=)0Xb?aw9;03rgTmCZbY4)4+T1$%_1Cbrz@}{LJ z2f)=XF!F54Ty97KO24K79~Zzt9vHj_`q#Z(HP3PW1mw2q7u^AeN5BO2M>hTd3MFU{ z>Bri<00009a7bBm000XT000XT0n*)m`~Uy|Zb?KzRCwC$+Pe+IAP@jh>=oFAo~f9F zUD$z{sBPg1Y%7UG^j>pU-LJk700000006kJlybDzju}_$vwxyUN-4w`ulP;B>H`1( z000000Q{G2<>BY2NY44nd+(vv`gosxaTcu(v9aIo;$WX!9hqi)Mm*h2Rg(M9xDN&&ow5`bYkJd;XFtNAr4 z_zoXJ7^a+)nQbj)7jx(uKabQ+@emiYy7zUAP(igB;OirvVHS6Y=ZVu>jwN`Hc!-tc z0`UoPjMD{)Z-uUS{3f{Q@t0tp%PatXF;gnGvC_t@#0}y};;5llSo1#OOTwzTlBGII zIR+aUq>zLJ1r=;Uhl4m(lXlkGmuUEwQ6>+gw}mP=If^KeH%4lOrm9pm(p7qNRK?!^ z@6*<%r@ZOmB+&cnx}W1fa384GT=)0Xb?aw9;03rgTmCZbY4)4+T1$%_1Cbrz@}{LJ z2f)=XF!F54Ty97KO24K79~Zzt9vHj_`q#Z(HP3PW1mw2q7u^AeN5BO2M>hTd3MFU{ z>Bri<00009a7bBm000XT000XT0n*)m`~Uy|oJmAMRCwC$*})BiAQT2*a0EAS0yl66 zZjR$dZs5U1oWTibFzwaGG-*oxz6%gI{Ev`#Ap`&b0JxoawmD5x9){tVuj^XY@z)Ew znz=dK?E5~nZ5#G|ucG+p1;moK^PIb`JLcQAg_Kgf-Hnaon7tbS008Rt0HfJ7N@#_Z^8f$<07*qoM6N<$f;BN4 AR{#J2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/stripes_r_leg.png b/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/stripes_r_leg.png new file mode 100644 index 0000000000000000000000000000000000000000..e149af3795ff287f77b915648caa57ce41acc721 GIT binary patch literal 568 zcmV-80>}M{P)aTcu(v9aIo;$WX!9hqi)Mm*h2Rg(M9xDN&&ow5`bYkJd;XFtNAr4 z_zoXJ7^a+)nQbj)7jx(uKabQ+@emiYy7zUAP(igB;OirvVHS6Y=ZVu>jwN`Hc!-tc z0`UoPjMD{)Z-uUS{3f{Q@t0tp%PatXF;gnGvC_t@#0}y};;5llSo1#OOTwzTlBGII zIR+aUq>zLJ1r=;Uhl4m(lXlkGmuUEwQ6>+gw}mP=If^KeH%4lOrm9pm(p7qNRK?!^ z@6*<%r@ZOmB+&cnx}W1fa384GT=)0Xb?aw9;03rgTmCZbY4)4+T1$%_1Cbrz@}{LJ z2f)=XF!F54Ty97KO24K79~Zzt9vHj_`q#Z(HP3PW1mw2q7u^AeN5BO2M>hTd3MFU{ z>Bri<00009a7bBm000XT000XT0n*)m`~Uy|Zb?KzRCwC$+OZLUAPfLNbOkn{XDa4k z7j|GKYCXNPveF8@|0XGtyCii&00000007{wl(Mzfwj=&!uJuWAN-4w`&p4A==K=r# z00000fJrQGnvO?=ob#FY-b1Z*`RW1IH%-?=!WiSz%LDABh#sW!Bf*0J0000aTcu(v9aIo;$WX!9hqi)Mm*h2Rg(M9xDN&&ow5`bYkJd;XFtNAr4 z_zoXJ7^a+)nQbj)7jx(uKabQ+@emiYy7zUAP(igB;OirvVHS6Y=ZVu>jwN`Hc!-tc z0`UoPjMD{)Z-uUS{3f{Q@t0tp%PatXF;gnGvC_t@#0}y};;5llSo1#OOTwzTlBGII zIR+aUq>zLJ1r=;Uhl4m(lXlkGmuUEwQ6>+gw}mP=If^KeH%4lOrm9pm(p7qNRK?!^ z@6*<%r@ZOmB+&cnx}W1fa384GT=)0Xb?aw9;03rgTmCZbY4)4+T1$%_1Cbrz@}{LJ z2f)=XF!F54Ty97KO24K79~Zzt9vHj_`q#Z(HP3PW1mw2q7u^AeN5BO2M>hTd3MFU{ z>Bri<00009a7bBm000XT000XT0n*)m`~Uy}t4TybRCwC$nq7`WKoG}~xrIYWTtebe z;s%~vLR`X=8%R7lhQuM9!)|S+Hod*9MR&E``TvqhYl^Ba^&yPs0RR910D#xTKO)>T z%|hcij$YfgKF!Or^oycc;yC`0p}8$%Sr6;q+izUCx=o8$$2B>dc2rfh@Xxy5uIs*B zoRx0Pb$OGJE{;SsGIblQIbchXy5FV)^u_P(-{bKcp*+uhUSM60000000000005BsCb)))m!XfV7f92Th9wL`PwEvpEqtD5FNz|!URSpzBSF=* zWsh|y=*s%O7juBFYt0^!6yQ5SX^>@^*cYN<7<_WV`*@!exI-Znx5s4%Fl9q<<>Y4v zaEfyqB#YmjbUQc1l+IIKKrJ>-9!3-=Ow;r^m;SE;00000z@O#~W%@X-8}MZX00000 LNkvXXu0mjfQSF{> literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/toxic_head.png b/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/toxic_head.png new file mode 100644 index 0000000000000000000000000000000000000000..d3400bf0e1d00f604f6c9dcae9c7ff3cc27c02d2 GIT binary patch literal 743 zcmV?P)aTcu(v9aIo;$WX!9hqi)Mm*h2Rg(M9xDN&&ow5`bYkJd;XFtNAr4 z_zoXJ7^a+)nQbj)7jx(uKabQ+@emiYy7zUAP(igB;OirvVHS6Y=ZVu>jwN`Hc!-tc z0`UoPjMD{)Z-uUS{3f{Q@t0tp%PatXF;gnGvC_t@#0}y};;5llSo1#OOTwzTlBGII zIR+aUq>zLJ1r=;Uhl4m(lXlkGmuUEwQ6>+gw}mP=If^KeH%4lOrm9pm(p7qNRK?!^ z@6*<%r@ZOmB+&cnx}W1fa384GT=)0Xb?aw9;03rgTmCZbY4)4+T1$%_1Cbrz@}{LJ z2f)=XF!F54Ty97KO24K79~Zzt9vHj_`q#Z(HP3PW1mw2q7u^AeN5BO2M>hTd3MFU{ z>Bri<00009a7bBm000XT000XT0n*)m`~Uy}9Z5t%RCwC$*+GhfFcg4cQ+ftnh?nvV zuJjP%A#~*p1drk+#Dy-sK*xkpM4H-!i5=+wLC_>M@5M+r&+`BPz&o0zQSH_Ir{bUG zrgJm-@ia}URaK>(cS#pt_SZR6!t{Z%EFViC5d?wir)j#4XIUm(e}%{R(m0Nu@B3Eq zZ>A6Y26@P!UDv6xJkKxL{ImG-D*Lwat&^6UUhj*d5Lf>neL6k>000000002McWB%8 zJ9Db*TDAYmCO@O%Xy5mzr{MA=-dX=F$D_Mx67xK3=i)ftP9jN?KR?}deVg2LjH{|^ zRd!#IUB=WkiXt_)Y+g9}#I@@`%gf0N*asVi!3)E18^5Ydy)TXLbD&HP000000000d ZegL_gpI*fdW%mF8002ovPDHLkV1f=xTVVhI literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/toxic_l_arm.png b/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/toxic_l_arm.png new file mode 100644 index 0000000000000000000000000000000000000000..f74ffaae9d4816d3676c395edaef31cb2ac1aaa2 GIT binary patch literal 569 zcmV-90>=G`P)aTcu(v9aIo;$WX!9hqi)Mm*h2Rg(M9xDN&&ow5`bYkJd;XFtNAr4 z_zoXJ7^a+)nQbj)7jx(uKabQ+@emiYy7zUAP(igB;OirvVHS6Y=ZVu>jwN`Hc!-tc z0`UoPjMD{)Z-uUS{3f{Q@t0tp%PatXF;gnGvC_t@#0}y};;5llSo1#OOTwzTlBGII zIR+aUq>zLJ1r=;Uhl4m(lXlkGmuUEwQ6>+gw}mP=If^KeH%4lOrm9pm(p7qNRK?!^ z@6*<%r@ZOmB+&cnx}W1fa384GT=)0Xb?aw9;03rgTmCZbY4)4+T1$%_1Cbrz@}{LJ z2f)=XF!F54Ty97KO24K79~Zzt9vHj_`q#Z(HP3PW1mw2q7u^AeN5BO2M>hTd3MFU{ z>Bri<00009a7bBm000XT000XT0n*)m`~Uy|Z%IT!RCwC$*+B}xAPfXR?Z?HJw^yO3 zf&tUaJRqPOgJ^320Kg7oj5|}^t9oEI;Pj&q)%rRhGWFf5Mb%9+sUzzff*F!JzV&TD z;+r4<00000mGnO>Vtq27bM{gR`Y*r?cpZasa{vGU0KRzuuZS{B^xM*)00000NkvXX Hu0mjfCBpn- literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/toxic_l_leg.png b/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/toxic_l_leg.png new file mode 100644 index 0000000000000000000000000000000000000000..fbcd1237d79913b045ab0b91c5a185e515bf8524 GIT binary patch literal 540 zcmV+%0^|LOP)aTcu(v9aIo;$WX!9hqi)Mm*h2Rg(M9xDN&&ow5`bYkJd;XFtNAr4 z_zoXJ7^a+)nQbj)7jx(uKabQ+@emiYy7zUAP(igB;OirvVHS6Y=ZVu>jwN`Hc!-tc z0`UoPjMD{)Z-uUS{3f{Q@t0tp%PatXF;gnGvC_t@#0}y};;5llSo1#OOTwzTlBGII zIR+aUq>zLJ1r=;Uhl4m(lXlkGmuUEwQ6>+gw}mP=If^KeH%4lOrm9pm(p7qNRK?!^ z@6*<%r@ZOmB+&cnx}W1fa384GT=)0Xb?aw9;03rgTmCZbY4)4+T1$%_1Cbrz@}{LJ z2f)=XF!F54Ty97KO24K79~Zzt9vHj_`q#Z(HP3PW1mw2q7u^AeN5BO2M>hTd3MFU{ z>Bri<00009a7bBm000XT000XT0n*)m`~Uy|Qb|NXRCwC$+B*usFbDw9cyjUN{S1X{ z8QLuNy-6Zy(A6;j000000QiUaqDW>QPh3^8>$9sqSN?vtRR91000000Xkxwu4^P)aTcu(v9aIo;$WX!9hqi)Mm*h2Rg(M9xDN&&ow5`bYkJd;XFtNAr4 z_zoXJ7^a+)nQbj)7jx(uKabQ+@emiYy7zUAP(igB;OirvVHS6Y=ZVu>jwN`Hc!-tc z0`UoPjMD{)Z-uUS{3f{Q@t0tp%PatXF;gnGvC_t@#0}y};;5llSo1#OOTwzTlBGII zIR+aUq>zLJ1r=;Uhl4m(lXlkGmuUEwQ6>+gw}mP=If^KeH%4lOrm9pm(p7qNRK?!^ z@6*<%r@ZOmB+&cnx}W1fa384GT=)0Xb?aw9;03rgTmCZbY4)4+T1$%_1Cbrz@}{LJ z2f)=XF!F54Ty97KO24K79~Zzt9vHj_`q#Z(HP3PW1mw2q7u^AeN5BO2M>hTd3MFU{ z>Bri<00009a7bBm000XT000XT0n*)m`~Uy|aY;l$RCwC$*g*<_AQS}9?Be3dYa1;B z!yuja_QGfU4C1x{002*Ft;dRU?&%jRfK^ui?cDJj(3R%jx8d_SX9++Fjt*e9A{;(% zd;lxI1OWg5002l*dJkN`om*=qIz4~zgmu7u<>Na50002ybONW+GD~ta4x|78002ov JPDHLkV1lnO{S^QJ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/toxic_r_leg.png b/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_parts.rsi/toxic_r_leg.png new file mode 100644 index 0000000000000000000000000000000000000000..bd772bfc0bbc610ada8ff1e7c1375f3d6a50e7bc GIT binary patch literal 532 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 Bk*oj! literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_wings.rsi/honeypot_primary.png b/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_wings.rsi/honeypot_primary.png new file mode 100644 index 0000000000000000000000000000000000000000..d8428597262ee93250a7a85ec11e5738ca77f103 GIT binary patch literal 1064 zcmV+@1lRkCP)aTcu(v9aIo;$WX!9hqi)Mm*h2Rg(M9xDN&&ow5`bYkJd;XFtNAr4 z_zoXJ7^a+)nQbj)7jx(uKabQ+@emiYy7zUAP(igB;OirvVHS6Y=ZVu>jwN`Hc!-tc z0`UoPjMD{)Z-uUS{3f{Q@t0tp%PatXF;gnGvC_t@#0}y};;5llSo1#OOTwzTlBGII zIR+aUq>zLJ1r=;Uhl4m(lXlkGmuUEwQ6>+gw}mP=If^KeH%4lOrm9pm(p7qNRK?!^ z@6*<%r@ZOmB+&cnx}W1fa384GT=)0Xb?aw9;03rgTmCZbY4)4+T1$%_1Cbrz@}{LJ z2f)=XF!F54Ty97KO24K79~Zzt9vHj_`q#Z(HP3PW1mw2q7u^AeN5BO2M>hTd3MFU{ z>Bri<00009a7bBm000ie000ie0hKEb8vpYWc6(Yo+#JqDRW;4WkKh?Lp&M%ql&d%;Q=b1k?*+&RM z2qAyS|t-S79+;c)QlnM_8sS}pk%0qAzSs#>j@^HeG&&gZi^pUq~X)9HNd zClMv{?RHz0%Vlx7T#WhYbZU+$2nyOY!Y#200H(d?d4AoFJdXSQ-UI>dgTX+>b_QVN zv)QajCX;5$>rt0DqK+V--K=XV{Suo1*iCP@+ZpqEDHwO9Qpp72cDtG4ZjS%LPn2fB zdc78_)k+kLMG3PO)EA3|DijJI_ZgWPu-$GS>euU4oK7cme0N{0{sytjW3+8Om&-jE zUM`oa*Xu>{-G&fC2qA9|)^?XoOa1 z#x;0=7kGlVw*h!gK1!$4{&~G#H{aoh!(nJgAKIW1T3>m9x91=vT=VW|KZB0Y=6RkB zy|8*J^JWnL6nJ0000aTcu(v9aIo;$WX!9hqi)Mm*h2Rg(M9xDN&&ow5`bYkJd;XFtNAr4 z_zoXJ7^a+)nQbj)7jx(uKabQ+@emiYy7zUAP(igB;OirvVHS6Y=ZVu>jwN`Hc!-tc z0`UoPjMD{)Z-uUS{3f{Q@t0tp%PatXF;gnGvC_t@#0}y};;5llSo1#OOTwzTlBGII zIR+aUq>zLJ1r=;Uhl4m(lXlkGmuUEwQ6>+gw}mP=If^KeH%4lOrm9pm(p7qNRK?!^ z@6*<%r@ZOmB+&cnx}W1fa384GT=)0Xb?aw9;03rgTmCZbY4)4+T1$%_1Cbrz@}{LJ z2f)=XF!F54Ty97KO24K79~Zzt9vHj_`q#Z(HP3PW1mw2q7u^AeN5BO2M>hTd3MFU{ z>Bri<00009a7bBm000ie000ie0hKEb8vpHs#dG!y}Yw+`|}JCw%aXjHXEu`Dtx=${C25}38hjg@t9v(5x?K> z1NH0mO6T+0l&|`I%pM?gIvq3HUcFE#1O%_wYc&`QKGy)(1lA^m+O>Gn;uGshy#dS| zYU_5pp~il{AE`yD%*`H>erXhckHq>YG)jEPfO|X>blL|7o=&H! z6)v&ePgI=!;OQP9sV*kSfU@?*h%BuC(P(5YPI!BPEM3v^Y-#uzAeWG2#x2V-Desve z18U){f67h&)E>BdvDvn*mHuWki~8)jn6!~uPqXM(hzVXch$;9}0{{RI Z`~Yt$?L1h5A&dY3002ovPDHLkV1m4$waEYg literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_wings.rsi/meta.json b/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_wings.rsi/meta.json new file mode 100644 index 000000000000..b7f59a8231af --- /dev/null +++ b/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_wings.rsi/meta.json @@ -0,0 +1,47 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Concepts by: https://github.com/ElusiveCoin", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "default", + "directions": 4 + }, + { + "name": "smooth", + "directions": 4 + }, + { + "name": "honeypot_primary", + "directions": 4 + }, + { + "name": "honeypot_secondary", + "directions": 4 + }, + { + "name": "stubby", + "directions": 4 + }, + { + "name": "bee_primary", + "directions": 4 + }, + { + "name": "bee_secondary", + "directions": 4 + }, + { + "name": "firefly_primary", + "directions": 4 + }, + { + "name": "firefly_secondary", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_wings.rsi/smooth.png b/Resources/Textures/_DV/Mobs/Customization/Chitinid/chitinid_wings.rsi/smooth.png new file mode 100644 index 0000000000000000000000000000000000000000..bd0bbec36f34ddf9d00f4ceee9981580250be252 GIT binary patch literal 1128 zcmV-u1eg1XP)aTcu(v9aIo;$WX!9hqi)Mm*h2Rg(M9xDN&&ow5`bYkJd;XFtNAr4 z_zoXJ7^a+)nQbj)7jx(uKabQ+@emiYy7zUAP(igB;OirvVHS6Y=ZVu>jwN`Hc!-tc z0`UoPjMD{)Z-uUS{3f{Q@t0tp%PatXF;gnGvC_t@#0}y};;5llSo1#OOTwzTlBGII zIR+aUq>zLJ1r=;Uhl4m(lXlkGmuUEwQ6>+gw}mP=If^KeH%4lOrm9pm(p7qNRK?!^ z@6*<%r@ZOmB+&cnx}W1fa384GT=)0Xb?aw9;03rgTmCZbY4)4+T1$%_1Cbrz@}{LJ z2f)=XF!F54Ty97KO24K79~Zzt9vHj_`q#Z(HP3PW1mw2q7u^AeN5BO2M>hTd3MFU{ z>Bri<00009a7bBm000XT000XT0n*)m`~Uy~o=HSORCwC$nmeoNKoG|_;#)-REv#(B zMl7tvQa_H5*2>n$$I;r#!cMGgL@g8r-)}L8|6VpE8gtPLm&7waSTb3YocYgAb`RNM zj35YtAP9mW2!bGf9g-EDuGj1Ge!o}FeLf#66bjO>2tcJ$kyEJ@w_Pq5JD<rU`q_VrjK^c%Z^laTcu(v9aIo;$WX!9hqi)Mm*h2Rg(M9xDN&&ow5`bYkJd;XFtNAr4 z_zoXJ7^a+)nQbj)7jx(uKabQ+@emiYy7zUAP(igB;OirvVHS6Y=ZVu>jwN`Hc!-tc z0`UoPjMD{)Z-uUS{3f{Q@t0tp%PatXF;gnGvC_t@#0}y};;5llSo1#OOTwzTlBGII zIR+aUq>zLJ1r=;Uhl4m(lXlkGmuUEwQ6>+gw}mP=If^KeH%4lOrm9pm(p7qNRK?!^ z@6*<%r@ZOmB+&cnx}W1fa384GT=)0Xb?aw9;03rgTmCZbY4)4+T1$%_1Cbrz@}{LJ z2f)=XF!F54Ty97KO24K79~Zzt9vHj_`q#Z(HP3PW1mw2q7u^AeN5BO2M>hTd3MFU{ z>Bri<00009a7bBm000XT000XT0n*)m`~Uy}`$EHe~=(9f4+pH)fpAXLAUufS%yw(37AXCTMfUv;BVG{8d1c33fxd_I@< zXf(27BW1hYitfc?A?+XtN_7|R4aRXS9ZV*Zv=ifO6h%(mM?c%f;Gv=f*PiF)w3pTg zAb5Z+>Ff0>*R$D7)%jI`HfRLUZ0ZF}EJe6wqn|ZGr&MZ!4L~b2KL`FCTWJR1kL&e1 zZKLP_7wz$UEXfU&R3wZFSSd{0+Dmvv4FO#nukG}QnA literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Species/Chitinid/parts.rsi/full.png b/Resources/Textures/_DV/Mobs/Species/Chitinid/parts.rsi/full.png new file mode 100644 index 0000000000000000000000000000000000000000..6d5e167c553e980737a7985a2fef7243eff0f254 GIT binary patch literal 1253 zcmV@AxIU67K(y6N(H-Ahqi)Mm*kqXLXw6{iWFDD#i8IJ zy7+7GKhRZhRS*P45OH<&*CHjpYYHvWzHoUTzW2V5yLW&;tuw>!NdSiF@JuQxt>)LH z;5&Q>VFcrd$jr8uvWq!%jh{!Vrg(^pUft_D#y~-}8Q|+9o@Ewyi06sZTaG1ok9e4s zE@~=<%0ep35u%e$i7Zwz1O2ti%oCDdMQ1S6K5r;wB;0T**=% zr8Nc{8KjVe1O*jrLWhGmWs_#s*_UYemQf}TqrZhJI5~bjp3KyV+Z*If7a)OG7;K;Q+qHe3EO&1vqN^jb@c9s}VW;PR%W zDF?vSE)aRPWG*+P04=|!0UsB@U>+E{2m05&SvB`@{siQ<>51-u!y{ml>cbm<_St9# zlr7a&00009a7bBm000XT000XT0n*)m`~Uz08%ab#R9M5smc36?Q53+>v#%5yQ#43T zNr(vx1Bu~dfJ8$agvG$5VL%y}TpV2dBV1jaSd@V{f(vmlL=zZ<#1Io2Vh|Dck$d%MB36&zJ@#BTD7jot!r{v@Hul^( zt}{CN%uA<#NgxoAgM+M0OuTe_$-waNll;Xg86SV)q*A+*N+pf4+8FZ5&Qiuh5eA1b01&XQ!p~}RO?=Vm47Z{h%q`H0H4)((Iz|z zsC6vX{0~2oSd;1LH%?VE(9?4_KNZ`?*m2|Vkyp(DE^lw|F{9Vq++ujS+=0Q+@R4_P z-1dBTK#ga!hjkAIgTiJE1YCom0px9MU1d2@vNA%r>1l{sn_fP(D0F?hd$>xUvUO%YC@*5STwb@VY_^Ynmqv4 zrGy+k^f~9tBBGH72OrAT)^|f=l-d(D&!CjjW7 zUzNuw8jaaV89PP}teHXX`(uQWm6f>E*I)D42c-Szj!+CAIeO@G&bJJ386B_2mXaQ>8^K9dr;8nxTqA3q?U3rGj0mLtDYBOY)jDLXw6gMT)E7;!to9 zUHlsS4|Ek=6$C*ML|k3{TBOALnnH`TH@w^*=iPI8?><1t>dbKZQh;H)b}o|^SBq<6 z=p6xsAs~jB#2jlWzgR%e_<5viiiafc)w`~143-p!0f8{_EVFEvc%C@B6E+=?_?GLk&u^T|K7Vnx3%LbA;62512g@DIG}|DaB90q+m9@^pZxT_=l|1D! zTH|n#Lk4MxkWs}Zbht=THfd(veW|8z85Qy{`dg^MCPx_>c@v~osjEU+C0(IUM~%<@ z|2!RaX4>x_Ndx__p7%Kcg!X|(-Sd7=J+E;F1Ydw_v+b|YoaVksueY`MF%aDWE^peJ zd;nbS0;A8CWJ^scNJ~&v;Nt=qDgwjzz`(jctJXfwpMb(PJ<%O-cmzyReRSgw&17fu zQv;wy00009a7bBm000XT000XT0n*)m`~Uy}v`IukRCwC$nm>+$Kp4fpF@}JJiJXDL z#)`y-!mD@&55gI|iUo~{J%x>>4I~s|Y-ar?j9FRTWCj`6?E58#aR|KkzWLJ(L;(D2 zgzbat_4?LcE|<=Yze-u{$={YMm&yV@_nC1qY<4>Cpw?cwA<~R6oK`V zBvEax&tzFPl3;8_t|h5sx10000000000000000000ViScPlnx=e_VHp0nR}_VM-)gn$#cZQZ zS8e$~Tjep;9-10p@hFNY2m;mTdEV`~Jj*hvjr25Ns_^=3kPl`rmy2rGbxr&IUS2&K z6~Xj$Sk7j%yABS|M)=3~7K;TJO7<}NlHbi5TCe?`LgURyd(g!cSN(7}Jp5pyZ&;JH z*+UnGUBc^Sz(yvMiL>xL?T^Q!Dgt}xQUse#P|oM`J7J!VT!77HL(L{AdfEil^yZ~d zmgQ~cX)oLD)>vEE8ktU~G#-zssw&F!yw~8*3eoo9N*@3K0000000000002IgFA00` U2R1k}IRF3v07*qoM6N<$f@RW|5&!@I literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Species/Chitinid/parts.rsi/head_m.png b/Resources/Textures/_DV/Mobs/Species/Chitinid/parts.rsi/head_m.png new file mode 100644 index 0000000000000000000000000000000000000000..c9b9cbb1979df8935a5f167c5c62aebb046f7a4a GIT binary patch literal 898 zcmV-|1AY97P)aQ>8^K9dr;8nxTqA3q?U3rGj0mLtDYBOY)jDLXw6gMT)E7;!to9 zUHlsS4|Ek=6$C*ML|k3{TBOALnnH`TH@w^*=iPI8?><1t>dbKZQh;H)b}o|^SBq<6 z=p6xsAs~jB#2jlWzgR%e_<5viiiafc)w`~143-p!0f8{_EVFEvc%C@B6E+=?_?GLk&u^T|K7Vnx3%LbA;62512g@DIG}|DaB90q+m9@^pZxT_=l|1D! zTH|n#Lk4MxkWs}Zbht=THfd(veW|8z85Qy{`dg^MCPx_>c@v~osjEU+C0(IUM~%<@ z|2!RaX4>x_Ndx__p7%Kcg!X|(-Sd7=J+E;F1Ydw_v+b|YoaVksueY`MF%aDWE^peJ zd;nbS0;A8CWJ^scNJ~&v;Nt=qDgwjzz`(jctJXfwpMb(PJ<%O-cmzyReRSgw&17fu zQv;wy00009a7bBm000XT000XT0n*)m`~Uy}xJg7oRCwC$nmvw!Kp2K+j4?`Kf@iRx zu_B?N@G72xgK!3}VnJhKPhn$8BMAi%nvrj^Lsk|yVUTgnzE5JrG5G#4jK#nh0RI}U zdtwwt?eXDoFmC)+`dm|7bjKPK++g^Z>2n=%*LB%)xn!1Qv7#tgRaNYKJ{u{4^nKr# z$4Z}w<5)|d>xS=QqJ+NiV@sIn7@@GgeKrM!AInVlL>2m7;nh`F@5UBEbsKbf#~Sb* zBWu935=@2vEBXKc000000000000000_)N4m6T&d;9S?%Qi0N1Ab4_uv*=&A%ce~yA zltrlEjkf5~mU)J1&xaZy@$GiYR;!g9TPzmsc6l7fLK&Ip;>+UI-XLwv)^#n9%d%vb z%SALE2bC~%cUbIpyN3Y^Pe$lP-|hE%DoRXn^#%PlX(+w!a|&PH25Ha6n4;FN*K6+s z6H`N)q)i^iFdq|M-3DaDwrykKY1*f0DoY>_V@l9j1cm2$55hDZset40s8(Y>(IP0P zH{A+ZmbEiac{!aDSZF{0000000000008({ Y?%I9#2nE;Q_W%F@07*qoM6N<$f`Gt}%>V!Z literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Species/Chitinid/parts.rsi/l_arm.png b/Resources/Textures/_DV/Mobs/Species/Chitinid/parts.rsi/l_arm.png new file mode 100644 index 0000000000000000000000000000000000000000..48c0a2ee062c53d00e2bb7aceca3692290b97f05 GIT binary patch literal 752 zcmVaTcu(v9aIo;$WX!9hqi)Mm*h2Rg(M9xDN&&ow5`bYkJd;XFtNAr4 z_zoXJ7^a+)nQbj)7jx(uKabQ+@emiYy7zUAP(igB;OirvVHS6Y=ZVu>jwN`Hc!-tc z0`UoPjMD{)Z-uUS{3f{Q@t0tp%PatXF;gnGvC_t@#0}y};;5llSo1#OOTwzTlBGII zIR+aUq>zLJ1r=;Uhl4m(lXlkGmuUEwQ6>+gw}mP=If^KeH%4lOrm9pm(p7qNRK?!^ z@6*<%r@ZOmB+&cnx}W1fa384GT=)0Xb?aw9;03rgTmCZbY4)4+T1$%_1Cbrz@}{LJ z2f)=XF!F54Ty97KO24K79~Zzt9vHj_`q#Z(HP3PW1mw2q7u^AeN5BO2M>hTd3MFU{ z>Bri<00009a7bBm000XT000XT0n*)m`~Uy}CP_p=RCwC$+A)fQKorLDNl2j=@-ALO zJjYza8`uk0g1sjYY;Cl2`DWK9EG%oD;3WTFlcbmreat)|Pv-yt003Ah%W{h;*IeKC zoAt#iPq}AY@7+3ZSr(V)x%1weT(EMKcNX&kq-h$85DW7HG)?2?d3ITry}S#wUOCe= zh1{RxaNPpvtQJLa8-^kL9>?*eynVg$l&kzRkHaM!;BzBv+xEIUz`6lGH$vsF>uOqn zhhZxvK{v1b%d6{J+jO&h3@T5#Q9K2#8sKk@5C8xG00000;J(LY-upvq@9$Cs z{d;_*2#?rrTr&fGYARh-mA>9SY6oaqw2$O9KKt)%GWr5&YP^rmKe`7T9h$yP0g@yM iFH!&i0001hKYaneMWis;c*_g`0000Y-zxQDW zk>mS)r;4pDx!`zI(OI-ztgFewi*e{vX!J~izf!IH$KjdF% z?a<sR(fq5Gz-Vwv$f_VC}YzJL6#wZkciGbL4%8Zvj<%=SB}-5P57rH{dB zg21tkLo(Hd+b6hR|53RltE;``#nrv*lD~+Xwlg*weB{}@)7!><&ds9SgVjfz*Q^og z^zV2)htH!%yX5L~^Mk7M_p^MiDU+Mv;=l9Cu`KD$M&_OBoyp4r6VHC`nC)VcZRuV) z<(h;{%0xFVqmYmdjLdpMQ*>uVrpIr37=1{sQsQrJ$ib6=PBZru25DajUA$)Ux{K)x zw4VK|pVwz+`?S1&NyEMH^S@=-oqjv)eO9@D`Mhv@<|h3ETd#h~zceRpzvud`TW%N% z+-20ukD67*5c8Jl@cC_rrnZSJQGIFkp^%YBq~T!og8Z}dLyP5~`#aRlp7(;!!iGt0 zh25@y>^({8SGjK%9R)@KXMsm#F#`j)5C}6~x?A@L7$Ll#E{-7;x8BY&U5srzM< yt$BJ0vEh54#~j#ws{8Sc*fq1oU;MUvp<~Yc&P(N9fBQO+r#xN#T-G@yGywqNM&oGNS#Ph_dEyohPM?B1m za-R5vILhgO#J56MJbn{g@c2tG&!!guzvw9yT3BgeR^$fpByq&h%dBx8ag(rWu4E{W z(i($}G?GX_f`T$Op~FFpvPm;*?~B)c%P5hD(ceM^oE!xd$r~lLOkGvV8tE#1Ix1rB z|L19I(^Fpea02Llb=}W#Ah-|Is;>Kc>bkWvAn*cQn@xX-<}~+BdbO!Vj)B1);PR%a zDF?vSE->wRBD8s5}lqQ+S@It^1#= zK;;@y0LO8pNx1+300000006)&Wm(Fu>!f=A_g4BbS7Xbvh`#SdmSxs$1!$V)^1FOB zUKB;U-~ZD&nRQ*oIF6TgewwCj%(||(@oz0a9LLtxOFv1H?c;6R-c^7{oB=@)h+!B+ zQ54o~1-N7Xt1I&`3=d_zOy2+VJa6NwEwHEikD&W!3;@6{c>@#wdmb;~mbm}`002ov JPDHLkV1gT zaB^>EX>4U6ba`-PAZ2)IW&i+q+U;0vawInh{jXEx2rUpG9Y-BEd z+5AbByKAhrMnb>?9zALQ^{1yla8ao>6|t&K^}Gh>!sbjj!3c8;65;^39Bk}`y4 z>^OINKK$$PMiu2K#)afK}#yk z3UDgL+1O+GtReCJ)EK!cO`EmaTI(H$c1Z5n-D}6hpuwXI89Hp#(MF#LpIN3% zoi^)iv!_LiS6Q-j*{Z9pzVk*X?XqR-wq1AI-4SZeUR+$=yn6Hgg4#hfeS_Ke$o(9( z{6GzWrGr_)q9Ocr;~f!Pi{ekm6$|2t22HEyec~-_2dSkFxzf zkq7HuYxrJy`r5t-=b<1S?_JkDrsu;ij|`dn=4*Hjht_x=iB%_R4bI*&;PbW?6!Rh0 z!?971jycNS*r1v(P|6CjfxKZLSs!GcMma(#eCBOzF?cZpw5i859M~5c9~7-k7o0pC zr4qOc@HB651VJ<^B%JJOYeVTt`l~@T7V*x!;53LD;%OJyJZ9UdpYWqKAXd<-RnL4w z&lb*iMA9g>I&0`G2tydUUAg&KiP+(A{PtFskbY&{)24Ds8I`o;@go z!)!G~z!g4qpa#2+H)xsdz!{Ff#tkAM0Ud;5jgS(JV~5%_>=*;9rD7Ck^_p-3N61#d z5%QT4F2M95d=AyH-4@bld*lenBw`;y{&r07Cw?;8QrX!?G!)R+$AoZr>;!Zg3tz6| z*{xZi`Z_70r91CmkJR)gWOpBaSph2=9MvW`J5mm+^f3)#GzBIeI0nGC12=pLxVNOh zJO7{rd}d6)E8t7em!SW-pl9y4yHGkxE2;~cWz;AnW0czNz57H7KzTTsfAi~Vy!Y4N{hS7OZ{P)jhC?lm4&ks)z;wck zZ1bUel?3g=IGk*AM!6<18eXfgWkk8htA7I{8!Gx0oP4v3Hc%;G11H8$Aow~>khm+v zMsqFXATmO{1x1ybAz_;;?IIs<&bXlP*p7X8hVEx z;bjcXR$UxF32i&fFK9Ro1OYvFP$~#K8nFv4iqVT*Fe}}5#ZPCimPK>-YFlvJ!@6?i z`Ef6bfXo2|Z2TLyBhpy}9y2Te0007FOGiWiNu`b21^@s632;bRa{vGf5&!@T5&_cP ze*6Fc00(qQO+^Ri0R|2RD7Np_fB*mh+(|@1RA}Dq*u4$HFc5~}*A`OJWrHjcreF#t zNs&p|AYG;)6`3GYB$X+kL4us~ClLCc`p!E0+}wePh=_=Ye3`QXE};NMj&9De*O1Tx zXEV!N0X>k?&AeAfNgyl`{hNvz__sV zxIAw+AX`{Kwp9~EL_|bHME>050R31_v=M8D&-p3CxUcl*8l(j07*qo IM6N<$g0aVLB>(^b literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Species/Chitinid/parts.rsi/meta.json b/Resources/Textures/_DV/Mobs/Species/Chitinid/parts.rsi/meta.json new file mode 100644 index 000000000000..ed5dfd514502 --- /dev/null +++ b/Resources/Textures/_DV/Mobs/Species/Chitinid/parts.rsi/meta.json @@ -0,0 +1,66 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/commit/1d0eadcb126fc3581eed33490f4be2a88157af58, modified by https://github.com/PixelTheKermit", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" + }, + { + "name": "head_f", + "directions": 4 + }, + { + "name": "head_m", + "directions": 4 + }, + { + "name": "l_arm", + "directions": 4 + }, + { + "name": "l_foot", + "directions": 4 + }, + { + "name": "l_hand", + "directions": 4 + }, + { + "name": "l_leg", + "directions": 4 + }, + { + "name": "r_arm", + "directions": 4 + }, + { + "name": "r_foot", + "directions": 4 + }, + { + "name": "r_hand", + "directions": 4 + }, + { + "name": "r_leg", + "directions": 4 + }, + { + "name": "torso_f", + "directions": 4 + }, + { + "name": "torso_m", + "directions": 4 + }, + { + "name": "eyes", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_DV/Mobs/Species/Chitinid/parts.rsi/r_arm.png b/Resources/Textures/_DV/Mobs/Species/Chitinid/parts.rsi/r_arm.png new file mode 100644 index 0000000000000000000000000000000000000000..703756e5c4774f6020869ae4505f636a0a7055cb GIT binary patch literal 758 zcmVaTcu(v9aIo;$WX!9hqi)Mm*h2Rg(M9xDN&&ow5`bYkJd;XFtNAr4 z_zoXJ7^a+)nQbj)7jx(uKabQ+@emiYy7zUAP(igB;OirvVHS6Y=ZVu>jwN`Hc!-tc z0`UoPjMD{)Z-uUS{3f{Q@t0tp%PatXF;gnGvC_t@#0}y};;5llSo1#OOTwzTlBGII zIR+aUq>zLJ1r=;Uhl4m(lXlkGmuUEwQ6>+gw}mP=If^KeH%4lOrm9pm(p7qNRK?!^ z@6*<%r@ZOmB+&cnx}W1fa384GT=)0Xb?aw9;03rgTmCZbY4)4+T1$%_1Cbrz@}{LJ z2f)=XF!F54Ty97KO24K79~Zzt9vHj_`q#Z(HP3PW1mw2q7u^AeN5BO2M>hTd3MFU{ z>Bri<00009a7bBm000XT000XT0n*)m`~Uy}EJ;K`RCwC$+A+>VKp4jHS(UhwljtO_ z-~MbY-NIc3nk z?~N!xa^6}(k|g`Xw{2@g0g_YlN^YI|EuEX@c~(VH7_n6)r{vXTeVTpOb=5RYM!l~j zujJNQ1*ZjcUAJHBx>mmLzrrwl^fr)ul2h`&=f7?6s;VAcfaJS6Nm}oKIF2{Z^VG5| zk6!wcPjX7$TMIY_FU#`L1xUWzCrR4O^L$Iw)QHcZIqP)g)xEA`^cOXU0f8{_470gQJV%__a&5tT#6zsC z6p2rW_?gq=4R6&-)w)Li<3y=6S!To>xBuf-k_e)$(uBoMyjCueG$;F%aDWE^k_z zdH`JQ0>jU?!j*;;q$TM(@NoeQ6oA2dpl{8eRdXNbPe6W~p6CuZJOU=DKDzz~jACci z3)ynT00009a7bBm000XT000XT0n*)m`~Uy|i%CR5RCwC$+93{vFc1aMB5)j`SE%BK zoDYYrsNo28h?0s`tCl4J@t$s)KTX}A5C8xG00000;LAMEZC%&)rc6Cg&iPWN;g`cP z#xRa!o2Dsj+cv!A0a8k>)*6oE81{YlO921?00000xJ&Qk`>w!~8DflWS(d*tT<-Wk joqWHel=8&zx9lpM8J;b~@TFd900000NkvXXu0mjfMcxQ@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Species/Chitinid/parts.rsi/r_hand.png b/Resources/Textures/_DV/Mobs/Species/Chitinid/parts.rsi/r_hand.png new file mode 100644 index 0000000000000000000000000000000000000000..b9f02aa597609c9b405c7b5b737e98fe9446df9d GIT binary patch literal 713 zcmV;)0yh1LP)&$Sv5`ba4b|#e+S95D( z=p6y{K|l}2W#(8**+mH*8S9z z|DUI$%}o2D8tdJq98>z~xO- zQx1TuU0~$dl5M#z1!)PI27FuqgE?U69_U~9XVuup`4b>*(-YkRheyC9)kik|0F@4B z*|PW8;{X5v32;bRa{vGf5&!@T5&_cPe*6Fc0RBltK~#9!?b@*ogD?<Qj{{ri3n%@uWtM}a6wsqE8RXZy6O5Hx!G6a27P!xrV z6iA)E-QOimQxzMarA`0<00000007QTPF#m!aMLtxYYe|>*U?zlb;&%>W?k24ni_mI zSXGrd`hNrRJW1c*H^5rErC?c>L%Su<`*r$~kU5ZLnUPmP)~0EaOT7ZGIZ)U2wP!#q vbKo9wlceCeI7vYabKtA*0=|v_0D3(DR2g-IKxOaS00000NkvXXu0mjfs(3!~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Species/Chitinid/parts.rsi/r_leg.png b/Resources/Textures/_DV/Mobs/Species/Chitinid/parts.rsi/r_leg.png new file mode 100644 index 0000000000000000000000000000000000000000..6f45ae18950c3fa4914cc7807fcb9bbe43357ed9 GIT binary patch literal 278 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I0wfs{c7_7UyPhtNAsLNtZ*1gkHV|liIN#*L zMn>-mjYgcTlQ%HR2CIb5I3T^G`IP1hr5uiQ5!b5t=9Z_s)18x>J3!!1#I}FG-W5MM zsB5q<{`tbRXHqLlBI|8~7|z|2Ex01mbMT`B1N#?~XJ4Hse?2lyh=W0R>RxLG(aRGv z*Vg~KcKdezRnB(|XTH6&e&xb6#naBob>@ODu)!xfm7d=}cU{D%ExPI4^_;s#E`4e5 z9{;pGzQ@vDC}HBOjw%I*qi4Dg7WiIFX;y7eHs9KwD%j4vG1`2Raw Xz;`2mx9-MYApd&0`njxgN@xNAsv>)6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Species/Chitinid/parts.rsi/torso_f.png b/Resources/Textures/_DV/Mobs/Species/Chitinid/parts.rsi/torso_f.png new file mode 100644 index 0000000000000000000000000000000000000000..71d34660015848123fd0d00dafcf9b345de26b40 GIT binary patch literal 1305 zcmV+!1?KvRP)g)xEA`^cOXU0f8{_470gQJV%__a&5tT#6zsC z6p2rW_?gq=4R6&-)w)Li<3y=6S!To>xBuf-k_e)$(uBoMyjCueG$;F%aDWE^k_z zdH`JQ0>jU?!j*;;q$TM(@NoeQ6oA2dpl{8eRdXNbPe6W~p6CuZJOU=DKDzz~jACci z3)ynT00009a7bBm000XT000XT0n*)m`~Uz0Pf0{URCwC$nm=n|K@`O&5>O;W5Ja%B zOP5a5+F4rIiH(62)>-D;Ne}C8YTrQ_Jn~gtxh|gxT;PLS>m`ou0lBU2nBox`gejA3Nrz zd_J!~{N?3EHJeRc$DlcQ*l5Rf)N%hgq5kLRXE;#SQPMH2+vp$tlwMz71FZXaJgx^0 zvE6R>&BlIke}8}Wbx8eQucs=NN;qI>gO867RVtON^{pJh4Uh1t6K;$?9Kb#l3Wadc zoPBi0U@)-Ojvad=KNy3=z_I=?c$Bbx51zcey?xn-ShC&gF}VK}_ykY-O3*r3d z=jU+tx#(ZozF|6@s&cukmdj;0_0s9IZjS=!VBpZl;2VvG*6(yWPM;UExf#b%wOS3m zzFMtx2^;Ocz5|&0cXxN8^J}%5E@7kHMc>K+I9{;R19%-L07`)Nb02?)^r;1)Z`v;U zG21sllxq+B07}^GjBhfTj9M%fTAMG}X!pJZ=xt0n9)T!f^C|cS8z2UYy@xN@=JD+P z6xcuR4z>9_1)0S- zah!6f(+N>x>h1RjL0Yd4;Mxa_(J@9CMSv6<48>y)IMg3+n;^3^y4~)#Ylslt+}uR6 z5n|1oi5UdJQrip>>luK-Gb)QZrXAvQhdSg7hU5?yLt=#4A2WUL?3*CHj6f)Zp-hyp z6+Q)MF-Z%sKXimQ2ViRPI{?L9*WRg^n(T{9f>!L5PV6U1MGcq2DL6R*p>T$#(E-;4 zrBi?=_W`EpMdkpkHwy9y{1Z@{`HGSJ7Wmb-t*B%3e?uPxK@bE%__z51rX5?nFOH<4 P00000NkvXXu0mjf@da%e literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Species/Chitinid/parts.rsi/torso_m.png b/Resources/Textures/_DV/Mobs/Species/Chitinid/parts.rsi/torso_m.png new file mode 100644 index 0000000000000000000000000000000000000000..9f08874e16b338c20ec268611d0eacb0e08603f8 GIT binary patch literal 1269 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Specific/Species/chitinid.rsi/chitzite_glow.png b/Resources/Textures/_DV/Objects/Specific/Species/chitinid.rsi/chitzite_glow.png new file mode 100644 index 0000000000000000000000000000000000000000..5a77b238e84fefaf9a6c43008f09a8c03902c3a4 GIT binary patch literal 1035 zcmV+m1oZofP)!NdSiF@JuQxt>)LH z&^vq>L=e4*$jr8uvWq!%jh{!Vrg(^pUft_D#y~-}8Q|+9o@Ewyi06sZTaG1ok9dTY zE@~=<%0ep35u%e$i7Zwz1O2ti%oCDdMQ1S6K5r;wE9$T**=% zqcsj28KjVe1O*jrLWhGmWs_#s*_UYemQf}TqrZhJI5~bmtaAn*cQn=OBt<}~+Bdab2JkAa~b;PR%W zDF?vSE-?CR$y{zo0a|`d13oT*NFErz2m05&SvB`@{siQ<>51-u!y{ml>W4P|0E6&n z(P#Gzy8r+H32;bRa{vGf5&!@T5&_cPe*6Fc0zgSbK~#9!?V2%8!!Q(v)2Np~3=Ax+ z9T*T7fSm)t#2rw_UV;e@zz!Ec3=CbnFfbr4!2nOfl2z4-?L7N6?e|HDHX?QSf4~1F zuA2q`000000ALI(mh(%E&uRBvfZVY^n$>Lm8gj0w9dHrX#sZvc2#_oO_s`dnZ$ikF zA_j=~^V#BY-GmyZIPo85PjladkSV3ae>r`-^-b7hO4SGonNqVN)=jBJ$dn=mIHBdW z6Wl*mOK5rT1ow~Cn*DOj3GN?D?NurjP(%DKy2RJ0hQ80}62Gq++S1}{M3VdiIYMgm z1t+5X&^0N zVKnygV0!p@@qTu1X294RvY00(il7$bi+N(An7Qd1h@i2M6GK|jCHLexF(l^RJJ08lc(a(_MsD8Vf# z5j1`*_vcdqM33E*aIWz38}Z|q#QtH-vV^}5g!ll^&o7%)OR#4jndJZg002ovPDHLk FV1hyB Date: Thu, 23 Jan 2025 13:06:16 +0100 Subject: [PATCH 190/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index ae92f0813aff..8cb65c907f36 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: DangerRevolution - changes: - - message: Security Cyborgs have been authorised for use aboard Delta-V class stations. - type: Add - id: 442 - time: '2024-07-22T09:33:11.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/721 - author: Colin-Tel changes: - message: Asterisk station has a few more rooms, check the map! @@ -3857,3 +3850,10 @@ id: 941 time: '2025-01-19T18:56:46.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2773 +- author: ElusiveCoin + changes: + - message: Added the Chitinid species, fun little glowy ant guys! + type: Add + id: 942 + time: '2025-01-23T07:27:44.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2707 From f54427ac9b85cdfb2422ec114d40b0f4187f927b Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Thu, 23 Jan 2025 18:24:19 +0000 Subject: [PATCH 191/205] let psionic abilities be used while cuffed + cleanup (#2686) * move psionic action textures to the rsi * move psionic actions to _DV psionic.yml, let them be used while cuffed * untroll --------- Co-authored-by: deltanedas <@deltanedas:kde.org> --- .../en-US/nyanotrasen/abilities/psionic.ftl | 32 ---- .../Prototypes/Nyanotrasen/Actions/types.yml | 125 ------------- Resources/Prototypes/_DV/Actions/psionic.yml | 169 ++++++++++++++++++ Resources/Prototypes/_DV/Actions/types.yml | 14 -- .../Interface/VerbIcons/dispel.png.yml | 2 - .../Interface/VerbIcons/license.txt | 13 -- .../Interface/VerbIcons/mass_sleep.png.yml | 2 - .../Interface/VerbIcons/metapsionic.png.yml | 2 - .../Interface/VerbIcons/mind_swap.png.yml | 2 - .../VerbIcons/mind_swap_return.png.yml | 2 - .../VerbIcons/noospheric_zap.png.yml | 2 - .../VerbIcons/psionic_invisibility.png.yml | 2 - .../psionic_invisibility_off.png.yml | 2 - .../VerbIcons/psionic_regeneration.png.yml | 2 - .../Interface/VerbIcons/pyrokinesis.png.yml | 2 - .../Interface/VerbIcons/telegnosis.png.yml | 2 - .../Actions/actions_psionics.rsi}/dispel.png | Bin .../actions_psionics.rsi/invisibility.png} | Bin .../invisibility_off.png} | Bin .../actions_psionics.rsi}/mass_sleep.png | Bin .../Actions/actions_psionics.rsi/meta.json | 39 +++- .../actions_psionics.rsi}/metapsionic.png | Bin .../actions_psionics.rsi}/mind_swap.png | Bin .../mind_swap_return.png | Bin .../actions_psionics.rsi}/noospheric_zap.png | Bin .../actions_psionics.rsi}/pyrokinesis.png | Bin .../actions_psionics.rsi/regeneration.png} | Bin .../actions_psionics.rsi}/telegnosis.png | Bin 28 files changed, 205 insertions(+), 209 deletions(-) create mode 100644 Resources/Prototypes/_DV/Actions/psionic.yml delete mode 100644 Resources/Textures/Nyanotrasen/Interface/VerbIcons/dispel.png.yml delete mode 100644 Resources/Textures/Nyanotrasen/Interface/VerbIcons/license.txt delete mode 100644 Resources/Textures/Nyanotrasen/Interface/VerbIcons/mass_sleep.png.yml delete mode 100644 Resources/Textures/Nyanotrasen/Interface/VerbIcons/metapsionic.png.yml delete mode 100644 Resources/Textures/Nyanotrasen/Interface/VerbIcons/mind_swap.png.yml delete mode 100644 Resources/Textures/Nyanotrasen/Interface/VerbIcons/mind_swap_return.png.yml delete mode 100644 Resources/Textures/Nyanotrasen/Interface/VerbIcons/noospheric_zap.png.yml delete mode 100644 Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_invisibility.png.yml delete mode 100644 Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_invisibility_off.png.yml delete mode 100644 Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_regeneration.png.yml delete mode 100644 Resources/Textures/Nyanotrasen/Interface/VerbIcons/pyrokinesis.png.yml delete mode 100644 Resources/Textures/Nyanotrasen/Interface/VerbIcons/telegnosis.png.yml rename Resources/Textures/{Nyanotrasen/Interface/VerbIcons => _DV/Interface/Actions/actions_psionics.rsi}/dispel.png (100%) rename Resources/Textures/{Nyanotrasen/Interface/VerbIcons/psionic_invisibility.png => _DV/Interface/Actions/actions_psionics.rsi/invisibility.png} (100%) rename Resources/Textures/{Nyanotrasen/Interface/VerbIcons/psionic_invisibility_off.png => _DV/Interface/Actions/actions_psionics.rsi/invisibility_off.png} (100%) rename Resources/Textures/{Nyanotrasen/Interface/VerbIcons => _DV/Interface/Actions/actions_psionics.rsi}/mass_sleep.png (100%) rename Resources/Textures/{Nyanotrasen/Interface/VerbIcons => _DV/Interface/Actions/actions_psionics.rsi}/metapsionic.png (100%) rename Resources/Textures/{Nyanotrasen/Interface/VerbIcons => _DV/Interface/Actions/actions_psionics.rsi}/mind_swap.png (100%) rename Resources/Textures/{Nyanotrasen/Interface/VerbIcons => _DV/Interface/Actions/actions_psionics.rsi}/mind_swap_return.png (100%) rename Resources/Textures/{Nyanotrasen/Interface/VerbIcons => _DV/Interface/Actions/actions_psionics.rsi}/noospheric_zap.png (100%) rename Resources/Textures/{Nyanotrasen/Interface/VerbIcons => _DV/Interface/Actions/actions_psionics.rsi}/pyrokinesis.png (100%) rename Resources/Textures/{Nyanotrasen/Interface/VerbIcons/psionic_regeneration.png => _DV/Interface/Actions/actions_psionics.rsi/regeneration.png} (100%) rename Resources/Textures/{Nyanotrasen/Interface/VerbIcons => _DV/Interface/Actions/actions_psionics.rsi}/telegnosis.png (100%) diff --git a/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl b/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl index d0e8db72f8cd..4b9198663a44 100644 --- a/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl +++ b/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl @@ -3,43 +3,16 @@ cage-resist-third-person = {CAPITALIZE(THE($user))} starts removing {POSS-ADJ($u cage-uncage-verb = Uncage -action-name-metapsionic = Metapsionic Pulse -action-description-metapsionic = Send a mental pulse through the area to see if there are any psychics nearby. - metapsionic-pulse-success = You detect psychic presence nearby. metapsionic-pulse-failure = You don't detect any psychic presence nearby. metapsionic-pulse-power = You detect that {$power} was used nearby. -action-name-dispel = Dispel -action-description-dispel = Dispel summoned entities such as familiars or forcewalls. - -action-name-mass-sleep = Mass Sleep -action-description-mass-sleep = Put targets in a small area to sleep. - accept-psionics-window-title = Psionic! accept-psionics-window-prompt-text-part = You rolled a psionic power! It's possible that certain anti-psychic forces may hunt you, so you should consider keeping it secret. Do you still wish to be psionic? -action-name-psionic-invisibility = Psionic Invisibility -action-description-psionic-invisibility = Render yourself invisible to any entity that could potentially be psychic. Borgs, animals, and so on are not affected. - -action-name-psionic-invisibility-off = Turn Off Psionic Invisibility -action-description-psionic-invisibility-off = Return to visibility, and receive a stun. - -action-name-mind-swap = Mind Swap -action-description-mind-swap = Swap minds with the target. Either can change back after 20 seconds. - -action-name-mind-swap-return = Reverse Mind Swap -action-description-mind-swap-return = Return to your original body. - -action-name-telegnosis = Telegnosis -action-description-telegnosis = Create a telegnostic projection to remotely observe things. - -action-name-psionic-regeneration = Psionic Regeneration -action-description-psionic-regeneration = Push your natural metabolism to the limit to power your body's regenerative capability. - glimmer-report = Current Glimmer Level: {$level}Ψ. glimmer-event-report-generic = Noöspheric discharge detected. Glimmer level has decreased by {$decrease} to {$level}Ψ. glimmer-event-report-signatures = New psionic signatures manifested. Glimmer level has decreased by {$decrease} to {$level}Ψ. @@ -56,11 +29,6 @@ telegnostic-trapped-entity-desc = Its many eyes betray sadness. psionic-burns-up = {CAPITALIZE(THE($item))} burns up with arcs of strange energy! psionic-burn-resist = Strange arcs dance across {THE($item)}! -action-name-noospheric-zap = Noospheric Zap -action-description-noospheric-zap = Shocks the conciousness of the target and leaves them stunned and stuttering. - -action-name-pyrokinesis = Pyrokinesis -action-description-pyrokinesis = Light a flammable target on fire. pyrokinesis-power-used = A wisp of flame engulfs {THE($target)}, igniting {OBJECT($target)}! action-name-psychokinesis = Psychokinesis diff --git a/Resources/Prototypes/Nyanotrasen/Actions/types.yml b/Resources/Prototypes/Nyanotrasen/Actions/types.yml index 31ea8f5316f9..fb8194050af8 100644 --- a/Resources/Prototypes/Nyanotrasen/Actions/types.yml +++ b/Resources/Prototypes/Nyanotrasen/Actions/types.yml @@ -17,128 +17,3 @@ icon: { sprite: Nyanotrasen/Objects/Specific/Species/felinid.rsi, state: icon } useDelay: 30 event: !type:HairballActionEvent - -- type: entity - id: ActionDispel - name: action-name-dispel - description: action-description-dispel - components: - - type: EntityTargetAction - icon: Nyanotrasen/Interface/VerbIcons/dispel.png - useDelay: 45 - checkCanAccess: false - range: 6 - itemIconStyle: BigAction - canTargetSelf: false - event: !type:DispelPowerActionEvent - -- type: entity - id: ActionMassSleep - name: action-name-mass-sleep - description: action-description-mass-sleep - components: - - type: WorldTargetAction - icon: Nyanotrasen/Interface/VerbIcons/mass_sleep.png - useDelay: 60 - checkCanAccess: false - range: 8 - itemIconStyle: BigAction - event: !type:MassSleepPowerActionEvent - -- type: entity - id: ActionMindSwapPsionic - name: action-name-mind-swap - description: action-description-mind-swap - components: - - type: EntityTargetAction - icon: Nyanotrasen/Interface/VerbIcons/mind_swap.png - useDelay: 240 - checkCanAccess: false - range: 8 - itemIconStyle: BigAction - event: !type:MindSwapPowerActionEvent - -- type: entity - id: ActionMindSwapReturn - name: action-name-mind-swap-return - description: action-description-mind-swap-return - components: - - type: InstantAction - icon: Nyanotrasen/Interface/VerbIcons/mind_swap_return.png - useDelay: 20 - checkCanInteract: false - event: !type:MindSwapPowerReturnActionEvent - -- type: entity - id: ActionNoosphericZap - name: action-name-noospheric-zap - description: action-description-noospheric-zap - components: - - type: EntityTargetAction - icon: Nyanotrasen/Interface/VerbIcons/noospheric_zap.png - useDelay: 100 - range: 5 - itemIconStyle: BigAction - event: !type:NoosphericZapPowerActionEvent - -- type: entity - id: ActionPyrokinesis - name: action-name-pyrokinesis - description: action-description-pyrokinesis - components: - - type: EntityTargetAction - icon: Nyanotrasen/Interface/VerbIcons/pyrokinesis.png - useDelay: 50 - range: 6 - checkCanAccess: false - itemIconStyle: BigAction - event: !type:PyrokinesisPowerActionEvent - -- type: entity - id: ActionMetapsionic - name: action-name-metapsionic - description: action-description-metapsionic - components: - - type: InstantAction - icon: Nyanotrasen/Interface/VerbIcons/metapsionic.png - useDelay: 45 - event: !type:MetapsionicPowerActionEvent - -- type: entity - id: ActionPsionicRegeneration - name: action-name-psionic-regeneration - description: action-description-psionic-regeneration - components: - - type: InstantAction - icon: Nyanotrasen/Interface/VerbIcons/psionic_regeneration.png - useDelay: 120 - event: !type:PsionicRegenerationPowerActionEvent - -- type: entity - id: ActionTelegnosis - name: action-name-telegnosis - description: action-description-telegnosis - components: - - type: InstantAction - icon: Nyanotrasen/Interface/VerbIcons/telegnosis.png - useDelay: 150 - event: !type:TelegnosisPowerActionEvent - -- type: entity - id: ActionPsionicInvisibility - name: action-name-psionic-invisibility - description: action-description-psionic-invisibility - components: - - type: InstantAction - icon: Nyanotrasen/Interface/VerbIcons/psionic_invisibility.png - useDelay: 120 - event: !type:PsionicInvisibilityPowerActionEvent - -- type: entity - id: ActionPsionicInvisibilityUsed - name: action-name-psionic-invisibility-off - description: action-description-psionic-invisibility-off - components: - - type: InstantAction - icon: Nyanotrasen/Interface/VerbIcons/psionic_invisibility_off.png - event: !type:RemovePsionicInvisibilityOffPowerActionEvent diff --git a/Resources/Prototypes/_DV/Actions/psionic.yml b/Resources/Prototypes/_DV/Actions/psionic.yml new file mode 100644 index 000000000000..4f8ccf406be6 --- /dev/null +++ b/Resources/Prototypes/_DV/Actions/psionic.yml @@ -0,0 +1,169 @@ +- type: entity + id: ActionDispel + name: Dispel + description: Dispel summoned entities such as familiars or forcewalls. + components: + - type: EntityTargetAction + icon: + sprite: _DV/Interface/Actions/actions_psionics.rsi + state: dispel + useDelay: 45 + checkCanAccess: false + checkCanInteract: false + range: 6 + itemIconStyle: BigAction + canTargetSelf: false + event: !type:DispelPowerActionEvent + +- type: entity + id: ActionMassSleep + name: Mass Sleep + description: Put targets in a small area to sleep. + components: + - type: WorldTargetAction + icon: + sprite: _DV/Interface/Actions/actions_psionics.rsi + state: mass_sleep + useDelay: 60 + checkCanAccess: false + checkCanInteract: false + range: 8 + itemIconStyle: BigAction + event: !type:MassSleepPowerActionEvent + +- type: entity + id: ActionMindSwapPsionic + name: Mind Swap + description: Swap minds with the target. Either can change back after 20 seconds. + components: + - type: EntityTargetAction + icon: + sprite: _DV/Interface/Actions/actions_psionics.rsi + state: mind_swap + useDelay: 240 + checkCanAccess: false + checkCanInteract: false + range: 8 + itemIconStyle: BigAction + event: !type:MindSwapPowerActionEvent + +- type: entity + id: ActionMindSwapReturn + name: Reverse Mind Swap + description: Return to your original body. + components: + - type: InstantAction + icon: + sprite: _DV/Interface/Actions/actions_psionics.rsi + state: mind_swap_return + useDelay: 20 + checkCanInteract: false + event: !type:MindSwapPowerReturnActionEvent + +- type: entity + id: ActionNoosphericZap + name: Noospheric Zap + description: Shocks the conciousness of the target and leaves them stunned and stuttering. + components: + - type: EntityTargetAction + icon: + sprite: _DV/Interface/Actions/actions_psionics.rsi + state: noospheric_zap + useDelay: 100 + checkCanInteract: false + range: 5 + itemIconStyle: BigAction + event: !type:NoosphericZapPowerActionEvent + +- type: entity + id: ActionPyrokinesis + name: Pyrokinesis + description: Light a flammable target on fire. + components: + - type: EntityTargetAction + icon: + sprite: _DV/Interface/Actions/actions_psionics.rsi + state: pyrokinesis + useDelay: 50 + range: 6 + checkCanAccess: false + itemIconStyle: BigAction + event: !type:PyrokinesisPowerActionEvent + +- type: entity + id: ActionMetapsionic + name: Metapsionic Pulse + description: Send a mental pulse through the area to see if there are any psychics nearby. + components: + - type: InstantAction + icon: + sprite: _DV/Interface/Actions/actions_psionics.rsi + state: metapsionic + useDelay: 45 + checkCanInteract: false + event: !type:MetapsionicPowerActionEvent + +- type: entity + id: ActionPsionicRegeneration + name: Psionic Regeneration + description: Push your natural metabolism to the limit to power your body's regenerative capability. + components: + - type: InstantAction + icon: + sprite: _DV/Interface/Actions/actions_psionics.rsi + state: regeneration + useDelay: 120 + checkCanInteract: false + event: !type:PsionicRegenerationPowerActionEvent + +- type: entity + id: ActionTelegnosis + name: Telegnosis + description: Create a telegnostic projection to remotely observe things. + components: + - type: InstantAction + icon: + sprite: _DV/Interface/Actions/actions_psionics.rsi + state: telegnosis + useDelay: 150 + checkCanInteract: false + event: !type:TelegnosisPowerActionEvent + +- type: entity + id: ActionPsionicInvisibility + name: Psionic Invisibility + description: Render yourself invisible to any entity that could potentially be psychic. Borgs, animals, and so on are not affected. + components: + - type: InstantAction + icon: + sprite: _DV/Interface/Actions/actions_psionics.rsi + state: invisibility + useDelay: 120 + checkCanInteract: false + event: !type:PsionicInvisibilityPowerActionEvent + +- type: entity + id: ActionPsionicInvisibilityUsed + name: Turn Off Psionic Invisibility + description: Return to visibility, and receive a stun. + components: + - type: InstantAction + icon: + sprite: _DV/Interface/Actions/actions_psionics.rsi + state: invisibility_off + checkCanInteract: false + event: !type:RemovePsionicInvisibilityOffPowerActionEvent + +- type: entity + id: ActionPrecognition + name: Precognition + description: See into the future to get a hint about the next random event. + components: + - type: InstantAction + icon: + sprite: _DV/Interface/Actions/actions_psionics.rsi + state: precognition + useDelay: 240 + checkCanInteract: false + checkConsciousness: false + event: !type:PrecognitionPowerActionEvent diff --git a/Resources/Prototypes/_DV/Actions/types.yml b/Resources/Prototypes/_DV/Actions/types.yml index cb4818527ef6..fd677762cd97 100644 --- a/Resources/Prototypes/_DV/Actions/types.yml +++ b/Resources/Prototypes/_DV/Actions/types.yml @@ -35,20 +35,6 @@ state: full event: !type:ToggleCrawlingStateEvent -- type: entity - id: ActionPrecognition - name: Precognition - description: See into the future to get a hint about the next random event. - components: - - type: InstantAction - icon: - sprite: _DV/Interface/Actions/actions_psionics.rsi - state: precognition - useDelay: 240 - checkCanInteract: false - checkConsciousness: false - event: !type:PrecognitionPowerActionEvent - - type: entity id: ActionChitzite name: Cough Up Chitzite diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/dispel.png.yml b/Resources/Textures/Nyanotrasen/Interface/VerbIcons/dispel.png.yml deleted file mode 100644 index 5c43e2330505..000000000000 --- a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/dispel.png.yml +++ /dev/null @@ -1,2 +0,0 @@ -sample: - filter: true diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/license.txt b/Resources/Textures/Nyanotrasen/Interface/VerbIcons/license.txt deleted file mode 100644 index ad1d595d9bd5..000000000000 --- a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/license.txt +++ /dev/null @@ -1,13 +0,0 @@ -The eleven files below are licensed under CC-BY-SA 4.0 by the author who can be found on GitHub @Vordenburg. - -dispel.png -mass_sleep.png -metapsionic.png -mind_swap.png -mind_swap_return.png -noospheric_zap.png -psionic_invisibility.png -psionic_invisibility_off.png -psionic_regeneration.png -pyrokinesis.png -telegnosis.png diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/mass_sleep.png.yml b/Resources/Textures/Nyanotrasen/Interface/VerbIcons/mass_sleep.png.yml deleted file mode 100644 index 5c43e2330505..000000000000 --- a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/mass_sleep.png.yml +++ /dev/null @@ -1,2 +0,0 @@ -sample: - filter: true diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/metapsionic.png.yml b/Resources/Textures/Nyanotrasen/Interface/VerbIcons/metapsionic.png.yml deleted file mode 100644 index 5c43e2330505..000000000000 --- a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/metapsionic.png.yml +++ /dev/null @@ -1,2 +0,0 @@ -sample: - filter: true diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/mind_swap.png.yml b/Resources/Textures/Nyanotrasen/Interface/VerbIcons/mind_swap.png.yml deleted file mode 100644 index 5c43e2330505..000000000000 --- a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/mind_swap.png.yml +++ /dev/null @@ -1,2 +0,0 @@ -sample: - filter: true diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/mind_swap_return.png.yml b/Resources/Textures/Nyanotrasen/Interface/VerbIcons/mind_swap_return.png.yml deleted file mode 100644 index 5c43e2330505..000000000000 --- a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/mind_swap_return.png.yml +++ /dev/null @@ -1,2 +0,0 @@ -sample: - filter: true diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/noospheric_zap.png.yml b/Resources/Textures/Nyanotrasen/Interface/VerbIcons/noospheric_zap.png.yml deleted file mode 100644 index 5c43e2330505..000000000000 --- a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/noospheric_zap.png.yml +++ /dev/null @@ -1,2 +0,0 @@ -sample: - filter: true diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_invisibility.png.yml b/Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_invisibility.png.yml deleted file mode 100644 index 5c43e2330505..000000000000 --- a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_invisibility.png.yml +++ /dev/null @@ -1,2 +0,0 @@ -sample: - filter: true diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_invisibility_off.png.yml b/Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_invisibility_off.png.yml deleted file mode 100644 index 5c43e2330505..000000000000 --- a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_invisibility_off.png.yml +++ /dev/null @@ -1,2 +0,0 @@ -sample: - filter: true diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_regeneration.png.yml b/Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_regeneration.png.yml deleted file mode 100644 index 5c43e2330505..000000000000 --- a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_regeneration.png.yml +++ /dev/null @@ -1,2 +0,0 @@ -sample: - filter: true diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/pyrokinesis.png.yml b/Resources/Textures/Nyanotrasen/Interface/VerbIcons/pyrokinesis.png.yml deleted file mode 100644 index 5c43e2330505..000000000000 --- a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/pyrokinesis.png.yml +++ /dev/null @@ -1,2 +0,0 @@ -sample: - filter: true diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/telegnosis.png.yml b/Resources/Textures/Nyanotrasen/Interface/VerbIcons/telegnosis.png.yml deleted file mode 100644 index 5c43e2330505..000000000000 --- a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/telegnosis.png.yml +++ /dev/null @@ -1,2 +0,0 @@ -sample: - filter: true diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/dispel.png b/Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/dispel.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/dispel.png rename to Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/dispel.png diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_invisibility.png b/Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/invisibility.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_invisibility.png rename to Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/invisibility.png diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_invisibility_off.png b/Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/invisibility_off.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_invisibility_off.png rename to Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/invisibility_off.png diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/mass_sleep.png b/Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/mass_sleep.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/mass_sleep.png rename to Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/mass_sleep.png diff --git a/Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/meta.json b/Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/meta.json index e0c9ccac8c52..83e4629b1105 100644 --- a/Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/meta.json +++ b/Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/meta.json @@ -1,14 +1,47 @@ { "version": 1, "license": "CC-BY-SA-4.0", - "copyright": "Sprited by chamomileteatime on Discord for DeltaV", + "copyright": "Created by @Vordenburg (github) for Nyanotrasen. Precognition sprited by chamomileteatime on Discord for DeltaV", "size": { "x": 64, "y": 64 }, "states": [ - { - "name": "precognition" + { + "name": "dispel" + }, + { + "name": "invisibility_off" + }, + { + "name": "invisibility" + }, + { + "name": "mass_sleep" + }, + { + "name": "metapsionic" + }, + { + "name": "mind_swap" + }, + { + "name": "mind_swap_return" + }, + { + "name": "noospheric_zap" + }, + { + "name": "precognition" + }, + { + "name": "pyrokinesis" + }, + { + "name": "regeneration" + }, + { + "name": "telegnosis" } ] } diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/metapsionic.png b/Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/metapsionic.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/metapsionic.png rename to Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/metapsionic.png diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/mind_swap.png b/Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/mind_swap.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/mind_swap.png rename to Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/mind_swap.png diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/mind_swap_return.png b/Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/mind_swap_return.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/mind_swap_return.png rename to Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/mind_swap_return.png diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/noospheric_zap.png b/Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/noospheric_zap.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/noospheric_zap.png rename to Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/noospheric_zap.png diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/pyrokinesis.png b/Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/pyrokinesis.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/pyrokinesis.png rename to Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/pyrokinesis.png diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_regeneration.png b/Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/regeneration.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_regeneration.png rename to Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/regeneration.png diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/telegnosis.png b/Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/telegnosis.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/telegnosis.png rename to Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/telegnosis.png From 19e5bea8aa6302fd5abb2eed5c8f4bfb94a75de2 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Thu, 23 Jan 2025 19:24:38 +0100 Subject: [PATCH 192/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 8cb65c907f36..2a69de341fad 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,14 +1,4 @@ Entries: -- author: Colin-Tel - changes: - - message: Asterisk station has a few more rooms, check the map! - type: Tweak - - message: Micro station's salvage locator was replaced with a salvage magnet and - should no longer have grids intersect with the station. - type: Fix - id: 443 - time: '2024-07-22T16:32:49.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1484 - author: noctyrnal changes: - message: Walls, Airlocks and Tiles have received new sprites as per a visual resprite @@ -3857,3 +3847,10 @@ id: 942 time: '2025-01-23T07:27:44.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2707 +- author: deltanedas + changes: + - message: Fixed not being able to use psionic powers while cuffed. + type: Fix + id: 943 + time: '2025-01-23T18:24:19.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2686 From eda41474f5029b21d8f8c52bc517acd1c79913c9 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Thu, 23 Jan 2025 20:56:34 +0000 Subject: [PATCH 193/205] refactor felinid/chitinid item coughing (#2790) * move BlockInjection to shared * add ItemCougher * make Chitinid use ItemCougher * make felinid use ItemCougher * update actions * access --------- Co-authored-by: deltanedas <@deltanedas:kde.org> --- .../_DV/Abilities/Felinid/FelinidSystem.cs | 5 + .../Chemistry/EntitySystems/InjectorSystem.cs | 2 +- .../Felinid/CoughingUpHairballComponent.cs | 11 - .../Abilities/Felinid/FelinidComponent.cs | 36 ---- .../Abilities/Felinid/FelinidFoodComponent.cs | 5 - .../Abilities/Felinid/FelinidSystem.cs | 195 ------------------ .../Abilities/Felinid/HairballComponent.cs | 7 - .../Chitinid/BlockInjectionComponent.cs | 4 - .../Abilities/Chitinid/ChitinidComponent.cs | 32 +-- .../_DV/Abilities/Chitinid/ChitinidSystem.cs | 74 ++----- .../Chitinid/CoughingUpChitziteComponent.cs | 14 -- .../_DV/Abilities/Felinid/FelinidSystem.cs | 74 +++++++ .../_DV/Abilities/CoughingUpItemComponent.cs | 19 ++ .../_DV/Abilities/Felinid/FelinidComponent.cs | 20 ++ .../Abilities/Felinid/FelinidFoodComponent.cs | 16 ++ .../Abilities/Felinid/HairballComponent.cs | 22 ++ .../Abilities/Felinid/SharedFelinidSystem.cs | 34 +++ .../_DV/Abilities/ItemCougherComponent.cs | 48 +++++ .../_DV/Abilities/ItemCougherSystem.cs | 106 ++++++++++ .../Components/BlockInjectionComponent.cs | 10 + .../Locale/en-US/_DV/abilities/chitinid.ftl | 1 - .../en-US/_DV/abilities/item-cougher.ftl | 1 + .../en-US/nyanotrasen/abilities/felinid.ftl | 4 - .../Prototypes/Nyanotrasen/Actions/types.yml | 19 -- .../Entities/Mobs/Species/felinid.yml | 4 + Resources/Prototypes/_DV/Actions/types.yml | 15 +- .../_DV/Entities/Mobs/Species/chitinid.yml | 4 + 27 files changed, 412 insertions(+), 370 deletions(-) create mode 100644 Content.Client/_DV/Abilities/Felinid/FelinidSystem.cs delete mode 100644 Content.Server/Nyanotrasen/Abilities/Felinid/CoughingUpHairballComponent.cs delete mode 100644 Content.Server/Nyanotrasen/Abilities/Felinid/FelinidComponent.cs delete mode 100644 Content.Server/Nyanotrasen/Abilities/Felinid/FelinidFoodComponent.cs delete mode 100644 Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs delete mode 100644 Content.Server/Nyanotrasen/Abilities/Felinid/HairballComponent.cs delete mode 100644 Content.Server/_DV/Abilities/Chitinid/BlockInjectionComponent.cs delete mode 100644 Content.Server/_DV/Abilities/Chitinid/CoughingUpChitziteComponent.cs create mode 100644 Content.Server/_DV/Abilities/Felinid/FelinidSystem.cs create mode 100644 Content.Shared/_DV/Abilities/CoughingUpItemComponent.cs create mode 100644 Content.Shared/_DV/Abilities/Felinid/FelinidComponent.cs create mode 100644 Content.Shared/_DV/Abilities/Felinid/FelinidFoodComponent.cs create mode 100644 Content.Shared/_DV/Abilities/Felinid/HairballComponent.cs create mode 100644 Content.Shared/_DV/Abilities/Felinid/SharedFelinidSystem.cs create mode 100644 Content.Shared/_DV/Abilities/ItemCougherComponent.cs create mode 100644 Content.Shared/_DV/Abilities/ItemCougherSystem.cs create mode 100644 Content.Shared/_DV/Chemistry/Components/BlockInjectionComponent.cs create mode 100644 Resources/Locale/en-US/_DV/abilities/item-cougher.ftl delete mode 100644 Resources/Prototypes/Nyanotrasen/Actions/types.yml diff --git a/Content.Client/_DV/Abilities/Felinid/FelinidSystem.cs b/Content.Client/_DV/Abilities/Felinid/FelinidSystem.cs new file mode 100644 index 000000000000..d9d7ca869654 --- /dev/null +++ b/Content.Client/_DV/Abilities/Felinid/FelinidSystem.cs @@ -0,0 +1,5 @@ +using Content.Shared._DV.Abilities.Felinid; + +namespace Content.Shared._DV.Abilities.Felinid; + +public sealed class FelinidSystem : SharedFelinidSystem; diff --git a/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs b/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs index c935326b13c4..723b11ad97bc 100644 --- a/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs @@ -1,6 +1,6 @@ -using Content.Server.Abilities.Chitinid; using Content.Server.Body.Components; using Content.Server.Body.Systems; +using Content.Shared._DV.Chemistry.Components; // DeltaV using Content.Shared.Chemistry; using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.Components.SolutionManager; diff --git a/Content.Server/Nyanotrasen/Abilities/Felinid/CoughingUpHairballComponent.cs b/Content.Server/Nyanotrasen/Abilities/Felinid/CoughingUpHairballComponent.cs deleted file mode 100644 index 1bfa0809b63a..000000000000 --- a/Content.Server/Nyanotrasen/Abilities/Felinid/CoughingUpHairballComponent.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace Content.Server.Abilities.Felinid; - -[RegisterComponent] -public sealed partial class CoughingUpHairballComponent : Component -{ - [DataField("accumulator")] - public float Accumulator = 0f; - - [DataField("coughUpTime")] - public TimeSpan CoughUpTime = TimeSpan.FromSeconds(2.15); // length of hairball.ogg -} diff --git a/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidComponent.cs b/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidComponent.cs deleted file mode 100644 index 9165b90de05f..000000000000 --- a/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidComponent.cs +++ /dev/null @@ -1,36 +0,0 @@ -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; -using Robust.Shared.Prototypes; -using Content.Shared.Actions; -using Robust.Shared.Utility; - -namespace Content.Server.Abilities.Felinid; - -[RegisterComponent] -public sealed partial class FelinidComponent : Component -{ - ///

/// UID of the entity the player is controlling. /// Popup to send them. + /// If true, if the popup is sent to the same mind again, it will not be displayed. /// Returns true if the popup message was sent to the client successfully. - public bool SendPopup(EntityUid? uid, ProtoId popupPrototype) + public bool SendPopup(EntityUid? uid, ProtoId popupPrototype, bool sendOnlyOnce = true) { if (uid == null) return false; @@ -52,7 +53,7 @@ public bool SendPopup(EntityUid? uid, ProtoId popupProto if (!_mind.TryGetMind(uid.Value, out var mindUid, out _)) return false; - return SendPopupMind(mindUid, popupPrototype); + return SendPopupMind(mindUid, popupPrototype, sendOnlyOnce); } /// @@ -60,12 +61,24 @@ public bool SendPopup(EntityUid? uid, ProtoId popupProto /// /// UID of the players mind. /// Popup to send them. + /// If true, if the popup is sent to the same mind again, it will not be displayed. /// Returns true if the popup message was sent to the client successfully. - public bool SendPopupMind(EntityUid? uid, ProtoId popupPrototype) + public bool SendPopupMind(EntityUid? uid, ProtoId popupPrototype, bool sendOnlyOnce = true) { if (uid == null) return false; + if (sendOnlyOnce) + { + EnsureComp(uid.Value, out var feedbackInfoComp); + + // If it's already been seen, don't resend it. + if (!feedbackInfoComp.SeenPopups.Add(popupPrototype)) + return false; + + Dirty(uid.Value, feedbackInfoComp); + } + if (!_mind.TryGetSession(uid, out var session)) return false; diff --git a/Content.Shared/_DV/Implants/AddComponentsImplant/AddComponentsImplantComponent.cs b/Content.Shared/_DV/Implants/AddComponentsImplant/AddComponentsImplantComponent.cs new file mode 100644 index 000000000000..5be9fc06e5ab --- /dev/null +++ b/Content.Shared/_DV/Implants/AddComponentsImplant/AddComponentsImplantComponent.cs @@ -0,0 +1,26 @@ +using Robust.Shared.Prototypes; + +namespace Content.Shared._DV.Implants.AddComponentsImplant; + +/// +/// When added to an implanter will add the passed in components to the implanted entity. +/// +/// +/// Warning: Multiple implants with this component adding the same components will not properly remove components +/// unless removed in the inverse order of their injection (Last in, first out). +/// +[RegisterComponent] +public sealed partial class AddComponentsImplantComponent : Component +{ + /// + /// What components will be added to the entity. If the component already exists, it will be skipped. + /// + [DataField(required: true)] + public ComponentRegistry ComponentsToAdd; + + /// + /// What components were added to the entity after implanted. Is used to know what components to remove. + /// + [DataField] + public ComponentRegistry AddedComponents = new(); +} diff --git a/Content.Shared/_DV/Implants/AddComponentsImplant/AddComponentsImplantSystem.cs b/Content.Shared/_DV/Implants/AddComponentsImplant/AddComponentsImplantSystem.cs new file mode 100644 index 000000000000..2e5c19f88f3e --- /dev/null +++ b/Content.Shared/_DV/Implants/AddComponentsImplant/AddComponentsImplantSystem.cs @@ -0,0 +1,39 @@ +using Robust.Shared.Containers; +using Content.Shared.Implants; + +namespace Content.Shared._DV.Implants.AddComponentsImplant; + +public sealed class AddComponentsImplantSystem : EntitySystem +{ + [Dependency] private readonly IComponentFactory _factory = default!; + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnImplantImplantedEvent); + SubscribeLocalEvent(OnRemove); + } + + private void OnImplantImplantedEvent(Entity ent, ref ImplantImplantedEvent args) + { + if (args.Implanted is not {} target) + return; + + foreach (var component in ent.Comp.ComponentsToAdd) + { + // Don't add the component if it already exists + if (EntityManager.HasComponent(target, _factory.GetComponent(component.Key).GetType())) + continue; + + EntityManager.AddComponent(target, component.Value); + ent.Comp.AddedComponents.Add(component.Key, component.Value); + } + } + + private void OnRemove(Entity ent, ref EntGotRemovedFromContainerMessage args) + { + EntityManager.RemoveComponents(args.Container.Owner, ent.Comp.AddedComponents); + + // Clear the list so the implant can be reused. + ent.Comp.AddedComponents.Clear(); + } +} diff --git a/Content.Shared/_DV/Implants/AddFactions/AddFactionsImplantComponent.cs b/Content.Shared/_DV/Implants/AddFactions/AddFactionsImplantComponent.cs new file mode 100644 index 000000000000..af9db77d911c --- /dev/null +++ b/Content.Shared/_DV/Implants/AddFactions/AddFactionsImplantComponent.cs @@ -0,0 +1,23 @@ +using Content.Shared.NPC.Prototypes; +using Robust.Shared.Prototypes; + +namespace Content.Shared._DV.Implants.AddFactions; + +/// +/// Will add all the factions to the person being implanted. +/// +[RegisterComponent] +public sealed partial class AddFactionsImplantComponent : Component +{ + /// + /// These factions will be added when implanted. + /// + [DataField(required: true)] + public HashSet> Factions; + + /// + /// These are the factions that were actually added. Used know what factions to remove when the implant is removed. + /// + [DataField] + public HashSet> AddedFactions = new(); +} diff --git a/Content.Shared/_DV/Implants/AddFactions/AddFactionsImplantSystem.cs b/Content.Shared/_DV/Implants/AddFactions/AddFactionsImplantSystem.cs new file mode 100644 index 000000000000..7717a1e5a756 --- /dev/null +++ b/Content.Shared/_DV/Implants/AddFactions/AddFactionsImplantSystem.cs @@ -0,0 +1,39 @@ +using Content.Shared.Implants; +using Content.Shared.NPC.Systems; +using Robust.Shared.Containers; + +namespace Content.Shared._DV.Implants.AddFactions; + +public sealed class AddFactionsImplantSystem : EntitySystem +{ + [Dependency] private readonly NpcFactionSystem _npc = default!; + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnImplantImplantedEvent); + SubscribeLocalEvent(OnRemove); + } + + private void OnImplantImplantedEvent(Entity ent, ref ImplantImplantedEvent args) + { + if (args.Implanted is not {} target) + return; + + foreach (var faction in ent.Comp.Factions) + { + if (_npc.IsMember(target, faction)) // If it's already in that faction, skip this. + continue; + + _npc.AddFaction(target, faction); + ent.Comp.AddedFactions.Add(faction); + } + } + + private void OnRemove(Entity ent, ref EntGotRemovedFromContainerMessage args) + { + foreach (var faction in ent.Comp.AddedFactions) + _npc.RemoveFaction(args.Container.Owner, faction); + + ent.Comp.AddedFactions.Clear(); + } +} diff --git a/Resources/Locale/en-US/_DV/feedbackpopup/popups/nukeHostagepopup.ftl b/Resources/Locale/en-US/_DV/feedbackpopup/popups/nukeHostagepopup.ftl new file mode 100644 index 000000000000..475e59d5adaf --- /dev/null +++ b/Resources/Locale/en-US/_DV/feedbackpopup/popups/nukeHostagepopup.ftl @@ -0,0 +1,16 @@ +# Round start nukie +feedbackpopup-hostage-nukie-start-name = Nukie-Hostage-START +feedbackpopup-hostage-nukie-start-title = [bold]New Nuke-Ops objective[/bold] +feedbackpopup-hostage-nukie-start-description-0 = You rolled the new hostage nukie objective! This is a new objective we are testing for nuke ops. This is at the very early stages of development, so any feedback is good. Expect bugs (Please report them <3)! +feedbackpopup-hostage-nukie-start-description-1 = To complete the objective, cuff the required amount of heads (If there aren't that many on the station the current amount of heads will be all that is required) and FTL warp back to the outpost. +feedbackpopup-hostage-nukie-start-description-2 = At the [bold]end of the round[/bold] you will get a feedback form. + +# On death, or game end nukie +feedbackpopup-hostage-nukie-end-name = Nukie-Hostage-NUKIE +feedbackpopup-hostage-nukie-end-title = [bold]Hostage objective feedback![/bold] +feedbackpopup-hostage-nukie-end-description-0 = Thanks for play testing our new nuke ops objective! If you would like to share any feedback about this feature, please comment it below. We would like to hear what you liked or didn't like, and how you think this feature could be improved. + +# Crew popup on round end. +feedbackpopup-hostage-crew-end-name = Nukie-Hostage-CREW +feedbackpopup-hostage-crew-end-title = [bold]Hostage objective feedback (Crew)![/bold] + diff --git a/Resources/Locale/en-US/_DV/nukie-operations/operations.ftl b/Resources/Locale/en-US/_DV/nukie-operations/operations.ftl new file mode 100644 index 000000000000..b264291679fd --- /dev/null +++ b/Resources/Locale/en-US/_DV/nukie-operations/operations.ftl @@ -0,0 +1,6 @@ +# Kidnap heads objective +nukie-operations-kidnap-heads-nuke-codes-override = This is a hostage operation. Look at your objectives for more information. It is recommended to buy hostage implants and handcuffs from your uplink. [color=red]To complete your objective you must FTL back to your outpost with the required number of heads restrained[/color]. +nukie-operations-kidnap-heads-objective-title = Cut off the head. +nukie-operations-kidnap-heads-objective-descript = We need to you kidnap {$count} heads of staff from the station. We only care about the heads, any crew who dies is just collateral. + +nukeops-cond-nukieskidnappedheads = The nuclear operative kidnapped the heads of the station. diff --git a/Resources/Locale/en-US/_DV/store/uplink-catalog.ftl b/Resources/Locale/en-US/_DV/store/uplink-catalog.ftl index e3f6a7a81ad3..fa8e9fc28866 100644 --- a/Resources/Locale/en-US/_DV/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/_DV/store/uplink-catalog.ftl @@ -15,6 +15,9 @@ uplink-syndicate-radio-implanter-desc = A cranial implant that lets you talk on uplink-syndicate-radio-implanter-bundle-name = Syndicate Radio Implanter Bundle uplink-syndicate-radio-implanter-bundle-desc = Two implanters for the price of one and a half! Share one with your Syndicate friend. +uplink-syndicate-hostage-implanter-bundle-name = Hostage implant bundle +uplink-syndicate-hostage-implanter-bundle-desc = These implants pacify when injected and also allow the hostages to enter your shuttle without being shot by turrets! + uplink-doorjack-name = Airlock Access Override uplink-doorjack-desc = A specialized cryptographic sequencer, designed solely to doorjack NanoTrasen's updated airlocks. Does not tamper with anything else. @@ -39,3 +42,7 @@ uplink-objective-syndicate-board-desc = Its expensive, don't lose it! uplink-dead-mans-signaller-name = Dead Man's Signaller uplink-dead-mans-signaller-desc = A device that if armed, will send a signal to any linked devices (such as bombs) when it is dropped or put away. + +# Objectives +uplink-syndicate-handcuff-bundle-name = Handcuff implant bundle +uplink-syndicate-handcuff-bundle-desc = Includes 10 metal handcuffs. We recommended you share with your friends! diff --git a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml index beffe8959a60..ee3913c4aa2c 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml @@ -254,3 +254,15 @@ components: - type: Implanter implant: MindShieldImplant + +# Nukie implants + +- type: entity + id: HostageImplanter + suffix: hostage + parent: BaseImplantOnlyImplanterSyndi + components: + - type: Implanter + implant: HostageImplant + implantTime: 20 + drawTime: 15 diff --git a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml index 9ae08dfa74ae..b9ce4411b218 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml @@ -330,3 +330,22 @@ permanent: false # DeltaV - let peaceful revs etc remove mindshields addedComponents: # DeltaV - replaces mindshield tag logic - type: MindShield + +# Nukie implants + +- type: entity + parent: BaseSubdermalImplant + id: HostageImplant + name: hostage implant + description: Perfect for all your hostage ops needs! Allows the implanted entity to be ignored by syndicate turrets. + categories: [ HideSpawnMenu ] + components: + - type: SubdermalImplant + - type: AddComponentsImplant + componentsToAdd: + - type: Pacified + disallowDisarm: true + disallowAllCombat: true + - type: AddFactionsImplant + factions: + - Hostage diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml index 95c44e616a0f..d136c44f40e2 100644 --- a/Resources/Prototypes/GameRules/roundstart.yml +++ b/Resources/Prototypes/GameRules/roundstart.yml @@ -96,6 +96,8 @@ minPlayers: 20 - type: LoadMapRule mapPath: /Maps/Nonstations/nukieplanet.yml + - type: NukieOperation # DeltaV - Nukie operations! + operations: NukieOperations - type: AntagSelection selectionTime: PrePlayerSpawn definitions: diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/_DV/Catalog/Fills/Boxes/general.yml index aaab0d11936e..7ea998369c78 100644 --- a/Resources/Prototypes/_DV/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/_DV/Catalog/Fills/Boxes/general.yml @@ -16,7 +16,7 @@ whitelist: components: - EncryptionKey - + - type: entity name: justice encryption key box parent: BoxEncryptionKeyPassenger @@ -42,3 +42,47 @@ contents: - id: SyndicateRadioImplanter amount: 2 + +- type: entity + name: syndicate hostage implanter box + parent: BoxCardboard + id: BoxSyndicateHostageImplanter + description: Contains hostage implants. + components: + - type: Sprite + layers: + - state: box_of_doom + - state: implant + - type: Storage + maxItemSize: Small + grid: + - 0,0,2,3 + whitelist: + components: + - Implanter + - type: StorageFill + contents: + - id: HostageImplanter + amount: 6 + +- type: entity + name: syndicate handcuff box + parent: BoxCardboard + id: BoxSyndicateHandcuffBundle + description: Contains a large amount of handcuffs + components: + - type: Sprite + layers: + - state: box_of_doom + - state: handcuff + - type: Storage + maxItemSize: Small + grid: + - 0,0,4,3 + whitelist: + components: + - Handcuff + - type: StorageFill + contents: + - id: Handcuffs + amount: 10 diff --git a/Resources/Prototypes/_DV/Catalog/uplink_catalog.yml b/Resources/Prototypes/_DV/Catalog/uplink_catalog.yml index f9ed7503158a..595be85726cf 100644 --- a/Resources/Prototypes/_DV/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/_DV/Catalog/uplink_catalog.yml @@ -179,3 +179,46 @@ Telecrystal: 2 categories: - UplinkDisruption + +- type: listing + id: UplinkHostageImplanter + name: uplink-syndicate-hostage-implanter-bundle-name + description: uplink-syndicate-hostage-implanter-bundle-desc + icon: { sprite: Objects/Misc/handcuffs.rsi, state: handcuff } + productEntity: BoxSyndicateHostageImplanter + discountCategory: usualDiscounts + discountDownTo: + Telecrystal: 1 + cost: + Telecrystal: 2 + categories: + - UplinkImplants + conditions: + - !type:BuyerWhitelistCondition + blacklist: + components: + - SurplusBundle + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink + +- type: listing + id: UplinkHandcuffBundle + name: uplink-syndicate-handcuff-bundle-name + description: uplink-syndicate-handcuff-bundle-desc + icon: { sprite: Objects/Misc/handcuffs.rsi, state: handcuff } + productEntity: BoxSyndicateHandcuffBundle + cost: + Telecrystal: 1 + categories: + - UplinkObjectives + conditions: + - !type:BuyerWhitelistCondition + blacklist: + components: + - SurplusBundle + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink diff --git a/Resources/Prototypes/_DV/FeedbackPopup/feedbackpopupsNukeHostage.yml b/Resources/Prototypes/_DV/FeedbackPopup/feedbackpopupsNukeHostage.yml new file mode 100644 index 000000000000..6b210d48f28b --- /dev/null +++ b/Resources/Prototypes/_DV/FeedbackPopup/feedbackpopupsNukeHostage.yml @@ -0,0 +1,26 @@ +# Round start nukie popup. +- type: feedbackPopup + id: NukieHostageRoundStartPopup + popupName: feedbackpopup-hostage-nukie-start-name + title: feedbackpopup-hostage-nukie-start-title + description: + - feedbackpopup-hostage-nukie-start-description-0 + - feedbackpopup-hostage-nukie-start-description-1 + - feedbackpopup-hostage-nukie-start-description-2 + feedbackField: false + +# On death, or game end nukie popup. +- type: feedbackPopup + id: NukieHostageRoundEndPopup + popupName: feedbackpopup-hostage-nukie-end-name + title: feedbackpopup-hostage-nukie-end-title + description: + - feedbackpopup-hostage-nukie-end-description-0 + +# Crew popup on round end. +- type: feedbackPopup + id: NukieHostageRoundEndCrewPopup + popupName: feedbackpopup-hostage-crew-end-name + title: feedbackpopup-hostage-crew-end-title + description: + - feedbackpopup-hostage-nukie-end-description-0 diff --git a/Resources/Prototypes/_DV/Objectives/nukies.yml b/Resources/Prototypes/_DV/Objectives/nukies.yml new file mode 100644 index 000000000000..8e613bfc9d9c --- /dev/null +++ b/Resources/Prototypes/_DV/Objectives/nukies.yml @@ -0,0 +1,66 @@ +# Nukies operations + +- type: weightedRandom + id: NukieOperations + weights: + NukieOperationDestroyStation: 1 + NukieOperationKidnapHeads: 1 + +- type: nukieOperation + id: NukieOperationDestroyStation + operationObjectives: + - NukeStationObjective + +- type: nukieOperation + id: NukieOperationKidnapHeads + operationObjectives: + - KidnapHeadsObjective + - NukieStealDiskObjective + nukeCodePaperOverride: nukie-operations-kidnap-heads-nuke-codes-override + +- type: entity + parent: BaseObjective + id: NukeStationObjective + name: Nuke the station. + description: Its your job. Get going! + components: + - type: Objective + difficulty: 4.0 + issuer: objective-issuer-syndicate + icon: + sprite: Objects/Devices/nuke.rsi + state: nuclearbomb_base + - type: NukeStationCondition + - type: CodeCondition + +- type: entity + parent: BaseObjective + id: KidnapHeadsObjective + components: + - type: Objective + difficulty: 4.0 + issuer: objective-issuer-syndicate + icon: + sprite: Objects/Misc/handcuffs.rsi + state: handcuff + - type: KidnapHeadsCondition + - type: NumberObjective + min: 4 # Min and max have to be the same. Otherwise, each operative will have a different number. + max: 4 + title: nukie-operations-kidnap-heads-objective-title + description: nukie-operations-kidnap-heads-objective-descript + +- type: entity + parent: BaseStealObjective + id: NukieStealDiskObjective + components: + - type: Objective + difficulty: 4.0 + issuer: objective-issuer-syndicate + icon: + sprite: Objects/Misc/nukedisk.rsi + state: icon + - type: StealCondition + stealGroup: NukeDisk + owner: objective-condition-steal-station + verifyMapExistence: false diff --git a/Resources/Prototypes/_DV/ai_factions.yml b/Resources/Prototypes/_DV/ai_factions.yml index 783fc9d98897..2307eef3bc32 100644 --- a/Resources/Prototypes/_DV/ai_factions.yml +++ b/Resources/Prototypes/_DV/ai_factions.yml @@ -3,3 +3,6 @@ hostile: - Mouse - SimpleHostile + +- type: npcFaction + id: Hostage diff --git a/Resources/Prototypes/ai_factions.yml b/Resources/Prototypes/ai_factions.yml index c2b62b5bdc60..d9e343534a40 100644 --- a/Resources/Prototypes/ai_factions.yml +++ b/Resources/Prototypes/ai_factions.yml @@ -62,6 +62,8 @@ - Zombie - Dragon - AllHostile + friendly: # DeltaV Nukie hostage ops + - Hostage - type: npcFaction id: Xeno From ee6164793bd3fdc561495505468304c90830e3f5 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Sat, 25 Jan 2025 02:30:00 +0100 Subject: [PATCH 197/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 25525bb4154e..cb442ca36987 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: DangerRevolution - changes: - - message: Construction of Security Cyborgs now requires extra steps. - type: Tweak - id: 446 - time: '2024-07-23T10:29:35.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1523 - author: NullWanderer, Adeinitas, Colin_Tel, DLondon changes: - message: Updated the server rules and made them more readable in one go, check @@ -3854,3 +3847,14 @@ id: 945 time: '2025-01-24T23:45:07.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2787 +- author: beck-thompson + changes: + - message: Hostage ops. This is an alternative to nuclear operatives where you must + kidnap the heads of the station! + type: Add + - message: Hostage implants. These implants pacify anyone implanted and make them + immune from syndicate turrets. + type: Add + id: 946 + time: '2025-01-25T01:29:42.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2545 From aefae9eb706fdab4eec802ab77c65b7d33fb737f Mon Sep 17 00:00:00 2001 From: Emily <182209267+Emily9031@users.noreply.github.com> Date: Fri, 24 Jan 2025 21:09:35 -0700 Subject: [PATCH 198/205] Dead Man's Signaller changelog (#2792) * dead man's signaller changelog * I forgot to stage the file I'm stupid --- Resources/Changelog/Parts/2775.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 Resources/Changelog/Parts/2775.yml diff --git a/Resources/Changelog/Parts/2775.yml b/Resources/Changelog/Parts/2775.yml new file mode 100644 index 000000000000..3a7d4f06a034 --- /dev/null +++ b/Resources/Changelog/Parts/2775.yml @@ -0,0 +1,4 @@ +author: Emily9031 +changes: +- type: Add + message: Added a dead man's signaller that will activate when dropped. Find it in the uplink and research! Make sure you arm it! From 9f3c165ef40140f2873a8ecfd286c5ae6d6eaafb Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Sat, 25 Jan 2025 05:09:54 +0100 Subject: [PATCH 199/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 16 ++++++++-------- Resources/Changelog/Parts/2775.yml | 4 ---- 2 files changed, 8 insertions(+), 12 deletions(-) delete mode 100644 Resources/Changelog/Parts/2775.yml diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index cb442ca36987..e4c48faf7fc7 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,12 +1,4 @@ Entries: -- author: NullWanderer, Adeinitas, Colin_Tel, DLondon - changes: - - message: Updated the server rules and made them more readable in one go, check - them out!!! - type: Tweak - id: 447 - time: '2024-07-24T23:19:26.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1494 - author: NullWanderer changes: - message: Merged upstream up to 01/07 @@ -3858,3 +3850,11 @@ id: 946 time: '2025-01-25T01:29:42.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2545 +- author: Emily9031 + changes: + - message: Added a dead man's signaller that will activate when dropped. Find it + in the uplink and research! Make sure you arm it! + type: Add + id: 947 + time: '2025-01-25T04:09:54.540837+00:00' + url: null diff --git a/Resources/Changelog/Parts/2775.yml b/Resources/Changelog/Parts/2775.yml deleted file mode 100644 index 3a7d4f06a034..000000000000 --- a/Resources/Changelog/Parts/2775.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Emily9031 -changes: -- type: Add - message: Added a dead man's signaller that will activate when dropped. Find it in the uplink and research! Make sure you arm it! From 5404cb25ed3bcd34d5c776dd460b4102d459f414 Mon Sep 17 00:00:00 2001 From: ElusiveCoin Date: Sat, 25 Jan 2025 12:50:18 -0700 Subject: [PATCH 200/205] Chitinid Minor Update (Bug Fix + Resistance updates + Guidebook update) (#2796) * Bug Fix + Resistance updates + Guidebook update Fixes the bug where they lose their light with an anom (Game limitations lets them only have one light at a time but the light returns after losing the anom) Tweaked resistance to be a bit more tanky for the cost of weaker to elemental things like shock and harder to heal due to inability to be injected Removed unneeded text from guidebook entry, added a more visible warning about Chitzite, fixed a spelling error, reflected more of the numerical values in the text. * Chocolate edible --- .../Prototypes/_DV/Body/Organs/chitinid.yml | 36 ++++++++++++++++++- .../_DV/Body/Prototypes/chitinid.yml | 2 +- .../Prototypes/_DV/Damage/modifier_sets.yml | 5 +-- .../_DV/Entities/Mobs/Species/chitinid.yml | 8 ----- .../Guidebook/Mobs/_DV/Chitinid.xml | 17 +++++---- 5 files changed, 47 insertions(+), 21 deletions(-) diff --git a/Resources/Prototypes/_DV/Body/Organs/chitinid.yml b/Resources/Prototypes/_DV/Body/Organs/chitinid.yml index 38a0e0b22191..c531740662dd 100644 --- a/Resources/Prototypes/_DV/Body/Organs/chitinid.yml +++ b/Resources/Prototypes/_DV/Body/Organs/chitinid.yml @@ -1,6 +1,6 @@ - type: entity id: OrganChitinidStomach - parent: [OrganAnimalStomach, OrganHumanStomach] + parent: OrganHumanStomach name: stomach description: "Gross. This is hard to stomach." components: @@ -31,3 +31,37 @@ groups: - id: Food - id: Drink + +- type: entity + id: OrganChitinidLiver + parent: BaseAnimalOrgan + name: liver + categories: [ HideSpawnMenu ] + components: + - type: Organ + slotId: liver # Shitmed + onAdd: + - type: UnpoweredFlashlight + - type: PointLight + enabled: false + radius: 3 + softness: 5 + color: "#2CFA1F" + autoRot: true + - type: Sprite + state: liver + - type: Metabolizer + maxReagents: 1 + metabolizerTypes: [ Animal ] + groups: + - id: Alcohol + rateModifier: 0.1 + - type: Liver # Shitmed + - type: Tag # goob edit + tags: + - Meat + - Organ + - Liver + - type: Item + size: Small + heldPrefix: liver diff --git a/Resources/Prototypes/_DV/Body/Prototypes/chitinid.yml b/Resources/Prototypes/_DV/Body/Prototypes/chitinid.yml index 18428a67a6c4..9175aeed003c 100644 --- a/Resources/Prototypes/_DV/Body/Prototypes/chitinid.yml +++ b/Resources/Prototypes/_DV/Body/Prototypes/chitinid.yml @@ -16,7 +16,7 @@ heart: OrganAnimalHeart lungs: OrganHumanLungs stomach: OrganChitinidStomach - liver: OrganAnimalLiver + liver: OrganChitinidLiver kidneys: OrganHumanKidneys connections: - right arm diff --git a/Resources/Prototypes/_DV/Damage/modifier_sets.yml b/Resources/Prototypes/_DV/Damage/modifier_sets.yml index 42a10a3b123e..a9a5eff4900f 100644 --- a/Resources/Prototypes/_DV/Damage/modifier_sets.yml +++ b/Resources/Prototypes/_DV/Damage/modifier_sets.yml @@ -33,8 +33,9 @@ - type: damageModifierSet id: Chitinid coefficients: - Blunt: 1.15 - Piercing: 1.25 + Blunt: 0.9 + Piercing: 0.9 Slash: 0.9 Cold: 1.1 + Shock: 1.15 Radiation: 0.2 diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Species/chitinid.yml b/Resources/Prototypes/_DV/Entities/Mobs/Species/chitinid.yml index b74046adc9ce..90ecbf5a085f 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/Species/chitinid.yml +++ b/Resources/Prototypes/_DV/Entities/Mobs/Species/chitinid.yml @@ -14,14 +14,6 @@ baseDecayRate: 0.0467 #needs to eat more to survive - type: Thirst - - type: UnpoweredFlashlight - - type: PointLight - enabled: false - radius: 3 - softness: 5 - color: "#2CFA1F" - autoRot: true - - type: Carriable - type: Icon diff --git a/Resources/ServerInfo/Guidebook/Mobs/_DV/Chitinid.xml b/Resources/ServerInfo/Guidebook/Mobs/_DV/Chitinid.xml index 29dde13c0f72..f3948fdd7bb3 100644 --- a/Resources/ServerInfo/Guidebook/Mobs/_DV/Chitinid.xml +++ b/Resources/ServerInfo/Guidebook/Mobs/_DV/Chitinid.xml @@ -5,24 +5,23 @@ - An industrious worker drone species, the Chitinid are strong diligent workers. Thanks to their homeworld's enviroment, they have grown an acute resistance to radiation, but not without its side effects. + An industrious hymenoptera species, the Chitinid are strong and diligent. Thanks to evolution, they have grown an acute resistance to radiation, but not without its side effects. ## Diet - Nothing special. ## Benefits - - Takes 80% less Radiation, 10% less Slash. - - Their bodies naturally recover from light radiation damage up to a point, once they accumulate enough radiation they must purge it from their systems in the form of a small rock. - - Due to their worker drone nature they are Better at pulling and carrying things. - - Due to their radioactive homeworld they possess a bio light. + - Takes 80% less Radiation, 10% less Slash Blunt and Piercing. + - Their bodies naturally recover from light radiation damage up to a point, once they accumulate enough radiation they must purge it from their systems in the form of a small rock [color=#ff0f0f]WARNING:The Chitzite they expel is slightly radioactive [/color]. + - They are Better at pulling and carrying things. + - They possess a bio light. ## Drawbacks - - Built for work rather than combat their hard shells are weaker to Blunt and piercing damage, they take 25% more piercing and 15% more Blunt damage. + - They take 15% more Shock damage due to their biology. - Due to their hard shells normal syringes can not pierce them, requiring hypos to bypass the toughness. - Thanks to their overactive systems they get hungry 33% faster. - - The cold does not agree with their biology and makes their movement sluggish, the cold also harms them more than others. - - They are deceptivly heavy due to their lifestyle and diet. - - The Chitzite they expel is slightly radioactive. + - The cold does not agree with their biology and makes their movement sluggish the colder it gets, the cold also harms them more than others causing them to take 25% more damage from it. + - They are deceptively heavy due to their lifestyle and diet. - Bug Blood. From 441f9d5dd4d143ee55c626a68ce7fb0d2c655b38 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Sat, 25 Jan 2025 19:55:12 +0000 Subject: [PATCH 201/205] chitinid minor update cl (#2798) Co-authored-by: deltanedas <@deltanedas:kde.org> --- Resources/Changelog/Parts/2796.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 Resources/Changelog/Parts/2796.yml diff --git a/Resources/Changelog/Parts/2796.yml b/Resources/Changelog/Parts/2796.yml new file mode 100644 index 000000000000..8481dca31259 --- /dev/null +++ b/Resources/Changelog/Parts/2796.yml @@ -0,0 +1,8 @@ +author: ElusiveCoin +changes: +- type: Tweak + message: Updated Chitinid Resistances to make them more tank like while still being harder to heal in the midst of a battle. +- type: Fix + message: Fixed a bug where anomalies that gave the player a point light would remove the Chitinid's bio light if cured. +- type: Tweak + message: Updated Guidebook text of the Chitinid species. From f5b33cd5e327338e2d2bd7571fc1c86d0f3f25d0 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Sat, 25 Jan 2025 20:55:31 +0100 Subject: [PATCH 202/205] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 20 +++++++++++++------- Resources/Changelog/Parts/2796.yml | 8 -------- 2 files changed, 13 insertions(+), 15 deletions(-) delete mode 100644 Resources/Changelog/Parts/2796.yml diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index e4c48faf7fc7..9a740c79f5af 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: NullWanderer - changes: - - message: Merged upstream up to 01/07 - type: Add - id: 448 - time: '2024-07-25T01:17:58.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1533 - author: Fox changes: - message: Ifrit should now be behind 4 hours of Epistemics playtime @@ -3858,3 +3851,16 @@ id: 947 time: '2025-01-25T04:09:54.540837+00:00' url: null +- author: ElusiveCoin + changes: + - message: Updated Chitinid Resistances to make them more tank like while still + being harder to heal in the midst of a battle. + type: Tweak + - message: Fixed a bug where anomalies that gave the player a point light would + remove the Chitinid's bio light if cured. + type: Fix + - message: Updated Guidebook text of the Chitinid species. + type: Tweak + id: 948 + time: '2025-01-25T19:55:31.266176+00:00' + url: null diff --git a/Resources/Changelog/Parts/2796.yml b/Resources/Changelog/Parts/2796.yml deleted file mode 100644 index 8481dca31259..000000000000 --- a/Resources/Changelog/Parts/2796.yml +++ /dev/null @@ -1,8 +0,0 @@ -author: ElusiveCoin -changes: -- type: Tweak - message: Updated Chitinid Resistances to make them more tank like while still being harder to heal in the midst of a battle. -- type: Fix - message: Fixed a bug where anomalies that gave the player a point light would remove the Chitinid's bio light if cured. -- type: Tweak - message: Updated Guidebook text of the Chitinid species. From 38dffdf4146c2d3fdc7bf9fc062e09328e573dba Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Sun, 26 Jan 2025 01:13:44 +0200 Subject: [PATCH 203/205] Fix EE namespace issue (#2801) * EE NameSpace * More --- .../markings/cyberlimbs.ftl | 0 .../markings/goblin_markings.ftl | 0 .../markings/harpy.ftl | 0 .../markings/oni.ftl | 0 .../markings/oni_feet.ftl | 0 .../markings/pointy_ears.ftl | 0 .../Mobs/Customization/Markings/harpy.yml | 62 +++--- .../Mobs/Customization/Markings/oni_feet.yml | 2 +- .../Mobs/Customization/Markings/oni_horns.yml | 178 +++++++++--------- .../Customization/Markings/pointy_ears.yml | 18 +- .../Mobs/Customization/Markings/tusks.yml | 4 +- .../Mobs/Customization/cyberlimbs/comp1.yml | 28 +-- .../Mobs/Customization/cyberlimbs/comp2.yml | 32 ++-- .../SoundCollections/harpy.yml | 0 .../Harpy/harpy_ears.rsi/harpy_ears_large.png | Bin .../Harpy/harpy_ears.rsi/meta.json | 0 .../Harpy/harpy_tails.rsi/forked_long.png | Bin .../Harpy/harpy_tails.rsi/haven_tone_1.png | Bin .../Harpy/harpy_tails.rsi/haven_tone_2.png | Bin .../huescale_forked_tailfin.png | Bin .../Harpy/harpy_tails.rsi/meta.json | 0 .../Harpy/harpy_tails.rsi/swallow_tail.png | Bin .../whitescale_forked_tailfin.png | Bin .../Harpy/harpy_tails48x48.rsi/meta.json | 0 .../peacock_tail_eyes.png | Bin .../peacock_tail_feathers.png | Bin .../harpy_wings.rsi/bat_wings_tone_1.png | Bin .../harpy_wings.rsi/bat_wings_tone_2.png | Bin .../harpy_wings.rsi/bionic_wings_tone_1.png | Bin .../harpy_wings.rsi/bionic_wings_tone_2.png | Bin .../Harpy/harpy_wings.rsi/classic_harpy.png | Bin .../Harpy/harpy_wings.rsi/harpy_2tone_1.png | Bin .../Harpy/harpy_wings.rsi/harpy_2tone_2.png | Bin .../Harpy/harpy_wings.rsi/harpy_3tone_1.png | Bin .../Harpy/harpy_wings.rsi/harpy_3tone_2.png | Bin .../Harpy/harpy_wings.rsi/harpy_3tone_3.png | Bin .../harpy_wings.rsi/harpy_speckled_1.png | Bin .../harpy_wings.rsi/harpy_speckled_2.png | Bin .../harpy_wings.rsi/harpy_undertone_1.png | Bin .../harpy_wings.rsi/harpy_undertone_2.png | Bin .../Harpy/harpy_wings.rsi/harpy_wingtip_1.png | Bin .../Harpy/harpy_wings.rsi/harpy_wingtip_2.png | Bin .../Harpy/harpy_wings.rsi/huescale_harpy.png | Bin .../harpy_wings.rsi/huescale_harpy_folded.png | Bin .../huescale_harpy_wing_owl.png | Bin .../Harpy/harpy_wings.rsi/meta.json | 0 .../harpy_wings.rsi/whitescale_harpy.png | Bin .../whitescale_harpy_folded.png | Bin .../whitescale_harpy_wing_owl.png | Bin .../Oni/oni_horns.rsi/antlers_2tone_1.png | Bin .../Oni/oni_horns.rsi/antlers_2tone_2.png | Bin .../Oni/oni_horns.rsi/antlers_3tone_1.png | Bin .../Oni/oni_horns.rsi/antlers_3tone_2.png | Bin .../Oni/oni_horns.rsi/antlers_3tone_3.png | Bin .../Customization/Oni/oni_horns.rsi/aries.png | Bin .../Oni/oni_horns.rsi/aries_3tone_1.png | Bin .../Oni/oni_horns.rsi/aries_3tone_2.png | Bin .../Oni/oni_horns.rsi/aries_3tone_3.png | Bin .../Oni/oni_horns.rsi/crowned.png | Bin .../oni_horns.rsi/double_curved_3tone_1.png | Bin .../oni_horns.rsi/double_curved_3tone_2.png | Bin .../oni_horns.rsi/double_curved_3tone_3.png | Bin .../double_curved_outwards_3tone_1.png | Bin .../double_curved_outwards_3tone_2.png | Bin .../double_curved_outwards_3tone_3.png | Bin .../Oni/oni_horns.rsi/double_thick.png | Bin .../oni_horns.rsi/double_thick_2tone_1.png | Bin .../oni_horns.rsi/double_thick_2tone_2.png | Bin .../oni_horns.rsi/double_thick_3tone_1.png | Bin .../oni_horns.rsi/double_thick_3tone_2.png | Bin .../oni_horns.rsi/double_thick_3tone_3.png | Bin .../Oni/oni_horns.rsi/erebia.png | Bin .../Oni/oni_horns.rsi/erebia_3tone_1.png | Bin .../Oni/oni_horns.rsi/erebia_3tone_2.png | Bin .../Oni/oni_horns.rsi/erebia_3tone_3.png | Bin .../Oni/oni_horns.rsi/erebia_rings.png | Bin .../Oni/oni_horns.rsi/inclined.png | Bin .../Oni/oni_horns.rsi/inclined_3tone_1.png | Bin .../Oni/oni_horns.rsi/inclined_3tone_2.png | Bin .../Oni/oni_horns.rsi/inclined_3tone_3.png | Bin .../Customization/Oni/oni_horns.rsi/meta.json | 0 .../Oni/oni_horns.rsi/nepeta.png | Bin .../Oni/oni_horns.rsi/nepeta_3tone_1.png | Bin .../Oni/oni_horns.rsi/nepeta_3tone_2.png | Bin .../Oni/oni_horns.rsi/nepeta_3tone_3.png | Bin .../Oni/oni_horns.rsi/pisces.png | Bin .../Oni/oni_horns.rsi/pisces_2tone_1.png | Bin .../Oni/oni_horns.rsi/pisces_2tone_2.png | Bin .../Oni/oni_horns.rsi/pisces_3tone_1.png | Bin .../Oni/oni_horns.rsi/pisces_3tone_2.png | Bin .../Oni/oni_horns.rsi/pisces_3tone_3.png | Bin .../Oni/oni_horns.rsi/sagittarius.png | Bin .../Oni/oni_horns.rsi/sagittarius_3tone_1.png | Bin .../Oni/oni_horns.rsi/sagittarius_3tone_2.png | Bin .../Oni/oni_horns.rsi/sagittarius_3tone_3.png | Bin .../Oni/oni_horns.rsi/serket.png | Bin .../Oni/oni_horns.rsi/serket_3tone_1.png | Bin .../Oni/oni_horns.rsi/serket_3tone_2.png | Bin .../Oni/oni_horns.rsi/serket_3tone_3.png | Bin .../Oni/oni_horns.rsi/taurus.png | Bin .../Oni/oni_horns.rsi/taurus_2tone_1.png | Bin .../Oni/oni_horns.rsi/taurus_2tone_2.png | Bin .../Oni/oni_horns.rsi/taurus_3tone_1.png | Bin .../Oni/oni_horns.rsi/taurus_3tone_2.png | Bin .../Oni/oni_horns.rsi/taurus_3tone_3.png | Bin .../Oni/oni_horns.rsi/tavris.png | Bin .../Oni/oni_horns.rsi/tavris_3tone_1.png | Bin .../Oni/oni_horns.rsi/tavris_3tone_2.png | Bin .../Oni/oni_horns.rsi/tavris_3tone_3.png | Bin .../Oni/oni_horns.rsi/unicorn.png | Bin .../Oni/oni_horns.rsi/vantas.png | Bin .../Oni/oni_horns.rsi/vantas_3tone_1.png | Bin .../Oni/oni_horns.rsi/vantas_3tone_2.png | Bin .../Oni/oni_horns.rsi/vantas_3tone_3.png | Bin .../Customization/Oni/oni_horns.rsi/virgo.png | Bin .../Oni/oni_horns.rsi/virgo_3tone_1.png | Bin .../Oni/oni_horns.rsi/virgo_3tone_2.png | Bin .../Oni/oni_horns.rsi/virgo_3tone_3.png | Bin .../Customization/Oni/oni_horns.rsi/wavy.png | Bin .../Oni/oni_horns.rsi/wavy_2tone_1.png | Bin .../Oni/oni_horns.rsi/wavy_2tone_2.png | Bin .../Oni/oni_horns.rsi/wavy_3tone_1.png | Bin .../Oni/oni_horns.rsi/wavy_3tone_2.png | Bin .../Oni/oni_horns.rsi/wavy_3tone_3.png | Bin .../Oni/oni_horns48x48.rsi/makara.png | Bin .../Oni/oni_horns48x48.rsi/makara_2tone_1.png | Bin .../Oni/oni_horns48x48.rsi/makara_2tone_2.png | Bin .../Oni/oni_horns48x48.rsi/makara_3tone_1.png | Bin .../Oni/oni_horns48x48.rsi/makara_3tone_2.png | Bin .../Oni/oni_horns48x48.rsi/makara_3tone_3.png | Bin .../Oni/oni_horns48x48.rsi/meta.json | 0 .../Oni/oni_horns48x48.rsi/tall_bull.png | Bin .../oni_horns48x48.rsi/tall_bull_3tone_1.png | Bin .../oni_horns48x48.rsi/tall_bull_3tone_2.png | Bin .../oni_horns48x48.rsi/tall_bull_3tone_3.png | Bin .../Oni/oni_horns48x48.rsi/tall_curved.png | Bin .../tall_curved_3tone_1.png | Bin .../tall_curved_3tone_2.png | Bin .../tall_curved_3tone_3.png | Bin .../comp1/comp1_main.rsi/l_arm-primary.png | Bin .../comp1/comp1_main.rsi/l_arm-secondary.png | Bin .../comp1/comp1_main.rsi/l_arm-tertiary.png | Bin .../comp1/comp1_main.rsi/l_foot.png | Bin .../comp1/comp1_main.rsi/l_hand.png | Bin .../comp1/comp1_main.rsi/l_leg-primary.png | Bin .../comp1/comp1_main.rsi/l_leg-secondary.png | Bin .../cyberlimbs/comp1/comp1_main.rsi/meta.json | 0 .../comp1/comp1_main.rsi/r_arm-primary.png | Bin .../comp1/comp1_main.rsi/r_arm-secondary.png | Bin .../comp1/comp1_main.rsi/r_arm-tertiary.png | Bin .../comp1/comp1_main.rsi/r_foot.png | Bin .../comp1/comp1_main.rsi/r_hand.png | Bin .../comp1/comp1_main.rsi/r_leg-primary.png | Bin .../comp1/comp1_main.rsi/r_leg-secondary.png | Bin .../comp2/comp2_main.rsi/l_arm-1.png | Bin .../comp2/comp2_main.rsi/l_arm-2.png | Bin .../comp2/comp2_main.rsi/l_foot-1.png | Bin .../comp2/comp2_main.rsi/l_foot-2.png | Bin .../comp2/comp2_main.rsi/l_hand-1.png | Bin .../comp2/comp2_main.rsi/l_hand-2.png | Bin .../comp2/comp2_main.rsi/l_leg-1.png | Bin .../comp2/comp2_main.rsi/l_leg-2.png | Bin .../cyberlimbs/comp2/comp2_main.rsi/meta.json | 0 .../comp2/comp2_main.rsi/r_arm-1.png | Bin .../comp2/comp2_main.rsi/r_arm-2.png | Bin .../comp2/comp2_main.rsi/r_foot-1.png | Bin .../comp2/comp2_main.rsi/r_foot-2.png | Bin .../comp2/comp2_main.rsi/r_hand-1.png | Bin .../comp2/comp2_main.rsi/r_hand-2.png | Bin .../comp2/comp2_main.rsi/r_leg-1.png | Bin .../comp2/comp2_main.rsi/r_leg-2.png | Bin .../goblin_tusks.rsi/goblin_tusks_big.png | Bin .../goblin_tusks.rsi/goblin_tusks_none.png | Bin .../goblin_tusks.rsi/goblin_tusks_small.png | Bin .../Customization/goblin_tusks.rsi/meta.json | 0 .../Mobs/Customization/oni_feet.rsi/meta.json | 0 .../Customization/oni_feet.rsi/two_toes.png | Bin .../Customization/pointy_ears.rsi/meta.json | 0 .../pointy_ears.rsi/pointy_ears_large.png | Bin .../pointy_ears.rsi/pointy_ears_none.png | Bin .../pointy_ears.rsi/pointy_ears_slanted.png | Bin .../pointy_ears.rsi/pointy_ears_small.png | Bin .../pointy_ears.rsi/pointy_ears_standard.png | Bin .../pointy_ears.rsi/pointy_ears_tall.png | Bin .../pointy_ears.rsi/pointy_ears_thin.png | Bin .../pointy_ears.rsi/pointy_ears_upwards.png | Bin .../pointy_ears.rsi/pointy_ears_wide.png | Bin 187 files changed, 162 insertions(+), 162 deletions(-) rename Resources/Locale/en-US/{einstein-engines => _EE}/markings/cyberlimbs.ftl (100%) rename Resources/Locale/en-US/{einstein-engines => _EE}/markings/goblin_markings.ftl (100%) rename Resources/Locale/en-US/{einstein-engines => _EE}/markings/harpy.ftl (100%) rename Resources/Locale/en-US/{einstein-engines => _EE}/markings/oni.ftl (100%) rename Resources/Locale/en-US/{einstein-engines => _EE}/markings/oni_feet.ftl (100%) rename Resources/Locale/en-US/{einstein-engines => _EE}/markings/pointy_ears.ftl (100%) rename Resources/Prototypes/{Einstein-Engines => _EE}/Entities/Mobs/Customization/Markings/harpy.yml (72%) rename Resources/Prototypes/{Einstein-Engines => _EE}/Entities/Mobs/Customization/Markings/oni_feet.yml (81%) rename Resources/Prototypes/{Einstein-Engines => _EE}/Entities/Mobs/Customization/Markings/oni_horns.yml (60%) rename Resources/Prototypes/{Einstein-Engines => _EE}/Entities/Mobs/Customization/Markings/pointy_ears.yml (73%) rename Resources/Prototypes/{Einstein-Engines => _EE}/Entities/Mobs/Customization/Markings/tusks.yml (78%) rename Resources/Prototypes/{Einstein-Engines => _EE}/Entities/Mobs/Customization/cyberlimbs/comp1.yml (62%) rename Resources/Prototypes/{Einstein-Engines => _EE}/Entities/Mobs/Customization/cyberlimbs/comp2.yml (59%) rename Resources/Prototypes/{Einstein-Engines => _EE}/SoundCollections/harpy.yml (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_large.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Harpy/harpy_ears.rsi/meta.json (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Harpy/harpy_tails.rsi/forked_long.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Harpy/harpy_tails.rsi/haven_tone_1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Harpy/harpy_tails.rsi/haven_tone_2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Harpy/harpy_tails.rsi/huescale_forked_tailfin.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Harpy/harpy_tails.rsi/swallow_tail.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Harpy/harpy_tails.rsi/whitescale_forked_tailfin.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Harpy/harpy_tails48x48.rsi/meta.json (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_eyes.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_feathers.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Harpy/harpy_wings.rsi/bat_wings_tone_1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Harpy/harpy_wings.rsi/bat_wings_tone_2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Harpy/harpy_wings.rsi/bionic_wings_tone_1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Harpy/harpy_wings.rsi/bionic_wings_tone_2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Harpy/harpy_wings.rsi/classic_harpy.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_2tone_1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_2tone_2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_3tone_1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_3tone_2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_3tone_3.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_speckled_1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_speckled_2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_undertone_1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_undertone_2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_wingtip_1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_wingtip_2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Harpy/harpy_wings.rsi/huescale_harpy.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Harpy/harpy_wings.rsi/huescale_harpy_folded.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Harpy/harpy_wings.rsi/huescale_harpy_wing_owl.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Harpy/harpy_wings.rsi/whitescale_harpy.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Harpy/harpy_wings.rsi/whitescale_harpy_folded.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Harpy/harpy_wings.rsi/whitescale_harpy_wing_owl.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/antlers_2tone_1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/antlers_2tone_2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/antlers_3tone_1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/antlers_3tone_2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/antlers_3tone_3.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/aries.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/aries_3tone_1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/aries_3tone_2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/aries_3tone_3.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/crowned.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/double_curved_3tone_1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/double_curved_3tone_2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/double_curved_3tone_3.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/double_curved_outwards_3tone_1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/double_curved_outwards_3tone_2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/double_curved_outwards_3tone_3.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/double_thick.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/double_thick_2tone_1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/double_thick_2tone_2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/double_thick_3tone_1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/double_thick_3tone_2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/double_thick_3tone_3.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/erebia.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/erebia_3tone_1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/erebia_3tone_2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/erebia_3tone_3.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/erebia_rings.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/inclined.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/inclined_3tone_1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/inclined_3tone_2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/inclined_3tone_3.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/meta.json (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/nepeta.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/nepeta_3tone_1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/nepeta_3tone_2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/nepeta_3tone_3.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/pisces.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/pisces_2tone_1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/pisces_2tone_2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/pisces_3tone_1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/pisces_3tone_2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/pisces_3tone_3.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/sagittarius.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/sagittarius_3tone_1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/sagittarius_3tone_2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/sagittarius_3tone_3.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/serket.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/serket_3tone_1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/serket_3tone_2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/serket_3tone_3.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/taurus.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/taurus_2tone_1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/taurus_2tone_2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/taurus_3tone_1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/taurus_3tone_2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/taurus_3tone_3.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/tavris.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/tavris_3tone_1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/tavris_3tone_2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/tavris_3tone_3.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/unicorn.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/vantas.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/vantas_3tone_1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/vantas_3tone_2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/vantas_3tone_3.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/virgo.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/virgo_3tone_1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/virgo_3tone_2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/virgo_3tone_3.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/wavy.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/wavy_2tone_1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/wavy_2tone_2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/wavy_3tone_1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/wavy_3tone_2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns.rsi/wavy_3tone_3.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns48x48.rsi/makara.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns48x48.rsi/makara_2tone_1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns48x48.rsi/makara_2tone_2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns48x48.rsi/makara_3tone_1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns48x48.rsi/makara_3tone_2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns48x48.rsi/makara_3tone_3.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns48x48.rsi/meta.json (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull_3tone_1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull_3tone_2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull_3tone_3.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved_3tone_1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved_3tone_2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved_3tone_3.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/l_arm-primary.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/l_arm-secondary.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/l_arm-tertiary.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/l_foot.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/l_hand.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/l_leg-primary.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/l_leg-secondary.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/meta.json (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/r_arm-primary.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/r_arm-secondary.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/r_arm-tertiary.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/r_foot.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/r_hand.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/r_leg-primary.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/r_leg-secondary.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/l_arm-1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/l_arm-2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/l_foot-1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/l_foot-2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/l_hand-1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/l_hand-2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/l_leg-1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/l_leg-2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/meta.json (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/r_arm-1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/r_arm-2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/r_foot-1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/r_foot-2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/r_hand-1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/r_hand-2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/r_leg-1.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/r_leg-2.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_big.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_none.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_small.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/goblin_tusks.rsi/meta.json (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/oni_feet.rsi/meta.json (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/oni_feet.rsi/two_toes.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/pointy_ears.rsi/meta.json (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/pointy_ears.rsi/pointy_ears_large.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/pointy_ears.rsi/pointy_ears_none.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/pointy_ears.rsi/pointy_ears_slanted.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/pointy_ears.rsi/pointy_ears_small.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/pointy_ears.rsi/pointy_ears_standard.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/pointy_ears.rsi/pointy_ears_tall.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/pointy_ears.rsi/pointy_ears_thin.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/pointy_ears.rsi/pointy_ears_upwards.png (100%) rename Resources/Textures/{Einstein-Engines => _EE}/Mobs/Customization/pointy_ears.rsi/pointy_ears_wide.png (100%) diff --git a/Resources/Locale/en-US/einstein-engines/markings/cyberlimbs.ftl b/Resources/Locale/en-US/_EE/markings/cyberlimbs.ftl similarity index 100% rename from Resources/Locale/en-US/einstein-engines/markings/cyberlimbs.ftl rename to Resources/Locale/en-US/_EE/markings/cyberlimbs.ftl diff --git a/Resources/Locale/en-US/einstein-engines/markings/goblin_markings.ftl b/Resources/Locale/en-US/_EE/markings/goblin_markings.ftl similarity index 100% rename from Resources/Locale/en-US/einstein-engines/markings/goblin_markings.ftl rename to Resources/Locale/en-US/_EE/markings/goblin_markings.ftl diff --git a/Resources/Locale/en-US/einstein-engines/markings/harpy.ftl b/Resources/Locale/en-US/_EE/markings/harpy.ftl similarity index 100% rename from Resources/Locale/en-US/einstein-engines/markings/harpy.ftl rename to Resources/Locale/en-US/_EE/markings/harpy.ftl diff --git a/Resources/Locale/en-US/einstein-engines/markings/oni.ftl b/Resources/Locale/en-US/_EE/markings/oni.ftl similarity index 100% rename from Resources/Locale/en-US/einstein-engines/markings/oni.ftl rename to Resources/Locale/en-US/_EE/markings/oni.ftl diff --git a/Resources/Locale/en-US/einstein-engines/markings/oni_feet.ftl b/Resources/Locale/en-US/_EE/markings/oni_feet.ftl similarity index 100% rename from Resources/Locale/en-US/einstein-engines/markings/oni_feet.ftl rename to Resources/Locale/en-US/_EE/markings/oni_feet.ftl diff --git a/Resources/Locale/en-US/einstein-engines/markings/pointy_ears.ftl b/Resources/Locale/en-US/_EE/markings/pointy_ears.ftl similarity index 100% rename from Resources/Locale/en-US/einstein-engines/markings/pointy_ears.ftl rename to Resources/Locale/en-US/_EE/markings/pointy_ears.ftl diff --git a/Resources/Prototypes/Einstein-Engines/Entities/Mobs/Customization/Markings/harpy.yml b/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/harpy.yml similarity index 72% rename from Resources/Prototypes/Einstein-Engines/Entities/Mobs/Customization/Markings/harpy.yml rename to Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/harpy.yml index d13f5f032640..625a2e8a80e3 100644 --- a/Resources/Prototypes/Einstein-Engines/Entities/Mobs/Customization/Markings/harpy.yml +++ b/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/harpy.yml @@ -15,7 +15,7 @@ - !type:SimpleColoring color: "#964b00" sprites: - - sprite: Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi + - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi state: huescale_harpy - type: marking @@ -32,7 +32,7 @@ - !type:SimpleColoring color: "#964b00" sprites: - - sprite: Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi + - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi state: whitescale_harpy - type: marking @@ -49,7 +49,7 @@ - !type:SimpleColoring color: "#964b00" sprites: - - sprite: Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi + - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi state: classic_harpy - type: marking @@ -66,7 +66,7 @@ - !type:SimpleColoring color: "#964b00" sprites: - - sprite: Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi + - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi state: huescale_harpy_folded - type: marking @@ -83,7 +83,7 @@ - !type:SimpleColoring color: "#964b00" sprites: - - sprite: Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi + - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi state: whitescale_harpy_folded - type: marking @@ -100,7 +100,7 @@ - !type:SimpleColoring color: "#964b00" sprites: - - sprite: Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi + - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi state: huescale_harpy_wing_owl - type: marking @@ -117,7 +117,7 @@ - !type:SimpleColoring color: "#964b00" sprites: - - sprite: Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi + - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi state: whitescale_harpy_wing_owl - type: marking @@ -134,7 +134,7 @@ - !type:SimpleColoring color: "#964b00" sprites: - - sprite: Einstein-Engines/Mobs/Customization/Harpy/harpy_ears.rsi + - sprite: _EE/Mobs/Customization/Harpy/harpy_ears.rsi state: harpy_ears_large - type: marking @@ -150,7 +150,7 @@ fallbackTypes: - !type:SimpleColoring sprites: - - sprite: Einstein-Engines/Mobs/Customization/Harpy/harpy_tails.rsi + - sprite: _EE/Mobs/Customization/Harpy/harpy_tails.rsi state: whitescale_forked_tailfin - type: marking @@ -166,7 +166,7 @@ fallbackTypes: - !type:SimpleColoring sprites: - - sprite: Einstein-Engines/Mobs/Customization/Harpy/harpy_tails.rsi + - sprite: _EE/Mobs/Customization/Harpy/harpy_tails.rsi state: huescale_forked_tailfin - type: marking @@ -182,9 +182,9 @@ fallbackTypes: - !type:SimpleColoring sprites: - - sprite: Einstein-Engines/Mobs/Customization/Harpy/harpy_tails48x48.rsi + - sprite: _EE/Mobs/Customization/Harpy/harpy_tails48x48.rsi state: peacock_tail_feathers - - sprite: Einstein-Engines/Mobs/Customization/Harpy/harpy_tails48x48.rsi + - sprite: _EE/Mobs/Customization/Harpy/harpy_tails48x48.rsi state: peacock_tail_eyes - type: marking @@ -200,9 +200,9 @@ fallbackTypes: - !type:SimpleColoring sprites: - - sprite: Einstein-Engines/Mobs/Customization/Harpy/harpy_tails.rsi + - sprite: _EE/Mobs/Customization/Harpy/harpy_tails.rsi state: haven_tone_1 - - sprite: Einstein-Engines/Mobs/Customization/Harpy/harpy_tails.rsi + - sprite: _EE/Mobs/Customization/Harpy/harpy_tails.rsi state: haven_tone_2 - type: marking @@ -218,7 +218,7 @@ fallbackTypes: - !type:SimpleColoring sprites: - - sprite: Einstein-Engines/Mobs/Customization/Harpy/harpy_tails.rsi + - sprite: _EE/Mobs/Customization/Harpy/harpy_tails.rsi state: forked_long - type: marking @@ -234,7 +234,7 @@ fallbackTypes: - !type:SimpleColoring sprites: - - sprite: Einstein-Engines/Mobs/Customization/Harpy/harpy_tails.rsi + - sprite: _EE/Mobs/Customization/Harpy/harpy_tails.rsi state: swallow_tail - type: marking @@ -243,9 +243,9 @@ markingCategory: Arms speciesRestriction: [Harpy] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi + - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi state: harpy_2tone_1 - - sprite: Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi + - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi state: harpy_2tone_2 - type: marking @@ -254,11 +254,11 @@ markingCategory: Arms speciesRestriction: [Harpy] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi + - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi state: harpy_3tone_1 - - sprite: Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi + - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi state: harpy_3tone_2 - - sprite: Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi + - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi state: harpy_3tone_3 - type: marking @@ -267,9 +267,9 @@ markingCategory: Arms speciesRestriction: [Harpy] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi + - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi state: harpy_speckled_1 - - sprite: Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi + - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi state: harpy_speckled_2 - type: marking @@ -278,9 +278,9 @@ markingCategory: Arms speciesRestriction: [Harpy] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi + - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi state: harpy_undertone_1 - - sprite: Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi + - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi state: harpy_undertone_2 - type: marking @@ -289,9 +289,9 @@ markingCategory: Arms speciesRestriction: [Harpy] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi + - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi state: harpy_wingtip_1 - - sprite: Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi + - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi state: harpy_wingtip_2 - type: marking @@ -300,9 +300,9 @@ markingCategory: Arms speciesRestriction: [Harpy] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi + - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi state: bat_wings_tone_1 - - sprite: Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi + - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi state: bat_wings_tone_2 - type: marking @@ -311,8 +311,8 @@ markingCategory: Arms speciesRestriction: [Harpy] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi + - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi state: bionic_wings_tone_1 - - sprite: Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi + - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi state: bionic_wings_tone_2 shader: unshaded diff --git a/Resources/Prototypes/Einstein-Engines/Entities/Mobs/Customization/Markings/oni_feet.yml b/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/oni_feet.yml similarity index 81% rename from Resources/Prototypes/Einstein-Engines/Entities/Mobs/Customization/Markings/oni_feet.yml rename to Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/oni_feet.yml index eb58b69076d0..61a13c62b541 100644 --- a/Resources/Prototypes/Einstein-Engines/Entities/Mobs/Customization/Markings/oni_feet.yml +++ b/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/oni_feet.yml @@ -9,5 +9,5 @@ !type:SimpleColoring color: "#454545" sprites: - - sprite: Einstein-Engines/Mobs/Customization/oni_feet.rsi + - sprite: _EE/Mobs/Customization/oni_feet.rsi state: two_toes diff --git a/Resources/Prototypes/Einstein-Engines/Entities/Mobs/Customization/Markings/oni_horns.yml b/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/oni_horns.yml similarity index 60% rename from Resources/Prototypes/Einstein-Engines/Entities/Mobs/Customization/Markings/oni_horns.yml rename to Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/oni_horns.yml index 3dc309f756f8..92907844a34e 100644 --- a/Resources/Prototypes/Einstein-Engines/Entities/Mobs/Customization/Markings/oni_horns.yml +++ b/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/oni_horns.yml @@ -5,7 +5,7 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns48x48.rsi state: tall_curved - type: marking id: OniHornTallCurved3Tone @@ -14,11 +14,11 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns48x48.rsi state: tall_curved_3tone_1 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns48x48.rsi state: tall_curved_3tone_2 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns48x48.rsi state: tall_curved_3tone_3 - type: marking id: OniHornTallBull @@ -27,7 +27,7 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns48x48.rsi state: tall_bull - type: marking id: OniHornTallBull3Tone @@ -36,11 +36,11 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns48x48.rsi state: tall_bull_3tone_1 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns48x48.rsi state: tall_bull_3tone_2 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns48x48.rsi state: tall_bull_3tone_3 - type: marking id: OniHornCrowned @@ -49,7 +49,7 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: crowned - type: marking @@ -59,7 +59,7 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: serket - type: marking @@ -69,11 +69,11 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: serket_3tone_1 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: serket_3tone_2 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: serket_3tone_3 - type: marking @@ -83,7 +83,7 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: pisces - type: marking @@ -93,9 +93,9 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: pisces_2tone_1 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: pisces_2tone_2 - type: marking @@ -105,11 +105,11 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: pisces_3tone_1 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: pisces_3tone_2 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: pisces_3tone_3 - type: marking @@ -119,7 +119,7 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: virgo - type: marking @@ -129,11 +129,11 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: virgo_3tone_1 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: virgo_3tone_2 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: virgo_3tone_3 - type: marking @@ -143,7 +143,7 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: sagittarius - type: marking @@ -153,11 +153,11 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: sagittarius_3tone_1 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: sagittarius_3tone_2 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: sagittarius_3tone_3 - type: marking @@ -167,7 +167,7 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: vantas - type: marking @@ -177,11 +177,11 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: vantas_3tone_1 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: vantas_3tone_2 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: vantas_3tone_3 - type: marking @@ -191,7 +191,7 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns48x48.rsi state: makara - type: marking @@ -201,9 +201,9 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns48x48.rsi state: makara_2tone_1 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns48x48.rsi state: makara_2tone_2 - type: marking @@ -213,11 +213,11 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns48x48.rsi state: makara_3tone_1 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns48x48.rsi state: makara_3tone_2 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns48x48.rsi state: makara_3tone_3 - type: marking @@ -227,7 +227,7 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: nepeta - type: marking @@ -237,11 +237,11 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: nepeta_3tone_1 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: nepeta_3tone_2 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: nepeta_3tone_3 - type: marking @@ -251,7 +251,7 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: taurus - type: marking @@ -261,9 +261,9 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: taurus_2tone_1 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: taurus_2tone_2 - type: marking @@ -273,11 +273,11 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: taurus_3tone_1 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: taurus_3tone_2 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: taurus_3tone_3 - type: marking @@ -287,7 +287,7 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: aries - type: marking @@ -297,11 +297,11 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: aries_3tone_1 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: aries_3tone_2 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: aries_3tone_3 - type: marking @@ -311,7 +311,7 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: tavris - type: marking @@ -321,11 +321,11 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: tavris_3tone_1 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: tavris_3tone_2 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: tavris_3tone_3 - type: marking @@ -335,7 +335,7 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: inclined - type: marking @@ -345,11 +345,11 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: inclined_3tone_1 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: inclined_3tone_2 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: inclined_3tone_3 - type: marking @@ -359,7 +359,7 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: wavy - type: marking @@ -369,9 +369,9 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: wavy_2tone_1 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: wavy_2tone_2 - type: marking @@ -381,11 +381,11 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: wavy_3tone_1 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: wavy_3tone_2 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: wavy_3tone_3 - type: marking @@ -395,9 +395,9 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: antlers_2tone_1 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: antlers_2tone_2 - type: marking @@ -407,11 +407,11 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: antlers_3tone_1 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: antlers_3tone_2 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: antlers_3tone_3 - type: marking @@ -421,7 +421,7 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: unicorn - type: marking @@ -431,7 +431,7 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: erebia - type: marking @@ -441,11 +441,11 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: erebia_3tone_1 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: erebia_3tone_2 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: erebia_3tone_3 - type: marking @@ -455,9 +455,9 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: erebia - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: erebia_rings - type: marking @@ -467,7 +467,7 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: double_thick - type: marking @@ -477,9 +477,9 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: double_thick_2tone_1 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: double_thick_2tone_2 - type: marking @@ -489,11 +489,11 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: double_thick_3tone_1 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: double_thick_3tone_2 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: double_thick_3tone_3 - type: marking @@ -503,11 +503,11 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: double_curved_3tone_1 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: double_curved_3tone_2 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: double_curved_3tone_3 - type: marking @@ -517,9 +517,9 @@ forcedColoring: false speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: double_curved_outwards_3tone_1 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: double_curved_outwards_3tone_2 - - sprite: Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi + - sprite: _EE/Mobs/Customization/Oni/oni_horns.rsi state: double_curved_outwards_3tone_3 diff --git a/Resources/Prototypes/Einstein-Engines/Entities/Mobs/Customization/Markings/pointy_ears.yml b/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/pointy_ears.yml similarity index 73% rename from Resources/Prototypes/Einstein-Engines/Entities/Mobs/Customization/Markings/pointy_ears.yml rename to Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/pointy_ears.yml index 62a03c44bbd5..b1ec5df09f22 100644 --- a/Resources/Prototypes/Einstein-Engines/Entities/Mobs/Customization/Markings/pointy_ears.yml +++ b/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/pointy_ears.yml @@ -5,7 +5,7 @@ forcedColoring: true speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/pointy_ears.rsi + - sprite: _EE/Mobs/Customization/pointy_ears.rsi state: pointy_ears_standard - type: marking @@ -15,7 +15,7 @@ forcedColoring: true speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/pointy_ears.rsi + - sprite: _EE/Mobs/Customization/pointy_ears.rsi state: pointy_ears_wide - type: marking @@ -25,7 +25,7 @@ forcedColoring: true speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/pointy_ears.rsi + - sprite: _EE/Mobs/Customization/pointy_ears.rsi state: pointy_ears_small - type: marking @@ -35,7 +35,7 @@ forcedColoring: true speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/pointy_ears.rsi + - sprite: _EE/Mobs/Customization/pointy_ears.rsi state: pointy_ears_upwards - type: marking @@ -45,7 +45,7 @@ forcedColoring: true speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/pointy_ears.rsi + - sprite: _EE/Mobs/Customization/pointy_ears.rsi state: pointy_ears_tall - type: marking @@ -55,7 +55,7 @@ forcedColoring: true speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/pointy_ears.rsi + - sprite: _EE/Mobs/Customization/pointy_ears.rsi state: pointy_ears_slanted - type: marking @@ -65,7 +65,7 @@ forcedColoring: true speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/pointy_ears.rsi + - sprite: _EE/Mobs/Customization/pointy_ears.rsi state: pointy_ears_thin - type: marking @@ -75,7 +75,7 @@ forcedColoring: true speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/pointy_ears.rsi + - sprite: _EE/Mobs/Customization/pointy_ears.rsi state: pointy_ears_large - type: marking @@ -85,5 +85,5 @@ forcedColoring: true speciesRestriction: [Oni] sprites: - - sprite: Einstein-Engines/Mobs/Customization/pointy_ears.rsi + - sprite: _EE/Mobs/Customization/pointy_ears.rsi state: pointy_ears_none diff --git a/Resources/Prototypes/Einstein-Engines/Entities/Mobs/Customization/Markings/tusks.yml b/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/tusks.yml similarity index 78% rename from Resources/Prototypes/Einstein-Engines/Entities/Mobs/Customization/Markings/tusks.yml rename to Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/tusks.yml index c5cd2c58530a..52789ed8dcaa 100644 --- a/Resources/Prototypes/Einstein-Engines/Entities/Mobs/Customization/Markings/tusks.yml +++ b/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/tusks.yml @@ -9,7 +9,7 @@ !type:SimpleColoring color: "#d9d9d9" sprites: - - sprite: Einstein-Engines/Mobs/Customization/goblin_tusks.rsi + - sprite: _EE/Mobs/Customization/goblin_tusks.rsi state: goblin_tusks_small - type: marking @@ -23,5 +23,5 @@ !type:SimpleColoring color: "#d9d9d9" sprites: - - sprite: Einstein-Engines/Mobs/Customization/goblin_tusks.rsi + - sprite: _EE/Mobs/Customization/goblin_tusks.rsi state: goblin_tusks_big diff --git a/Resources/Prototypes/Einstein-Engines/Entities/Mobs/Customization/cyberlimbs/comp1.yml b/Resources/Prototypes/_EE/Entities/Mobs/Customization/cyberlimbs/comp1.yml similarity index 62% rename from Resources/Prototypes/Einstein-Engines/Entities/Mobs/Customization/cyberlimbs/comp1.yml rename to Resources/Prototypes/_EE/Entities/Mobs/Customization/cyberlimbs/comp1.yml index 9795b96e7088..de00242f59ca 100644 --- a/Resources/Prototypes/Einstein-Engines/Entities/Mobs/Customization/cyberlimbs/comp1.yml +++ b/Resources/Prototypes/_EE/Entities/Mobs/Customization/cyberlimbs/comp1.yml @@ -4,11 +4,11 @@ markingCategory: Arms speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] sprites: - - sprite: Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi + - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi state: l_arm-primary - - sprite: Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi + - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi state: l_arm-secondary - - sprite: Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi + - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi state: l_arm-tertiary - type: marking @@ -17,7 +17,7 @@ markingCategory: Arms speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] sprites: - - sprite: Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi + - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi state: l_hand - type: marking @@ -26,9 +26,9 @@ markingCategory: Legs speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] sprites: - - sprite: Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi + - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi state: l_leg-primary - - sprite: Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi + - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi state: l_leg-secondary @@ -38,7 +38,7 @@ markingCategory: Legs speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] sprites: - - sprite: Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi + - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi state: l_foot @@ -49,11 +49,11 @@ markingCategory: Arms speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] sprites: - - sprite: Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi + - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi state: r_arm-primary - - sprite: Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi + - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi state: r_arm-secondary - - sprite: Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi + - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi state: r_arm-tertiary @@ -63,7 +63,7 @@ markingCategory: Arms speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] sprites: - - sprite: Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi + - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi state: r_hand - type: marking @@ -72,9 +72,9 @@ markingCategory: Legs speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] sprites: - - sprite: Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi + - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi state: r_leg-primary - - sprite: Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi + - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi state: r_leg-secondary @@ -84,5 +84,5 @@ markingCategory: Legs speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] sprites: - - sprite: Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi + - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi state: r_foot diff --git a/Resources/Prototypes/Einstein-Engines/Entities/Mobs/Customization/cyberlimbs/comp2.yml b/Resources/Prototypes/_EE/Entities/Mobs/Customization/cyberlimbs/comp2.yml similarity index 59% rename from Resources/Prototypes/Einstein-Engines/Entities/Mobs/Customization/cyberlimbs/comp2.yml rename to Resources/Prototypes/_EE/Entities/Mobs/Customization/cyberlimbs/comp2.yml index 125631374553..fd9b42cfd7b9 100644 --- a/Resources/Prototypes/Einstein-Engines/Entities/Mobs/Customization/cyberlimbs/comp2.yml +++ b/Resources/Prototypes/_EE/Entities/Mobs/Customization/cyberlimbs/comp2.yml @@ -4,9 +4,9 @@ markingCategory: Arms speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] sprites: - - sprite: Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi + - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi state: l_arm-1 - - sprite: Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi + - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi state: l_arm-2 - type: marking @@ -15,9 +15,9 @@ markingCategory: Arms speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] sprites: - - sprite: Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi + - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi state: l_hand-1 - - sprite: Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi + - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi state: l_hand-2 - type: marking @@ -26,9 +26,9 @@ markingCategory: Legs speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] sprites: - - sprite: Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi + - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi state: l_leg-1 - - sprite: Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi + - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi state: l_leg-2 @@ -38,9 +38,9 @@ markingCategory: Legs speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] sprites: - - sprite: Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi + - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi state: l_foot-1 - - sprite: Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi + - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi state: l_foot-2 @@ -51,9 +51,9 @@ markingCategory: Arms speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] sprites: - - sprite: Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi + - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi state: r_arm-1 - - sprite: Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi + - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi state: r_arm-2 @@ -63,9 +63,9 @@ markingCategory: Arms speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] sprites: - - sprite: Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi + - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi state: r_hand-1 - - sprite: Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi + - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi state: r_hand-2 @@ -75,9 +75,9 @@ markingCategory: Legs speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] sprites: - - sprite: Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi + - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi state: r_leg-1 - - sprite: Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi + - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi state: r_leg-2 @@ -87,7 +87,7 @@ markingCategory: Legs speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] sprites: - - sprite: Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi + - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi state: r_foot-1 - - sprite: Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi + - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi state: r_foot-2 diff --git a/Resources/Prototypes/Einstein-Engines/SoundCollections/harpy.yml b/Resources/Prototypes/_EE/SoundCollections/harpy.yml similarity index 100% rename from Resources/Prototypes/Einstein-Engines/SoundCollections/harpy.yml rename to Resources/Prototypes/_EE/SoundCollections/harpy.yml diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_large.png b/Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_large.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_large.png rename to Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_large.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_ears.rsi/meta.json b/Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_ears.rsi/meta.json similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_ears.rsi/meta.json rename to Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_ears.rsi/meta.json diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_tails.rsi/forked_long.png b/Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_tails.rsi/forked_long.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_tails.rsi/forked_long.png rename to Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_tails.rsi/forked_long.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_tails.rsi/haven_tone_1.png b/Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_tails.rsi/haven_tone_1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_tails.rsi/haven_tone_1.png rename to Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_tails.rsi/haven_tone_1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_tails.rsi/haven_tone_2.png b/Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_tails.rsi/haven_tone_2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_tails.rsi/haven_tone_2.png rename to Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_tails.rsi/haven_tone_2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_tails.rsi/huescale_forked_tailfin.png b/Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_tails.rsi/huescale_forked_tailfin.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_tails.rsi/huescale_forked_tailfin.png rename to Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_tails.rsi/huescale_forked_tailfin.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json b/Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json rename to Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_tails.rsi/swallow_tail.png b/Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_tails.rsi/swallow_tail.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_tails.rsi/swallow_tail.png rename to Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_tails.rsi/swallow_tail.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_tails.rsi/whitescale_forked_tailfin.png b/Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_tails.rsi/whitescale_forked_tailfin.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_tails.rsi/whitescale_forked_tailfin.png rename to Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_tails.rsi/whitescale_forked_tailfin.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_tails48x48.rsi/meta.json b/Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_tails48x48.rsi/meta.json similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_tails48x48.rsi/meta.json rename to Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_tails48x48.rsi/meta.json diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_eyes.png b/Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_eyes.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_eyes.png rename to Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_eyes.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_feathers.png b/Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_feathers.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_feathers.png rename to Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_tails48x48.rsi/peacock_tail_feathers.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/bat_wings_tone_1.png b/Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/bat_wings_tone_1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/bat_wings_tone_1.png rename to Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/bat_wings_tone_1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/bat_wings_tone_2.png b/Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/bat_wings_tone_2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/bat_wings_tone_2.png rename to Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/bat_wings_tone_2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/bionic_wings_tone_1.png b/Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/bionic_wings_tone_1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/bionic_wings_tone_1.png rename to Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/bionic_wings_tone_1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/bionic_wings_tone_2.png b/Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/bionic_wings_tone_2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/bionic_wings_tone_2.png rename to Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/bionic_wings_tone_2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/classic_harpy.png b/Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/classic_harpy.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/classic_harpy.png rename to Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/classic_harpy.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_2tone_1.png b/Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_2tone_1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_2tone_1.png rename to Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_2tone_1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_2tone_2.png b/Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_2tone_2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_2tone_2.png rename to Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_2tone_2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_3tone_1.png b/Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_3tone_1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_3tone_1.png rename to Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_3tone_1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_3tone_2.png b/Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_3tone_2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_3tone_2.png rename to Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_3tone_2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_3tone_3.png b/Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_3tone_3.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_3tone_3.png rename to Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_3tone_3.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_speckled_1.png b/Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_speckled_1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_speckled_1.png rename to Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_speckled_1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_speckled_2.png b/Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_speckled_2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_speckled_2.png rename to Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_speckled_2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_undertone_1.png b/Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_undertone_1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_undertone_1.png rename to Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_undertone_1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_undertone_2.png b/Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_undertone_2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_undertone_2.png rename to Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_undertone_2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_wingtip_1.png b/Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_wingtip_1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_wingtip_1.png rename to Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_wingtip_1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_wingtip_2.png b/Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_wingtip_2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_wingtip_2.png rename to Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/harpy_wingtip_2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/huescale_harpy.png b/Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/huescale_harpy.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/huescale_harpy.png rename to Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/huescale_harpy.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/huescale_harpy_folded.png b/Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/huescale_harpy_folded.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/huescale_harpy_folded.png rename to Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/huescale_harpy_folded.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/huescale_harpy_wing_owl.png b/Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/huescale_harpy_wing_owl.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/huescale_harpy_wing_owl.png rename to Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/huescale_harpy_wing_owl.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json b/Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json rename to Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/whitescale_harpy.png b/Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/whitescale_harpy.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/whitescale_harpy.png rename to Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/whitescale_harpy.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/whitescale_harpy_folded.png b/Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/whitescale_harpy_folded.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/whitescale_harpy_folded.png rename to Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/whitescale_harpy_folded.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/whitescale_harpy_wing_owl.png b/Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/whitescale_harpy_wing_owl.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Harpy/harpy_wings.rsi/whitescale_harpy_wing_owl.png rename to Resources/Textures/_EE/Mobs/Customization/Harpy/harpy_wings.rsi/whitescale_harpy_wing_owl.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/antlers_2tone_1.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/antlers_2tone_1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/antlers_2tone_1.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/antlers_2tone_1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/antlers_2tone_2.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/antlers_2tone_2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/antlers_2tone_2.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/antlers_2tone_2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/antlers_3tone_1.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/antlers_3tone_1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/antlers_3tone_1.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/antlers_3tone_1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/antlers_3tone_2.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/antlers_3tone_2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/antlers_3tone_2.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/antlers_3tone_2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/antlers_3tone_3.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/antlers_3tone_3.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/antlers_3tone_3.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/antlers_3tone_3.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/aries.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/aries.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/aries.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/aries.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/aries_3tone_1.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/aries_3tone_1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/aries_3tone_1.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/aries_3tone_1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/aries_3tone_2.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/aries_3tone_2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/aries_3tone_2.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/aries_3tone_2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/aries_3tone_3.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/aries_3tone_3.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/aries_3tone_3.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/aries_3tone_3.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/crowned.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/crowned.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/crowned.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/crowned.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/double_curved_3tone_1.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/double_curved_3tone_1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/double_curved_3tone_1.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/double_curved_3tone_1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/double_curved_3tone_2.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/double_curved_3tone_2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/double_curved_3tone_2.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/double_curved_3tone_2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/double_curved_3tone_3.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/double_curved_3tone_3.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/double_curved_3tone_3.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/double_curved_3tone_3.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/double_curved_outwards_3tone_1.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/double_curved_outwards_3tone_1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/double_curved_outwards_3tone_1.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/double_curved_outwards_3tone_1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/double_curved_outwards_3tone_2.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/double_curved_outwards_3tone_2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/double_curved_outwards_3tone_2.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/double_curved_outwards_3tone_2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/double_curved_outwards_3tone_3.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/double_curved_outwards_3tone_3.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/double_curved_outwards_3tone_3.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/double_curved_outwards_3tone_3.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/double_thick.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/double_thick.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/double_thick.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/double_thick.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/double_thick_2tone_1.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/double_thick_2tone_1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/double_thick_2tone_1.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/double_thick_2tone_1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/double_thick_2tone_2.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/double_thick_2tone_2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/double_thick_2tone_2.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/double_thick_2tone_2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/double_thick_3tone_1.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/double_thick_3tone_1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/double_thick_3tone_1.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/double_thick_3tone_1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/double_thick_3tone_2.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/double_thick_3tone_2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/double_thick_3tone_2.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/double_thick_3tone_2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/double_thick_3tone_3.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/double_thick_3tone_3.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/double_thick_3tone_3.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/double_thick_3tone_3.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/erebia.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/erebia.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/erebia.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/erebia.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/erebia_3tone_1.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/erebia_3tone_1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/erebia_3tone_1.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/erebia_3tone_1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/erebia_3tone_2.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/erebia_3tone_2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/erebia_3tone_2.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/erebia_3tone_2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/erebia_3tone_3.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/erebia_3tone_3.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/erebia_3tone_3.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/erebia_3tone_3.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/erebia_rings.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/erebia_rings.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/erebia_rings.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/erebia_rings.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/inclined.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/inclined.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/inclined.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/inclined.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/inclined_3tone_1.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/inclined_3tone_1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/inclined_3tone_1.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/inclined_3tone_1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/inclined_3tone_2.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/inclined_3tone_2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/inclined_3tone_2.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/inclined_3tone_2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/inclined_3tone_3.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/inclined_3tone_3.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/inclined_3tone_3.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/inclined_3tone_3.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/meta.json b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/meta.json similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/meta.json rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/meta.json diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/nepeta.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/nepeta.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/nepeta.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/nepeta.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/nepeta_3tone_1.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/nepeta_3tone_1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/nepeta_3tone_1.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/nepeta_3tone_1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/nepeta_3tone_2.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/nepeta_3tone_2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/nepeta_3tone_2.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/nepeta_3tone_2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/nepeta_3tone_3.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/nepeta_3tone_3.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/nepeta_3tone_3.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/nepeta_3tone_3.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/pisces.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/pisces.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/pisces.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/pisces.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/pisces_2tone_1.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/pisces_2tone_1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/pisces_2tone_1.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/pisces_2tone_1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/pisces_2tone_2.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/pisces_2tone_2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/pisces_2tone_2.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/pisces_2tone_2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/pisces_3tone_1.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/pisces_3tone_1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/pisces_3tone_1.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/pisces_3tone_1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/pisces_3tone_2.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/pisces_3tone_2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/pisces_3tone_2.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/pisces_3tone_2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/pisces_3tone_3.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/pisces_3tone_3.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/pisces_3tone_3.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/pisces_3tone_3.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/sagittarius.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/sagittarius.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/sagittarius.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/sagittarius.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/sagittarius_3tone_1.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/sagittarius_3tone_1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/sagittarius_3tone_1.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/sagittarius_3tone_1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/sagittarius_3tone_2.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/sagittarius_3tone_2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/sagittarius_3tone_2.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/sagittarius_3tone_2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/sagittarius_3tone_3.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/sagittarius_3tone_3.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/sagittarius_3tone_3.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/sagittarius_3tone_3.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/serket.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/serket.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/serket.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/serket.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/serket_3tone_1.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/serket_3tone_1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/serket_3tone_1.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/serket_3tone_1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/serket_3tone_2.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/serket_3tone_2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/serket_3tone_2.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/serket_3tone_2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/serket_3tone_3.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/serket_3tone_3.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/serket_3tone_3.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/serket_3tone_3.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/taurus.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/taurus.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/taurus.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/taurus.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/taurus_2tone_1.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/taurus_2tone_1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/taurus_2tone_1.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/taurus_2tone_1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/taurus_2tone_2.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/taurus_2tone_2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/taurus_2tone_2.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/taurus_2tone_2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/taurus_3tone_1.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/taurus_3tone_1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/taurus_3tone_1.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/taurus_3tone_1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/taurus_3tone_2.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/taurus_3tone_2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/taurus_3tone_2.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/taurus_3tone_2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/taurus_3tone_3.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/taurus_3tone_3.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/taurus_3tone_3.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/taurus_3tone_3.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/tavris.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/tavris.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/tavris.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/tavris.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/tavris_3tone_1.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/tavris_3tone_1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/tavris_3tone_1.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/tavris_3tone_1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/tavris_3tone_2.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/tavris_3tone_2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/tavris_3tone_2.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/tavris_3tone_2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/tavris_3tone_3.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/tavris_3tone_3.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/tavris_3tone_3.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/tavris_3tone_3.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/unicorn.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/unicorn.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/unicorn.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/unicorn.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/vantas.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/vantas.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/vantas.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/vantas.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/vantas_3tone_1.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/vantas_3tone_1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/vantas_3tone_1.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/vantas_3tone_1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/vantas_3tone_2.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/vantas_3tone_2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/vantas_3tone_2.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/vantas_3tone_2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/vantas_3tone_3.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/vantas_3tone_3.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/vantas_3tone_3.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/vantas_3tone_3.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/virgo.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/virgo.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/virgo.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/virgo.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/virgo_3tone_1.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/virgo_3tone_1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/virgo_3tone_1.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/virgo_3tone_1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/virgo_3tone_2.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/virgo_3tone_2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/virgo_3tone_2.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/virgo_3tone_2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/virgo_3tone_3.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/virgo_3tone_3.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/virgo_3tone_3.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/virgo_3tone_3.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/wavy.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/wavy.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/wavy.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/wavy.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/wavy_2tone_1.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/wavy_2tone_1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/wavy_2tone_1.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/wavy_2tone_1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/wavy_2tone_2.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/wavy_2tone_2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/wavy_2tone_2.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/wavy_2tone_2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/wavy_3tone_1.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/wavy_3tone_1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/wavy_3tone_1.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/wavy_3tone_1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/wavy_3tone_2.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/wavy_3tone_2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/wavy_3tone_2.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/wavy_3tone_2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/wavy_3tone_3.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/wavy_3tone_3.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns.rsi/wavy_3tone_3.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns.rsi/wavy_3tone_3.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi/makara.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns48x48.rsi/makara.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi/makara.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns48x48.rsi/makara.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi/makara_2tone_1.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns48x48.rsi/makara_2tone_1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi/makara_2tone_1.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns48x48.rsi/makara_2tone_1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi/makara_2tone_2.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns48x48.rsi/makara_2tone_2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi/makara_2tone_2.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns48x48.rsi/makara_2tone_2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi/makara_3tone_1.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns48x48.rsi/makara_3tone_1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi/makara_3tone_1.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns48x48.rsi/makara_3tone_1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi/makara_3tone_2.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns48x48.rsi/makara_3tone_2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi/makara_3tone_2.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns48x48.rsi/makara_3tone_2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi/makara_3tone_3.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns48x48.rsi/makara_3tone_3.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi/makara_3tone_3.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns48x48.rsi/makara_3tone_3.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi/meta.json b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns48x48.rsi/meta.json similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi/meta.json rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns48x48.rsi/meta.json diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull_3tone_1.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull_3tone_1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull_3tone_1.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull_3tone_1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull_3tone_2.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull_3tone_2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull_3tone_2.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull_3tone_2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull_3tone_3.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull_3tone_3.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull_3tone_3.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_bull_3tone_3.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved_3tone_1.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved_3tone_1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved_3tone_1.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved_3tone_1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved_3tone_2.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved_3tone_2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved_3tone_2.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved_3tone_2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved_3tone_3.png b/Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved_3tone_3.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved_3tone_3.png rename to Resources/Textures/_EE/Mobs/Customization/Oni/oni_horns48x48.rsi/tall_curved_3tone_3.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/l_arm-primary.png b/Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/l_arm-primary.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/l_arm-primary.png rename to Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/l_arm-primary.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/l_arm-secondary.png b/Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/l_arm-secondary.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/l_arm-secondary.png rename to Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/l_arm-secondary.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/l_arm-tertiary.png b/Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/l_arm-tertiary.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/l_arm-tertiary.png rename to Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/l_arm-tertiary.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/l_foot.png b/Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/l_foot.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/l_foot.png rename to Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/l_foot.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/l_hand.png b/Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/l_hand.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/l_hand.png rename to Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/l_hand.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/l_leg-primary.png b/Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/l_leg-primary.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/l_leg-primary.png rename to Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/l_leg-primary.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/l_leg-secondary.png b/Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/l_leg-secondary.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/l_leg-secondary.png rename to Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/l_leg-secondary.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/meta.json b/Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/meta.json similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/meta.json rename to Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/meta.json diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/r_arm-primary.png b/Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/r_arm-primary.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/r_arm-primary.png rename to Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/r_arm-primary.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/r_arm-secondary.png b/Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/r_arm-secondary.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/r_arm-secondary.png rename to Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/r_arm-secondary.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/r_arm-tertiary.png b/Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/r_arm-tertiary.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/r_arm-tertiary.png rename to Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/r_arm-tertiary.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/r_foot.png b/Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/r_foot.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/r_foot.png rename to Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/r_foot.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/r_hand.png b/Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/r_hand.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/r_hand.png rename to Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/r_hand.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/r_leg-primary.png b/Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/r_leg-primary.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/r_leg-primary.png rename to Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/r_leg-primary.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/r_leg-secondary.png b/Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/r_leg-secondary.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/r_leg-secondary.png rename to Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi/r_leg-secondary.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/l_arm-1.png b/Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/l_arm-1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/l_arm-1.png rename to Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/l_arm-1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/l_arm-2.png b/Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/l_arm-2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/l_arm-2.png rename to Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/l_arm-2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/l_foot-1.png b/Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/l_foot-1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/l_foot-1.png rename to Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/l_foot-1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/l_foot-2.png b/Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/l_foot-2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/l_foot-2.png rename to Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/l_foot-2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/l_hand-1.png b/Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/l_hand-1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/l_hand-1.png rename to Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/l_hand-1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/l_hand-2.png b/Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/l_hand-2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/l_hand-2.png rename to Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/l_hand-2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/l_leg-1.png b/Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/l_leg-1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/l_leg-1.png rename to Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/l_leg-1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/l_leg-2.png b/Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/l_leg-2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/l_leg-2.png rename to Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/l_leg-2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/meta.json b/Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/meta.json similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/meta.json rename to Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/meta.json diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/r_arm-1.png b/Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/r_arm-1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/r_arm-1.png rename to Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/r_arm-1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/r_arm-2.png b/Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/r_arm-2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/r_arm-2.png rename to Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/r_arm-2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/r_foot-1.png b/Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/r_foot-1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/r_foot-1.png rename to Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/r_foot-1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/r_foot-2.png b/Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/r_foot-2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/r_foot-2.png rename to Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/r_foot-2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/r_hand-1.png b/Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/r_hand-1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/r_hand-1.png rename to Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/r_hand-1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/r_hand-2.png b/Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/r_hand-2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/r_hand-2.png rename to Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/r_hand-2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/r_leg-1.png b/Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/r_leg-1.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/r_leg-1.png rename to Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/r_leg-1.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/r_leg-2.png b/Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/r_leg-2.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/r_leg-2.png rename to Resources/Textures/_EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi/r_leg-2.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_big.png b/Resources/Textures/_EE/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_big.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_big.png rename to Resources/Textures/_EE/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_big.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_none.png b/Resources/Textures/_EE/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_none.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_none.png rename to Resources/Textures/_EE/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_none.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_small.png b/Resources/Textures/_EE/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_small.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_small.png rename to Resources/Textures/_EE/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_small.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/goblin_tusks.rsi/meta.json b/Resources/Textures/_EE/Mobs/Customization/goblin_tusks.rsi/meta.json similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/goblin_tusks.rsi/meta.json rename to Resources/Textures/_EE/Mobs/Customization/goblin_tusks.rsi/meta.json diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/oni_feet.rsi/meta.json b/Resources/Textures/_EE/Mobs/Customization/oni_feet.rsi/meta.json similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/oni_feet.rsi/meta.json rename to Resources/Textures/_EE/Mobs/Customization/oni_feet.rsi/meta.json diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/oni_feet.rsi/two_toes.png b/Resources/Textures/_EE/Mobs/Customization/oni_feet.rsi/two_toes.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/oni_feet.rsi/two_toes.png rename to Resources/Textures/_EE/Mobs/Customization/oni_feet.rsi/two_toes.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/pointy_ears.rsi/meta.json b/Resources/Textures/_EE/Mobs/Customization/pointy_ears.rsi/meta.json similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/pointy_ears.rsi/meta.json rename to Resources/Textures/_EE/Mobs/Customization/pointy_ears.rsi/meta.json diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/pointy_ears.rsi/pointy_ears_large.png b/Resources/Textures/_EE/Mobs/Customization/pointy_ears.rsi/pointy_ears_large.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/pointy_ears.rsi/pointy_ears_large.png rename to Resources/Textures/_EE/Mobs/Customization/pointy_ears.rsi/pointy_ears_large.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/pointy_ears.rsi/pointy_ears_none.png b/Resources/Textures/_EE/Mobs/Customization/pointy_ears.rsi/pointy_ears_none.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/pointy_ears.rsi/pointy_ears_none.png rename to Resources/Textures/_EE/Mobs/Customization/pointy_ears.rsi/pointy_ears_none.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/pointy_ears.rsi/pointy_ears_slanted.png b/Resources/Textures/_EE/Mobs/Customization/pointy_ears.rsi/pointy_ears_slanted.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/pointy_ears.rsi/pointy_ears_slanted.png rename to Resources/Textures/_EE/Mobs/Customization/pointy_ears.rsi/pointy_ears_slanted.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/pointy_ears.rsi/pointy_ears_small.png b/Resources/Textures/_EE/Mobs/Customization/pointy_ears.rsi/pointy_ears_small.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/pointy_ears.rsi/pointy_ears_small.png rename to Resources/Textures/_EE/Mobs/Customization/pointy_ears.rsi/pointy_ears_small.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/pointy_ears.rsi/pointy_ears_standard.png b/Resources/Textures/_EE/Mobs/Customization/pointy_ears.rsi/pointy_ears_standard.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/pointy_ears.rsi/pointy_ears_standard.png rename to Resources/Textures/_EE/Mobs/Customization/pointy_ears.rsi/pointy_ears_standard.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/pointy_ears.rsi/pointy_ears_tall.png b/Resources/Textures/_EE/Mobs/Customization/pointy_ears.rsi/pointy_ears_tall.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/pointy_ears.rsi/pointy_ears_tall.png rename to Resources/Textures/_EE/Mobs/Customization/pointy_ears.rsi/pointy_ears_tall.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/pointy_ears.rsi/pointy_ears_thin.png b/Resources/Textures/_EE/Mobs/Customization/pointy_ears.rsi/pointy_ears_thin.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/pointy_ears.rsi/pointy_ears_thin.png rename to Resources/Textures/_EE/Mobs/Customization/pointy_ears.rsi/pointy_ears_thin.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/pointy_ears.rsi/pointy_ears_upwards.png b/Resources/Textures/_EE/Mobs/Customization/pointy_ears.rsi/pointy_ears_upwards.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/pointy_ears.rsi/pointy_ears_upwards.png rename to Resources/Textures/_EE/Mobs/Customization/pointy_ears.rsi/pointy_ears_upwards.png diff --git a/Resources/Textures/Einstein-Engines/Mobs/Customization/pointy_ears.rsi/pointy_ears_wide.png b/Resources/Textures/_EE/Mobs/Customization/pointy_ears.rsi/pointy_ears_wide.png similarity index 100% rename from Resources/Textures/Einstein-Engines/Mobs/Customization/pointy_ears.rsi/pointy_ears_wide.png rename to Resources/Textures/_EE/Mobs/Customization/pointy_ears.rsi/pointy_ears_wide.png From 47749d98029d9179bfd6b6e3fa98a80fa6382c12 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 26 Jan 2025 07:35:59 +0000 Subject: [PATCH 204/205] Update Credits (#2802) Co-authored-by: DeltaV-Bot --- Resources/Credits/GitHub.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt index 89ed3ccb7a26..a943100c64c6 100644 --- a/Resources/Credits/GitHub.txt +++ b/Resources/Credits/GitHub.txt @@ -1 +1 @@ -0tito, 0x6273, 12rabbits, 13spacemen, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 2digitman, 3nderall, 4310v343k, 4dplanner, 612git, 778b, Ablankmann, abregado, Absolute-Potato, Acruid, actioninja, ActiveMammmoth, actually-reb, ada-please, adamsong, Adeinitas, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, Agoichi, Ahion, aiden, Aikakakah, aitorlogedo, ajcm, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexum418, alexumandxgabriel08x, Alithsko, ALMv1, Alpaccalypse, Alpha-Two, AlphaQwerty, Altoids1, amatwiedle, amylizzle, ancientpower, Andre19926, AndrewEyeke, AndreyCamper, angelofallars, Anzarot121, Appiah, ar4ill, ArchPigeon, ArchRBX, areitpog, Arendian, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringlich, aspiringLich, astriloqua, august-sun, AutoOtter, Avalon-Proto, AverageNotDoingAnythingEnjoyer, avghdev, Awlod, azzy, azzyisnothere, AzzyIsNotHere, baa14453, BackeTako, BananaFlambe, Baptr0b0t, BarryNorfolk, BasedPugilist, BasedUser, Batuh1n, beck-thompson, BellwetherLogic, ben, benev0, benjamin-burges, BGare, bhespiritu, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, BlitzTheSquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, Booblesnoot42, boogiebogus, Boolean-Buckeye, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, Bribrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, capnsockless, CaptainMaru, CaptainSqrBeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, Catofquestionableethics, CatTheSystem, Centronias, chairbender, Charlese2, charlie, ChaseFlorom, chavonadelal, Cheackraze, CheddaCheez, cheesePizza2, cheeseplated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbygummibear, Ciac32, civilCornball, Clement-O, clyf, Clyybber, CMDR-Piboy314, CodedCrow, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, CookieMasterT, coolboy911, coolmankid12345, Coolsurf6, corentt, CormosLemming, CrafterKolyan, crazybrain23, creadth, CrigCrag, croilbird, Crotalus, CrudeWax, CrzyPotato, cutemoongod, Cyberboss, d34d10cc, dabigoose, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, DangerRevolution, daniel-cr, DanSAussieITS, Daracke, DarkenedSynergy, Darkenson, DawBla, Daxxi3, dch-GH, de0rix, Deahaka, dean, DEATHB4DEFEAT, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DefinitelyNotFurryXD, degradka, Delete69, deltanedas, DeltaV-Bot, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, dexlerxd, dffdff2423, dge21, DieselMohawk, digitalic, Dimastra, DinoWattz, Dirius77, DisposableCrewmember42, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DoctorBeard, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, dootythefrooty, Dorragon, Doru991, dotcatshark, DoubleRiceEddiedd, DoutorWhite, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, dylanstrategie, dylanwhittingham, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, ElectroSR, elsie, elthundercloud, Elysium206, Emily9031, Emisse, emmafornash, EmoGarbage404, Endecc, eoineoineoin, eris, erohrs2, ERORR404V1, Errant-4, esguard, estacaoespacialpirata, Eternally-Confused, eugene, ewokswagger, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, FATFSAAM2, Feluk6174, ficcialfaint, FieldCommand, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, firenamefn, FirinMaLazors, Fishfish458, fl-oz, Flareguy, flashgnash, FluffiestFloof, FluffMe, FluidRock, flyingkarii, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, Fouin, foxhorn, freeman2651, freeze2222, Froffy025, Fromoriss, froozigiusz, FrostMando, FryOfDestiny, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, gamer3107, gansulalan, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, gluesniffler, GNF54, godisdeadLOL, goet, Goldminermac, Golinth, GoodWheatley, Gorox221, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, greggthefather, GreyMario, GTRsound, Guess-My-Name, gusxyz, Gyrandola, h3half, Haltell, Hanzdegloker, HappyRoach, Hardly3D, harikattar, HawkeyeBlade, he1acdvv, Hebi, Henry, HerCoyote23, HighTechPuddle, hitomishirichan, hiucko, hivehum, Hmeister-fake, Hmeister-real, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hreno, HTMLSystem, hubismal, Hugal31, Huxellberger, Hyenh, hyphenationc, i-justuser-i, iacore, iamnotgray, IamVelcroboy, ian, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imrenq, imweax, indeano, Injazz, Insineer, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jaskanbe, JasperJRoth, jerryimmouse, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jmcb, joe, JoeHammad1844, JohnGinnane, johnku1, Jophire, joshepvodka, Jrpl, jtbill123, juliangiebel, juniwoofs, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, JustinWinningham, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, KaiShibaa, kalane15, kalanosh, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KieueCaprie, Killerqu00, Kimpes, KingFroozy, kira-er, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kosticia, koteq, Kr8art, KrasnoshchekovPavel, Krunklehorn, Kupie, Kurzaen, kxvvv, kyupolaris, kzhanik, lajolico, Lamrr, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonidussaks, leonsfriedrich, LetterN, lettern, Level10Cybermancer, LEVELcat, lever1209, LevitatingTree, Lgibb18, lgruthes, LightVillet, liltenhead, LinkUyx, LioValkyria, Litraxx, LittleBuilderJane, LittleNyanCat, lizelive, lleftTheDragon, localcc, lokachop, Lomcastar, LordCarve, LordEclipse, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luizwritescode, Lukasz825700516, luminight, lunarcomets, luringens, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M3739, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, MagnusCrowe, malchanceux, MaloTV, manelnavola, ManelNavola, Mangohydra, marboww, Markek1, Matz05, max, MaxNox7, maylokana, mazzie, MehimoNemo, MeltedPixel, MemeProof, memoblob, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, mifia, MilenVolf, MilonPL, Minemoder5000, Minty642, minus1over12, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterMecky, Mith-randalf, MjrLandWhale, mkanke-real, MLGTASTICa, mnemotechnician, moderatelyaware, modern-nm, mokiros, Moneyl, Monotheonist, Moomoobeef, moony, Morb0, MossyGreySlope, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, muburu, MureixloI, musicmanvr, MWKane, Myakot, Myctai, N3X15, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, NIXC, NkoKirkto, nmajask, noctyrnal, noelkathegod, nok-ko, NonchalantNoob, NoobyLegion, Nopey, not-gavnaed, notafet, notquitehadouken, notsodana, noudoit, noverd, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, NullWanderer, nyeogmi, Nylux, Nyranu, och-och, ocotheomega, OctoRocket, OldDanceJacket, onesch, OnyxTheBrave, OrangeMoronage9622, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paige404, paigemaeforrest, pali6, Pangogie, panzer-iv1, paolordls, partyaddict, patrikturi, PaulRitter, peccneck, Peptide90, peptron1, PeterFuto, PetMudstone, pewter-wiz, Pgriha, Phantom-Lily, PHCodes, pheenty, Phill101, phunnyguy, PilgrimViis, Pill-U, pinkbat5, Piras314, Pireax, pissdemon, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, pofitlo, pointer-to-null, pok27, poklj, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, PPooch, ProfanedBane, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykana, psykzz, PuceTint, PuroSlavKing, PursuitInAshes, Putnam3145, qrtDaniil, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, RedBookcase, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, ReeZer2, RemberBM, RemieRichards, RemTim, Remuchi, rene-descartes2021, Renlou, retequizzle, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, RobbyTheFish, Rockdtben, Rohesie, rok-povsic, rolfero, RomanNovo, rosieposieeee, Roudenn, router, RumiTiger, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, SaphireLattice, SapphicOverload, sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, schrodinger71, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, Segonist, sephtasm, Serkket, sewerpig, sh18rw, Shaddap1, ShadeAware, ShadowCommander, shadowtheprotogen546, shadowwailker, shaeone, shampunj, shariathotpatrol, ShatteredSwords, SignalWalker, siigiil, SimpleStation14, Simyon264, sirdragooon, Sirionaut, SirSmith148, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, sleepyyapril, Slyfox333, Smugman, snebl, sniperchance, Snowni, snowsignal, solaris7518, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, southbridge-fur, sowelipililimute, Soydium, spacelizard, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, Spanky, spartak, SpartanKadence, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, Squishy77, SsalamethVersaach, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, Stealthbomber16, stellar-novas, stomf, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, superjj18, Supernorn, SweptWasTaken, Sybil, SYNCHRONIC, Szunti, TadJohnson00, Tainakov, takemysoult, tap, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TeenSarlacc, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, TGRCdev, tgrkzus, ThataKat, ThatGuyUSA, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, theashtronaut, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheIntoxicatedCat, thekilk, themias, theomund, TheOneWhoIsManyFrame, TherapyGoth, therealDLondon, TheShuEd, thetolbean, thevinter, TheWaffleJesus, Thinbug0, ThunderBear2006, Timemaster99, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, Titian3, tk-a369, tkdrg, tmtmtl30, toasterpm87, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomce795, Tomeno, Tonydatguy, topy, Tornado-Technology, tosatur, TotallyLemon, Tr1bute, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, Tyzemol, UbaserB, ubis1, UBlueberry, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, Unkn0wnGh0st333, unusualcrow, Uriende, UristMcDorf, user424242420, Vaaankas, valentfingerov, Varen, Vasilis, VasilisThePikachu, Velcroboy, veliebm, VelonacepsCalyxEggs, venn, veprolet, veritable-calamity, Veritius, Vermidia, vero5123, Verslebas, Vexerot, VigersRay, violet754, Visne, vitalvitriol, vlados1408, VMSolidus, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, vulppine, wafehling, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, widgetbeck, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, wrexbe, WTCWR68, xkreksx, xprospero, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, Yousifb26, youtissoum, yunii, YuriyKiss, yuriykiss, zach-hill, Zadeon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zHonys, zionnBE, ZNixian, ZoldorfTheWizard, zonespace27, ZweiHawke, Zylofan, Zymem, zzylex +0tito, 0x6273, 12rabbits, 13spacemen, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 2digitman, 3nderall, 4310v343k, 4dplanner, 612git, 778b, Ablankmann, abregado, Absolute-Potato, Acruid, actioninja, ActiveMammmoth, actually-reb, ada-please, adamsong, Adeinitas, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, Agoichi, Ahion, aiden, Aikakakah, aitorlogedo, ajcm, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexum418, alexumandxgabriel08x, Alithsko, ALMv1, Alpaccalypse, Alpha-Two, AlphaQwerty, Altoids1, amatwiedle, amylizzle, ancientpower, Andre19926, AndrewEyeke, AndreyCamper, angelofallars, Anzarot121, Appiah, ar4ill, ArchPigeon, ArchRBX, areitpog, Arendian, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringlich, aspiringLich, astriloqua, august-sun, AutoOtter, Avalon-Proto, AverageNotDoingAnythingEnjoyer, avghdev, Awlod, azzy, AzzyIsNotHere, azzyisnothere, baa14453, BackeTako, BananaFlambe, Baptr0b0t, BarryNorfolk, BasedPugilist, BasedUser, Batuh1n, beck-thompson, BellwetherLogic, ben, benev0, benjamin-burges, BGare, bhespiritu, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, BlitzTheSquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, Booblesnoot42, boogiebogus, Boolean-Buckeye, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, Bribrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, capnsockless, CaptainMaru, CaptainSqrBeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, Catofquestionableethics, CatTheSystem, Centronias, chairbender, Charlese2, charlie, ChaseFlorom, chavonadelal, Cheackraze, CheddaCheez, cheesePizza2, cheeseplated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbygummibear, Ciac32, civilCornball, Clement-O, clyf, Clyybber, CMDR-Piboy314, CodedCrow, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, CookieMasterT, coolboy911, coolmankid12345, Coolsurf6, corentt, CormosLemming, CrafterKolyan, crazybrain23, creadth, CrigCrag, croilbird, Crotalus, CrudeWax, CrzyPotato, cutemoongod, Cyberboss, d34d10cc, dabigoose, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, DangerRevolution, daniel-cr, DanSAussieITS, Daracke, DarkenedSynergy, Darkenson, DawBla, Daxxi3, dch-GH, de0rix, Deahaka, dean, DEATHB4DEFEAT, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DefinitelyNotFurryXD, degradka, Delete69, deltanedas, DeltaV-Bot, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, dexlerxd, dffdff2423, dge21, DieselMohawk, digitalic, Dimastra, DinoWattz, Dirius77, DisposableCrewmember42, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DoctorBeard, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, dootythefrooty, Dorragon, Doru991, dotcatshark, DoubleRiceEddiedd, DoutorWhite, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, dylanstrategie, dylanwhittingham, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, ElectroSR, elsie, elthundercloud, ElusiveCoin, Elysium206, Emily9031, Emisse, emmafornash, EmoGarbage404, Endecc, eoineoineoin, eris, erohrs2, ERORR404V1, Errant-4, esguard, estacaoespacialpirata, Eternally-Confused, eugene, ewokswagger, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, FATFSAAM2, Feluk6174, ficcialfaint, FieldCommand, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, firenamefn, FirinMaLazors, Fishfish458, fl-oz, Flareguy, flashgnash, FluffiestFloof, FluffMe, FluidRock, flyingkarii, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, Fouin, foxhorn, freeman2651, freeze2222, Froffy025, Fromoriss, froozigiusz, FrostMando, FryOfDestiny, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, gamer3107, gansulalan, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, gluesniffler, GNF54, godisdeadLOL, goet, Goldminermac, Golinth, GoodWheatley, Gorox221, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, greggthefather, GreyMario, GTRsound, Guess-My-Name, gusxyz, Gyrandola, h3half, Haltell, Hanzdegloker, HappyRoach, Hardly3D, harikattar, HawkeyeBlade, he1acdvv, Hebi, Henry, HerCoyote23, HighTechPuddle, hitomishirichan, hiucko, hivehum, Hmeister-fake, Hmeister-real, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hreno, HTMLSystem, hubismal, Hugal31, Huxellberger, Hyenh, hyphenationc, i-justuser-i, iacore, iamnotgray, IamVelcroboy, ian, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imrenq, imweax, indeano, Injazz, Insineer, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jaskanbe, JasperJRoth, JerryImMouse, jerryimmouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jmcb, joe, JoeHammad1844, JohnGinnane, johnku1, Jophire, joshepvodka, Jrpl, jtbill123, juliangiebel, juniwoofs, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, JustinWinningham, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, KaiShibaa, kalane15, kalanosh, Kanashi-Panda, katzenminer, kbailey-git, keekee38, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KieueCaprie, Killerqu00, Kimpes, KingFroozy, kira-er, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kosticia, koteq, Kr8art, KrasnoshchekovPavel, Krunklehorn, Kupie, Kurzaen, kxvvv, kyupolaris, kzhanik, lajolico, Lamrr, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonidussaks, leonsfriedrich, lettern, LetterN, Level10Cybermancer, LEVELcat, lever1209, LevitatingTree, Lgibb18, lgruthes, LightVillet, liltenhead, LinkUyx, LioValkyria, Litraxx, LittleBuilderJane, LittleNyanCat, lizelive, lleftTheDragon, localcc, lokachop, Lomcastar, LordCarve, LordEclipse, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luizwritescode, Lukasz825700516, luminight, lunarcomets, luringens, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M3739, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, MagnusCrowe, malchanceux, MaloTV, manelnavola, ManelNavola, Mangohydra, marboww, Markek1, Matz05, max, MaxNox7, maylokana, mazzie, MehimoNemo, MeltedPixel, MemeProof, memoblob, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, mifia, MilenVolf, MilonPL, Minemoder5000, Minty642, minus1over12, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterMecky, Mith-randalf, MjrLandWhale, mkanke-real, MLGTASTICa, mnemotechnician, moderatelyaware, modern-nm, mokiros, Moneyl, Monotheonist, Moomoobeef, moony, Morb0, MossyGreySlope, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, muburu, MureixloI, musicmanvr, MWKane, Myakot, Myctai, N3X15, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, NIXC, NkoKirkto, nmajask, noctyrnal, noelkathegod, nok-ko, NonchalantNoob, NoobyLegion, Nopey, not-gavnaed, notafet, notquitehadouken, notsodana, noudoit, noverd, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, NullWanderer, nyeogmi, Nylux, Nyranu, och-och, ocotheomega, OctoRocket, OldDanceJacket, onesch, OnyxTheBrave, OrangeMoronage9622, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paige404, paigemaeforrest, pali6, Pangogie, panzer-iv1, paolordls, partyaddict, patrikturi, PaulRitter, peccneck, Peptide90, peptron1, PeterFuto, PetMudstone, pewter-wiz, Pgriha, Phantom-Lily, PHCodes, pheenty, Phill101, phunnyguy, PilgrimViis, Pill-U, pinkbat5, Piras314, Pireax, pissdemon, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, pofitlo, pointer-to-null, pok27, poklj, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, PPooch, ProfanedBane, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykana, psykzz, PuceTint, PuroSlavKing, PursuitInAshes, Putnam3145, qrtDaniil, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, RedBookcase, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, ReeZer2, RemberBM, RemieRichards, RemTim, Remuchi, rene-descartes2021, Renlou, retequizzle, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, RobbyTheFish, Rockdtben, Rohesie, rok-povsic, rolfero, RomanNovo, rosieposieeee, Roudenn, router, RumiTiger, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, SaphireLattice, SapphicOverload, sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, schrodinger71, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, Segonist, sephtasm, Serkket, sewerpig, sh18rw, Shaddap1, ShadeAware, ShadowCommander, shadowtheprotogen546, shadowwailker, shaeone, shampunj, shariathotpatrol, ShatteredSwords, SignalWalker, siigiil, SimpleStation14, Simyon264, sirdragooon, Sirionaut, SirSmith148, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, sleepyyapril, Slyfox333, Smugman, snebl, sniperchance, Snowni, snowsignal, solaris7518, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, southbridge-fur, sowelipililimute, Soydium, spacelizard, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, Spanky, spartak, SpartanKadence, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, Squishy77, SsalamethVersaach, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, Stealthbomber16, stellar-novas, stomf, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, superjj18, Supernorn, SweptWasTaken, Sybil, SYNCHRONIC, Szunti, TadJohnson00, Tainakov, takemysoult, tap, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TeenSarlacc, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, TGRCdev, tgrkzus, ThataKat, ThatGuyUSA, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, theashtronaut, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheIntoxicatedCat, thekilk, themias, theomund, TheOneWhoIsManyFrame, TherapyGoth, therealDLondon, TheShuEd, thetolbean, thevinter, TheWaffleJesus, Thinbug0, ThunderBear2006, Timemaster99, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, Titian3, tk-a369, tkdrg, tmtmtl30, toasterpm87, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomce795, Tomeno, Tonydatguy, topy, Tornado-Technology, tosatur, TotallyLemon, Tr1bute, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, Tyzemol, UbaserB, ubis1, UBlueberry, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, Unkn0wnGh0st333, unusualcrow, Uriende, UristMcDorf, user424242420, Vaaankas, valentfingerov, Varen, Vasilis, VasilisThePikachu, Velcroboy, veliebm, VelonacepsCalyxEggs, venn, veprolet, veritable-calamity, Veritius, Vermidia, vero5123, Verslebas, Vexerot, VigersRay, violet754, Visne, vitalvitriol, vlados1408, VMSolidus, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, vulppine, wafehling, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, widgetbeck, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, wrexbe, wtcwr68, xkreksx, xprospero, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, Yousifb26, youtissoum, yunii, yuriykiss, YuriyKiss, zach-hill, Zadeon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zHonys, zionnBE, ZNixian, ZoldorfTheWizard, zonespace27, ZweiHawke, Zylofan, Zymem, zzylex From b79792548324f441dc7070e9c9c173628fe9cb70 Mon Sep 17 00:00:00 2001 From: GeneralGaws Date: Sun, 26 Jan 2025 22:42:12 +0300 Subject: [PATCH 205/205] 121 --- .github/workflows/build-docfx.yml | 2 +- .github/workflows/build-map-renderer.yml | 2 +- .github/workflows/build-test-debug.yml | 2 +- .github/workflows/publish.yml | 2 +- .github/workflows/test-packaging.yml | 2 +- .github/workflows/yaml-linter.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-docfx.yml b/.github/workflows/build-docfx.yml index 2842578abc80..3201cbb05e8c 100644 --- a/.github/workflows/build-docfx.yml +++ b/.github/workflows/build-docfx.yml @@ -21,7 +21,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v3.2.0 with: - dotnet-version: 9.0.x + dotnet-version: 9.0.100 - name: Install dependencies run: dotnet restore diff --git a/.github/workflows/build-map-renderer.yml b/.github/workflows/build-map-renderer.yml index 9c81e8fc4862..fdfe8d840b4e 100644 --- a/.github/workflows/build-map-renderer.yml +++ b/.github/workflows/build-map-renderer.yml @@ -36,7 +36,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v3.2.0 with: - dotnet-version: 9.0.x + dotnet-version: 9.0.100 - name: Install dependencies run: dotnet restore diff --git a/.github/workflows/build-test-debug.yml b/.github/workflows/build-test-debug.yml index 101d5557be96..6ce804c0e03b 100644 --- a/.github/workflows/build-test-debug.yml +++ b/.github/workflows/build-test-debug.yml @@ -36,7 +36,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v3.2.0 with: - dotnet-version: 9.0.x + dotnet-version: 9.0.100 - name: Install dependencies run: dotnet restore diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 93ae21b72dfe..ca134b9bd6f9 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -22,7 +22,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v3.2.0 with: - dotnet-version: 9.0.x + dotnet-version: 9.0.100 - name: Get Engine Tag run: | diff --git a/.github/workflows/test-packaging.yml b/.github/workflows/test-packaging.yml index c83fe51f1897..90753dac4429 100644 --- a/.github/workflows/test-packaging.yml +++ b/.github/workflows/test-packaging.yml @@ -51,7 +51,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v3.2.0 with: - dotnet-version: 9.0.x + dotnet-version: 9.0.100 - name: Install dependencies run: dotnet restore diff --git a/.github/workflows/yaml-linter.yml b/.github/workflows/yaml-linter.yml index 434e8e7692b3..19348187eb5e 100644 --- a/.github/workflows/yaml-linter.yml +++ b/.github/workflows/yaml-linter.yml @@ -26,7 +26,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v3.2.0 with: - dotnet-version: 9.0.x + dotnet-version: 9.0.100 - name: Install dependencies run: dotnet restore - name: Build