From 4b24d2959e2d1281ce618270c72df64643cc8ef2 Mon Sep 17 00:00:00 2001 From: psykana <36602558+psykana@users.noreply.github.com> Date: Sun, 26 Oct 2025 15:36:36 +0000 Subject: [PATCH 001/121] Internals: prioritize gas tanks over jetpacks (#35068) * Internals: prioritize gas tanks over jetpacks * Use HasComp --- .../Body/Systems/SharedInternalsSystem.cs | 37 ++++++++++++++----- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/Content.Shared/Body/Systems/SharedInternalsSystem.cs b/Content.Shared/Body/Systems/SharedInternalsSystem.cs index 7db02a376c..c0dc6c1172 100644 --- a/Content.Shared/Body/Systems/SharedInternalsSystem.cs +++ b/Content.Shared/Body/Systems/SharedInternalsSystem.cs @@ -7,6 +7,7 @@ using Content.Shared.Hands.Components; using Content.Shared.IdentityManagement; using Content.Shared.Internals; using Content.Shared.Inventory; +using Content.Shared.Movement.Components; using Content.Shared.Popups; using Content.Shared.Verbs; using Robust.Shared.Containers; @@ -258,11 +259,15 @@ public abstract class SharedInternalsSystem : EntitySystem Entity user) { // TODO use _respirator.CanMetabolizeGas() to prioritize metabolizable gasses - // Prioritise - // 1. back equipped tanks - // 2. exo-slot tanks - // 3. in-hand tanks - // 4. pocket/belt tanks + // Lookup order: + // 1. Back + // 2. Exo-slot + // 3. In-hand + // 4. Pocket/belt + // Jetpacks will only be used as a fallback if no other tank is found + + // Store the first jetpack seen + Entity? found = null; if (!Resolve(user, ref user.Comp2, ref user.Comp3)) return null; @@ -271,22 +276,36 @@ public abstract class SharedInternalsSystem : EntitySystem TryComp(backEntity, out var backGasTank) && _gasTank.CanConnectToInternals((backEntity.Value, backGasTank))) { - return (backEntity.Value, backGasTank); + found = (backEntity.Value, backGasTank); + if (!HasComp(backEntity.Value)) + { + return found; + } } if (_inventory.TryGetSlotEntity(user, "suitstorage", out var entity, user.Comp2, user.Comp3) && TryComp(entity, out var gasTank) && _gasTank.CanConnectToInternals((entity.Value, gasTank))) { - return (entity.Value, gasTank); + found ??= (entity.Value, gasTank); + if (!HasComp(entity.Value)) + { + return (entity.Value, gasTank); + } } foreach (var item in _inventory.GetHandOrInventoryEntities((user.Owner, user.Comp1, user.Comp2))) { if (TryComp(item, out gasTank) && _gasTank.CanConnectToInternals((item, gasTank))) - return (item, gasTank); + { + found ??= (item, gasTank); + if (!HasComp(item)) + { + return (item, gasTank); + } + } } - return null; + return found; } } From 03d8ca461b7b9580d0d0b3a79e621dbdd5fca075 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 26 Oct 2025 15:49:14 +0000 Subject: [PATCH 002/121] 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 ba2ba073c7..bb4bccd354 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Seam_Less - changes: - - message: Practice Magazines are now white, Incendiary Magazines are now orange. - type: Tweak - id: 8657 - time: '2025-06-11T20:03:14.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37709 - author: Princess-Cheeseballs changes: - message: Basilisk projectile speed and movement speed has been reduced and is @@ -3929,3 +3922,11 @@ id: 9158 time: '2025-10-26T10:36:06.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/41049 +- author: psykana + changes: + - message: Toggle internals now uses jetpack only if there's no proper gas tank + equipped + type: Tweak + id: 9159 + time: '2025-10-26T15:48:07.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/35068 From eb625a5b50724755a7179d008d59e7ab3989315a Mon Sep 17 00:00:00 2001 From: Huaqas Date: Mon, 27 Oct 2025 02:25:23 +0800 Subject: [PATCH 003/121] Add Crazy Lube to the Toy Box. (#36292) * Add crazy lube to the toy box. * Decrease volume from 100u to 60u. * Bring it back to 100u now lube evaporates. * 4 space indent Co-authored-by: Southbridge <7013162+southbridge-fur@users.noreply.github.com> --------- Co-authored-by: Southbridge <7013162+southbridge-fur@users.noreply.github.com> --- .../Prototypes/Catalog/Fills/Crates/fun.yml | 2 +- .../Prototypes/Entities/Objects/Fun/toys.yml | 32 ++++++++++++++++++ .../Textures/Objects/Fun/glue.rsi/icon.png | Bin 16048 -> 562 bytes .../Objects/Fun/glue.rsi/icon_open.png | Bin 570 -> 595 bytes .../Objects/Fun/glue.rsi/inhand-left.png | Bin 20730 -> 368 bytes .../Objects/Fun/glue.rsi/inhand-right.png | Bin 20738 -> 378 bytes .../Textures/Objects/Fun/glue.rsi/meta.json | 2 +- .../Textures/Objects/Fun/lube.rsi/icon.png | Bin 0 -> 539 bytes .../Objects/Fun/lube.rsi/icon_open.png | Bin 0 -> 577 bytes .../Objects/Fun/lube.rsi/inhand-left.png | Bin 0 -> 355 bytes .../Objects/Fun/lube.rsi/inhand-right.png | Bin 0 -> 376 bytes .../Textures/Objects/Fun/lube.rsi/meta.json | 25 ++++++++++++++ 12 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Objects/Fun/lube.rsi/icon.png create mode 100644 Resources/Textures/Objects/Fun/lube.rsi/icon_open.png create mode 100644 Resources/Textures/Objects/Fun/lube.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Fun/lube.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Fun/lube.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index a92463a75e..d35ceaa033 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml @@ -428,7 +428,7 @@ contents: - id: SnapPopBox - id: CrazyGlue - amount: 2 + - id: CrazyLube - id: PlasticBanana - id: WhoopieCushion - id: ToyHammer diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index a4cdfcf731..12eaf2cee6 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -1087,6 +1087,38 @@ tags: - DrinkSpaceGlue +- type: entity + parent: DrinkBase + id: CrazyLube + name: crazy lube + description: A bottle of super slipery crazy lube manufactured by Honk! Co. + components: + - type: Openable + sound: + collection: packetOpenSounds + - type: Sprite + sprite: Objects/Fun/lube.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - type: Appearance + - type: SolutionContainerManager + solutions: + drink: + maxVol: 100 + reagents: + - ReagentId: SpaceLube + Quantity: 100 + - type: GenericVisualizer + visuals: + enum.OpenableVisuals.Opened: + enum.OpenableVisuals.Layer: + True: {state: "icon_open"} + False: {state: "icon"} + - type: Lube + - type: TrashOnSolutionEmpty + solution: drink + - type: entity parent: BaseItem id: NewtonCradle diff --git a/Resources/Textures/Objects/Fun/glue.rsi/icon.png b/Resources/Textures/Objects/Fun/glue.rsi/icon.png index 8e0223811980f9f77832c185a9f936ac646375e8..3906f21a0b060ed665eb81a49f7687152280c890 100644 GIT binary patch delta 537 zcmV+!0_Od&eX<0QB!2;OQb$4nuFf3k0005(Nkl-ps=PE>EkDLWo*`r+*f*JFf|V*m0l7-YGVX zx2g^)?>qWf{93!|RDFXBfVIg^G5Ycu0l$~Q%&~Yg{z~q%@92?gV7v5h1DMv0YXId% zm^r*~om>fEcU}{Lr`-Sq{9XWF9GwXyO4=0wfO&b{aCIZ8Mx^Vy_?=HGm6D!?mS;fM zbuk^EXtMiz27dss$|nFq7D9Ou*7exyJq55Js1h#)U|v{Fw(qxxL4Yf(d93XK03)Mg z4bML92>{!hAO1W*er|#MFSbB941ifEz|@p9fK(@3oT;)nQ^luggjZMbX&UiZm3XWw zomdH=u3#cTC=?=?NHoCR8$dJ~!PnJAG#XJ#sti!Mx_@DBc#U$&*n+xXksJ zZ@hh{wy#M=ZKnGHupNi<(iXPk0I;9!QA#ci0C2jrgkc!ij)P$slvh@ilY?X#+La0b zh1ppOKW+6gycdAi>+cyF8g8)F8&Uf6CpNaWr2+o>kxaT3=W+*a1!(JeAel^hWPeN^ b^q?Oe7!s8x;a!Du00000NkvXXu0mjf&%yd^ literal 16048 zcmeI3e{37o9l$ROjY?<`(tuVOtT!WQM|ZiO{&lmjP2+S4o3k|aRJW{@^WD4T6#LHj z&aoRn>B_W~wM8pvf-yGIqE&^C3REaX5uy|7G=>TS3Y$iRHi3X426U973^w-8zy0Do zRe&^YdZ)zp_kG{@`+eWf_r34={_w5CL*MG^?Czu}s%vl{HUi&i?|*Rze03%#&%n3y zvjdwPin`#--hUf)_dUxfDsr=#NV>`RcVx}Z^r*U>0zJh{7S4vc)y1r;jRTiXfl!@p@cR$u7!2qYNaz$l%azRa8l!;ipJWH{_Anx=J`GMSWwgo0VC%P$={i#2!00%JSiGnB@dk5EwXvakg2m zT4XHein5ccpBQkooSAh^+oCEXRJ$s9WwNzEmQ!H|DY8X1%kn)O+sa7S zYBt$?E?ruhuCX8uGQe^jXvep-%Z}Nu?TpzAgsiC-3=C@$kJn*3Dtp&7>cwgDAt?wuA*0NG%ejOIA4#js7bxvb#EZ1x{OFo&*tv}A zDrQC<1#H$Djj;8>hMBcpCHL8BI|r8q6fwfK8g6M7v$edpt$QsEIItK_Ly=&qN(XnX zI@&y1RisU&+%|MuGj+KhR8j?^xz4|FDEhyr8qDODFZ32>YgVZFl(UDVg* z`7Mn$M{G<7w_a}>#N+ay<+v(LXE3I~fgTgCET|b;AQ13wO z&rt|Ro%noZFv0;o6%cubQw@z#gHno7`Jl#V@DQjf+@oO;?!?brhEReRWg#H*T($B3 z_sZY_FGttLRBIII3R}&rI`F?#xpV7>pS5x=ZkhiFl`Egb=AKyXv-5js#QU}+!~P3< zfm-T&@CGw)tiET;^OIg5P3KGVg8~OHmiJyOrj2UUbQ9jRQH`3`Ex%`(t|C;TA;S$; z-dDQv_l*tk=>sSMzhCr6SacY*7&eO_os60A`-bD)2}BsFWP>VN8g5$1ut8BVESIX` zIiYkLE04mb5cmMZ)}Dao-QjBYpD*%5J)d;L4e>zf(y?F(Gpw;5WGlm;rSq1 zf(rqH7YQyrA4E%VAwcjV!G-68XbCO^2wo((@O%(0!G!?9iv$;*527Ww5FmJw;KK7k zv;-Fd1TPX?cs_`h;6i}lMS=^@2hkE-2oStTaN+qNT7nA!f)@!cJRd|$a3MhOBEf~{ zgJ=mZ1PERvxbS=sEy0BV!HWbJo)4lWxDX(Ck>JAfL9_%H0t7D-TzEc+mf%8w;6;K9 z&j-;GTnG@nNO0l#AX4T@FEshXZ<(Dz=A&{F2G+5PlP6x!e1NH z+Q3Mhq9(7TsO`5<)ZC}={cjYN=P2s!>nTdUi=vj=w{JbMj-uKg9E|lQihq9R&Y5pN zHN5P^)W)|DP4m4EDG&W3|1kaT;UOk;@$5b4?V`8rnp$(!zDpK8|KxA`SFAWOczRL( zC%abuY2BfhrGo?eZa8>(VtD`Aj^%}Co(R4^dx!JvM_c|Hy70Q&*9Jp`ylAX&B{ovlN=`-)YwWou6 z_vDUX;GN5sPi%fPKy}~U-FEB`*M+wK^ml7czj5{ziJm=gz_+(paO7WJYPCQ8<{Ph_ zF5dL%Et$hpC+^G~G&j#2F#kRh3(Xu6&P-az?2EQP_}Wv`TYt3p#&6DS6{a6~`iROs z{=V_-k{_=c|M`-+I-Sxo-|45Hra`lxVF+6x+^X2zuRxUbzzw+T#JHHgY znM%KB{blvBPuf4)ab$LG=DA;;ZNEQp&8drzPhI=(Rc(5}qFb diff --git a/Resources/Textures/Objects/Fun/glue.rsi/icon_open.png b/Resources/Textures/Objects/Fun/glue.rsi/icon_open.png index cc2039df905dbc1377f6b1fbc5a8e7355f4ab6cd..23be4f59d3ec8932a2d7fb1461aebd74d70b7409 100644 GIT binary patch delta 558 zcmV+}0@3}t1k(hNFn1vfUNp4JM$x7P>n#Oo4y`Aph!=ZG zuwWrKPYso7S@2Z)19I?^NDieQ3jG0stpqCAh`rVn5+ba4&`UNJyK%b~K}yC$T}TW_ zW_GOzeJ{&?v){ZAv-5p3@V{zn-Vj^!h6p-OU#}kuaqOjO8h-#Us^0+6r^awMt6k%v z1GH=9?pZN;^&+uogwgE}A_H=+Z91cx*e-o)OgT3cfFKG4U^|C_0hIOtz;3-1j3YexT?xpW^#iN5)0B{-~0fa1sauxVG7l|AJIEr&g zCE0sUSM0}8tq)+|=^hIm0N}>t&5n27I1fN^{n_6K*uDRd-QQxdL;?W2Qh}KnX#lB4 zv@qLZVYY>C7$laL(G7$2bc^(KOWIfoz}HANOFSNDB!8RjfIBgOR4R$y-%l!)R5Dct zXzm~KdSZn}-R9Czl1ANTXLN~!uits{RPA7u%33d72Eg?^KG!#JJr964JA+E*(f|OT z78kKB3)l0oEQ>~=pllA3W#~4W095AYsQilgWq2Y0*Vk4VAD`%m`HiUb>Lt%NiqZi8 w{7xv{iYLqEx1j=rdLPK;a+>Uo=v1fr3HUyv7O>GxUjP6A07*qoM6N<$f{`@@EC2ui delta 533 zcmV+w0_y$K1iA!}Fnp2Wze)y_Afv} zn^y6J$(i#bgzp1oWYe-^??O8RhsFPGptJR3Xaibz0N{Jj8alW(wr#6gtyXC?8Xs)i zRtGEoj<^m?-ngzVSYrU3JvRctXMY3#!Lu01>wwlTXn)<*k^K=-1{}xPH{IoOSzHeW z&Vb`Ms!%ArI)7lBlA0L04p^2oZdum2u3mHpZohaq^ZVSj>8k*&y?c|4|7!yPQxli= zj4fkKBdn%@Wbtm_T#(81)~Z#Sb8}(?qC2p(&}C_%i(#5%R#q@fllj>$^Rr!XU@ZeX zBwd$ODn-(D_n12}1NnRoV|0{!KBpB_+d%8fH=fSiBY*JgT%61i_;o5*ZqeS{;?8}& z7cEjfTAczQj3PGt$AnP?z*;4t6R!t*?WK_ Xt(`e6x(-Jr00000NkvXXu0mjfk~RW4 diff --git a/Resources/Textures/Objects/Fun/glue.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/glue.rsi/inhand-left.png index 6678c2db8dc57daa6d3c7aa9d817a9a04c7c1b57..12542316ffc49267d714df67e1fcb49fbfaf1748 100644 GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zwLD!MLn`LH zy=Caf(Q4+FYTQ#TCj)wlWiiWx7zb$|L zSKXq2zvhgdig6myOa=yp*4?*@_dkD^7h8X87gtPu*yY``zpZ|As>ts1)0%0i>?XdO zPj6&)s;%4Oz3u<{N|tTk`6oWM5{x?VG^7>3`Y**Q;-@ z3166K{(9>5uXaUG`n8H?e9DapeLF4a%>RZM4F_3=UZyLISBPb-{lOH}f3{m+A@riU zbAETYxv?~l`_=unl2SbGp7BW+S!-;2C#Q?VIvlBOS;XD3qrX5_)a_|e{sG+|t$Yj& bAD+);OzHA4vPs^57UWw`S3j3^P6U)a;|E$)Py;Q3il_*FRoc)h*g&nIAgC1~o;UBknYXjE z$-c?PT6qIIGkf1TzkBcRoO|v$_riQ~|GqnK8rnW&7{*Q0dnXUT=dS4QhPT7}x#0en z;p4{o-os79c*oZ0Z#uQh{b>J$2Cu=iv`A3V8lR-Qa2xfc zrWAn$YM!XI#4@Ticf=qm&ZKV2Mo@1BVXYM53NKu2jSUY+9d%yGycX)6j%v+>J7BTA zEb3)4g3JAslO0>kfP_nWa93?A$*jNy)YOo;Ybh%!e8!dMmGm;(mtW1RSVFQMxt8BE~ zueq<*WGEM-^)X(Px(UW;W{d=;YDa+GVs2$?`d~h&l0EM3-P~eRCgbkz2{KN1kK2}Q z;qh^9(>?BJIa=!=*zG;>fTTSRU@DY>s&q$o5EGDPspHKf%dg+aZ@1Xh$LQf?qbAU z!7Yg8t`=%Q5Ai9X%moiIZ6Lh8%LwcPKR(tLW0E@Fz|a<@m_c}g0VWGQ|ET8z$dcl% zvHcZ7k8p);BWBq?GCk8q9J>s;L}?+Zc1`!nks8vd5e1vA=V4DOpCI9Dj+ABkh;t8k zwLL5WNV~+kBCjc!ZxO{!Y$NKq0$Bp~DA-F~WK&xzEM4hvzJ4&_LINiVvOx`o7rB*V z667;XeTgYB04YwtydrL0nXhD%q041EQ4%>bQ<<(cTLO}y>B(v|xd50Vjy65Y6jCN^ z=F&GY49e5U_c*n=W>WJwvs|g(&3F>%w0D4BBkO?;hJ&+5J8_yntlo*^ac00)b#!+l zfT~i=XJk@CITDN^Eroo?w~%6{g*+2XFI~v0V58UE5$!A)=F$gdRabk1C~G{iGQDeO zjR*DpD_gr+W4r#Vi$+sN)y>#&THbUD#yCYx62*3vR1q?&9IG;_88ocQ6|LQ2bu>p~ zfnc>c*GIuB^|kw0I;v}zt2tt*w$$1n&CqWxiH07ZgKT^~xKLo~(l zt1|HG$; z7@Nho5*dvYMr(EAU06G=8+jrg#8m-@ff`DAzY#8!IwuIFR#+1C`g|Zo6iUm-YbrTf z>(t$;^)eX$MF&;75#$LfnNiA=rqWw%&Q~2q;XFW5$$SKdA{MfI6UtVTI0)(|+vOI= zK8BN$0d})Ej24TsolzuPOp=6Lwb2BI^1@;qd6L)&(k_MIumuuKVY-S~gbHimy|3?) zWoC!$UC`Z4YGp35juYASq##}Rbjy1)_rOk^NS8!n(X~m*1etbdxk3buf@~+^rk!Lk zdONy?`~Aj+)3?r?uX<&!uhttZoc_PA%-Dxl)_Z9Uxw<|~i{W^)-xH-MQ7I2= zsme#AJH4pRhnlmU6jtG|byZsit^Mp!RIkr3w(D_+VtAEF^q#0@ANQ&rzPxJoaj$Au z^PXDJs=~cNdoVrC8LjBzF}@W$2$$`;YFieA6RqCnUXA_1vYtOQ8NjVrGdgjw;Yh8m z)BB*W;^DOvGY=BQc-dsG#oLC7TjA0j?)%G~3;&GG+WE+}dF#&T+TgcQi%xQpThLX| zm5YH~!i9Ggbmd|omvG@-1zouq$R%8OS3y@U2671(-c`_*i-BCig?ANndsl!}R3%?DC6$e({?({Q%$c&>z^=Z*02tkvq0;dvNOX z&D%e4a_^l#F{XcU-Cd_1+j3#g!_RK{@h#OIPyYLWAikdSd*ZGZ*ihesxRq zn|_(ssj07h=8iL)hh}g4-H|s+rw?qOn)E(>{p$~%ee6fK{_Wv&k3Vwuxv#wXz@=?x zpL+h{zrOmBt)tE>-`h0u(q}Kc{Lx2$e(u-jFFy19w|@4^o1c8md+F(41z-47YuE1& zKk>y9B*%&yvdKmLH> mj3@eE`p(DT+oemJjc>be+dTfx&$-cq>8X8_U*CP?!T$hv>!XAK diff --git a/Resources/Textures/Objects/Fun/glue.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/glue.rsi/inhand-right.png index 1388227cbd3da61ae08ca2d6358c04927af64c86..b8d15b2450e0442a91bb26e743cf53af45af0fbf 100644 GIT binary patch literal 378 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zO*~y3Ln`LH zy|vMc*-@nR;qFCEFSJ*>?h?`b#L(2bw)MA5*-9N97T4tTrInKfJ~73uek-p=fS?83{1OPO%oM`|6 literal 20738 zcmeHPZ-`u16@P6sb`ztvRxL(koG2>w?%Y4`-yL?R**}T9nn{*qOEy(%@4NTD-7&lK zCNr~t68j<458{_plol!ZAfgDO;)e=~NF;F-pqS5Z)Rtc zeUpu~@&s8!I)CHjJ?cHflni*3F!! z7c15A{7c`zl+RVvc>bhS#^u_SUaHKTtLqczj?T+-rzKbU2TFU!Hi`hSqMIVOv9erk z6gS56E!-k}51R}5TuY>RdOSZ7c9>fz&*i3qy3SdnHj>zOatrR)T6S#1&q!+8od4!;U(yXkII|PDj;7#2v6$*bub> z8O4P`N=kNgYOD3-*3gtJ=w-d4tIY=Jk%4-(rJxx!mVzz1>^$DGW3WlN-06GZcvn^i zcHL+mS_29qN(X8-=Fir2;ka%Dt97Xlt-(|d44QqTd0cm`vkfQ^9|+W}_*>wFPqrjM zZ&bEW3!k*rT0Ye_^%#&=oT_Wl4C?biuv}`p>s)M$+|*RdJ#!y8S*faEz45`ZLcdDa zak^-FS~PWuV(>+R5vKFRDl)4`ocl2;Vw?bJOZH)u16A?Q#uyA?3t@Mjz~V5AW)DU} zvL6E$q7qH9EtI5e0!PWBAJkVwvs76Ti@H#&E{+wtjS0z)dlsjH<)9A3(j_)l7}Pva zYdVmt;rf`UO5FfsG!jMvQ?(+%q*&~2jUOymO60IRIms<{$Yk7|oFWr+a>BN33r|dN zn;v$@3gKD@!EW!72Sn}d0Hy+2QN`}4v6Mnn3Ng!e!IVTR7qf^EL2VO(<0#E+ z&NS0Q5~7$C9#ayz!k2AAgee7bEk-FN62oMMg|;adMEk(CidN%JEg2hqZE;f|=7=a>bM9iqUBNAg z<*pWLNDuKTq09vjF>N5cwaW!!TMV7^5ZH?fVV=L%#A*rQ-Cb&*YNsjzgV!}<2XgbN9rB*+Fe7+&aBj!BTu zF!d#-zyPE;gYt@YYj3`iOonch?Sx5Wxm=vBHktyGq1owDIJpWiMVY3y4O@ZFJb05Z z9sxTeBA#u7YjPhVSSz#aRqtjz5p>);Ko8D(i0KN;w;?rAJkB3B@5JqKCcrjzbgW*1 zs!}W`WMV@(5{w}&g?z`ikYc8VJQGYWUC63nqu1OK@mvPLZ0c&J5@wBOd(*pC)_6jn z>22+1jjj5xCh83xRyX7MxV-5UjO`RLN)%gFQc=jTaxBTPX3(%Ids@50>S&I&1uC1( zxjhOtsc+rK`jW2RsOD%xwWPKNX#{?AUDWl&B4p#+DTmsqy=wjNgICFp7@{H8Zp{o# za$5_RBWgj^acmPKS1JqH5S1;{_K2gL*vttl_D?aKOoCu2{h(|kVd)p1X_ybi5U&RP z-Lc6fQC-xkREUQYH}p^Ef7xQL<6_2qiag3qx^R$Hz}5r)#jT2)0yYn{3~ zwq63`zv!S!*DGm)N@A2UrYZLtoAWJ)Q8*7!R5BmIp@@Yn--NQ&Bo2c5$#%KLv5(=T zWQg6Y9Y(W7*~%!QEhb7rZrx~5xL{^N+D#ylcPS)bLMep=wxFF51;;MK8g1Z_Wnzcy zU(nr6syCO|#)<59Qjjiuyyd-`dtfI{#Oy{E-I|m{kZFaMn?%qs$aW%b+(`nXzoXl@ z-|t*FeeKNomRIKXYQ5pY>Hq7>Z2NF;y%*Pzo9n~47;bO&hr<*lEahR1+@u_Y7z~$I z#YAQq7wCGM;j~Y^XDvqPD!LEZvPR$DF>8CM39vzZ1-DwJw|f}?)9o#`!*rMKL{&Z( z-su&g&WD<_l@ylXuys>g07NaN;vbbjILA+q!P}&E2AqF1F3{F@5<;( z#Xu_I8+zBC?oa6HD*SHVI{ZN17pnW-3_q@ylQYN5hH>tFhH?JWhVjqq@OjNJRK``T}R zcVYR$yN$JDmq(6#_u$EUoB$G3k?%b`wfCtzfBoWtKL?lj zr+&P5&V1tIYhQce(%kd&e{G!q!RS}_pL^T*m3=?_$%{YR{~qzNi%;Zwy6FAqA8N$f z_59=KXWu{d&?k4lV&D0V?_B%$-^QlLU;p$k-*{yAa}P5-a`2-+y}a;?-(0<~zWdUz oE*bYv#1ID?CHQ*%`YxmV_Ukjd-mw35;gi`zN2k9v`N(7c0r$k7RsaA1 diff --git a/Resources/Textures/Objects/Fun/glue.rsi/meta.json b/Resources/Textures/Objects/Fun/glue.rsi/meta.json index 55fc6227cd..c05e904864 100644 --- a/Resources/Textures/Objects/Fun/glue.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/glue.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood1183 (github) for ss14", + "copyright": "Made by brainfood1183 (github) for ss14. Edited by huaqas (github).", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Fun/lube.rsi/icon.png b/Resources/Textures/Objects/Fun/lube.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..2cf3aeeefb3a8821531b5a6a489e7628d6c6fa23 GIT binary patch literal 539 zcmV+$0_6RPP)Px$)k#D_R9J=Wmpe!!K^Vt>IW$Ja+qlGcII+3d1bmc%w5d{93t9&(wh;~lJ1Y^A z<_gQZ#^yk<5*rZ$5quODvRVkDMiXC~C1*6nSOlMuTxMdFL;uY(Gv9x|-wxk5%)&>P zquf9tM8V)FShSE|+`YqE+$vfxS6`%}A1R;CkWXh+?f0rtF=-*cXlQSyw!RK)?^tLd zzuad(lJX9`mi}*m{MB{E07^9g@b~zl;^ayI9iu_VlnAmD0>GC!w`{3Wc?puLKdRpHq>?9qwBgy)h|^8Gpm0FpU(xq z_XDu9v)SEHZ2*989bHexy5?3$s|b)jaFISZdop+Ka^0_WR~z8h%`^a0!FdAN6!FGZ zCbxe8Fic1xy1r;P)Px$`$Eu8e7#BA?GMIF9qfG)-}`;&`O% zz~JNiqR$8c5D0bw@Vl@^VdjGd@^!%XFVHltVWPaTC6%P*ynX|P5LlMga=SB`jC4Kl zy#tnIiBu}}`GhbbYohHsU>HW&FpRLOUg{c7e|kN3v~T>*T>w5Ve;w-Xv;lzIH*Xzk z8+u3~t)hX_N|4gZ`k}s!V6ZVZ)M*2+{!Rh#e0-jG#Ua}>z_X=E03MQ1NUwMZ;}wT! zG)lbUG?_aS1Ea|a^xj@ZlM_lwl?`mJS9m}6l0Y%X^}!^8VvdE8r^yV zyaT}XJk|XxorIlu=ovt;ZWr4 z4D?5;O@-)QxC+30qzcZzRINGpH=%SX{#pFhvMtN0z6a9jv?lu^y5NFc_zj+nk+pwZ P00000NkvXXu0mjf%zF+2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/lube.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/lube.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..58bf76cb93b0b650cedc88b9b9a02838f0903a62 GIT binary patch literal 355 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zWj$RSLn`LH zy|t0|kby|cLvb;Nz`%fuOPacPH4+40tdMA6yTN=dp_S*s77syN?iqX+6)ns3#Qv*a zjC$TJt8_CBXdnZ_0^av~d9N40-@AQX{X#au=ku>*Z04As8a}6ZYVkU+k1h4Rx4Cb> zj@>%b{l;e)??X_ph2&Cav1~?s`wNlvRa`|8v{S>wTLyeMMsV_U?L{*)yE$ zL=4%3_w{xwrjVe^~m)~R19E7rX}b!Lsu>C_h| z143fwbJX8==a~9c?8V*MmUZC=zSp({M6Pd;_%66f?|{zPS{4R|hW#JdRvQFqw^oH| Pg8b;|>gTe~DWM4f0Y{OO literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/lube.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/lube.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..a6843a417962343bade1c2a7554449e675955f6c GIT binary patch literal 376 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zjXYf(Ln`LH zy=CZk*g>H6q2VI-z~zeySw+nkG#E{9=mRq>ckW&~<=B)X{ zSC>h4i$8ex&0vq&X5K|&xsBad-#+@(cXts}oZYppMJHOgZ{)Do@2gogb7{xfvWOCf zIc{RM`}R+@kJSG8=ijZTZ$@zUm*zb0s@Y-D6sNo+m~8!ml$9VT^0f m@VpV8#XsZnr86LJru|`f&uaIsD{vDpi0kR<=d#Wzp$P!RM4`0+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/lube.rsi/meta.json b/Resources/Textures/Objects/Fun/lube.rsi/meta.json new file mode 100644 index 0000000000..841ae725cb --- /dev/null +++ b/Resources/Textures/Objects/Fun/lube.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by brainfood1183 (github) for ss14. Edited by huaqas (github).", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From 9683337de578cce3bbe115a5d63967847b4b8f9e Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 26 Oct 2025 18:38:34 +0000 Subject: [PATCH 004/121] 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 bb4bccd354..7f9c5f3404 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: Princess-Cheeseballs - changes: - - message: Basilisk projectile speed and movement speed has been reduced and is - slightly weaker - type: Tweak - id: 8658 - time: '2025-06-11T20:20:48.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/38089 - author: Nox38 changes: - message: launchers must now be wielded before firing. @@ -3930,3 +3922,10 @@ id: 9159 time: '2025-10-26T15:48:07.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/35068 +- author: Huaqas + changes: + - message: Added a bottle of crazy space lube to the toy box! + type: Add + id: 9160 + time: '2025-10-26T18:37:26.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/36292 From 737a4f308eddb26b5bcbadef859c6f310feedb80 Mon Sep 17 00:00:00 2001 From: ThatGuyUSA Date: Sun, 26 Oct 2025 11:28:45 -0700 Subject: [PATCH 005/121] Fixes .50 Uranium projectile sprite (#41068) * 'fixed' .50 uranium displaying what it was set to * Changed depleted-uranium to uranium --- .../Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml index 02ccd1a83b..63d07eb2f2 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml @@ -208,7 +208,9 @@ components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: depleted-uranium + layers: + - state: uranium + shader: unshaded - type: Projectile damage: types: From c0839f35adbb4c24aa0b2f16430a08135bab963c Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 26 Oct 2025 18:51:09 +0000 Subject: [PATCH 006/121] 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 7f9c5f3404..7a19d2e891 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Nox38 - changes: - - message: launchers must now be wielded before firing. - type: Tweak - id: 8659 - time: '2025-06-11T20:28:00.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/38110 - author: Boaz1111 changes: - message: Various species can now have the same scars as humans do, with exceptions. @@ -3929,3 +3922,10 @@ id: 9160 time: '2025-10-26T18:37:26.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/36292 +- author: ThatGuyUSA + changes: + - message: .50 uranium pellets use their intended sprite. + type: Fix + id: 9161 + time: '2025-10-26T18:50:01.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/41068 From 6046687a29b52cf197bc63fd60e2aacdbd7e4fb5 Mon Sep 17 00:00:00 2001 From: Kyle Tyo <36606155+VerinSenpai@users.noreply.github.com> Date: Sun, 26 Oct 2025 17:43:13 -0400 Subject: [PATCH 007/121] Remove IsFirstTimePredicted from Ninja systems (#41127) commit --- Content.Shared/Ninja/Systems/DashAbilitySystem.cs | 3 --- Content.Shared/Ninja/Systems/SharedNinjaGlovesSystem.cs | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Content.Shared/Ninja/Systems/DashAbilitySystem.cs b/Content.Shared/Ninja/Systems/DashAbilitySystem.cs index c02d6cfd9a..5646ba2bee 100644 --- a/Content.Shared/Ninja/Systems/DashAbilitySystem.cs +++ b/Content.Shared/Ninja/Systems/DashAbilitySystem.cs @@ -56,9 +56,6 @@ public sealed class DashAbilitySystem : EntitySystem /// private void OnDash(Entity ent, ref DashEvent args) { - if (!_timing.IsFirstTimePredicted) - return; - var (uid, comp) = ent; var user = args.Performer; if (!CheckDash(uid, user)) diff --git a/Content.Shared/Ninja/Systems/SharedNinjaGlovesSystem.cs b/Content.Shared/Ninja/Systems/SharedNinjaGlovesSystem.cs index 1f3cc3881d..d4eb0cbd48 100644 --- a/Content.Shared/Ninja/Systems/SharedNinjaGlovesSystem.cs +++ b/Content.Shared/Ninja/Systems/SharedNinjaGlovesSystem.cs @@ -128,8 +128,7 @@ public abstract class SharedNinjaGlovesSystem : EntitySystem public bool AbilityCheck(EntityUid uid, BeforeInteractHandEvent args, out EntityUid target) { target = args.Target; - return _timing.IsFirstTimePredicted - && !_combatMode.IsInCombatMode(uid) + return !_combatMode.IsInCombatMode(uid) && _hands.GetActiveItem(uid) == null && _interaction.InRangeUnobstructed(uid, target); } From 3bd09630869d0e06c4de81780fe1fe3d6d9d7c8c Mon Sep 17 00:00:00 2001 From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> Date: Sun, 26 Oct 2025 16:02:24 -0700 Subject: [PATCH 008/121] Fix DeltaPressure serialization spam (#41131) * Fix DeltaPressure serialization spam * Add TODO --- Content.Server/Atmos/Components/DeltaPressureComponent.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Content.Server/Atmos/Components/DeltaPressureComponent.cs b/Content.Server/Atmos/Components/DeltaPressureComponent.cs index 0d2debe08a..cfe67a855b 100644 --- a/Content.Server/Atmos/Components/DeltaPressureComponent.cs +++ b/Content.Server/Atmos/Components/DeltaPressureComponent.cs @@ -40,8 +40,11 @@ public sealed partial class DeltaPressureComponent : Component /// for removal while the entity is being deleted. /// /// Note that while already stores the grid, - /// we cannot trust it to be available on init or when the entity is being deleted. Tragic. - [DataField] + /// we cannot trust it to be available on init or when the entity is being deleted. Tragic. + /// Double note: this is set during ComponentInit and thus does not need to be a datafield + /// or else it will spam serialization. + /// TODO ATMOS: Simply use AirtightComponent's GridUID caching and handle entity removal from the processing list on an invalidation system similar to InvalidTiles. + [ViewVariables(VVAccess.ReadOnly)] public EntityUid? GridUid; /// From 5084fe456f706c7e0efd22f5948368a815648c2b Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Mon, 27 Oct 2025 00:58:19 +0100 Subject: [PATCH 009/121] Nanotrasen is a word (#41124) --- SpaceStation14.sln.DotSettings | 1 + 1 file changed, 1 insertion(+) diff --git a/SpaceStation14.sln.DotSettings b/SpaceStation14.sln.DotSettings index fe8e82b3bd..c335824763 100644 --- a/SpaceStation14.sln.DotSettings +++ b/SpaceStation14.sln.DotSettings @@ -677,6 +677,7 @@ public sealed partial class $CLASS$ : Shared$CLASS$ { True True True + True True True True From 82ab14da3ac73e5edd61a4cc8090a96174ddaa89 Mon Sep 17 00:00:00 2001 From: beck-thompson <107373427+beck-thompson@users.noreply.github.com> Date: Sun, 26 Oct 2025 19:40:07 -0700 Subject: [PATCH 010/121] Admin alerts now link players with tpto (#40472) * Admin alerts now link players with tpto * Add coords * Slarti tweaks! * He saw my minor spelling mistake - its over... --- Content.Client/Chat/Managers/ChatManager.cs | 5 + .../Administration/Logs/AdminLogManager.cs | 104 +++++++++++++++++- Content.Server/Chat/Managers/ChatManager.cs | 12 +- .../EntitySystems/ExplosionSystem.cs | 7 +- Content.Shared/Chat/ISharedChatManager.cs | 22 ++++ .../en-US/administration/admin-alerts.ftl | 2 + 6 files changed, 145 insertions(+), 7 deletions(-) diff --git a/Content.Client/Chat/Managers/ChatManager.cs b/Content.Client/Chat/Managers/ChatManager.cs index 68707e021c..1b66bf8732 100644 --- a/Content.Client/Chat/Managers/ChatManager.cs +++ b/Content.Client/Chat/Managers/ChatManager.cs @@ -31,6 +31,11 @@ internal sealed class ChatManager : IChatManager // See server-side manager. This just exists for shared code. } + public void SendAdminAlertNoFormatOrEscape(string message) + { + // See server-side manager. This just exists for shared code. + } + public void SendMessage(string text, ChatSelectChannel channel) { var str = text.ToString(); diff --git a/Content.Server/Administration/Logs/AdminLogManager.cs b/Content.Server/Administration/Logs/AdminLogManager.cs index e7682cf559..2587d4b8f9 100644 --- a/Content.Server/Administration/Logs/AdminLogManager.cs +++ b/Content.Server/Administration/Logs/AdminLogManager.cs @@ -12,13 +12,16 @@ using Content.Shared.Database; using Content.Shared.Mind; using Content.Shared.Players.PlayTimeTracking; using Prometheus; +using Robust.Server.GameObjects; using Robust.Shared; using Robust.Shared.Configuration; +using Robust.Shared.Map; using Robust.Shared.Network; using Robust.Shared.Player; using Robust.Shared.Prototypes; using Robust.Shared.Reflection; using Robust.Shared.Timing; +using Robust.Shared.Utility; namespace Content.Server.Administration.Logs; @@ -338,7 +341,7 @@ public sealed partial class AdminLogManager : SharedAdminLogManager, IAdminLogMa Players = players, }; - DoAdminAlerts(players, message, impact); + DoAdminAlerts(players, message, impact, handler); if (preRound) { @@ -380,6 +383,34 @@ public sealed partial class AdminLogManager : SharedAdminLogManager, IAdminLogMa return players; } + /// + /// Get a list of coordinates from the s values. Will transform all coordinate types + /// to map coordinates! + /// + /// A list of map coordinates that were found in the value input, can return an empty list. + private List GetCoordinates(Dictionary values) + { + List coordList = new(); + EntityManager.TrySystem(out TransformSystem? transform); + + foreach (var value in values.Values) + { + switch (value) + { + case EntityCoordinates entCords: + if (transform != null) + coordList.Add(transform.ToMapCoordinates(entCords)); + continue; + + case MapCoordinates mapCord: + coordList.Add(mapCord); + continue; + } + } + + return coordList; + } + private void AddPlayer(List players, Guid user, int logId) { // The majority of logs have a single player, or maybe two. Instead of allocating a List and @@ -397,10 +428,11 @@ public sealed partial class AdminLogManager : SharedAdminLogManager, IAdminLogMa }); } - private void DoAdminAlerts(List players, string message, LogImpact impact) + private void DoAdminAlerts(List players, string message, LogImpact impact, LogStringHandler handler) { var adminLog = false; var logMessage = message; + var playerNetEnts = new List<(NetEntity, string)>(); foreach (var player in players) { @@ -419,6 +451,8 @@ public sealed partial class AdminLogManager : SharedAdminLogManager, IAdminLogMa ("name", cachedInfo.CharacterName), ("subtype", subtype)); } + if (cachedInfo != null && cachedInfo.NetEntity != null) + playerNetEnts.Add((cachedInfo.NetEntity.Value, cachedInfo.CharacterName)); } if (adminLog) @@ -442,7 +476,73 @@ public sealed partial class AdminLogManager : SharedAdminLogManager, IAdminLogMa } if (adminLog) + { _chat.SendAdminAlert(logMessage); + + if (CreateTpLinks(playerNetEnts, out var tpLinks)) + _chat.SendAdminAlertNoFormatOrEscape(tpLinks); + + var coords = GetCoordinates(handler.Values); + + if (CreateCordLinks(coords, out var cordLinks)) + _chat.SendAdminAlertNoFormatOrEscape(cordLinks); + } + } + + /// + /// Creates a list of tpto command links of the given players + /// + private bool CreateTpLinks(List<(NetEntity NetEnt, string CharacterName)> players, out string outString) + { + outString = string.Empty; + + if (players.Count == 0) + return false; + + outString = Loc.GetString("admin-alert-tp-to-players-header"); + + for (var i = 0; i < players.Count; i++) + { + var player = players[i]; + outString += $"[cmdlink=\"{EscapeText(player.CharacterName)}\" command=\"tpto {player.NetEnt}\"/]"; + + if (i < players.Count - 1) + outString += ", "; + } + + return true; + } + + /// + /// Creates a list of toto command links for the given map coordinates. + /// + private bool CreateCordLinks(List cords, out string outString) + { + outString = string.Empty; + + if (cords.Count == 0) + return false; + + outString = Loc.GetString("admin-alert-tp-to-coords-header"); + + for (var i = 0; i < cords.Count; i++) + { + var cord = cords[i]; + outString += $"[cmdlink=\"{cord.ToString()}\" command=\"tp {cord.X} {cord.Y} {cord.MapId}\"/]"; + + if (i < cords.Count - 1) + outString += ", "; + } + + return true; + } + + /// + /// Escape the given text to not allow breakouts of the cmdlink tags. + /// + private string EscapeText(string text) + { + return FormattedMessage.EscapeText(text).Replace("\"", "\\\"").Replace("'", "\\'"); } public async Task> All(LogFilter? filter = null, Func>? listProvider = null) diff --git a/Content.Server/Chat/Managers/ChatManager.cs b/Content.Server/Chat/Managers/ChatManager.cs index c62a10ada3..f90e286d9e 100644 --- a/Content.Server/Chat/Managers/ChatManager.cs +++ b/Content.Server/Chat/Managers/ChatManager.cs @@ -160,14 +160,20 @@ internal sealed partial class ChatManager : IChatManager public void SendAdminAlert(string message) { - var clients = _adminManager.ActiveAdmins.Select(p => p.Channel); - var wrappedMessage = Loc.GetString("chat-manager-send-admin-announcement-wrap-message", ("adminChannelName", Loc.GetString("chat-manager-admin-channel-name")), ("message", FormattedMessage.EscapeText(message))); - ChatMessageToMany(ChatChannel.AdminAlert, message, wrappedMessage, default, false, true, clients); + SendAdminAlertNoFormatOrEscape(wrappedMessage); } + public void SendAdminAlertNoFormatOrEscape(string message) + { + var clients = _adminManager.ActiveAdmins.Select(p => p.Channel); + + ChatMessageToMany(ChatChannel.AdminAlert, message, message, default, false, true, clients); + } + + public void SendAdminAlert(EntityUid player, string message) { var mindSystem = _entityManager.System(); diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs index 67dbe97b29..198db3eca1 100644 --- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs +++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs @@ -256,11 +256,14 @@ public sealed partial class ExplosionSystem : SharedExplosionSystem var logImpact = (alertMinExplosionIntensity > -1 && totalIntensity >= alertMinExplosionIntensity) ? LogImpact.Extreme : LogImpact.High; - _adminLogger.Add(LogType.Explosion, logImpact, - $"{ToPrettyString(user.Value):user} caused {ToPrettyString(uid):entity} to explode ({typeId}) at Pos:{(posFound ? $"{gridPos:coordinates}" : "[Grid or Map not found]")} with intensity {totalIntensity} slope {slope}"); + if (posFound) + _adminLogger.Add(LogType.Explosion, logImpact, $"{ToPrettyString(user.Value):user} caused {ToPrettyString(uid):entity} to explode ({typeId}) at Pos:{gridPos:coordinates} with intensity {totalIntensity} slope {slope}"); + else + _adminLogger.Add(LogType.Explosion, logImpact, $"{ToPrettyString(user.Value):user} caused {ToPrettyString(uid):entity} to explode ({typeId}) at Pos:[Grid or Map not found] with intensity {totalIntensity} slope {slope}"); } } + /// /// Queue an explosion, with a specified epicenter and set of starting tiles. /// diff --git a/Content.Shared/Chat/ISharedChatManager.cs b/Content.Shared/Chat/ISharedChatManager.cs index 39c1d85dd2..76fb4fbea8 100644 --- a/Content.Shared/Chat/ISharedChatManager.cs +++ b/Content.Shared/Chat/ISharedChatManager.cs @@ -3,6 +3,28 @@ namespace Content.Shared.Chat; public interface ISharedChatManager { void Initialize(); + + /// + /// Send an admin alert to the admin chat channel. + /// + /// The message to send. void SendAdminAlert(string message); + + /// + /// Send an admin alert to the admin chat channel specifically about the given player. + /// Will include info extra like their antag status and name. + /// + /// The player that the message is about. + /// The message to send. void SendAdminAlert(EntityUid player, string message); + + /// + /// This is a dangerous function! Only pass in property escaped text. + /// See: + ///

+ /// Use this for things that need to be unformatted (like tpto links) but ensure that everything else + /// is formated properly. If it's not, players could sneak in ban links or other nasty commands that the admins + /// could clink on. + ///
+ void SendAdminAlertNoFormatOrEscape(string message); } diff --git a/Resources/Locale/en-US/administration/admin-alerts.ftl b/Resources/Locale/en-US/administration/admin-alerts.ftl index 931c3766a7..512c654650 100644 --- a/Resources/Locale/en-US/administration/admin-alerts.ftl +++ b/Resources/Locale/en-US/administration/admin-alerts.ftl @@ -2,3 +2,5 @@ admin-alert-ipintel-blocked = {$player} was rejected from joining due to their IP having a {TOSTRING($percent, "P2")} confidence of being a VPN/Datacenter. admin-alert-ipintel-warning = {$player} IP has a {TOSTRING($percent, "P2")} confidence of being a VPN/Datacenter. Please watch them. admin-alert-antag-label = {$message} [ANTAG: {$name}, {$subtype}] +admin-alert-tp-to-players-header = Players:{" "} +admin-alert-tp-to-coords-header = Coords:{" "} From 7dbf084940e3178d4f1acc754ceeac92976121a1 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 27 Oct 2025 02:52:51 +0000 Subject: [PATCH 011/121] Automatic changelog update --- Resources/Changelog/Admin.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml index eb2d5599f4..bc936a9c37 100644 --- a/Resources/Changelog/Admin.yml +++ b/Resources/Changelog/Admin.yml @@ -1483,5 +1483,13 @@ Entries: id: 180 time: '2025-10-23T14:16:13.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/41060 +- author: beck + changes: + - message: TPTO command links are now added for admin logs that involve players + or coordinates! + type: Add + id: 181 + time: '2025-10-27T02:51:40.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40472 Name: Admin Order: 2 From 3a9bcf1a8380f145ed08f1923734f2dcfd28e027 Mon Sep 17 00:00:00 2001 From: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com> Date: Sun, 26 Oct 2025 19:46:27 -0700 Subject: [PATCH 012/121] Damageable/Destructible Benchmarks (#41064) * the fard * oomba * The woke swarm... * Review * review * Apply suggestions from code review --------- Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --- Content.Benchmarks/DestructibleBenchmark.cs | 159 ++++++++++++++++++ .../DestructibleSystem.BenchmarkHelpers.cs | 35 ++++ .../Destructible/DestructibleSystem.cs | 2 +- .../DamageableSystem.BenchmarkHelpers.cs | 15 ++ .../Damage/Systems/DamageableSystem.cs | 2 +- 5 files changed, 211 insertions(+), 2 deletions(-) create mode 100644 Content.Benchmarks/DestructibleBenchmark.cs create mode 100644 Content.Server/Destructible/DestructibleSystem.BenchmarkHelpers.cs create mode 100644 Content.Shared/Damage/Systems/DamageableSystem.BenchmarkHelpers.cs diff --git a/Content.Benchmarks/DestructibleBenchmark.cs b/Content.Benchmarks/DestructibleBenchmark.cs new file mode 100644 index 0000000000..b91837e7ca --- /dev/null +++ b/Content.Benchmarks/DestructibleBenchmark.cs @@ -0,0 +1,159 @@ +using System.Collections.Generic; +using System.Diagnostics; +using System.Threading.Tasks; +using BenchmarkDotNet.Attributes; +using Content.IntegrationTests; +using Content.IntegrationTests.Pair; +using Content.Server.Destructible; +using Content.Shared.Damage; +using Content.Shared.Damage.Prototypes; +using Content.Shared.FixedPoint; +using Content.Shared.Maps; +using Robust.Shared; +using Robust.Shared.Analyzers; +using Robust.Shared.GameObjects; +using Robust.Shared.Map; +using Robust.Shared.Maths; +using Robust.Shared.Prototypes; +using Robust.Shared.Random; + +namespace Content.Benchmarks; + +[Virtual] +[GcServer(true)] +[MemoryDiagnoser] +public class DestructibleBenchmark +{ + /// + /// Number of destructible entities per prototype to spawn with a . + /// + [Params(1, 10, 100, 1000, 5000)] + public int EntityCount; + + /// + /// Amount of blunt damage we do to each entity. + /// + [Params(10000)] + public FixedPoint2 DamageAmount; + + [Params("Blunt")] + public ProtoId DamageType; + + private static readonly EntProtoId WindowProtoId = "Window"; + private static readonly EntProtoId WallProtoId = "WallReinforced"; + private static readonly EntProtoId HumanProtoId = "MobHuman"; + + private static readonly ProtoId TileRef = "Plating"; + + private readonly EntProtoId[] _prototypes = [WindowProtoId, WallProtoId, HumanProtoId]; + + private readonly List> _damageables = new(); + private readonly List> _destructbiles = new(); + + private DamageSpecifier _damage; + + private TestPair _pair = default!; + private IEntityManager _entMan = default!; + private IPrototypeManager _protoMan = default!; + private IRobustRandom _random = default!; + private ITileDefinitionManager _tileDefMan = default!; + private DamageableSystem _damageable = default!; + private DestructibleSystem _destructible = default!; + private SharedMapSystem _map = default!; + + [GlobalSetup] + public async Task SetupAsync() + { + ProgramShared.PathOffset = "../../../../"; + PoolManager.Startup(); + _pair = await PoolManager.GetServerClient(); + var server = _pair.Server; + + var mapdata = await _pair.CreateTestMap(); + + _entMan = server.ResolveDependency(); + _protoMan = server.ResolveDependency(); + _random = server.ResolveDependency(); + _tileDefMan = server.ResolveDependency(); + _damageable = _entMan.System(); + _destructible = _entMan.System(); + _map = _entMan.System(); + + if (!_protoMan.Resolve(DamageType, out var type)) + return; + + _damage = new DamageSpecifier(type, DamageAmount); + + _random.SetSeed(69420); // Randomness needs to be deterministic for benchmarking. + + var plating = _tileDefMan[TileRef].TileId; + + // We make a rectangular grid of destructible entities, and then damage them all simultaneously to stress test the system. + // Needed for managing the performance of destructive effects and damage application. + await server.WaitPost(() => + { + // Set up a thin line of tiles to place our objects on. They should be anchored for a "realistic" scenario... + for (var x = 0; x < EntityCount; x++) + { + for (var y = 0; y < _prototypes.Length; y++) + { + _map.SetTile(mapdata.Grid, mapdata.Grid, new Vector2i(x, y), new Tile(plating)); + } + } + + for (var x = 0; x < EntityCount; x++) + { + var y = 0; + foreach (var protoId in _prototypes) + { + var coords = new EntityCoordinates(mapdata.Grid, x + 0.5f, y + 0.5f); + _entMan.SpawnEntity(protoId, coords); + y++; + } + } + + var query = _entMan.EntityQueryEnumerator(); + + while (query.MoveNext(out var uid, out var damageable, out var destructible)) + { + _damageables.Add((uid, damageable)); + _destructbiles.Add((uid, damageable, destructible)); + } + }); + } + + [Benchmark] + public async Task PerformDealDamage() + { + await _pair.Server.WaitPost(() => + { + _damageable.ApplyDamageToAllEntities(_damageables, _damage); + }); + } + + [Benchmark] + public async Task PerformTestTriggers() + { + await _pair.Server.WaitPost(() => + { + _destructible.TestAllTriggers(_destructbiles); + }); + } + + [Benchmark] + public async Task PerformTestBehaviors() + { + await _pair.Server.WaitPost(() => + { + _destructible.TestAllBehaviors(_destructbiles); + }); + } + + + [GlobalCleanup] + public async Task CleanupAsync() + { + await _pair.DisposeAsync(); + PoolManager.Shutdown(); + } +} diff --git a/Content.Server/Destructible/DestructibleSystem.BenchmarkHelpers.cs b/Content.Server/Destructible/DestructibleSystem.BenchmarkHelpers.cs new file mode 100644 index 0000000000..ac5e3704fe --- /dev/null +++ b/Content.Server/Destructible/DestructibleSystem.BenchmarkHelpers.cs @@ -0,0 +1,35 @@ +using Content.Shared.Damage; + +namespace Content.Server.Destructible; + +public sealed partial class DestructibleSystem +{ + /// + /// Tests all triggers in a DestructibleComponent to see how expensive it is to query them. + /// + public void TestAllTriggers(List> destructibles) + { + foreach (var (uid, damageable, destructible) in destructibles) + { + foreach (var threshold in destructible.Thresholds) + { + // Chances are, none of these triggers will pass! + Triggered(threshold, (uid, damageable)); + } + } + } + + /// + /// Tests all behaviours in a DestructibleComponent to see how expensive it is to query them. + /// + public void TestAllBehaviors(List> destructibles) + { + foreach (var (uid, damageable, destructible) in destructibles) + { + foreach (var threshold in destructible.Thresholds) + { + Execute(threshold, uid); + } + } + } +} diff --git a/Content.Server/Destructible/DestructibleSystem.cs b/Content.Server/Destructible/DestructibleSystem.cs index 682baa04ca..847229278c 100644 --- a/Content.Server/Destructible/DestructibleSystem.cs +++ b/Content.Server/Destructible/DestructibleSystem.cs @@ -26,7 +26,7 @@ using Robust.Shared.Random; namespace Content.Server.Destructible { [UsedImplicitly] - public sealed class DestructibleSystem : SharedDestructibleSystem + public sealed partial class DestructibleSystem : SharedDestructibleSystem { [Dependency] public readonly IRobustRandom Random = default!; public new IEntityManager EntityManager => base.EntityManager; diff --git a/Content.Shared/Damage/Systems/DamageableSystem.BenchmarkHelpers.cs b/Content.Shared/Damage/Systems/DamageableSystem.BenchmarkHelpers.cs new file mode 100644 index 0000000000..d248d717b8 --- /dev/null +++ b/Content.Shared/Damage/Systems/DamageableSystem.BenchmarkHelpers.cs @@ -0,0 +1,15 @@ +namespace Content.Shared.Damage; + +public sealed partial class DamageableSystem +{ + /// + /// Applies damage to all entities to see how expensive it is to deal damage. + /// + public void ApplyDamageToAllEntities(List> damageables, DamageSpecifier damage) + { + foreach (var (uid, damageable) in damageables) + { + TryChangeDamage(uid, damage, damageable: damageable); + } + } +} diff --git a/Content.Shared/Damage/Systems/DamageableSystem.cs b/Content.Shared/Damage/Systems/DamageableSystem.cs index b849227156..f1e259001c 100644 --- a/Content.Shared/Damage/Systems/DamageableSystem.cs +++ b/Content.Shared/Damage/Systems/DamageableSystem.cs @@ -17,7 +17,7 @@ using Robust.Shared.Utility; namespace Content.Shared.Damage { - public sealed class DamageableSystem : EntitySystem + public sealed partial class DamageableSystem : EntitySystem { [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly SharedAppearanceSystem _appearance = default!; From 32d6d7d4611e16014e5e3e98918a1aee98601522 Mon Sep 17 00:00:00 2001 From: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com> Date: Mon, 27 Oct 2025 21:59:31 +1300 Subject: [PATCH 013/121] Fix delivery-spam.ftl tag typo (#41140) italics to italic --- Resources/Locale/en-US/delivery/delivery-spam.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/delivery/delivery-spam.ftl b/Resources/Locale/en-US/delivery/delivery-spam.ftl index c5161bb19f..ce5d207f14 100644 --- a/Resources/Locale/en-US/delivery/delivery-spam.ftl +++ b/Resources/Locale/en-US/delivery/delivery-spam.ftl @@ -235,7 +235,7 @@ delivery-spam-11 = Help mom and dad! if we do not get this money in 10 days then the govertment will come to take away childhood home and we will be homeless. {"[bold]thank you and we love you,[/bold]"} - {"[italic]parents[/italics]"} + {"[italic]parents[/italic]"} delivery-spam-12 = Join us on the maiden voyage! .desc = Advertisement for a relaxing voyage. From 7c0ba70b74453e1eda62abcf09f900c4fb5d3313 Mon Sep 17 00:00:00 2001 From: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> Date: Mon, 27 Oct 2025 07:44:11 -0300 Subject: [PATCH 014/121] Fix TryProccessRadioMessage Typo (#41139) fix proccess typo --- Content.Client/UserInterface/Systems/Chat/ChatUIController.cs | 2 +- Content.Server/Chat/Systems/ChatSystem.cs | 2 +- Content.Shared/Chat/SharedChatSystem.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs index 25d3d58226..f1fdb51aef 100644 --- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs +++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs @@ -689,7 +689,7 @@ public sealed partial class ChatUIController : UIController radioChannel = null; return _player.LocalEntity is EntityUid { Valid: true } uid && _chatSys != null - && _chatSys.TryProccessRadioMessage(uid, text, out _, out radioChannel, quiet: true); + && _chatSys.TryProcessRadioMessage(uid, text, out _, out radioChannel, quiet: true); } public void UpdateSelectedChannel(ChatBox box) diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs index ea4810992d..a0e5a0bfed 100644 --- a/Content.Server/Chat/Systems/ChatSystem.cs +++ b/Content.Server/Chat/Systems/ChatSystem.cs @@ -212,7 +212,7 @@ public sealed partial class ChatSystem : SharedChatSystem // This message may have a radio prefix, and should then be whispered to the resolved radio channel if (checkRadioPrefix) { - if (TryProccessRadioMessage(source, message, out var modMessage, out var channel)) + if (TryProcessRadioMessage(source, message, out var modMessage, out var channel)) { SendEntityWhisper(source, modMessage, range, channel, nameOverride, hideLog, ignoreActionBlocker); return; diff --git a/Content.Shared/Chat/SharedChatSystem.cs b/Content.Shared/Chat/SharedChatSystem.cs index dc74109060..e7efe39df9 100644 --- a/Content.Shared/Chat/SharedChatSystem.cs +++ b/Content.Shared/Chat/SharedChatSystem.cs @@ -146,7 +146,7 @@ public abstract partial class SharedChatSystem : EntitySystem /// The channel that was requested, if any /// Whether or not to generate an informative pop-up message. /// - public bool TryProccessRadioMessage( + public bool TryProcessRadioMessage( EntityUid source, string input, out string output, From 91292522b504b82187846e72a5d3d086a533cf7a Mon Sep 17 00:00:00 2001 From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> Date: Mon, 27 Oct 2025 04:00:37 -0700 Subject: [PATCH 015/121] DeltaPressure Predicted Examine (#41135) * predicted examine * atrociously satanic * do it right this time * deltafields aren't necessary * Update Content.Server/Atmos/EntitySystems/AtmosphereSystem.DeltaPressure.cs --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --- .../EntitySystems/DeltaPressureSystem.cs | 5 +++++ .../Tests/Atmos/DeltaPressureTest.cs | 1 + .../Components/GridAtmosphereComponent.cs | 1 + .../AtmosphereSystem.DeltaPressure.cs | 20 ++++++++++++++++--- .../EntitySystems/DeltaPressureSystem.cs | 14 +++---------- .../Components/DeltaPressureComponent.cs | 20 +++++++++---------- .../SharedDeltaPressureSystem.cs | 20 +++++++++++++++++++ 7 files changed, 57 insertions(+), 24 deletions(-) create mode 100644 Content.Client/Atmos/EntitySystems/DeltaPressureSystem.cs rename {Content.Server => Content.Shared}/Atmos/Components/DeltaPressureComponent.cs (89%) create mode 100644 Content.Shared/Atmos/EntitySystems/SharedDeltaPressureSystem.cs diff --git a/Content.Client/Atmos/EntitySystems/DeltaPressureSystem.cs b/Content.Client/Atmos/EntitySystems/DeltaPressureSystem.cs new file mode 100644 index 0000000000..3d9893ac62 --- /dev/null +++ b/Content.Client/Atmos/EntitySystems/DeltaPressureSystem.cs @@ -0,0 +1,5 @@ +using Content.Shared.Atmos.EntitySystems; + +namespace Content.Client.Atmos.EntitySystems; + +public sealed class DeltaPressureSystem : SharedDeltaPressureSystem; diff --git a/Content.IntegrationTests/Tests/Atmos/DeltaPressureTest.cs b/Content.IntegrationTests/Tests/Atmos/DeltaPressureTest.cs index 839e0ea897..c3b3877c98 100644 --- a/Content.IntegrationTests/Tests/Atmos/DeltaPressureTest.cs +++ b/Content.IntegrationTests/Tests/Atmos/DeltaPressureTest.cs @@ -4,6 +4,7 @@ using Content.Server.Atmos; using Content.Server.Atmos.Components; using Content.Server.Atmos.EntitySystems; using Content.Shared.Atmos; +using Content.Shared.Atmos.Components; using Robust.Shared.EntitySerialization; using Robust.Shared.EntitySerialization.Systems; using Robust.Shared.GameObjects; diff --git a/Content.Server/Atmos/Components/GridAtmosphereComponent.cs b/Content.Server/Atmos/Components/GridAtmosphereComponent.cs index 2d36d2bd14..2a0d87515c 100644 --- a/Content.Server/Atmos/Components/GridAtmosphereComponent.cs +++ b/Content.Server/Atmos/Components/GridAtmosphereComponent.cs @@ -3,6 +3,7 @@ using Content.Server.Atmos.EntitySystems; using Content.Server.Atmos.Piping.Components; using Content.Server.Atmos.Serialization; using Content.Server.NodeContainer.NodeGroups; +using Content.Shared.Atmos.Components; namespace Content.Server.Atmos.Components { diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.DeltaPressure.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.DeltaPressure.cs index efddcaf1a7..255e58dcbf 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.DeltaPressure.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.DeltaPressure.cs @@ -1,5 +1,6 @@ using Content.Server.Atmos.Components; using Content.Shared.Atmos; +using Content.Shared.Atmos.Components; using Content.Shared.Damage; using Robust.Shared.Random; using Robust.Shared.Threading; @@ -175,7 +176,7 @@ public sealed partial class AtmosphereSystem /// containing the queue. /// The current absolute pressure being experienced by the entity. /// The current delta pressure being experienced by the entity. - private static void EnqueueDeltaPressureDamage(Entity ent, + private void EnqueueDeltaPressureDamage(Entity ent, GridAtmosphereComponent gridAtmosComp, float pressure, float delta) @@ -184,7 +185,7 @@ public sealed partial class AtmosphereSystem var aboveMinDeltaPressure = delta > ent.Comp.MinPressureDelta; if (!aboveMinPressure && !aboveMinDeltaPressure) { - ent.Comp.IsTakingDamage = false; + SetIsTakingDamageState(ent, false); return; } @@ -251,7 +252,20 @@ public sealed partial class AtmosphereSystem var appliedDamage = ScaleDamage(ent, ent.Comp.BaseDamage, maxPressureCapped); _damage.TryChangeDamage(ent, appliedDamage, ignoreResistances: true, interruptsDoAfters: false); - ent.Comp.IsTakingDamage = true; + SetIsTakingDamageState(ent, true); + } + + /// + /// Helper function to prevent spamming clients with dirty events when the damage state hasn't changed. + /// + /// The entity to check. + /// The value to set. + private void SetIsTakingDamageState(Entity ent, bool toSet) + { + if (ent.Comp.IsTakingDamage == toSet) + return; + ent.Comp.IsTakingDamage = toSet; + Dirty(ent); } /// diff --git a/Content.Server/Atmos/EntitySystems/DeltaPressureSystem.cs b/Content.Server/Atmos/EntitySystems/DeltaPressureSystem.cs index dd7091c270..669735b90d 100644 --- a/Content.Server/Atmos/EntitySystems/DeltaPressureSystem.cs +++ b/Content.Server/Atmos/EntitySystems/DeltaPressureSystem.cs @@ -1,6 +1,6 @@ using Content.Server.Atmos.Components; -using Content.Shared.Examine; -using Robust.Shared.Map.Components; +using Content.Shared.Atmos.Components; +using Content.Shared.Atmos.EntitySystems; namespace Content.Server.Atmos.EntitySystems; @@ -14,7 +14,7 @@ namespace Content.Server.Atmos.EntitySystems; /// This system handles the adding and removing of entities to a processing list, /// as well as any field changes via the API. /// -public sealed class DeltaPressureSystem : EntitySystem +public sealed partial class DeltaPressureSystem : SharedDeltaPressureSystem { [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; @@ -24,8 +24,6 @@ public sealed class DeltaPressureSystem : EntitySystem SubscribeLocalEvent(OnComponentInit); SubscribeLocalEvent(OnComponentShutdown); - SubscribeLocalEvent(OnExamined); - SubscribeLocalEvent(OnGridChanged); } @@ -48,12 +46,6 @@ public sealed class DeltaPressureSystem : EntitySystem _atmosphereSystem.TryRemoveDeltaPressureEntity(ent.Comp.GridUid.Value, ent); } - private void OnExamined(Entity ent, ref ExaminedEvent args) - { - if (ent.Comp.IsTakingDamage) - args.PushMarkup(Loc.GetString("window-taking-damage")); - } - private void OnGridChanged(Entity ent, ref GridUidChangedEvent args) { if (args.OldGrid != null) diff --git a/Content.Server/Atmos/Components/DeltaPressureComponent.cs b/Content.Shared/Atmos/Components/DeltaPressureComponent.cs similarity index 89% rename from Content.Server/Atmos/Components/DeltaPressureComponent.cs rename to Content.Shared/Atmos/Components/DeltaPressureComponent.cs index cfe67a855b..064d67f606 100644 --- a/Content.Server/Atmos/Components/DeltaPressureComponent.cs +++ b/Content.Shared/Atmos/Components/DeltaPressureComponent.cs @@ -1,37 +1,37 @@ -using Content.Server.Atmos.EntitySystems; +using Content.Shared.Atmos.EntitySystems; using Content.Shared.Damage; using Content.Shared.FixedPoint; using Content.Shared.Guidebook; +using Robust.Shared.GameStates; -namespace Content.Server.Atmos.Components; +namespace Content.Shared.Atmos.Components; /// /// Entities that have this component will have damage done to them depending on the local pressure /// environment that they reside in. /// /// Atmospherics.DeltaPressure batch-processes entities with this component in a list on -/// the grid's . +/// the grid's GridAtmosphereComponent. /// The entities are automatically added and removed from this list, and automatically /// added on initialization. /// -/// Note that the entity should have an and be a grid structure. +/// Note that the entity should have an AirtightComponent and be a grid structure. [RegisterComponent] +[NetworkedComponent, AutoGenerateComponentState] +[Access(typeof(SharedAtmosphereSystem), typeof(SharedDeltaPressureSystem))] public sealed partial class DeltaPressureComponent : Component { /// - /// Whether the entity is currently in the processing list of the grid's . + /// Whether the entity is currently in the processing list of the grid's GridAtmosphereComponent. /// [DataField(readOnly: true)] [ViewVariables(VVAccess.ReadOnly)] - [Access(typeof(DeltaPressureSystem), typeof(AtmosphereSystem))] public bool InProcessingList; /// /// Whether this entity is currently taking damage from pressure. /// - [DataField(readOnly: true)] - [ViewVariables(VVAccess.ReadOnly)] - [Access(typeof(DeltaPressureSystem), typeof(AtmosphereSystem))] + [DataField, AutoNetworkedField] public bool IsTakingDamage; /// @@ -39,7 +39,7 @@ public sealed partial class DeltaPressureComponent : Component /// Required for proper deletion, as we cannot reference the grid /// for removal while the entity is being deleted. /// - /// Note that while already stores the grid, + /// Note that while AirtightComponent already stores the grid, /// we cannot trust it to be available on init or when the entity is being deleted. Tragic. /// Double note: this is set during ComponentInit and thus does not need to be a datafield /// or else it will spam serialization. diff --git a/Content.Shared/Atmos/EntitySystems/SharedDeltaPressureSystem.cs b/Content.Shared/Atmos/EntitySystems/SharedDeltaPressureSystem.cs new file mode 100644 index 0000000000..4ea9880707 --- /dev/null +++ b/Content.Shared/Atmos/EntitySystems/SharedDeltaPressureSystem.cs @@ -0,0 +1,20 @@ +using Content.Shared.Atmos.Components; +using Content.Shared.Examine; + +namespace Content.Shared.Atmos.EntitySystems; + +public abstract partial class SharedDeltaPressureSystem : EntitySystem +{ + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnExaminedEvent); + } + + private void OnExaminedEvent(Entity ent, ref ExaminedEvent args) + { + if (ent.Comp.IsTakingDamage) + args.PushMarkup(Loc.GetString("window-taking-damage")); + } +} From 7427bf79714e33ca6c98d026fe0df06e0d1557b0 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 27 Oct 2025 11:13:26 +0000 Subject: [PATCH 016/121] 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 7a19d2e891..7b6d2d0f2d 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,13 +1,4 @@ Entries: -- author: Boaz1111 - changes: - - message: Various species can now have the same scars as humans do, with exceptions. - type: Add - - message: A smaller variant of the eye scars has been added. - type: Add - id: 8660 - time: '2025-06-11T21:56:57.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/35645 - author: SlamBamActionman changes: - message: Propeller hats can now be found in the Clothesmate. @@ -3929,3 +3920,12 @@ id: 9161 time: '2025-10-26T18:50:01.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/41068 +- author: ArtisticRoomba + changes: + - message: Examine text for whether an object is currently taking Delta-Pressure + damage is predicted, so you no longer have to wait for it to pop into place, + it just shows up instantly. + type: Tweak + id: 9162 + time: '2025-10-27T11:12:17.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/41135 From 4e716a64b80fa617bf55f79a37af56448e210bea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=81da?= Date: Mon, 27 Oct 2025 06:03:37 -0500 Subject: [PATCH 017/121] Document tags: M-Q (#41141) * the letter M * the letter N * the letter O * the letter P * the letter q * Update Resources/Prototypes/tags.yml --------- Co-authored-by: iaada Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --- .../Components/TransferMindOnGibComponent.cs | 6 +- .../Prototypes/Entities/Clothing/Belt/job.yml | 1 - .../Prototypes/Entities/Objects/Misc/pen.yml | 1 - .../Entities/Structures/Machines/lathe.yml | 46 +--- .../Structures/Power/Generation/teg.yml | 1 - .../pet_inventory_template.yml | 2 +- Resources/Prototypes/tags.yml | 204 +++++++++--------- 7 files changed, 117 insertions(+), 144 deletions(-) diff --git a/Content.Shared/Mind/Components/TransferMindOnGibComponent.cs b/Content.Shared/Mind/Components/TransferMindOnGibComponent.cs index 0343796741..233354834d 100644 --- a/Content.Shared/Mind/Components/TransferMindOnGibComponent.cs +++ b/Content.Shared/Mind/Components/TransferMindOnGibComponent.cs @@ -1,11 +1,11 @@ using Content.Shared.Tag; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; +using Robust.Shared.Prototypes; namespace Content.Shared.Mind.Components; [RegisterComponent] public sealed partial class TransferMindOnGibComponent : Component { - [DataField("targetTag", customTypeSerializer: typeof(PrototypeIdSerializer))] - public string TargetTag = "MindTransferTarget"; + [DataField] + public ProtoId TargetTag = "MindTransferTarget"; } diff --git a/Resources/Prototypes/Entities/Clothing/Belt/job.yml b/Resources/Prototypes/Entities/Clothing/Belt/job.yml index 9f170017f5..4024d8c06a 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/job.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/job.yml @@ -252,7 +252,6 @@ - BotanyShovel - BotanyHoe - BotanyHatchet - - PlantSampleTaker - PlantBGone - Bottle - Syringe diff --git a/Resources/Prototypes/Entities/Objects/Misc/pen.yml b/Resources/Prototypes/Entities/Objects/Misc/pen.yml index 0eede77db7..1a9fec83be 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/pen.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/pen.yml @@ -83,7 +83,6 @@ tags: - Write - WriteIgnoreStamps - - Pickaxe - Pen - type: MeleeWeapon wideAnimationRotation: -45 diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 60e52c772d..412126af5f 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -107,7 +107,7 @@ - type: Machine board: AutolatheMachineCircuitboard - type: MaterialStorage - whitelist: + whitelist: &StandardMaterialWhitelist tags: - Sheet - RawMaterial @@ -183,11 +183,7 @@ - type: Machine board: ProtolatheMachineCircuitboard - type: MaterialStorage - whitelist: - tags: - - Sheet - - RawMaterial - - Ingot + whitelist: *StandardMaterialWhitelist - type: OreSiloClient - type: Lathe idleState: icon @@ -271,11 +267,7 @@ emagDynamicPacks: - SecurityBoards - type: MaterialStorage - whitelist: - tags: - - Sheet - - RawMaterial - - Ingot + whitelist: *StandardMaterialWhitelist - type: OreSiloClient - type: RequireProjectileTarget @@ -320,11 +312,7 @@ - MechParts - MechEquipment - type: MaterialStorage - whitelist: - tags: - - Sheet - - RawMaterial - - Ingot + whitelist: *StandardMaterialWhitelist - type: OreSiloClient - type: GuideHelp guides: @@ -411,11 +399,7 @@ emagStaticPacks: - SyndicateAmmoStatic - type: MaterialStorage - whitelist: - tags: - - Sheet - - RawMaterial - - Ingot + whitelist: *StandardMaterialWhitelist - type: OreSiloClient - type: LatheAnnouncing channels: [Security] @@ -450,11 +434,7 @@ emagStaticPacks: - SyndicateAmmoStatic - type: MaterialStorage - whitelist: - tags: - - Sheet - - RawMaterial - - Ingot + whitelist: *StandardMaterialWhitelist - type: OreSiloClient - type: entity @@ -537,11 +517,7 @@ - ClothingCentComm - ClothingSyndie - type: MaterialStorage - whitelist: - tags: - - Sheet - - RawMaterial - - Ingot + whitelist: *StandardMaterialWhitelist - type: OreSiloClient - type: entity @@ -710,11 +686,5 @@ dynamicPacks: - FauxTiles - type: MaterialStorage - whitelist: - tags: - - Sheet - - Metal - - Wooden - - RawMaterial - - Plastic + whitelist: *StandardMaterialWhitelist - type: OreSiloClient diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/teg.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/teg.yml index debc07b6eb..0bf5011de2 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/teg.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/teg.yml @@ -151,7 +151,6 @@ # tags - type: Tag tags: - - Pipe - Unstackable # basic interactions diff --git a/Resources/Prototypes/InventoryTemplates/pet_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/pet_inventory_template.yml index b800995038..3924644b62 100644 --- a/Resources/Prototypes/InventoryTemplates/pet_inventory_template.yml +++ b/Resources/Prototypes/InventoryTemplates/pet_inventory_template.yml @@ -57,7 +57,7 @@ slotFlags: EYES uiWindowPos: 1,2 strippingWindowPos: 1,2 - displayName: Head + displayName: Eyes whitelist: tags: - PetWearable diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 062268da75..a974fa8b6f 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -368,7 +368,7 @@ id: CoordinatesDisk # Storage whitelist: DiskCase - type: Tag # designed to let corgis wear things; at present only for SmartCorgi. View PR 33737 on upstream for more dog wearables - id: CorgiWearable + id: CorgiWearable # Used by inventoryTemplate:SmartCorgi to whitelist clothes slots outerClothing, head, back. - type: Tag #Ohioans die happy id: Corn # CargoBounty: BountyCorn @@ -899,181 +899,181 @@ ## M ## - type: Tag - id: Machete + id: Machete # Unused (Exists on Machete, Cutlass) - type: Tag - id: MacroBomb + id: MacroBomb # Unused (Exists on MacroBombImplant) # Magazines ordered by slot then caliber - type: Tag - id: MagazineCalico + id: MagazineCalico # Unused x2 - type: Tag - id: MagazineCaselessRifle + id: MagazineCaselessRifle # Unused (Exists on BaseMagazineCaselessRifle) - type: Tag - id: MagazineHeavyRifle + id: MagazineHeavyRifle # Unused (Exists on BaseMagazineHeavyRifle) - type: Tag - id: MagazineHeavyRifleBox + id: MagazineHeavyRifleBox # Unused x2 - type: Tag - id: MagazineLightRifle + id: MagazineLightRifle # Storage whitelist: BaseWeaponRifle, WeaponRifleAk - type: Tag - id: MagazineLightRifleBox + id: MagazineLightRifleBox # Storage whitelist: BaseWeaponLightMachineGun - type: Tag - id: MagazineLightRiflePan + id: MagazineLightRiflePan # Unused x2 - type: Tag - id: MagazineMagnum + id: MagazineMagnum # Storage whitelist: ClothingBeltSecurity, WeaponPistolN1984 - type: Tag - id: MagazinePistol + id: MagazinePistol # Storage whitelist: ClothingBeltSecurity, BaseWeaponPistol, WeaponPistolViper - type: Tag - id: MagazinePistolCaselessRifle + id: MagazinePistolCaselessRifle # Storage whitelist: WeaponPistolCobra - type: Tag - id: MagazinePistolHighCapacity + id: MagazinePistolHighCapacity # Storage whitelist: WeaponPistolViper - type: Tag - id: MagazinePistolSubMachineGunTopMounted + id: MagazinePistolSubMachineGunTopMounted # Storage whitelist: WeaponSubMachineGunWt550 - type: Tag - id: MagazineRifle + id: MagazineRifle # Storage whitelist: WeaponRifleLecter, WeaponRifleEstoc, WeaponRifleM90GrenadeLauncher - type: Tag - id: MagazineShotgun + id: MagazineShotgun # Storage whitelist: WeaponShotgunBulldog - type: Tag - id: MagazinePistolSubMachineGun + id: MagazinePistolSubMachineGun # Storage whitelist: BaseWeaponSubMachineGun, WeaponSubMachineGunDrozd - type: Tag - id: MagazineGrenade + id: MagazineGrenade # Storage whitelist: ShuttleGunDuster # Magazines end - type: Tag - id: MailingUnitElectronics + id: MailingUnitElectronics # ConstructionGraph: DisposalMachine + +- type: Tag # Used on DungeonRoom prototypes. + id: Maints # RoomFill spawner whitelist for MaintsRoomMarker. - type: Tag - id: Maints + id: Matchstick # Storage whitelist: Ashtray. ConstructionGraph: ImprovisedShotgunShellGraph - type: Tag - id: Matchstick + id: Mayo # Storage whitelist: ClothingBeltChef - type: Tag - id: Mayo + id: Meat # SpecialDigestible: OrganReptilianStomach. CargoBounty: BountyFood. Several MetamorphRecipes. - type: Tag - id: Meat + id: Medal # Storage whitelist: MedalCase - type: Tag - id: Medal + id: Medkit # CargoBounty: BountyMedkitBox. ConstructionGraph: MediBot - type: Tag - id: Medkit + id: MessyDrinkerImmune # Default value in MessyDrinkerComponent. Tagged entity is immune to spills. - type: Tag - id: MessyDrinkerImmune + id: Metal # Used by MicrowaveSystem. Causes microwaves to malfunction when tagged entity is nuked. - type: Tag - id: Metal + id: MicroBomb # ReplacementImplant whitelist on MacroBombImplant. - type: Tag - id: MicroBomb + id: MicrowaveMachineBoard # CargoBounty: BountyMicrowaveMachineBoard - type: Tag - id: MicrowaveMachineBoard + id: MimeBelt # ConstructionGraph: MimeHardsuit, MimeBot - type: Tag - id: MimeBelt + id: MimeHappyHonk # ConstructionGraph: MimeBot - type: Tag - id: MimeHappyHonk + id: MindTransferTarget # Default value in TransferMindOnGibComponent. Moves the mind of the gibed component owner to the tagged giblet. + +- type: Tag # Used on DungeonRoom prototypes. + id: Mineshaft # PrefabDunGen whitelist on Mineshaft DungeonConfig. - type: Tag - id: MindTransferTarget + id: ModularReceiver # ConstructionGraph: ImprovisedShotgunGraph - type: Tag - id: Mineshaft + id: MonkeyCube # Storage whitelist: ClothingBeltChef. CargoBounty: BountyMonkeyCube - type: Tag - id: ModularReceiver + id: MonkeyWearable # Used by inventoryTemplate:monkey to whitelist clothing slot outerClothing for slightly less intelligent primates. - type: Tag - id: MonkeyCube + id: Mop # Storage whitelist: JanitorialTrolley - type: Tag - id: MonkeyWearable + id: MopAdv # ItemMapper: JanitorialTrolley - type: Tag - id: Mop + id: MopBasic # ItemMapper: JanitorialTrolley. ConstructionGraph: MoproachShoes - type: Tag - id: MopAdv + id: Mouse # CargoBounty: BountyMouse - type: Tag - id: MopBasic + id: Multitool # Storage whitelist: BaseClothingBeltEngineering. ItemMapper: BaseClothingBeltEngineering. ConstructionGraph: LogicGate - type: Tag - id: Mouse - -- type: Tag - id: Multitool - -- type: Tag - id: Mushroom + id: Mushroom # ConstructionGraph: Soil ## N ## - type: Tag id: NinjaBombingTargetBlocker # Ninjas will not target this warp point - type: Tag - id: NoBlockAnchoring + id: NoBlockAnchoring # Unused x2 - type: Tag - id: NoConsoleSound + id: NoConsoleSound # Blacklist on BaseComputer, StationMap. Tagged entity will not make sound when opening the UI. - type: Tag - id: NozzleBackTank + id: NozzleBackTank # Storage whitelist: WeaponSprayNozzle - type: Tag id: Nugget # ItemCounter: FoodBoxNugget - type: Tag - id: NukeOpsUplink + id: NukeOpsUplink # Used by NukeopsRuleSystem to find nukie uplinks during warops. Whitelisting for ListingPrototypes. ## O ## - type: Tag - id: Ointment + id: Ointment # Storage whitelist: ClothingBeltMedical - type: Tag - id: Ore + id: Ore # Storage whitelist: OreBag, OreBox. MaterialStorage whitelist: OreProcessor - type: Tag - id: OreBananium + id: OreBananium # CargoBounty: BountySalvageOreBananium - type: Tag - id: OreGold + id: OreGold # CargoBounty: BountySalvageOreGold - type: Tag - id: OrePlasma + id: OrePlasma # CargoBounty: BountySalvageOrePlasma - type: Tag - id: OreSilver + id: OreSilver # CargoBounty: BountySalvageOreSilver - type: Tag - id: OreUranium + id: OreUranium # CargoBounty: BountySalvageOreUranium ## P ## - type: Tag - id: Packet + id: Packet # Storage whitelist: ClothingBeltChef - type: Tag id: ParadoxCloneObjectiveBlacklist # objective entities with this tag don't get copied to paradox clones @@ -1082,129 +1082,134 @@ id: Paper # A writeable piece of paper. Subset of Document tag. SpecialDigestible: OrganMothStomach, OrganReptilianStomach - type: Tag - id: Pancake + id: Pancake # CargoBounty: BountyPancake - type: Tag - id: ParcelWrapBlacklist + id: ParcelWrapBlacklist # Tagged entities can't be wrapped in ParcelWrap. - type: Tag - id: Payload # for grenade/bomb crafting + id: Payload # Used by PayloadSystem to find entities to send TriggerEvent. ConstructionGraph: ModularGrenadeGraph, ModularMineGraph - type: Tag - id: Pen + id: Pen # CargoBounty: BountyPen - type: Tag - id: PepperShaker + id: PepperShaker # Storage whitelist: ClothingBeltChef. ItemMapper: ClothingBeltChef - type: Tag id: PercussionInstrument # CargoBounty: BountyPercussion. MachineBoard construction: DawInstrumentMachineCircuitboard - type: Tag - id: PetOnly + id: PetOnly # Used by human, diona, arachnid InventoryTemplate to blacklist back slot items. - type: Tag - id: PetWearable + id: PetWearable # Used by hamster, kangaroo, pet, petAdvanced, SmartCorgi InventoryTemplate to whitelist mask slots. + # SmartCorgi and petAdvanced use it for eyes slots. petAdvanced uses it for head slot. - type: Tag - id: Pickaxe + id: Pickaxe # GatherableComponent whitelist on WallRock. - type: Tag - id: Pie + id: Pie # CargoBounty: BountyPie. Blacklisted in BountyFruit and BountyVegetable. - type: Tag - id: Pig + id: Pig # Reproductive partner key. - type: Tag - id: Pill + id: Pill # Storage whitelist: PillCanister. SpecialDigestible: OrganMothStomach, OrganReptilianStomach - type: Tag - id: PillCanister + id: PillCanister # Storage whitelist: ClothingBeltMedical, ChemBag, ChemMaster, SmartFridge. ItemMapper: ClothingBeltMedical - type: Tag - id: Pipe + id: Pipe # ConstructionGraph: BananiumHorn, ImprovisedShotgunGraph, PipeBomb, PneumaticCannon - type: Tag - id: Pistachios + id: Pistachios # Blacklist on BountyFruit. - type: Tag - id: Pizza + id: Pizza # Storage whitelist: FoodBoxPizza - type: Tag - id: PKAUpgrade + id: PKAUpgrade # UpgradeableGun whitelist for WeaponProtoKineticAccelerator. - type: Tag - id: PlantAnalyzer + id: PlantAnalyzer # Commented out on ClothingBeltPlant, so currently unused x2. - type: Tag - id: PlantBGone + id: PlantBGone # Storage whitelist: ClothingBeltPlant. ItemMapper: ClothingBeltPlant - type: Tag - id: PlantSampleTaker + id: PlantSampleTaker # Used by PlantHolderSystem to make tagged entities a pseudo-tool for trimming seeds. TODO this sucks! - type: Tag - id: PlasmaGlassShard + id: PlasmaGlassShard # ConstructionGraph: ImprovisedArrowPlasma, PlasmaShiv, SpearPlasma - type: Tag - id: Plastic + id: Plastic # Used by MicrowaveSystem to turn tagged entities into trash. - type: Tag - id: Plunger + id: Plunger # Storage whitelist: BaseBow, ClothingBeltQuiver, ClothingBeltJanitor, JanitorialTrolley. ItemMapper: ClothingBeltJanitor, JanitorialTrolley. + # Storage blacklist on BaseToilet due to conflicting actions. - type: Tag - id: PlushieCarp + id: PlushieCarp # Storage whitelist: MopBucket. ItemMapper: MopBucket - type: Tag - id: PlushieCarpHolo + id: PlushieCarpHolo # Storage whitelist: MopBucket. ItemMapper: MopBucket - type: Tag - id: PlushieCarpMagi + id: PlushieCarpMagi # Storage whitelist: MopBucket. ItemMapper: MopBucket - type: Tag - id: PlushieGhost + id: PlushieGhost # ConstructionGraph: PlushieGhostRevenant - type: Tag - id: PlushieLizard + id: PlushieLizard # ConstructionGraph: ClothingShoeSlippersLizard - type: Tag - id: PlushieSharkBlue + id: PlushieSharkBlue # Storage whitelist: MopBucket. ItemMapper: MopBucket - type: Tag - id: PlushieSharkGrey + id: PlushieSharkGrey # Storage whitelist: MopBucket. ItemMapper: MopBucket - type: Tag - id: PlushieSharkPink + id: PlushieSharkPink # Storage whitelist: MopBucket. ItemMapper: MopBucket - type: Tag - id: Potato + id: Potato # ConstructionGraph: PowerCellPotato - type: Tag - id: PotatoBattery + id: PotatoBattery # ConstructionGraph: PotatoAI. Blacklisted on battery chargers. - type: Tag - id: PowerCage + id: PowerCage # Storage whitelist: PowerCageRecharger, ShuttleGunPerforator - type: Tag - id: PowerCell + id: PowerCell # Storage whitelist: BountyLaserGun, ClothingOuterSuitSpaceNinja, BaseWeaponPowerCell, PowerCellRecharger, WeaponCapacitorRecharger, + # TurboItemRecharger, ShuttleGunSvalinnMachineGun. ConstructionGraph: WallmountSubstation + # Could potentially be replaced by whitelisting PowerCellComponent. - type: Tag - id: PowerCellSmall + id: PowerCellSmall # Storage whitelist: BaseWeaponPowerCell, PowerCellRecharger, ShuttleGunSvalinnMachineGun. + # ConstructionGraph: WallmountSubstation, makeshiftstunprod - type: Tag - id: Powerdrill + id: Powerdrill # Storage whitelist: BaseClothingBeltEngineering. ItemMapper: BaseClothingBeltEngineering - type: Tag - id: PreventAccessLogging + id: PreventAccessLogging # Tagged entities (aghost) will not be added to a device's log. Used by AccessReaderSystem. - type: Tag - id: PrisonUniform + id: PrisonUniform # CargoBounty: BountyPrisonUniform - type: Tag - id: ProximitySensor + id: ProximitySensor # This tag is used as a common ingredient in the construction of various machines and bots. ## Q ## - type: Tag - id: QuantumSpinInverter + id: QuantumSpinInverter # Used by namesake to recognize other QSIs. Also used as a blacklist in some storages to prevent bugs. ## R ## @@ -1590,6 +1595,7 @@ - type: Tag id: Wooden # just like our atmos + # MaterialStorage whitelist: Sheetifier - type: Tag id: WoodwindInstrument # even more like our atmos From 41f6bcf00e21f6d8251c5b955d14663ecb387075 Mon Sep 17 00:00:00 2001 From: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> Date: Mon, 27 Oct 2025 11:15:51 -0300 Subject: [PATCH 018/121] Discord Command Arguments as List (#41113) * start (i got distracted) * feat: list-based arguments for the discord implementation * chore: unnecessary? * chore: rename ArgumentList to Arguments * fix: rename error * chore: todo * fix: error, again. I'm silly. * chore: review * *sound of flames* --- .../Discord/DiscordLink/DiscordChatLink.cs | 13 +++++++++ .../Discord/DiscordLink/DiscordLink.cs | 28 ++++++++++++++----- 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/Content.Server/Discord/DiscordLink/DiscordChatLink.cs b/Content.Server/Discord/DiscordLink/DiscordChatLink.cs index 358bc4ab3e..34ddc39f71 100644 --- a/Content.Server/Discord/DiscordLink/DiscordChatLink.cs +++ b/Content.Server/Discord/DiscordLink/DiscordChatLink.cs @@ -1,6 +1,7 @@ using Content.Server.Chat.Managers; using Content.Shared.CCVar; using Content.Shared.Chat; +using NetCord; using NetCord.Gateway; using Robust.Shared.Asynchronous; using Robust.Shared.Configuration; @@ -24,6 +25,10 @@ public sealed class DiscordChatLink : IPostInjectInit { _discordLink.OnMessageReceived += OnMessageReceived; + #if DEBUG + _discordLink.RegisterCommandCallback(OnDebugCommandRun, "debug"); + #endif + _configurationManager.OnValueChanged(CCVars.OocDiscordChannelId, OnOocChannelIdChanged, true); _configurationManager.OnValueChanged(CCVars.AdminChatDiscordChannelId, OnAdminChannelIdChanged, true); } @@ -36,6 +41,14 @@ public sealed class DiscordChatLink : IPostInjectInit _configurationManager.UnsubValueChanged(CCVars.AdminChatDiscordChannelId, OnAdminChannelIdChanged); } + #if DEBUG + private void OnDebugCommandRun(CommandReceivedEventArgs ev) + { + var args = string.Join('\n', ev.Arguments); + _sawmill.Info($"Provided arguments: \n{args}"); + } + #endif + private void OnOocChannelIdChanged(string channelId) { if (string.IsNullOrEmpty(channelId)) diff --git a/Content.Server/Discord/DiscordLink/DiscordLink.cs b/Content.Server/Discord/DiscordLink/DiscordLink.cs index cbfe12f180..5bfb61d4d1 100644 --- a/Content.Server/Discord/DiscordLink/DiscordLink.cs +++ b/Content.Server/Discord/DiscordLink/DiscordLink.cs @@ -1,9 +1,11 @@ -using System.Threading.Tasks; +using System.Collections.ObjectModel; +using System.Threading.Tasks; using Content.Shared.CCVar; using NetCord; using NetCord.Gateway; using NetCord.Rest; using Robust.Shared.Configuration; +using Robust.Shared.Utility; namespace Content.Server.Discord.DiscordLink; @@ -18,9 +20,16 @@ public sealed class CommandReceivedEventArgs public string Command { get; init; } = string.Empty; /// - /// The arguments to the command. This is everything after the command + /// The raw arguments to the command. This is everything after the command /// - public string Arguments { get; init; } = string.Empty; + public string RawArguments { get; init; } = string.Empty; + + /// + /// A list of arguments to the command. + /// This uses mostly for maintainability. + /// + public List Arguments { get; init; } = []; + /// /// Information about the message that the command was received from. This includes the message content, author, etc. /// Use this to reply to the message, delete it, etc. @@ -66,6 +75,7 @@ public sealed class DiscordLink : IPostInjectInit /// public event Action? OnMessageReceived; + // TODO: consider implementing this in a way where we can unregister it in a similar way public void RegisterCommandCallback(Action callback, string command) { OnCommandReceived += args => @@ -180,24 +190,28 @@ public sealed class DiscordLink : IPostInjectInit var trimmedInput = content[BotPrefix.Length..].Trim(); var firstSpaceIndex = trimmedInput.IndexOf(' '); - string command, arguments; + string command, rawArguments; if (firstSpaceIndex == -1) { command = trimmedInput; - arguments = string.Empty; + rawArguments = string.Empty; } else { command = trimmedInput[..firstSpaceIndex]; - arguments = trimmedInput[(firstSpaceIndex + 1)..].Trim(); + rawArguments = trimmedInput[(firstSpaceIndex + 1)..].Trim(); } + var argumentList = new List(); + CommandParsing.ParseArguments(rawArguments, argumentList); + // Raise the event! OnCommandReceived?.Invoke(new CommandReceivedEventArgs { Command = command, - Arguments = arguments, + Arguments = argumentList, + RawArguments = rawArguments, Message = message, }); return ValueTask.CompletedTask; From 85f607f1e67e398df169e21f5b27a1ec4e1daabd Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Mon, 27 Oct 2025 19:45:28 +0100 Subject: [PATCH 019/121] make water cup spill when worn (#41148) --- .../Entities/Objects/Consumable/Drinks/drinks_cups.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml index 7b1320ba49..ea11162c99 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml @@ -95,6 +95,8 @@ - HEAD quickEquip: false sprite: Clothing/Head/Hats/party_water_cup.rsi + - type: SpillWhenWorn + solution: drink # Mugs - type: entity From cf66dd7b350dc394ba3afc1252b636ac96c9a93d Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 27 Oct 2025 18:57:24 +0000 Subject: [PATCH 020/121] Automatic changelog update --- Resources/Changelog/Changelog.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 7b6d2d0f2d..1ad11639c7 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,14 +1,4 @@ Entries: -- author: SlamBamActionman - changes: - - message: Propeller hats can now be found in the Clothesmate. - type: Add - - message: Swirl lollipops can now be found in the manager inventory of GetMore - Chocolate Corp. vending machines. - type: Add - id: 8661 - time: '2025-06-12T01:22:51.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/38260 - author: themias changes: - message: Fixed an issue where the gas analyzer and anomaly scanner would need @@ -3929,3 +3919,10 @@ id: 9162 time: '2025-10-27T11:12:17.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/41135 +- author: lzk228 + changes: + - message: Water cup spills when worn + type: Tweak + id: 9163 + time: '2025-10-27T18:56:16.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/41148 From cdbe92d37d65b6adc89d45f66825ad502ad4549f Mon Sep 17 00:00:00 2001 From: Hannah Giovanna Dawson Date: Mon, 27 Oct 2025 19:53:04 +0000 Subject: [PATCH 021/121] Update DamageableSystem to modern standards (#39417) * Update DamageableSystem to modern standards * DamageContainerId -> DamageContainerID with lint flag * Replace strings with protoids * Make CVar subscription declarations all consistently whitespaced * ChangeDamage -> TryChangeDamage, cope with C# jank * Revert event signature changes * Restore a comment * Re-add two queries * Init the queries * Use appearanceQuery in DamageChanged * Use damageableQuery in TryChangeDamage * Use damageableQuery in SetDamageModifierSetId * Final cleanup, fix sandboxing * Rectify ExplosionSystem:::ProcessEntity's call to TryChangeDamage * Re-organize DamageableSystem * first big fuck you breaking change. * THATS A LOT OF DAMAGE!!! * Fix test fails * test fixes 2 * push it --------- Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> --- Content.Benchmarks/DestructibleBenchmark.cs | 3 +- Content.Client/Damage/DamageVisualsSystem.cs | 1 + .../UI/HealthAnalyzerWindow.xaml.cs | 8 +- .../Overlays/EntityHealthBarOverlay.cs | 2 +- .../Overlays/ShowHealthIconsSystem.cs | 2 +- .../DamageOverlayUiController.cs | 2 +- .../Tests/Commands/RejuvenateTest.cs | 2 + .../Tests/Commands/SuicideCommandTests.cs | 6 +- .../Construction/Interaction/WindowRepair.cs | 4 +- .../Tests/Damageable/DamageableTest.cs | 12 +- .../DestructibleDamageGroupTest.cs | 6 +- .../DestructibleDamageTypeTest.cs | 2 + .../DestructibleDestructionTest.cs | 1 + .../DestructibleThresholdActivationTest.cs | 8 +- .../Tests/GameRules/NukeOpsTest.cs | 2 +- .../Tests/Minds/MindTests.cs | 4 +- .../Tests/Mousetrap/MousetrapTest.cs | 3 +- .../Tests/Storage/EntityStorageTests.cs | 1 + .../Tests/Vending/VendingInteractionTest.cs | 4 +- .../Tests/VendingMachineRestockTest.cs | 9 +- .../Tests/Weapons/WeaponTests.cs | 2 +- .../Access/Systems/IdCardConsoleSystem.cs | 1 + .../Systems/AdminVerbSystem.Smites.cs | 3 +- .../AtmosphereSystem.DeltaPressure.cs | 2 +- .../Atmos/EntitySystems/AtmosphereSystem.cs | 2 +- .../Atmos/EntitySystems/BarotraumaSystem.cs | 3 +- .../Atmos/EntitySystems/FlammableSystem.cs | 2 +- Content.Server/Atmos/Rotting/RottingSystem.cs | 2 +- Content.Server/Bed/BedSystem.cs | 2 +- Content.Server/Bible/BibleSystem.cs | 7 +- .../Body/Systems/RespiratorSystem.cs | 6 +- .../CardboardBox/CardboardBoxSystem.cs | 14 +- Content.Server/Chat/SuicideSystem.cs | 2 +- .../Chat/Systems/EmoteOnDamageSystem.cs | 2 + Content.Server/Cloning/CloningPodSystem.cs | 2 +- Content.Server/Cluwne/CluwneSystem.cs | 2 +- .../Construction/Conditions/MinHealth.cs | 7 +- Content.Server/Damage/Commands/HurtCommand.cs | 2 +- .../Damage/ForceSay/DamageForceSaySystem.cs | 1 + .../Damage/Systems/DamageOnHitSystem.cs | 3 +- .../Damage/Systems/DamageOnLandSystem.cs | 2 +- .../Systems/DamageOnToolInteractSystem.cs | 14 +- .../Damage/Systems/DamageOtherOnHitSystem.cs | 8 +- .../Damage/Systems/DamageRandomPopupSystem.cs | 1 + .../Damage/Systems/ExaminableDamageSystem.cs | 2 +- .../DestructibleSystem.BenchmarkHelpers.cs | 4 +- .../Destructible/DestructibleSystem.cs | 5 +- .../Disposal/Unit/DisposableSystem.cs | 2 +- Content.Server/Dragon/DragonRiftSystem.cs | 4 +- .../Electrocution/ElectrocutionSystem.cs | 14 +- .../EntitySystems/ExplosionSystem.Airtight.cs | 4 +- .../ExplosionSystem.Processing.cs | 37 +- .../EntitySystems/ExplosionSystem.cs | 3 +- Content.Server/Ghost/GhostSystem.cs | 5 +- Content.Server/Guardian/GuardianSystem.cs | 6 +- .../ImmovableRod/ImmovableRodSystem.cs | 3 +- .../KillTracking/KillTrackingSystem.cs | 1 + .../Kitchen/EntitySystems/MicrowaveSystem.cs | 4 +- .../Lightning/LightningTargetSystem.cs | 3 +- Content.Server/Mech/Systems/MechSystem.cs | 4 +- Content.Server/Medical/DefibrillatorSystem.cs | 3 +- .../Medical/HealthAnalyzerSystem.cs | 2 +- Content.Server/Mining/MeteorSystem.cs | 3 +- .../Specific/PickNearbyInjectableOperator.cs | 2 +- .../NPC/Systems/NPCRetaliationSystem.cs | 1 + .../NPC/Systems/NPCUtilitySystem.cs | 2 +- .../Ninja/Systems/StunProviderSystem.cs | 6 +- .../EntitySystems/SmokingSystem.Vape.cs | 2 +- .../Polymorph/Systems/PolymorphSystem.cs | 7 +- .../Projectiles/ProjectileSystem.cs | 72 +-- .../EntitySystems/RevenantSystem.Abilities.cs | 2 +- .../Revenant/EntitySystems/RevenantSystem.cs | 2 +- .../Shuttles/Systems/ShuttleSystem.Impact.cs | 3 +- .../Shuttles/Systems/ShuttleSystem.cs | 2 +- .../Shuttles/Systems/ThrusterSystem.cs | 4 +- .../Silicons/Borgs/BorgSystem.Transponder.cs | 2 +- .../Silicons/StationAi/StationAiSystem.cs | 8 +- .../DamagedSiliconAccentSystem.cs | 2 +- Content.Server/Spreader/KudzuSystem.cs | 3 +- .../Temperature/Systems/TemperatureSystem.cs | 3 +- .../VendingMachines/VendingMachineSystem.cs | 1 + .../Ranged/Systems/GunSystem.AutoFire.cs | 2 +- .../Zombies/ZombieSystem.Transform.cs | 6 +- Content.Server/Zombies/ZombieSystem.cs | 11 +- Content.Shared/Armor/SharedArmorSystem.cs | 1 + Content.Shared/Bed/Sleep/SleepingSystem.cs | 1 + .../Blocking/BlockingSystem.User.cs | 48 +- .../Body/Systems/SharedBloodstreamSystem.cs | 5 +- .../Body/Systems/SharedBodySystem.Parts.cs | 2 +- .../Body/Systems/SharedBodySystem.cs | 2 +- .../Systems/ChangelingDevourSystem.cs | 5 +- Content.Shared/Chat/SharedSuicideSystem.cs | 8 +- .../Climbing/Systems/ClimbSystem.cs | 2 +- .../Clothing/SharedCursedMaskSystem.cs | 1 + Content.Shared/Clumsy/ClumsySystem.cs | 8 +- .../ClothingSlowOnDamageModifierComponent.cs | 1 + .../Damage/Components/DamageableComponent.cs | 182 +++---- .../Components/IgnoreSlowOnDamageComponent.cs | 1 + .../RequireProjectileTargetComponent.cs | 1 + Content.Shared/Damage/DamageModifierSet.cs | 1 + Content.Shared/Damage/DamageSpecifier.cs | 1 + .../Prototypes/DamageContainerPrototype.cs | 2 +- .../Damage/Prototypes/DamageGroupPrototype.cs | 2 +- .../Damage/Systems/DamageOnAttackedSystem.cs | 4 +- .../Damage/Systems/DamageOnInteractSystem.cs | 6 +- .../Damage/Systems/DamageableSystem.API.cs | 235 ++++++++ .../DamageableSystem.BenchmarkHelpers.cs | 6 +- .../Damage/Systems/DamageableSystem.Events.cs | 290 ++++++++++ .../Damage/Systems/DamageableSystem.cs | 510 +++--------------- .../Damage/Systems/PassiveDamageSystem.cs | 6 +- .../Systems/RequireProjectileTargetSystem.cs | 7 +- .../Damage/Systems/SharedGodmodeSystem.cs | 4 +- .../Damage/Systems/SlowOnDamageSystem.cs | 183 ++++--- .../Destructible/Triggers/AndTrigger.cs | 2 +- .../Triggers/DamageGroupTrigger.cs | 2 +- .../Destructible/Triggers/DamageTrigger.cs | 2 +- .../Triggers/DamageTypeTrigger.cs | 2 +- .../Triggers/IThresholdTrigger.cs | 2 +- .../Destructible/Triggers/OrTrigger.cs | 2 +- Content.Shared/DoAfter/SharedDoAfterSystem.cs | 1 + .../Doors/Systems/SharedDoorSystem.cs | 2 +- .../DamageGroupEntityConditionSystem.cs | 2 +- .../DamageTypeEntityConditionSystem.cs | 1 + .../TotalDamageEntityConditionSystem.cs | 2 +- .../EvenHealthChangeEntityEffectSystem.cs | 7 +- .../Effects/HealthChangeEntityEffectSystem.cs | 11 +- .../Execution/SharedExecutionSystem.cs | 3 +- Content.Shared/Fax/Systems/FaxecuteSystem.cs | 4 +- .../Flash/DamagedByFlashingSystem.cs | 4 +- .../HealthExaminableSystem.cs | 2 +- .../Implants/SharedImplanterSystem.cs | 2 +- .../Inventory/InventorySystem.Relay.cs | 1 + .../Kitchen/SharedKitchenSpikeSystem.cs | 6 +- .../Medical/Healing/HealingSystem.cs | 9 +- .../Medical/Stethoscope/StethoscopeSystem.cs | 2 +- .../SuitSensors/SharedSuitSensorSystem.cs | 2 +- .../Mobs/Components/MobStateComponent.cs | 3 +- .../Systems/MobStateSystem.Subscribers.cs | 1 + Content.Shared/Mobs/Systems/MobStateSystem.cs | 3 +- .../Mobs/Systems/MobThresholdSystem.cs | 2 + .../Nutrition/EntitySystems/HungerSystem.cs | 4 +- .../Systems/SharedChameleonProjectorSystem.cs | 2 +- Content.Shared/Repairable/RepairableSystem.cs | 9 +- .../Silicons/Borgs/SharedBorgSystem.Relay.cs | 1 + Content.Shared/Silicons/Bots/MedibotSystem.cs | 8 +- .../EntitySystems/SecretStashSystem.cs | 2 +- .../Stunnable/SharedStunSystem.Knockdown.cs | 1 + .../Trigger/Systems/DamageOnTriggerSystem.cs | 4 +- .../Turrets/SharedDeployableTurretSystem.cs | 6 +- .../Systems/HitscanBasicDamageSystem.cs | 6 +- .../Marker/SharedDamageMarkerSystem.cs | 2 +- .../Weapons/Melee/SharedMeleeWeaponSystem.cs | 10 +- .../Weapons/Ranged/Systems/SharedGunSystem.cs | 1 + .../Artifact/SharedXenoArtifactSystem.XAT.cs | 1 + .../Artifact/XAE/XAEDamageInAreaSystem.cs | 1 + .../XAT/XATDamageThresholdReachedSystem.cs | 1 + .../Equipment/SharedArtifactCrusherSystem.cs | 2 +- 157 files changed, 1127 insertions(+), 967 deletions(-) create mode 100644 Content.Shared/Damage/Systems/DamageableSystem.API.cs create mode 100644 Content.Shared/Damage/Systems/DamageableSystem.Events.cs diff --git a/Content.Benchmarks/DestructibleBenchmark.cs b/Content.Benchmarks/DestructibleBenchmark.cs index b91837e7ca..1b54bacca0 100644 --- a/Content.Benchmarks/DestructibleBenchmark.cs +++ b/Content.Benchmarks/DestructibleBenchmark.cs @@ -1,12 +1,13 @@ using System.Collections.Generic; -using System.Diagnostics; using System.Threading.Tasks; using BenchmarkDotNet.Attributes; using Content.IntegrationTests; using Content.IntegrationTests.Pair; using Content.Server.Destructible; using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.Damage.Prototypes; +using Content.Shared.Damage.Systems; using Content.Shared.FixedPoint; using Content.Shared.Maps; using Robust.Shared; diff --git a/Content.Client/Damage/DamageVisualsSystem.cs b/Content.Client/Damage/DamageVisualsSystem.cs index 065bf628bc..ac3ff819aa 100644 --- a/Content.Client/Damage/DamageVisualsSystem.cs +++ b/Content.Client/Damage/DamageVisualsSystem.cs @@ -1,5 +1,6 @@ using System.Linq; using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.Damage.Prototypes; using Content.Shared.FixedPoint; using Robust.Client.GameObjects; diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs index 225619b031..533a8b9f2c 100644 --- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs +++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs @@ -1,28 +1,22 @@ using System.Linq; using System.Numerics; -using Content.Client.Message; using Content.Shared.Atmos; using Content.Client.UserInterface.Controls; -using Content.Shared.Alert; -using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.Damage.Prototypes; using Content.Shared.FixedPoint; using Content.Shared.Humanoid; using Content.Shared.Humanoid.Prototypes; using Content.Shared.IdentityManagement; -using Content.Shared.Inventory; using Content.Shared.MedicalScanner; using Content.Shared.Mobs; using Content.Shared.Mobs.Components; -using Content.Shared.Mobs.Systems; -using Content.Shared.Nutrition.Components; using Robust.Client.AutoGenerated; using Robust.Client.UserInterface.XAML; using Robust.Client.GameObjects; using Robust.Client.Graphics; using Robust.Client.UserInterface.Controls; using Robust.Client.ResourceManagement; -using Robust.Client.UserInterface; using Robust.Shared.Prototypes; using Robust.Shared.Utility; diff --git a/Content.Client/Overlays/EntityHealthBarOverlay.cs b/Content.Client/Overlays/EntityHealthBarOverlay.cs index cf9d879844..55fc1e0974 100644 --- a/Content.Client/Overlays/EntityHealthBarOverlay.cs +++ b/Content.Client/Overlays/EntityHealthBarOverlay.cs @@ -1,7 +1,7 @@ using System.Numerics; using Content.Client.StatusIcon; using Content.Client.UserInterface.Systems; -using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.FixedPoint; using Content.Shared.Mobs; using Content.Shared.Mobs.Components; diff --git a/Content.Client/Overlays/ShowHealthIconsSystem.cs b/Content.Client/Overlays/ShowHealthIconsSystem.cs index 0a875e79c5..7fbc0cd944 100644 --- a/Content.Client/Overlays/ShowHealthIconsSystem.cs +++ b/Content.Client/Overlays/ShowHealthIconsSystem.cs @@ -1,5 +1,4 @@ using Content.Shared.Atmos.Rotting; -using Content.Shared.Damage; using Content.Shared.Inventory.Events; using Content.Shared.Mobs.Components; using Content.Shared.Overlays; @@ -7,6 +6,7 @@ using Content.Shared.StatusIcon; using Content.Shared.StatusIcon.Components; using Robust.Shared.Prototypes; using System.Linq; +using Content.Shared.Damage.Components; namespace Content.Client.Overlays; diff --git a/Content.Client/UserInterface/Systems/DamageOverlays/DamageOverlayUiController.cs b/Content.Client/UserInterface/Systems/DamageOverlays/DamageOverlayUiController.cs index 55d00fec18..20db76554d 100644 --- a/Content.Client/UserInterface/Systems/DamageOverlays/DamageOverlayUiController.cs +++ b/Content.Client/UserInterface/Systems/DamageOverlays/DamageOverlayUiController.cs @@ -1,4 +1,4 @@ -using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.FixedPoint; using Content.Shared.Mobs; using Content.Shared.Mobs.Components; diff --git a/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs b/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs index 53604b2c1e..87ff00691a 100644 --- a/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs +++ b/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs @@ -1,6 +1,8 @@ using Content.Shared.Administration.Systems; using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.Damage.Prototypes; +using Content.Shared.Damage.Systems; using Content.Shared.FixedPoint; using Content.Shared.Mobs.Components; using Content.Shared.Mobs.Systems; diff --git a/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs b/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs index c232ccf415..57e8bfd449 100644 --- a/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs +++ b/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs @@ -1,6 +1,8 @@ using System.Linq; using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.Damage.Prototypes; +using Content.Shared.Damage.Systems; using Content.Shared.Execution; using Content.Shared.FixedPoint; using Content.Shared.Ghost; @@ -280,7 +282,7 @@ public sealed class SuicideCommandTests await server.WaitAssertion(() => { // Heal all damage first (possible low pressure damage taken) - damageableSystem.SetAllDamage(player, damageableComp, 0); + damageableSystem.ClearAllDamage((player, damageableComp)); consoleHost.GetSessionShell(playerMan.Sessions.First()).ExecuteCommand("suicide"); var lethalDamageThreshold = mobThresholdsComp.Thresholds.Keys.Last(); @@ -355,7 +357,7 @@ public sealed class SuicideCommandTests await server.WaitAssertion(() => { // Heal all damage first (possible low pressure damage taken) - damageableSystem.SetAllDamage(player, damageableComp, 0); + damageableSystem.ClearAllDamage((player, damageableComp)); consoleHost.GetSessionShell(playerMan.Sessions.First()).ExecuteCommand("suicide"); var lethalDamageThreshold = mobThresholdsComp.Thresholds.Keys.Last(); diff --git a/Content.IntegrationTests/Tests/Construction/Interaction/WindowRepair.cs b/Content.IntegrationTests/Tests/Construction/Interaction/WindowRepair.cs index 192604edfd..5a4d284c0f 100644 --- a/Content.IntegrationTests/Tests/Construction/Interaction/WindowRepair.cs +++ b/Content.IntegrationTests/Tests/Construction/Interaction/WindowRepair.cs @@ -1,6 +1,8 @@ using Content.IntegrationTests.Tests.Interaction; using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.Damage.Prototypes; +using Content.Shared.Damage.Systems; using Content.Shared.FixedPoint; using Robust.Shared.Prototypes; @@ -21,7 +23,7 @@ public sealed class WindowRepair : InteractionTest var damageType = Server.ProtoMan.Index(BluntDamageType); var damage = new DamageSpecifier(damageType, FixedPoint2.New(10)); Assert.That(comp.Damage.GetTotal(), Is.EqualTo(FixedPoint2.Zero)); - await Server.WaitPost(() => sys.TryChangeDamage(SEntMan.GetEntity(Target), damage, ignoreResistances: true)); + await Server.WaitPost(() => sys.TryChangeDamage(SEntMan.GetEntity(Target).Value, damage, ignoreResistances: true)); await RunTicks(5); Assert.That(comp.Damage.GetTotal(), Is.GreaterThan(FixedPoint2.Zero)); diff --git a/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs b/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs index f610ab732e..72e8901631 100644 --- a/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs +++ b/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs @@ -1,5 +1,7 @@ using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.Damage.Prototypes; +using Content.Shared.Damage.Systems; using Content.Shared.FixedPoint; using Robust.Shared.GameObjects; using Robust.Shared.Map; @@ -232,10 +234,14 @@ namespace Content.IntegrationTests.Tests.Damageable Assert.That(sDamageableComponent.TotalDamage, Is.EqualTo(FixedPoint2.Zero)); }); - // Test SetAll function - sDamageableSystem.SetAllDamage(sDamageableEntity, sDamageableComponent, 10); + // Test SetAll and ClearAll function + sDamageableSystem.SetAllDamage((sDamageableEntity, sDamageableComponent), 10); Assert.That(sDamageableComponent.TotalDamage, Is.EqualTo(FixedPoint2.New(10 * sDamageableComponent.Damage.DamageDict.Count))); - sDamageableSystem.SetAllDamage(sDamageableEntity, sDamageableComponent, 0); + sDamageableSystem.SetAllDamage((sDamageableEntity, sDamageableComponent), 0); + Assert.That(sDamageableComponent.TotalDamage, Is.EqualTo(FixedPoint2.Zero)); + sDamageableSystem.SetAllDamage((sDamageableEntity, sDamageableComponent), 10); + Assert.That(sDamageableComponent.TotalDamage, Is.EqualTo(FixedPoint2.New(10 * sDamageableComponent.Damage.DamageDict.Count))); + sDamageableSystem.ClearAllDamage((sDamageableEntity, sDamageableComponent)); Assert.That(sDamageableComponent.TotalDamage, Is.EqualTo(FixedPoint2.Zero)); // Test 'wasted' healing diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs index 3650fd69d7..99f68b3fa3 100644 --- a/Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs +++ b/Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs @@ -1,5 +1,7 @@ using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.Damage.Prototypes; +using Content.Shared.Damage.Systems; using Content.Shared.Destructible.Thresholds.Triggers; using Content.Shared.FixedPoint; using Robust.Shared.GameObjects; @@ -130,7 +132,7 @@ namespace Content.IntegrationTests.Tests.Destructible sTestThresholdListenerSystem.ThresholdsReached.Clear(); // Heal both classes of damage to 0 - sDamageableSystem.SetAllDamage(sDestructibleEntity, sDamageableComponent, 0); + sDamageableSystem.ClearAllDamage((sDestructibleEntity, sDamageableComponent)); // No new thresholds reached, healing should not trigger it Assert.That(sTestThresholdListenerSystem.ThresholdsReached, Is.Empty); @@ -174,7 +176,7 @@ namespace Content.IntegrationTests.Tests.Destructible threshold.TriggersOnce = true; // Heal brute and burn back to 0 - sDamageableSystem.SetAllDamage(sDestructibleEntity, sDamageableComponent, 0); + sDamageableSystem.ClearAllDamage((sDestructibleEntity, sDamageableComponent)); // No new thresholds reached from healing Assert.That(sTestThresholdListenerSystem.ThresholdsReached, Is.Empty); diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs index 4b1dc1ab3b..70baaea95a 100644 --- a/Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs +++ b/Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs @@ -1,5 +1,7 @@ using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.Damage.Prototypes; +using Content.Shared.Damage.Systems; using Content.Shared.Destructible.Thresholds.Triggers; using Robust.Shared.GameObjects; using Robust.Shared.Prototypes; diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs index b1342eeafe..df98294ee9 100644 --- a/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs +++ b/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs @@ -2,6 +2,7 @@ using System.Linq; using Content.Server.Destructible.Thresholds.Behaviors; using Content.Shared.Damage; using Content.Shared.Damage.Prototypes; +using Content.Shared.Damage.Systems; using Content.Shared.Destructible.Thresholds; using Robust.Shared.GameObjects; using Robust.Shared.Prototypes; diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs index fb3c40ec3c..1736d3d7e3 100644 --- a/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs +++ b/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs @@ -3,7 +3,9 @@ using Content.Server.Destructible; using Content.Server.Destructible.Thresholds; using Content.Server.Destructible.Thresholds.Behaviors; using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.Damage.Prototypes; +using Content.Shared.Damage.Systems; using Content.Shared.FixedPoint; using Robust.Shared.Audio.Systems; using Content.Shared.Destructible; @@ -124,7 +126,7 @@ namespace Content.IntegrationTests.Tests.Destructible Assert.That(sTestThresholdListenerSystem.ThresholdsReached, Is.Empty); // Set damage to 0 - sDamageableSystem.SetAllDamage(sDestructibleEntity, sDamageableComponent, 0); + sDamageableSystem.ClearAllDamage((sDestructibleEntity, sDamageableComponent)); // Damage for 100, up to 100 sDamageableSystem.TryChangeDamage(sDestructibleEntity, bluntDamage * 10, true); @@ -185,7 +187,7 @@ namespace Content.IntegrationTests.Tests.Destructible sTestThresholdListenerSystem.ThresholdsReached.Clear(); // Heal all damage - sDamageableSystem.SetAllDamage(sDestructibleEntity, sDamageableComponent, 0); + sDamageableSystem.ClearAllDamage((sDestructibleEntity, sDamageableComponent)); // Damage up to 50 sDamageableSystem.TryChangeDamage(sDestructibleEntity, bluntDamage * 5, true); @@ -247,7 +249,7 @@ namespace Content.IntegrationTests.Tests.Destructible sTestThresholdListenerSystem.ThresholdsReached.Clear(); // Heal the entity completely - sDamageableSystem.SetAllDamage(sDestructibleEntity, sDamageableComponent, 0); + sDamageableSystem.ClearAllDamage((sDestructibleEntity, sDamageableComponent)); // Check that the entity has 0 damage Assert.That(sDamageableComponent.TotalDamage, Is.EqualTo(FixedPoint2.Zero)); diff --git a/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs b/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs index 4f92fd4e55..246a770190 100644 --- a/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs +++ b/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs @@ -10,7 +10,7 @@ using Content.Server.Roles; using Content.Server.RoundEnd; using Content.Server.Shuttles.Components; using Content.Shared.CCVar; -using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.FixedPoint; using Content.Shared.GameTicking; using Content.Shared.Hands.Components; diff --git a/Content.IntegrationTests/Tests/Minds/MindTests.cs b/Content.IntegrationTests/Tests/Minds/MindTests.cs index 1bda6fd4db..35069339ba 100644 --- a/Content.IntegrationTests/Tests/Minds/MindTests.cs +++ b/Content.IntegrationTests/Tests/Minds/MindTests.cs @@ -4,7 +4,9 @@ using Content.Server.Ghost.Roles; using Content.Server.Ghost.Roles.Components; using Content.Server.Mind; using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.Damage.Prototypes; +using Content.Shared.Damage.Systems; using Content.Shared.FixedPoint; using Content.Shared.Mind; using Content.Shared.Mind.Components; @@ -147,7 +149,7 @@ public sealed partial class MindTests var damageable = entMan.GetComponent(entity); var prototype = protoMan.Index(BluntDamageType); - damageableSystem.SetDamage(entity, damageable, new DamageSpecifier(prototype, FixedPoint2.New(401))); + damageableSystem.SetDamage((entity, damageable), new DamageSpecifier(prototype, FixedPoint2.New(401))); Assert.That(mindSystem.GetMind(entity, mindContainerComp), Is.EqualTo(mindId)); }); diff --git a/Content.IntegrationTests/Tests/Mousetrap/MousetrapTest.cs b/Content.IntegrationTests/Tests/Mousetrap/MousetrapTest.cs index 422d58cdcf..5f1b9172dd 100644 --- a/Content.IntegrationTests/Tests/Mousetrap/MousetrapTest.cs +++ b/Content.IntegrationTests/Tests/Mousetrap/MousetrapTest.cs @@ -1,7 +1,6 @@ using Content.IntegrationTests.Tests.Movement; using Content.Server.NPC.HTN; -using Content.Shared.Damage; -using Content.Shared.FixedPoint; +using Content.Shared.Damage.Components; using Content.Shared.Item.ItemToggle; using Content.Shared.Item.ItemToggle.Components; using Content.Shared.Mobs; diff --git a/Content.IntegrationTests/Tests/Storage/EntityStorageTests.cs b/Content.IntegrationTests/Tests/Storage/EntityStorageTests.cs index 45ee69a9ef..f80cc089de 100644 --- a/Content.IntegrationTests/Tests/Storage/EntityStorageTests.cs +++ b/Content.IntegrationTests/Tests/Storage/EntityStorageTests.cs @@ -1,5 +1,6 @@ using Content.Server.Storage.EntitySystems; using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Robust.Shared.Containers; using Robust.Shared.GameObjects; diff --git a/Content.IntegrationTests/Tests/Vending/VendingInteractionTest.cs b/Content.IntegrationTests/Tests/Vending/VendingInteractionTest.cs index 3645667737..af16f1278a 100644 --- a/Content.IntegrationTests/Tests/Vending/VendingInteractionTest.cs +++ b/Content.IntegrationTests/Tests/Vending/VendingInteractionTest.cs @@ -2,7 +2,9 @@ using System.Linq; using Content.IntegrationTests.Tests.Interaction; using Content.Server.VendingMachines; using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.Damage.Prototypes; +using Content.Shared.Damage.Systems; using Content.Shared.FixedPoint; using Content.Shared.VendingMachines; using Robust.Shared.Prototypes; @@ -200,7 +202,7 @@ public sealed class VendingInteractionTest : InteractionTest // Damage the vending machine to the point that it breaks var damageType = ProtoMan.Index(TestDamageType); var damage = new DamageSpecifier(damageType, FixedPoint2.New(100)); - await Server.WaitPost(() => damageableSys.TryChangeDamage(SEntMan.GetEntity(Target), damage, ignoreResistances: true)); + await Server.WaitPost(() => damageableSys.TryChangeDamage(SEntMan.GetEntity(Target).Value, damage, ignoreResistances: true)); await RunTicks(5); Assert.That(damageableComp.Damage.GetTotal(), Is.GreaterThan(FixedPoint2.Zero), $"{VendingMachineProtoId} did not take damage."); } diff --git a/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs b/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs index f30eed0651..01770fe107 100644 --- a/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs +++ b/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs @@ -5,6 +5,7 @@ using Content.Server.Wires; using Content.Shared.Cargo.Prototypes; using Content.Shared.Damage; using Content.Shared.Damage.Prototypes; +using Content.Shared.Damage.Systems; using Content.Shared.Prototypes; using Content.Shared.Storage.Components; using Content.Shared.VendingMachines; @@ -296,14 +297,12 @@ namespace Content.IntegrationTests.Tests restock = entityManager.SpawnEntity("TestRestockExplode", coordinates); var damageSpec = new DamageSpecifier(prototypeManager.Index(TestDamageType), 100); - var damageResult = damageableSystem.TryChangeDamage(restock, damageSpec); + var damageResult = damageableSystem.ChangeDamage(restock, damageSpec); #pragma warning disable NUnit2045 - Assert.That(damageResult, Is.Not.Null, - "Received null damageResult when attempting to damage restock box."); + Assert.That(!damageResult.Empty, "Received empty damageResult when attempting to damage restock box."); - Assert.That((int) damageResult!.GetTotal(), Is.GreaterThan(0), - "Box damage result was not greater than 0."); + Assert.That((int) damageResult.GetTotal(), Is.GreaterThan(0), "Box damage result was not greater than 0."); #pragma warning restore NUnit2045 }); await server.WaitRunTicks(15); diff --git a/Content.IntegrationTests/Tests/Weapons/WeaponTests.cs b/Content.IntegrationTests/Tests/Weapons/WeaponTests.cs index bf240ba9e2..135e75f8be 100644 --- a/Content.IntegrationTests/Tests/Weapons/WeaponTests.cs +++ b/Content.IntegrationTests/Tests/Weapons/WeaponTests.cs @@ -1,5 +1,5 @@ using Content.IntegrationTests.Tests.Interaction; -using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.Weapons.Ranged.Components; using Content.Shared.Weapons.Ranged.Systems; using Content.Shared.Wieldable.Components; diff --git a/Content.Server/Access/Systems/IdCardConsoleSystem.cs b/Content.Server/Access/Systems/IdCardConsoleSystem.cs index 7c772830ba..9f21fd68d8 100644 --- a/Content.Server/Access/Systems/IdCardConsoleSystem.cs +++ b/Content.Server/Access/Systems/IdCardConsoleSystem.cs @@ -12,6 +12,7 @@ using Content.Shared.Chat; using Content.Shared.Construction; using Content.Shared.Containers.ItemSlots; using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.Database; using Content.Shared.Roles; using Content.Shared.StationRecords; diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs index d03b799ff2..617451f955 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs @@ -1,6 +1,5 @@ using Content.Server.Administration.Components; using Content.Server.Atmos.EntitySystems; -using Content.Server.Body.Components; using Content.Server.Body.Systems; using Content.Server.Electrocution; using Content.Server.Explosion.EntitySystems; @@ -24,7 +23,6 @@ using Content.Shared.Body.Part; using Content.Shared.Clothing.Components; using Content.Shared.Clumsy; using Content.Shared.Cluwne; -using Content.Shared.Damage; using Content.Shared.Damage.Systems; using Content.Shared.Database; using Content.Shared.Electrocution; @@ -58,6 +56,7 @@ using Robust.Shared.Spawners; using Robust.Shared.Utility; using System.Numerics; using System.Threading; +using Content.Shared.Damage.Components; using Timer = Robust.Shared.Timing.Timer; namespace Content.Server.Administration.Systems; diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.DeltaPressure.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.DeltaPressure.cs index 255e58dcbf..d6ab2a0087 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.DeltaPressure.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.DeltaPressure.cs @@ -251,7 +251,7 @@ public sealed partial class AtmosphereSystem var maxPressureCapped = Math.Min(maxPressure, ent.Comp.MaxEffectivePressure); var appliedDamage = ScaleDamage(ent, ent.Comp.BaseDamage, maxPressureCapped); - _damage.TryChangeDamage(ent, appliedDamage, ignoreResistances: true, interruptsDoAfters: false); + _damage.ChangeDamage(ent.Owner, appliedDamage, ignoreResistances: true, interruptsDoAfters: false); SetIsTakingDamageState(ent, true); } diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs index 00b7e16913..8120caca4e 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs @@ -14,7 +14,7 @@ using Robust.Shared.Map; using Robust.Shared.Physics.Systems; using Robust.Shared.Prototypes; using System.Linq; -using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Robust.Shared.Threading; namespace Content.Server.Atmos.EntitySystems; diff --git a/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs b/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs index ec508790ba..c23f58637d 100644 --- a/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs +++ b/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs @@ -3,7 +3,8 @@ using Content.Server.Administration.Logs; using Content.Server.Atmos.Components; using Content.Shared.Alert; using Content.Shared.Atmos; -using Content.Shared.Damage; +using Content.Shared.Damage.Components; +using Content.Shared.Damage.Systems; using Content.Shared.Database; using Content.Shared.FixedPoint; using Content.Shared.Inventory; diff --git a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs index 81bd4e5c6c..071c63c500 100644 --- a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs +++ b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs @@ -7,7 +7,7 @@ using Content.Shared.ActionBlocker; using Content.Shared.Alert; using Content.Shared.Atmos; using Content.Shared.Atmos.Components; -using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.Database; using Content.Shared.IgnitionSource; using Content.Shared.Interaction; diff --git a/Content.Server/Atmos/Rotting/RottingSystem.cs b/Content.Server/Atmos/Rotting/RottingSystem.cs index 57c1504b16..5feb95e3c4 100644 --- a/Content.Server/Atmos/Rotting/RottingSystem.cs +++ b/Content.Server/Atmos/Rotting/RottingSystem.cs @@ -2,7 +2,7 @@ using Content.Server.Atmos.EntitySystems; using Content.Shared.Atmos; using Content.Shared.Atmos.Rotting; using Content.Shared.Body.Events; -using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.Temperature.Components; using Robust.Server.Containers; using Robust.Shared.Physics.Components; diff --git a/Content.Server/Bed/BedSystem.cs b/Content.Server/Bed/BedSystem.cs index 8cfb28acb6..f6c2862a84 100644 --- a/Content.Server/Bed/BedSystem.cs +++ b/Content.Server/Bed/BedSystem.cs @@ -2,7 +2,7 @@ using Content.Shared.Bed; using Content.Shared.Bed.Components; using Content.Shared.Bed.Sleep; using Content.Shared.Buckle.Components; -using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.Mobs.Systems; namespace Content.Server.Bed diff --git a/Content.Server/Bible/BibleSystem.cs b/Content.Server/Bible/BibleSystem.cs index 2aabb5eb27..eb11a465bd 100644 --- a/Content.Server/Bible/BibleSystem.cs +++ b/Content.Server/Bible/BibleSystem.cs @@ -4,7 +4,7 @@ using Content.Server.Popups; using Content.Shared.ActionBlocker; using Content.Shared.Actions; using Content.Shared.Bible; -using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.Ghost.Roles.Components; using Content.Shared.IdentityManagement; using Content.Shared.Interaction; @@ -14,7 +14,6 @@ using Content.Shared.Mobs.Systems; using Content.Shared.Popups; using Content.Shared.Timing; using Content.Shared.Verbs; -using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; using Robust.Shared.Player; using Robust.Shared.Random; @@ -133,9 +132,7 @@ namespace Content.Server.Bible } } - var damage = _damageableSystem.TryChangeDamage(args.Target.Value, component.Damage, true, origin: uid); - - if (damage == null || damage.Empty) + if (_damageableSystem.TryChangeDamage(args.Target.Value, component.Damage, true, origin: uid)) { var othersMessage = Loc.GetString(component.LocPrefix + "-heal-success-none-others", ("user", Identity.Entity(args.User, EntityManager)), ("target", Identity.Entity(args.Target.Value, EntityManager)), ("bible", uid)); _popupSystem.PopupEntity(othersMessage, args.User, Filter.PvsExcept(args.User), true, PopupType.Medium); diff --git a/Content.Server/Body/Systems/RespiratorSystem.cs b/Content.Server/Body/Systems/RespiratorSystem.cs index ca3ee2c9e1..79457cb036 100644 --- a/Content.Server/Body/Systems/RespiratorSystem.cs +++ b/Content.Server/Body/Systems/RespiratorSystem.cs @@ -12,7 +12,7 @@ using Content.Shared.Chat; using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reagent; -using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.Database; using Content.Shared.EntityConditions; using Content.Shared.EntityConditions.Conditions.Body; @@ -367,7 +367,7 @@ public sealed class RespiratorSystem : EntitySystem if (ent.Comp.SuffocationCycles == 2) _adminLogger.Add(LogType.Asphyxiation, $"{ToPrettyString(ent):entity} started suffocating"); - _damageableSys.TryChangeDamage(ent, ent.Comp.Damage, interruptsDoAfters: false); + _damageableSys.ChangeDamage(ent.Owner, ent.Comp.Damage, interruptsDoAfters: false); if (ent.Comp.SuffocationCycles < ent.Comp.SuffocationCycleThreshold) return; @@ -381,7 +381,7 @@ public sealed class RespiratorSystem : EntitySystem if (ent.Comp.SuffocationCycles >= 2) _adminLogger.Add(LogType.Asphyxiation, $"{ToPrettyString(ent):entity} stopped suffocating"); - _damageableSys.TryChangeDamage(ent, ent.Comp.DamageRecovery); + _damageableSys.ChangeDamage(ent.Owner, ent.Comp.DamageRecovery); var ev = new StopSuffocatingEvent(); RaiseLocalEvent(ent, ref ev); diff --git a/Content.Server/CardboardBox/CardboardBoxSystem.cs b/Content.Server/CardboardBox/CardboardBoxSystem.cs index 836dc485d9..9fdd23e780 100644 --- a/Content.Server/CardboardBox/CardboardBoxSystem.cs +++ b/Content.Server/CardboardBox/CardboardBoxSystem.cs @@ -1,20 +1,16 @@ -using Content.Server.Storage.Components; using Content.Server.Storage.EntitySystems; using Content.Shared.Access.Components; using Content.Shared.CardboardBox; using Content.Shared.CardboardBox.Components; -using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.Interaction; using Content.Shared.Movement.Components; using Content.Shared.Movement.Systems; using Content.Shared.Stealth; using Content.Shared.Stealth.Components; using Content.Shared.Storage.Components; -using Robust.Server.GameObjects; -using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; using Robust.Shared.Containers; -using Robust.Shared.Player; using Robust.Shared.Timing; namespace Content.Server.CardboardBox; @@ -109,10 +105,10 @@ public sealed class CardboardBoxSystem : SharedCardboardBoxSystem //Relay damage to the mover private void OnDamage(EntityUid uid, CardboardBoxComponent component, DamageChangedEvent args) { - if (args.DamageDelta != null && args.DamageIncreased) - { - _damageable.TryChangeDamage(component.Mover, args.DamageDelta, origin: args.Origin); - } + if (args.DamageDelta == null || !args.DamageIncreased || component.Mover is not { } mover) + return; + + _damageable.ChangeDamage(mover, args.DamageDelta, origin: args.Origin); } private void OnEntInserted(EntityUid uid, CardboardBoxComponent component, EntInsertedIntoContainerMessage args) diff --git a/Content.Server/Chat/SuicideSystem.cs b/Content.Server/Chat/SuicideSystem.cs index dca2959f98..9f901b2ad8 100644 --- a/Content.Server/Chat/SuicideSystem.cs +++ b/Content.Server/Chat/SuicideSystem.cs @@ -2,7 +2,7 @@ using Content.Server.Ghost; using Content.Server.Hands.Systems; using Content.Shared.Administration.Logs; using Content.Shared.Chat; -using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.Database; using Content.Shared.IdentityManagement; using Content.Shared.Interaction.Events; diff --git a/Content.Server/Chat/Systems/EmoteOnDamageSystem.cs b/Content.Server/Chat/Systems/EmoteOnDamageSystem.cs index 4afb885c4c..2b2be1e869 100644 --- a/Content.Server/Chat/Systems/EmoteOnDamageSystem.cs +++ b/Content.Server/Chat/Systems/EmoteOnDamageSystem.cs @@ -1,3 +1,5 @@ +using Content.Shared.Damage.Systems; + namespace Content.Server.Chat.Systems; using Content.Shared.Chat; diff --git a/Content.Server/Cloning/CloningPodSystem.cs b/Content.Server/Cloning/CloningPodSystem.cs index f413a1863f..2f113bee57 100644 --- a/Content.Server/Cloning/CloningPodSystem.cs +++ b/Content.Server/Cloning/CloningPodSystem.cs @@ -12,7 +12,7 @@ using Content.Shared.CCVar; using Content.Shared.Chemistry.Components; using Content.Shared.Cloning; using Content.Shared.Chat; -using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.DeviceLinking.Events; using Content.Shared.Emag.Components; using Content.Shared.Emag.Systems; diff --git a/Content.Server/Cluwne/CluwneSystem.cs b/Content.Server/Cluwne/CluwneSystem.cs index ab13548e04..97d7005279 100644 --- a/Content.Server/Cluwne/CluwneSystem.cs +++ b/Content.Server/Cluwne/CluwneSystem.cs @@ -8,7 +8,7 @@ using Content.Shared.Chat; using Content.Shared.Chat.Prototypes; using Content.Shared.Clumsy; using Content.Shared.Cluwne; -using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.Mobs; using Content.Shared.NameModifier.EntitySystems; using Content.Shared.Popups; diff --git a/Content.Server/Construction/Conditions/MinHealth.cs b/Content.Server/Construction/Conditions/MinHealth.cs index 980f6a49ca..cef30db71f 100644 --- a/Content.Server/Construction/Conditions/MinHealth.cs +++ b/Content.Server/Construction/Conditions/MinHealth.cs @@ -1,13 +1,8 @@ using Content.Server.Destructible; using Content.Shared.Construction; -using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.Examine; using Content.Shared.FixedPoint; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Content.Server.Construction.Conditions; diff --git a/Content.Server/Damage/Commands/HurtCommand.cs b/Content.Server/Damage/Commands/HurtCommand.cs index af9c1ee8fc..849f6e543e 100644 --- a/Content.Server/Damage/Commands/HurtCommand.cs +++ b/Content.Server/Damage/Commands/HurtCommand.cs @@ -4,7 +4,7 @@ using Content.Server.Administration; using Content.Shared.Administration; using Content.Shared.Damage; using Content.Shared.Damage.Prototypes; -using Content.Shared.FixedPoint; +using Content.Shared.Damage.Systems; using Robust.Shared.Console; using Robust.Shared.Prototypes; diff --git a/Content.Server/Damage/ForceSay/DamageForceSaySystem.cs b/Content.Server/Damage/ForceSay/DamageForceSaySystem.cs index a46d42f3e3..5597c47fdb 100644 --- a/Content.Server/Damage/ForceSay/DamageForceSaySystem.cs +++ b/Content.Server/Damage/ForceSay/DamageForceSaySystem.cs @@ -2,6 +2,7 @@ using Content.Shared.Bed.Sleep; using Content.Shared.Damage; using Content.Shared.Damage.Events; using Content.Shared.Damage.ForceSay; +using Content.Shared.Damage.Systems; using Content.Shared.FixedPoint; using Content.Shared.Mobs; using Content.Shared.Mobs.Systems; diff --git a/Content.Server/Damage/Systems/DamageOnHitSystem.cs b/Content.Server/Damage/Systems/DamageOnHitSystem.cs index f129a14f79..4b13106cc8 100644 --- a/Content.Server/Damage/Systems/DamageOnHitSystem.cs +++ b/Content.Server/Damage/Systems/DamageOnHitSystem.cs @@ -1,8 +1,7 @@ using Content.Server.Damage.Components; -using Content.Shared.Damage; -using Robust.Shared.Player; using Content.Shared.Weapons.Melee.Events; using System.Linq; +using Content.Shared.Damage.Systems; namespace Content.Server.Damage.Systems; diff --git a/Content.Server/Damage/Systems/DamageOnLandSystem.cs b/Content.Server/Damage/Systems/DamageOnLandSystem.cs index 3cf103e6ee..8dede48dee 100644 --- a/Content.Server/Damage/Systems/DamageOnLandSystem.cs +++ b/Content.Server/Damage/Systems/DamageOnLandSystem.cs @@ -9,7 +9,7 @@ namespace Content.Server.Damage.Systems ///
public sealed class DamageOnLandSystem : EntitySystem { - [Dependency] private readonly DamageableSystem _damageableSystem = default!; + [Dependency] private readonly Shared.Damage.Systems.DamageableSystem _damageableSystem = default!; public override void Initialize() { diff --git a/Content.Server/Damage/Systems/DamageOnToolInteractSystem.cs b/Content.Server/Damage/Systems/DamageOnToolInteractSystem.cs index 8c0e0a1382..88fe02510f 100644 --- a/Content.Server/Damage/Systems/DamageOnToolInteractSystem.cs +++ b/Content.Server/Damage/Systems/DamageOnToolInteractSystem.cs @@ -11,7 +11,7 @@ namespace Content.Server.Damage.Systems { public sealed class DamageOnToolInteractSystem : EntitySystem { - [Dependency] private readonly DamageableSystem _damageableSystem = default!; + [Dependency] private readonly Shared.Damage.Systems.DamageableSystem _damageableSystem = default!; [Dependency] private readonly IAdminLogManager _adminLogger = default!; [Dependency] private readonly SharedToolSystem _toolSystem = default!; @@ -35,22 +35,22 @@ namespace Content.Server.Damage.Systems && itemToggle.Activated && !welder.TankSafe) { - var dmg = _damageableSystem.TryChangeDamage(args.Target, weldingDamage, origin: args.User); - - if (dmg != null) + if (_damageableSystem.TryChangeDamage(args.Target, weldingDamage, out var dmg, origin: args.User)) + { _adminLogger.Add(LogType.Damaged, $"{ToPrettyString(args.User):user} used {ToPrettyString(args.Used):used} as a welder to deal {dmg.GetTotal():damage} damage to {ToPrettyString(args.Target):target}"); + } args.Handled = true; } else if (component.DefaultDamage is {} damage && _toolSystem.HasQuality(args.Used, component.Tools)) { - var dmg = _damageableSystem.TryChangeDamage(args.Target, damage, origin: args.User); - - if (dmg != null) + if (_damageableSystem.TryChangeDamage(args.Target, damage, out var dmg, origin: args.User)) + { _adminLogger.Add(LogType.Damaged, $"{ToPrettyString(args.User):user} used {ToPrettyString(args.Used):used} as a tool to deal {dmg.GetTotal():damage} damage to {ToPrettyString(args.Target):target}"); + } args.Handled = true; } diff --git a/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs b/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs index 10930ca5c9..02bc7334a6 100644 --- a/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs +++ b/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs @@ -17,7 +17,7 @@ public sealed class DamageOtherOnHitSystem : SharedDamageOtherOnHitSystem { [Dependency] private readonly IAdminLogManager _adminLogger = default!; [Dependency] private readonly GunSystem _guns = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; + [Dependency] private readonly Shared.Damage.Systems.DamageableSystem _damageable = default!; [Dependency] private readonly SharedCameraRecoilSystem _sharedCameraRecoil = default!; [Dependency] private readonly SharedColorFlashEffectSystem _color = default!; @@ -33,13 +33,13 @@ public sealed class DamageOtherOnHitSystem : SharedDamageOtherOnHitSystem if (TerminatingOrDeleted(args.Target)) return; - var dmg = _damageable.TryChangeDamage(args.Target, component.Damage * _damageable.UniversalThrownDamageModifier, component.IgnoreResistances, origin: args.Component.Thrower); + var dmg = _damageable.ChangeDamage(args.Target, component.Damage * _damageable.UniversalThrownDamageModifier, component.IgnoreResistances, origin: args.Component.Thrower); // Log damage only for mobs. Useful for when people throw spears at each other, but also avoids log-spam when explosions send glass shards flying. - if (dmg != null && HasComp(args.Target)) + if (HasComp(args.Target)) _adminLogger.Add(LogType.ThrowHit, $"{ToPrettyString(args.Target):target} received {dmg.GetTotal():damage} damage from collision"); - if (dmg is { Empty: false }) + if (!dmg.Empty) { _color.RaiseEffect(Color.Red, [args.Target], Filter.Pvs(args.Target, entityManager: EntityManager)); } diff --git a/Content.Server/Damage/Systems/DamageRandomPopupSystem.cs b/Content.Server/Damage/Systems/DamageRandomPopupSystem.cs index 8bdbf84147..25e7bc1644 100644 --- a/Content.Server/Damage/Systems/DamageRandomPopupSystem.cs +++ b/Content.Server/Damage/Systems/DamageRandomPopupSystem.cs @@ -1,6 +1,7 @@ using Content.Server.Damage.Components; using Content.Server.Popups; using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Robust.Shared.Player; using Robust.Shared.Random; diff --git a/Content.Server/Damage/Systems/ExaminableDamageSystem.cs b/Content.Server/Damage/Systems/ExaminableDamageSystem.cs index b0dfae71b7..a2a9f234f5 100644 --- a/Content.Server/Damage/Systems/ExaminableDamageSystem.cs +++ b/Content.Server/Damage/Systems/ExaminableDamageSystem.cs @@ -1,6 +1,6 @@ using Content.Server.Damage.Components; using Content.Server.Destructible; -using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.Examine; using Content.Shared.Rounding; using Robust.Shared.Prototypes; diff --git a/Content.Server/Destructible/DestructibleSystem.BenchmarkHelpers.cs b/Content.Server/Destructible/DestructibleSystem.BenchmarkHelpers.cs index ac5e3704fe..a00194c911 100644 --- a/Content.Server/Destructible/DestructibleSystem.BenchmarkHelpers.cs +++ b/Content.Server/Destructible/DestructibleSystem.BenchmarkHelpers.cs @@ -7,7 +7,7 @@ public sealed partial class DestructibleSystem /// /// Tests all triggers in a DestructibleComponent to see how expensive it is to query them. /// - public void TestAllTriggers(List> destructibles) + public void TestAllTriggers(List> destructibles) { foreach (var (uid, damageable, destructible) in destructibles) { @@ -22,7 +22,7 @@ public sealed partial class DestructibleSystem /// /// Tests all behaviours in a DestructibleComponent to see how expensive it is to query them. /// - public void TestAllBehaviors(List> destructibles) + public void TestAllBehaviors(List> destructibles) { foreach (var (uid, damageable, destructible) in destructibles) { diff --git a/Content.Server/Destructible/DestructibleSystem.cs b/Content.Server/Destructible/DestructibleSystem.cs index 847229278c..7ed736fffd 100644 --- a/Content.Server/Destructible/DestructibleSystem.cs +++ b/Content.Server/Destructible/DestructibleSystem.cs @@ -11,6 +11,7 @@ using Content.Server.Fluids.EntitySystems; using Content.Server.Stack; using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.Database; using Content.Shared.Destructible; using Content.Shared.Destructible.Thresholds.Triggers; @@ -111,7 +112,7 @@ namespace Content.Server.Destructible /// /// Check if the given threshold should trigger. /// - public bool Triggered(DamageThreshold threshold, Entity owner) + public bool Triggered(DamageThreshold threshold, Entity owner) { if (threshold.Trigger == null) return false; @@ -135,7 +136,7 @@ namespace Content.Server.Destructible /// /// Check if the conditions for the given threshold are currently true. /// - public bool Reached(DamageThreshold threshold, Entity owner) + public bool Reached(DamageThreshold threshold, Entity owner) { if (threshold.Trigger == null) return false; diff --git a/Content.Server/Disposal/Unit/DisposableSystem.cs b/Content.Server/Disposal/Unit/DisposableSystem.cs index d307488110..73365c4f62 100644 --- a/Content.Server/Disposal/Unit/DisposableSystem.cs +++ b/Content.Server/Disposal/Unit/DisposableSystem.cs @@ -1,7 +1,7 @@ using Content.Server.Atmos.EntitySystems; using Content.Server.Disposal.Tube; using Content.Shared.Body.Components; -using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.Disposal.Components; using Content.Shared.Item; using Content.Shared.Throwing; diff --git a/Content.Server/Dragon/DragonRiftSystem.cs b/Content.Server/Dragon/DragonRiftSystem.cs index 9cab018fd7..842b27ec86 100644 --- a/Content.Server/Dragon/DragonRiftSystem.cs +++ b/Content.Server/Dragon/DragonRiftSystem.cs @@ -2,16 +2,14 @@ using Content.Server.Chat.Systems; using Content.Server.NPC; using Content.Server.NPC.Systems; using Content.Server.Pinpointer; -using Content.Shared.Damage; using Content.Shared.Dragon; using Content.Shared.Examine; using Content.Shared.Sprite; -using Robust.Shared.GameObjects; using Robust.Shared.Map; using Robust.Shared.Player; using Robust.Shared.Serialization.Manager; using System.Numerics; -using Robust.Shared.Audio; +using Content.Shared.Damage.Components; using Robust.Shared.Audio.Systems; using Robust.Shared.GameStates; using Robust.Shared.Utility; diff --git a/Content.Server/Electrocution/ElectrocutionSystem.cs b/Content.Server/Electrocution/ElectrocutionSystem.cs index a162b29e19..fe9fe44571 100644 --- a/Content.Server/Electrocution/ElectrocutionSystem.cs +++ b/Content.Server/Electrocution/ElectrocutionSystem.cs @@ -1,14 +1,12 @@ using Content.Server.Administration.Logs; -using Content.Server.NodeContainer; using Content.Server.NodeContainer.EntitySystems; -using Content.Server.NodeContainer.NodeGroups; -using Content.Server.NodeContainer.Nodes; using Content.Server.Power.Components; using Content.Server.Power.EntitySystems; using Content.Server.Power.NodeGroups; using Content.Server.Weapons.Melee; using Content.Shared.Damage; using Content.Shared.Damage.Prototypes; +using Content.Shared.Damage.Systems; using Content.Shared.Database; using Content.Shared.Electrocution; using Content.Shared.IdentityManagement; @@ -27,7 +25,6 @@ using Content.Shared.Tag; using Content.Shared.Weapons.Melee.Events; using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; -using Robust.Shared.Map; using Robust.Shared.Physics.Events; using Robust.Shared.Player; using Robust.Shared.Prototypes; @@ -402,19 +399,16 @@ public sealed class ElectrocutionSystem : SharedElectrocutionSystem ? _stun.TryUpdateParalyzeDuration(uid, time * ParalyzeTimeMultiplier) : _stun.TryAddParalyzeDuration(uid, time * ParalyzeTimeMultiplier); } - + // TODO: Sparks here. if (shockDamage is { } dmg) { - var actual = _damageable.TryChangeDamage(uid, - new DamageSpecifier(_prototypeManager.Index(DamageType), dmg), origin: sourceUid); - - if (actual != null) + if (_damageable.TryChangeDamage(uid, new DamageSpecifier(_prototypeManager.Index(DamageType), dmg), out var damage, origin: sourceUid)) { _adminLogger.Add(LogType.Electrocution, - $"{ToPrettyString(uid):entity} received {actual.GetTotal():damage} powered electrocution damage{(sourceUid != null ? " from " + ToPrettyString(sourceUid.Value) : ""):source}"); + $"{ToPrettyString(uid):entity} received {damage:damage} powered electrocution damage{(sourceUid != null ? " from " + ToPrettyString(sourceUid.Value) : ""):source}"); } } diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Airtight.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Airtight.cs index 3d55a7e823..303c4e8cab 100644 --- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Airtight.cs +++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Airtight.cs @@ -1,9 +1,7 @@ using Content.Server.Atmos.Components; -using Content.Server.Destructible; using Content.Shared.Atmos; -using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.Explosion; -using Content.Shared.Explosion.EntitySystems; using Content.Shared.FixedPoint; using Robust.Shared.Map.Components; diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs index 263fdabf98..c6528b0142 100644 --- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs +++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs @@ -1,13 +1,10 @@ -using System.Linq; using System.Numerics; -using Content.Server.Atmos.EntitySystems; -using Content.Server.Explosion.Components; using Content.Shared.CCVar; using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.Database; using Content.Shared.Explosion; using Content.Shared.Explosion.Components; -using Content.Shared.Explosion.EntitySystems; using Content.Shared.Maps; using Content.Shared.Physics; using Content.Shared.Projectiles; @@ -17,7 +14,6 @@ using Robust.Shared.Map.Components; using Robust.Shared.Physics; using Robust.Shared.Physics.Components; using Robust.Shared.Physics.Dynamics; -using Robust.Shared.Player; using Robust.Shared.Random; using Robust.Shared.Timing; using Robust.Shared.Utility; @@ -439,28 +435,25 @@ public sealed partial class ExplosionSystem float? fireStacksOnIgnite, EntityUid? cause) { - if (originalDamage != null) + if (originalDamage is not null) { GetEntitiesToDamage(uid, originalDamage, id); foreach (var (entity, damage) in _toDamage) { - if (_actorQuery.HasComp(entity)) - { - // Log damage to player entities only, cause this will create a massive amount of log spam otherwise. - if (cause != null) - { - _adminLogger.Add(LogType.ExplosionHit, LogImpact.Medium, $"Explosion of {ToPrettyString(cause):actor} dealt {damage.GetTotal()} damage to {ToPrettyString(entity):subject}"); - } - else - { - _adminLogger.Add(LogType.ExplosionHit, LogImpact.Medium, $"Explosion at {epicenter:epicenter} dealt {damage.GetTotal()} damage to {ToPrettyString(entity):subject}"); - } - - } + if (!_damageableQuery.TryComp(entity, out var damageable)) + continue; // TODO EXPLOSIONS turn explosions into entities, and pass the the entity in as the damage origin. - _damageableSystem.TryChangeDamage(entity, damage, ignoreResistances: true, ignoreGlobalModifiers: true); + _damageableSystem.TryChangeDamage((entity, damageable), damage, ignoreResistances: true, ignoreGlobalModifiers: true); + if (_actorQuery.HasComp(entity)) + { + // Log damage to player entities only; this will create a massive amount of log spam otherwise. + if (cause is not null) + _adminLogger.Add(LogType.ExplosionHit, LogImpact.Medium, $"Explosion of {ToPrettyString(cause):actor} dealt {damage.GetTotal()} damage to {ToPrettyString(entity):subject}"); + else + _adminLogger.Add(LogType.ExplosionHit, LogImpact.Medium, $"Explosion at {epicenter:epicenter} dealt {damage.GetTotal()} damage to {ToPrettyString(entity):subject}"); + } } } @@ -666,7 +659,7 @@ sealed class Explosion private readonly IEntityManager _entMan; private readonly ExplosionSystem _system; private readonly SharedMapSystem _mapSystem; - private readonly DamageableSystem _damageable; + private readonly Shared.Damage.Systems.DamageableSystem _damageable; public readonly EntityUid VisualEnt; @@ -690,7 +683,7 @@ sealed class Explosion EntityUid visualEnt, EntityUid? cause, SharedMapSystem mapSystem, - DamageableSystem damageable) + Shared.Damage.Systems.DamageableSystem damageable) { VisualEnt = visualEnt; Cause = cause; diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs index 198db3eca1..70863d6f54 100644 --- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs +++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs @@ -9,7 +9,8 @@ using Content.Server.NPC.Pathfinding; using Content.Shared.Atmos.Components; using Content.Shared.Camera; using Content.Shared.CCVar; -using Content.Shared.Damage; +using Content.Shared.Damage.Components; +using Content.Shared.Damage.Systems; using Content.Shared.Database; using Content.Shared.Explosion; using Content.Shared.Explosion.Components; diff --git a/Content.Server/Ghost/GhostSystem.cs b/Content.Server/Ghost/GhostSystem.cs index 1a3c9031fe..af1a433d1a 100644 --- a/Content.Server/Ghost/GhostSystem.cs +++ b/Content.Server/Ghost/GhostSystem.cs @@ -3,13 +3,14 @@ using System.Numerics; using Content.Server.Administration.Logs; using Content.Server.Chat.Managers; using Content.Server.GameTicking; -using Content.Server.Ghost.Components; using Content.Server.Mind; using Content.Server.Roles.Jobs; using Content.Shared.Actions; using Content.Shared.CCVar; using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.Damage.Prototypes; +using Content.Shared.Damage.Systems; using Content.Shared.Database; using Content.Shared.Examine; using Content.Shared.Eye; @@ -586,7 +587,7 @@ namespace Content.Server.Ghost DamageSpecifier damage = new(_prototypeManager.Index(AsphyxiationDamageType), dealtDamage); - _damageable.TryChangeDamage(playerEntity, damage, true); + _damageable.ChangeDamage(playerEntity.Value, damage, true); } } diff --git a/Content.Server/Guardian/GuardianSystem.cs b/Content.Server/Guardian/GuardianSystem.cs index ea1a6f4f4f..5f2597afef 100644 --- a/Content.Server/Guardian/GuardianSystem.cs +++ b/Content.Server/Guardian/GuardianSystem.cs @@ -1,7 +1,7 @@ using Content.Server.Body.Systems; using Content.Server.Popups; using Content.Shared.Actions; -using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.DoAfter; using Content.Shared.Examine; using Content.Shared.Guardian; @@ -285,8 +285,8 @@ namespace Content.Server.Guardian if (args.DamageDelta == null || component.Host == null || component.DamageShare == 0) return; - _damageSystem.TryChangeDamage( - component.Host, + _damageSystem.ChangeDamage( + component.Host.Value, args.DamageDelta * component.DamageShare, origin: args.Origin, ignoreResistances: true, diff --git a/Content.Server/ImmovableRod/ImmovableRodSystem.cs b/Content.Server/ImmovableRod/ImmovableRodSystem.cs index bcbcfda9af..646b5c97bb 100644 --- a/Content.Server/ImmovableRod/ImmovableRodSystem.cs +++ b/Content.Server/ImmovableRod/ImmovableRodSystem.cs @@ -1,10 +1,9 @@ using Content.Server.Body.Systems; using Content.Server.Destructible; -using Content.Server.Examine; using Content.Server.Polymorph.Components; using Content.Server.Popups; using Content.Shared.Body.Components; -using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.Examine; using Content.Shared.Popups; using Robust.Shared.Audio.Systems; diff --git a/Content.Server/KillTracking/KillTrackingSystem.cs b/Content.Server/KillTracking/KillTrackingSystem.cs index ba27ea5d9e..d40e0e13dd 100644 --- a/Content.Server/KillTracking/KillTrackingSystem.cs +++ b/Content.Server/KillTracking/KillTrackingSystem.cs @@ -1,5 +1,6 @@ using Content.Server.NPC.HTN; using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.FixedPoint; using Content.Shared.Mobs; using Content.Shared.Mobs.Systems; diff --git a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs index e23bea7bb4..1c6ed26d48 100644 --- a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs +++ b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs @@ -7,7 +7,6 @@ using Content.Server.Hands.Systems; using Content.Server.Kitchen.Components; using Content.Server.Power.Components; using Content.Server.Power.EntitySystems; -using Content.Server.Temperature.Components; using Content.Server.Temperature.Systems; using Content.Shared.Body.Components; using Content.Shared.Body.Part; @@ -40,9 +39,8 @@ using Robust.Shared.Timing; using Content.Shared.Stacks; using Content.Server.Construction.Components; using Content.Shared.Chat; -using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.Temperature.Components; -using Robust.Shared.Utility; namespace Content.Server.Kitchen.EntitySystems { diff --git a/Content.Server/Lightning/LightningTargetSystem.cs b/Content.Server/Lightning/LightningTargetSystem.cs index 4a0ee23c5b..eac23c3016 100644 --- a/Content.Server/Lightning/LightningTargetSystem.cs +++ b/Content.Server/Lightning/LightningTargetSystem.cs @@ -2,6 +2,7 @@ using Content.Server.Explosion.EntitySystems; using Content.Server.Lightning; using Content.Server.Lightning.Components; using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Robust.Server.GameObjects; namespace Content.Server.Tesla.EntitySystems; @@ -26,7 +27,7 @@ public sealed class LightningTargetSystem : EntitySystem { DamageSpecifier damage = new(); damage.DamageDict.Add("Structural", uid.Comp.DamageFromLightning); - _damageable.TryChangeDamage(uid, damage, true); + _damageable.ChangeDamage(uid.Owner, damage, true); if (uid.Comp.LightningExplode) { diff --git a/Content.Server/Mech/Systems/MechSystem.cs b/Content.Server/Mech/Systems/MechSystem.cs index 917f4f5035..923c701868 100644 --- a/Content.Server/Mech/Systems/MechSystem.cs +++ b/Content.Server/Mech/Systems/MechSystem.cs @@ -4,7 +4,7 @@ using Content.Server.Body.Systems; using Content.Server.Mech.Components; using Content.Server.Power.EntitySystems; using Content.Shared.ActionBlocker; -using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.DoAfter; using Content.Shared.FixedPoint; using Content.Shared.Interaction; @@ -265,7 +265,7 @@ public sealed partial class MechSystem : SharedMechSystem component.PilotSlot.ContainedEntity != null) { var damage = args.DamageDelta * component.MechToPilotDamageMultiplier; - _damageable.TryChangeDamage(component.PilotSlot.ContainedEntity, damage); + _damageable.ChangeDamage(component.PilotSlot.ContainedEntity.Value, damage); } } diff --git a/Content.Server/Medical/DefibrillatorSystem.cs b/Content.Server/Medical/DefibrillatorSystem.cs index 1578f11629..f0dfceb14e 100644 --- a/Content.Server/Medical/DefibrillatorSystem.cs +++ b/Content.Server/Medical/DefibrillatorSystem.cs @@ -8,7 +8,8 @@ using Content.Server.Popups; using Content.Server.PowerCell; using Content.Shared.Traits.Assorted; using Content.Shared.Chat; -using Content.Shared.Damage; +using Content.Shared.Damage.Components; +using Content.Shared.Damage.Systems; using Content.Shared.DoAfter; using Content.Shared.Interaction; using Content.Shared.Item.ItemToggle; diff --git a/Content.Server/Medical/HealthAnalyzerSystem.cs b/Content.Server/Medical/HealthAnalyzerSystem.cs index 657ac3e636..f022dff5e3 100644 --- a/Content.Server/Medical/HealthAnalyzerSystem.cs +++ b/Content.Server/Medical/HealthAnalyzerSystem.cs @@ -2,7 +2,7 @@ using Content.Server.Medical.Components; using Content.Server.PowerCell; using Content.Shared.Body.Components; using Content.Shared.Chemistry.EntitySystems; -using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.DoAfter; using Content.Shared.IdentityManagement; using Content.Shared.Interaction; diff --git a/Content.Server/Mining/MeteorSystem.cs b/Content.Server/Mining/MeteorSystem.cs index 3b0c6920b3..361844ba25 100644 --- a/Content.Server/Mining/MeteorSystem.cs +++ b/Content.Server/Mining/MeteorSystem.cs @@ -1,6 +1,7 @@ using Content.Server.Administration.Logs; using Content.Server.Destructible; -using Content.Shared.Damage; +using Content.Shared.Damage.Components; +using Content.Shared.Damage.Systems; using Content.Shared.Database; using Content.Shared.FixedPoint; using Content.Shared.Mobs.Systems; diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/PickNearbyInjectableOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/PickNearbyInjectableOperator.cs index f351d582c6..67a8198c38 100644 --- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/PickNearbyInjectableOperator.cs +++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/PickNearbyInjectableOperator.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using Content.Shared.NPC.Components; using Content.Server.NPC.Pathfinding; using Content.Shared.Chemistry.Components.SolutionManager; -using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.Interaction; using Content.Shared.Mobs.Components; using Content.Shared.Silicons.Bots; diff --git a/Content.Server/NPC/Systems/NPCRetaliationSystem.cs b/Content.Server/NPC/Systems/NPCRetaliationSystem.cs index d6b2000f32..a970d34bda 100644 --- a/Content.Server/NPC/Systems/NPCRetaliationSystem.cs +++ b/Content.Server/NPC/Systems/NPCRetaliationSystem.cs @@ -1,6 +1,7 @@ using Content.Server.NPC.Components; using Content.Shared.CombatMode; using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.Mobs.Components; using Content.Shared.NPC.Components; using Content.Shared.NPC.Systems; diff --git a/Content.Server/NPC/Systems/NPCUtilitySystem.cs b/Content.Server/NPC/Systems/NPCUtilitySystem.cs index bc82e72692..9605b62847 100644 --- a/Content.Server/NPC/Systems/NPCUtilitySystem.cs +++ b/Content.Server/NPC/Systems/NPCUtilitySystem.cs @@ -6,7 +6,6 @@ using Content.Server.NPC.Queries.Curves; using Content.Server.NPC.Queries.Queries; using Content.Server.Nutrition.Components; using Content.Shared.Chemistry.EntitySystems; -using Content.Shared.Damage; using Content.Shared.Examine; using Content.Shared.Fluids.Components; using Content.Shared.Inventory; @@ -29,6 +28,7 @@ using Robust.Shared.Prototypes; using Robust.Shared.Utility; using Content.Shared.Atmos.Components; using System.Linq; +using Content.Shared.Damage.Components; using Content.Shared.Temperature.Components; namespace Content.Server.NPC.Systems; diff --git a/Content.Server/Ninja/Systems/StunProviderSystem.cs b/Content.Server/Ninja/Systems/StunProviderSystem.cs index 8697692e5e..98df8a039a 100644 --- a/Content.Server/Ninja/Systems/StunProviderSystem.cs +++ b/Content.Server/Ninja/Systems/StunProviderSystem.cs @@ -1,6 +1,6 @@ using Content.Server.Ninja.Events; using Content.Server.Power.EntitySystems; -using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.Interaction; using Content.Shared.Ninja.Components; using Content.Shared.Ninja.Systems; @@ -9,8 +9,6 @@ using Content.Shared.Stunnable; using Content.Shared.Timing; using Content.Shared.Whitelist; using Robust.Shared.Audio.Systems; -using Robust.Shared.Timing; -using Robust.Shared.Prototypes; namespace Content.Server.Ninja.Systems; @@ -62,7 +60,7 @@ public sealed class StunProviderSystem : SharedStunProviderSystem _audio.PlayPvs(comp.Sound, target); - _damageable.TryChangeDamage(target, comp.StunDamage, false, true, null, origin: uid); + _damageable.ChangeDamage(target, comp.StunDamage, origin: uid); _stun.TryAddParalyzeDuration(target, comp.StunTime); // short cooldown to prevent instant stunlocking diff --git a/Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs b/Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs index 6905979a5f..871a15ee73 100644 --- a/Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs +++ b/Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs @@ -4,7 +4,7 @@ using Content.Server.Nutrition.Components; using Content.Server.Popups; using Content.Shared.Body.Components; using Content.Shared.Atmos; -using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.DoAfter; using Content.Shared.Emag.Systems; using Content.Shared.IdentityManagement; diff --git a/Content.Server/Polymorph/Systems/PolymorphSystem.cs b/Content.Server/Polymorph/Systems/PolymorphSystem.cs index db7fb6a92f..897ad72047 100644 --- a/Content.Server/Polymorph/Systems/PolymorphSystem.cs +++ b/Content.Server/Polymorph/Systems/PolymorphSystem.cs @@ -4,7 +4,8 @@ using Content.Server.Inventory; using Content.Server.Polymorph.Components; using Content.Shared.Buckle; using Content.Shared.Coordinates; -using Content.Shared.Damage; +using Content.Shared.Damage.Components; +using Content.Shared.Damage.Systems; using Content.Shared.Destructible; using Content.Shared.Hands.EntitySystems; using Content.Shared.IdentityManagement; @@ -228,7 +229,7 @@ public sealed partial class PolymorphSystem : EntitySystem _mobThreshold.GetScaledDamage(uid, child, out var damage) && damage != null) { - _damageable.SetDamage(child, damageParent, damage); + _damageable.SetDamage((child, damageParent), damage); } if (configuration.Inventory == PolymorphInventoryChange.Transfer) @@ -323,7 +324,7 @@ public sealed partial class PolymorphSystem : EntitySystem _mobThreshold.GetScaledDamage(uid, parent, out var damage) && damage != null) { - _damageable.SetDamage(parent, damageParent, damage); + _damageable.SetDamage((parent, damageParent), damage); } if (component.Configuration.Inventory == PolymorphInventoryChange.Transfer) diff --git a/Content.Server/Projectiles/ProjectileSystem.cs b/Content.Server/Projectiles/ProjectileSystem.cs index 4c054a4561..28df1eb42d 100644 --- a/Content.Server/Projectiles/ProjectileSystem.cs +++ b/Content.Server/Projectiles/ProjectileSystem.cs @@ -3,7 +3,8 @@ using Content.Server.Destructible; using Content.Server.Effects; using Content.Server.Weapons.Ranged.Systems; using Content.Shared.Camera; -using Content.Shared.Damage; +using Content.Shared.Damage.Components; +using Content.Shared.Damage.Systems; using Content.Shared.Database; using Content.Shared.FixedPoint; using Content.Shared.Projectiles; @@ -54,64 +55,63 @@ public sealed class ProjectileSystem : SharedProjectileSystem damageRequired -= damageableComponent.TotalDamage; damageRequired = FixedPoint2.Max(damageRequired, FixedPoint2.Zero); } - var modifiedDamage = _damageableSystem.TryChangeDamage(target, ev.Damage, component.IgnoreResistances, damageable: damageableComponent, origin: component.Shooter); var deleted = Deleted(target); - if (modifiedDamage is not null && Exists(component.Shooter)) + if (_damageableSystem.TryChangeDamage((target, damageableComponent), ev.Damage, out var damage, component.IgnoreResistances, origin: component.Shooter) && Exists(component.Shooter)) { - if (modifiedDamage.AnyPositive() && !deleted) + if (!deleted) { _color.RaiseEffect(Color.Red, new List { target }, Filter.Pvs(target, entityManager: EntityManager)); } _adminLogger.Add(LogType.BulletHit, LogImpact.Medium, - $"Projectile {ToPrettyString(uid):projectile} shot by {ToPrettyString(component.Shooter!.Value):user} hit {otherName:target} and dealt {modifiedDamage.GetTotal():damage} damage"); - } + $"Projectile {ToPrettyString(uid):projectile} shot by {ToPrettyString(component.Shooter!.Value):user} hit {otherName:target} and dealt {damage:damage} damage"); - // If penetration is to be considered, we need to do some checks to see if the projectile should stop. - if (modifiedDamage is not null && component.PenetrationThreshold != 0) - { - // If a damage type is required, stop the bullet if the hit entity doesn't have that type. - if (component.PenetrationDamageTypeRequirement != null) + // If penetration is to be considered, we need to do some checks to see if the projectile should stop. + if (component.PenetrationThreshold != 0) { - var stopPenetration = false; - foreach (var requiredDamageType in component.PenetrationDamageTypeRequirement) + // If a damage type is required, stop the bullet if the hit entity doesn't have that type. + if (component.PenetrationDamageTypeRequirement != null) { - if (!modifiedDamage.DamageDict.Keys.Contains(requiredDamageType)) + var stopPenetration = false; + foreach (var requiredDamageType in component.PenetrationDamageTypeRequirement) { - stopPenetration = true; - break; + if (!damage.DamageDict.Keys.Contains(requiredDamageType)) + { + stopPenetration = true; + break; + } + } + if (stopPenetration) + component.ProjectileSpent = true; + } + + // If the object won't be destroyed, it "tanks" the penetration hit. + if (damage.GetTotal() < damageRequired) + { + component.ProjectileSpent = true; + } + + if (!component.ProjectileSpent) + { + component.PenetrationAmount += damageRequired; + // The projectile has dealt enough damage to be spent. + if (component.PenetrationAmount >= component.PenetrationThreshold) + { + component.ProjectileSpent = true; } } - if (stopPenetration) - component.ProjectileSpent = true; } - - // If the object won't be destroyed, it "tanks" the penetration hit. - if (modifiedDamage.GetTotal() < damageRequired) + else { component.ProjectileSpent = true; } - - if (!component.ProjectileSpent) - { - component.PenetrationAmount += damageRequired; - // The projectile has dealt enough damage to be spent. - if (component.PenetrationAmount >= component.PenetrationThreshold) - { - component.ProjectileSpent = true; - } - } - } - else - { - component.ProjectileSpent = true; } if (!deleted) { - _guns.PlayImpactSound(target, modifiedDamage, component.SoundHit, component.ForceSound); + _guns.PlayImpactSound(target, damage, component.SoundHit, component.ForceSound); if (!args.OurBody.LinearVelocity.IsLengthZero()) _sharedCameraRecoil.KickCamera(target, args.OurBody.LinearVelocity.Normalized()); diff --git a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs index 38c3480078..8089cba61b 100644 --- a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs +++ b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs @@ -213,7 +213,7 @@ public sealed partial class RevenantSystem return; DamageSpecifier dspec = new(); dspec.DamageDict.Add("Cold", damage.Value); - _damage.TryChangeDamage(args.Args.Target, dspec, true, origin: uid); + _damage.ChangeDamage(args.Args.Target.Value, dspec, true, origin: uid); args.Handled = true; } diff --git a/Content.Server/Revenant/EntitySystems/RevenantSystem.cs b/Content.Server/Revenant/EntitySystems/RevenantSystem.cs index 6c8972be58..34966d9c22 100644 --- a/Content.Server/Revenant/EntitySystems/RevenantSystem.cs +++ b/Content.Server/Revenant/EntitySystems/RevenantSystem.cs @@ -3,7 +3,7 @@ using Content.Server.Actions; using Content.Server.GameTicking; using Content.Server.Store.Systems; using Content.Shared.Alert; -using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.DoAfter; using Content.Shared.Examine; using Content.Shared.Eye; diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs index b5adeb04db..6126234451 100644 --- a/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs +++ b/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs @@ -20,6 +20,7 @@ using Robust.Shared.Physics.Events; using Robust.Shared.Prototypes; using Robust.Shared.Random; using System.Numerics; +using Content.Shared.Damage.Components; namespace Content.Server.Shuttles.Systems; @@ -372,7 +373,7 @@ public sealed partial class ShuttleSystem damageSpec.DamageDict["Blunt"] = scaledDamage; damageSpec.DamageDict["Structural"] = scaledDamage * _structuralDamage; - _damageSys.TryChangeDamage(localEnt, damageSpec, damageable: damageable); + _damageSys.ChangeDamage((localEnt, damageable), damageSpec); } // might've been destroyed if (TerminatingOrDeleted(localEnt) || EntityManager.IsQueuedForDeletion(localEnt)) diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.cs index e96ceffd16..86b97c40a6 100644 --- a/Content.Server/Shuttles/Systems/ShuttleSystem.cs +++ b/Content.Server/Shuttles/Systems/ShuttleSystem.cs @@ -8,7 +8,7 @@ using Content.Server.Shuttles.Events; using Content.Server.Station.Systems; using Content.Server.Stunnable; using Content.Shared.Buckle.Components; -using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.Light.Components; using Content.Shared.Movement.Events; using Content.Shared.Salvage; diff --git a/Content.Server/Shuttles/Systems/ThrusterSystem.cs b/Content.Server/Shuttles/Systems/ThrusterSystem.cs index f7f0a8b251..20040ab40a 100644 --- a/Content.Server/Shuttles/Systems/ThrusterSystem.cs +++ b/Content.Server/Shuttles/Systems/ThrusterSystem.cs @@ -1,16 +1,14 @@ using System.Numerics; using Content.Server.Audio; -using Content.Server.Power.Components; using Content.Server.Power.EntitySystems; using Content.Server.Shuttles.Components; -using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.Examine; using Content.Shared.Interaction; using Content.Shared.Maps; using Content.Shared.Physics; using Content.Shared.Shuttles.Components; using Content.Shared.Temperature; -using Robust.Shared.Map; using Robust.Shared.Map.Components; using Robust.Shared.Physics.Collision.Shapes; using Robust.Shared.Physics.Components; diff --git a/Content.Server/Silicons/Borgs/BorgSystem.Transponder.cs b/Content.Server/Silicons/Borgs/BorgSystem.Transponder.cs index 082e6776f0..fd3b910753 100644 --- a/Content.Server/Silicons/Borgs/BorgSystem.Transponder.cs +++ b/Content.Server/Silicons/Borgs/BorgSystem.Transponder.cs @@ -1,6 +1,6 @@ using Content.Shared.Containers.ItemSlots; using Content.Shared.DeviceNetwork; -using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.FixedPoint; using Content.Shared.Mobs; using Content.Shared.Mobs.Systems; diff --git a/Content.Server/Silicons/StationAi/StationAiSystem.cs b/Content.Server/Silicons/StationAi/StationAiSystem.cs index 4ee2a07d72..a9198d5816 100644 --- a/Content.Server/Silicons/StationAi/StationAiSystem.cs +++ b/Content.Server/Silicons/StationAi/StationAiSystem.cs @@ -12,7 +12,8 @@ using Content.Server.Station.Systems; using Content.Shared.Alert; using Content.Shared.Chat.Prototypes; using Content.Shared.Containers.ItemSlots; -using Content.Shared.Damage; +using Content.Shared.Damage.Components; +using Content.Shared.Damage.Systems; using Content.Shared.Destructible; using Content.Shared.DeviceNetwork.Components; using Content.Shared.DoAfter; @@ -127,10 +128,7 @@ public sealed class StationAiSystem : SharedStationAiSystem _battery.SetCharge(ent, battery.MaxCharge); } - if (TryComp(ent, out var damageable)) - { - _damageable.SetAllDamage(ent, damageable, 0); - } + _damageable.ClearAllDamage(ent.Owner); } protected override void OnAiInsert(Entity ent, ref EntInsertedIntoContainerMessage args) diff --git a/Content.Server/Speech/EntitySystems/DamagedSiliconAccentSystem.cs b/Content.Server/Speech/EntitySystems/DamagedSiliconAccentSystem.cs index d4a37a07cd..a5e30346bd 100644 --- a/Content.Server/Speech/EntitySystems/DamagedSiliconAccentSystem.cs +++ b/Content.Server/Speech/EntitySystems/DamagedSiliconAccentSystem.cs @@ -2,7 +2,7 @@ using Content.Server.Destructible; using Content.Server.PowerCell; using Content.Shared.Speech.Components; -using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.FixedPoint; using Content.Shared.Speech; using Robust.Shared.Random; diff --git a/Content.Server/Spreader/KudzuSystem.cs b/Content.Server/Spreader/KudzuSystem.cs index fbc809c15b..e8470ebd57 100644 --- a/Content.Server/Spreader/KudzuSystem.cs +++ b/Content.Server/Spreader/KudzuSystem.cs @@ -1,4 +1,5 @@ -using Content.Shared.Damage; +using Content.Shared.Damage.Components; +using Content.Shared.Damage.Systems; using Content.Shared.Spreader; using Robust.Shared.Prototypes; using Robust.Shared.Random; diff --git a/Content.Server/Temperature/Systems/TemperatureSystem.cs b/Content.Server/Temperature/Systems/TemperatureSystem.cs index f6a7536994..3bbde482c4 100644 --- a/Content.Server/Temperature/Systems/TemperatureSystem.cs +++ b/Content.Server/Temperature/Systems/TemperatureSystem.cs @@ -5,7 +5,8 @@ using Content.Server.Body.Components; using Content.Server.Temperature.Components; using Content.Shared.Alert; using Content.Shared.Atmos; -using Content.Shared.Damage; +using Content.Shared.Damage.Components; +using Content.Shared.Damage.Systems; using Content.Shared.Database; using Content.Shared.Inventory; using Content.Shared.Rejuvenate; diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs index 86a7b512b6..1fb695ae61 100644 --- a/Content.Server/VendingMachines/VendingMachineSystem.cs +++ b/Content.Server/VendingMachines/VendingMachineSystem.cs @@ -5,6 +5,7 @@ using Content.Server.Power.Components; using Content.Server.Vocalization.Systems; using Content.Shared.Cargo; using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.Destructible; using Content.Shared.Emp; using Content.Shared.Power; diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.AutoFire.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.AutoFire.cs index 47b0d5f3c6..995e29727b 100644 --- a/Content.Server/Weapons/Ranged/Systems/GunSystem.AutoFire.cs +++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.AutoFire.cs @@ -1,4 +1,4 @@ -using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.Weapons.Ranged.Components; using Robust.Shared.Map; diff --git a/Content.Server/Zombies/ZombieSystem.Transform.cs b/Content.Server/Zombies/ZombieSystem.Transform.cs index c44c2e7aa0..43a06f2614 100644 --- a/Content.Server/Zombies/ZombieSystem.Transform.cs +++ b/Content.Server/Zombies/ZombieSystem.Transform.cs @@ -14,10 +14,9 @@ using Content.Server.NPC.Systems; using Content.Server.StationEvents.Components; using Content.Server.Speech.Components; using Content.Shared.Body.Components; -using Content.Shared.Chat; using Content.Shared.CombatMode; using Content.Shared.CombatMode.Pacification; -using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.Hands.Components; using Content.Shared.Hands.EntitySystems; using Content.Shared.Humanoid; @@ -248,8 +247,7 @@ public sealed partial class ZombieSystem tempComp.ColdDamage.ClampMax(0); //Heals the zombie from all the damage it took while human - if (TryComp(target, out var damageablecomp)) - _damageable.SetAllDamage(target, damageablecomp, 0); + _damageable.ClearAllDamage(target); _mobState.ChangeMobState(target, MobState.Alive); _faction.ClearFactions(target, dirty: false); diff --git a/Content.Server/Zombies/ZombieSystem.cs b/Content.Server/Zombies/ZombieSystem.cs index d4f86fa96c..72c5236930 100644 --- a/Content.Server/Zombies/ZombieSystem.cs +++ b/Content.Server/Zombies/ZombieSystem.cs @@ -1,4 +1,3 @@ -using System.Linq; using Content.Shared.NPC.Prototypes; using Content.Server.Actions; using Content.Server.Body.Systems; @@ -11,7 +10,7 @@ using Content.Shared.Armor; using Content.Shared.Bed.Sleep; using Content.Shared.Cloning.Events; using Content.Shared.Chat; -using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.Humanoid; using Content.Shared.Inventory; using Content.Shared.Mind; @@ -118,7 +117,7 @@ namespace Content.Server.Zombies var curTime = _timing.CurTime; // Hurt the living infected - var query = EntityQueryEnumerator(); + var query = EntityQueryEnumerator(); while (query.MoveNext(out var uid, out var comp, out var damage, out var mobState)) { // Process only once per second @@ -138,11 +137,11 @@ namespace Content.Server.Zombies ? comp.CritDamageMultiplier : 1f; - _damageable.TryChangeDamage(uid, comp.Damage * multiplier, true, false, damage); + _damageable.ChangeDamage((uid, damage), comp.Damage * multiplier, true, false); } // Heal the zombified - var zombQuery = EntityQueryEnumerator(); + var zombQuery = EntityQueryEnumerator(); while (zombQuery.MoveNext(out var uid, out var comp, out var damage, out var mobState)) { // Process only once per second @@ -159,7 +158,7 @@ namespace Content.Server.Zombies : 1f; // Gradual healing for living zombies. - _damageable.TryChangeDamage(uid, comp.PassiveHealing * multiplier, true, false, damage); + _damageable.ChangeDamage((uid, damage), comp.PassiveHealing * multiplier, true, false); } } diff --git a/Content.Shared/Armor/SharedArmorSystem.cs b/Content.Shared/Armor/SharedArmorSystem.cs index 972289460f..6a3db3184d 100644 --- a/Content.Shared/Armor/SharedArmorSystem.cs +++ b/Content.Shared/Armor/SharedArmorSystem.cs @@ -1,5 +1,6 @@ using Content.Shared.Clothing.Components; using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.Examine; using Content.Shared.Inventory; using Content.Shared.Silicons.Borgs; diff --git a/Content.Shared/Bed/Sleep/SleepingSystem.cs b/Content.Shared/Bed/Sleep/SleepingSystem.cs index 27e11bc878..661c8399a1 100644 --- a/Content.Shared/Bed/Sleep/SleepingSystem.cs +++ b/Content.Shared/Bed/Sleep/SleepingSystem.cs @@ -4,6 +4,7 @@ using Content.Shared.Buckle.Components; using Content.Shared.Damage; using Content.Shared.Damage.Events; using Content.Shared.Damage.ForceSay; +using Content.Shared.Damage.Systems; using Content.Shared.Emoting; using Content.Shared.Examine; using Content.Shared.Eye.Blinding.Systems; diff --git a/Content.Shared/Blocking/BlockingSystem.User.cs b/Content.Shared/Blocking/BlockingSystem.User.cs index 2cd1db7f1f..db59a8d5f6 100644 --- a/Content.Shared/Blocking/BlockingSystem.User.cs +++ b/Content.Shared/Blocking/BlockingSystem.User.cs @@ -1,6 +1,6 @@ using Content.Shared.Damage; -using Content.Shared.Damage.Prototypes; -using Robust.Shared.Audio; +using Content.Shared.Damage.Components; +using Content.Shared.Damage.Systems; using Robust.Shared.Audio.Systems; using Robust.Shared.Containers; @@ -42,31 +42,31 @@ public sealed partial class BlockingSystem private void OnUserDamageModified(EntityUid uid, BlockingUserComponent component, DamageModifyEvent args) { - if (TryComp(component.BlockingItem, out var blocking)) + if (component.BlockingItem is not { } item || !TryComp(item, out var blocking)) + return; + + if (args.Damage.GetTotal() <= 0) + return; + + // A shield should only block damage it can itself absorb. To determine that we need the Damageable component on it. + if (!TryComp(item, out var dmgComp)) + return; + + var blockFraction = blocking.IsBlocking ? blocking.ActiveBlockFraction : blocking.PassiveBlockFraction; + blockFraction = Math.Clamp(blockFraction, 0, 1); + _damageable.TryChangeDamage((item, dmgComp), blockFraction * args.OriginalDamage); + + var modify = new DamageModifierSet(); + foreach (var key in dmgComp.Damage.DamageDict.Keys) { - if (args.Damage.GetTotal() <= 0) - return; + modify.Coefficients.TryAdd(key, 1 - blockFraction); + } - // A shield should only block damage it can itself absorb. To determine that we need the Damageable component on it. - if (!TryComp(component.BlockingItem, out var dmgComp)) - return; + args.Damage = DamageSpecifier.ApplyModifierSet(args.Damage, modify); - var blockFraction = blocking.IsBlocking ? blocking.ActiveBlockFraction : blocking.PassiveBlockFraction; - blockFraction = Math.Clamp(blockFraction, 0, 1); - _damageable.TryChangeDamage(component.BlockingItem, blockFraction * args.OriginalDamage); - - var modify = new DamageModifierSet(); - foreach (var key in dmgComp.Damage.DamageDict.Keys) - { - modify.Coefficients.TryAdd(key, 1 - blockFraction); - } - - args.Damage = DamageSpecifier.ApplyModifierSet(args.Damage, modify); - - if (blocking.IsBlocking && !args.Damage.Equals(args.OriginalDamage)) - { - _audio.PlayPvs(blocking.BlockSound, uid); - } + if (blocking.IsBlocking && !args.Damage.Equals(args.OriginalDamage)) + { + _audio.PlayPvs(blocking.BlockSound, uid); } } diff --git a/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs b/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs index 693eede7d8..688e3ccb92 100644 --- a/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs +++ b/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs @@ -6,8 +6,8 @@ using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reaction; using Content.Shared.Chemistry.Reagent; using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.EntityEffects.Effects.Solution; -using Content.Shared.EntityEffects.Effects.Transform; using Content.Shared.FixedPoint; using Content.Shared.Fluids; using Content.Shared.Forensics.Components; @@ -99,8 +99,7 @@ public abstract class SharedBloodstreamSystem : EntitySystem // bloodloss damage is based on the base value, and modified by how low your blood level is. var amt = bloodstream.BloodlossDamage / (0.1f + bloodPercentage); - _damageableSystem.TryChangeDamage(uid, amt, - ignoreResistances: false, interruptsDoAfters: false); + _damageableSystem.TryChangeDamage(uid, amt, ignoreResistances: false, interruptsDoAfters: false); // Apply dizziness as a symptom of bloodloss. // The effect is applied in a way that it will never be cleared without being healthy. diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs index 78d270ddc9..0b2efdce59 100644 --- a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs +++ b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs @@ -181,7 +181,7 @@ public partial class SharedBodySystem { // TODO BODY SYSTEM KILL : remove this when wounding and required parts are implemented properly var damage = new DamageSpecifier(Prototypes.Index(BloodlossDamageType), 300); - Damageable.TryChangeDamage(bodyEnt, damage); + Damageable.ChangeDamage(bodyEnt.Owner, damage); } } diff --git a/Content.Shared/Body/Systems/SharedBodySystem.cs b/Content.Shared/Body/Systems/SharedBodySystem.cs index a45966fcc3..f359ebc632 100644 --- a/Content.Shared/Body/Systems/SharedBodySystem.cs +++ b/Content.Shared/Body/Systems/SharedBodySystem.cs @@ -1,4 +1,4 @@ -using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.Movement.Systems; using Content.Shared.Standing; using Robust.Shared.Containers; diff --git a/Content.Shared/Changeling/Systems/ChangelingDevourSystem.cs b/Content.Shared/Changeling/Systems/ChangelingDevourSystem.cs index 500ee06b22..a30387a807 100644 --- a/Content.Shared/Changeling/Systems/ChangelingDevourSystem.cs +++ b/Content.Shared/Changeling/Systems/ChangelingDevourSystem.cs @@ -4,7 +4,8 @@ using Content.Shared.Armor; using Content.Shared.Atmos.Rotting; using Content.Shared.Body.Components; using Content.Shared.Changeling.Components; -using Content.Shared.Damage; +using Content.Shared.Damage.Components; +using Content.Shared.Damage.Systems; using Content.Shared.Database; using Content.Shared.DoAfter; using Content.Shared.Humanoid; @@ -92,7 +93,7 @@ public sealed class ChangelingDevourSystem : EntitySystem if (damage.Damage.DamageDict.TryGetValue(damagePoints.Key, out var val) && val > comp.DevourConsumeDamageCap) return; } - _damageable.TryChangeDamage(target, comp.DamagePerTick, true, true, damage, user); + _damageable.ChangeDamage((target.Value, damage), comp.DamagePerTick, true, true, user); } /// diff --git a/Content.Shared/Chat/SharedSuicideSystem.cs b/Content.Shared/Chat/SharedSuicideSystem.cs index 4b9eaf24b7..0484e51ab2 100644 --- a/Content.Shared/Chat/SharedSuicideSystem.cs +++ b/Content.Shared/Chat/SharedSuicideSystem.cs @@ -1,8 +1,10 @@ +using System.Linq; using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.Damage.Prototypes; +using Content.Shared.Damage.Systems; using Content.Shared.Mobs.Components; using Robust.Shared.Prototypes; -using System.Linq; namespace Content.Shared.Chat; @@ -40,7 +42,7 @@ public sealed class SharedSuicideSystem : EntitySystem appliedDamageSpecifier.DamageDict[key] = Math.Ceiling((double) (value * lethalAmountOfDamage / totalDamage)); } - _damageableSystem.TryChangeDamage(target, appliedDamageSpecifier, true, origin: target); + _damageableSystem.ChangeDamage(target.AsNullable(), appliedDamageSpecifier, true, origin: target); } /// @@ -64,6 +66,6 @@ public sealed class SharedSuicideSystem : EntitySystem } var damage = new DamageSpecifier(damagePrototype, lethalAmountOfDamage); - _damageableSystem.TryChangeDamage(target, damage, true, origin: target); + _damageableSystem.ChangeDamage(target.AsNullable(), damage, true, origin: target); } } diff --git a/Content.Shared/Climbing/Systems/ClimbSystem.cs b/Content.Shared/Climbing/Systems/ClimbSystem.cs index 45055ebbcc..9cc0a55ce1 100644 --- a/Content.Shared/Climbing/Systems/ClimbSystem.cs +++ b/Content.Shared/Climbing/Systems/ClimbSystem.cs @@ -2,7 +2,7 @@ using Content.Shared.ActionBlocker; using Content.Shared.Buckle.Components; using Content.Shared.Climbing.Components; using Content.Shared.Climbing.Events; -using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.DoAfter; using Content.Shared.DragDrop; using Content.Shared.Hands.Components; diff --git a/Content.Shared/Clothing/SharedCursedMaskSystem.cs b/Content.Shared/Clothing/SharedCursedMaskSystem.cs index 8ba83be151..359e8ef769 100644 --- a/Content.Shared/Clothing/SharedCursedMaskSystem.cs +++ b/Content.Shared/Clothing/SharedCursedMaskSystem.cs @@ -1,5 +1,6 @@ using Content.Shared.Clothing.Components; using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.Examine; using Content.Shared.Inventory; using Content.Shared.Movement.Systems; diff --git a/Content.Shared/Clumsy/ClumsySystem.cs b/Content.Shared/Clumsy/ClumsySystem.cs index d7b4019eb8..35866b155a 100644 --- a/Content.Shared/Clumsy/ClumsySystem.cs +++ b/Content.Shared/Clumsy/ClumsySystem.cs @@ -2,7 +2,7 @@ using Content.Shared.CCVar; using Content.Shared.Chemistry.Hypospray.Events; using Content.Shared.Climbing.Components; using Content.Shared.Climbing.Events; -using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.IdentityManagement; using Content.Shared.Medical; using Content.Shared.Popups; @@ -95,7 +95,7 @@ public sealed class ClumsySystem : EntitySystem args.Cancelled = true; // fail to catch if (ent.Comp.CatchingFailDamage != null) - _damageable.TryChangeDamage(ent, ent.Comp.CatchingFailDamage, origin: args.Item); + _damageable.ChangeDamage(ent.Owner, ent.Comp.CatchingFailDamage, origin: args.Item); // Collisions don't work properly with PopupPredicted or PlayPredicted. // So we make this server only. @@ -127,7 +127,7 @@ public sealed class ClumsySystem : EntitySystem return; if (ent.Comp.GunShootFailDamage != null) - _damageable.TryChangeDamage(ent, ent.Comp.GunShootFailDamage, origin: ent); + _damageable.ChangeDamage(ent.Owner, ent.Comp.GunShootFailDamage, origin: ent); _stun.TryUpdateParalyzeDuration(ent, ent.Comp.GunShootFailStunTime); @@ -199,7 +199,7 @@ public sealed class ClumsySystem : EntitySystem { stunTime = bonkComp.BonkTime; if (bonkComp.BonkDamage != null) - _damageable.TryChangeDamage(target, bonkComp.BonkDamage, true); + _damageable.ChangeDamage(target.Owner, bonkComp.BonkDamage, true); } _stun.TryUpdateParalyzeDuration(target, stunTime); diff --git a/Content.Shared/Damage/Components/ClothingSlowOnDamageModifierComponent.cs b/Content.Shared/Damage/Components/ClothingSlowOnDamageModifierComponent.cs index 3d4bdd597c..faf8a1bb57 100644 --- a/Content.Shared/Damage/Components/ClothingSlowOnDamageModifierComponent.cs +++ b/Content.Shared/Damage/Components/ClothingSlowOnDamageModifierComponent.cs @@ -1,3 +1,4 @@ +using Content.Shared.Damage.Systems; using Robust.Shared.GameStates; namespace Content.Shared.Damage.Components; diff --git a/Content.Shared/Damage/Components/DamageableComponent.cs b/Content.Shared/Damage/Components/DamageableComponent.cs index 1d290181ec..cef27d4d2f 100644 --- a/Content.Shared/Damage/Components/DamageableComponent.cs +++ b/Content.Shared/Damage/Components/DamageableComponent.cs @@ -1,4 +1,5 @@ using Content.Shared.Damage.Prototypes; +using Content.Shared.Damage.Systems; using Content.Shared.FixedPoint; using Content.Shared.Mobs; using Content.Shared.StatusIcon; @@ -6,105 +7,100 @@ using Robust.Shared.GameStates; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; -namespace Content.Shared.Damage +namespace Content.Shared.Damage.Components; + +/// +/// Component that allows entities to take damage. +/// +/// +/// The supported damage types are specified using a s. DamageContainers +/// may also have resistances to certain damage types, defined via a . +/// +[RegisterComponent] +[NetworkedComponent] +[Access(typeof(DamageableSystem), Other = AccessPermissions.ReadExecute)] +public sealed partial class DamageableComponent : Component { /// - /// Component that allows entities to take damage. + /// This specifies what damage types are supported by this component. + /// If null, all damage types will be supported. + /// + [DataField("damageContainer")] + // ReSharper disable once InconsistentNaming - This is wrong but fixing it is potentially annoying for downstreams. + public ProtoId? DamageContainerID; + + /// + /// This will be applied to any damage that is dealt to this container, + /// unless the damage explicitly ignores resistances. /// /// - /// The supported damage types are specified using a s. DamageContainers - /// may also have resistances to certain damage types, defined via a . + /// Though DamageModifierSets can be deserialized directly, we only want to use the prototype version here + /// to reduce duplication. /// - [RegisterComponent] - [NetworkedComponent] - [Access(typeof(DamageableSystem), Other = AccessPermissions.ReadExecute)] - public sealed partial class DamageableComponent : Component + [DataField("damageModifierSet")] + public ProtoId? DamageModifierSetId; + + /// + /// All the damage information is stored in this . + /// + /// + /// If this data-field is specified, this allows damageable components to be initialized with non-zero damage. + /// + [DataField(readOnly: true)] //TODO FULL GAME SAVE + public DamageSpecifier Damage = new(); + + /// + /// Damage, indexed by ID keys. + /// + /// + /// Groups which have no members that are supported by this component will not be present in this + /// dictionary. + /// + [ViewVariables] public Dictionary DamagePerGroup = new(); + + /// + /// The sum of all damages in the DamageableComponent. + /// + [ViewVariables] + public FixedPoint2 TotalDamage; + + [DataField("radiationDamageTypes")] + // ReSharper disable once UseCollectionExpression - Cannot refactor this as it's a potential sandbox violation. + public List> RadiationDamageTypeIDs = new() { "Radiation" }; + + /// + /// Group types that affect the pain overlay. + /// + /// TODO: Add support for adding damage types specifically rather than whole damage groups + [DataField] + // ReSharper disable once UseCollectionExpression - Cannot refactor this as it's a potential sandbox volation. + public List> PainDamageGroups = new() { "Brute", "Burn" }; + + [DataField] + public Dictionary> HealthIcons = new() { - /// - /// This specifies what damage types are supported by this component. - /// If null, all damage types will be supported. - /// - [DataField("damageContainer")] - public ProtoId? DamageContainerID; + { MobState.Alive, "HealthIconFine" }, + { MobState.Critical, "HealthIconCritical" }, + { MobState.Dead, "HealthIconDead" }, + }; - /// - /// This will be applied to any damage that is dealt to this container, - /// unless the damage explicitly ignores resistances. - /// - /// - /// Though DamageModifierSets can be deserialized directly, we only want to use the prototype version here - /// to reduce duplication. - /// - [DataField("damageModifierSet")] - public ProtoId? DamageModifierSetId; + [DataField] + public ProtoId RottingIcon = "HealthIconRotting"; - /// - /// All the damage information is stored in this . - /// - /// - /// If this data-field is specified, this allows damageable components to be initialized with non-zero damage. - /// - [DataField(readOnly: true)] // TODO FULL GAME SAVE - public DamageSpecifier Damage = new(); - - /// - /// Damage, indexed by ID keys. - /// - /// - /// Groups which have no members that are supported by this component will not be present in this - /// dictionary. - /// - [ViewVariables] public Dictionary DamagePerGroup = new(); - - /// - /// The sum of all damages in the DamageableComponent. - /// - [ViewVariables] - public FixedPoint2 TotalDamage; - - [DataField("radiationDamageTypes")] - public List> RadiationDamageTypeIDs = new() { "Radiation" }; - - /// - /// Group types that affect the pain overlay. - /// - /// TODO: Add support for adding damage types specifically rather than whole damage groups - [DataField] - public List> PainDamageGroups = new() { "Brute", "Burn" }; - - [DataField] - public Dictionary> HealthIcons = new() - { - { MobState.Alive, "HealthIconFine" }, - { MobState.Critical, "HealthIconCritical" }, - { MobState.Dead, "HealthIconDead" }, - }; - - [DataField] - public ProtoId RottingIcon = "HealthIconRotting"; - - [DataField] - public FixedPoint2? HealthBarThreshold; - } - - [Serializable, NetSerializable] - public sealed class DamageableComponentState : ComponentState - { - public readonly Dictionary DamageDict; - public readonly string? DamageContainerId; - public readonly string? ModifierSetId; - public readonly FixedPoint2? HealthBarThreshold; - - public DamageableComponentState( - Dictionary damageDict, - string? damageContainerId, - string? modifierSetId, - FixedPoint2? healthBarThreshold) - { - DamageDict = damageDict; - DamageContainerId = damageContainerId; - ModifierSetId = modifierSetId; - HealthBarThreshold = healthBarThreshold; - } - } + [DataField] + public FixedPoint2? HealthBarThreshold; +} + +[Serializable, NetSerializable] +public sealed class DamageableComponentState( + Dictionary damageDict, + ProtoId? damageContainerId, + ProtoId? modifierSetId, + FixedPoint2? healthBarThreshold) + : ComponentState +{ + public readonly Dictionary DamageDict = damageDict; + public readonly ProtoId? DamageContainerId = damageContainerId; + public readonly ProtoId? ModifierSetId = modifierSetId; + public readonly FixedPoint2? HealthBarThreshold = healthBarThreshold; } diff --git a/Content.Shared/Damage/Components/IgnoreSlowOnDamageComponent.cs b/Content.Shared/Damage/Components/IgnoreSlowOnDamageComponent.cs index e933eb1a79..101a494bc9 100644 --- a/Content.Shared/Damage/Components/IgnoreSlowOnDamageComponent.cs +++ b/Content.Shared/Damage/Components/IgnoreSlowOnDamageComponent.cs @@ -1,3 +1,4 @@ +using Content.Shared.Damage.Systems; using Robust.Shared.GameStates; namespace Content.Shared.Damage.Components; diff --git a/Content.Shared/Damage/Components/RequireProjectileTargetComponent.cs b/Content.Shared/Damage/Components/RequireProjectileTargetComponent.cs index 5bd8292daa..3c94dcbc38 100644 --- a/Content.Shared/Damage/Components/RequireProjectileTargetComponent.cs +++ b/Content.Shared/Damage/Components/RequireProjectileTargetComponent.cs @@ -1,3 +1,4 @@ +using Content.Shared.Damage.Systems; using Robust.Shared.GameStates; namespace Content.Shared.Damage.Components; diff --git a/Content.Shared/Damage/DamageModifierSet.cs b/Content.Shared/Damage/DamageModifierSet.cs index eaa6e93da4..d8b00ad1f2 100644 --- a/Content.Shared/Damage/DamageModifierSet.cs +++ b/Content.Shared/Damage/DamageModifierSet.cs @@ -1,3 +1,4 @@ +using Content.Shared.Damage.Components; using Content.Shared.Damage.Prototypes; using Robust.Shared.Serialization; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary; diff --git a/Content.Shared/Damage/DamageSpecifier.cs b/Content.Shared/Damage/DamageSpecifier.cs index 7bf921baa2..6c11f88b1e 100644 --- a/Content.Shared/Damage/DamageSpecifier.cs +++ b/Content.Shared/Damage/DamageSpecifier.cs @@ -1,5 +1,6 @@ using System.Linq; using System.Text.Json.Serialization; +using Content.Shared.Damage.Components; using Content.Shared.Damage.Prototypes; using Content.Shared.FixedPoint; using JetBrains.Annotations; diff --git a/Content.Shared/Damage/Prototypes/DamageContainerPrototype.cs b/Content.Shared/Damage/Prototypes/DamageContainerPrototype.cs index 00322f0884..1643a5469d 100644 --- a/Content.Shared/Damage/Prototypes/DamageContainerPrototype.cs +++ b/Content.Shared/Damage/Prototypes/DamageContainerPrototype.cs @@ -1,5 +1,5 @@ +using Content.Shared.Damage.Components; using Robust.Shared.Prototypes; -using Robust.Shared.Serialization; namespace Content.Shared.Damage.Prototypes { diff --git a/Content.Shared/Damage/Prototypes/DamageGroupPrototype.cs b/Content.Shared/Damage/Prototypes/DamageGroupPrototype.cs index a33064f934..facdcce0e8 100644 --- a/Content.Shared/Damage/Prototypes/DamageGroupPrototype.cs +++ b/Content.Shared/Damage/Prototypes/DamageGroupPrototype.cs @@ -1,5 +1,5 @@ +using Content.Shared.Damage.Components; using Robust.Shared.Prototypes; -using Robust.Shared.Serialization; namespace Content.Shared.Damage.Prototypes { diff --git a/Content.Shared/Damage/Systems/DamageOnAttackedSystem.cs b/Content.Shared/Damage/Systems/DamageOnAttackedSystem.cs index 29de43fba4..d628f40b76 100644 --- a/Content.Shared/Damage/Systems/DamageOnAttackedSystem.cs +++ b/Content.Shared/Damage/Systems/DamageOnAttackedSystem.cs @@ -73,9 +73,9 @@ public sealed class DamageOnAttackedSystem : EntitySystem } } - totalDamage = _damageableSystem.TryChangeDamage(args.User, totalDamage, entity.Comp.IgnoreResistances, origin: entity); + totalDamage = _damageableSystem.ChangeDamage(args.User, totalDamage, entity.Comp.IgnoreResistances, origin: entity); - if (totalDamage != null && totalDamage.AnyPositive()) + if (totalDamage.AnyPositive()) { _adminLogger.Add(LogType.Damaged, $"{ToPrettyString(args.User):user} injured themselves by attacking {ToPrettyString(entity):target} and received {totalDamage.GetTotal():damage} damage"); _audioSystem.PlayPredicted(entity.Comp.InteractSound, entity, args.User); diff --git a/Content.Shared/Damage/Systems/DamageOnInteractSystem.cs b/Content.Shared/Damage/Systems/DamageOnInteractSystem.cs index bd3b6979f7..401c94f33e 100644 --- a/Content.Shared/Damage/Systems/DamageOnInteractSystem.cs +++ b/Content.Shared/Damage/Systems/DamageOnInteractSystem.cs @@ -65,7 +65,7 @@ public sealed class DamageOnInteractSystem : EntitySystem // or checking the entity for the comp itself if the inventory didn't work if (protectiveEntity.Comp == null && TryComp(args.User, out var protectiveComp)) protectiveEntity = (args.User, protectiveComp); - + // if protectiveComp isn't null after all that, it means the user has protection, // so let's calculate how much they resist @@ -75,9 +75,9 @@ public sealed class DamageOnInteractSystem : EntitySystem } } - totalDamage = _damageableSystem.TryChangeDamage(args.User, totalDamage, origin: args.Target); + totalDamage = _damageableSystem.ChangeDamage(args.User, totalDamage, origin: args.Target); - if (totalDamage != null && totalDamage.AnyPositive()) + if (totalDamage.AnyPositive()) { // Record this interaction and determine when a user is allowed to interact with this entity again entity.Comp.LastInteraction = _gameTiming.CurTime; diff --git a/Content.Shared/Damage/Systems/DamageableSystem.API.cs b/Content.Shared/Damage/Systems/DamageableSystem.API.cs new file mode 100644 index 0000000000..c2a1374901 --- /dev/null +++ b/Content.Shared/Damage/Systems/DamageableSystem.API.cs @@ -0,0 +1,235 @@ +using Content.Shared.Damage.Components; +using Content.Shared.Damage.Prototypes; +using Content.Shared.FixedPoint; +using Robust.Shared.Prototypes; + +namespace Content.Shared.Damage.Systems; + +public sealed partial class DamageableSystem +{ + /// + /// Directly sets the damage specifier of a damageable component. + /// + /// + /// Useful for some unfriendly folk. Also ensures that cached values are updated and that a damage changed + /// event is raised. + /// + public void SetDamage(Entity ent, DamageSpecifier damage) + { + if (!_damageableQuery.Resolve(ent, ref ent.Comp, false)) + return; + + ent.Comp.Damage = damage; + + OnEntityDamageChanged((ent, ent.Comp)); + } + + /// + /// Applies damage specified via a . + /// + /// + /// is effectively just a dictionary of damage types and damage values. This + /// function just applies the container's resistances (unless otherwise specified) and then changes the + /// stored damage data. Division of group damage into types is managed by . + /// + /// + /// If the attempt was successful or not. + /// + public bool TryChangeDamage( + Entity ent, + DamageSpecifier damage, + bool ignoreResistances = false, + bool interruptsDoAfters = true, + EntityUid? origin = null, + bool ignoreGlobalModifiers = false + ) + { + //! Empty just checks if the DamageSpecifier is _literally_ empty, as in, is internal dictionary of damage types is empty. + // If you deal 0.0 of some damage type, Empty will be false! + return !TryChangeDamage(ent, damage, out _, ignoreResistances, interruptsDoAfters, origin, ignoreGlobalModifiers); + } + + /// + /// Applies damage specified via a . + /// + /// + /// is effectively just a dictionary of damage types and damage values. This + /// function just applies the container's resistances (unless otherwise specified) and then changes the + /// stored damage data. Division of group damage into types is managed by . + /// + /// + /// If the attempt was successful or not. + /// + public bool TryChangeDamage( + Entity ent, + DamageSpecifier damage, + out DamageSpecifier newDamage, + bool ignoreResistances = false, + bool interruptsDoAfters = true, + EntityUid? origin = null, + bool ignoreGlobalModifiers = false + ) + { + //! Empty just checks if the DamageSpecifier is _literally_ empty, as in, is internal dictionary of damage types is empty. + // If you deal 0.0 of some damage type, Empty will be false! + newDamage = ChangeDamage(ent, damage, ignoreResistances, interruptsDoAfters, origin, ignoreGlobalModifiers); + return !damage.Empty; + } + + /// + /// Applies damage specified via a . + /// + /// + /// is effectively just a dictionary of damage types and damage values. This + /// function just applies the container's resistances (unless otherwise specified) and then changes the + /// stored damage data. Division of group damage into types is managed by . + /// + /// + /// The actual amount of damage taken, as a DamageSpecifier. + /// + public DamageSpecifier ChangeDamage( + Entity ent, + DamageSpecifier damage, + bool ignoreResistances = false, + bool interruptsDoAfters = true, + EntityUid? origin = null, + bool ignoreGlobalModifiers = false + ) + { + var damageDone = new DamageSpecifier(); + + if (!_damageableQuery.Resolve(ent, ref ent.Comp, false)) + return damageDone; + + if (damage.Empty) + return damageDone; + + var before = new BeforeDamageChangedEvent(damage, origin); + RaiseLocalEvent(ent, ref before); + + if (before.Cancelled) + return damageDone; + + // Apply resistances + if (!ignoreResistances) + { + if ( + ent.Comp.DamageModifierSetId != null && + _prototypeManager.Resolve(ent.Comp.DamageModifierSetId, out var modifierSet) + ) + damage = DamageSpecifier.ApplyModifierSet(damage, modifierSet); + + // TODO DAMAGE + // byref struct event. + var ev = new DamageModifyEvent(damage, origin); + RaiseLocalEvent(ent, ev); + damage = ev.Damage; + + if (damage.Empty) + return damageDone; + } + + if (!ignoreGlobalModifiers) + damage = ApplyUniversalAllModifiers(damage); + + + damageDone.DamageDict.EnsureCapacity(damage.DamageDict.Count); + + var dict = ent.Comp.Damage.DamageDict; + foreach (var (type, value) in damage.DamageDict) + { + // CollectionsMarshal my beloved. + if (!dict.TryGetValue(type, out var oldValue)) + continue; + + var newValue = FixedPoint2.Max(FixedPoint2.Zero, oldValue + value); + if (newValue == oldValue) + continue; + + dict[type] = newValue; + damageDone.DamageDict[type] = newValue - oldValue; + } + + if (!damageDone.Empty) + OnEntityDamageChanged((ent, ent.Comp), damageDone, interruptsDoAfters, origin); + + return damageDone; + } + + /// + /// Applies the two universal "All" modifiers, if set. + /// Individual damage source modifiers are set in their respective code. + /// + /// The damage to be changed. + public DamageSpecifier ApplyUniversalAllModifiers(DamageSpecifier damage) + { + // Checks for changes first since they're unlikely in normal play. + if ( + MathHelper.CloseToPercent(UniversalAllDamageModifier, 1f) && + MathHelper.CloseToPercent(UniversalAllHealModifier, 1f) + ) + return damage; + + foreach (var (key, value) in damage.DamageDict) + { + if (value == 0) + continue; + + if (value > 0) + { + damage.DamageDict[key] *= UniversalAllDamageModifier; + + continue; + } + + if (value < 0) + damage.DamageDict[key] *= UniversalAllHealModifier; + } + + return damage; + } + + public void ClearAllDamage(Entity ent) + { + SetAllDamage(ent, FixedPoint2.Zero); + } + + /// + /// Sets all damage types supported by a to the specified value. + /// + /// + /// Does nothing If the given damage value is negative. + /// + public void SetAllDamage(Entity ent, FixedPoint2 newValue) + { + if (!_damageableQuery.Resolve(ent, ref ent.Comp, false)) + return; + + if (newValue < 0) + return; + + foreach (var type in ent.Comp.Damage.DamageDict.Keys) + { + ent.Comp.Damage.DamageDict[type] = newValue; + } + + // Setting damage does not count as 'dealing' damage, even if it is set to a larger value, so we pass an + // empty damage delta. + OnEntityDamageChanged((ent, ent.Comp), new DamageSpecifier()); + } + + /// + /// Set's the damage modifier set prototype for this entity. + /// + /// The entity we're setting the modifier set of. + /// The prototype we're setting. + public void SetDamageModifierSetId(Entity ent, ProtoId? damageModifierSetId) + { + if (!_damageableQuery.Resolve(ent, ref ent.Comp, false)) + return; + + ent.Comp.DamageModifierSetId = damageModifierSetId; + + Dirty(ent); + } +} diff --git a/Content.Shared/Damage/Systems/DamageableSystem.BenchmarkHelpers.cs b/Content.Shared/Damage/Systems/DamageableSystem.BenchmarkHelpers.cs index d248d717b8..5ca7fe1992 100644 --- a/Content.Shared/Damage/Systems/DamageableSystem.BenchmarkHelpers.cs +++ b/Content.Shared/Damage/Systems/DamageableSystem.BenchmarkHelpers.cs @@ -1,4 +1,6 @@ -namespace Content.Shared.Damage; +using Content.Shared.Damage.Components; + +namespace Content.Shared.Damage.Systems; public sealed partial class DamageableSystem { @@ -9,7 +11,7 @@ public sealed partial class DamageableSystem { foreach (var (uid, damageable) in damageables) { - TryChangeDamage(uid, damage, damageable: damageable); + TryChangeDamage((uid, damageable), damage); } } } diff --git a/Content.Shared/Damage/Systems/DamageableSystem.Events.cs b/Content.Shared/Damage/Systems/DamageableSystem.Events.cs new file mode 100644 index 0000000000..3e985ba204 --- /dev/null +++ b/Content.Shared/Damage/Systems/DamageableSystem.Events.cs @@ -0,0 +1,290 @@ +using Content.Shared.CCVar; +using Content.Shared.Damage.Components; +using Content.Shared.Damage.Prototypes; +using Content.Shared.FixedPoint; +using Content.Shared.Inventory; +using Content.Shared.Radiation.Events; +using Content.Shared.Rejuvenate; +using Robust.Shared.GameStates; + +namespace Content.Shared.Damage.Systems; + +public sealed partial class DamageableSystem +{ + public override void Initialize() + { + SubscribeLocalEvent(DamageableInit); + SubscribeLocalEvent(DamageableHandleState); + SubscribeLocalEvent(DamageableGetState); + SubscribeLocalEvent(OnIrradiated); + SubscribeLocalEvent(OnRejuvenate); + + _appearanceQuery = GetEntityQuery(); + _damageableQuery = GetEntityQuery(); + + // Damage modifier CVars are updated and stored here to be queried in other systems. + // Note that certain modifiers requires reloading the guidebook. + Subs.CVar( + _config, + CCVars.PlaytestAllDamageModifier, + value => + { + UniversalAllDamageModifier = value; + _chemistryGuideData.ReloadAllReagentPrototypes(); + _explosion.ReloadMap(); + }, + true + ); + Subs.CVar( + _config, + CCVars.PlaytestAllHealModifier, + value => + { + UniversalAllHealModifier = value; + _chemistryGuideData.ReloadAllReagentPrototypes(); + }, + true + ); + Subs.CVar( + _config, + CCVars.PlaytestProjectileDamageModifier, + value => UniversalProjectileDamageModifier = value, + true + ); + Subs.CVar( + _config, + CCVars.PlaytestMeleeDamageModifier, + value => UniversalMeleeDamageModifier = value, + true + ); + Subs.CVar( + _config, + CCVars.PlaytestProjectileDamageModifier, + value => UniversalProjectileDamageModifier = value, + true + ); + Subs.CVar( + _config, + CCVars.PlaytestHitscanDamageModifier, + value => UniversalHitscanDamageModifier = value, + true + ); + Subs.CVar( + _config, + CCVars.PlaytestReagentDamageModifier, + value => + { + UniversalReagentDamageModifier = value; + _chemistryGuideData.ReloadAllReagentPrototypes(); + }, + true + ); + Subs.CVar( + _config, + CCVars.PlaytestReagentHealModifier, + value => + { + UniversalReagentHealModifier = value; + _chemistryGuideData.ReloadAllReagentPrototypes(); + }, + true + ); + Subs.CVar( + _config, + CCVars.PlaytestExplosionDamageModifier, + value => + { + UniversalExplosionDamageModifier = value; + _explosion.ReloadMap(); + }, + true + ); + Subs.CVar( + _config, + CCVars.PlaytestThrownDamageModifier, + value => UniversalThrownDamageModifier = value, + true + ); + Subs.CVar( + _config, + CCVars.PlaytestTopicalsHealModifier, + value => UniversalTopicalsHealModifier = value, + true + ); + Subs.CVar( + _config, + CCVars.PlaytestMobDamageModifier, + value => UniversalMobDamageModifier = value, + true + ); + } + + /// + /// Initialize a damageable component + /// + private void DamageableInit(Entity ent, ref ComponentInit _) + { + if ( + ent.Comp.DamageContainerID is null || + !_prototypeManager.Resolve(ent.Comp.DamageContainerID, out var damageContainerPrototype) + ) + { + // No DamageContainerPrototype was given. So we will allow the container to support all damage types + foreach (var type in _prototypeManager.EnumeratePrototypes()) + { + ent.Comp.Damage.DamageDict.TryAdd(type.ID, FixedPoint2.Zero); + } + } + else + { + // Initialize damage dictionary, using the types and groups from the damage + // container prototype + foreach (var type in damageContainerPrototype.SupportedTypes) + { + ent.Comp.Damage.DamageDict.TryAdd(type, FixedPoint2.Zero); + } + + foreach (var groupId in damageContainerPrototype.SupportedGroups) + { + var group = _prototypeManager.Index(groupId); + foreach (var type in group.DamageTypes) + { + ent.Comp.Damage.DamageDict.TryAdd(type, FixedPoint2.Zero); + } + } + } + + ent.Comp.Damage.GetDamagePerGroup(_prototypeManager, ent.Comp.DamagePerGroup); + ent.Comp.TotalDamage = ent.Comp.Damage.GetTotal(); + } + + private void OnIrradiated(Entity ent, ref OnIrradiatedEvent args) + { + var damageValue = FixedPoint2.New(args.TotalRads); + + // Radiation should really just be a damage group instead of a list of types. + DamageSpecifier damage = new(); + foreach (var typeId in ent.Comp.RadiationDamageTypeIDs) + { + damage.DamageDict.Add(typeId, damageValue); + } + + ChangeDamage(ent.Owner, damage, interruptsDoAfters: false, origin: args.Origin); + } + + private void OnRejuvenate(Entity ent, ref RejuvenateEvent args) + { + // Do this so that the state changes when we set the damage + _mobThreshold.SetAllowRevives(ent, true); + ClearAllDamage(ent.AsNullable()); + _mobThreshold.SetAllowRevives(ent, false); + } + + private void DamageableHandleState(Entity ent, ref ComponentHandleState args) + { + if (args.Current is not DamageableComponentState state) + return; + + ent.Comp.DamageContainerID = state.DamageContainerId; + ent.Comp.DamageModifierSetId = state.ModifierSetId; + ent.Comp.HealthBarThreshold = state.HealthBarThreshold; + + // Has the damage actually changed? + DamageSpecifier newDamage = new() { DamageDict = new Dictionary(state.DamageDict) }; + var delta = newDamage - ent.Comp.Damage; + delta.TrimZeros(); + + if (delta.Empty) + return; + + ent.Comp.Damage = newDamage; + + OnEntityDamageChanged(ent, delta); + } +} + +/// +/// Raised before damage is done, so stuff can cancel it if necessary. +/// +[ByRefEvent] +public record struct BeforeDamageChangedEvent(DamageSpecifier Damage, EntityUid? Origin = null, bool Cancelled = false); + +/// +/// Raised on an entity when damage is about to be dealt, +/// in case anything else needs to modify it other than the base +/// damageable component. +/// +/// For example, armor. +/// +public sealed class DamageModifyEvent(DamageSpecifier damage, EntityUid? origin = null) + : EntityEventArgs, IInventoryRelayEvent +{ + // Whenever locational damage is a thing, this should just check only that bit of armour. + public SlotFlags TargetSlots => ~SlotFlags.POCKET; + + public readonly DamageSpecifier OriginalDamage = damage; + public DamageSpecifier Damage = damage; +} + +public sealed class DamageChangedEvent : EntityEventArgs +{ + /// + /// This is the component whose damage was changed. + /// + /// + /// Given that nearly every component that cares about a change in the damage, needs to know the + /// current damage values, directly passing this information prevents a lot of duplicate + /// Owner.TryGetComponent() calls. + /// + public readonly DamageableComponent Damageable; + + /// + /// The amount by which the damage has changed. If the damage was set directly to some number, this will be + /// null. + /// + public readonly DamageSpecifier? DamageDelta; + + /// + /// Was any of the damage change dealing damage, or was it all healing? + /// + public readonly bool DamageIncreased; + + /// + /// Does this event interrupt DoAfters? + /// Note: As provided in the constructor, this *does not* account for DamageIncreased. + /// As written into the event, this *does* account for DamageIncreased. + /// + public readonly bool InterruptsDoAfters; + + /// + /// Contains the entity which caused the change in damage, if any was responsible. + /// + public readonly EntityUid? Origin; + + public DamageChangedEvent( + DamageableComponent damageable, + DamageSpecifier? damageDelta, + bool interruptsDoAfters, + EntityUid? origin + ) + { + Damageable = damageable; + DamageDelta = damageDelta; + Origin = origin; + + if (DamageDelta is null) + return; + + foreach (var damageChange in DamageDelta.DamageDict.Values) + { + if (damageChange <= 0) + continue; + + DamageIncreased = true; + + break; + } + + InterruptsDoAfters = interruptsDoAfters && DamageIncreased; + } +} diff --git a/Content.Shared/Damage/Systems/DamageableSystem.cs b/Content.Shared/Damage/Systems/DamageableSystem.cs index f1e259001c..2b4c5ad360 100644 --- a/Content.Shared/Damage/Systems/DamageableSystem.cs +++ b/Content.Shared/Damage/Systems/DamageableSystem.cs @@ -1,469 +1,97 @@ using System.Linq; -using Content.Shared.CCVar; using Content.Shared.Chemistry; -using Content.Shared.Damage.Prototypes; +using Content.Shared.Damage.Components; using Content.Shared.Explosion.EntitySystems; -using Content.Shared.FixedPoint; -using Content.Shared.Inventory; -using Content.Shared.Mobs.Components; using Content.Shared.Mobs.Systems; -using Content.Shared.Radiation.Events; -using Content.Shared.Rejuvenate; using Robust.Shared.Configuration; using Robust.Shared.GameStates; using Robust.Shared.Network; using Robust.Shared.Prototypes; using Robust.Shared.Utility; -namespace Content.Shared.Damage +namespace Content.Shared.Damage.Systems; + +public sealed partial class DamageableSystem : EntitySystem { - public sealed partial class DamageableSystem : EntitySystem - { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly INetManager _netMan = default!; - [Dependency] private readonly MobThresholdSystem _mobThreshold = default!; - [Dependency] private readonly IConfigurationManager _config = default!; - [Dependency] private readonly SharedChemistryGuideDataSystem _chemistryGuideData = default!; - [Dependency] private readonly SharedExplosionSystem _explosion = default!; + [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private readonly INetManager _netMan = default!; + [Dependency] private readonly MobThresholdSystem _mobThreshold = default!; + [Dependency] private readonly IConfigurationManager _config = default!; + [Dependency] private readonly SharedChemistryGuideDataSystem _chemistryGuideData = default!; + [Dependency] private readonly SharedExplosionSystem _explosion = default!; - private EntityQuery _appearanceQuery; - private EntityQuery _damageableQuery; + private EntityQuery _appearanceQuery; + private EntityQuery _damageableQuery; - public float UniversalAllDamageModifier { get; private set; } = 1f; - public float UniversalAllHealModifier { get; private set; } = 1f; - public float UniversalMeleeDamageModifier { get; private set; } = 1f; - public float UniversalProjectileDamageModifier { get; private set; } = 1f; - public float UniversalHitscanDamageModifier { get; private set; } = 1f; - public float UniversalReagentDamageModifier { get; private set; } = 1f; - public float UniversalReagentHealModifier { get; private set; } = 1f; - public float UniversalExplosionDamageModifier { get; private set; } = 1f; - public float UniversalThrownDamageModifier { get; private set; } = 1f; - public float UniversalTopicalsHealModifier { get; private set; } = 1f; - public float UniversalMobDamageModifier { get; private set; } = 1f; - - public override void Initialize() - { - SubscribeLocalEvent(DamageableInit); - SubscribeLocalEvent(DamageableHandleState); - SubscribeLocalEvent(DamageableGetState); - SubscribeLocalEvent(OnIrradiated); - SubscribeLocalEvent(OnRejuvenate); - - _appearanceQuery = GetEntityQuery(); - _damageableQuery = GetEntityQuery(); - - // Damage modifier CVars are updated and stored here to be queried in other systems. - // Note that certain modifiers requires reloading the guidebook. - Subs.CVar(_config, CCVars.PlaytestAllDamageModifier, value => - { - UniversalAllDamageModifier = value; - _chemistryGuideData.ReloadAllReagentPrototypes(); - _explosion.ReloadMap(); - }, true); - Subs.CVar(_config, CCVars.PlaytestAllHealModifier, value => - { - UniversalAllHealModifier = value; - _chemistryGuideData.ReloadAllReagentPrototypes(); - }, true); - Subs.CVar(_config, CCVars.PlaytestProjectileDamageModifier, value => UniversalProjectileDamageModifier = value, true); - Subs.CVar(_config, CCVars.PlaytestMeleeDamageModifier, value => UniversalMeleeDamageModifier = value, true); - Subs.CVar(_config, CCVars.PlaytestProjectileDamageModifier, value => UniversalProjectileDamageModifier = value, true); - Subs.CVar(_config, CCVars.PlaytestHitscanDamageModifier, value => UniversalHitscanDamageModifier = value, true); - Subs.CVar(_config, CCVars.PlaytestReagentDamageModifier, value => - { - UniversalReagentDamageModifier = value; - _chemistryGuideData.ReloadAllReagentPrototypes(); - }, true); - Subs.CVar(_config, CCVars.PlaytestReagentHealModifier, value => - { - UniversalReagentHealModifier = value; - _chemistryGuideData.ReloadAllReagentPrototypes(); - }, true); - Subs.CVar(_config, CCVars.PlaytestExplosionDamageModifier, value => - { - UniversalExplosionDamageModifier = value; - _explosion.ReloadMap(); - }, true); - Subs.CVar(_config, CCVars.PlaytestThrownDamageModifier, value => UniversalThrownDamageModifier = value, true); - Subs.CVar(_config, CCVars.PlaytestTopicalsHealModifier, value => UniversalTopicalsHealModifier = value, true); - Subs.CVar(_config, CCVars.PlaytestMobDamageModifier, value => UniversalMobDamageModifier = value, true); - } - - /// - /// Initialize a damageable component - /// - private void DamageableInit(EntityUid uid, DamageableComponent component, ComponentInit _) - { - if (component.DamageContainerID != null && - _prototypeManager.Resolve(component.DamageContainerID, - out var damageContainerPrototype)) - { - // Initialize damage dictionary, using the types and groups from the damage - // container prototype - foreach (var type in damageContainerPrototype.SupportedTypes) - { - component.Damage.DamageDict.TryAdd(type, FixedPoint2.Zero); - } - - foreach (var groupId in damageContainerPrototype.SupportedGroups) - { - var group = _prototypeManager.Index(groupId); - foreach (var type in group.DamageTypes) - { - component.Damage.DamageDict.TryAdd(type, FixedPoint2.Zero); - } - } - } - else - { - // No DamageContainerPrototype was given. So we will allow the container to support all damage types - foreach (var type in _prototypeManager.EnumeratePrototypes()) - { - component.Damage.DamageDict.TryAdd(type.ID, FixedPoint2.Zero); - } - } - - component.Damage.GetDamagePerGroup(_prototypeManager, component.DamagePerGroup); - component.TotalDamage = component.Damage.GetTotal(); - } - - /// - /// Directly sets the damage specifier of a damageable component. - /// - /// - /// Useful for some unfriendly folk. Also ensures that cached values are updated and that a damage changed - /// event is raised. - /// - public void SetDamage(EntityUid uid, DamageableComponent damageable, DamageSpecifier damage) - { - damageable.Damage = damage; - DamageChanged(uid, damageable); - } - - /// - /// If the damage in a DamageableComponent was changed, this function should be called. - /// - /// - /// This updates cached damage information, flags the component as dirty, and raises a damage changed event. - /// The damage changed event is used by other systems, such as damage thresholds. - /// - public void DamageChanged(EntityUid uid, DamageableComponent component, DamageSpecifier? damageDelta = null, - bool interruptsDoAfters = true, EntityUid? origin = null) - { - component.Damage.GetDamagePerGroup(_prototypeManager, component.DamagePerGroup); - component.TotalDamage = component.Damage.GetTotal(); - Dirty(uid, component); - - if (_appearanceQuery.TryGetComponent(uid, out var appearance) && damageDelta != null) - { - var data = new DamageVisualizerGroupData(component.DamagePerGroup.Keys.ToList()); - _appearance.SetData(uid, DamageVisualizerKeys.DamageUpdateGroups, data, appearance); - } - - // TODO DAMAGE - // byref struct event. - RaiseLocalEvent(uid, new DamageChangedEvent(component, damageDelta, interruptsDoAfters, origin)); - } - - /// - /// Applies damage specified via a . - /// - /// - /// is effectively just a dictionary of damage types and damage values. This - /// function just applies the container's resistances (unless otherwise specified) and then changes the - /// stored damage data. Division of group damage into types is managed by . - /// - /// - /// Returns a with information about the actual damage changes. This will be - /// null if the user had no applicable components that can take damage. - /// - /// If true, this will ignore the entity's damage modifier ( and skip raising a . - /// Whether the damage should cancel any damage sensitive do-afters - /// The entity that is causing this damage - /// If true, this will skip over applying the universal damage modifiers (see ). - /// - public DamageSpecifier? TryChangeDamage( - EntityUid? uid, - DamageSpecifier damage, - bool ignoreResistances = false, - bool interruptsDoAfters = true, - DamageableComponent? damageable = null, - EntityUid? origin = null, - bool ignoreGlobalModifiers = false) - { - if (!uid.HasValue || !_damageableQuery.Resolve(uid.Value, ref damageable, false)) - { - // TODO BODY SYSTEM pass damage onto body system - // BOBBY WHEN? - return null; - } - - if (damage.Empty) - { - return damage; - } - - var before = new BeforeDamageChangedEvent(damage, origin); - RaiseLocalEvent(uid.Value, ref before); - - if (before.Cancelled) - return null; - - // Apply resistances - if (!ignoreResistances) - { - if (damageable.DamageModifierSetId != null && - _prototypeManager.Resolve(damageable.DamageModifierSetId, out var modifierSet)) - { - damage = DamageSpecifier.ApplyModifierSet(damage, modifierSet); - } - - // TODO DAMAGE - // byref struct event. - var ev = new DamageModifyEvent(damage, origin); - RaiseLocalEvent(uid.Value, ev); - damage = ev.Damage; - - if (damage.Empty) - { - return damage; - } - } - - if (!ignoreGlobalModifiers) - damage = ApplyUniversalAllModifiers(damage); - - var delta = new DamageSpecifier(); - delta.DamageDict.EnsureCapacity(damage.DamageDict.Count); - - var dict = damageable.Damage.DamageDict; - foreach (var (type, value) in damage.DamageDict) - { - // CollectionsMarshal my beloved. - if (!dict.TryGetValue(type, out var oldValue)) - continue; - - var newValue = FixedPoint2.Max(FixedPoint2.Zero, oldValue + value); - if (newValue == oldValue) - continue; - - dict[type] = newValue; - delta.DamageDict[type] = newValue - oldValue; - } - - if (delta.DamageDict.Count > 0) - DamageChanged(uid.Value, damageable, delta, interruptsDoAfters, origin); - - return delta; - } - - /// - /// Applies the two univeral "All" modifiers, if set. - /// Individual damage source modifiers are set in their respective code. - /// - /// The damage to be changed. - public DamageSpecifier ApplyUniversalAllModifiers(DamageSpecifier damage) - { - // Checks for changes first since they're unlikely in normal play. - if (UniversalAllDamageModifier == 1f && UniversalAllHealModifier == 1f) - return damage; - - foreach (var (key, value) in damage.DamageDict) - { - if (value == 0) - continue; - - if (value > 0) - { - damage.DamageDict[key] *= UniversalAllDamageModifier; - continue; - } - - if (value < 0) - { - damage.DamageDict[key] *= UniversalAllHealModifier; - } - } - - return damage; - } - - /// - /// Sets all damage types supported by a to the specified value. - /// - /// - /// Does nothing If the given damage value is negative. - /// - public void SetAllDamage(EntityUid uid, DamageableComponent component, FixedPoint2 newValue) - { - if (newValue < 0) - { - // invalid value - return; - } - - foreach (var type in component.Damage.DamageDict.Keys) - { - component.Damage.DamageDict[type] = newValue; - } - - // Setting damage does not count as 'dealing' damage, even if it is set to a larger value, so we pass an - // empty damage delta. - DamageChanged(uid, component, new DamageSpecifier()); - } - - public void SetDamageModifierSetId(EntityUid uid, string? damageModifierSetId, DamageableComponent? comp = null) - { - if (!_damageableQuery.Resolve(uid, ref comp)) - return; - - comp.DamageModifierSetId = damageModifierSetId; - Dirty(uid, comp); - } - - private void DamageableGetState(EntityUid uid, DamageableComponent component, ref ComponentGetState args) - { - if (_netMan.IsServer) - { - args.State = new DamageableComponentState(component.Damage.DamageDict, component.DamageContainerID, component.DamageModifierSetId, component.HealthBarThreshold); - } - else - { - // avoid mispredicting damage on newly spawned entities. - args.State = new DamageableComponentState(component.Damage.DamageDict.ShallowClone(), component.DamageContainerID, component.DamageModifierSetId, component.HealthBarThreshold); - } - } - - private void OnIrradiated(EntityUid uid, DamageableComponent component, OnIrradiatedEvent args) - { - var damageValue = FixedPoint2.New(args.TotalRads); - - // Radiation should really just be a damage group instead of a list of types. - DamageSpecifier damage = new(); - foreach (var typeId in component.RadiationDamageTypeIDs) - { - damage.DamageDict.Add(typeId, damageValue); - } - - TryChangeDamage(uid, damage, interruptsDoAfters: false, origin: args.Origin); - } - - private void OnRejuvenate(EntityUid uid, DamageableComponent component, RejuvenateEvent args) - { - TryComp(uid, out var thresholds); - _mobThreshold.SetAllowRevives(uid, true, thresholds); // do this so that the state changes when we set the damage - SetAllDamage(uid, component, 0); - _mobThreshold.SetAllowRevives(uid, false, thresholds); - } - - private void DamageableHandleState(EntityUid uid, DamageableComponent component, ref ComponentHandleState args) - { - if (args.Current is not DamageableComponentState state) - { - return; - } - - component.DamageContainerID = state.DamageContainerId; - component.DamageModifierSetId = state.ModifierSetId; - component.HealthBarThreshold = state.HealthBarThreshold; - - // Has the damage actually changed? - DamageSpecifier newDamage = new() { DamageDict = new(state.DamageDict) }; - var delta = newDamage - component.Damage; - delta.TrimZeros(); - - if (!delta.Empty) - { - component.Damage = newDamage; - DamageChanged(uid, component, delta); - } - } - } + public float UniversalAllDamageModifier { get; private set; } = 1f; + public float UniversalAllHealModifier { get; private set; } = 1f; + public float UniversalMeleeDamageModifier { get; private set; } = 1f; + public float UniversalProjectileDamageModifier { get; private set; } = 1f; + public float UniversalHitscanDamageModifier { get; private set; } = 1f; + public float UniversalReagentDamageModifier { get; private set; } = 1f; + public float UniversalReagentHealModifier { get; private set; } = 1f; + public float UniversalExplosionDamageModifier { get; private set; } = 1f; + public float UniversalThrownDamageModifier { get; private set; } = 1f; + public float UniversalTopicalsHealModifier { get; private set; } = 1f; + public float UniversalMobDamageModifier { get; private set; } = 1f; /// - /// Raised before damage is done, so stuff can cancel it if necessary. + /// If the damage in a DamageableComponent was changed this function should be called. /// - [ByRefEvent] - public record struct BeforeDamageChangedEvent(DamageSpecifier Damage, EntityUid? Origin = null, bool Cancelled = false); - - /// - /// Raised on an entity when damage is about to be dealt, - /// in case anything else needs to modify it other than the base - /// damageable component. - /// - /// For example, armor. - /// - public sealed class DamageModifyEvent : EntityEventArgs, IInventoryRelayEvent + /// + /// This updates cached damage information, flags the component as dirty, and raises a damage changed event. + /// The damage changed event is used by other systems, such as damage thresholds. + /// + private void OnEntityDamageChanged( + Entity ent, + DamageSpecifier? damageDelta = null, + bool interruptsDoAfters = true, + EntityUid? origin = null + ) { - // Whenever locational damage is a thing, this should just check only that bit of armour. - public SlotFlags TargetSlots { get; } = ~SlotFlags.POCKET; + ent.Comp.Damage.GetDamagePerGroup(_prototypeManager, ent.Comp.DamagePerGroup); + ent.Comp.TotalDamage = ent.Comp.Damage.GetTotal(); + Dirty(ent); - public readonly DamageSpecifier OriginalDamage; - public DamageSpecifier Damage; - public EntityUid? Origin; - - public DamageModifyEvent(DamageSpecifier damage, EntityUid? origin = null) + if (damageDelta != null && _appearanceQuery.TryGetComponent(ent, out var appearance)) { - OriginalDamage = damage; - Damage = damage; - Origin = origin; + _appearance.SetData( + ent, + DamageVisualizerKeys.DamageUpdateGroups, + new DamageVisualizerGroupData(ent.Comp.DamagePerGroup.Keys.ToList()), + appearance + ); } + + // TODO DAMAGE + // byref struct event. + RaiseLocalEvent(ent, new DamageChangedEvent(ent.Comp, damageDelta, interruptsDoAfters, origin)); } - public sealed class DamageChangedEvent : EntityEventArgs + private void DamageableGetState(Entity ent, ref ComponentGetState args) { - /// - /// This is the component whose damage was changed. - /// - /// - /// Given that nearly every component that cares about a change in the damage, needs to know the - /// current damage values, directly passing this information prevents a lot of duplicate - /// Owner.TryGetComponent() calls. - /// - public readonly DamageableComponent Damageable; - - /// - /// The amount by which the damage has changed. If the damage was set directly to some number, this will be - /// null. - /// - public readonly DamageSpecifier? DamageDelta; - - /// - /// Was any of the damage change dealing damage, or was it all healing? - /// - public readonly bool DamageIncreased; - - /// - /// Does this event interrupt DoAfters? - /// Note: As provided in the constructor, this *does not* account for DamageIncreased. - /// As written into the event, this *does* account for DamageIncreased. - /// - public readonly bool InterruptsDoAfters; - - /// - /// Contains the entity which caused the change in damage, if any was responsible. - /// - public readonly EntityUid? Origin; - - public DamageChangedEvent(DamageableComponent damageable, DamageSpecifier? damageDelta, bool interruptsDoAfters, EntityUid? origin) + if (_netMan.IsServer) { - Damageable = damageable; - DamageDelta = damageDelta; - Origin = origin; + args.State = new DamageableComponentState( + ent.Comp.Damage.DamageDict, + ent.Comp.DamageContainerID, + ent.Comp.DamageModifierSetId, + ent.Comp.HealthBarThreshold + ); + // TODO BODY SYSTEM pass damage onto body system + // BOBBY WHEN? 😭 + // BOBBY SOON 🫡 - if (DamageDelta == null) - return; - - foreach (var damageChange in DamageDelta.DamageDict.Values) - { - if (damageChange > 0) - { - DamageIncreased = true; - break; - } - } - InterruptsDoAfters = interruptsDoAfters && DamageIncreased; + return; } + + // avoid mispredicting damage on newly spawned entities. + args.State = new DamageableComponentState( + ent.Comp.Damage.DamageDict.ShallowClone(), + ent.Comp.DamageContainerID, + ent.Comp.DamageModifierSetId, + ent.Comp.HealthBarThreshold + ); } } diff --git a/Content.Shared/Damage/Systems/PassiveDamageSystem.cs b/Content.Shared/Damage/Systems/PassiveDamageSystem.cs index e750863e24..fddf7dc975 100644 --- a/Content.Shared/Damage/Systems/PassiveDamageSystem.cs +++ b/Content.Shared/Damage/Systems/PassiveDamageSystem.cs @@ -1,10 +1,8 @@ using Content.Shared.Damage.Components; -using Content.Shared.Mobs.Systems; using Content.Shared.Mobs.Components; -using Content.Shared.FixedPoint; using Robust.Shared.Timing; -namespace Content.Shared.Damage; +namespace Content.Shared.Damage.Systems; public sealed class PassiveDamageSystem : EntitySystem { @@ -47,7 +45,7 @@ public sealed class PassiveDamageSystem : EntitySystem foreach (var allowedState in comp.AllowedStates) { if(allowedState == mobState.CurrentState) - _damageable.TryChangeDamage(uid, comp.Damage, true, false, damage); + _damageable.ChangeDamage((uid, damage), comp.Damage, true, false); } } } diff --git a/Content.Shared/Damage/Systems/RequireProjectileTargetSystem.cs b/Content.Shared/Damage/Systems/RequireProjectileTargetSystem.cs index 66b1de65e8..63b690a67c 100644 --- a/Content.Shared/Damage/Systems/RequireProjectileTargetSystem.cs +++ b/Content.Shared/Damage/Systems/RequireProjectileTargetSystem.cs @@ -1,10 +1,11 @@ +using Content.Shared.Damage.Components; using Content.Shared.Projectiles; -using Content.Shared.Weapons.Ranged.Components; using Content.Shared.Standing; -using Robust.Shared.Physics.Events; +using Content.Shared.Weapons.Ranged.Components; using Robust.Shared.Containers; +using Robust.Shared.Physics.Events; -namespace Content.Shared.Damage.Components; +namespace Content.Shared.Damage.Systems; public sealed class RequireProjectileTargetSystem : EntitySystem { diff --git a/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs b/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs index 4bf762c479..2a020732c2 100644 --- a/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs +++ b/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs @@ -85,9 +85,9 @@ public abstract class SharedGodmodeSystem : EntitySystem if (!Resolve(uid, ref godmode, false)) return; - if (TryComp(uid, out var damageable) && godmode.OldDamage != null) + if (godmode.OldDamage != null) { - _damageable.SetDamage(uid, damageable, godmode.OldDamage); + _damageable.SetDamage(uid, godmode.OldDamage); } RemComp(uid); diff --git a/Content.Shared/Damage/Systems/SlowOnDamageSystem.cs b/Content.Shared/Damage/Systems/SlowOnDamageSystem.cs index e339727200..fef7b6ae06 100644 --- a/Content.Shared/Damage/Systems/SlowOnDamageSystem.cs +++ b/Content.Shared/Damage/Systems/SlowOnDamageSystem.cs @@ -5,109 +5,108 @@ using Content.Shared.FixedPoint; using Content.Shared.Inventory; using Content.Shared.Movement.Systems; -namespace Content.Shared.Damage +namespace Content.Shared.Damage.Systems; + +public sealed class SlowOnDamageSystem : EntitySystem { - public sealed class SlowOnDamageSystem : EntitySystem + [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifierSystem = default!; + + public override void Initialize() { - [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifierSystem = default!; + base.Initialize(); - public override void Initialize() + SubscribeLocalEvent(OnDamageChanged); + SubscribeLocalEvent(OnRefreshMovespeed); + + SubscribeLocalEvent>(OnModifySpeed); + SubscribeLocalEvent(OnExamined); + SubscribeLocalEvent(OnGotEquipped); + SubscribeLocalEvent(OnGotUnequipped); + + SubscribeLocalEvent(OnIgnoreStartup); + SubscribeLocalEvent(OnIgnoreShutdown); + SubscribeLocalEvent(OnIgnoreModifySpeed); + } + + private void OnRefreshMovespeed(EntityUid uid, SlowOnDamageComponent component, RefreshMovementSpeedModifiersEvent args) + { + if (!TryComp(uid, out var damage)) + return; + + if (damage.TotalDamage == FixedPoint2.Zero) + return; + + // Get closest threshold + FixedPoint2 closest = FixedPoint2.Zero; + var total = damage.TotalDamage; + foreach (var thres in component.SpeedModifierThresholds) { - base.Initialize(); - - SubscribeLocalEvent(OnDamageChanged); - SubscribeLocalEvent(OnRefreshMovespeed); - - SubscribeLocalEvent>(OnModifySpeed); - SubscribeLocalEvent(OnExamined); - SubscribeLocalEvent(OnGotEquipped); - SubscribeLocalEvent(OnGotUnequipped); - - SubscribeLocalEvent(OnIgnoreStartup); - SubscribeLocalEvent(OnIgnoreShutdown); - SubscribeLocalEvent(OnIgnoreModifySpeed); + if (total >= thres.Key && thres.Key > closest) + closest = thres.Key; } - private void OnRefreshMovespeed(EntityUid uid, SlowOnDamageComponent component, RefreshMovementSpeedModifiersEvent args) + if (closest != FixedPoint2.Zero) { - if (!TryComp(uid, out var damage)) - return; + var speed = component.SpeedModifierThresholds[closest]; - if (damage.TotalDamage == FixedPoint2.Zero) - return; - - // Get closest threshold - FixedPoint2 closest = FixedPoint2.Zero; - var total = damage.TotalDamage; - foreach (var thres in component.SpeedModifierThresholds) - { - if (total >= thres.Key && thres.Key > closest) - closest = thres.Key; - } - - if (closest != FixedPoint2.Zero) - { - var speed = component.SpeedModifierThresholds[closest]; - - var ev = new ModifySlowOnDamageSpeedEvent(speed); - RaiseLocalEvent(uid, ref ev); - args.ModifySpeed(ev.Speed, ev.Speed); - } - } - - private void OnDamageChanged(EntityUid uid, SlowOnDamageComponent component, DamageChangedEvent args) - { - // We -could- only refresh if it crossed a threshold but that would kind of be a lot of duplicated - // code and this isn't a super hot path anyway since basically only humans have this - - _movementSpeedModifierSystem.RefreshMovementSpeedModifiers(uid); - } - - private void OnModifySpeed(Entity ent, ref InventoryRelayedEvent args) - { - var dif = 1 - args.Args.Speed; - if (dif <= 0) - return; - - // reduces the slowness modifier by the given coefficient - args.Args.Speed += dif * ent.Comp.Modifier; - } - - private void OnExamined(Entity ent, ref ExaminedEvent args) - { - var msg = Loc.GetString("slow-on-damage-modifier-examine", ("mod", (1 - ent.Comp.Modifier) * 100)); - args.PushMarkup(msg); - } - - private void OnGotEquipped(Entity ent, ref ClothingGotEquippedEvent args) - { - _movementSpeedModifierSystem.RefreshMovementSpeedModifiers(args.Wearer); - } - - private void OnGotUnequipped(Entity ent, ref ClothingGotUnequippedEvent args) - { - _movementSpeedModifierSystem.RefreshMovementSpeedModifiers(args.Wearer); - } - - private void OnIgnoreStartup(Entity ent, ref ComponentStartup args) - { - _movementSpeedModifierSystem.RefreshMovementSpeedModifiers(ent); - } - - private void OnIgnoreShutdown(Entity ent, ref ComponentShutdown args) - { - _movementSpeedModifierSystem.RefreshMovementSpeedModifiers(ent); - } - - private void OnIgnoreModifySpeed(Entity ent, ref ModifySlowOnDamageSpeedEvent args) - { - args.Speed = 1f; + var ev = new ModifySlowOnDamageSpeedEvent(speed); + RaiseLocalEvent(uid, ref ev); + args.ModifySpeed(ev.Speed, ev.Speed); } } - [ByRefEvent] - public record struct ModifySlowOnDamageSpeedEvent(float Speed) : IInventoryRelayEvent + private void OnDamageChanged(EntityUid uid, SlowOnDamageComponent component, DamageChangedEvent args) { - public SlotFlags TargetSlots => SlotFlags.WITHOUT_POCKET; + // We -could- only refresh if it crossed a threshold but that would kind of be a lot of duplicated + // code and this isn't a super hot path anyway since basically only humans have this + + _movementSpeedModifierSystem.RefreshMovementSpeedModifiers(uid); + } + + private void OnModifySpeed(Entity ent, ref InventoryRelayedEvent args) + { + var dif = 1 - args.Args.Speed; + if (dif <= 0) + return; + + // reduces the slowness modifier by the given coefficient + args.Args.Speed += dif * ent.Comp.Modifier; + } + + private void OnExamined(Entity ent, ref ExaminedEvent args) + { + var msg = Loc.GetString("slow-on-damage-modifier-examine", ("mod", (1 - ent.Comp.Modifier) * 100)); + args.PushMarkup(msg); + } + + private void OnGotEquipped(Entity ent, ref ClothingGotEquippedEvent args) + { + _movementSpeedModifierSystem.RefreshMovementSpeedModifiers(args.Wearer); + } + + private void OnGotUnequipped(Entity ent, ref ClothingGotUnequippedEvent args) + { + _movementSpeedModifierSystem.RefreshMovementSpeedModifiers(args.Wearer); + } + + private void OnIgnoreStartup(Entity ent, ref ComponentStartup args) + { + _movementSpeedModifierSystem.RefreshMovementSpeedModifiers(ent); + } + + private void OnIgnoreShutdown(Entity ent, ref ComponentShutdown args) + { + _movementSpeedModifierSystem.RefreshMovementSpeedModifiers(ent); + } + + private void OnIgnoreModifySpeed(Entity ent, ref ModifySlowOnDamageSpeedEvent args) + { + args.Speed = 1f; } } + +[ByRefEvent] +public record struct ModifySlowOnDamageSpeedEvent(float Speed) : IInventoryRelayEvent +{ + public SlotFlags TargetSlots => SlotFlags.WITHOUT_POCKET; +} diff --git a/Content.Shared/Destructible/Triggers/AndTrigger.cs b/Content.Shared/Destructible/Triggers/AndTrigger.cs index ebedeee479..938f125b01 100644 --- a/Content.Shared/Destructible/Triggers/AndTrigger.cs +++ b/Content.Shared/Destructible/Triggers/AndTrigger.cs @@ -1,4 +1,4 @@ -using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Robust.Shared.Serialization; namespace Content.Shared.Destructible.Thresholds.Triggers; diff --git a/Content.Shared/Destructible/Triggers/DamageGroupTrigger.cs b/Content.Shared/Destructible/Triggers/DamageGroupTrigger.cs index 902198e33d..c1add2e891 100644 --- a/Content.Shared/Destructible/Triggers/DamageGroupTrigger.cs +++ b/Content.Shared/Destructible/Triggers/DamageGroupTrigger.cs @@ -1,4 +1,4 @@ -using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.FixedPoint; using Content.Shared.Damage.Prototypes; using Robust.Shared.Prototypes; diff --git a/Content.Shared/Destructible/Triggers/DamageTrigger.cs b/Content.Shared/Destructible/Triggers/DamageTrigger.cs index 9ec2060e5f..7a2d612f75 100644 --- a/Content.Shared/Destructible/Triggers/DamageTrigger.cs +++ b/Content.Shared/Destructible/Triggers/DamageTrigger.cs @@ -1,4 +1,4 @@ -using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.FixedPoint; using Robust.Shared.Serialization; diff --git a/Content.Shared/Destructible/Triggers/DamageTypeTrigger.cs b/Content.Shared/Destructible/Triggers/DamageTypeTrigger.cs index 8f50b62791..60bd9baf67 100644 --- a/Content.Shared/Destructible/Triggers/DamageTypeTrigger.cs +++ b/Content.Shared/Destructible/Triggers/DamageTypeTrigger.cs @@ -1,4 +1,4 @@ -using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.Damage.Prototypes; using Content.Shared.FixedPoint; using Robust.Shared.Prototypes; diff --git a/Content.Shared/Destructible/Triggers/IThresholdTrigger.cs b/Content.Shared/Destructible/Triggers/IThresholdTrigger.cs index 98c96a5bd5..d97394c406 100644 --- a/Content.Shared/Destructible/Triggers/IThresholdTrigger.cs +++ b/Content.Shared/Destructible/Triggers/IThresholdTrigger.cs @@ -1,4 +1,4 @@ -using Content.Shared.Damage; +using Content.Shared.Damage.Components; namespace Content.Shared.Destructible.Thresholds.Triggers; diff --git a/Content.Shared/Destructible/Triggers/OrTrigger.cs b/Content.Shared/Destructible/Triggers/OrTrigger.cs index 3e379cac7f..cdf72bed7f 100644 --- a/Content.Shared/Destructible/Triggers/OrTrigger.cs +++ b/Content.Shared/Destructible/Triggers/OrTrigger.cs @@ -1,4 +1,4 @@ -using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Robust.Shared.Serialization; namespace Content.Shared.Destructible.Thresholds.Triggers; diff --git a/Content.Shared/DoAfter/SharedDoAfterSystem.cs b/Content.Shared/DoAfter/SharedDoAfterSystem.cs index c1a3d6ecee..d80f65755e 100644 --- a/Content.Shared/DoAfter/SharedDoAfterSystem.cs +++ b/Content.Shared/DoAfter/SharedDoAfterSystem.cs @@ -2,6 +2,7 @@ using System.Diagnostics.CodeAnalysis; using System.Threading.Tasks; using Content.Shared.ActionBlocker; using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.Hands.Components; using Content.Shared.Tag; using Robust.Shared.GameStates; diff --git a/Content.Shared/Doors/Systems/SharedDoorSystem.cs b/Content.Shared/Doors/Systems/SharedDoorSystem.cs index 50132e42dd..c031dcc7bd 100644 --- a/Content.Shared/Doors/Systems/SharedDoorSystem.cs +++ b/Content.Shared/Doors/Systems/SharedDoorSystem.cs @@ -2,7 +2,7 @@ using System.Linq; using Content.Shared.Access.Components; using Content.Shared.Access.Systems; using Content.Shared.Administration.Logs; -using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.Database; using Content.Shared.Doors.Components; using Content.Shared.Emag.Systems; diff --git a/Content.Shared/EntityConditions/Conditions/DamageGroupEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/DamageGroupEntityConditionSystem.cs index dd877140d6..3691039189 100644 --- a/Content.Shared/EntityConditions/Conditions/DamageGroupEntityConditionSystem.cs +++ b/Content.Shared/EntityConditions/Conditions/DamageGroupEntityConditionSystem.cs @@ -1,4 +1,4 @@ -using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.Damage.Prototypes; using Content.Shared.FixedPoint; using Robust.Shared.Prototypes; diff --git a/Content.Shared/EntityConditions/Conditions/DamageTypeEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/DamageTypeEntityConditionSystem.cs index 30490c72e8..f2611a8200 100644 --- a/Content.Shared/EntityConditions/Conditions/DamageTypeEntityConditionSystem.cs +++ b/Content.Shared/EntityConditions/Conditions/DamageTypeEntityConditionSystem.cs @@ -1,4 +1,5 @@ using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.Damage.Prototypes; using Content.Shared.FixedPoint; using Robust.Shared.Prototypes; diff --git a/Content.Shared/EntityConditions/Conditions/TotalDamageEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/TotalDamageEntityConditionSystem.cs index 16f4a946f3..306398b4eb 100644 --- a/Content.Shared/EntityConditions/Conditions/TotalDamageEntityConditionSystem.cs +++ b/Content.Shared/EntityConditions/Conditions/TotalDamageEntityConditionSystem.cs @@ -1,4 +1,4 @@ -using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.FixedPoint; using Robust.Shared.Prototypes; diff --git a/Content.Shared/EntityEffects/Effects/EvenHealthChangeEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/EvenHealthChangeEntityEffectSystem.cs index 33b2041b37..b26b801264 100644 --- a/Content.Shared/EntityEffects/Effects/EvenHealthChangeEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/EvenHealthChangeEntityEffectSystem.cs @@ -1,5 +1,7 @@ using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.Damage.Prototypes; +using Content.Shared.Damage.Systems; using Content.Shared.FixedPoint; using Content.Shared.Localizations; using Robust.Shared.Prototypes; @@ -43,11 +45,10 @@ public sealed partial class EvenHealthChangeEntityEffectSystem : EntityEffectSys damageSpec *= args.Scale; _damageable.TryChangeDamage( - entity, + entity.AsNullable(), damageSpec, args.Effect.IgnoreResistances, - interruptsDoAfters: false, - damageable: entity.Comp); + interruptsDoAfters: false); } } diff --git a/Content.Shared/EntityEffects/Effects/HealthChangeEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/HealthChangeEntityEffectSystem.cs index 89948cd2e4..595bf15aa5 100644 --- a/Content.Shared/EntityEffects/Effects/HealthChangeEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/HealthChangeEntityEffectSystem.cs @@ -1,4 +1,5 @@ using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.Damage.Prototypes; using Content.Shared.FixedPoint; using Content.Shared.Localizations; @@ -13,7 +14,7 @@ namespace Content.Shared.EntityEffects.Effects; /// public sealed partial class HealthChangeEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly DamageableSystem _damageable = default!; + [Dependency] private readonly Damage.Systems.DamageableSystem _damageable = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { @@ -22,7 +23,7 @@ public sealed partial class HealthChangeEntityEffectSystem : EntityEffectSystem< damageSpec *= args.Scale; _damageable.TryChangeDamage( - entity, + entity.AsNullable(), damageSpec, args.Effect.IgnoreResistances, interruptsDoAfters: false); @@ -49,10 +50,10 @@ public sealed partial class HealthChange : EntityEffectBase var damageSpec = new DamageSpecifier(Damage); - var universalReagentDamageModifier = entSys.GetEntitySystem().UniversalReagentDamageModifier; - var universalReagentHealModifier = entSys.GetEntitySystem().UniversalReagentHealModifier; + var universalReagentDamageModifier = entSys.GetEntitySystem().UniversalReagentDamageModifier; + var universalReagentHealModifier = entSys.GetEntitySystem().UniversalReagentHealModifier; - damageSpec = entSys.GetEntitySystem().ApplyUniversalAllModifiers(damageSpec); + damageSpec = entSys.GetEntitySystem().ApplyUniversalAllModifiers(damageSpec); foreach (var (kind, amount) in damageSpec.DamageDict) { diff --git a/Content.Shared/Execution/SharedExecutionSystem.cs b/Content.Shared/Execution/SharedExecutionSystem.cs index b6d52cf352..926e6e08c2 100644 --- a/Content.Shared/Execution/SharedExecutionSystem.cs +++ b/Content.Shared/Execution/SharedExecutionSystem.cs @@ -1,7 +1,7 @@ using Content.Shared.ActionBlocker; using Content.Shared.Chat; using Content.Shared.CombatMode; -using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.Database; using Content.Shared.DoAfter; using Content.Shared.IdentityManagement; @@ -12,7 +12,6 @@ using Content.Shared.Verbs; using Content.Shared.Weapons.Melee; using Content.Shared.Weapons.Melee.Events; using Content.Shared.Interaction.Events; -using Content.Shared.Mind; using Robust.Shared.Player; using Robust.Shared.Audio.Systems; diff --git a/Content.Shared/Fax/Systems/FaxecuteSystem.cs b/Content.Shared/Fax/Systems/FaxecuteSystem.cs index 7768c7a3d2..3018b70c05 100644 --- a/Content.Shared/Fax/Systems/FaxecuteSystem.cs +++ b/Content.Shared/Fax/Systems/FaxecuteSystem.cs @@ -1,4 +1,4 @@ -using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.Popups; using Content.Shared.Fax.Components; @@ -26,7 +26,7 @@ public sealed class FaxecuteSystem : EntitySystem return; var damageSpec = faxecute.Damage; - _damageable.TryChangeDamage(sendEntity, damageSpec); + _damageable.ChangeDamage(sendEntity.Value, damageSpec); _popupSystem.PopupEntity(Loc.GetString("fax-machine-popup-error", ("target", uid)), uid, PopupType.LargeCaution); return; diff --git a/Content.Shared/Flash/DamagedByFlashingSystem.cs b/Content.Shared/Flash/DamagedByFlashingSystem.cs index 103dfb663c..9dbd01b89e 100644 --- a/Content.Shared/Flash/DamagedByFlashingSystem.cs +++ b/Content.Shared/Flash/DamagedByFlashingSystem.cs @@ -1,5 +1,5 @@ using Content.Shared.Flash.Components; -using Content.Shared.Damage; +using Content.Shared.Damage.Systems; namespace Content.Shared.Flash; @@ -18,7 +18,7 @@ public sealed class DamagedByFlashingSystem : EntitySystem // Best wait for Ed's status effect system rewrite. private void OnFlashAttempt(Entity ent, ref FlashAttemptEvent args) { - _damageable.TryChangeDamage(ent, ent.Comp.FlashDamage); + _damageable.ChangeDamage(ent.Owner, ent.Comp.FlashDamage); // TODO: It would be more logical if different flashes had different power, // and the damage would be inflicted depending on the strength of the flash. diff --git a/Content.Shared/HealthExaminable/HealthExaminableSystem.cs b/Content.Shared/HealthExaminable/HealthExaminableSystem.cs index 0645c51a47..ae938e0995 100644 --- a/Content.Shared/HealthExaminable/HealthExaminableSystem.cs +++ b/Content.Shared/HealthExaminable/HealthExaminableSystem.cs @@ -1,4 +1,4 @@ -using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.Examine; using Content.Shared.FixedPoint; using Content.Shared.IdentityManagement; diff --git a/Content.Shared/Implants/SharedImplanterSystem.cs b/Content.Shared/Implants/SharedImplanterSystem.cs index 6ff6d42d3b..6431b3d42e 100644 --- a/Content.Shared/Implants/SharedImplanterSystem.cs +++ b/Content.Shared/Implants/SharedImplanterSystem.cs @@ -1,7 +1,7 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using Content.Shared.Containers.ItemSlots; -using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.DoAfter; using Content.Shared.Examine; using Content.Shared.Forensics; diff --git a/Content.Shared/Inventory/InventorySystem.Relay.cs b/Content.Shared/Inventory/InventorySystem.Relay.cs index 392234297c..11b7f61130 100644 --- a/Content.Shared/Inventory/InventorySystem.Relay.cs +++ b/Content.Shared/Inventory/InventorySystem.Relay.cs @@ -7,6 +7,7 @@ using Content.Shared.Climbing.Events; using Content.Shared.Contraband; using Content.Shared.Damage; using Content.Shared.Damage.Events; +using Content.Shared.Damage.Systems; using Content.Shared.Electrocution; using Content.Shared.Explosion; using Content.Shared.Eye.Blinding.Systems; diff --git a/Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs b/Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs index 530dcb437b..7e7dbd744e 100644 --- a/Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs +++ b/Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs @@ -1,6 +1,6 @@ using Content.Shared.Administration.Logs; using Content.Shared.Body.Systems; -using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.Database; using Content.Shared.Destructible; using Content.Shared.DoAfter; @@ -330,7 +330,7 @@ public sealed class SharedKitchenSpikeSystem : EntitySystem { EnsureComp(args.Target.Value); - _damageableSystem.TryChangeDamage(args.Target, ent.Comp.ButcherDamage, true); + _damageableSystem.ChangeDamage(args.Target.Value, ent.Comp.ButcherDamage, true); // Log severity for damaging other entities is normally medium. _logger.Add(LogType.Action, @@ -428,7 +428,7 @@ public sealed class SharedKitchenSpikeSystem : EntitySystem kitchenSpike.NextDamage += kitchenSpike.DamageInterval; Dirty(uid, kitchenSpike); - _damageableSystem.TryChangeDamage(contained, kitchenSpike.TimeDamage, true); + _damageableSystem.ChangeDamage(contained.Value, kitchenSpike.TimeDamage, true); } } diff --git a/Content.Shared/Medical/Healing/HealingSystem.cs b/Content.Shared/Medical/Healing/HealingSystem.cs index 2ac2c50871..bd9f0003ba 100644 --- a/Content.Shared/Medical/Healing/HealingSystem.cs +++ b/Content.Shared/Medical/Healing/HealingSystem.cs @@ -2,7 +2,8 @@ using Content.Shared.Administration.Logs; using Content.Shared.Body.Components; using Content.Shared.Body.Systems; using Content.Shared.Chemistry.EntitySystems; -using Content.Shared.Damage; +using Content.Shared.Damage.Components; +using Content.Shared.Damage.Systems; using Content.Shared.Database; using Content.Shared.DoAfter; using Content.Shared.FixedPoint; @@ -76,12 +77,10 @@ public sealed class HealingSystem : EntitySystem if (healing.ModifyBloodLevel != 0 && bloodstream != null) _bloodstreamSystem.TryModifyBloodLevel((target.Owner, bloodstream), healing.ModifyBloodLevel); - var healed = _damageable.TryChangeDamage(target.Owner, healing.Damage * _damageable.UniversalTopicalsHealModifier, true, origin: args.Args.User); - - if (healed == null && healing.BloodlossModifier != 0) + if (!_damageable.TryChangeDamage(target.Owner, healing.Damage * _damageable.UniversalTopicalsHealModifier, out var healed, true, origin: args.Args.User) && healing.BloodlossModifier != 0) return; - var total = healed?.GetTotal() ?? FixedPoint2.Zero; + var total = healed.GetTotal(); // Re-verify that we can heal the damage. var dontRepeat = false; diff --git a/Content.Shared/Medical/Stethoscope/StethoscopeSystem.cs b/Content.Shared/Medical/Stethoscope/StethoscopeSystem.cs index 01d61aa06e..86a8249321 100644 --- a/Content.Shared/Medical/Stethoscope/StethoscopeSystem.cs +++ b/Content.Shared/Medical/Stethoscope/StethoscopeSystem.cs @@ -1,5 +1,5 @@ using Content.Shared.Actions; -using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.DoAfter; using Content.Shared.FixedPoint; using Content.Shared.Inventory; diff --git a/Content.Shared/Medical/SuitSensors/SharedSuitSensorSystem.cs b/Content.Shared/Medical/SuitSensors/SharedSuitSensorSystem.cs index 6930b029b7..861fcd8daf 100644 --- a/Content.Shared/Medical/SuitSensors/SharedSuitSensorSystem.cs +++ b/Content.Shared/Medical/SuitSensors/SharedSuitSensorSystem.cs @@ -2,7 +2,7 @@ using System.Numerics; using Content.Shared.Access.Systems; using Content.Shared.ActionBlocker; using Content.Shared.Clothing; -using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.DeviceNetwork; using Content.Shared.DoAfter; using Content.Shared.Emp; diff --git a/Content.Shared/Mobs/Components/MobStateComponent.cs b/Content.Shared/Mobs/Components/MobStateComponent.cs index 7cff0779cb..80a0674c96 100644 --- a/Content.Shared/Mobs/Components/MobStateComponent.cs +++ b/Content.Shared/Mobs/Components/MobStateComponent.cs @@ -1,7 +1,6 @@ -using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.Mobs.Systems; using Robust.Shared.GameStates; -using Robust.Shared.Serialization; namespace Content.Shared.Mobs.Components { diff --git a/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs b/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs index 7b5ee52b27..ded30499ee 100644 --- a/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs +++ b/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs @@ -3,6 +3,7 @@ using Content.Shared.Buckle.Components; using Content.Shared.CombatMode.Pacification; using Content.Shared.Damage; using Content.Shared.Damage.ForceSay; +using Content.Shared.Damage.Systems; using Content.Shared.Emoting; using Content.Shared.Hands; using Content.Shared.Interaction; diff --git a/Content.Shared/Mobs/Systems/MobStateSystem.cs b/Content.Shared/Mobs/Systems/MobStateSystem.cs index d3cfda32bb..0497f3cce0 100644 --- a/Content.Shared/Mobs/Systems/MobStateSystem.cs +++ b/Content.Shared/Mobs/Systems/MobStateSystem.cs @@ -1,9 +1,8 @@ using Content.Shared.ActionBlocker; using Content.Shared.Administration.Logs; -using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.Mobs.Components; using Content.Shared.Standing; -using Robust.Shared.Physics.Systems; using Robust.Shared.Timing; namespace Content.Shared.Mobs.Systems; diff --git a/Content.Shared/Mobs/Systems/MobThresholdSystem.cs b/Content.Shared/Mobs/Systems/MobThresholdSystem.cs index a059c18dd8..3af7317954 100644 --- a/Content.Shared/Mobs/Systems/MobThresholdSystem.cs +++ b/Content.Shared/Mobs/Systems/MobThresholdSystem.cs @@ -2,6 +2,8 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using Content.Shared.Alert; using Content.Shared.Damage; +using Content.Shared.Damage.Components; +using Content.Shared.Damage.Systems; using Content.Shared.FixedPoint; using Content.Shared.Mobs.Components; using Content.Shared.Mobs.Events; diff --git a/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs b/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs index 559a6a1019..226f2c4c40 100644 --- a/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs +++ b/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs @@ -1,16 +1,14 @@ using System.Diagnostics.CodeAnalysis; using Content.Shared.Alert; -using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.Mobs.Systems; using Content.Shared.Movement.Systems; using Content.Shared.Nutrition.Components; using Content.Shared.Rejuvenate; using Content.Shared.StatusIcon; -using Robust.Shared.Network; using Robust.Shared.Prototypes; using Robust.Shared.Random; using Robust.Shared.Timing; -using Robust.Shared.Utility; namespace Content.Shared.Nutrition.EntitySystems; diff --git a/Content.Shared/Polymorph/Systems/SharedChameleonProjectorSystem.cs b/Content.Shared/Polymorph/Systems/SharedChameleonProjectorSystem.cs index 69b9bf8f8d..3fd9ed07bd 100644 --- a/Content.Shared/Polymorph/Systems/SharedChameleonProjectorSystem.cs +++ b/Content.Shared/Polymorph/Systems/SharedChameleonProjectorSystem.cs @@ -1,6 +1,5 @@ using Content.Shared.Actions; using Content.Shared.Coordinates; -using Content.Shared.Damage; using Content.Shared.Hands; using Content.Shared.Interaction; using Content.Shared.Item; @@ -14,6 +13,7 @@ using Robust.Shared.Network; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.Manager; using System.Diagnostics.CodeAnalysis; +using Content.Shared.Damage.Systems; namespace Content.Shared.Polymorph.Systems; diff --git a/Content.Shared/Repairable/RepairableSystem.cs b/Content.Shared/Repairable/RepairableSystem.cs index 7a0f01b9b6..7526faeb51 100644 --- a/Content.Shared/Repairable/RepairableSystem.cs +++ b/Content.Shared/Repairable/RepairableSystem.cs @@ -1,5 +1,6 @@ using Content.Shared.Administration.Logs; -using Content.Shared.Damage; +using Content.Shared.Damage.Components; +using Content.Shared.Damage.Systems; using Content.Shared.Database; using Content.Shared.DoAfter; using Content.Shared.Interaction; @@ -32,14 +33,14 @@ public sealed partial class RepairableSystem : EntitySystem if (ent.Comp.Damage != null) { - var damageChanged = _damageableSystem.TryChangeDamage(ent.Owner, ent.Comp.Damage, true, false, origin: args.User); - _adminLogger.Add(LogType.Healed, $"{ToPrettyString(args.User):user} repaired {ToPrettyString(ent.Owner):target} by {damageChanged?.GetTotal()}"); + var damageChanged = _damageableSystem.ChangeDamage(ent.Owner, ent.Comp.Damage, true, false, origin: args.User); + _adminLogger.Add(LogType.Healed, $"{ToPrettyString(args.User):user} repaired {ToPrettyString(ent.Owner):target} by {damageChanged.GetTotal()}"); } else { // Repair all damage - _damageableSystem.SetAllDamage(ent.Owner, damageable, 0); + _damageableSystem.SetAllDamage((ent.Owner, damageable), 0); _adminLogger.Add(LogType.Healed, $"{ToPrettyString(args.User):user} repaired {ToPrettyString(ent.Owner):target} back to full health"); } diff --git a/Content.Shared/Silicons/Borgs/SharedBorgSystem.Relay.cs b/Content.Shared/Silicons/Borgs/SharedBorgSystem.Relay.cs index 87df866c98..7a1ca31eb5 100644 --- a/Content.Shared/Silicons/Borgs/SharedBorgSystem.Relay.cs +++ b/Content.Shared/Silicons/Borgs/SharedBorgSystem.Relay.cs @@ -1,4 +1,5 @@ using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.Silicons.Borgs.Components; namespace Content.Shared.Silicons.Borgs; diff --git a/Content.Shared/Silicons/Bots/MedibotSystem.cs b/Content.Shared/Silicons/Bots/MedibotSystem.cs index 407e586eb1..68ee5ff405 100644 --- a/Content.Shared/Silicons/Bots/MedibotSystem.cs +++ b/Content.Shared/Silicons/Bots/MedibotSystem.cs @@ -1,5 +1,8 @@ +using Robust.Shared.Audio.Systems; +using Robust.Shared.Serialization; +using System.Diagnostics.CodeAnalysis; using Content.Shared.Chemistry.EntitySystems; -using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.DoAfter; using Content.Shared.Emag.Components; using Content.Shared.Emag.Systems; @@ -8,9 +11,6 @@ using Content.Shared.Mobs; using Content.Shared.Mobs.Components; using Content.Shared.NPC.Components; using Content.Shared.Popups; -using Robust.Shared.Audio.Systems; -using Robust.Shared.Serialization; -using System.Diagnostics.CodeAnalysis; namespace Content.Shared.Silicons.Bots; diff --git a/Content.Shared/Storage/EntitySystems/SecretStashSystem.cs b/Content.Shared/Storage/EntitySystems/SecretStashSystem.cs index 7e83b50fba..273359e4d3 100644 --- a/Content.Shared/Storage/EntitySystems/SecretStashSystem.cs +++ b/Content.Shared/Storage/EntitySystems/SecretStashSystem.cs @@ -1,5 +1,5 @@ using Content.Shared.Construction.EntitySystems; -using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.Destructible; using Content.Shared.Hands.Components; using Content.Shared.Hands.EntitySystems; diff --git a/Content.Shared/Stunnable/SharedStunSystem.Knockdown.cs b/Content.Shared/Stunnable/SharedStunSystem.Knockdown.cs index ae8f970623..fc2b01c649 100644 --- a/Content.Shared/Stunnable/SharedStunSystem.Knockdown.cs +++ b/Content.Shared/Stunnable/SharedStunSystem.Knockdown.cs @@ -3,6 +3,7 @@ using Content.Shared.Buckle.Components; using Content.Shared.CCVar; using Content.Shared.Damage; using Content.Shared.Damage.Components; +using Content.Shared.Damage.Systems; using Content.Shared.Database; using Content.Shared.DoAfter; using Content.Shared.Gravity; diff --git a/Content.Shared/Trigger/Systems/DamageOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/DamageOnTriggerSystem.cs index cdcb1044f7..d021eed80d 100644 --- a/Content.Shared/Trigger/Systems/DamageOnTriggerSystem.cs +++ b/Content.Shared/Trigger/Systems/DamageOnTriggerSystem.cs @@ -5,7 +5,7 @@ namespace Content.Shared.Trigger.Systems; public sealed class DamageOnTriggerSystem : XOnTriggerSystem { - [Dependency] private readonly DamageableSystem _damageableSystem = default!; + [Dependency] private readonly Damage.Systems.DamageableSystem _damageableSystem = default!; protected override void OnTrigger(Entity ent, EntityUid target, ref TriggerEvent args) { @@ -13,7 +13,7 @@ public sealed class DamageOnTriggerSystem : XOnTriggerSystem(ent, out var damageable)) { var damageSetID = enabled ? ent.Comp.DeployedDamageModifierSetId : ent.Comp.RetractedDamageModifierSetId; - _damageable.SetDamageModifierSetId(ent, damageSetID, damageable); + _damageable.SetDamageModifierSetId((ent, damageable), damageSetID); } // Change the turret's fixtures diff --git a/Content.Shared/Weapons/Hitscan/Systems/HitscanBasicDamageSystem.cs b/Content.Shared/Weapons/Hitscan/Systems/HitscanBasicDamageSystem.cs index 130687469a..e5298a2937 100644 --- a/Content.Shared/Weapons/Hitscan/Systems/HitscanBasicDamageSystem.cs +++ b/Content.Shared/Weapons/Hitscan/Systems/HitscanBasicDamageSystem.cs @@ -1,4 +1,4 @@ -using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.Weapons.Hitscan.Components; using Content.Shared.Weapons.Hitscan.Events; @@ -22,9 +22,7 @@ public sealed class HitscanBasicDamageSystem : EntitySystem var dmg = ent.Comp.Damage * _damage.UniversalHitscanDamageModifier; - var damageDealt = _damage.TryChangeDamage(args.Data.HitEntity, dmg, origin: args.Data.Gun); - - if (damageDealt == null) + if(!_damage.TryChangeDamage(args.Data.HitEntity.Value, dmg, out var damageDealt, origin: args.Data.Gun)) return; var damageEvent = new HitscanDamageDealtEvent diff --git a/Content.Shared/Weapons/Marker/SharedDamageMarkerSystem.cs b/Content.Shared/Weapons/Marker/SharedDamageMarkerSystem.cs index eab638a9fc..b236824815 100644 --- a/Content.Shared/Weapons/Marker/SharedDamageMarkerSystem.cs +++ b/Content.Shared/Weapons/Marker/SharedDamageMarkerSystem.cs @@ -1,8 +1,8 @@ using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.Projectiles; using Content.Shared.Weapons.Melee.Events; using Content.Shared.Whitelist; -using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; using Robust.Shared.Network; using Robust.Shared.Physics.Events; diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs index 9bc0b845ae..a010dbec17 100644 --- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs +++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs @@ -7,6 +7,7 @@ using Content.Shared.Administration.Components; using Content.Shared.Administration.Logs; using Content.Shared.CombatMode; using Content.Shared.Damage; +using Content.Shared.Damage.Components; using Content.Shared.Damage.Events; using Content.Shared.Damage.Systems; using Content.Shared.Database; @@ -541,9 +542,8 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem RaiseLocalEvent(target.Value, attackedEvent); var modifiedDamage = DamageSpecifier.ApplyModifierSets(damage + hitEvent.BonusDamage + attackedEvent.BonusDamage, hitEvent.ModifiersList); - var damageResult = Damageable.TryChangeDamage(target, modifiedDamage, origin:user, ignoreResistances:resistanceBypass); - if (damageResult is {Empty: false}) + if (!Damageable.TryChangeDamage(target.Value, modifiedDamage, out var damageResult, origin:user, ignoreResistances:resistanceBypass)) { // If the target has stamina and is taking blunt damage, they should also take stamina damage based on their blunt to stamina factor if (damageResult.DamageDict.TryGetValue("Blunt", out var bluntDamage)) @@ -568,7 +568,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem _meleeSound.PlayHitSound(target.Value, user, GetHighestDamageSound(modifiedDamage, _protoManager), hitEvent.HitSoundOverride, component); - if (damageResult?.GetTotal() > FixedPoint2.Zero) + if (damageResult.GetTotal() > FixedPoint2.Zero) { DoDamageEffect(targets, user, targetXform); } @@ -697,9 +697,9 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem RaiseLocalEvent(entity, attackedEvent); var modifiedDamage = DamageSpecifier.ApplyModifierSets(damage + hitEvent.BonusDamage + attackedEvent.BonusDamage, hitEvent.ModifiersList); - var damageResult = Damageable.TryChangeDamage(entity, modifiedDamage, origin: user, ignoreResistances: resistanceBypass); + var damageResult = Damageable.ChangeDamage(entity, modifiedDamage, origin: user, ignoreResistances: resistanceBypass); - if (damageResult != null && damageResult.GetTotal() > FixedPoint2.Zero) + if (damageResult.GetTotal() > FixedPoint2.Zero) { // If the target has stamina and is taking blunt damage, they should also take stamina damage based on their blunt to stamina factor if (damageResult.DamageDict.TryGetValue("Blunt", out var bluntDamage)) diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs index 1b7bf4bae8..ed8849a41a 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs @@ -7,6 +7,7 @@ using Content.Shared.Audio; using Content.Shared.CombatMode; using Content.Shared.Containers.ItemSlots; using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.Examine; using Content.Shared.Hands; using Content.Shared.Hands.EntitySystems; diff --git a/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.XAT.cs b/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.XAT.cs index 1ef85db27f..4d9e2e6df4 100644 --- a/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.XAT.cs +++ b/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.XAT.cs @@ -1,6 +1,7 @@ using System.Linq; using Content.Shared.Chemistry; using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.Examine; using Content.Shared.Interaction; using Content.Shared.Movement.Pulling.Events; diff --git a/Content.Shared/Xenoarchaeology/Artifact/XAE/XAEDamageInAreaSystem.cs b/Content.Shared/Xenoarchaeology/Artifact/XAE/XAEDamageInAreaSystem.cs index 405fa338ff..a0d9d09368 100644 --- a/Content.Shared/Xenoarchaeology/Artifact/XAE/XAEDamageInAreaSystem.cs +++ b/Content.Shared/Xenoarchaeology/Artifact/XAE/XAEDamageInAreaSystem.cs @@ -1,4 +1,5 @@ using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.Whitelist; using Content.Shared.Xenoarchaeology.Artifact.XAE.Components; using Robust.Shared.Random; diff --git a/Content.Shared/Xenoarchaeology/Artifact/XAT/XATDamageThresholdReachedSystem.cs b/Content.Shared/Xenoarchaeology/Artifact/XAT/XATDamageThresholdReachedSystem.cs index eab832ce6d..e392b91823 100644 --- a/Content.Shared/Xenoarchaeology/Artifact/XAT/XATDamageThresholdReachedSystem.cs +++ b/Content.Shared/Xenoarchaeology/Artifact/XAT/XATDamageThresholdReachedSystem.cs @@ -1,4 +1,5 @@ using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.Xenoarchaeology.Artifact.Components; using Content.Shared.Xenoarchaeology.Artifact.XAT.Components; using Robust.Shared.Prototypes; diff --git a/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactCrusherSystem.cs b/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactCrusherSystem.cs index a8c4b9ff06..2807fd9250 100644 --- a/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactCrusherSystem.cs +++ b/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactCrusherSystem.cs @@ -1,4 +1,4 @@ -using Content.Shared.Damage; +using Content.Shared.Damage.Systems; using Content.Shared.Emag.Systems; using Content.Shared.Examine; using Content.Shared.Popups; From ce6daea5fb978e14d9f06f88a8430157eafc5f82 Mon Sep 17 00:00:00 2001 From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com> Date: Mon, 27 Oct 2025 18:05:37 -0400 Subject: [PATCH 022/121] More-generic bar flask name/description (#41144) More generic bar flask name/description --- .../Entities/Objects/Consumable/Drinks/drinks_flasks.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml index 17f9e47fe6..31680db9ed 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml @@ -92,8 +92,8 @@ - type: entity parent: FlaskBase id: DrinkFlaskBar - name: bar flask - description: A metal flask often given out by the bartender on loan. Don't forget to return it! + name: flask + description: A reusable metal flask. Classier than drinking straight from a bottle. components: - type: Sprite sprite: Objects/Consumable/Drinks/barflask.rsi From abd9aec8bd6ead47428cde8d1a202fc14a8daa6f Mon Sep 17 00:00:00 2001 From: Atakku Date: Mon, 27 Oct 2025 23:33:56 +0100 Subject: [PATCH 023/121] Implemented parenting and minimum default for loadout groups (#40861) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Implemented parenting and minimum default for loadouts * Fix a mistake * Apply suggestion from @iaada Co-authored-by: āda * Implement @iaada's suggestion to rename MinDefault to DefaultSelected * happy little accidents * Moved Parents and Abstract fields to under ID, added inheritdoc --------- Co-authored-by: āda --- .../Loadouts/LoadoutGroupPrototype.cs | 19 ++++++++++++++++++- .../Preferences/Loadouts/RoleLoadout.cs | 4 ++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/Content.Shared/Preferences/Loadouts/LoadoutGroupPrototype.cs b/Content.Shared/Preferences/Loadouts/LoadoutGroupPrototype.cs index 990f1b74a2..b65f332885 100644 --- a/Content.Shared/Preferences/Loadouts/LoadoutGroupPrototype.cs +++ b/Content.Shared/Preferences/Loadouts/LoadoutGroupPrototype.cs @@ -1,4 +1,5 @@ using Robust.Shared.Prototypes; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Array; namespace Content.Shared.Preferences.Loadouts; @@ -6,11 +7,20 @@ namespace Content.Shared.Preferences.Loadouts; /// Corresponds to a set of loadouts for a particular slot. /// [Prototype] -public sealed partial class LoadoutGroupPrototype : IPrototype +public sealed partial class LoadoutGroupPrototype : IPrototype, IInheritingPrototype { [IdDataField] public string ID { get; private set; } = string.Empty; + /// + [ParentDataFieldAttribute(typeof(AbstractPrototypeIdArraySerializer))] + public string[]? Parents { get; } + + /// + [NeverPushInheritance] + [AbstractDataField] + public bool Abstract { get; } + /// /// User-friendly name for the group. /// @@ -22,6 +32,12 @@ public sealed partial class LoadoutGroupPrototype : IPrototype /// [DataField] public int MinLimit = 1; + + /// + /// Number of loadouts that are selected by default. + /// + [DataField] + public int DefaultSelected = 0; /// /// Maximum limit for the category. @@ -35,6 +51,7 @@ public sealed partial class LoadoutGroupPrototype : IPrototype [DataField] public bool Hidden; + [AlwaysPushInheritance] [DataField(required: true)] public List> Loadouts = new(); } diff --git a/Content.Shared/Preferences/Loadouts/RoleLoadout.cs b/Content.Shared/Preferences/Loadouts/RoleLoadout.cs index 9b7f4ae05e..d9f79f543a 100644 --- a/Content.Shared/Preferences/Loadouts/RoleLoadout.cs +++ b/Content.Shared/Preferences/Loadouts/RoleLoadout.cs @@ -228,13 +228,13 @@ public sealed partial class RoleLoadout : IEquatable var loadouts = new List(); SelectedLoadouts[group] = loadouts; - if (groupProto.MinLimit > 0) + if (groupProto.MinLimit > 0 || loadouts.Count < groupProto.DefaultSelected) { // Apply any loadouts we can. foreach (var protoId in groupProto.Loadouts) { // Reached the limit, time to stop - if (loadouts.Count >= groupProto.MinLimit) + if (loadouts.Count >= Math.Max(groupProto.MinLimit, groupProto.DefaultSelected)) break; if (!protoManager.TryIndex(protoId, out var loadoutProto)) From db05016fe0dd744cd91faacba8c6ed78dad16eaf Mon Sep 17 00:00:00 2001 From: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com> Date: Mon, 27 Oct 2025 15:43:28 -0700 Subject: [PATCH 024/121] Fix chemical explosion scaling. (#41153) Fix area reaction scaling Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> --- .../EntityEffects/Effects/Solution/AreaReactionEntityEffect.cs | 2 ++ .../EntityEffects/Effects/Transform/EmpEntityEffectSystem.cs | 2 ++ .../EntityEffects/Effects/Transform/ExplosionEntityEffect.cs | 2 ++ .../EntityEffects/Effects/Transform/FlashEntityEffectSystem.cs | 2 ++ 4 files changed, 8 insertions(+) diff --git a/Content.Shared/EntityEffects/Effects/Solution/AreaReactionEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Solution/AreaReactionEntityEffect.cs index 13175cfed1..9d3dc38222 100644 --- a/Content.Shared/EntityEffects/Effects/Solution/AreaReactionEntityEffect.cs +++ b/Content.Shared/EntityEffects/Effects/Solution/AreaReactionEntityEffect.cs @@ -28,6 +28,8 @@ public sealed partial class AreaReactionEffect : EntityEffectBase [DataField(required: true)] public SoundSpecifier Sound = default!; + public override bool Scaling => true; + public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("entity-effect-guidebook-area-reaction", ("duration", Duration) diff --git a/Content.Shared/EntityEffects/Effects/Transform/EmpEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Transform/EmpEntityEffectSystem.cs index 2cbb6d6dad..334223686b 100644 --- a/Content.Shared/EntityEffects/Effects/Transform/EmpEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/Transform/EmpEntityEffectSystem.cs @@ -49,6 +49,8 @@ public sealed partial class Emp : EntityEffectBase [DataField] public TimeSpan Duration = TimeSpan.FromSeconds(15); + public override bool Scaling => true; + public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("entity-effect-guidebook-emp-reaction-effect", ("chance", Probability)); diff --git a/Content.Shared/EntityEffects/Effects/Transform/ExplosionEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Transform/ExplosionEntityEffect.cs index 907c4e321f..2e32c434a3 100644 --- a/Content.Shared/EntityEffects/Effects/Transform/ExplosionEntityEffect.cs +++ b/Content.Shared/EntityEffects/Effects/Transform/ExplosionEntityEffect.cs @@ -50,6 +50,8 @@ public sealed partial class Explosion : EntityEffectBase [DataField] public float TileBreakScale = 1f; + public override bool Scaling => true; + public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("entity-effect-guidebook-explosion", ("chance", Probability)); diff --git a/Content.Shared/EntityEffects/Effects/Transform/FlashEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Transform/FlashEntityEffectSystem.cs index df788e94d6..66d30945aa 100644 --- a/Content.Shared/EntityEffects/Effects/Transform/FlashEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/Transform/FlashEntityEffectSystem.cs @@ -76,6 +76,8 @@ public sealed partial class Flash : EntityEffectBase [DataField] public SoundSpecifier? Sound = new SoundPathSpecifier("/Audio/Weapons/flash.ogg"); + public override bool Scaling => true; + public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("entity-effect-guidebook-flash-reaction-effect", ("chance", Probability)); } From 3cd377df8e952b2e190816f4c6498996325edf6e Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 27 Oct 2025 22:55:53 +0000 Subject: [PATCH 025/121] Automatic changelog update --- Resources/Changelog/Changelog.yml | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 3b37199314..a97f0fc97a 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,19 +1,4 @@ Entries: -- author: themias - changes: - - message: Fixed an issue where the gas analyzer and anomaly scanner would need - to be reactivated to open the UI - type: Fix - id: 8662 - time: '2025-06-12T21:16:07.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/38285 -- author: BigfootBravo - changes: - - message: Utensils don't spam a warning for incompatible foods. - type: Fix - id: 8663 - time: '2025-06-13T01:48:28.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/38297 - author: hoshizora-sayo changes: - message: Fixed crafting menu entries that included modular machine parts @@ -3933,3 +3918,10 @@ id: 9164 time: '2025-10-23T15:29:38.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/40983 +- author: Princess-Cheeseballs + changes: + - message: Explosions now scale properly with reagent quantity + type: Fix + id: 9165 + time: '2025-10-27T22:54:45.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/41153 From b4e2e6862812d9f5a2737cb1697417b5e317e61d Mon Sep 17 00:00:00 2001 From: scrivoy <179060466+scrivoy@users.noreply.github.com> Date: Mon, 27 Oct 2025 23:58:45 +0100 Subject: [PATCH 026/121] Resprite and refactor wall dispensers (fuel, cleaner) (#36251) * resprite fuel and cleaner walldispenser * added sprites and moved walldispensers in own .rsi * forgot to remove sprites in old location * meta.json - use 4 spaces instead of 2 * moved reagent from food to tank container * clean up code inheritance * replace static sprites with layered sprites and update related code * added BaseDispenser for shared logic across dispensers * make BaseDispenser unspawnable * Add Explosive and PacifismDangerousAttack to FuelDispenser for consistency with WeldingFuelTank * moved the sprite one pixel down * reset wall_dispensers.yml to master * rename sprite states, remove unused sprites, bring back code changes after merge * really remove every unused sprite * add maxVol * indent to 4 spaces * cleanup * remove pepper dispenser * switch to shared fill level sprite --- .../Wallmounts/Storage/wall_dispensers.yml | 63 ++++++++++++------ .../Storage/tanks.rsi/cleanerdispenser.png | Bin 1069 -> 0 bytes .../Storage/tanks.rsi/fueldispenser.png | Bin 1105 -> 0 bytes .../Structures/Storage/tanks.rsi/meta.json | 11 +-- .../Storage/tanks.rsi/pepperdispenser.png | Bin 1096 -> 0 bytes .../walldispenser.rsi/cleanerdispenser.png | Bin 0 -> 1172 bytes .../Wallmounts/walldispenser.rsi/fill-1.png | Bin 0 -> 568 bytes .../Wallmounts/walldispenser.rsi/fill-2.png | Bin 0 -> 595 bytes .../Wallmounts/walldispenser.rsi/fill-3.png | Bin 0 -> 599 bytes .../Wallmounts/walldispenser.rsi/fill-4.png | Bin 0 -> 619 bytes .../Wallmounts/walldispenser.rsi/fill-5.png | Bin 0 -> 649 bytes .../walldispenser.rsi/fueldispenser.png | Bin 0 -> 1170 bytes .../Wallmounts/walldispenser.rsi/meta.json | 32 +++++++++ 13 files changed, 75 insertions(+), 31 deletions(-) delete mode 100644 Resources/Textures/Structures/Storage/tanks.rsi/cleanerdispenser.png delete mode 100644 Resources/Textures/Structures/Storage/tanks.rsi/fueldispenser.png delete mode 100644 Resources/Textures/Structures/Storage/tanks.rsi/pepperdispenser.png create mode 100644 Resources/Textures/Structures/Wallmounts/walldispenser.rsi/cleanerdispenser.png create mode 100644 Resources/Textures/Structures/Wallmounts/walldispenser.rsi/fill-1.png create mode 100644 Resources/Textures/Structures/Wallmounts/walldispenser.rsi/fill-2.png create mode 100644 Resources/Textures/Structures/Wallmounts/walldispenser.rsi/fill-3.png create mode 100644 Resources/Textures/Structures/Wallmounts/walldispenser.rsi/fill-4.png create mode 100644 Resources/Textures/Structures/Wallmounts/walldispenser.rsi/fill-5.png create mode 100644 Resources/Textures/Structures/Wallmounts/walldispenser.rsi/fueldispenser.png create mode 100644 Resources/Textures/Structures/Wallmounts/walldispenser.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/wall_dispensers.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/wall_dispensers.yml index 962963c341..cfcbd59dc2 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/wall_dispensers.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/wall_dispensers.yml @@ -4,8 +4,7 @@ abstract: true components: - type: Sprite - sprite: Structures/Storage/tanks.rsi - state: cleanerdispenser + sprite: Structures/Wallmounts/walldispenser.rsi - type: Appearance - type: Destructible thresholds: @@ -13,8 +12,8 @@ !type:DamageTrigger damage: 50 behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] + - !type:DoActsBehavior + acts: [ "Destruction" ] - trigger: !type:DamageTypeTrigger damageType: Heat @@ -48,15 +47,46 @@ - type: entity parent: BaseDispenser - id: FuelDispenser - name: fuel dispenser + id: CleanerDispenser + name: space cleaner dispenser + description: Wallmount Space Cleaner dispenser. components: - type: Sprite - sprite: Structures/Storage/tanks.rsi - state: fueldispenser + layers: + - state: cleanerdispenser + - state: fill-1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - type: SolutionContainerVisuals + maxFillLevels: 5 + fillBaseName: fill- - type: SolutionContainerManager solutions: tank: + maxVol: 5000 + reagents: + - ReagentId: SpaceCleaner + Quantity: 5000 + +- type: entity + parent: BaseDispenser + id: FuelDispenser + name: fuel dispenser + description: Wallmount Fuel dispenser. + components: + - type: Sprite + layers: + - state: fueldispenser + - state: fill-1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - type: SolutionContainerVisuals + maxFillLevels: 5 + fillBaseName: fill- + - type: SolutionContainerManager + solutions: + tank: + maxVol: 1000 reagents: - ReagentId: WeldingFuel Quantity: 1000 @@ -67,16 +97,7 @@ weldingDamage: types: Heat: 20 - -- type: entity - parent: BaseDispenser - id: CleanerDispenser - name: space cleaner dispenser - components: - - type: SolutionContainerManager - solutions: - tank: - reagents: - - ReagentId: SpaceCleaner - Quantity: 5000 - - type: ReagentTank + - type: PacifismDangerousAttack + - type: Explosive + explosionType: Default + totalIntensity: 50 diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/cleanerdispenser.png b/Resources/Textures/Structures/Storage/tanks.rsi/cleanerdispenser.png deleted file mode 100644 index 0d42fa402e435e1fbc12cffb18239c35a4cc8c2e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1069 zcmV+|1k(G7P)(vT3CfBo+ykScb4D8;y1qCG% zR3Ivqri(UYQRRzFxU2NM1K-cy79H4n$*Y#sM)6>(3e9A{1nWjm-UOz@)X=&-i zC|c=(-+XObmUDUoS!j$wT=(+BKq|G?!es$>#x36ophO z)qVz|-uKzi#IKh~q{0?l!f>DP%nt%eyPzq9pSO zQU_7s68?4vMN#lPk3ylq>gp;1P{?FjE}#<$G*_{zs#G4{A`C+ki3F;uQvKx%0KzaN znM|@Z|2eX}Z{lEdVHhGR3JIVQMTcy+m4PUV$mjF%g@Z3(sZ@%cHUHbTjb&MgqKIJ_ zh@yxr%k1s#p=w&o4R|7f@$vCvPjow&oSbab>vcTOdud#jkt8W5&}t8ef5%xXG+$89 z^Ww~iqDV6Nat*gC!MPDQIOBpO0mS`rS`(fdfo62IT8&P_h@Gd?>3^pL2cwilvE_Fw zoEw2AW@cvzMUjz_5r&6{(K8vAS5|<(FoypWKi$2H_-Eu{7@}!fOXufGz%)&wD59^g n4>-Ofq9|(F0~ff!e~v!@r2Ft1c|%pH00000NkvXXu0mjfrGe~> diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/fueldispenser.png b/Resources/Textures/Structures/Storage/tanks.rsi/fueldispenser.png deleted file mode 100644 index 333ffde9a9cd0519f7f3b7344a6402d1e15ca16f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1105 zcmV-X1g`suP)f#B!^H?MQO{IA=t#m1}|nm?A>(_)SCb%xGicA&2!p$HSf$b&pR^|J zKF|F8JTo&hXqt90fjVyMYa}B9MqiwT4Kwx4>JpOBe-5-`nkI%Z2!$xSyDQBT&~=?$F2|SIxA^(s zeE`x%nmyw&A3o?{WMqUwSAipEle-5u34(xiZJq7J8dcL|a&j_^B}o#pEaQ0|Ksb^Y zD&Tn@f*|nl;X@Qf0l;-#Y};mbb~X%_%jLp5f*_zM3eM*lgbe84rm$_BJ9~SifUgDy zFirDf0+wYV%QB{El1wJ)?(Qa&$>6#!sZ@&o{(cr07g1G}_V#xA`}^72+G1yC2Y{{z z1K75W7So8uVtm)x34o#~M5EE>6)++Ky=@Z3e44+q$RK^*%ob`8inm& z5N#VNa6`2|85;wRyWepfo-Ql^G^YR@kCLKDT<^I;WUov|ROQLaGu|6WA&L^)nLT#$ zCaGi_q9{>uG&ZvPc(oe0Z{6bly?c1oDxUA7sw%^yqx?8GhhZ4a5l|EbrxsyuX^n)@ z%I^LlS2{Xb`gNOx(MoRrkVLYZ<==Nu6p^x3p(oWxHk-wDU6RQp8yg#VKr$Y0xPZ67%0;yLZ2m-siyBLOnZQEf$%d$wP(}<#oVHk*_h%C!gDiu^sYq$Z=B``id ze&!e545p^0YUOen*L7b6mt`bL3JEmY1LEIF)(G`KsO!3+GNLGkDnjEYxHJMU&$u8- zz_9|rE1U4r2-K@9l}fZ3MwmPni~T!K@N$*1C^r0Vgi9k($IR?3z9=$0Jj~G05PCe$ z+WI>17sl|P;`>LB5dW;)_kA=?Ync2}2^5P(f*|19wQB$;c7$n~1VPZS2VUbf{&V~R Xdl>ufOHIYt00000NkvXXu0mjfe%1a$ diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/meta.json b/Resources/Textures/Structures/Storage/tanks.rsi/meta.json index c4d31e80b2..93b557cf5a 100644 --- a/Resources/Textures/Structures/Storage/tanks.rsi/meta.json +++ b/Resources/Textures/Structures/Storage/tanks.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/8442af39ee82b813194f71db82edd2923d97818d, watercooler Taken from paradise at https://github.com/ParadiseSS13/Paradise/commit/ae2258d9235752ac6d80ec11e36553fe3b6ae59e, dispensers taken from paradise at https://github.com/ParadiseSS13/Paradise/commit/846ce475b2258a4336d8895f07f2c0f4053963bc", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/8442af39ee82b813194f71db82edd2923d97818d, watercooler Taken from paradise at https://github.com/ParadiseSS13/Paradise/commit/ae2258d9235752ac6d80ec11e36553fe3b6ae59e", "size": { "x": 32, "y": 32 @@ -117,15 +117,6 @@ }, { "name": "generictank-1" - }, - { - "name": "cleanerdispenser" - }, - { - "name": "fueldispenser" - }, - { - "name": "pepperdispenser" } ] } diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/pepperdispenser.png b/Resources/Textures/Structures/Storage/tanks.rsi/pepperdispenser.png deleted file mode 100644 index f8b99b524446dd701aafb921634bae454f2068bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1096 zcmV-O1h@N%P)dAG#Z;aRR4f+R z+uJ)rU~zHr*en|9KYK1o(jk(^63}%$H0;~nWbM%-%0X?t*7rvCBpKk^wQHO`dlpqy ziO1vY?CdZ-JV+3Vqt+xG3~i>vcI49_IB)+Ri^KK zANn$k^Hi(V<|D z5oaW2@NQCN*30p6p~MHN)=>VufqWm>-rfe1n5KzgoQFb;t*v{_6VP>?d_K=7oxS{a z@ht!zyz+qEnHk=;+ZY-eqR?BQyt>Lq7cLM40n44stS>E5HBClGM?+tcNCZVu@H`J7 z9LWo*`CI2m)9vmARgbQ4@kY z6`x<63Kz8&YC;eM@U7(_s#UIBzRb-VH}I-eJl{uERR%9z;)mO}F$|+Q0zwFuk}vb= z!%cccgkLKj(XKAO+}xM%S3DBk-At^nqedilynwdeUW5?1u1h+dW@Tjs4@f5x4HwX{ z1nR3;RaNFvDSq~ST3T9ARh5NIh6TX)eWHrOOeTY(?7J|YG%HX3%Rg{7?jw=4_OG?8T)!!VF#8AVa3R4S;N)^GzJOJHPVL_z|M_JI6%f;B?@1$A9Ftc)znM59mFaHA_YH3A1`T#7^h!v1(( z6P_A@dUmB!iB`i1gU93Xf9DDgW~s<>!|z5oH3D@^Oitpv?lDY5uXqwhA_^A>o7K;QyKv!26aCAomLC~-VUf>1(bNmS!?EBEu{@2q0 O0000EX>4Tx04R}tkv&MmKpe$iTeTup!FCXF$WR5rE-K+0Yt2!bCV?t+t|iu}v_ypoO(+!Jwop^fF z(mC%FM_5Txh|h_~4Z0xlBiCh@-#8Z?_Vdh$kx9=HM~H=D8_R9XN`^{2MI2RBjq?3j zmle)ioYiubHSft^7|LtQOI)Wpj3gGY2oVBgRI!0FEW~KlNHLM7{e*{q$nlHhlF79J zMvi$@ph9x|;D7MDTeC1Z;U{oBCBbxV`?fXf|V@JW{p$&msy{e=SXen#Jv1H!jJ&#K#7b04Py{D4^000SaNLh0L z01FcU01FcV0GgZ_00007bV*G`2k8b56B{?3>k-8O00NLnL_t(o!|j&OOB7)o#y^(M z`|dJJE6c2QDb!Bba#Hr zNT?QLdfWA4~~s3_p^$X&jq769nG zGvdje2(}z-;C<`&N%I4cb2>WQuD1SmqVkeDDG z$SGgbb(R)Wgn}6Weyy*S<%$rzfA{w9d_dE*?D_5p-}ImO@q_#xKiSs8$Np(FsnPi+ zk}K57X@Z)@hwcc8`A-;z(cnt}Ku=$P!5@0@{d~Z|{NhrHfU+rY+HmmlO*h9%DDKIV zu_(j0ZeyAzmbJ4Np#Z9?GWzmG^+lLYrwjVri|2~aWc9~)M#o;|%J9Z@+K->`UxZRh z6d_2)qO`WQ7C2ue?l_@k?XYPW?s}Vs!O`aC>I68QF!B0nL1%bz2Q!H|#2%kX%yGK2 z)4u>A1j{R{zE8vaE@(Rvs`{iX5m0}M{P)EX>4Tx04R}tkv&MmKpe$iTeTup!FCXF$WR5rE-K+0Yt2!bCV?t+t|iu}v_ypoO(+!Jwop^fF z(mC%FM_5Txh|h_~4Z0xlBiCh@-#8Z?_Vdh$kx9=HM~H=D8_R9XN`^{2MI2RBjq?3j zmle)ioYiubHSft^7|LtQOI)Wpj3gGY2oVBgRI!0FEW~KlNHLM7{e*{q$nlHhlF79J zMvi$@ph9x|;D7MDTeC1Z;U{oBCBbxV`?fXf|V@JW{p$&msy{e=SXen#Jv1H!jJ&#K#7b04Py{D4^000SaNLh0L z01FcU01FcV0GgZ_00007bV*G`2k8b56CMY~Mb#_-001;eL_t(o!|l+q4ZuJQ12K76 zZ|B`SLbAa>kR}b;9n>iS0N`hJ8fWI&-6TnO*R9EX>4Tx04R}tkv&MmKpe$iTeTup!FCXF$WR5rE-K+0Yt2!bCV?t+t|iu}v_ypoO(+!Jwop^fF z(mC%FM_5Txh|h_~4Z0xlBiCh@-#8Z?_Vdh$kx9=HM~H=D8_R9XN`^{2MI2RBjq?3j zmle)ioYiubHSft^7|LtQOI)Wpj3gGY2oVBgRI!0FEW~KlNHLM7{e*{q$nlHhlF79J zMvi$@ph9x|;D7MDTeC1Z;U{oBCBbxV`?fXf|V@JW{p$&msy{e=SXen#Jv1H!jJ&#K#7b04Py{D4^000SaNLh0L z01FcU01FcV0GgZ_00007bV*G`2k8b56CNaFBBWjb002)(L_t(o!|l?c4ZtuAMA3`X zRWp@W$Wlgz9w5L)rD+rt@E`j+U}6aX0N_?;Rv&k-oj$qqtj37YoO8QRwADDqsLYfk h_1@cG^EUv16E897R0j1HfG+?5002ovPDHLkV1lW!2p<3d literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Wallmounts/walldispenser.rsi/fill-3.png b/Resources/Textures/Structures/Wallmounts/walldispenser.rsi/fill-3.png new file mode 100644 index 0000000000000000000000000000000000000000..16db0b0904340e277cb24e793fb046b18f2bcfc9 GIT binary patch literal 599 zcmV-d0;v6oP)EX>4Tx04R}tkv&MmKpe$iTeTup!FCXF$WR5rE-K+0Yt2!bCV?t+t|iu}v_ypoO(+!Jwop^fF z(mC%FM_5Txh|h_~4Z0xlBiCh@-#8Z?_Vdh$kx9=HM~H=D8_R9XN`^{2MI2RBjq?3j zmle)ioYiubHSft^7|LtQOI)Wpj3gGY2oVBgRI!0FEW~KlNHLM7{e*{q$nlHhlF79J zMvi$@ph9x|;D7MDTeC1Z;U{oBCBbxV`?fXf|V@JW{p$&msy{e=SXen#Jv1H!jJ&#K#7b04Py{D4^000SaNLh0L z01FcU01FcV0GgZ_00007bV*G`2k8b56CVLKJwaFi002`-L_t(o!|l?c4FE9=Ls3_{ zRXbHy=u$y}8K5ACj`pgeg8!Ih5Gk?*0Kl!xtUm5uJDIPsfs;GWs*DKDIk)qPwkpRM lm6?*H-h2DY>;?dE;sqwyf)rzqUmgGe002ovPDHLkV1lQ>3N-)# literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Wallmounts/walldispenser.rsi/fill-4.png b/Resources/Textures/Structures/Wallmounts/walldispenser.rsi/fill-4.png new file mode 100644 index 0000000000000000000000000000000000000000..087ca74ecd98190f26df96803aefaa4f42124706 GIT binary patch literal 619 zcmV-x0+juUP)EX>4Tx04R}tkv&MmKpe$iTeTup!FCXF$WR5rE-K+0Yt2!bCV?t+t|iu}v_ypoO(+!Jwop^fF z(mC%FM_5Txh|h_~4Z0xlBiCh@-#8Z?_Vdh$kx9=HM~H=D8_R9XN`^{2MI2RBjq?3j zmle)ioYiubHSft^7|LtQOI)Wpj3gGY2oVBgRI!0FEW~KlNHLM7{e*{q$nlHhlF79J zMvi$@ph9x|;D7MDTeC1Z;U{oBCBbxV`?fXf|V@JW{p$&msy{e=SXen#Jv1H!jJ&#K#7b04Py{D4^000SaNLh0L z01FcU01FcV0GgZ_00007bV*G`2k8b56CWD9SctR$003u6L_t(o!|l_t4Zt7_MA0M4 z9!$qntiV!Klng*YnjobjmX#vKf8EK2ZON7Z0DqNpo=dHDTC%6lu`7mKj4@d9=L0-9 zv}EuFo<8TU*jm#V!<;>~?^8;dy?04cN-4Z$?gjwhaRK`DrWhVYg5>}J002ovPDHLk FV1nKh6;J>G literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Wallmounts/walldispenser.rsi/fill-5.png b/Resources/Textures/Structures/Wallmounts/walldispenser.rsi/fill-5.png new file mode 100644 index 0000000000000000000000000000000000000000..cbc6e5f12a5dec068d5827801ab0cf7a6cdd3845 GIT binary patch literal 649 zcmV;40(Sk0P)EX>4Tx04R}tkv&MmKpe$iTeTup!FCXF$WR5rE-K+0Yt2!bCV?t+t|iu}v_ypoO(+!Jwop^fF z(mC%FM_5Txh|h_~4Z0xlBiCh@-#8Z?_Vdh$kx9=HM~H=D8_R9XN`^{2MI2RBjq?3j zmle)ioYiubHSft^7|LtQOI)Wpj3gGY2oVBgRI!0FEW~KlNHLM7{e*{q$nlHhlF79J zMvi$@ph9x|;D7MDTeC1Z;U{oBCBbxV`?fXf|V@JW{p$&msy{e=SXen#Jv1H!jJ&#K#7b04Py{D4^000SaNLh0L z01FcU01FcV0GgZ_00007bV*G`2k8b56CX4F>JZof004zaL_t(o!|l|u2?QY&1kmxg zCQP&->#(Zdf)&_}k)Z_`{7aT)BljZ<#~t&sVFCw40V1L=bE~qHqGJpIK+f6SEqUjh_p0o@ jpYPm~fAS|JA|m<#)LW$e9`u9&00000NkvXXu0mjfn#LsY literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Wallmounts/walldispenser.rsi/fueldispenser.png b/Resources/Textures/Structures/Wallmounts/walldispenser.rsi/fueldispenser.png new file mode 100644 index 0000000000000000000000000000000000000000..75556478b70c53c877db84fd60c345f155067703 GIT binary patch literal 1170 zcmV;D1a13?P)EX>4Tx04R}tkv&MmKpe$iTeTup!FCXF$WR5rE-K+0Yt2!bCV?t+t|iu}v_ypoO(+!Jwop^fF z(mC%FM_5Txh|h_~4Z0xlBiCh@-#8Z?_Vdh$kx9=HM~H=D8_R9XN`^{2MI2RBjq?3j zmle)ioYiubHSft^7|LtQOI)Wpj3gGY2oVBgRI!0FEW~KlNHLM7{e*{q$nlHhlF79J zMvi$@ph9x|;D7MDTeC1Z;U{oBCBbxV`?fXf|V@JW{p$&msy{e=SXen#Jv1H!jJ&#K#7b04Py{D4^000SaNLh0L z01FcU01FcV0GgZ_00007bV*G`2k8b56C4c`re3fB00NFlL_t(o!|j&OOB7)o#y^J6 zJG;!%xTa7hXdOIkLeN1FM5v^YpkH7VUGm;v;JLq`KfsF+c`$>$gw;h|gm!g75>_+< z+j7UW5vQD4#Obikw7=Y$wY4t$oaTAonfHC>`{Q|EsH2WL{xcei2fDkvZOgJSO%u~J zYqE(f%gC~f5Q0=HRj_Ac@ynKFaj~NvfUIS?u$-8#$dj=sk`P?IcD-yAW@l&0MzpMetYvYz?-r5BB@AQNo%74)q$Bsfp0nbMt^C`6qK>wpr zPwqtUv);mn@eBA-kk+aNJbgBfX_{zShIl;g$pH*wmwBldI{vJapC(@dBq3N%OcM^| zly7Jnt1Br&!7Knd-u|5rsH$pT>51?~`;H$!$nWv(v_SuGJzHU&-_4&J=)=2!~FJ$W(~ zW%$8E48y=Q_YNZzKv5JXUcRWl2)DPl3kt}K=L*gs{p~9gldk|6zIT`Qv*-L5p)AWt zLXeC_X>DySaK1|1aYEDFV@KEB^>%cfmgeT_1UQ{A{d%mRGrYKi`NRU^kk2O;xX{(* zUw{yTwe_^`(=fja+D?b6J}FBC6d#v<(b?H)Lry?bQxgXV2kvtvoT}Bu;<$H*#*+{r zNfNegyU+h50>?#TtrwK#fZG91QOk1RhK5R Date: Mon, 27 Oct 2025 23:10:48 +0000 Subject: [PATCH 027/121] 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 a97f0fc97a..96a6287dc1 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: hoshizora-sayo - changes: - - message: Fixed crafting menu entries that included modular machine parts - type: Fix - id: 8664 - time: '2025-06-13T05:21:57.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/38299 - author: nkokic changes: - message: Tear gas smoke is now white and semi-transparent. @@ -3925,3 +3918,11 @@ id: 9165 time: '2025-10-27T22:54:45.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/41153 +- author: scrivoy + changes: + - message: Fuel dispensers now explode when ignited with a welding tool, similar + to fuel tanks. + type: Tweak + id: 9166 + time: '2025-10-27T23:09:40.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/36251 From 39fc0052a44c0fb6a3aeab628b7791c772a6d66e Mon Sep 17 00:00:00 2001 From: TheGrimbeeper Date: Tue, 28 Oct 2025 18:10:44 +1100 Subject: [PATCH 028/121] Xenoartifact: Fix phasing effect (#41160) --- .../Xenoarchaeology/Artifact/XAE/XAERemoveCollisionSystem.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Shared/Xenoarchaeology/Artifact/XAE/XAERemoveCollisionSystem.cs b/Content.Shared/Xenoarchaeology/Artifact/XAE/XAERemoveCollisionSystem.cs index 5b557a77f3..f047416076 100644 --- a/Content.Shared/Xenoarchaeology/Artifact/XAE/XAERemoveCollisionSystem.cs +++ b/Content.Shared/Xenoarchaeology/Artifact/XAE/XAERemoveCollisionSystem.cs @@ -14,12 +14,12 @@ public sealed class XAERemoveCollisionSystem : BaseXAESystem protected override void OnActivated(Entity ent, ref XenoArtifactNodeActivatedEvent args) { - if (!TryComp(ent.Owner, out var fixtures)) + if (!TryComp(args.Artifact, out var fixtures)) return; foreach (var fixture in fixtures.Fixtures.Values) { - _physics.SetHard(ent.Owner, fixture, false, fixtures); + _physics.SetHard(args.Artifact, fixture, false, fixtures); } } } From 9526d2092aacdddab3ec11488da737f3634a9490 Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 28 Oct 2025 07:22:41 +0000 Subject: [PATCH 029/121] Automatic changelog update --- Resources/Changelog/Changelog.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 96a6287dc1..ba209f40b6 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,14 +1,4 @@ Entries: -- author: nkokic - changes: - - message: Tear gas smoke is now white and semi-transparent. - type: Tweak - - message: Tear gas now causes coughing, slows you down and hits a bit faster than - before. - type: Add - id: 8665 - time: '2025-06-13T13:53:44.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/36440 - author: M1tht1c changes: - message: You can now remove visitors mindshields. @@ -3926,3 +3916,10 @@ id: 9166 time: '2025-10-27T23:09:40.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/36251 +- author: TheGrimbeeper + changes: + - message: Artifact phasing fixed. + type: Fix + id: 9167 + time: '2025-10-28T07:21:31.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/41160 From 5ee1fa3e2c6094b8c0b8c9974e3b033828447b91 Mon Sep 17 00:00:00 2001 From: Errant <35878406+Errant-4@users.noreply.github.com> Date: Tue, 28 Oct 2025 11:27:07 +0100 Subject: [PATCH 030/121] update support email (#41166) * update support email * one more * one one more --- CODE_OF_CONDUCT.md | 2 +- Resources/ConfigPresets/WizardsDen/wizardsDen.toml | 2 +- SECURITY.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index b2aeb6197a..f8f22fb3f8 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -8,7 +8,7 @@ This isn’t an exhaustive list of things that you can’t do. Rather, take it i This code of conduct applies specifically to the Github repositories and its spaces managed by the Space Station 14 project or Space Wizards Federation. Some spaces, such as the Space Station 14 Discord or the official Wizard's Den game servers, have their own rules but are in spirit equal to what may be found in here. -If you believe someone is violating the code of conduct, we ask that you report it by contacting a Maintainer, Project Manager or Wizard staff member through [Discord](https://discord.ss14.io/), [the forums](https://forum.spacestation14.com/), or emailing [telecommunications@spacestation14.com](mailto:telecommunications@spacestation14.com). +If you believe someone is violating the code of conduct, we ask that you report it by contacting a Maintainer, Project Manager or Wizard staff member through [Discord](https://discord.ss14.io/), [the forums](https://forum.spacestation14.com/), or emailing [support@spacestation14.com](mailto:support@spacestation14.com). - **Be friendly and patient.** - **Be welcoming.** We strive to be a community that welcomes and supports people of all backgrounds and identities. This includes, but is not limited to members of any race, ethnicity, culture, national origin, colour, immigration status, social and economic class, educational level, sex, sexual orientation, gender identity and expression, age, size, family status, political belief, religion, and mental and physical ability. diff --git a/Resources/ConfigPresets/WizardsDen/wizardsDen.toml b/Resources/ConfigPresets/WizardsDen/wizardsDen.toml index 6d2259e350..547dc6d6fa 100644 --- a/Resources/ConfigPresets/WizardsDen/wizardsDen.toml +++ b/Resources/ConfigPresets/WizardsDen/wizardsDen.toml @@ -15,7 +15,7 @@ panic_bunker.custom_reason = "You have not played on a Wizard's Den server long # IPIntel stuff ipintel_enabled = true -ipintel_contact_email = "telecommunications@spacestation14.com" +ipintel_contact_email = "support@spacestation14.com" ipintel_bad_rating = 0.99 ipintel_alert_admin_warn_rating = 0.95 diff --git a/SECURITY.md b/SECURITY.md index 38197078a3..54186c1c3b 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -1,7 +1,7 @@ # Reporting a security vulnerability You can report a security vulnerability through Discord or through email. -If you want to send an email, you can contact us at . +If you want to send an email, you can contact us at . If you want to contact us through Discord, you can join [our server](https://discord.gg/MwDDf6t) and then **privately** message anyone with the `@Wizard` or `@SS14 Maintainer` role. From c8b26adb38473aa83c11c5a337b25b3e573583eb Mon Sep 17 00:00:00 2001 From: emberwinters Date: Tue, 28 Oct 2025 14:01:13 -0300 Subject: [PATCH 031/121] Diphenhydramine drowsiness maximum fix (#41169) Update medicine.yml --- Resources/Prototypes/Reagents/medicine.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index 998f508b61..706fe6c7ca 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -93,7 +93,6 @@ - !type:ModifyStatusEffect effectProto: StatusEffectDrowsiness time: 1.5 - type: Add - !type:HealthChange damage: types: From b942c8aa138bb6b75707b915b5a2774b3770307c Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 28 Oct 2025 17:15:27 +0000 Subject: [PATCH 032/121] 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 ba209f40b6..0323c1b8b5 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,13 +1,4 @@ Entries: -- author: M1tht1c - changes: - - message: You can now remove visitors mindshields. - type: Fix - - message: Disaster victims now have mindshields when appropriate. - type: Fix - id: 8666 - time: '2025-06-13T14:43:41.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/36537 - author: SyaoranFox changes: - message: Rat King is now a full antag. @@ -3923,3 +3914,10 @@ id: 9167 time: '2025-10-28T07:21:31.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/41160 +- author: emberwinters + changes: + - message: Diphenhydramine now respects its maximum drowsiness + type: Fix + id: 9168 + time: '2025-10-28T17:14:19.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/41169 From 222aaa9b59262693e0a5faed2a1eee8ed74ccf62 Mon Sep 17 00:00:00 2001 From: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com> Date: Tue, 28 Oct 2025 11:31:53 -0700 Subject: [PATCH 033/121] [HOTFIX] Fix status effect removal from entity effects and buckets not being draggable (#41168) just do less work it's that easy! Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> --- .../Fluids/EntitySystems/SolutionDumpingSystem.cs | 11 +---------- .../StatusEffectNew/StatusEffectSystem.API.cs | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/Content.Shared/Fluids/EntitySystems/SolutionDumpingSystem.cs b/Content.Shared/Fluids/EntitySystems/SolutionDumpingSystem.cs index b2bbcb2942..a6f4a8b31f 100644 --- a/Content.Shared/Fluids/EntitySystems/SolutionDumpingSystem.cs +++ b/Content.Shared/Fluids/EntitySystems/SolutionDumpingSystem.cs @@ -4,7 +4,6 @@ using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.EntitySystems; using Content.Shared.DragDrop; using Content.Shared.FixedPoint; -using Content.Shared.Item; using Content.Shared.Nutrition.EntitySystems; using Content.Shared.Popups; using Robust.Shared.Audio.Systems; @@ -20,7 +19,6 @@ namespace Content.Shared.Fluids.EntitySystems; /// /// /// -/// public sealed class SolutionDumpingSystem : EntitySystem { [Dependency] private readonly IPrototypeManager _protoMan = default!; @@ -30,8 +28,6 @@ public sealed class SolutionDumpingSystem : EntitySystem [Dependency] private readonly SharedPopupSystem _popup = default!; [Dependency] private readonly SharedSolutionContainerSystem _solContainer = default!; - private EntityQuery _itemQuery; - private EntityQuery _refillableQuery; private EntityQuery _dumpQuery; public override void Initialize() @@ -40,22 +36,17 @@ public sealed class SolutionDumpingSystem : EntitySystem SubscribeLocalEvent(OnDrainableCanDrag); SubscribeLocalEvent(OnDrainableCanDragDropped); - - //SubscribeLocalEvent(OnRefillableDragged); For if you want to refill a container by dragging it into another one. Can't find a use for that currently. SubscribeLocalEvent(OnDrainableDragged); SubscribeLocalEvent(OnDrainedToDumpableDragged); // We use queries for these since CanDropDraggedEvent gets called pretty rapidly - _itemQuery = GetEntityQuery(); - _refillableQuery = GetEntityQuery(); _dumpQuery = GetEntityQuery(); } private void OnDrainableCanDrag(Entity ent, ref CanDragEvent args) { - if (_itemQuery.HasComp(ent)) - args.Handled = true; + args.Handled = true; } private void OnDrainableCanDragDropped(Entity ent, ref CanDropDraggedEvent args) diff --git a/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs b/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs index 0d153ecfaa..ab6362746c 100644 --- a/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs +++ b/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs @@ -306,7 +306,7 @@ public sealed partial class StatusEffectsSystem /// True if duration was edited successfully, false otherwise. public bool TryRemoveTime(EntityUid uid, EntProtoId effectProto, TimeSpan? time) { - return time == null ? TryRemoveStatusEffect(uid, effectProto) : TryAddTime(uid, effectProto, time.Value); + return time == null ? TryRemoveStatusEffect(uid, effectProto) : TryAddTime(uid, effectProto, - time.Value); } /// From 5c09eed0806a74dc28075422ea304276097309b5 Mon Sep 17 00:00:00 2001 From: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com> Date: Tue, 28 Oct 2025 11:33:46 -0700 Subject: [PATCH 034/121] [Hotfix] Fix Phalanx (#41170) feex Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> --- Content.Server/Botany/Systems/PlantHolderSystem.cs | 7 ++++--- Resources/Prototypes/Reagents/medicine.yml | 5 +---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Content.Server/Botany/Systems/PlantHolderSystem.cs b/Content.Server/Botany/Systems/PlantHolderSystem.cs index 2554f95455..1e992f9cd2 100644 --- a/Content.Server/Botany/Systems/PlantHolderSystem.cs +++ b/Content.Server/Botany/Systems/PlantHolderSystem.cs @@ -886,12 +886,13 @@ public sealed class PlantHolderSystem : EntitySystem if (solution.Volume > 0 && component.MutationLevel < 25) { - var amt = FixedPoint2.New(1); - foreach (var entry in _solutionContainerSystem.RemoveEachReagent(component.SoilSolution.Value, amt)) + foreach (var entry in component.SoilSolution.Value.Comp.Solution.Contents) { var reagentProto = _prototype.Index(entry.Reagent.Prototype); - _entityEffects.ApplyEffects(uid, reagentProto.PlantMetabolisms.ToArray()); + _entityEffects.ApplyEffects(uid, reagentProto.PlantMetabolisms.ToArray(), entry.Quantity.Float()); } + + _solutionContainerSystem.RemoveEachReagent(component.SoilSolution.Value, FixedPoint2.New(1)); } CheckLevelSanity(uid, component); diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index 998f508b61..17c4dfcd5c 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -589,10 +589,7 @@ - !type:PlantAdjustToxins amount: 6 - !type:PlantPhalanximine - conditions: - - !type:ReagentCondition - reagent: Phalanximine - min: 4 + minScale: 4 metabolisms: Medicine: metabolismRate: 0.1 From 87a3b4fa5647753de6ff18473d356ed81dc2e855 Mon Sep 17 00:00:00 2001 From: kosticia Date: Tue, 28 Oct 2025 22:46:56 +0300 Subject: [PATCH 035/121] Rename kira special to the orange-lime soda (#41167) * rename kira * these one too * migration * Revert "migration" This reverts commit ae0006ef745909c2e17b37fd18fd1d57204fe773. * Revert "these one too" This reverts commit 9757d2cf6898719b158e03c0f3b637cd2b55ce17. * Revert "rename kira" This reverts commit 170408c6f7486a6746b7a7c52cf10c597ead2608. * bless the emo * aaaaa * time to end this right here and right now * Revert "time to end this right here and right now" This reverts commit b2c38573f9f8b5e8f736443d646d26839a0694cf. * Revert "aaaaa" This reverts commit 0f9451e22533b2f646211219e04103ce16d952ca. * Revert "bless the emo" This reverts commit 223607accf81e286481cab8d1037b1eb89a44dac. * rename * bikeshedding --------- Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> --- .../reagents/meta/consumable/drink/alcohol.ftl | 3 --- .../en-US/reagents/meta/consumable/drink/drinks.ftl | 3 +++ .../Spawners/Random/Food_Drinks/drinks_glass.yml | 2 +- .../Consumable/Drinks/drinks_metamorphic.yml | 8 ++++---- .../Prototypes/Reagents/Consumable/Drink/drinks.yml | 8 ++++---- Resources/Prototypes/Recipes/Reactions/drinks.yml | 4 ++-- .../fill-1.png | Bin .../fill-2.png | Bin .../fill-3.png | Bin .../icon.png | Bin .../icon_empty.png | Bin .../meta.json | 0 Resources/migration.yml | 3 +++ 13 files changed, 17 insertions(+), 14 deletions(-) rename Resources/Textures/Objects/Consumable/Drinks/{kiraspecial.rsi => orangelime_soda.rsi}/fill-1.png (100%) rename Resources/Textures/Objects/Consumable/Drinks/{kiraspecial.rsi => orangelime_soda.rsi}/fill-2.png (100%) rename Resources/Textures/Objects/Consumable/Drinks/{kiraspecial.rsi => orangelime_soda.rsi}/fill-3.png (100%) rename Resources/Textures/Objects/Consumable/Drinks/{kiraspecial.rsi => orangelime_soda.rsi}/icon.png (100%) rename Resources/Textures/Objects/Consumable/Drinks/{kiraspecial.rsi => orangelime_soda.rsi}/icon_empty.png (100%) rename Resources/Textures/Objects/Consumable/Drinks/{kiraspecial.rsi => orangelime_soda.rsi}/meta.json (100%) 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 733fad4cf9..12f6a2d867 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl @@ -193,9 +193,6 @@ reagent-desc-jungle-bird = Despite the name, it’s not exceptionally popular am reagent-name-kalimotxo = kalimotxo reagent-desc-kalimotxo = A high-class Cuba Libre, for the discerning alcoholic. -reagent-name-kira-special = Kira special -reagent-desc-kira-special = Long live the guy who everyone had mistaken for a girl. Baka! - reagent-name-tortuga = Tortuga reagent-desc-tortuga = Perfect for pirates who’ve been selected as the designated driver. Yarr! 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 c6964b55bc..02a87260d5 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl @@ -93,3 +93,6 @@ reagent-desc-posca = Poor warriors' drink from a forgotten era. reagent-name-mopwata = mopwata reagent-desc-mopwata = Dirty, stagnant mop water. + +reagent-name-orange-lime-soda = citrus bikeshed +reagent-desc-orange-lime-soda = The soda should be orange! No, it should be lemon-lime! 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 8504925528..d049250b55 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 @@ -70,7 +70,7 @@ - DrinkJackRoseGlass - DrinkJungleBirdGlass - DrinkKalimotxoGlass - - DrinkKiraSpecial + - DrinkOrangeLimeSodaGlass - DrinkLongIslandIcedTeaGlass - DrinkManhattanGlass - DrinkManlyDorfGlass diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml index 10a2b76657..aaa58be59c 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml @@ -1230,18 +1230,18 @@ - type: entity parent: DrinkGlass - id: DrinkKiraSpecial - suffix: kira special + id: DrinkOrangeLimeSodaGlass + suffix: citrus bikeshed components: - type: SolutionContainerManager solutions: drink: maxVol: 30 reagents: - - ReagentId: KiraSpecial + - ReagentId: OrangeLimeSoda Quantity: 30 - type: Icon - sprite: Objects/Consumable/Drinks/kiraspecial.rsi + sprite: Objects/Consumable/Drinks/orangelime_soda.rsi state: icon - type: entity diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml index 6fac8606d9..d21de70031 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml @@ -567,15 +567,15 @@ color: "#B3B599" - type: reagent - id: KiraSpecial - name: reagent-name-kira-special + id: OrangeLimeSoda + name: reagent-name-orange-lime-soda parent: BaseDrink - desc: reagent-desc-kira-special + desc: reagent-desc-orange-lime-soda physicalDesc: reagent-physical-desc-strong-smelling flavor: sweet color: "#CCCC99" metamorphicSprite: - sprite: Objects/Consumable/Drinks/kiraspecial.rsi + sprite: Objects/Consumable/Drinks/orangelime_soda.rsi state: icon_empty metamorphicMaxFillLevels: 3 metamorphicFillBaseName: fill- diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml index 1838f47509..c048b27b1a 100644 --- a/Resources/Prototypes/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml @@ -715,7 +715,7 @@ Kalimotxo: 2 - type: reaction - id: KiraSpecial + id: OrangeLimeSoda requiredMixerCategories: - Stir reactants: @@ -726,7 +726,7 @@ SodaWater: amount: 1 products: - KiraSpecial: 3 + OrangeLimeSoda: 3 - type: reaction id: Lemonade diff --git a/Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/orangelime_soda.rsi/fill-1.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/fill-1.png rename to Resources/Textures/Objects/Consumable/Drinks/orangelime_soda.rsi/fill-1.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/orangelime_soda.rsi/fill-2.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/fill-2.png rename to Resources/Textures/Objects/Consumable/Drinks/orangelime_soda.rsi/fill-2.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/orangelime_soda.rsi/fill-3.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/fill-3.png rename to Resources/Textures/Objects/Consumable/Drinks/orangelime_soda.rsi/fill-3.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/orangelime_soda.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/icon.png rename to Resources/Textures/Objects/Consumable/Drinks/orangelime_soda.rsi/icon.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/orangelime_soda.rsi/icon_empty.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/icon_empty.png rename to Resources/Textures/Objects/Consumable/Drinks/orangelime_soda.rsi/icon_empty.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/orangelime_soda.rsi/meta.json similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/meta.json rename to Resources/Textures/Objects/Consumable/Drinks/orangelime_soda.rsi/meta.json diff --git a/Resources/migration.yml b/Resources/migration.yml index 9a59d61c39..849e586655 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -735,3 +735,6 @@ WarpPointBombing: null ToyGriffin: ToyFigurineGriffin ToyOwlman: ToyFigurineOwlman ToySkeleton: ToyFigurineSkeleton + +# 2025-10-28 +DringKiraSpecial: DrinkOrangeLimeSodaGlass From dcb761610728bb4dcea059e6f7b9f45645f06806 Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 28 Oct 2025 19:59:28 +0000 Subject: [PATCH 036/121] 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 0323c1b8b5..6732f79655 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: SyaoranFox - changes: - - message: Rat King is now a full antag. - type: Tweak - id: 8667 - time: '2025-06-13T15:52:19.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/38124 - author: qrwas changes: - message: add missing locale for Undergarment @@ -3921,3 +3914,10 @@ id: 9168 time: '2025-10-28T17:14:19.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/41169 +- author: kosticia + changes: + - message: Kira special drink has been renamed to the citrus bikeshed. + type: Tweak + id: 9169 + time: '2025-10-28T19:58:20.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/41167 From 3f5bd8b565363565a83c6305f197c3aabeba8bf4 Mon Sep 17 00:00:00 2001 From: Sir Warock <67167466+SirWarock@users.noreply.github.com> Date: Wed, 29 Oct 2025 03:54:42 +0100 Subject: [PATCH 037/121] Widen Ammo UI (#40570) --- .../Weapons/Ranged/ItemStatus/BulletRender.cs | 13 ++++++++++++- .../Ranged/Systems/GunSystem.AmmoCounter.cs | 14 ++++++++++++-- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/Content.Client/Weapons/Ranged/ItemStatus/BulletRender.cs b/Content.Client/Weapons/Ranged/ItemStatus/BulletRender.cs index e6cb596b94..e11d5e7158 100644 --- a/Content.Client/Weapons/Ranged/ItemStatus/BulletRender.cs +++ b/Content.Client/Weapons/Ranged/ItemStatus/BulletRender.cs @@ -149,6 +149,15 @@ public sealed class BulletRender : BaseBulletRenderer public const int BulletHeight = 12; public const int VerticalSeparation = 2; + private static readonly LayoutParameters LayoutLarge = new LayoutParameters + { + ItemHeight = BulletHeight, + ItemSeparation = 6, + ItemWidth = 5, + VerticalSeparation = VerticalSeparation, + MinCountPerRow = MinCountPerRow + }; + private static readonly LayoutParameters LayoutNormal = new LayoutParameters { ItemHeight = BulletHeight, @@ -185,8 +194,9 @@ public sealed class BulletRender : BaseBulletRenderer if (_type == value) return; - Parameters = _type switch + Parameters = value switch { + BulletType.Large => LayoutLarge, BulletType.Normal => LayoutNormal, BulletType.Tiny => LayoutTiny, _ => throw new ArgumentOutOfRangeException() @@ -218,6 +228,7 @@ public sealed class BulletRender : BaseBulletRenderer public enum BulletType { + Large, Normal, Tiny } diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.AmmoCounter.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.AmmoCounter.cs index b9a5d1df9a..dc27a5db87 100644 --- a/Content.Client/Weapons/Ranged/Systems/GunSystem.AmmoCounter.cs +++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.AmmoCounter.cs @@ -110,7 +110,12 @@ public sealed partial class GunSystem _bulletRender.Count = count; _bulletRender.Capacity = capacity; - _bulletRender.Type = capacity > 50 ? BulletRender.BulletType.Tiny : BulletRender.BulletType.Normal; + _bulletRender.Type = capacity switch + { + > 50 => BulletRender.BulletType.Tiny, + > 15 => BulletRender.BulletType.Normal, + _ => BulletRender.BulletType.Large + }; } } @@ -236,7 +241,12 @@ public sealed partial class GunSystem _bulletRender.Count = count; _bulletRender.Capacity = capacity; - _bulletRender.Type = capacity > 50 ? BulletRender.BulletType.Tiny : BulletRender.BulletType.Normal; + _bulletRender.Type = capacity switch + { + > 50 => BulletRender.BulletType.Tiny, + > 15 => BulletRender.BulletType.Normal, + _ => BulletRender.BulletType.Large + }; _ammoCount.Text = $"x{count:00}"; } From b5fb76d629a8038c76bb6e6f60971a599a9c8b38 Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 29 Oct 2025 03:07:02 +0000 Subject: [PATCH 038/121] 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 6732f79655..dc7b367a45 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: qrwas - changes: - - message: add missing locale for Undergarment - type: Fix - id: 8668 - time: '2025-06-13T16:09:30.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/38304 - author: slarticodefast changes: - message: Fixed some reagents like puncturase healing bleeding when they shouldn't. @@ -3921,3 +3914,11 @@ id: 9169 time: '2025-10-28T19:58:20.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/41167 +- author: SirWarock + changes: + - message: Certain low-capacity weapons, like Mosin, Shotguns and Handguns will + have their ammo counter UI enlargened to have an easier time gauging your ammo. + type: Tweak + id: 9170 + time: '2025-10-29T03:05:55.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40570 From 7e828cae028359181f007b67091f0e807007a5ff Mon Sep 17 00:00:00 2001 From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com> Date: Wed, 29 Oct 2025 01:39:56 -0400 Subject: [PATCH 039/121] Department heads can now approve the use of their departmentally-restricted items (#40565) * Department heads can now approve their own department's minor contra * adjusted wording * adjusted wording --- .../ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml index 70b845ccd4..e56b826e3c 100644 --- a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml +++ b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml @@ -320,7 +320,7 @@ - The Captain or Head of Security may authorize individual use of minor contraband. Any contraband which is restricted to a department other than command or security is minor contraband unless otherwise specified. + Any contraband which is restricted to a department other than command or security is minor contraband unless otherwise specified. The Captain or Head of Security may authorize individual use of minor contraband, and other department heads may authorize individual use of minor contraband restricted to their assigned department. From 052b59172ebc16bad368245e6fa1f188407eb258 Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 29 Oct 2025 05:51:50 +0000 Subject: [PATCH 040/121] 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 dc7b367a45..a5a11cb67b 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: slarticodefast - changes: - - message: Fixed some reagents like puncturase healing bleeding when they shouldn't. - type: Fix - id: 8669 - time: '2025-06-13T16:11:15.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/38289 - author: Kittygyat changes: - message: Monkeys & kobolds can now wear emergency EVA suits, with a fresh new @@ -3922,3 +3915,11 @@ id: 9170 time: '2025-10-29T03:05:55.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/40570 +- author: Hitlinemoss + changes: + - message: Department heads are now legally able to approve the use of their departmentally-restricted + items without requiring Captain/HoS oversight. + type: Tweak + id: 9171 + time: '2025-10-29T05:50:43.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40565 From 932d3948eb4d13b9b55080c1c0674f0c507c70a2 Mon Sep 17 00:00:00 2001 From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com> Date: Wed, 29 Oct 2025 20:55:41 -0400 Subject: [PATCH 041/121] General touchups to antagonist flavor text (#41184) * General touchups to antagonist flavor text * Update Resources/Locale/en-US/game-ticking/game-presets/preset-wizard.ftl * Update Resources/Locale/en-US/game-ticking/game-presets/preset-wizard.ftl --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com> --- .../game-presets/preset-changeling.ftl | 4 +- .../game-presets/preset-nukeops.ftl | 10 ++--- .../game-presets/preset-revolutionary.ftl | 43 +++++++++---------- .../game-presets/preset-thief.ftl | 13 ++---- .../game-presets/preset-traitor.ftl | 11 +++-- .../game-presets/preset-wizard.ftl | 11 ++--- 6 files changed, 39 insertions(+), 53 deletions(-) diff --git a/Resources/Locale/en-US/game-ticking/game-presets/preset-changeling.ftl b/Resources/Locale/en-US/game-ticking/game-presets/preset-changeling.ftl index 32e79679cc..46a0a30d5d 100644 --- a/Resources/Locale/en-US/game-ticking/game-presets/preset-changeling.ftl +++ b/Resources/Locale/en-US/game-ticking/game-presets/preset-changeling.ftl @@ -1,8 +1,8 @@ changeling-role-greeting = - You are a Changeling, a highly intelligent predator. + You are a changeling, a highly intelligent predator. Your primary goal is to escape the station alive via assuming the identities of the denizens of this station. You are hungry and will not make it long without sustenance... - Kill, consume, hide, survive. + Kill. Consume. Hide. Survive. changeling-briefing = You are a changeling. diff --git a/Resources/Locale/en-US/game-ticking/game-presets/preset-nukeops.ftl b/Resources/Locale/en-US/game-ticking/game-presets/preset-nukeops.ftl index 92acfb2bfb..1343aaec7e 100644 --- a/Resources/Locale/en-US/game-ticking/game-presets/preset-nukeops.ftl +++ b/Resources/Locale/en-US/game-ticking/game-presets/preset-nukeops.ftl @@ -3,7 +3,7 @@ nukeops-description = Nuclear operatives have targeted the station. Try to keep nukeops-welcome = You are a nuclear operative. Your goal is to blow up {$station}, and ensure that it is nothing but a pile of rubble. Your bosses, the Syndicate, have provided you with the tools you'll need for the task. - Operation {$name} is a go ! Death to Nanotrasen! + Operation {$name} is a go! Death to Nanotrasen! nukeops-briefing = Your objectives are simple. Deliver the payload and get out before the payload detonates. Begin mission. nukeops-opsmajor = [color=crimson]Syndicate major victory![/color] @@ -13,10 +13,10 @@ nukeops-crewminor = [color=green]Crew minor victory![/color] nukeops-crewmajor = [color=green]Crew major victory![/color] nukeops-cond-nukeexplodedoncorrectstation = The nuclear operatives managed to blow up the station. -nukeops-cond-nukeexplodedonnukieoutpost = The nuclear operative outpost was destroyed by a nuclear blast. -nukeops-cond-nukeexplodedonincorrectlocation = The nuclear bomb was detonated off-station. +nukeops-cond-nukeexplodedonnukieoutpost = The nuclear operative outpost was destroyed by a nuclear blast! +nukeops-cond-nukeexplodedonincorrectlocation = The nuclear bomb detonated off-station. nukeops-cond-nukeactiveinstation = The nuclear bomb was left armed on-station. -nukeops-cond-nukeactiveatcentcom = The nuclear bomb was delivered to Central Command! +nukeops-cond-nukeactiveatcentcom = The nuclear bomb was armed and delivered to Central Command! nukeops-cond-nukediskoncentcom = The crew escaped with the nuclear authentication disk. nukeops-cond-nukedisknotoncentcom = The crew left the nuclear authentication disk behind. nukeops-cond-nukiesabandoned = The nuclear operatives were abandoned. @@ -24,7 +24,7 @@ nukeops-cond-allnukiesdead = All nuclear operatives have died. nukeops-cond-somenukiesalive = Some nuclear operatives died. nukeops-cond-allnukiesalive = No nuclear operatives died. -nukeops-list-start = The operatives were: +nukeops-list-start = The nuclear operatives were: nukeops-list-name = - [color=White]{$name}[/color] nukeops-list-name-user = - [color=White]{$name}[/color] ([color=gray]{$user}[/color]) nukeops-not-enough-ready-players = Not enough players readied up for the game! There were {$readyPlayersCount} players readied up out of {$minimumPlayers} needed. Can't start Nukeops. diff --git a/Resources/Locale/en-US/game-ticking/game-presets/preset-revolutionary.ftl b/Resources/Locale/en-US/game-ticking/game-presets/preset-revolutionary.ftl index 83edfd4d69..2c75886e77 100644 --- a/Resources/Locale/en-US/game-ticking/game-presets/preset-revolutionary.ftl +++ b/Resources/Locale/en-US/game-ticking/game-presets/preset-revolutionary.ftl @@ -1,56 +1,53 @@ ## Rev Head roles-antag-rev-head-name = Head Revolutionary -roles-antag-rev-head-objective = Your objective is to take over the station by converting people to your cause and killing all Command staff on station. +roles-antag-rev-head-objective = Your objective is to take over the station by converting people to your cause and eliminating all members of Command. head-rev-role-greeting = - You are a Head Revolutionary. - You are tasked with removing all of Command from station via conversion, death or imprisonment. - The Syndicate has sponsored you with a flash that converts the crew to your side. - Beware, this won't work on those with a mindshield or wearing eye protection. + You are a head revolutionary. You are tasked with removing all of Command from power through death, restraint, or conversion. + The Syndicate has sponsored you with a flash that converts others to your cause. Beware, this won't work on those with eye protection or mindshield implants. Remember that Command and Security are implanted with mindshields as part of the hiring process. Viva la revolución! head-rev-briefing = Use flashes to convert people to your cause. - Get rid of or convert all heads to take over the station. + Kill, restrain, or convert all members of Command to take over the station. -head-rev-break-mindshield = The Mindshield was destroyed! +head-rev-break-mindshield = The mindshield implant was destroyed! ## Rev roles-antag-rev-name = Revolutionary -roles-antag-rev-objective = Your objective is to ensure the safety and follow the orders of the Head Revolutionaries as well as getting rid or converting of all Command staff on station. +roles-antag-rev-objective = Your objective is to ensure the safety and follow the orders of the head revolutionaries, and to help them take over the station by eliminating all members of Command. rev-break-control = {$name} has remembered their true allegiance! rev-role-greeting = - You are a Revolutionary. - You are tasked with taking over the station and protecting the Head Revolutionaries. - Get rid of all of or convert the Command staff. + You are a revolutionary. You are tasked with protecting the head revolutionaries and helping them take over the station. + The revolution must work together to kill, restrain, or convert all members of Command. Viva la revolución! -rev-briefing = Help your head revolutionaries get rid of every head to take over the station. +rev-briefing = Help the head revolutionaries kill, restrain, or convert all members of Command to take over the station. ## General rev-title = Revolutionaries -rev-description = Revolutionaries are among us. +rev-description = Revolutionaries hidden among the crew are seeking to convert others to their cause and overthrow Command. -rev-not-enough-ready-players = Not enough players readied up for the game. There were {$readyPlayersCount} players readied up out of {$minimumPlayers} needed. Can't start a Revolution. -rev-no-one-ready = No players readied up! Can't start a Revolution. -rev-no-heads = There were no Head Revolutionaries to be selected. Can't start a Revolution. +rev-not-enough-ready-players = Not enough players readied up for the game. There were {$readyPlayersCount} players readied up out of {$minimumPlayers} needed. Can't start Revolutionaries. +rev-no-one-ready = No players readied up! Can't start Revolutionaries. +rev-no-heads = There were no Head Revolutionaries to be selected. Can't start Revolutionaries. -rev-won = The Head Revs survived and successfully seized control of the station. +rev-won = The head revolutionaries survived and successfully seized control of the station. -rev-lost = Command survived and killed all of the Head Revs. +rev-lost = All head revolutionaries have died, and Command survived. -rev-stalemate = All of the Head Revs and Command died. It's a draw. +rev-stalemate = Both Command and the head revolutionaries have all died. It's a draw. -rev-reverse-stalemate = Both Command and Head Revs survived. +rev-reverse-stalemate = Both Command and the head revolutionaries survived. rev-headrev-count = {$initialCount -> - [one] There was one Head Revolutionary: - *[other] There were {$initialCount} Head Revolutionaries: + [one] There was one head revolutionary: + *[other] There were {$initialCount} head revolutionaries: } rev-headrev-name-user = [color=#5e9cff]{$name}[/color] ([color=gray]{$username}[/color]) converted {$count} {$count -> @@ -67,7 +64,7 @@ rev-headrev-name = [color=#5e9cff]{$name}[/color] converted {$count} {$count -> rev-deconverted-title = Deconverted! rev-deconverted-text = - As the last headrev has died, the revolution is over. + As the last head revolutionary has died, the revolution is over. You are no longer a revolutionary, so be nice. rev-deconverted-confirm = Confirm diff --git a/Resources/Locale/en-US/game-ticking/game-presets/preset-thief.ftl b/Resources/Locale/en-US/game-ticking/game-presets/preset-thief.ftl index f3cc65f44e..14b51af35a 100644 --- a/Resources/Locale/en-US/game-ticking/game-presets/preset-thief.ftl +++ b/Resources/Locale/en-US/game-ticking/game-presets/preset-thief.ftl @@ -1,20 +1,13 @@ thief-role-greeting-human = - You are criminal scum, a kleptomaniac - previously arrested and on parole for petty theft. - You need to add more to your collection. - You were forcibly given a pacifism implant after your last arrest, - but that can't stop you from getting your fix by any means necessary. + You are criminal scum, a kleptomaniac previously arrested and on parole for petty theft. You need to add more to your collection. + You were forcibly given a pacifism implant after your last arrest, but that can't stop you from getting your fix by any means necessary. thief-role-greeting-animal = You are a kleptomaniac animal. Steal things that you like. thief-role-greeting-equipment = - You have a satchel of thieves' - tools and possess the innate - ability to steal without notice. - Choose your starting equipment, - and do your work stealthily. + You have a satchel of thieves' tools and possess the innate ability to steal without notice. Choose your starting equipment, and do your work stealthily. objective-issuer-thief = [color=#746694]Criminal[/color] diff --git a/Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl b/Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl index 378995279c..1b540d6524 100644 --- a/Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl +++ b/Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl @@ -24,9 +24,8 @@ traitor-death-match-end-round-description-entry = {$originalName}'s PDA, with {$ # TraitorRole traitor-role-greeting = - You are an agent sent by {$corporation} on behalf of [color = darkred]The Syndicate.[/color] - Your objectives and codewords are listed in the character menu. - Use your uplink to buy the tools you'll need for this mission. + You are an agent sent by [color = darkred]The Syndicate[/color] on behalf of {$corporation}. + Your objectives and codewords are listed in the character menu. Use your uplink to buy the tools you'll need for this mission. Death to Nanotrasen! traitor-role-codewords = The codewords are: [color = lightgray] @@ -35,7 +34,7 @@ traitor-role-codewords = Listen for them, and keep them secret. traitor-role-uplink-code = Set your ringtone to the notes [color = lightgray]{$code}[/color] to lock or unlock your uplink. - Remember to lock it after, or the stations crew will easily open it too! + Remember to lock it after, or the station's crew might find it! traitor-role-uplink-implant = Your uplink implant has been activated, access it from your hotbar. The uplink is secure unless someone removes it from your body. @@ -44,5 +43,5 @@ traitor-role-uplink-implant = traitor-role-codewords-short = The codewords are: {$codewords}. -traitor-role-uplink-code-short = Your uplink code is {$code}. Set it as your PDA ringtone to access uplink. -traitor-role-uplink-implant-short = Your uplink was implanted. Access it from your hotbar. +traitor-role-uplink-code-short = Your uplink code is {$code}. Set it as your PDA ringtone to access your uplink. +traitor-role-uplink-implant-short = Your uplink was implanted. Access it from the action menu. diff --git a/Resources/Locale/en-US/game-ticking/game-presets/preset-wizard.ftl b/Resources/Locale/en-US/game-ticking/game-presets/preset-wizard.ftl index 722db5fb46..3b4f43bc8d 100644 --- a/Resources/Locale/en-US/game-ticking/game-presets/preset-wizard.ftl +++ b/Resources/Locale/en-US/game-ticking/game-presets/preset-wizard.ftl @@ -5,8 +5,7 @@ roles-antag-survivor-name = Survivor roles-antag-survivor-objective = Current Objective: Survive survivor-role-greeting = - You are a Survivor. - Above all you need to make it back to CentComm alive. + You are a Survivor. Above all you need to make it back to Central Command alive. Collect as much firepower as needed to guarantee your survival. Trust no one. @@ -42,11 +41,9 @@ roles-antag-wizard-name = Wizard roles-antag-wizard-objective = Teach them a lesson they'll never forget. wizard-role-greeting = - YER A WIZARD! - There's been tensions between the Space Wizards Federation and NanoTrasen. - So you've been selected by the Space Wizards Federation to pay a visit to the station. - Give them a good demonstration of your powers. - What you do is up to you, just remember the Space Wizards want you to make it out alive. + It's wizard time, fireball! + There's been tensions between the Space Wizards Federation and NanoTrasen. You've been selected by the Space Wizards Federation to pay a visit to the station and give them a good "demonstration" of your powers. + What you do is up to you, but remember that the Space Wizards want you to make it out alive. wizard-round-end-name = wizard From 519bc389cc916a73ce6ed61697b0d2a52be8fe0e Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 30 Oct 2025 01:09:17 +0000 Subject: [PATCH 042/121] 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 a5a11cb67b..5d33f7ca86 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: Kittygyat - changes: - - message: Monkeys & kobolds can now wear emergency EVA suits, with a fresh new - sprite to go along with it! You're welcome, Pun-Pun enthusiasts! - type: Tweak - id: 8670 - time: '2025-06-13T18:54:21.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37660 - author: Nox38 changes: - message: The warden's dresser now contains their jumpsuits! @@ -3923,3 +3915,10 @@ id: 9171 time: '2025-10-29T05:50:43.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/40565 +- author: Hitlinemoss + changes: + - message: Antagonist flavor text has been adjusted. + type: Tweak + id: 9172 + time: '2025-10-30T01:08:06.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/41184 From e74e0b5c03009bacdc6581573e740081cf022d5b Mon Sep 17 00:00:00 2001 From: Connor Huffine Date: Wed, 29 Oct 2025 22:19:12 -0400 Subject: [PATCH 043/121] Readd CutWireVariationPass with Cvar (#41191) * Readd CutWireVariationPass * Add Cvar to disable cutwirevariationpass * Revert "Add Cvar to disable cutwirevariationpass" This reverts commit c8dab794a523a27385f6144ab09e99d19fc02c24. --- Resources/Prototypes/GameRules/roundstart.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml index df4d59fd5a..715a1f98c9 100644 --- a/Resources/Prototypes/GameRules/roundstart.yml +++ b/Resources/Prototypes/GameRules/roundstart.yml @@ -504,6 +504,7 @@ - id: BasicTrashVariationPass - id: SolidWallRustingVariationPass - id: ReinforcedWallRustingVariationPass + - id: CutWireVariationPass - id: BasicPuddleMessVariationPass prob: 0.99 orGroup: puddleMess From 37f7df66bf6e7cff504ea8add89dffa6dcf47019 Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 30 Oct 2025 02:31:36 +0000 Subject: [PATCH 044/121] 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 5d33f7ca86..a0d361a836 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Nox38 - changes: - - message: The warden's dresser now contains their jumpsuits! - type: Add - id: 8671 - time: '2025-06-14T08:59:40.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/38283 - author: Sparlight changes: - message: Corgium has been added. Consuming too much polymorphs you into a smart @@ -3922,3 +3915,10 @@ id: 9172 time: '2025-10-30T01:08:06.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/41184 +- author: kontakt + changes: + - message: Wires will once again break randomly at roundstart. + type: Fix + id: 9173 + time: '2025-10-30T02:30:28.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/41191 From 5cbc1cba48ba12067b7a3053393f9cdc4654331b Mon Sep 17 00:00:00 2001 From: Justin Pfeifler Date: Wed, 29 Oct 2025 22:17:13 -0500 Subject: [PATCH 045/121] Rejuvenating Resets Item Charges (#41165) * Add check for child entities with charges * Add reset charges on rejuvenate * Revert "Add check for child entities with charges" This reverts commit f55fd69da78ed3240e3b5349c854542516e2d1e1. * Revert "Add reset charges on rejuvenate" This reverts commit ee4221cd87c766d11f6f2a88b72b9de439a26e0a. * Add Reset Charges on Rejuvenate * Apply suggestions from code review * oops I broke it --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --- Content.Shared/Charges/Systems/SharedChargesSystem.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Content.Shared/Charges/Systems/SharedChargesSystem.cs b/Content.Shared/Charges/Systems/SharedChargesSystem.cs index 504648c41d..a48fbaaa8d 100644 --- a/Content.Shared/Charges/Systems/SharedChargesSystem.cs +++ b/Content.Shared/Charges/Systems/SharedChargesSystem.cs @@ -1,6 +1,7 @@ using Content.Shared.Actions.Events; using Content.Shared.Charges.Components; using Content.Shared.Examine; +using Content.Shared.Rejuvenate; using JetBrains.Annotations; using Robust.Shared.Timing; @@ -19,7 +20,7 @@ public abstract class SharedChargesSystem : EntitySystem base.Initialize(); SubscribeLocalEvent(OnExamine); - + SubscribeLocalEvent(OnRejuvenate); SubscribeLocalEvent(OnChargesAttempt); SubscribeLocalEvent(OnChargesMapInit); SubscribeLocalEvent(OnChargesPerformed); @@ -48,6 +49,11 @@ public abstract class SharedChargesSystem : EntitySystem args.PushMarkup(Loc.GetString("limited-charges-recharging", ("seconds", timeRemaining.TotalSeconds.ToString("F1")))); } + private void OnRejuvenate(Entity ent, ref RejuvenateEvent args) + { + ResetCharges(ent.AsNullable()); + } + private void OnChargesAttempt(Entity ent, ref ActionAttemptEvent args) { if (args.Cancelled) From 040ceb162b033b72227fb03fcc86e1e729f3abb0 Mon Sep 17 00:00:00 2001 From: Connor Huffine Date: Thu, 30 Oct 2025 05:29:02 -0400 Subject: [PATCH 046/121] TemperatureSystem Base Class Initialization (#41196) Add base class initialization --- Content.Server/Temperature/Systems/TemperatureSystem.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Content.Server/Temperature/Systems/TemperatureSystem.cs b/Content.Server/Temperature/Systems/TemperatureSystem.cs index 3bbde482c4..928b6ae9b5 100644 --- a/Content.Server/Temperature/Systems/TemperatureSystem.cs +++ b/Content.Server/Temperature/Systems/TemperatureSystem.cs @@ -41,6 +41,8 @@ public sealed class TemperatureSystem : SharedTemperatureSystem public override void Initialize() { + base.Initialize(); + SubscribeLocalEvent(EnqueueDamage); SubscribeLocalEvent(OnAtmosExposedUpdate); SubscribeLocalEvent(OnRejuvenate); From a181063eafcc8ed7dd9c27d4fb891b24f646ba84 Mon Sep 17 00:00:00 2001 From: Connor Huffine Date: Thu, 30 Oct 2025 08:42:53 -0400 Subject: [PATCH 047/121] Remove warnings in Pow3r (#41195) Refactor obsolete methods --- Pow3r/Program.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Pow3r/Program.cs b/Pow3r/Program.cs index 40c011ddcb..be5bf62f39 100644 --- a/Pow3r/Program.cs +++ b/Pow3r/Program.cs @@ -103,7 +103,7 @@ namespace Pow3r GLFW.WindowHint(WindowHintBool.SrgbCapable, true); var windowSettings = new NativeWindowSettings { - Size = (1280, 720), + ClientSize = (1280, 720), WindowState = WindowState.Maximized, StartVisible = false, @@ -199,9 +199,9 @@ namespace Pow3r _cursors[(int) ImGuiMouseCursor.Arrow] = GLFW.CreateStandardCursor(CursorShape.Arrow); _cursors[(int) ImGuiMouseCursor.TextInput] = GLFW.CreateStandardCursor(CursorShape.IBeam); - _cursors[(int) ImGuiMouseCursor.ResizeNS] = GLFW.CreateStandardCursor(CursorShape.VResize); - _cursors[(int) ImGuiMouseCursor.ResizeEW] = GLFW.CreateStandardCursor(CursorShape.HResize); - _cursors[(int) ImGuiMouseCursor.Hand] = GLFW.CreateStandardCursor(CursorShape.Hand); + _cursors[(int) ImGuiMouseCursor.ResizeNS] = GLFW.CreateStandardCursor(CursorShape.ResizeNS); + _cursors[(int) ImGuiMouseCursor.ResizeEW] = GLFW.CreateStandardCursor(CursorShape.ResizeEW); + _cursors[(int) ImGuiMouseCursor.Hand] = GLFW.CreateStandardCursor(CursorShape.PointingHand); _cursors[(int) ImGuiMouseCursor.ResizeAll] = GLFW.CreateStandardCursor(CursorShape.Arrow); _cursors[(int) ImGuiMouseCursor.ResizeNESW] = GLFW.CreateStandardCursor(CursorShape.Arrow); _cursors[(int) ImGuiMouseCursor.ResizeNWSE] = GLFW.CreateStandardCursor(CursorShape.Arrow); From 1cc726a6097ecda5560993a7ffed5e66585d8212 Mon Sep 17 00:00:00 2001 From: SnappingOpossum Date: Fri, 31 Oct 2025 06:19:36 +1100 Subject: [PATCH 048/121] Allow pacifists to use disabling modes of energy magnum and energy shotgun (#41029) Pacifists can stun with emagnum and eshotgun --- .../CombatMode/Pacification/PacificationSystem.cs | 5 +++++ .../Ranged/Components/BatteryWeaponFireModesComponent.cs | 6 ++++++ .../Entities/Objects/Weapons/Guns/Battery/battery_guns.yml | 2 ++ 3 files changed, 13 insertions(+) diff --git a/Content.Shared/CombatMode/Pacification/PacificationSystem.cs b/Content.Shared/CombatMode/Pacification/PacificationSystem.cs index 6bc32c5b96..22fbb53a93 100644 --- a/Content.Shared/CombatMode/Pacification/PacificationSystem.cs +++ b/Content.Shared/CombatMode/Pacification/PacificationSystem.cs @@ -6,6 +6,7 @@ using Content.Shared.IdentityManagement; using Content.Shared.Interaction.Events; using Content.Shared.Popups; using Content.Shared.Throwing; +using Content.Shared.Weapons.Ranged.Components; using Content.Shared.Weapons.Ranged.Events; using Robust.Shared.Timing; @@ -65,6 +66,10 @@ public sealed class PacificationSystem : EntitySystem if (HasComp(args.Used)) return; + if (TryComp(args.Used, out var component)) + if (component.FireModes[component.CurrentFireMode].PacifismAllowedMode) + return; + // Disallow firing guns in all cases. ShowPopup(ent, args.Used, "pacified-cannot-fire-gun"); args.Cancel(); diff --git a/Content.Shared/Weapons/Ranged/Components/BatteryWeaponFireModesComponent.cs b/Content.Shared/Weapons/Ranged/Components/BatteryWeaponFireModesComponent.cs index 77b9f53b7b..6986cf9fe9 100644 --- a/Content.Shared/Weapons/Ranged/Components/BatteryWeaponFireModesComponent.cs +++ b/Content.Shared/Weapons/Ranged/Components/BatteryWeaponFireModesComponent.cs @@ -42,6 +42,12 @@ public sealed partial class BatteryWeaponFireMode /// [DataField] public float FireCost = 100; + + /// + /// Wether or not this fire mode can be used by pacifists + /// + [DataField] + public bool PacifismAllowedMode = false; } [Serializable, NetSerializable] diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 2ab9141c76..8e2650b5fe 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -847,6 +847,7 @@ fireCost: 80 - proto: BulletDisablerSmgSpread fireCost: 48 + pacifismAllowedMode: true - type: Item size: Large sprite: Objects/Weapons/Guns/Battery/inhands_64x.rsi @@ -898,6 +899,7 @@ fireCost: 150 - proto: BulletDisabler fireCost: 62.5 + pacifismAllowedMode: true - type: BatterySelfRecharger autoRecharge: true autoRechargeRate: 48 From 6d53307711eb00b9f17f75c8168a90cce00af962 Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 30 Oct 2025 19:32:05 +0000 Subject: [PATCH 049/121] 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 a0d361a836..a45c81e411 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: Sparlight - changes: - - message: Corgium has been added. Consuming too much polymorphs you into a smart - corgi. - type: Add - id: 8672 - time: '2025-06-14T09:07:48.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37951 - author: Sparlight changes: - message: A pet bag for smart corgis to wear and a construction option for them. Not @@ -3922,3 +3914,11 @@ id: 9173 time: '2025-10-30T02:30:28.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/41191 +- author: SnappingOpossum + changes: + - message: Energy shotgun and energy magnum can now be used by pacifists in their + disabling modes. + type: Tweak + id: 9174 + time: '2025-10-30T19:30:57.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/41029 From 49860b820cb5fe9953bcff21206c6a2388a4126c Mon Sep 17 00:00:00 2001 From: rumaks Date: Thu, 30 Oct 2025 19:52:37 +0000 Subject: [PATCH 050/121] Change the recipe for licoxide to not require lead (#40991) change licoxide recipe --- Resources/Prototypes/Recipes/Reactions/fun.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Recipes/Reactions/fun.yml b/Resources/Prototypes/Recipes/Reactions/fun.yml index 9245f36a36..b000481476 100644 --- a/Resources/Prototypes/Recipes/Reactions/fun.yml +++ b/Resources/Prototypes/Recipes/Reactions/fun.yml @@ -55,7 +55,7 @@ - type: reaction id: Licoxide reactants: - Lead: + Lithium: amount: 1 Zinc: amount: 1 From d671b3f64a40ee7942c98b7613e555c2733a6385 Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 30 Oct 2025 20:05:13 +0000 Subject: [PATCH 051/121] 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 a45c81e411..f5f24d99bf 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: Sparlight - changes: - - message: A pet bag for smart corgis to wear and a construction option for them. Not - actually wearable by normal pets at this time. - type: Add - id: 8673 - time: '2025-06-14T16:09:06.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37440 - author: Nikitosych changes: - message: Fixed the ability for holoparasite to kill the host through the mech @@ -3922,3 +3914,10 @@ id: 9174 time: '2025-10-30T19:30:57.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/41029 +- author: rumaks-xyz + changes: + - message: Changed the recipe for licoxide to require lithium instead of lead. + type: Tweak + id: 9175 + time: '2025-10-30T20:04:05.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40991 From ed86c8bad705b34393929f1058c2ae3a67eb5968 Mon Sep 17 00:00:00 2001 From: kosticia Date: Thu, 30 Oct 2025 23:26:38 +0300 Subject: [PATCH 052/121] fix typo in migrations (#41203) aaaaaa --- Resources/migration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/migration.yml b/Resources/migration.yml index 849e586655..3cf660fdf4 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -737,4 +737,4 @@ ToyOwlman: ToyFigurineOwlman ToySkeleton: ToyFigurineSkeleton # 2025-10-28 -DringKiraSpecial: DrinkOrangeLimeSodaGlass +DrinkKiraSpecial: DrinkOrangeLimeSodaGlass From 036fef8054ce390540d86d9e417e0cbe88bc137b Mon Sep 17 00:00:00 2001 From: rumaks Date: Thu, 30 Oct 2025 20:41:13 +0000 Subject: [PATCH 053/121] Fix the ethanol guidebook entry (#41192) change liver metabolism rate to 1 --- Resources/Prototypes/Body/Organs/Animal/animal.yml | 1 - Resources/Prototypes/Body/Organs/Animal/slimes.yml | 2 +- Resources/Prototypes/Body/Organs/arachnid.yml | 1 - Resources/Prototypes/Body/Organs/diona.yml | 1 - Resources/Prototypes/Body/Organs/human.yml | 1 - Resources/Prototypes/Body/Organs/slime.yml | 4 ++-- .../Reagents/Consumable/Drink/alcohol.yml | 14 ++++++++------ 7 files changed, 11 insertions(+), 13 deletions(-) diff --git a/Resources/Prototypes/Body/Organs/Animal/animal.yml b/Resources/Prototypes/Body/Organs/Animal/animal.yml index 4aa14a440d..152c4c4112 100644 --- a/Resources/Prototypes/Body/Organs/Animal/animal.yml +++ b/Resources/Prototypes/Body/Organs/Animal/animal.yml @@ -125,7 +125,6 @@ metabolizerTypes: [ Animal ] groups: - id: Alcohol - rateModifier: 0.1 - type: Item size: Small heldPrefix: liver diff --git a/Resources/Prototypes/Body/Organs/Animal/slimes.yml b/Resources/Prototypes/Body/Organs/Animal/slimes.yml index c3e1965c06..0c72945c7a 100644 --- a/Resources/Prototypes/Body/Organs/Animal/slimes.yml +++ b/Resources/Prototypes/Body/Organs/Animal/slimes.yml @@ -19,7 +19,7 @@ - id: Poison - id: Narcotic - id: Alcohol - rateModifier: 0.2 + rateModifier: 2 - type: SolutionContainerManager solutions: stomach: diff --git a/Resources/Prototypes/Body/Organs/arachnid.yml b/Resources/Prototypes/Body/Organs/arachnid.yml index 129c06a688..337ead6e09 100644 --- a/Resources/Prototypes/Body/Organs/arachnid.yml +++ b/Resources/Prototypes/Body/Organs/arachnid.yml @@ -123,7 +123,6 @@ metabolizerTypes: [Animal] groups: - id: Alcohol - rateModifier: 0.1 # removes alcohol very slowly along with the stomach removing it as a drink - type: entity id: OrganArachnidKidneys diff --git a/Resources/Prototypes/Body/Organs/diona.yml b/Resources/Prototypes/Body/Organs/diona.yml index cf8e2d0c0a..81cee7c442 100644 --- a/Resources/Prototypes/Body/Organs/diona.yml +++ b/Resources/Prototypes/Body/Organs/diona.yml @@ -92,7 +92,6 @@ - id: Poison - id: Narcotic - id: Alcohol - rateModifier: 0.1 - type: Item size: Small heldPrefix: stomach diff --git a/Resources/Prototypes/Body/Organs/human.yml b/Resources/Prototypes/Body/Organs/human.yml index 4d7a077d4e..4ac5faf67b 100644 --- a/Resources/Prototypes/Body/Organs/human.yml +++ b/Resources/Prototypes/Body/Organs/human.yml @@ -225,7 +225,6 @@ metabolizerTypes: [Human] groups: - id: Alcohol - rateModifier: 0.1 # removes alcohol very slowly along with the stomach removing it as a drink - type: entity id: OrganHumanKidneys diff --git a/Resources/Prototypes/Body/Organs/slime.yml b/Resources/Prototypes/Body/Organs/slime.yml index ca22d25423..7f1a96a7f0 100644 --- a/Resources/Prototypes/Body/Organs/slime.yml +++ b/Resources/Prototypes/Body/Organs/slime.yml @@ -19,7 +19,7 @@ - id: Poison - id: Narcotic - id: Alcohol - rateModifier: 0.25 + rateModifier: 2.5 - type: SolutionContainerManager solutions: stomach: @@ -37,7 +37,7 @@ size: Small heldPrefix: brain - + - type: entity id: OrganSlimeLungs parent: BaseHumanOrgan diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index 3e35837dda..f25dee1391 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -162,6 +162,7 @@ meltingPoint: -114.1 metabolisms: Alcohol: + metabolismRate: 0.05 effects: - !type:HealthChange conditions: @@ -173,7 +174,7 @@ inverted: true damage: types: - Poison: 1 + Poison: 0.1 # dwarves take less toxin damage and heal a marginal amount of brute - !type:HealthChange conditions: @@ -184,7 +185,7 @@ type: [ Dwarf ] damage: types: - Poison: 0.2 + Poison: 0.02 - !type:HealthChange conditions: - !type:ReagentCondition @@ -194,7 +195,7 @@ type: [ Dwarf ] damage: groups: - Brute: -1 + Brute: -0.1 - !type:Vomit probability: 0.04 conditions: @@ -206,7 +207,7 @@ type: [ Dwarf ] inverted: true - !type:Drunk - boozePower: 20 + boozePower: 2 - type: reagent id: Gin @@ -2520,6 +2521,7 @@ reagent: Ethanol amount: 0.45 # TODO: Figure out why setting this to 0 means this does more damage... WHAT BUG IS THIS?!! Alcohol: + metabolismRate : 0.05 effects: - !type:Drunk boozePower: 10 @@ -2533,7 +2535,7 @@ inverted: true damage: types: - Poison: 2 # TODO: Figure out poison amount. Ethanol does 1, this does 2 but also metabolises almost 3 to 4 times as fast as ethanol. This would be more Liver damage when that time arrives. + Poison: 0.2 # TODO: Figure out poison amount. Ethanol does 0.1, this does 0.2 but also metabolises almost 3 to 4 times as fast as ethanol. This would be more Liver damage when that time arrives. - !type:HealthChange conditions: - !type:ReagentCondition @@ -2543,7 +2545,7 @@ type: [Dwarf] damage: types: - Poison: 0.4 # TODO: Might increase this, even though it's just double of ethanol from 0.2 to 0.4 + Poison: 0.04 # TODO: Might increase this, even though it's just double of ethanol from 0.02 to 0.04 - !type:Vomit probability: 0.1 #TODO: Tweak vomit probability, maybe make this more violent and poisonous but the body aggressively purges it... conditions: From 3f5067693f38d3266cd56489f45cec10ed429fa3 Mon Sep 17 00:00:00 2001 From: Errant <35878406+Errant-4@users.noreply.github.com> Date: Thu, 30 Oct 2025 21:59:16 +0100 Subject: [PATCH 054/121] Remove the remaining CheckButtons (#41073) remove CheckButtons --- .../Administration/UI/BanPanel/BanPanel.xaml.cs | 10 +++++----- Content.Client/Disposal/Mailing/MailingUnitWindow.xaml | 2 +- Content.Client/Disposal/Unit/DisposalUnitWindow.xaml | 2 +- Content.Client/Instruments/UI/ChannelsMenu.xaml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs b/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs index 7566942506..cb2839f5d0 100644 --- a/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs +++ b/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs @@ -294,19 +294,19 @@ public sealed partial class BanPanel : DefaultWindow } /// - /// Adds a check button specifically for one "role" in a "group" + /// Adds a toggle button specifically for one "role" in a "group" /// E.g. it would add the Chief Medical Officer "role" into the "Medical" group. /// private void AddRoleCheckbox(string group, string role, GridContainer roleGroupInnerContainer, Button roleGroupCheckbox) { var roleCheckboxContainer = new BoxContainer(); - var roleCheckButton = new Button + var roleToggleButton = new Button { Name = role, Text = role, ToggleMode = true, }; - roleCheckButton.OnToggled += args => + roleToggleButton.OnToggled += args => { // Checks the role group checkbox if all the children are pressed if (args.Pressed && _roleCheckboxes[group].All(e => e.Item1.Pressed)) @@ -343,12 +343,12 @@ public sealed partial class BanPanel : DefaultWindow roleCheckboxContainer.AddChild(jobIconTexture); } - roleCheckboxContainer.AddChild(roleCheckButton); + roleCheckboxContainer.AddChild(roleToggleButton); roleGroupInnerContainer.AddChild(roleCheckboxContainer); _roleCheckboxes.TryAdd(group, []); - _roleCheckboxes[group].Add((roleCheckButton, rolePrototype)); + _roleCheckboxes[group].Add((roleToggleButton, rolePrototype)); } public void UpdateBanFlag(bool newFlag) diff --git a/Content.Client/Disposal/Mailing/MailingUnitWindow.xaml b/Content.Client/Disposal/Mailing/MailingUnitWindow.xaml index 0acd300895..ab910d2db4 100644 --- a/Content.Client/Disposal/Mailing/MailingUnitWindow.xaml +++ b/Content.Client/Disposal/Mailing/MailingUnitWindow.xaml @@ -47,7 +47,7 @@ Access="Public" Text="{Loc 'ui-disposal-unit-button-eject'}" StyleClasses="OpenBoth" /> - diff --git a/Content.Client/Disposal/Unit/DisposalUnitWindow.xaml b/Content.Client/Disposal/Unit/DisposalUnitWindow.xaml index 60ca7ba0db..312f80c176 100644 --- a/Content.Client/Disposal/Unit/DisposalUnitWindow.xaml +++ b/Content.Client/Disposal/Unit/DisposalUnitWindow.xaml @@ -34,7 +34,7 @@ Access="Public" Text="{Loc 'ui-disposal-unit-button-eject'}" StyleClasses="OpenBoth" /> - diff --git a/Content.Client/Instruments/UI/ChannelsMenu.xaml b/Content.Client/Instruments/UI/ChannelsMenu.xaml index 20e4a3e923..e98b03e6b3 100644 --- a/Content.Client/Instruments/UI/ChannelsMenu.xaml +++ b/Content.Client/Instruments/UI/ChannelsMenu.xaml @@ -7,7 +7,7 @@ public abstract class SharedNinjaGlovesSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; [Dependency] private readonly SharedCombatModeSystem _combatMode = default!; [Dependency] private readonly SharedHandsSystem _hands = default!; [Dependency] private readonly SharedInteractionSystem _interaction = default!; diff --git a/Content.Shared/Ninja/Systems/SharedSpaceNinjaSystem.cs b/Content.Shared/Ninja/Systems/SharedSpaceNinjaSystem.cs index e17e2bc893..62ddcecb81 100644 --- a/Content.Shared/Ninja/Systems/SharedSpaceNinjaSystem.cs +++ b/Content.Shared/Ninja/Systems/SharedSpaceNinjaSystem.cs @@ -1,4 +1,3 @@ -using Content.Shared.Clothing.Components; using Content.Shared.Ninja.Components; using Content.Shared.Weapons.Melee.Events; using Content.Shared.Weapons.Ranged.Events; From d0ac7d0b39134a9a7d847d375f875a041d849bd1 Mon Sep 17 00:00:00 2001 From: Kryyto <69859497+Kryyto@users.noreply.github.com> Date: Fri, 31 Oct 2025 01:05:31 +0100 Subject: [PATCH 058/121] Add a new gas React() benchmark (#41202) * Add a new gas React() benchmark * fix the iteration amount to 100, remove unused using * fix the iteration amount to 1000 --- Content.Benchmarks/GasReactionBenchmark.cs | 253 +++++++++++++++++++++ 1 file changed, 253 insertions(+) create mode 100644 Content.Benchmarks/GasReactionBenchmark.cs diff --git a/Content.Benchmarks/GasReactionBenchmark.cs b/Content.Benchmarks/GasReactionBenchmark.cs new file mode 100644 index 0000000000..9ed30373d1 --- /dev/null +++ b/Content.Benchmarks/GasReactionBenchmark.cs @@ -0,0 +1,253 @@ +using System.Threading.Tasks; +using BenchmarkDotNet.Attributes; +using Content.IntegrationTests; +using Content.IntegrationTests.Pair; +using Content.Server.Atmos; +using Content.Server.Atmos.EntitySystems; +using Content.Server.Atmos.Reactions; +using Content.Shared.Atmos; +using Robust.Shared; +using Robust.Shared.Analyzers; +using Robust.Shared.GameObjects; +using Robust.Shared.Maths; + +namespace Content.Benchmarks; + +/// +/// Benchmarks the performance of different gas reactions. +/// Tests each reaction type with realistic gas mixtures to measure computational cost. +/// +[Virtual] +[GcServer(true)] +[MemoryDiagnoser] +public class GasReactionBenchmark +{ + private const int Iterations = 1000; + private TestPair _pair = default!; + private AtmosphereSystem _atmosphereSystem = default!; + + // Grid and tile for reactions that need a holder + private EntityUid _testGrid = default!; + private TileAtmosphere _testTile = default!; + // Reaction instances + private PlasmaFireReaction _plasmaFireReaction = default!; + private TritiumFireReaction _tritiumFireReaction = default!; + private FrezonProductionReaction _frezonProductionReaction = default!; + private FrezonCoolantReaction _frezonCoolantReaction = default!; + private AmmoniaOxygenReaction _ammoniaOxygenReaction = default!; + private N2ODecompositionReaction _n2oDecompositionReaction = default!; + private WaterVaporReaction _waterVaporReaction = default!; + // Gas mixtures for each reaction type + private GasMixture _plasmaFireMixture = default!; + private GasMixture _tritiumFireMixture = default!; + private GasMixture _frezonProductionMixture = default!; + private GasMixture _frezonCoolantMixture = default!; + private GasMixture _ammoniaOxygenMixture = default!; + private GasMixture _n2oDecompositionMixture = default!; + private GasMixture _waterVaporMixture = default!; + + [GlobalSetup] + public async Task SetupAsync() + { + ProgramShared.PathOffset = "../../../../"; + PoolManager.Startup(); + _pair = await PoolManager.GetServerClient(); + var server = _pair.Server; + + // Create test map and grid + var mapData = await _pair.CreateTestMap(); + _testGrid = mapData.Grid; + + await server.WaitPost(() => + { + var entMan = server.ResolveDependency(); + _atmosphereSystem = entMan.System(); + + _plasmaFireReaction = new PlasmaFireReaction(); + _tritiumFireReaction = new TritiumFireReaction(); + _frezonProductionReaction = new FrezonProductionReaction(); + _frezonCoolantReaction = new FrezonCoolantReaction(); + _ammoniaOxygenReaction = new AmmoniaOxygenReaction(); + _n2oDecompositionReaction = new N2ODecompositionReaction(); + _waterVaporReaction = new WaterVaporReaction(); + + SetupGasMixtures(); + SetupTile(); + }); + } + + private void SetupGasMixtures() + { + // Plasma Fire: Plasma + Oxygen at high temperature + // Temperature must be > PlasmaMinimumBurnTemperature for reaction to occur + _plasmaFireMixture = new GasMixture(Atmospherics.CellVolume) + { + Temperature = Atmospherics.PlasmaMinimumBurnTemperature + 100f // ~673K + }; + _plasmaFireMixture.AdjustMoles(Gas.Plasma, 20f); + _plasmaFireMixture.AdjustMoles(Gas.Oxygen, 100f); + + // Tritium Fire: Tritium + Oxygen at high temperature + // Temperature must be > FireMinimumTemperatureToExist for reaction to occur + _tritiumFireMixture = new GasMixture(Atmospherics.CellVolume) + { + Temperature = Atmospherics.FireMinimumTemperatureToExist + 100f // ~473K + }; + _tritiumFireMixture.AdjustMoles(Gas.Tritium, 20f); + _tritiumFireMixture.AdjustMoles(Gas.Oxygen, 100f); + + // Frezon Production: Oxygen + Tritium + Nitrogen catalyst + // Optimal temperature for efficiency (80% of max efficiency temp) + _frezonProductionMixture = new GasMixture(Atmospherics.CellVolume) + { + Temperature = Atmospherics.FrezonProductionMaxEfficiencyTemperature * 0.8f // ~48K + }; + _frezonProductionMixture.AdjustMoles(Gas.Oxygen, 50f); + _frezonProductionMixture.AdjustMoles(Gas.Tritium, 50f); + _frezonProductionMixture.AdjustMoles(Gas.Nitrogen, 10f); + + // Frezon Coolant: Frezon + Nitrogen + // Temperature must be > FrezonCoolLowerTemperature (23.15K) for reaction to occur + _frezonCoolantMixture = new GasMixture(Atmospherics.CellVolume) + { + Temperature = Atmospherics.T20C + 50f // ~343K + }; + _frezonCoolantMixture.AdjustMoles(Gas.Frezon, 30f); + _frezonCoolantMixture.AdjustMoles(Gas.Nitrogen, 100f); + + // Ammonia + Oxygen reaction (concentration-dependent, no temp requirement) + _ammoniaOxygenMixture = new GasMixture(Atmospherics.CellVolume) + { + Temperature = Atmospherics.T20C + 100f // ~393K + }; + _ammoniaOxygenMixture.AdjustMoles(Gas.Ammonia, 40f); + _ammoniaOxygenMixture.AdjustMoles(Gas.Oxygen, 40f); + + // N2O Decomposition (no temperature requirement, just needs N2O moles) + _n2oDecompositionMixture = new GasMixture(Atmospherics.CellVolume) + { + Temperature = Atmospherics.T20C + 100f // ~393K + }; + _n2oDecompositionMixture.AdjustMoles(Gas.NitrousOxide, 100f); + + // Water Vapor - needs water vapor to condense + _waterVaporMixture = new GasMixture(Atmospherics.CellVolume) + { + Temperature = Atmospherics.T20C + }; + _waterVaporMixture.AdjustMoles(Gas.WaterVapor, 50f); + } + + private void SetupTile() + { + // Create a tile atmosphere to use as holder for all reactions + var testIndices = new Vector2i(0, 0); + _testTile = new TileAtmosphere(_testGrid, testIndices, new GasMixture(Atmospherics.CellVolume) + { + Temperature = Atmospherics.T20C + }); + } + + private static GasMixture CloneMixture(GasMixture original) + { + return new GasMixture(original); + } + + [Benchmark] + public async Task PlasmaFireReaction() + { + await _pair.Server.WaitPost(() => + { + for (var i = 0; i < Iterations; i++) + { + var mixture = CloneMixture(_plasmaFireMixture); + _plasmaFireReaction.React(mixture, _testTile, _atmosphereSystem, 1f); + } + }); + } + + [Benchmark] + public async Task TritiumFireReaction() + { + await _pair.Server.WaitPost(() => + { + for (var i = 0; i < Iterations; i++) + { + var mixture = CloneMixture(_tritiumFireMixture); + _tritiumFireReaction.React(mixture, _testTile, _atmosphereSystem, 1f); + } + }); + } + + [Benchmark] + public async Task FrezonProductionReaction() + { + await _pair.Server.WaitPost(() => + { + for (var i = 0; i < Iterations; i++) + { + var mixture = CloneMixture(_frezonProductionMixture); + _frezonProductionReaction.React(mixture, _testTile, _atmosphereSystem, 1f); + } + }); + } + + [Benchmark] + public async Task FrezonCoolantReaction() + { + await _pair.Server.WaitPost(() => + { + for (var i = 0; i < Iterations; i++) + { + var mixture = CloneMixture(_frezonCoolantMixture); + _frezonCoolantReaction.React(mixture, _testTile, _atmosphereSystem, 1f); + } + }); + } + + [Benchmark] + public async Task AmmoniaOxygenReaction() + { + await _pair.Server.WaitPost(() => + { + for (var i = 0; i < Iterations; i++) + { + var mixture = CloneMixture(_ammoniaOxygenMixture); + _ammoniaOxygenReaction.React(mixture, _testTile, _atmosphereSystem, 1f); + } + }); + } + + [Benchmark] + public async Task N2ODecompositionReaction() + { + await _pair.Server.WaitPost(() => + { + for (var i = 0; i < Iterations; i++) + { + var mixture = CloneMixture(_n2oDecompositionMixture); + _n2oDecompositionReaction.React(mixture, _testTile, _atmosphereSystem, 1f); + } + }); + } + + [Benchmark] + public async Task WaterVaporReaction() + { + await _pair.Server.WaitPost(() => + { + for (var i = 0; i < Iterations; i++) + { + var mixture = CloneMixture(_waterVaporMixture); + _waterVaporReaction.React(mixture, _testTile, _atmosphereSystem, 1f); + } + }); + } + + [GlobalCleanup] + public async Task CleanupAsync() + { + await _pair.DisposeAsync(); + PoolManager.Shutdown(); + } +} From ec8ada33889f1c7d7d44556d0a1efe037a7156a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=81da?= Date: Thu, 30 Oct 2025 19:09:44 -0500 Subject: [PATCH 059/121] Fix all ignored recipes in material arbitrage (#41134) * lights * drink glasses * vial chem bottle * plates n stuff * boards * airtank --------- Co-authored-by: iaada --- .../Tests/MaterialArbitrageTest.cs | 18 ++++-------------- .../Consumable/Food/Containers/plate.yml | 8 ++++---- .../Circuitboards/Machine/production.yml | 12 ++++++------ .../Prototypes/Recipes/Lathes/chemistry.yml | 4 ++-- .../Prototypes/Recipes/Lathes/cooking.yml | 2 +- Resources/Prototypes/Recipes/Lathes/misc.yml | 4 ++-- 6 files changed, 19 insertions(+), 29 deletions(-) diff --git a/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs b/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs index dcb47fb81c..3c6c372b75 100644 --- a/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs +++ b/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs @@ -28,20 +28,10 @@ namespace Content.IntegrationTests.Tests; [TestFixture] public sealed class MaterialArbitrageTest { - // These recipes are currently broken and need fixing. You should not be adding to these sets. - private readonly HashSet _destructionArbitrageIgnore = - [ - "BaseChemistryEmptyVial", "DrinkShotGlass", "SodiumLightTube", "DrinkGlassCoupeShaped", - "LedLightBulb", "ExteriorLightTube", "LightTube", "DrinkGlass", "DimLightBulb", "LightBulb", "LedLightTube", - "ChemistryEmptyBottle01", "WarmLightBulb", - ]; - - private readonly HashSet _compositionArbitrageIgnore = - [ - "FoodPlateSmall", "AirTank", "FoodPlateTin", "FoodPlateMuffinTin", "WeaponCapacitorRechargerCircuitboard", - "WeaponCapacitorRechargerCircuitboard", "BorgChargerCircuitboard", "BorgChargerCircuitboard", "FoodPlate", - "CellRechargerCircuitboard", "CellRechargerCircuitboard", - ]; + // These sets are for selectively excluding recipes from arbitrage. + // You should NOT be adding to these. They exist here for downstreams and potential future issues. + private readonly HashSet _destructionArbitrageIgnore = []; + private readonly HashSet _compositionArbitrageIgnore = []; [Test] public async Task NoMaterialArbitrage() diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml index 55d22e3980..36dff3a8d6 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml @@ -57,7 +57,7 @@ - Trash - type: PhysicalComposition materialComposition: - Glass: 60 + Glass: 50 - type: SpaceGarbage - type: entity @@ -117,7 +117,7 @@ acts: [ "Destruction" ] - type: PhysicalComposition materialComposition: - Glass: 30 + Glass: 25 - type: entity parent: FoodPlateTrash @@ -196,7 +196,7 @@ - Trash - type: PhysicalComposition materialComposition: - Steel: 60 + Steel: 50 - type: SpaceGarbage # Muffin Tin @@ -220,5 +220,5 @@ - Trash - type: PhysicalComposition materialComposition: - Steel: 30 + Steel: 25 - type: SpaceGarbage diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml index 0697506855..22205bf60d 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml @@ -663,8 +663,8 @@ Cable: 5 - type: PhysicalComposition materialComposition: - Steel: 30 - Plastic: 30 + Steel: 25 + Plastic: 25 - type: StaticPrice price: 15 @@ -706,8 +706,8 @@ Cable: 5 - type: PhysicalComposition materialComposition: - Steel: 30 - Plastic: 30 + Steel: 25 + Plastic: 25 - type: StaticPrice price: 15 @@ -727,8 +727,8 @@ CableMV: 5 - type: PhysicalComposition materialComposition: - Steel: 30 - Plastic: 30 + Steel: 25 + Plastic: 25 - type: StaticPrice price: 15 diff --git a/Resources/Prototypes/Recipes/Lathes/chemistry.yml b/Resources/Prototypes/Recipes/Lathes/chemistry.yml index 0b3b8352e5..edcb0491bf 100644 --- a/Resources/Prototypes/Recipes/Lathes/chemistry.yml +++ b/Resources/Prototypes/Recipes/Lathes/chemistry.yml @@ -77,7 +77,7 @@ result: ChemistryEmptyBottle01 completetime: 2 materials: - Glass: 50 + Glass: 100 - type: latheRecipe id: Vape @@ -95,7 +95,7 @@ result: BaseChemistryEmptyVial completetime: 2 materials: - Glass: 50 + Glass: 100 Wood: 20 - type: latheRecipe diff --git a/Resources/Prototypes/Recipes/Lathes/cooking.yml b/Resources/Prototypes/Recipes/Lathes/cooking.yml index 333279a820..e3081437c4 100644 --- a/Resources/Prototypes/Recipes/Lathes/cooking.yml +++ b/Resources/Prototypes/Recipes/Lathes/cooking.yml @@ -19,7 +19,7 @@ id: BaseGlasswareRecipe completetime: 0.8 materials: - Glass: 100 + Glass: 200 - type: latheRecipe parent: BaseGlasswareRecipe diff --git a/Resources/Prototypes/Recipes/Lathes/misc.yml b/Resources/Prototypes/Recipes/Lathes/misc.yml index f683b07ef8..ec29a654d6 100644 --- a/Resources/Prototypes/Recipes/Lathes/misc.yml +++ b/Resources/Prototypes/Recipes/Lathes/misc.yml @@ -8,7 +8,7 @@ completetime: 2 materials: Steel: 50 - Glass: 50 + Glass: 200 # Recipes @@ -120,7 +120,7 @@ result: AirTank completetime: 4 materials: - Steel: 300 + Steel: 400 - type: latheRecipe id: DoubleEmergencyOxygenTank From bde62ca0f28a63fa0df6a9d8c8ab54fd6cdde9a1 Mon Sep 17 00:00:00 2001 From: eoineoineoin Date: Fri, 31 Oct 2025 00:11:20 +0000 Subject: [PATCH 060/121] Fix client crash in MeleeWeaponSystem (#41121) Avoid crash when animating deleted entity --- Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs b/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs index 49b5b4a25b..3fbd4dce69 100644 --- a/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs +++ b/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs @@ -216,7 +216,7 @@ public sealed partial class MeleeWeaponSystem var query = EntityQueryEnumerator(); while (query.MoveNext(out var uid, out var arcComponent, out var xform)) { - if (arcComponent.User == null) + if (arcComponent.User == null || EntityManager.Deleted(arcComponent.User)) continue; Vector2 targetPos = TransformSystem.GetWorldPosition(arcComponent.User.Value); From ae2067c5beac43e4e43269ede6dd639393fa9618 Mon Sep 17 00:00:00 2001 From: NoreUhh <85219416+NoreUhh@users.noreply.github.com> Date: Thu, 30 Oct 2025 18:02:43 -0700 Subject: [PATCH 061/121] Add 2 New Reagents (Felinase and Caninase) (#41136) * Flavors, Flavor Profiles, Reagent Text * Base Reagent and Mix reaction * Borkinase, flavor stuff * Final touches me thinks * Comment out shit * Update fun.yml removed comments * Update fun.yml Increased output for borkinase and felinase * explosive reaction creates razorium when mixed and makes a radioactive explosion. screaming explosion funny!!! * reagent descriptions updated em * chem is no longer nuclear bomb * remove tile-break scale * recipe change done through web view dont kill me im lazy * removed cellular, halved rads done through web again, dont end me thanks * updated locale to reflect name change * updated reagent to reflect name change * updated reactions to reflect name changes --------- Co-authored-by: NoreUhh --- .../Speech/EntitySystems/BarkAccentSystem.cs | 9 +- .../Speech/EntitySystems/OwOAccentSystem.cs | 10 +- .../Locale/en-US/flavors/flavor-profiles.ftl | 1 + Resources/Locale/en-US/reagents/meta/fun.ftl | 6 + .../Entities/StatusEffects/speech.yml | 16 +++ Resources/Prototypes/Flavors/flavors.yml | 5 + Resources/Prototypes/Reagents/fun.yml | 110 ++++++++++++++++++ .../Prototypes/Recipes/Reactions/fun.yml | 47 ++++++++ 8 files changed, 202 insertions(+), 2 deletions(-) diff --git a/Content.Server/Speech/EntitySystems/BarkAccentSystem.cs b/Content.Server/Speech/EntitySystems/BarkAccentSystem.cs index 927b1259ad..27e42c70ed 100644 --- a/Content.Server/Speech/EntitySystems/BarkAccentSystem.cs +++ b/Content.Server/Speech/EntitySystems/BarkAccentSystem.cs @@ -1,3 +1,4 @@ +using Content.Shared.StatusEffectNew; using Content.Server.Speech.Components; using Content.Shared.Speech; using Robust.Shared.Random; @@ -23,6 +24,7 @@ namespace Content.Server.Speech.EntitySystems public override void Initialize() { SubscribeLocalEvent(OnAccent); + SubscribeLocalEvent>(OnAccentRelayed); } public string Accentuate(string message) @@ -36,9 +38,14 @@ namespace Content.Server.Speech.EntitySystems .Replace("l", "r").Replace("L", "R"); } - private void OnAccent(EntityUid uid, BarkAccentComponent component, AccentGetEvent args) + private void OnAccent(Entity entity, ref AccentGetEvent args) { args.Message = Accentuate(args.Message); } + + private void OnAccentRelayed(Entity entity, ref StatusEffectRelayedEvent args) + { + args.Args.Message = Accentuate(args.Args.Message); + } } } diff --git a/Content.Server/Speech/EntitySystems/OwOAccentSystem.cs b/Content.Server/Speech/EntitySystems/OwOAccentSystem.cs index ff930e524a..804c711ea7 100644 --- a/Content.Server/Speech/EntitySystems/OwOAccentSystem.cs +++ b/Content.Server/Speech/EntitySystems/OwOAccentSystem.cs @@ -1,5 +1,6 @@ using Content.Server.Speech.Components; using Content.Shared.Speech; +using Content.Shared.StatusEffectNew; using Robust.Shared.Random; namespace Content.Server.Speech.EntitySystems @@ -20,6 +21,7 @@ namespace Content.Server.Speech.EntitySystems public override void Initialize() { SubscribeLocalEvent(OnAccent); + SubscribeLocalEvent>(OnAccentRelayed); } public string Accentuate(string message) @@ -34,9 +36,15 @@ namespace Content.Server.Speech.EntitySystems .Replace("l", "w").Replace("L", "W"); } - private void OnAccent(EntityUid uid, OwOAccentComponent component, AccentGetEvent args) + private void OnAccent(Entity entity, ref AccentGetEvent args) { args.Message = Accentuate(args.Message); } + + private void OnAccentRelayed(Entity entity, ref StatusEffectRelayedEvent args) + { + args.Args.Message = Accentuate(args.Args.Message); + } + } } diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index f012d83d7e..1e76818ebf 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -183,6 +183,7 @@ flavor-complex-false-meat = not entirely unlike meat flavor-complex-paper = like mushy pulp flavor-complex-compressed-meat = like compressed meat flavor-complex-dog-food = like dog food +flavor-complex-canned-tuna = like canned tuna # Drink-specific flavors. diff --git a/Resources/Locale/en-US/reagents/meta/fun.ftl b/Resources/Locale/en-US/reagents/meta/fun.ftl index d6e4fe4794..eb4ff634d7 100644 --- a/Resources/Locale/en-US/reagents/meta/fun.ftl +++ b/Resources/Locale/en-US/reagents/meta/fun.ftl @@ -33,3 +33,9 @@ reagent-desc-hew = Pure essence of inversed lizard plush. Makes you Hew! reagent-name-corgiessence = corgium reagent-desc-corgiessence = Tastes like dog food. Clearly an acquired taste. + +reagent-name-catessence = felinase +reagent-desc-catessence = A type of carcinogenic enzyme known to break down proteins found within the vocal cords of most animals. Mixing is NOT recommended. + +reagent-name-canidessence = caninase +reagent-desc-canidessence = A type of carcinogenic enzyme known to break down proteins found within the vocal cords of most animals. Mixing is NOT recommended. diff --git a/Resources/Prototypes/Entities/StatusEffects/speech.yml b/Resources/Prototypes/Entities/StatusEffects/speech.yml index 1fe13c4626..0f957bfe56 100644 --- a/Resources/Prototypes/Entities/StatusEffects/speech.yml +++ b/Resources/Prototypes/Entities/StatusEffects/speech.yml @@ -33,3 +33,19 @@ name: scrambled components: - type: ScrambledAccent + +# Causes wu to tawk wike a cat. ^w^ +- type: entity + parent: SpeechStatusEffectBase + id: StatusEffectOwO + name: owoaccent + components: + - type: OwOAccent + +# Causes you to tark rike a dog. Woof! +- type: entity + parent: SpeechStatusEffectBase + id: StatusEffectBark + name: barkaccent + components: + - type: BarkAccent diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index 513803e102..e1fac917af 100644 --- a/Resources/Prototypes/Flavors/flavors.yml +++ b/Resources/Prototypes/Flavors/flavors.yml @@ -1349,6 +1349,11 @@ flavorType: Base description: flavor-complex-dog-food +- type: flavor + id: cannedtuna + flavorType: Complex + description: flavor-complex-canned-tuna + - type: flavor id: fishops flavorType: Complex diff --git a/Resources/Prototypes/Reagents/fun.yml b/Resources/Prototypes/Reagents/fun.yml index 0ad3e9af61..f6bddeee2d 100644 --- a/Resources/Prototypes/Reagents/fun.yml +++ b/Resources/Prototypes/Reagents/fun.yml @@ -429,3 +429,113 @@ - !type:ReagentCondition reagent: CorgiJuice min: 50 + +- type: reagent + id: Felinase + name: reagent-name-catessence + group: Toxins + desc: reagent-desc-catessence + physicalDesc: reagent-physical-desc-milky + flavor: cannedtuna + color: "#d8bed8" + metabolisms: + Poison: + metabolismRate: 0.2 + effects: + - !type:HealthChange + conditions: + - !type:ReagentCondition + reagent: Felinase + min: 25 + damage: + types: + Radiation: 0.5 + - !type:AdjustReagent + reagent: Felinase + amount: -15 + conditions: + - !type:ReagentCondition + reagent: Felinase + min: 40 + - !type:ModifyStatusEffect + conditions: + - !type:ReagentCondition + reagent: Felinase + min: 25 + effectProto: StatusEffectOwO + time: 25.0 + type: Add + - !type:Emote + conditions: + - !type:ReagentCondition + reagent: Felinase + min: 25 + emote: Cough + showInChat: true + showInGuidebook: true + force: true + probability: 0.05 + - !type:PopupMessage + conditions: + - !type:ReagentCondition + reagent: Felinase + min: 25 + type: Local + visualType: Small + messages: [ "capsaicin-effect-light-burn" ] + probability: 0.05 + +- type: reagent + id: Caninase + name: reagent-name-canidessence + group: Toxins + desc: reagent-desc-canidessence + physicalDesc: reagent-physical-desc-bubbly + flavor: dogfood + color: "#b87333" + metabolisms: + Poison: + metabolismRate: 0.2 + effects: + - !type:HealthChange + conditions: + - !type:ReagentCondition + reagent: Caninase + min: 25 + damage: + types: + Radiation: 0.5 + - !type:AdjustReagent + reagent: Caninase + amount: -15 + conditions: + - !type:ReagentCondition + reagent: Caninase + min: 40 + - !type:ModifyStatusEffect + conditions: + - !type:ReagentCondition + reagent: Caninase + min: 25 + effectProto: StatusEffectBark + time: 25.0 + type: Add + - !type:Emote + conditions: + - !type:ReagentCondition + reagent: Caninase + min: 25 + emote: Cough + showInChat: true + showInGuidebook: true + force: true + probability: 0.05 + - !type:PopupMessage + conditions: + - !type:ReagentCondition + reagent: Caninase + min: 25 + type: Local + visualType: Small + messages: [ "capsaicin-effect-light-burn" ] + probability: 0.05 diff --git a/Resources/Prototypes/Recipes/Reactions/fun.yml b/Resources/Prototypes/Recipes/Reactions/fun.yml index b000481476..a0c5c546c7 100644 --- a/Resources/Prototypes/Recipes/Reactions/fun.yml +++ b/Resources/Prototypes/Recipes/Reactions/fun.yml @@ -227,3 +227,50 @@ amount: 1 products: CorgiJuice: 2 + +- type: reaction + id: Felinase + reactants: + Haloperidol: + amount: 3 + Cognizine: + amount: 2 + CarpoToxin: + amount: 2 + Enzyme: + amount: 1 + products: + Felinase: 2 + +- type: reaction + id: Caninase + reactants: + Haloperidol: + amount: 3 + Cognizine: + amount: 2 + Happiness: + amount: 2 + Enzyme: + amount: 1 + products: + Caninase: 2 + +- type: reaction + id: CaninaseFelinaseReaction + impact: High + priority: 20 + reactants: + Caninase: + amount: 1 + Felinase: + amount: 1 + products: + Razorium: 2 + effects: + - !type:Explosion + explosionType: Radioactive + maxIntensity: 5 + intensityPerUnit: 1 + intensitySlope: 2.7 + maxTotalIntensity: 50 From c30321d886c398dc158788227144ea2c87838ac2 Mon Sep 17 00:00:00 2001 From: Connor Huffine Date: Thu, 30 Oct 2025 21:14:54 -0400 Subject: [PATCH 062/121] Remove inaccessible code (#41209) Remove false check --- Content.Server/Mindshield/MindShieldSystem.cs | 3 --- 1 file changed, 3 deletions(-) diff --git a/Content.Server/Mindshield/MindShieldSystem.cs b/Content.Server/Mindshield/MindShieldSystem.cs index bc5b65159b..f69e7b45fb 100644 --- a/Content.Server/Mindshield/MindShieldSystem.cs +++ b/Content.Server/Mindshield/MindShieldSystem.cs @@ -32,9 +32,6 @@ public sealed class MindShieldSystem : EntitySystem private void OnImplantImplanted(Entity ent, ref ImplantImplantedEvent ev) { - if (ev.Implanted == null) - return; - EnsureComp(ev.Implanted); MindShieldRemovalCheck(ev.Implanted, ev.Implant); } From dd61991b1c213d8018ffd88e07ac85b900cb3810 Mon Sep 17 00:00:00 2001 From: Super <84590915+SuperGDPWYL@users.noreply.github.com> Date: Fri, 31 Oct 2025 09:26:25 +0000 Subject: [PATCH 063/121] Add multi-job exclusion support to objectives, and add more appropriate job restrictions to certain thief objectives. (#40065) * multi exclusion! * quick correction * migrate all job: fields to jobs fields to avoid test fails. breaking change!!! --- .../Components/NotJobRequirementComponent.cs | 8 ++- .../Systems/NotJobRequirementSystem.cs | 2 +- Resources/Prototypes/Objectives/thief.yml | 70 +++++++++---------- Resources/Prototypes/Objectives/traitor.yml | 16 ++--- 4 files changed, 49 insertions(+), 47 deletions(-) diff --git a/Content.Server/Objectives/Components/NotJobRequirementComponent.cs b/Content.Server/Objectives/Components/NotJobRequirementComponent.cs index 6f6619da2b..cfc007e1e1 100644 --- a/Content.Server/Objectives/Components/NotJobRequirementComponent.cs +++ b/Content.Server/Objectives/Components/NotJobRequirementComponent.cs @@ -2,6 +2,7 @@ using Content.Server.Objectives.Systems; using Content.Shared.Roles; using Content.Shared.Roles.Jobs; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; +using Robust.Shared.Prototypes; /// /// Requires that the player not have a certain job to have this objective. @@ -9,9 +10,10 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy [RegisterComponent, Access(typeof(NotJobRequirementSystem))] public sealed partial class NotJobRequirementComponent : Component { + /// - /// ID of the job to ban from having this objective. + /// List of job prototype IDs to ban from having this objective. /// - [DataField(required: true, customTypeSerializer: typeof(PrototypeIdSerializer))] - public string Job = string.Empty; + [DataField] + public List> Jobs = new List>(); } diff --git a/Content.Server/Objectives/Systems/NotJobRequirementSystem.cs b/Content.Server/Objectives/Systems/NotJobRequirementSystem.cs index ac7e579c38..4c88bf03f3 100644 --- a/Content.Server/Objectives/Systems/NotJobRequirementSystem.cs +++ b/Content.Server/Objectives/Systems/NotJobRequirementSystem.cs @@ -25,7 +25,7 @@ public sealed class NotJobRequirementSystem : EntitySystem _jobs.MindTryGetJob(args.MindId, out var proto); // if player has no job then don't care - if (proto is not null && proto.ID == comp.Job) + if (proto is not null && comp.Jobs.Contains(proto.ID)) args.Cancelled = true; } } diff --git a/Resources/Prototypes/Objectives/thief.yml b/Resources/Prototypes/Objectives/thief.yml index fde0779151..7c8dc9d85a 100644 --- a/Resources/Prototypes/Objectives/thief.yml +++ b/Resources/Prototypes/Objectives/thief.yml @@ -101,7 +101,7 @@ id: TechnologyDiskStealCollectionObjective components: - type: NotJobRequirement - job: Scientist + jobs: [ Scientist ] - type: StealCondition stealGroup: TechnologyDisk minCollectionSize: 5 @@ -115,7 +115,7 @@ id: MailStealCollectionObjective components: - type: NotJobRequirement - job: CargoTechnician + jobs: [ CargoTechnician, SalvageSpecialist ] - type: StealCondition stealGroup: Mail minCollectionSize: 4 @@ -129,7 +129,7 @@ id: IDCardsStealCollectionObjective components: - type: NotJobRequirement #Here cause you can buy a personnel crate from cargo which is 8 ID cards. Meaning the ID you start with is number nine and you only need to steal one. - job: CargoTechnician #TODO: add salvage specialist + jobs: [ CargoTechnician, SalvageSpecialist ] - type: StealCondition stealGroup: IDCard minCollectionSize: 5 @@ -143,7 +143,7 @@ id: OfficerHandgunsStealCollectionObjective components: - type: NotJobRequirement - job: SecurityOfficer #TODO: Add HoS, Detective, and Warden + jobs: [ SecurityOfficer, HeadOfSecurity, Detective, Warden ] - type: StealCondition stealGroup: OfficerHandgun minCollectionSize: 2 @@ -174,7 +174,7 @@ id: ForensicScannerStealObjective components: - type: NotJobRequirement - job: Detective + jobs: [ Detective ] - type: StealCondition stealGroup: ForensicScanner - type: Objective @@ -185,7 +185,7 @@ id: FlippoEngravedLighterStealObjective components: - type: NotJobRequirement - job: Detective + jobs: [ Detective ] - type: StealCondition stealGroup: FlippoEngravedLighter - type: Objective @@ -214,7 +214,7 @@ id: ClothingOuterHardsuitVoidParamedStealObjective components: - type: NotJobRequirement - job: Paramedic #TODO: make it so this also includes Medical Doctor, Chemist and Psychologist + jobs: [ MedicalDoctor, Paramedic, Chemist, Psychologist ] - type: StealCondition stealGroup: ClothingOuterHardsuitVoidParamed - type: Objective @@ -225,7 +225,7 @@ id: MedicalTechFabCircuitboardStealObjective components: - type: NotJobRequirement - job: MedicalDoctor #TODO: make it so this also includes Chemist, Paramedic and Psychologist + jobs: [ MedicalDoctor, Paramedic, Chemist, Psychologist ] - type: StealCondition stealGroup: MedicalTechFabCircuitboard - type: Objective @@ -236,7 +236,7 @@ id: ClothingHeadsetAltMedicalStealObjective components: - type: NotJobRequirement - job: ChiefMedicalOfficer + jobs: [ ChiefMedicalOfficer ] - type: StealCondition stealGroup: ClothingHeadsetAltMedical - type: Objective @@ -247,7 +247,7 @@ id: FireAxeStealObjective components: - type: NotJobRequirement - job: AtmosphericTechnician + jobs: [ AtmosphericTechnician ] - type: StealCondition stealGroup: FireAxe - type: Objective @@ -258,7 +258,7 @@ id: AmePartFlatpackStealObjective components: - type: NotJobRequirement - job: StationEngineer #TODO: make it so this also includes Atmos technician + jobs: [ StationEngineer, AtmosphericTechnician ] - type: StealCondition stealGroup: AmePartFlatpack - type: Objective @@ -269,7 +269,7 @@ id: ChiefEngineerToolbeltStealObjective components: #- type: NotJobRequirement Is this really necessary? it's a pickpocket objective. Only thing is that it would be easier to get to CE - # Job: StationEngineer, AtmosphericTechnician + # jobs: [ StationEngineer, AtmosphericTechnician ] - type: StealCondition stealGroup: ChiefEngineerToolBelt - type: Objective @@ -280,7 +280,7 @@ id: ExpeditionsCircuitboardStealObjective components: - type: NotJobRequirement - job: SalvageSpecialist + jobs: [ SalvageSpecialist ] - type: StealCondition stealGroup: SalvageExpeditionsComputerCircuitboard - type: Objective @@ -291,7 +291,7 @@ id: CargoShuttleCircuitboardStealObjective components: - type: NotJobRequirement - job: CargoTechnician #TODO: make it so this also includes Salvage Specialist + jobs: [ CargoTechnician, SalvageSpecialist ] - type: StealCondition stealGroup: CargoShuttleConsoleCircuitboard - type: Objective @@ -302,7 +302,7 @@ id: ClothingEyesHudBeerStealObjective components: - type: NotJobRequirement - job: Bartender #TODO: make it so this also includes Service worker + jobs: [ Bartender, ServiceWorker ] - type: StealCondition stealGroup: ClothingEyesHudBeer - type: Objective @@ -313,7 +313,7 @@ id: BibleStealObjective components: - type: NotJobRequirement - job: Chaplain + jobs: [ Chaplain ] - type: StealCondition stealGroup: Bible - type: Objective @@ -324,7 +324,7 @@ id: ClothingNeckGoldmedalStealObjective components: - type: NotJobRequirement - job: HeadOfPersonnel + jobs: [ HeadOfPersonnel ] - type: StealCondition stealGroup: ClothingNeckGoldmedal - type: Objective @@ -335,7 +335,7 @@ id: ClothingNeckClownmedalStealObjective components: - type: NotJobRequirement - job: Captain + jobs: [ Captain ] - type: StealCondition stealGroup: ClothingNeckClownmedal - type: Objective @@ -346,7 +346,7 @@ id: CaptainSwordStealObjective components: - type: NotJobRequirement - job: Captain + jobs: [ Captain ] - type: StealCondition stealGroup: CaptainSword - type: Objective @@ -359,7 +359,7 @@ id: NuclearBombStealObjective components: - type: NotJobRequirement - job: Captain + jobs: [ Captain ] - type: StealCondition stealGroup: NuclearBomb - type: Objective @@ -370,7 +370,7 @@ id: FaxMachineCaptainStealObjective components: - type: NotJobRequirement - job: Captain + jobs: [ Captain ] - type: StealCondition stealGroup: FaxMachineCaptain - type: Objective @@ -381,7 +381,7 @@ id: ChemDispenserStealObjective components: - type: NotJobRequirement - job: Chemist #TODO: make it so this also includes Scientist. It's a roundstart circuit they can construct. + jobs: [ Chemist, Scientist ] - type: StealCondition stealGroup: ChemDispenser - type: Objective @@ -392,7 +392,7 @@ id: XenoArtifactStealObjective components: - type: NotJobRequirement - job: Scientist + jobs: [ Scientist ] - type: StealCondition stealGroup: XenoArtifact - type: Objective @@ -403,7 +403,7 @@ id: FreezerHeaterStealObjective components: - type: NotJobRequirement - job: AtmosphericTechnician #TODO: make it so this also includes Engineer, Medical doctor, chemist and maybe also scientist. Medical doc and chemist cause cryogenics, scientist cause it can be built and is sometimes mapped in artisci + jobs: [ AtmosphericTechnician, MedicalDoctor, Chemist, Paramedic, Psychologist, Scientist, Chef ] - type: StealCondition stealGroup: FreezerHeater - type: Objective @@ -414,7 +414,7 @@ id: TegStealObjective components: - type: NotJobRequirement - job: AtmosphericTechnician #TODO: make it so this also includes Engineer, Several TEG only maps have TEG accessible by standard Engineers + jobs: [ AtmosphericTechnician, StationEngineer ] - type: StealCondition stealGroup: Teg - type: Objective @@ -425,7 +425,7 @@ id: BoozeDispenserStealObjective components: - type: NotJobRequirement - job: Bartender #TODO: make it so this also includes Service worker + jobs: [ Bartender, ServiceWorker ] - type: StealCondition stealGroup: BoozeDispenser - type: Objective @@ -436,7 +436,7 @@ id: AltarNanotrasenStealObjective components: - type: NotJobRequirement - job: Chaplain + jobs: [ Chaplain ] - type: StealCondition stealGroup: AltarNanotrasen - type: Objective @@ -447,7 +447,7 @@ id: PlantRDStealObjective components: - type: NotJobRequirement - job: Scientist + jobs: [ Scientist ] - type: StealCondition stealGroup: PlantRD - type: Objective @@ -458,7 +458,7 @@ id: ToiletGoldenStealObjective components: - type: NotJobRequirement - job: Captain + jobs: [ Captain ] - type: StealCondition stealGroup: ToiletGoldenDirtyWater - type: Objective @@ -471,7 +471,7 @@ id: IanStealObjective components: - type: NotJobRequirement - job: HeadOfPersonnel + jobs: [ HeadOfPersonnel ] - type: StealCondition stealGroup: AnimalIan - type: Objective @@ -491,7 +491,7 @@ id: McGriffStealObjective components: - type: NotJobRequirement - job: Detective + jobs: [ Detective ] - type: StealCondition stealGroup: AnimalMcGriff - type: Objective @@ -502,7 +502,7 @@ id: WalterStealObjective components: - type: NotJobRequirement - job: Chemist + jobs: [ Chemist ] - type: StealCondition stealGroup: AnimalWalter - type: Objective @@ -522,7 +522,7 @@ id: RenaultStealObjective components: - type: NotJobRequirement - job: Captain + jobs: [ Captain ] - type: StealCondition stealGroup: AnimalRenault - type: Objective @@ -533,7 +533,7 @@ id: ShivaStealObjective components: - type: NotJobRequirement - job: SecurityOfficer + jobs: [ SecurityOfficer ] - type: StealCondition stealGroup: AnimalShiva - type: Objective @@ -544,7 +544,7 @@ id: TropicoStealObjective components: - type: NotJobRequirement - job: AtmosphericTechnician + jobs: [ AtmosphericTechnician ] - type: StealCondition stealGroup: AnimalTropico - type: Objective diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml index 26a4db42a0..1d6fab6998 100644 --- a/Resources/Prototypes/Objectives/traitor.yml +++ b/Resources/Prototypes/Objectives/traitor.yml @@ -192,7 +192,7 @@ id: BaseCMOStealObjective components: - type: NotJobRequirement - job: ChiefMedicalOfficer + jobs: [ ChiefMedicalOfficer ] - type: StealCondition owner: job-name-cmo @@ -218,7 +218,7 @@ id: BaseRDStealObjective components: - type: NotJobRequirement - job: ResearchDirector + jobs: [ ResearchDirector ] - type: StealCondition owner: job-name-rd @@ -249,7 +249,7 @@ # HoS will have this on them a lot of the time so.. difficulty: 3 - type: NotJobRequirement - job: HeadOfSecurity + jobs: [ HeadOfSecurity ] - type: StealCondition stealGroup: WeaponEnergyMagnum owner: job-name-hos @@ -261,7 +261,7 @@ id: MagbootsStealObjective components: - type: NotJobRequirement - job: ChiefEngineer + jobs: [ ChiefEngineer ] - type: StealCondition stealGroup: ClothingShoesBootsMagAdv owner: job-name-ce @@ -273,7 +273,7 @@ id: ClipboardStealObjective components: - type: NotJobRequirement - job: Quartermaster + jobs: [ Quartermaster ] - type: StealCondition stealGroup: BoxFolderQmClipboard owner: job-name-qm @@ -283,7 +283,7 @@ id: KnuckleDustersStealObjective components: - type: NotJobRequirement - job: Quartermaster + jobs: [ Quartermaster ] - type: StealCondition stealGroup: ClothingHandsKnuckleDustersQM owner: job-name-qm @@ -295,7 +295,7 @@ id: CorgiMeatStealObjective components: - type: NotJobRequirement - job: HeadOfPersonnel + jobs: [ HeadOfPersonnel ] - type: ObjectiveLimit limit: 3 # ian only has 2 slices, 3 obj for drama - type: StealCondition @@ -313,7 +313,7 @@ # sorry ce but your jordans are not as high security as the caps gear difficulty: 3.5 - type: NotJobRequirement - job: Captain + jobs: [ Captain ] - type: entity parent: BaseCaptainObjective From 050dae8aa79be582e40118fea3b5551f0ce4b953 Mon Sep 17 00:00:00 2001 From: Connor Huffine Date: Fri, 31 Oct 2025 06:37:10 -0400 Subject: [PATCH 064/121] Remove unused dependencies (#41213) --- Content.Server/Chat/Systems/ChatSystem.cs | 1 - Content.Server/Revenant/EntitySystems/RevenantSystem.cs | 1 - Content.Server/Weapons/Ranged/Systems/GunSystem.cs | 1 - Content.Server/Xenoarchaeology/Artifact/XAE/XAEPortalSystem.cs | 1 - 4 files changed, 4 deletions(-) diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs index a0e5a0bfed..b3128a6702 100644 --- a/Content.Server/Chat/Systems/ChatSystem.cs +++ b/Content.Server/Chat/Systems/ChatSystem.cs @@ -57,7 +57,6 @@ public sealed partial class ChatSystem : SharedChatSystem [Dependency] private readonly MobStateSystem _mobStateSystem = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly ReplacementAccentSystem _wordreplacement = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; [Dependency] private readonly ExamineSystemShared _examineSystem = default!; private bool _loocEnabled = true; diff --git a/Content.Server/Revenant/EntitySystems/RevenantSystem.cs b/Content.Server/Revenant/EntitySystems/RevenantSystem.cs index 34966d9c22..c5080c0b06 100644 --- a/Content.Server/Revenant/EntitySystems/RevenantSystem.cs +++ b/Content.Server/Revenant/EntitySystems/RevenantSystem.cs @@ -27,7 +27,6 @@ namespace Content.Server.Revenant.EntitySystems; public sealed partial class RevenantSystem : EntitySystem { [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly ActionsSystem _action = default!; [Dependency] private readonly AlertsSystem _alerts = default!; [Dependency] private readonly DamageableSystem _damage = default!; [Dependency] private readonly EntityLookupSystem _lookup = default!; diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs index dcfa3e6654..8bbab9503e 100644 --- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs +++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs @@ -22,7 +22,6 @@ namespace Content.Server.Weapons.Ranged.Systems; public sealed partial class GunSystem : SharedGunSystem { - [Dependency] private readonly DamageExamineSystem _damageExamine = default!; [Dependency] private readonly PricingSystem _pricing = default!; [Dependency] private readonly SharedMapSystem _map = default!; diff --git a/Content.Server/Xenoarchaeology/Artifact/XAE/XAEPortalSystem.cs b/Content.Server/Xenoarchaeology/Artifact/XAE/XAEPortalSystem.cs index 2de5dd0bfe..6bede34b68 100644 --- a/Content.Server/Xenoarchaeology/Artifact/XAE/XAEPortalSystem.cs +++ b/Content.Server/Xenoarchaeology/Artifact/XAE/XAEPortalSystem.cs @@ -20,7 +20,6 @@ public sealed class XAEPortalSystem : BaseXAESystem [Dependency] private readonly LinkedEntitySystem _link = default!; [Dependency] private readonly SharedTransformSystem _transform = default!; [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly IGameTiming _timing = default!; /// protected override void OnActivated(Entity ent, ref XenoArtifactNodeActivatedEvent args) From ce920e6f0d3e5e9c6765e407a938cd0050b1c34f Mon Sep 17 00:00:00 2001 From: Connor Huffine Date: Fri, 31 Oct 2025 06:38:10 -0400 Subject: [PATCH 065/121] Remove double includes (#41211) --- Content.Client/Access/UI/AgentIDCardWindow.xaml.cs | 1 - Content.Server/Botany/Systems/PlantHolderSystem.cs | 1 - 2 files changed, 2 deletions(-) diff --git a/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs b/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs index ea96b13376..2b8ebf53b7 100644 --- a/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs +++ b/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs @@ -9,7 +9,6 @@ using Robust.Client.UserInterface.XAML; using Robust.Shared.Prototypes; using System.Numerics; using System.Linq; -using Content.Client.Stylesheets; namespace Content.Client.Access.UI { diff --git a/Content.Server/Botany/Systems/PlantHolderSystem.cs b/Content.Server/Botany/Systems/PlantHolderSystem.cs index 1e992f9cd2..d5f331c157 100644 --- a/Content.Server/Botany/Systems/PlantHolderSystem.cs +++ b/Content.Server/Botany/Systems/PlantHolderSystem.cs @@ -23,7 +23,6 @@ using Robust.Shared.Player; using Robust.Shared.Prototypes; using Robust.Shared.Random; using Robust.Shared.Timing; -using Content.Shared.Administration.Logs; using Content.Shared.Chemistry.Reaction; using Content.Shared.Containers.ItemSlots; using Content.Shared.Database; From b6c674ac7797dbd3c0e7a4ec7258f953468582e1 Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 31 Oct 2025 15:52:22 +0000 Subject: [PATCH 066/121] Manual changelog push --- Resources/Changelog/Changelog.yml | 2 +- Resources/Changelog/Parts/pr-40065-Main.yml | 7 +++++++ Resources/Changelog/Parts/pr-40257-RULES.yml | 12 ++++++++++++ Resources/Changelog/Parts/pr-41134-Main.yml | 7 +++++++ Resources/Changelog/Parts/pr-41136-Main.yml | 7 +++++++ 5 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 Resources/Changelog/Parts/pr-40065-Main.yml create mode 100644 Resources/Changelog/Parts/pr-40257-RULES.yml create mode 100644 Resources/Changelog/Parts/pr-41134-Main.yml create mode 100644 Resources/Changelog/Parts/pr-41136-Main.yml diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 481d9ce3cb..f5f24d99bf 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,4 +1,4 @@ -Entries: +Entries: - author: Nikitosych changes: - message: Fixed the ability for holoparasite to kill the host through the mech diff --git a/Resources/Changelog/Parts/pr-40065-Main.yml b/Resources/Changelog/Parts/pr-40065-Main.yml new file mode 100644 index 0000000000..522cf81d0d --- /dev/null +++ b/Resources/Changelog/Parts/pr-40065-Main.yml @@ -0,0 +1,7 @@ +author: "SuperGDPWYL" +time: "2025-10-31T09:37:48.0000000+00:00" +url: "https://github.com/space-wizards/space-station-14/pull/40065" +changes: +- type: "Tweak" + message: "Certain thief objectives can no longer be rolled by jobs which have trivial access to the objective item." +... diff --git a/Resources/Changelog/Parts/pr-40257-RULES.yml b/Resources/Changelog/Parts/pr-40257-RULES.yml new file mode 100644 index 0000000000..e843575813 --- /dev/null +++ b/Resources/Changelog/Parts/pr-40257-RULES.yml @@ -0,0 +1,12 @@ +author: "Errant" +time: "2025-10-30T21:42:03.0000000+00:00" +url: "https://github.com/space-wizards/space-station-14/pull/40257" +changes: +- &2085259685 type: &1112762464 "Add" + &814436197 message: "Changes to Rules can now be tracked here." +- type: "Add" + message: "Rule changes are now tracked, on a new tab in the changelog window." +- type: "Tweak" + message: "Automation test. You like reading rules, don't you, you are a Rulesreader." +category: RULES +... diff --git a/Resources/Changelog/Parts/pr-41134-Main.yml b/Resources/Changelog/Parts/pr-41134-Main.yml new file mode 100644 index 0000000000..42a14688d1 --- /dev/null +++ b/Resources/Changelog/Parts/pr-41134-Main.yml @@ -0,0 +1,7 @@ +author: "aada" +time: "2025-10-31T00:20:53.0000000+00:00" +url: "https://github.com/space-wizards/space-station-14/pull/41134" +changes: +- type: "Fix" + message: "Several lathe recipes capable of duplicating materials have been made more expensive." +... diff --git a/Resources/Changelog/Parts/pr-41136-Main.yml b/Resources/Changelog/Parts/pr-41136-Main.yml new file mode 100644 index 0000000000..1ba1b21618 --- /dev/null +++ b/Resources/Changelog/Parts/pr-41136-Main.yml @@ -0,0 +1,7 @@ +author: "NoreUhh" +time: "2025-10-31T01:14:29.0000000+00:00" +url: "https://github.com/space-wizards/space-station-14/pull/41136" +changes: +- type: "Add" + message: "Added two new fun reagents, Felinase and Caninase, which change how you talk!" +... From ed47827d56a0756ce943ad957451f5209cd58466 Mon Sep 17 00:00:00 2001 From: Myra Date: Fri, 31 Oct 2025 17:07:07 +0100 Subject: [PATCH 067/121] Fix changelog part 2 (#41221) --- Resources/Changelog/Parts/pr-40257-RULES.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Changelog/Parts/pr-40257-RULES.yml b/Resources/Changelog/Parts/pr-40257-RULES.yml index e843575813..5baa53ff86 100644 --- a/Resources/Changelog/Parts/pr-40257-RULES.yml +++ b/Resources/Changelog/Parts/pr-40257-RULES.yml @@ -2,11 +2,11 @@ author: "Errant" time: "2025-10-30T21:42:03.0000000+00:00" url: "https://github.com/space-wizards/space-station-14/pull/40257" changes: -- &2085259685 type: &1112762464 "Add" - &814436197 message: "Changes to Rules can now be tracked here." +- type: "Add" + message: "Changes to Rules can now be tracked here." - type: "Add" message: "Rule changes are now tracked, on a new tab in the changelog window." - type: "Tweak" message: "Automation test. You like reading rules, don't you, you are a Rulesreader." -category: RULES +category: Rules ... From 79035cd023c629743b30367abdabaa123ec92f57 Mon Sep 17 00:00:00 2001 From: Sir Warock <67167466+SirWarock@users.noreply.github.com> Date: Fri, 31 Oct 2025 18:17:58 +0100 Subject: [PATCH 068/121] Fix Assumption of Nullable to have value (#41220) * Fix Potential Test Fail * Please the maintainer gods --- Content.Shared/Projectiles/ProjectileEmbedEvent.cs | 2 +- Content.Shared/Projectiles/SharedProjectileSystem.cs | 10 +++++----- .../Weapons/Misc/SharedGrapplingGunSystem.cs | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Content.Shared/Projectiles/ProjectileEmbedEvent.cs b/Content.Shared/Projectiles/ProjectileEmbedEvent.cs index e7dd6df8e2..675549c9d0 100644 --- a/Content.Shared/Projectiles/ProjectileEmbedEvent.cs +++ b/Content.Shared/Projectiles/ProjectileEmbedEvent.cs @@ -4,4 +4,4 @@ namespace Content.Shared.Projectiles; /// Raised directed on an entity when it embeds into something. /// [ByRefEvent] -public readonly record struct ProjectileEmbedEvent(EntityUid? Shooter, EntityUid Weapon, EntityUid Embedded); +public readonly record struct ProjectileEmbedEvent(EntityUid? Shooter, EntityUid? Weapon, EntityUid Embedded); diff --git a/Content.Shared/Projectiles/SharedProjectileSystem.cs b/Content.Shared/Projectiles/SharedProjectileSystem.cs index f99950c8f1..9a44ca545d 100644 --- a/Content.Shared/Projectiles/SharedProjectileSystem.cs +++ b/Content.Shared/Projectiles/SharedProjectileSystem.cs @@ -90,11 +90,11 @@ public abstract partial class SharedProjectileSystem : EntitySystem EmbedAttach(embeddable, args.Target, args.Shooter, embeddable.Comp); // Raise a specific event for projectiles. - if (TryComp(embeddable, out ProjectileComponent? projectile)) - { - var ev = new ProjectileEmbedEvent(projectile.Shooter!.Value, projectile.Weapon!.Value, args.Target); - RaiseLocalEvent(embeddable, ref ev); - } + if (!TryComp(embeddable, out var projectile)) + return; + + var ev = new ProjectileEmbedEvent(projectile.Shooter, projectile.Weapon, args.Target); + RaiseLocalEvent(embeddable, ref ev); } private void EmbedAttach(EntityUid uid, EntityUid target, EntityUid? user, EmbeddableProjectileComponent component) diff --git a/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs b/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs index a3c5a322ee..77af2e6543 100644 --- a/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs +++ b/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs @@ -225,11 +225,11 @@ public abstract class SharedGrapplingGunSystem : EntitySystem private void OnGrappleCollide(EntityUid uid, GrapplingProjectileComponent component, ref ProjectileEmbedEvent args) { - if (!Timing.IsFirstTimePredicted) + if (!Timing.IsFirstTimePredicted || !args.Weapon.HasValue) return; var jointComp = EnsureComp(uid); - var joint = _joints.CreateDistanceJoint(uid, args.Weapon, anchorA: new Vector2(0f, 0.5f), id: GrapplingJoint); + var joint = _joints.CreateDistanceJoint(uid, args.Weapon.Value, anchorA: new Vector2(0f, 0.5f), id: GrapplingJoint); joint.MaxLength = joint.Length + 0.2f; joint.Stiffness = 1f; joint.MinLength = 0.35f; From d893cda971cffe231e921da8d99298a4d534bbda Mon Sep 17 00:00:00 2001 From: Errant <35878406+Errant-4@users.noreply.github.com> Date: Fri, 31 Oct 2025 21:23:28 +0100 Subject: [PATCH 069/121] Fix for Tesla Twins Miniboss (#41199) * increase QA standards on the Tesla Generator production line * comment * Inert datafield and code * I'm not even supposed to be here today --- .../EntitySystems/SingularityGeneratorSystem.cs | 6 +++++- .../Components/SingularityGeneratorComponent.cs | 7 +++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs b/Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs index 884d625045..44c5da13a8 100644 --- a/Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs +++ b/Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs @@ -53,6 +53,9 @@ public sealed class SingularityGeneratorSystem : SharedSingularityGeneratorSyste return; SetPower(uid, 0, comp); + + // Other particle entities from the same wave could trigger additional teslas to spawn, so we must block the generator + comp.Inert = true; Spawn(comp.SpawnPrototype, Transform(uid).Coordinates); } @@ -112,7 +115,8 @@ public sealed class SingularityGeneratorSystem : SharedSingularityGeneratorSyste if (!TryComp(args.OtherEntity, out var generatorComp)) return; - if (_timing.CurTime < _metadata.GetPauseTime(uid) + generatorComp.NextFailsafe && !generatorComp.FailsafeDisabled) + if (generatorComp.Inert || + _timing.CurTime < generatorComp.NextFailsafe && !generatorComp.FailsafeDisabled) { QueueDel(uid); return; diff --git a/Content.Shared/Singularity/Components/SingularityGeneratorComponent.cs b/Content.Shared/Singularity/Components/SingularityGeneratorComponent.cs index 715584b5bc..8d4317e743 100644 --- a/Content.Shared/Singularity/Components/SingularityGeneratorComponent.cs +++ b/Content.Shared/Singularity/Components/SingularityGeneratorComponent.cs @@ -24,6 +24,13 @@ public sealed partial class SingularityGeneratorComponent : Component [DataField] public float Threshold = 16; + /// + /// An inert generator will never be charged by particles, even if emagged. + /// This is normally only used between activating and being destroyed, to avoid creating duplicate teslas. + /// + [DataField] + public bool Inert; + /// /// Allows the generator to ignore all the failsafe stuff, e.g. when emagged /// From 1f38a342175fe519b6fae1a0c3a7be86724079a6 Mon Sep 17 00:00:00 2001 From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> Date: Fri, 31 Oct 2025 13:45:50 -0700 Subject: [PATCH 070/121] Atmospherics Substepping (#40465) * initial shitcode commit * command boilerplate * command flushed out and docs fixes * missed one important thing in method extraction * do loc properly * rest later * address review * this worked on my laptop but not on my desktop but okay * review comments * address review --- .../Atmos/Commands/PauseAtmosCommand.cs | 69 ++++ .../Atmos/Commands/SubstepAtmosCommand.cs | 104 ++++++ .../AtmosphereSystem.BenchmarkHelpers.cs | 23 ++ .../AtmosphereSystem.Processing.cs | 305 ++++++++++-------- .../en-US/commands/pauseatmos-command.ftl | 6 + .../en-US/commands/substepatmos-command.ftl | 15 + 6 files changed, 396 insertions(+), 126 deletions(-) create mode 100644 Content.Server/Atmos/Commands/PauseAtmosCommand.cs create mode 100644 Content.Server/Atmos/Commands/SubstepAtmosCommand.cs create mode 100644 Resources/Locale/en-US/commands/pauseatmos-command.ftl create mode 100644 Resources/Locale/en-US/commands/substepatmos-command.ftl diff --git a/Content.Server/Atmos/Commands/PauseAtmosCommand.cs b/Content.Server/Atmos/Commands/PauseAtmosCommand.cs new file mode 100644 index 0000000000..984f2a0869 --- /dev/null +++ b/Content.Server/Atmos/Commands/PauseAtmosCommand.cs @@ -0,0 +1,69 @@ +using Content.Server.Administration; +using Content.Server.Atmos.Components; +using Content.Server.Atmos.EntitySystems; +using Content.Shared.Administration; +using Robust.Shared.Console; + +namespace Content.Server.Atmos.Commands; + +[AdminCommand(AdminFlags.Debug)] +public sealed class PauseAtmosCommand : LocalizedEntityCommands +{ + [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; + + public override string Command => "pauseatmos"; + + public override void Execute(IConsoleShell shell, string argStr, string[] args) + { + var grid = default(EntityUid); + + switch (args.Length) + { + case 0: + if (!EntityManager.TryGetComponent(shell.Player?.AttachedEntity, + out var playerxform) || + playerxform.GridUid == null) + { + shell.WriteError(Loc.GetString("cmd-error-no-grid-provided-or-invalid-grid")); + return; + } + + grid = playerxform.GridUid.Value; + break; + case 1: + if (!EntityUid.TryParse(args[0], out var parsedGrid) || !EntityManager.EntityExists(parsedGrid)) + { + shell.WriteError(Loc.GetString("cmd-error-couldnt-parse-entity")); + return; + } + + grid = parsedGrid; + break; + } + + if (!EntityManager.TryGetComponent(grid, out var gridAtmos)) + { + shell.WriteError(Loc.GetString("cmd-error-no-gridatmosphere")); + return; + } + + var newEnt = new Entity(grid, gridAtmos); + + _atmosphereSystem.SetAtmosphereSimulation(newEnt, !newEnt.Comp.Simulated); + shell.WriteLine(Loc.GetString("cmd-pauseatmos-set-atmos-simulation", + ("grid", EntityManager.ToPrettyString(grid)), + ("state", newEnt.Comp.Simulated))); + } + + public override CompletionResult GetCompletion(IConsoleShell shell, string[] args) + { + if (args.Length == 1) + { + return CompletionResult.FromHintOptions( + CompletionHelper.Components(args[0], EntityManager), + Loc.GetString("cmd-pauseatmos-completion-grid-pause")); + } + + return CompletionResult.Empty; + } +} diff --git a/Content.Server/Atmos/Commands/SubstepAtmosCommand.cs b/Content.Server/Atmos/Commands/SubstepAtmosCommand.cs new file mode 100644 index 0000000000..554abff4a8 --- /dev/null +++ b/Content.Server/Atmos/Commands/SubstepAtmosCommand.cs @@ -0,0 +1,104 @@ +using Content.Server.Administration; +using Content.Server.Atmos.Components; +using Content.Server.Atmos.EntitySystems; +using Content.Shared.Administration; +using Content.Shared.Atmos.Components; +using Robust.Shared.Console; +using Robust.Shared.Map; +using Robust.Shared.Map.Components; + +namespace Content.Server.Atmos.Commands; + +[AdminCommand(AdminFlags.Debug)] +public sealed class SubstepAtmosCommand : LocalizedEntityCommands +{ + [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; + + public override string Command => "substepatmos"; + + public override void Execute(IConsoleShell shell, string argStr, string[] args) + { + var grid = default(EntityUid); + + switch (args.Length) + { + case 0: + if (!EntityManager.TryGetComponent(shell.Player?.AttachedEntity, + out var playerxform) || + playerxform.GridUid == null) + { + shell.WriteError(Loc.GetString("cmd-error-no-grid-provided-or-invalid-grid")); + return; + } + + grid = playerxform.GridUid.Value; + break; + case 1: + if (!EntityUid.TryParse(args[0], out var parsedGrid) || !EntityManager.EntityExists(parsedGrid)) + { + shell.WriteError(Loc.GetString("cmd-error-couldnt-parse-entity")); + return; + } + + grid = parsedGrid; + break; + } + + // i'm straight piratesoftwaremaxxing + if (!EntityManager.TryGetComponent(grid, out var gridAtmos)) + { + shell.WriteError(Loc.GetString("cmd-error-no-gridatmosphere")); + return; + } + + if (!EntityManager.TryGetComponent(grid, out var gasTile)) + { + shell.WriteError(Loc.GetString("cmd-error-no-gastileoverlay")); + return; + } + + if (!EntityManager.TryGetComponent(grid, out var mapGrid)) + { + shell.WriteError(Loc.GetString("cmd-error-no-mapgrid")); + return; + } + + var xform = EntityManager.GetComponent(grid); + + if (xform.MapUid == null || xform.MapID == MapId.Nullspace) + { + shell.WriteError(Loc.GetString("cmd-error-no-valid-map")); + return; + } + + var newEnt = + new Entity(grid, + gridAtmos, + gasTile, + mapGrid, + xform); + + if (gridAtmos.Simulated) + { + shell.WriteLine(Loc.GetString("cmd-substepatmos-info-implicitly-paused-simulation", + ("grid", EntityManager.ToPrettyString(grid)))); + } + + _atmosphereSystem.SetAtmosphereSimulation(newEnt, false); + _atmosphereSystem.RunProcessingFull(newEnt, xform.MapUid.Value, _atmosphereSystem.AtmosTickRate); + + shell.WriteLine(Loc.GetString("cmd-substepatmos-info-substepped-grid", ("grid", EntityManager.ToPrettyString(grid)))); + } + + public override CompletionResult GetCompletion(IConsoleShell shell, string[] args) + { + if (args.Length == 1) + { + return CompletionResult.FromHintOptions( + CompletionHelper.Components(args[0], EntityManager), + Loc.GetString("cmd-substepatmos-completion-grid-substep")); + } + + return CompletionResult.Empty; + } +} diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.BenchmarkHelpers.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.BenchmarkHelpers.cs index f86ebcee73..62cbbae68a 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.BenchmarkHelpers.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.BenchmarkHelpers.cs @@ -46,4 +46,27 @@ public sealed partial class AtmosphereSystem return processingPaused; } + + /// + /// Fully runs one entity through the entire Atmos processing loop. + /// + /// The entity to simulate. + /// The that belongs to the grid's map. + /// Elapsed time to simulate. Recommended value is . + public void RunProcessingFull(Entity ent, + Entity mapAtmosphere, + float frameTime) + { + while (ProcessAtmosphere(ent, mapAtmosphere, frameTime) != AtmosphereProcessingCompletionState.Finished) { } + } + + /// + /// Allows or disallows atmosphere simulation on a . + /// + /// The atmosphere to pause or unpause processing. + /// The state to set. True means that the atmosphere is allowed to simulate, false otherwise. + public void SetAtmosphereSimulation(Entity ent, bool simulate) + { + ent.Comp.Simulated = simulate; + } } diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs index 9b8654af6d..72e4b5f151 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs @@ -649,143 +649,196 @@ namespace Content.Server.Atmos.EntitySystems if (atmosphere.LifeStage >= ComponentLifeStage.Stopping || Paused(owner) || !atmosphere.Simulated) continue; - atmosphere.Timer += frameTime; - - if (atmosphere.Timer < AtmosTime) - continue; - - // We subtract it so it takes lost time into account. - atmosphere.Timer -= AtmosTime; - var map = new Entity(xform.MapUid.Value, _mapAtmosQuery.CompOrNull(xform.MapUid.Value)); - switch (atmosphere.State) + var completionState = ProcessAtmosphere(ent, map, frameTime); + + switch (completionState) { - case AtmosphereProcessingState.Revalidate: - if (!ProcessRevalidate(ent)) - { - atmosphere.ProcessingPaused = true; - return; - } - - atmosphere.ProcessingPaused = false; - - // Next state depends on whether monstermos equalization is enabled or not. - // Note: We do this here instead of on the tile equalization step to prevent ending it early. - // Therefore, a change to this CVar might only be applied after that step is over. - atmosphere.State = MonstermosEqualization - ? AtmosphereProcessingState.TileEqualize - : AtmosphereProcessingState.ActiveTiles; + case AtmosphereProcessingCompletionState.Return: + return; + case AtmosphereProcessingCompletionState.Continue: continue; - case AtmosphereProcessingState.TileEqualize: - if (!ProcessTileEqualize(ent)) - { - atmosphere.ProcessingPaused = true; - return; - } - - atmosphere.ProcessingPaused = false; - atmosphere.State = AtmosphereProcessingState.ActiveTiles; - continue; - case AtmosphereProcessingState.ActiveTiles: - if (!ProcessActiveTiles(ent)) - { - atmosphere.ProcessingPaused = true; - return; - } - - atmosphere.ProcessingPaused = false; - // Next state depends on whether excited groups are enabled or not. - atmosphere.State = ExcitedGroups ? AtmosphereProcessingState.ExcitedGroups : AtmosphereProcessingState.HighPressureDelta; - continue; - case AtmosphereProcessingState.ExcitedGroups: - if (!ProcessExcitedGroups(ent)) - { - atmosphere.ProcessingPaused = true; - return; - } - - atmosphere.ProcessingPaused = false; - atmosphere.State = AtmosphereProcessingState.HighPressureDelta; - continue; - case AtmosphereProcessingState.HighPressureDelta: - if (!ProcessHighPressureDelta((ent, ent))) - { - atmosphere.ProcessingPaused = true; - return; - } - - atmosphere.ProcessingPaused = false; - atmosphere.State = DeltaPressureDamage - ? AtmosphereProcessingState.DeltaPressure - : AtmosphereProcessingState.Hotspots; - continue; - case AtmosphereProcessingState.DeltaPressure: - if (!ProcessDeltaPressure(ent)) - { - atmosphere.ProcessingPaused = true; - return; - } - - atmosphere.ProcessingPaused = false; - atmosphere.State = AtmosphereProcessingState.Hotspots; - continue; - case AtmosphereProcessingState.Hotspots: - if (!ProcessHotspots(ent)) - { - atmosphere.ProcessingPaused = true; - return; - } - - atmosphere.ProcessingPaused = false; - // Next state depends on whether superconduction is enabled or not. - // Note: We do this here instead of on the tile equalization step to prevent ending it early. - // Therefore, a change to this CVar might only be applied after that step is over. - atmosphere.State = Superconduction - ? AtmosphereProcessingState.Superconductivity - : AtmosphereProcessingState.PipeNet; - continue; - case AtmosphereProcessingState.Superconductivity: - if (!ProcessSuperconductivity(atmosphere)) - { - atmosphere.ProcessingPaused = true; - return; - } - - atmosphere.ProcessingPaused = false; - atmosphere.State = AtmosphereProcessingState.PipeNet; - continue; - case AtmosphereProcessingState.PipeNet: - if (!ProcessPipeNets(atmosphere)) - { - atmosphere.ProcessingPaused = true; - return; - } - - atmosphere.ProcessingPaused = false; - atmosphere.State = AtmosphereProcessingState.AtmosDevices; - continue; - case AtmosphereProcessingState.AtmosDevices: - if (!ProcessAtmosDevices(ent, map)) - { - atmosphere.ProcessingPaused = true; - return; - } - - atmosphere.ProcessingPaused = false; - atmosphere.State = AtmosphereProcessingState.Revalidate; - - // We reached the end of this atmosphere's update tick. Break out of the switch. + case AtmosphereProcessingCompletionState.Finished: break; } - - // And increase the update counter. - atmosphere.UpdateCounter++; } // We finished processing all atmospheres successfully, therefore we won't be paused next tick. _simulationPaused = false; } + + /// + /// Processes a through its processing stages. + /// + /// The entity to process. + /// The belonging to the + /// 's map. + /// The elapsed time since the last frame. + /// An that represents the completion state. + private AtmosphereProcessingCompletionState ProcessAtmosphere(Entity ent, + Entity mapAtmosphere, + float frameTime) + { + // They call me the deconstructor the way i be deconstructing it + // and by it, i mean... my entity + var (owner, atmosphere, visuals, grid, xform) = ent; + + atmosphere.Timer += frameTime; + + if (atmosphere.Timer < AtmosTime) + return AtmosphereProcessingCompletionState.Continue; + + // We subtract it so it takes lost time into account. + atmosphere.Timer -= AtmosTime; + + switch (atmosphere.State) + { + case AtmosphereProcessingState.Revalidate: + if (!ProcessRevalidate(ent)) + { + atmosphere.ProcessingPaused = true; + return AtmosphereProcessingCompletionState.Return; + } + + atmosphere.ProcessingPaused = false; + + // Next state depends on whether monstermos equalization is enabled or not. + // Note: We do this here instead of on the tile equalization step to prevent ending it early. + // Therefore, a change to this CVar might only be applied after that step is over. + atmosphere.State = MonstermosEqualization + ? AtmosphereProcessingState.TileEqualize + : AtmosphereProcessingState.ActiveTiles; + return AtmosphereProcessingCompletionState.Continue; + case AtmosphereProcessingState.TileEqualize: + if (!ProcessTileEqualize(ent)) + { + atmosphere.ProcessingPaused = true; + return AtmosphereProcessingCompletionState.Return; + } + + atmosphere.ProcessingPaused = false; + atmosphere.State = AtmosphereProcessingState.ActiveTiles; + return AtmosphereProcessingCompletionState.Continue; + case AtmosphereProcessingState.ActiveTiles: + if (!ProcessActiveTiles(ent)) + { + atmosphere.ProcessingPaused = true; + return AtmosphereProcessingCompletionState.Return; + } + + atmosphere.ProcessingPaused = false; + // Next state depends on whether excited groups are enabled or not. + atmosphere.State = ExcitedGroups ? AtmosphereProcessingState.ExcitedGroups : AtmosphereProcessingState.HighPressureDelta; + return AtmosphereProcessingCompletionState.Continue; + case AtmosphereProcessingState.ExcitedGroups: + if (!ProcessExcitedGroups(ent)) + { + atmosphere.ProcessingPaused = true; + return AtmosphereProcessingCompletionState.Return; + } + + atmosphere.ProcessingPaused = false; + atmosphere.State = AtmosphereProcessingState.HighPressureDelta; + return AtmosphereProcessingCompletionState.Continue; + case AtmosphereProcessingState.HighPressureDelta: + if (!ProcessHighPressureDelta((ent, ent))) + { + atmosphere.ProcessingPaused = true; + return AtmosphereProcessingCompletionState.Return; + } + + atmosphere.ProcessingPaused = false; + atmosphere.State = DeltaPressureDamage + ? AtmosphereProcessingState.DeltaPressure + : AtmosphereProcessingState.Hotspots; + return AtmosphereProcessingCompletionState.Continue; + case AtmosphereProcessingState.DeltaPressure: + if (!ProcessDeltaPressure(ent)) + { + atmosphere.ProcessingPaused = true; + return AtmosphereProcessingCompletionState.Return; + } + + atmosphere.ProcessingPaused = false; + atmosphere.State = AtmosphereProcessingState.Hotspots; + return AtmosphereProcessingCompletionState.Continue; + case AtmosphereProcessingState.Hotspots: + if (!ProcessHotspots(ent)) + { + atmosphere.ProcessingPaused = true; + return AtmosphereProcessingCompletionState.Return; + } + + atmosphere.ProcessingPaused = false; + // Next state depends on whether superconduction is enabled or not. + // Note: We do this here instead of on the tile equalization step to prevent ending it early. + // Therefore, a change to this CVar might only be applied after that step is over. + atmosphere.State = Superconduction + ? AtmosphereProcessingState.Superconductivity + : AtmosphereProcessingState.PipeNet; + return AtmosphereProcessingCompletionState.Continue; + case AtmosphereProcessingState.Superconductivity: + if (!ProcessSuperconductivity(atmosphere)) + { + atmosphere.ProcessingPaused = true; + return AtmosphereProcessingCompletionState.Return; + } + + atmosphere.ProcessingPaused = false; + atmosphere.State = AtmosphereProcessingState.PipeNet; + return AtmosphereProcessingCompletionState.Continue; + case AtmosphereProcessingState.PipeNet: + if (!ProcessPipeNets(atmosphere)) + { + atmosphere.ProcessingPaused = true; + return AtmosphereProcessingCompletionState.Return; + } + + atmosphere.ProcessingPaused = false; + atmosphere.State = AtmosphereProcessingState.AtmosDevices; + return AtmosphereProcessingCompletionState.Continue; + case AtmosphereProcessingState.AtmosDevices: + if (!ProcessAtmosDevices(ent, mapAtmosphere)) + { + atmosphere.ProcessingPaused = true; + return AtmosphereProcessingCompletionState.Return; + } + + atmosphere.ProcessingPaused = false; + atmosphere.State = AtmosphereProcessingState.Revalidate; + + // We reached the end of this atmosphere's update tick. Break out of the switch. + break; + } + + atmosphere.UpdateCounter++; + + return AtmosphereProcessingCompletionState.Finished; + } + } + + /// + /// An enum representing the completion state of a 's processing steps. + /// The processing of a spans over multiple stages and sticks, + /// with the method handling the processing having multiple return types. + /// + public enum AtmosphereProcessingCompletionState : byte + { + /// + /// Method is returning, ex. due to delegating processing to the next tick. + /// + Return, + + /// + /// Method is continuing, ex. due to finishing a single processing stage. + /// + Continue, + + /// + /// Method is finished with the GridAtmosphere. + /// + Finished, } public enum AtmosphereProcessingState : byte diff --git a/Resources/Locale/en-US/commands/pauseatmos-command.ftl b/Resources/Locale/en-US/commands/pauseatmos-command.ftl new file mode 100644 index 0000000000..1eb2e13f57 --- /dev/null +++ b/Resources/Locale/en-US/commands/pauseatmos-command.ftl @@ -0,0 +1,6 @@ +cmd-pauseatmos-desc = Pauses or unpauses the atmosphere simulation for the provided grid entity. +cmd-pauseatmos-help = Usage: {$command} + +cmd-pauseatmos-set-atmos-simulation = Set atmospherics simulation on {$grid} to state {$state}. + +cmd-pauseatmos-completion-grid-pause = EntityUid of the grid you want to pause/unpause. Automatically uses the grid you're standing on if empty. diff --git a/Resources/Locale/en-US/commands/substepatmos-command.ftl b/Resources/Locale/en-US/commands/substepatmos-command.ftl new file mode 100644 index 0000000000..bb8908572f --- /dev/null +++ b/Resources/Locale/en-US/commands/substepatmos-command.ftl @@ -0,0 +1,15 @@ +cmd-substepatmos-desc = Substeps the atmosphere simulation by a single atmostick for the provided grid entity. Implicitly pauses atmospherics simulation. +cmd-substepatmos-help = Usage: {$command} + +cmd-error-no-grid-provided-or-invalid-grid = You must either provide a grid entity or be standing on a grid to substep. +cmd-error-couldnt-parse-entity = Entity provided could not be parsed or does not exist. Try standing on a grid you want to substep. +cmd-error-no-gridatmosphere = Entity provided doesn't have a GridAtmosphereComponent. +cmd-error-no-gastileoverlay = Entity provided doesn't have a GasTileOverlayComponent. +cmd-error-no-mapgrid = Entity provided doesn't have a MapGridComponent. +cmd-error-no-xform = Entity provided doesn't have a TransformComponent? +cmd-error-no-valid-map = The grid provided is not on a valid map? + +cmd-substepatmos-info-implicitly-paused-simulation = Implicitly paused atmospherics simulation on {$grid}. +cmd-substepatmos-info-substepped-grid = Substepped atmospherics simulation by one atmostick on {$grid}. + +cmd-substepatmos-completion-grid-substep = EntityUid of the grid you want to substep. Automatically uses the grid you're standing on if empty. From 696debc6068b6fd545c02cca9a4ea94c63d50d8f Mon Sep 17 00:00:00 2001 From: Hannah Giovanna Dawson Date: Sat, 1 Nov 2025 00:36:44 +0000 Subject: [PATCH 071/121] Migrate random shuttle events to load dynamically (#40326) --- .../Rules/Components/LoadMapRuleComponent.cs | 6 +- .../Prototypes/GameRules/unknown_shuttles.yml | 48 ++++----- .../Shuttles/shuttle_incoming_event.yml | 100 ------------------ 3 files changed, 29 insertions(+), 125 deletions(-) delete mode 100644 Resources/Prototypes/Shuttles/shuttle_incoming_event.yml diff --git a/Content.Server/GameTicking/Rules/Components/LoadMapRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/LoadMapRuleComponent.cs index f09fff5eaf..f1bd1e5eef 100644 --- a/Content.Server/GameTicking/Rules/Components/LoadMapRuleComponent.cs +++ b/Content.Server/GameTicking/Rules/Components/LoadMapRuleComponent.cs @@ -34,7 +34,11 @@ public sealed partial class LoadMapRuleComponent : Component /// /// A to move to a new map. /// If there are no instances left nothing is done. + /// + /// This is deprecated. Do not create new content that uses this field, + /// and migrate existing content to be loaded dynamically during the round. + /// /// - [DataField] + [DataField, Obsolete("Do not pre-load grids. This causes the server to have to keep that grid loaded in memory during the entire round, even if that grid is never summoned to the playspace.")] public ProtoId? PreloadedGrid; } diff --git a/Resources/Prototypes/GameRules/unknown_shuttles.yml b/Resources/Prototypes/GameRules/unknown_shuttles.yml index 6b5cdc7998..ae57cab0b6 100644 --- a/Resources/Prototypes/GameRules/unknown_shuttles.yml +++ b/Resources/Prototypes/GameRules/unknown_shuttles.yml @@ -49,7 +49,7 @@ weight: 10 # 10 default reoccurrenceDelay: 30 duration: 1 - maxOccurrences: 1 # should be the same as [copies] in shuttle_incoming_event.yml + maxOccurrences: 1 - type: RuleGrids - type: LoadMapRule @@ -58,9 +58,9 @@ id: UnknownShuttleCargoLost components: - type: StationEvent - maxOccurrences: 2 # should be the same as [copies] in shuttle_incoming_event.yml + maxOccurrences: 2 - type: LoadMapRule - preloadedGrid: ShuttleCargoLost + gridPath: /Maps/Shuttles/ShuttleEvent/lost_cargo.yml - type: entity parent: BaseUnknownShuttleRule @@ -68,9 +68,9 @@ components: - type: StationEvent startAnnouncement: station-event-unknown-shuttle-incoming - maxOccurrences: 2 # should be the same as [copies] in shuttle_incoming_event.yml + maxOccurrences: 2 - type: LoadMapRule - preloadedGrid: TravelingCuisine + gridPath: /Maps/Shuttles/ShuttleEvent/traveling_china_cuisine.yml - type: entity parent: BaseUnknownShuttleRule @@ -78,9 +78,9 @@ components: - type: StationEvent startAnnouncement: station-event-unknown-shuttle-incoming - maxOccurrences: 3 # should be the same as [copies] in shuttle_incoming_event.yml + maxOccurrences: 3 - type: LoadMapRule - preloadedGrid: DisasterEvacPod + gridPath: /Maps/Shuttles/ShuttleEvent/disaster_evacpod.yml # The power of 3 clowns proved too strong for the players and may need to be 1984'ed. Replace this with a more engaging clown shuttle. - type: entity @@ -91,7 +91,7 @@ startAnnouncement: station-event-unknown-shuttle-incoming #!! weight: 2 - type: LoadMapRule - preloadedGrid: Honki + gridPath: /Maps/Shuttles/ShuttleEvent/honki.yml - type: entity parent: BaseUnknownShuttleRule @@ -100,9 +100,9 @@ - type: StationEvent startAnnouncement: null # It should be silent. weight: 5 # lower because weird freelance roles - maxOccurrences: 2 # should be the same as [copies] in shuttle_incoming_event.yml + maxOccurrences: 2 - type: LoadMapRule - preloadedGrid: SyndieEvacPod + gridPath: /Maps/Shuttles/ShuttleEvent/syndie_evacpod.yml - type: entity id: UnknownShuttleNTQuark @@ -114,7 +114,7 @@ earliestStart: 45 # late to hopefully have enough ghosts to fill all roles quickly. minimumPlayers: 25 - type: LoadMapRule - preloadedGrid: NTQuark + gridPath: /Maps/Shuttles/ShuttleEvent/quark.yml - type: entity id: UnknownShuttleCruiser @@ -124,7 +124,7 @@ startAnnouncement: station-event-unknown-shuttle-incoming #!! weight: 2 # Its just a big ship, so it needs to be rarer to be interesting. - type: LoadMapRule - preloadedGrid: Cruiser + gridPath: /Maps/Shuttles/ShuttleEvent/cruiser.yml - type: entity id: UnknownShuttleCryptid @@ -133,7 +133,7 @@ - type: StationEvent startAnnouncement: station-event-unknown-shuttle-incoming #!! - type: LoadMapRule - preloadedGrid: Cryptid + gridPath: /Maps/Shuttles/ShuttleEvent/cryptid.yml - type: entity id: UnknownShuttleEternal @@ -142,7 +142,7 @@ - type: StationEvent startAnnouncement: station-event-unknown-shuttle-incoming #!! - type: LoadMapRule - preloadedGrid: Eternal + gridPath: /Maps/Shuttles/ShuttleEvent/eternal.yml - type: entity id: UnknownShuttleFlatline @@ -151,7 +151,7 @@ - type: StationEvent startAnnouncement: station-event-unknown-shuttle-incoming #!! - type: LoadMapRule - preloadedGrid: Flatline + gridPath: /Maps/Shuttles/ShuttleEvent/flatline.yml - type: entity id: UnknownShuttleGym @@ -161,7 +161,7 @@ startAnnouncement: station-event-unknown-shuttle-incoming #!! weight: 5 # Its just a big ship, so it needs to be rarer to be interesting. - type: LoadMapRule - preloadedGrid: Gym + gridPath: /Maps/Shuttles/ShuttleEvent/gym.yml - type: entity id: UnknownShuttleNTIncorporation @@ -172,7 +172,7 @@ weight: 2 # Its just a big ship, so it needs to be rarer to be interesting. earliestStart: 45 # late to hopefully have enough ghosts to fill all roles quickly. (5-6) - type: LoadMapRule - preloadedGrid: NTIncorporation + gridPath: /Maps/Shuttles/ShuttleEvent/incorporation.yml - type: entity id: UnknownShuttleInstigator @@ -183,7 +183,7 @@ weight: 1 # lower because antags. earliestStart: 50 # late to hopefully have enough ghosts to fill all roles quickly (3) and because antags - type: LoadMapRule - preloadedGrid: Instigator + gridPath: /Maps/Shuttles/ShuttleEvent/instigator.yml - type: entity id: UnknownShuttleJoe @@ -192,7 +192,7 @@ - type: StationEvent startAnnouncement: station-event-unknown-shuttle-incoming #!! - type: LoadMapRule - preloadedGrid: Joe + gridPath: /Maps/Shuttles/ShuttleEvent/joe.yml - type: entity id: UnknownShuttleLambordeere @@ -201,7 +201,7 @@ - type: StationEvent startAnnouncement: station-event-unknown-shuttle-incoming #!! - type: LoadMapRule - preloadedGrid: Lambordeere + gridPath: /Maps/Shuttles/ShuttleEvent/lambordeere.yml - type: entity id: UnknownShuttleManOWar @@ -212,7 +212,7 @@ weight: 1 # lower because antags earliestStart: 50 # late to hopefully have enough ghosts to fill all roles quickly. (4) & antags - type: LoadMapRule - preloadedGrid: ManOWar + gridPath: /Maps/Shuttles/ShuttleEvent/manowar.yml - type: entity id: UnknownShuttleMeatZone @@ -221,7 +221,7 @@ - type: StationEvent startAnnouncement: station-event-unknown-shuttle-incoming #!! - type: LoadMapRule - preloadedGrid: Meatzone + gridPath: /Maps/Shuttles/ShuttleEvent/meatzone.yml - type: entity id: UnknownShuttleMicroshuttle @@ -232,7 +232,7 @@ weight: 11 # this is higher because its just a little generic personal shuttle maxOccurrences: 4 - type: LoadMapRule - preloadedGrid: Microshuttle + gridPath: /Maps/Shuttles/ShuttleEvent/microshuttle.yml - type: entity id: UnknownShuttleSpacebus @@ -241,5 +241,5 @@ - type: StationEvent startAnnouncement: station-event-unknown-shuttle-incoming #!! - type: LoadMapRule - preloadedGrid: Spacebus + gridPath: /Maps/Shuttles/ShuttleEvent/spacebus.yml diff --git a/Resources/Prototypes/Shuttles/shuttle_incoming_event.yml b/Resources/Prototypes/Shuttles/shuttle_incoming_event.yml deleted file mode 100644 index 8bcfb32d5a..0000000000 --- a/Resources/Prototypes/Shuttles/shuttle_incoming_event.yml +++ /dev/null @@ -1,100 +0,0 @@ -- type: preloadedGrid - id: ShuttleCargoLost - path: /Maps/Shuttles/ShuttleEvent/lost_cargo.yml - copies: 2 - -- type: preloadedGrid - id: TravelingCuisine - path: /Maps/Shuttles/ShuttleEvent/traveling_china_cuisine.yml - copies: 2 - -- type: preloadedGrid - id: DisasterEvacPod - path: /Maps/Shuttles/ShuttleEvent/disaster_evacpod.yml - copies: 3 - -# The power of 3 clowns has proved too strong for the players and may need to be 1984ed. -- type: preloadedGrid - id: Honki - path: /Maps/Shuttles/ShuttleEvent/honki.yml - copies: 1 - -- type: preloadedGrid - id: SyndieEvacPod - path: /Maps/Shuttles/ShuttleEvent/syndie_evacpod.yml - copies: 2 - -- type: preloadedGrid - id: NTQuark - path: /Maps/Shuttles/ShuttleEvent/quark.yml - copies: 1 - -- type: preloadedGrid - id: MeatZone - path: /Maps/Shuttles/ShuttleEvent/meatzone.yml - copies: 1 - -- type: preloadedGrid - id: Cruiser - path: /Maps/Shuttles/ShuttleEvent/cruiser.yml - copies: 1 - -- type: preloadedGrid - id: Cryptid - path: /Maps/Shuttles/ShuttleEvent/cryptid.yml - copies: 1 - -- type: preloadedGrid - id: Eternal - path: /Maps/Shuttles/ShuttleEvent/eternal.yml - copies: 1 - -- type: preloadedGrid - id: Flatline - path: /Maps/Shuttles/ShuttleEvent/flatline.yml - copies: 1 - -- type: preloadedGrid - id: Gym - path: /Maps/Shuttles/ShuttleEvent/gym.yml - copies: 1 - -- type: preloadedGrid - id: NTIncorporation - path: /Maps/Shuttles/ShuttleEvent/incorporation.yml - copies: 1 - -- type: preloadedGrid - id: Instigator - path: /Maps/Shuttles/ShuttleEvent/instigator.yml - copies: 1 - -- type: preloadedGrid - id: Joe - path: /Maps/Shuttles/ShuttleEvent/joe.yml - copies: 1 - -- type: preloadedGrid - id: Lambordeere - path: /Maps/Shuttles/ShuttleEvent/lambordeere.yml - copies: 1 - -- type: preloadedGrid - id: ManOWar - path: /Maps/Shuttles/ShuttleEvent/manowar.yml - copies: 1 - -- type: preloadedGrid - id: Meatzone - path: /Maps/Shuttles/ShuttleEvent/meatzone.yml - copies: 1 - -- type: preloadedGrid - id: Microshuttle - path: /Maps/Shuttles/ShuttleEvent/microshuttle.yml - copies: 4 - -- type: preloadedGrid - id: Spacebus - path: /Maps/Shuttles/ShuttleEvent/spacebus.yml - copies: 1 From 85e91a7551f3ca246489347b17930c1f77533c12 Mon Sep 17 00:00:00 2001 From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Sat, 1 Nov 2025 05:00:17 +0100 Subject: [PATCH 072/121] Allow InteractionTests to load other maps (#41226) * load maps and marker * cleanup * sneaky doc * sneaky doc2 --------- Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> --- .../Pair/TestPair.Helpers.cs | 47 +++++++++++++++++-- .../Tests/Interaction/InteractionTest.cs | 18 ++++++- .../Tests/Interaction/InteractionTestTests.cs | 31 ++++++++++++ Content.Shared/Tests/TestMarkerComponent.cs | 16 +++++++ Resources/Maps/Test/empty.yml | 2 +- .../Entities/Markers/integration_test.yml | 8 ++++ 6 files changed, 116 insertions(+), 6 deletions(-) create mode 100644 Content.IntegrationTests/Tests/Interaction/InteractionTestTests.cs create mode 100644 Content.Shared/Tests/TestMarkerComponent.cs create mode 100644 Resources/Prototypes/Entities/Markers/integration_test.yml diff --git a/Content.IntegrationTests/Pair/TestPair.Helpers.cs b/Content.IntegrationTests/Pair/TestPair.Helpers.cs index 1a3b38e829..4d02b560c9 100644 --- a/Content.IntegrationTests/Pair/TestPair.Helpers.cs +++ b/Content.IntegrationTests/Pair/TestPair.Helpers.cs @@ -4,8 +4,13 @@ using System.Linq; using Content.Server.Preferences.Managers; using Content.Shared.Preferences; using Content.Shared.Roles; +using Robust.Shared.EntitySerialization; +using Robust.Shared.EntitySerialization.Systems; +using Robust.Shared.GameObjects; +using Robust.Shared.Map; using Robust.Shared.Network; using Robust.Shared.Prototypes; +using Robust.Shared.Utility; namespace Content.IntegrationTests.Pair; @@ -15,13 +20,49 @@ public sealed partial class TestPair public Task CreateTestMap(bool initialized = true) => CreateTestMap(initialized, "Plating"); + /// + /// Loads a test map and returns a representing it. + /// + /// The to the test map to load. + /// Whether to initialize the map on load. + /// A representing the loaded map. + public async Task LoadTestMap(ResPath testMapPath, bool initialized = true) + { + TestMapData mapData = new(); + var deserializationOptions = DeserializationOptions.Default with { InitializeMaps = initialized }; + var mapLoaderSys = Server.EntMan.System(); + var mapSys = Server.System(); + + // Load our test map in and assert that it exists. + await Server.WaitAssertion(() => + { + Assert.That(mapLoaderSys.TryLoadMap(testMapPath, out var map, out var gridSet, deserializationOptions), + $"Failed to load map {testMapPath}."); + Assert.That(gridSet, Is.Not.Empty, "There were no grids loaded from the map!"); + + mapData.MapUid = map!.Value.Owner; + mapData.MapId = map!.Value.Comp.MapId; + mapData.Grid = gridSet!.First(); + mapData.GridCoords = new EntityCoordinates(mapData.Grid, 0, 0); + mapData.MapCoords = new MapCoordinates(0, 0, mapData.MapId); + mapData.Tile = mapSys.GetAllTiles(mapData.Grid.Owner, mapData.Grid.Comp).First(); + }); + + await RunTicksSync(10); + mapData.CMapUid = ToClientUid(mapData.MapUid); + mapData.CGridUid = ToClientUid(mapData.Grid); + mapData.CGridCoords = new EntityCoordinates(mapData.CGridUid, 0, 0); + + return mapData; + } + /// /// Set a user's antag preferences. Modified preferences are automatically reset at the end of the test. /// public async Task SetAntagPreference(ProtoId id, bool value, NetUserId? user = null) { user ??= Client.User!.Value; - if (user is not {} userId) + if (user is not { } userId) return; var prefMan = Server.ResolveDependency(); @@ -30,7 +71,7 @@ public sealed partial class TestPair // Automatic preference resetting only resets slot 0. Assert.That(prefs.SelectedCharacterIndex, Is.EqualTo(0)); - var profile = (HumanoidCharacterProfile) prefs.Characters[0]; + var profile = (HumanoidCharacterProfile)prefs.Characters[0]; var newProfile = profile.WithAntagPreference(id, value); _modifiedProfiles.Add(userId); await Server.WaitPost(() => prefMan.SetProfile(userId, 0, newProfile).Wait()); @@ -58,7 +99,7 @@ public sealed partial class TestPair var prefMan = Server.ResolveDependency(); var prefs = prefMan.GetPreferences(user); - var profile = (HumanoidCharacterProfile) prefs.Characters[0]; + var profile = (HumanoidCharacterProfile)prefs.Characters[0]; var dictionary = new Dictionary, JobPriority>(profile.JobPriorities); // Automatic preference resetting only resets slot 0. diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs index 4a33fdc03b..746717e785 100644 --- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs +++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs @@ -24,6 +24,7 @@ using Robust.Shared.Map; using Robust.Shared.Player; using Robust.Shared.Prototypes; using Robust.Shared.Timing; +using Robust.Shared.Utility; using Robust.UnitTesting; namespace Content.IntegrationTests.Tests.Interaction; @@ -39,10 +40,20 @@ namespace Content.IntegrationTests.Tests.Interaction; [FixtureLifeCycle(LifeCycle.InstancePerTestCase)] public abstract partial class InteractionTest { + /// + /// The prototype that will be spawned for the player entity at . + /// This is not a full humanoid and only has one hand by default. + /// protected virtual string PlayerPrototype => "InteractionTestMob"; + /// + /// The map path to load for the integration test. + /// If null an empty map with a single 1x1 plating grid will be generated. + /// + protected virtual ResPath? TestMapPath => null; + protected TestPair Pair = default!; - protected TestMapData MapData => Pair.TestMap!; + protected TestMapData MapData = default!; protected RobustIntegrationTest.ServerIntegrationInstance Server => Pair.Server; protected RobustIntegrationTest.ClientIntegrationInstance Client => Pair.Client; @@ -199,7 +210,10 @@ public abstract partial class InteractionTest CUiSys = CEntMan.System(); // Setup map. - await Pair.CreateTestMap(); + if (TestMapPath == null) + MapData = await Pair.CreateTestMap(); + else + MapData = await Pair.LoadTestMap(TestMapPath.Value); PlayerCoords = SEntMan.GetNetCoordinates(Transform.WithEntityId(MapData.GridCoords.Offset(new Vector2(0.5f, 0.5f)), MapData.MapUid)); TargetCoords = SEntMan.GetNetCoordinates(Transform.WithEntityId(MapData.GridCoords.Offset(new Vector2(1.5f, 0.5f)), MapData.MapUid)); diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTestTests.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTestTests.cs new file mode 100644 index 0000000000..54417b6c0b --- /dev/null +++ b/Content.IntegrationTests/Tests/Interaction/InteractionTestTests.cs @@ -0,0 +1,31 @@ +using System.Linq; +using Robust.Shared.GameObjects; +using Robust.Shared.Map.Components; +using Robust.Shared.Utility; + +namespace Content.IntegrationTests.Tests.Interaction; + +/// +/// Makes sure that interaction test helper methods are working as intended. +/// +public sealed class InteractionTestTests : InteractionTest +{ + protected override ResPath? TestMapPath => new("Maps/Test/empty.yml"); + + /// + /// Tests that map loading is working correctly. + /// + [Test] + public void MapLoadingTest() + { + // Make sure that there is only one grid. + var grids = SEntMan.AllEntities().ToList(); + Assert.That(grids, Has.Count.EqualTo(1), "Test map did not have exactly one grid."); + Assert.That(grids, Does.Contain(MapData.Grid), "MapData did not contain the loaded grid."); + + // Make sure we loaded the right map. + // This name is defined in empty.yml + Assert.That(SEntMan.GetComponent(MapData.MapUid).EntityName, Is.EqualTo("Empty Debug Map")); + } +} + diff --git a/Content.Shared/Tests/TestMarkerComponent.cs b/Content.Shared/Tests/TestMarkerComponent.cs new file mode 100644 index 0000000000..7c9ff86152 --- /dev/null +++ b/Content.Shared/Tests/TestMarkerComponent.cs @@ -0,0 +1,16 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.Tests; + +/// +/// Component that is used by integration tests to mark and easily find certain entities on a test map. +/// +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState] +public sealed partial class TestMarkerComponent : Component +{ + /// + /// A string to keep multiple markers on the same map distinct. + /// + [DataField, AutoNetworkedField] + public string Id = "marker"; +} diff --git a/Resources/Maps/Test/empty.yml b/Resources/Maps/Test/empty.yml index e54a18422b..d7f1cad574 100644 --- a/Resources/Maps/Test/empty.yml +++ b/Resources/Maps/Test/empty.yml @@ -56,7 +56,7 @@ entities: - uid: 3 components: - type: MetaData - name: map 89 + name: "Empty Debug Map" - type: Transform - type: Map mapPaused: True diff --git a/Resources/Prototypes/Entities/Markers/integration_test.yml b/Resources/Prototypes/Entities/Markers/integration_test.yml new file mode 100644 index 0000000000..a18f79367b --- /dev/null +++ b/Resources/Prototypes/Entities/Markers/integration_test.yml @@ -0,0 +1,8 @@ +- type: entity + parent: MarkerBase + id: IntegrationTestMarker + name: Integration Test Marker + components: + - type: TestMarker + - type: Sprite + state: pink From 34c5df45bbef28e3533057913dccea7a9ea0946c Mon Sep 17 00:00:00 2001 From: Justin Pfeifler Date: Sat, 1 Nov 2025 03:14:17 -0500 Subject: [PATCH 073/121] Add Reporter Beacon (#41230) Add reporter beacon --- Resources/Maps/elkridge.yml | 1055 +---------------------------------- 1 file changed, 10 insertions(+), 1045 deletions(-) diff --git a/Resources/Maps/elkridge.yml b/Resources/Maps/elkridge.yml index 385b0358aa..9929e25111 100644 --- a/Resources/Maps/elkridge.yml +++ b/Resources/Maps/elkridge.yml @@ -1,11 +1,11 @@ meta: format: 7 category: Map - engineVersion: 267.2.0 + engineVersion: 267.3.0 forkId: "" forkVersion: "" - time: 09/29/2025 02:22:45 - entityCount: 18698 + time: 11/01/2025 07:57:27 + entityCount: 18699 maps: - 1 grids: @@ -55488,6 +55488,13 @@ entities: - type: Transform pos: -19.5,25.5 parent: 2 +- proto: DefaultStationBeaconReporter + entities: + - uid: 18696 + components: + - type: Transform + pos: -25.5,-32.5 + parent: 2 - proto: DefaultStationBeaconRND entities: - uid: 16585 @@ -89705,50 +89712,36 @@ entities: - type: Transform pos: 23.5,29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3743 components: - type: Transform pos: 49.5,-0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11798 components: - type: Transform pos: 7.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13788 components: - type: Transform pos: 28.5,0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15383 components: - type: Transform pos: 53.5,-0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16109 components: - type: Transform pos: -22.5,49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16110 components: - type: Transform pos: -21.5,34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: InflatableWall entities: - uid: 1102 @@ -89756,106 +89749,76 @@ entities: - type: Transform pos: 24.5,29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7317 components: - type: Transform pos: -6.5,54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10391 components: - type: Transform pos: -42.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10398 components: - type: Transform pos: 4.5,12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10399 components: - type: Transform pos: 16.5,21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10401 components: - type: Transform pos: -2.5,47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10410 components: - type: Transform pos: 21.5,29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10411 components: - type: Transform pos: 22.5,29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10422 components: - type: Transform pos: 46.5,19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10423 components: - type: Transform pos: 42.5,30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10424 components: - type: Transform pos: 44.5,30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16108 components: - type: Transform pos: -21.5,49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18128 components: - type: Transform pos: -2.5,35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18253 components: - type: Transform pos: 55.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18254 components: - type: Transform pos: 54.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: InflatableWallStack5 entities: - uid: 10457 @@ -98406,121 +98369,89 @@ entities: - type: Transform pos: 37.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1405 components: - type: Transform pos: 37.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1408 components: - type: Transform pos: 37.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1702 components: - type: Transform pos: 1.5,-31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1708 components: - type: Transform rot: 3.141592653589793 rad pos: 22.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1870 components: - type: Transform pos: 1.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2321 components: - type: Transform pos: 19.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2381 components: - type: Transform rot: 1.5707963267948966 rad pos: 22.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2469 components: - type: Transform rot: 1.5707963267948966 rad pos: 22.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2473 components: - type: Transform rot: 1.5707963267948966 rad pos: 22.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9754 components: - type: Transform pos: 20.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12687 components: - type: Transform pos: 21.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14235 components: - type: Transform rot: -1.5707963267948966 rad pos: 18.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18678 components: - type: Transform rot: 3.141592653589793 rad pos: 31.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18679 components: - type: Transform rot: 3.141592653589793 rad pos: 30.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18680 components: - type: Transform rot: 3.141592653589793 rad pos: 32.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: ReinforcedWindow entities: - uid: 79 @@ -98529,1619 +98460,1179 @@ entities: rot: 3.141592653589793 rad pos: 26.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 325 components: - type: Transform pos: 45.5,-10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 990 components: - type: Transform pos: -6.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1030 components: - type: Transform pos: 7.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1122 components: - type: Transform rot: 3.141592653589793 rad pos: 25.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1125 components: - type: Transform pos: 30.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1126 components: - type: Transform pos: 30.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1131 components: - type: Transform pos: 38.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1165 components: - type: Transform pos: 35.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1169 components: - type: Transform pos: -41.5,19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1247 components: - type: Transform pos: -38.5,21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1261 components: - type: Transform pos: -2.5,-31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1356 components: - type: Transform pos: 37.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1357 components: - type: Transform pos: 37.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1359 components: - type: Transform pos: 45.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1360 components: - type: Transform pos: 45.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1361 components: - type: Transform pos: 45.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1401 components: - type: Transform pos: 35.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1404 components: - type: Transform pos: 35.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1561 components: - type: Transform pos: 3.5,38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1582 components: - type: Transform pos: 32.5,-25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1654 components: - type: Transform pos: -2.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1762 components: - type: Transform rot: 3.141592653589793 rad pos: 19.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1839 components: - type: Transform pos: -1.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1865 components: - type: Transform pos: 0.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1873 components: - type: Transform pos: -6.5,-25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1931 components: - type: Transform pos: -0.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1950 components: - type: Transform pos: -3.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1959 components: - type: Transform pos: -9.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1965 components: - type: Transform pos: 2.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1992 components: - type: Transform pos: -15.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2002 components: - type: Transform pos: 15.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2013 components: - type: Transform pos: 14.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2018 components: - type: Transform pos: -13.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2105 components: - type: Transform pos: -5.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2208 components: - type: Transform pos: 35.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2218 components: - type: Transform pos: 35.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2219 components: - type: Transform pos: 35.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2222 components: - type: Transform pos: 35.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2223 components: - type: Transform pos: 35.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2298 components: - type: Transform pos: 45.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2438 components: - type: Transform pos: 24.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2517 components: - type: Transform pos: 35.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2541 components: - type: Transform pos: 36.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2631 components: - type: Transform pos: 29.5,14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2651 components: - type: Transform pos: -32.5,-50.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2660 components: - type: Transform pos: 12.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2722 components: - type: Transform pos: 29.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2727 components: - type: Transform pos: 45.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2770 components: - type: Transform pos: -11.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2963 components: - type: Transform rot: 3.141592653589793 rad pos: 23.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3193 components: - type: Transform pos: -35.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3647 components: - type: Transform rot: -1.5707963267948966 rad pos: -66.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3648 components: - type: Transform rot: -1.5707963267948966 rad pos: -65.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3649 components: - type: Transform rot: -1.5707963267948966 rad pos: -64.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3650 components: - type: Transform rot: -1.5707963267948966 rad pos: -64.5,-32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3651 components: - type: Transform rot: -1.5707963267948966 rad pos: -66.5,-32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3652 components: - type: Transform rot: -1.5707963267948966 rad pos: -65.5,-32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3653 components: - type: Transform rot: -1.5707963267948966 rad pos: -58.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3654 components: - type: Transform rot: -1.5707963267948966 rad pos: -56.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3655 components: - type: Transform rot: -1.5707963267948966 rad pos: -57.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3656 components: - type: Transform rot: -1.5707963267948966 rad pos: -56.5,-32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3657 components: - type: Transform rot: -1.5707963267948966 rad pos: -57.5,-32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3658 components: - type: Transform rot: -1.5707963267948966 rad pos: -58.5,-32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3659 components: - type: Transform rot: -1.5707963267948966 rad pos: -50.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3660 components: - type: Transform rot: -1.5707963267948966 rad pos: -49.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3661 components: - type: Transform rot: -1.5707963267948966 rad pos: -48.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3662 components: - type: Transform rot: -1.5707963267948966 rad pos: -48.5,-32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3663 components: - type: Transform rot: -1.5707963267948966 rad pos: -49.5,-32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3664 components: - type: Transform rot: -1.5707963267948966 rad pos: -50.5,-32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3673 components: - type: Transform pos: -48.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3679 components: - type: Transform pos: -49.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3681 components: - type: Transform pos: -50.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3718 components: - type: Transform pos: -56.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3720 components: - type: Transform pos: -56.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4023 components: - type: Transform rot: -1.5707963267948966 rad pos: 31.5,20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4024 components: - type: Transform rot: -1.5707963267948966 rad pos: 32.5,20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4326 components: - type: Transform rot: 1.5707963267948966 rad pos: -32.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4342 components: - type: Transform rot: 1.5707963267948966 rad pos: -33.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4348 components: - type: Transform rot: 1.5707963267948966 rad pos: -43.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4349 components: - type: Transform rot: 1.5707963267948966 rad pos: -40.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4353 components: - type: Transform rot: 1.5707963267948966 rad pos: -41.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4360 components: - type: Transform pos: -39.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4366 components: - type: Transform rot: 1.5707963267948966 rad pos: -37.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4367 components: - type: Transform rot: 1.5707963267948966 rad pos: -36.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4378 components: - type: Transform rot: 1.5707963267948966 rad pos: -43.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4380 components: - type: Transform rot: 1.5707963267948966 rad pos: -43.5,-6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4422 components: - type: Transform pos: 19.5,41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4507 components: - type: Transform pos: -27.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4563 components: - type: Transform pos: -23.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4579 components: - type: Transform pos: -29.5,-2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4581 components: - type: Transform pos: -23.5,-2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4588 components: - type: Transform pos: -23.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5177 components: - type: Transform pos: -21.5,43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5264 components: - type: Transform pos: -19.5,-6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5444 components: - type: Transform pos: -33.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5458 components: - type: Transform pos: -41.5,21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5479 components: - type: Transform pos: -38.5,20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5502 components: - type: Transform pos: -8.5,20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5509 components: - type: Transform pos: -8.5,21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5552 components: - type: Transform pos: -38.5,19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5615 components: - type: Transform pos: -13.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5788 components: - type: Transform pos: -15.5,-32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5791 components: - type: Transform pos: -13.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5956 components: - type: Transform pos: 11.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5959 components: - type: Transform pos: -19.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6148 components: - type: Transform pos: -7.5,-31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6258 components: - type: Transform pos: -23.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6280 components: - type: Transform pos: -32.5,-49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6355 components: - type: Transform pos: 36.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6482 components: - type: Transform pos: 3.5,37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6494 components: - type: Transform pos: 15.5,40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6495 components: - type: Transform pos: 14.5,40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6498 components: - type: Transform pos: 13.5,40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6499 components: - type: Transform rot: 3.141592653589793 rad pos: 18.5,41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6508 components: - type: Transform pos: 5.5,41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6510 components: - type: Transform pos: 11.5,41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6546 components: - type: Transform pos: 2.5,41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6547 components: - type: Transform pos: 1.5,41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6548 components: - type: Transform pos: 0.5,41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6662 components: - type: Transform pos: -21.5,42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6763 components: - type: Transform pos: -32.5,12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6937 components: - type: Transform pos: -21.5,22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6950 components: - type: Transform rot: -1.5707963267948966 rad pos: -26.5,11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6989 components: - type: Transform pos: -29.5,36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7042 components: - type: Transform pos: -9.5,35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7054 components: - type: Transform pos: -9.5,42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7056 components: - type: Transform pos: -9.5,43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7057 components: - type: Transform pos: -9.5,41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7059 components: - type: Transform pos: -9.5,34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7061 components: - type: Transform pos: -9.5,37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7063 components: - type: Transform pos: -9.5,36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7064 components: - type: Transform pos: -9.5,44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7065 components: - type: Transform pos: -9.5,48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7066 components: - type: Transform pos: -9.5,49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7067 components: - type: Transform pos: -9.5,51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7068 components: - type: Transform pos: -9.5,50.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7137 components: - type: Transform rot: -1.5707963267948966 rad pos: -15.5,57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7191 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7192 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7193 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7655 components: - type: Transform rot: 3.141592653589793 rad pos: 20.5,41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7658 components: - type: Transform rot: 3.141592653589793 rad pos: 24.5,43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7781 components: - type: Transform rot: -1.5707963267948966 rad pos: 32.5,32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7782 components: - type: Transform rot: -1.5707963267948966 rad pos: 31.5,32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7893 components: - type: Transform pos: -28.5,0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7904 components: - type: Transform pos: 29.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7997 components: - type: Transform pos: -27.5,36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8010 components: - type: Transform rot: 3.141592653589793 rad pos: 60.5,0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8011 components: - type: Transform rot: 3.141592653589793 rad pos: 50.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8012 components: - type: Transform rot: 3.141592653589793 rad pos: 52.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8028 components: - type: Transform rot: 3.141592653589793 rad pos: 60.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8029 components: - type: Transform rot: 3.141592653589793 rad pos: 58.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8030 components: - type: Transform rot: 3.141592653589793 rad pos: 57.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8031 components: - type: Transform rot: 3.141592653589793 rad pos: 56.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8054 components: - type: Transform pos: 43.5,33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8092 components: - type: Transform pos: -28.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8095 components: - type: Transform pos: 38.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8156 components: - type: Transform rot: 1.5707963267948966 rad pos: 54.5,5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8229 components: - type: Transform pos: 34.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8236 components: - type: Transform rot: 1.5707963267948966 rad pos: 24.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8349 components: - type: Transform pos: -35.5,33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8786 components: - type: Transform rot: 1.5707963267948966 rad pos: 24.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8788 components: - type: Transform rot: 1.5707963267948966 rad pos: 24.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9602 components: - type: Transform pos: -35.5,32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9751 components: - type: Transform rot: 3.141592653589793 rad pos: 32.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9752 components: - type: Transform rot: 3.141592653589793 rad pos: 21.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10527 components: - type: Transform pos: -38.5,-49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10763 components: - type: Transform rot: 3.141592653589793 rad pos: 27.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10981 components: - type: Transform pos: -11.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11070 components: - type: Transform pos: -15.5,-10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11139 components: - type: Transform pos: -28.5,36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11171 components: - type: Transform rot: -1.5707963267948966 rad pos: -26.5,12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11221 components: - type: Transform rot: 1.5707963267948966 rad pos: -13.5,19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11234 components: - type: Transform pos: -20.5,22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11722 components: - type: Transform pos: -7.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11736 components: - type: Transform pos: -10.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11774 components: - type: Transform pos: -10.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11911 components: - type: Transform pos: -11.5,-6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12551 components: - type: Transform rot: 3.141592653589793 rad pos: 30.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12652 components: - type: Transform rot: 3.141592653589793 rad pos: 20.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12655 components: - type: Transform rot: 3.141592653589793 rad pos: 24.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12713 components: - type: Transform rot: 1.5707963267948966 rad pos: 24.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12757 components: - type: Transform pos: -11.5,11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12902 components: - type: Transform rot: -1.5707963267948966 rad pos: -26.5,13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13451 components: - type: Transform rot: 3.141592653589793 rad pos: -11.5,-48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13452 components: - type: Transform rot: 3.141592653589793 rad pos: -13.5,-48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13637 components: - type: Transform pos: 21.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13854 components: - type: Transform rot: 1.5707963267948966 rad pos: 24.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13972 components: - type: Transform pos: -16.5,14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14139 components: - type: Transform pos: 49.5,12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14530 components: - type: Transform rot: 1.5707963267948966 rad pos: -31.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14533 components: - type: Transform rot: 1.5707963267948966 rad pos: 24.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14535 components: - type: Transform rot: 1.5707963267948966 rad pos: 24.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14773 components: - type: Transform pos: -41.5,20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14828 components: - type: Transform rot: 1.5707963267948966 rad pos: -14.5,19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14867 components: - type: Transform rot: -1.5707963267948966 rad pos: -19.5,22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14918 components: - type: Transform pos: 36.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15142 components: - type: Transform pos: -39.5,-49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15244 components: - type: Transform rot: 1.5707963267948966 rad pos: -23.5,43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15262 components: - type: Transform pos: -34.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15348 components: - type: Transform pos: 47.5,32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15706 components: - type: Transform pos: -32.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15725 components: - type: Transform rot: 1.5707963267948966 rad pos: -23.5,42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15922 components: - type: Transform rot: 3.141592653589793 rad pos: -44.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15923 components: - type: Transform rot: 3.141592653589793 rad pos: -44.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16116 components: - type: Transform pos: -24.5,47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17069 components: - type: Transform pos: -45.5,-48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17070 components: - type: Transform pos: -45.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17071 components: - type: Transform pos: -45.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17079 components: - type: Transform rot: 3.141592653589793 rad pos: -44.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17625 components: - type: Transform pos: 26.5,43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17630 components: - type: Transform pos: 21.5,43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18037 components: - type: Transform pos: -7.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18038 components: - type: Transform pos: -7.5,-32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18040 components: - type: Transform pos: -18.5,14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18167 components: - type: Transform rot: 1.5707963267948966 rad pos: 58.5,5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18603 components: - type: Transform pos: 47.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18604 components: - type: Transform pos: 49.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18681 components: - type: Transform rot: 3.141592653589793 rad pos: 31.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: RemoteSignaller entities: - uid: 16085 @@ -100724,123 +100215,91 @@ entities: - type: Transform pos: 49.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1513 components: - type: Transform pos: 47.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1514 components: - type: Transform pos: 46.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1515 components: - type: Transform pos: 48.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1540 components: - type: Transform rot: 1.5707963267948966 rad pos: -11.5,14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3436 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4706 components: - type: Transform pos: 20.5,16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5080 components: - type: Transform pos: 21.5,16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6000 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,-6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6001 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6002 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11215 components: - type: Transform rot: 1.5707963267948966 rad pos: -11.5,13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14372 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,-0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16219 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16221 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16222 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: ShuttersNormalOpen entities: - uid: 755 @@ -100849,395 +100308,289 @@ entities: rot: -1.5707963267948966 rad pos: -28.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 996 components: - type: Transform rot: -1.5707963267948966 rad pos: -28.5,0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1576 components: - type: Transform rot: -1.5707963267948966 rad pos: -13.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2142 components: - type: Transform rot: -1.5707963267948966 rad pos: -13.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2332 components: - type: Transform pos: 35.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3047 components: - type: Transform rot: -1.5707963267948966 rad pos: -15.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3135 components: - type: Transform rot: 1.5707963267948966 rad pos: -11.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4121 components: - type: Transform pos: 35.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4607 components: - type: Transform rot: -1.5707963267948966 rad pos: -43.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4881 components: - type: Transform rot: -1.5707963267948966 rad pos: -29.5,-2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5557 components: - type: Transform rot: 1.5707963267948966 rad pos: -11.5,-6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7324 components: - type: Transform pos: 35.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8014 components: - type: Transform rot: 1.5707963267948966 rad pos: -11.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8122 components: - type: Transform pos: 36.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8126 components: - type: Transform pos: 36.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9651 components: - type: Transform pos: 36.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9655 components: - type: Transform pos: 37.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11048 components: - type: Transform rot: 1.5707963267948966 rad pos: -23.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11066 components: - type: Transform pos: -11.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11085 components: - type: Transform rot: -1.5707963267948966 rad pos: -43.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11086 components: - type: Transform rot: -1.5707963267948966 rad pos: -43.5,-6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11087 components: - type: Transform pos: -41.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11088 components: - type: Transform pos: -40.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11089 components: - type: Transform pos: -39.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11090 components: - type: Transform pos: -37.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11091 components: - type: Transform pos: -36.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11092 components: - type: Transform pos: -35.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11093 components: - type: Transform pos: -33.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11094 components: - type: Transform pos: -32.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11182 components: - type: Transform pos: -21.5,22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11766 components: - type: Transform rot: -1.5707963267948966 rad pos: -13.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11783 components: - type: Transform rot: -1.5707963267948966 rad pos: -15.5,-32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12813 components: - type: Transform rot: 1.5707963267948966 rad pos: 3.5,38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13977 components: - type: Transform rot: 1.5707963267948966 rad pos: -23.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13978 components: - type: Transform rot: 1.5707963267948966 rad pos: -23.5,-2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14681 components: - type: Transform pos: -19.5,22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15086 components: - type: Transform pos: -20.5,22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15186 components: - type: Transform pos: -1.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15189 components: - type: Transform pos: 0.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15279 components: - type: Transform pos: -31.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16146 components: - type: Transform pos: 1.5,18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16147 components: - type: Transform pos: 2.5,18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16155 components: - type: Transform pos: 0.5,41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16156 components: - type: Transform pos: 1.5,41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16157 components: - type: Transform pos: 2.5,41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16159 components: - type: Transform rot: 1.5707963267948966 rad pos: 3.5,37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16173 components: - type: Transform pos: 31.5,20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16174 components: - type: Transform pos: 32.5,20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18094 components: - type: Transform rot: 1.5707963267948966 rad pos: 18.5,8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18095 components: - type: Transform rot: 1.5707963267948966 rad pos: 18.5,7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18096 components: - type: Transform rot: 1.5707963267948966 rad pos: 18.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18097 components: - type: Transform rot: 1.5707963267948966 rad pos: 18.5,5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18098 components: - type: Transform rot: 1.5707963267948966 rad pos: 18.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: ShuttleConsoleCircuitboard entities: - uid: 2192 @@ -110272,43 +109625,31 @@ entities: - type: Transform pos: -29.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2056 components: - type: Transform pos: -18.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2795 components: - type: Transform pos: -4.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6711 components: - type: Transform pos: -29.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10537 components: - type: Transform pos: -12.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15863 components: - type: Transform pos: -26.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: TobaccoSeeds entities: - uid: 15669 @@ -125096,44 +124437,32 @@ entities: rot: -1.5707963267948966 rad pos: -8.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12763 components: - type: Transform pos: -17.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13490 components: - type: Transform pos: -16.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15932 components: - type: Transform rot: 1.5707963267948966 rad pos: -43.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16656 components: - type: Transform pos: -26.5,7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16657 components: - type: Transform pos: -25.5,7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorCargoLocked entities: - uid: 851 @@ -125142,40 +124471,30 @@ entities: rot: -1.5707963267948966 rad pos: 10.5,27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9496 components: - type: Transform rot: -1.5707963267948966 rad pos: 17.5,36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14121 components: - type: Transform rot: 1.5707963267948966 rad pos: 9.5,24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14186 components: - type: Transform rot: 1.5707963267948966 rad pos: 9.5,29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16384 components: - type: Transform rot: 1.5707963267948966 rad pos: 9.5,28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorHydroponicsLocked entities: - uid: 6727 @@ -125184,8 +124503,6 @@ entities: rot: 3.141592653589793 rad pos: 15.5,12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorKitchenHydroponicsLocked entities: - uid: 4458 @@ -125194,16 +124511,12 @@ entities: rot: 3.141592653589793 rad pos: 14.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4493 components: - type: Transform rot: 3.141592653589793 rad pos: 13.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecure entities: - uid: 1899 @@ -125212,8 +124525,6 @@ entities: rot: 3.141592653589793 rad pos: 0.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -125230,8 +124541,6 @@ entities: rot: 3.141592653589793 rad pos: 1.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -125248,16 +124557,12 @@ entities: rot: 1.5707963267948966 rad pos: -11.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16149 components: - type: Transform rot: -1.5707963267948966 rad pos: 24.5,12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureArmoryLocked entities: - uid: 1806 @@ -125265,8 +124570,6 @@ entities: - type: Transform pos: -4.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -125280,8 +124583,6 @@ entities: rot: -1.5707963267948966 rad pos: 5.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureAtmosphericsLocked entities: - uid: 6394 @@ -125290,8 +124591,6 @@ entities: rot: 3.141592653589793 rad pos: 31.5,-25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureBrigLocked entities: - uid: 2070 @@ -125300,8 +124599,6 @@ entities: rot: 3.141592653589793 rad pos: -4.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -125317,16 +124614,12 @@ entities: rot: -1.5707963267948966 rad pos: 29.5,15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3973 components: - type: Transform rot: 1.5707963267948966 rad pos: 24.5,12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureCommandLocked entities: - uid: 1118 @@ -125335,32 +124628,24 @@ entities: rot: -1.5707963267948966 rad pos: 27.5,-2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2067 components: - type: Transform rot: -1.5707963267948966 rad pos: -41.5,15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4301 components: - type: Transform rot: -1.5707963267948966 rad pos: -43.5,20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5372 components: - type: Transform rot: -1.5707963267948966 rad pos: -39.5,25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureEngineeringLocked entities: - uid: 1156 @@ -125369,8 +124654,6 @@ entities: rot: 3.141592653589793 rad pos: 23.5,-10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureHeadOfPersonnelLocked entities: - uid: 2732 @@ -125379,8 +124662,6 @@ entities: rot: -1.5707963267948966 rad pos: -11.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureJanitorLocked entities: - uid: 7437 @@ -125389,8 +124670,6 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureMedicalLocked entities: - uid: 4099 @@ -125401,16 +124680,12 @@ entities: rot: -1.5707963267948966 rad pos: 24.5,25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8184 components: - type: Transform rot: 3.141592653589793 rad pos: 27.5,5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureSalvageLocked entities: - uid: 7307 @@ -125418,24 +124693,18 @@ entities: - type: Transform pos: 25.5,45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7632 components: - type: Transform rot: 1.5707963267948966 rad pos: 17.5,36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17632 components: - type: Transform rot: 1.5707963267948966 rad pos: 24.5,40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureScienceLocked entities: - uid: 4296 @@ -125444,72 +124713,54 @@ entities: rot: 3.141592653589793 rad pos: -27.5,18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4721 components: - type: Transform rot: 3.141592653589793 rad pos: -29.5,18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5258 components: - type: Transform rot: 3.141592653589793 rad pos: -25.5,18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6846 components: - type: Transform rot: 3.141592653589793 rad pos: -13.5,23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10615 components: - type: Transform rot: 3.141592653589793 rad pos: -27.5,31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11146 components: - type: Transform rot: 3.141592653589793 rad pos: -14.5,23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11200 components: - type: Transform rot: 3.141592653589793 rad pos: -24.5,31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14469 components: - type: Transform rot: 3.141592653589793 rad pos: -11.5,19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15541 components: - type: Transform rot: 3.141592653589793 rad pos: -10.5,19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureSecurityLawyerLocked entities: - uid: 3534 @@ -125519,8 +124770,6 @@ entities: - type: Transform pos: -37.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureSecurityLocked entities: - uid: 1047 @@ -125529,15 +124778,11 @@ entities: rot: 1.5707963267948966 rad pos: 18.5,-6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1850 components: - type: Transform pos: 1.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -125553,8 +124798,6 @@ entities: - type: Transform pos: 0.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -125571,24 +124814,18 @@ entities: rot: -1.5707963267948966 rad pos: -1.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3570 components: - type: Transform rot: 3.141592653589793 rad pos: -35.5,-32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7480 components: - type: Transform rot: -1.5707963267948966 rad pos: -4.5,29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorServiceLocked entities: - uid: 3122 @@ -125597,8 +124834,6 @@ entities: rot: 3.141592653589793 rad pos: -18.5,-24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: Window entities: - uid: 158 @@ -125606,251 +124841,181 @@ entities: - type: Transform pos: -5.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 182 components: - type: Transform pos: -5.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 397 components: - type: Transform pos: 18.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 398 components: - type: Transform pos: 18.5,5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 966 components: - type: Transform pos: 18.5,7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3152 components: - type: Transform pos: -22.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3153 components: - type: Transform pos: -23.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3154 components: - type: Transform pos: -24.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3180 components: - type: Transform pos: -26.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3181 components: - type: Transform pos: -26.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3415 components: - type: Transform pos: -37.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3416 components: - type: Transform pos: -37.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3944 components: - type: Transform rot: 1.5707963267948966 rad pos: 35.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3945 components: - type: Transform rot: 1.5707963267948966 rad pos: 36.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3946 components: - type: Transform rot: 1.5707963267948966 rad pos: 37.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4157 components: - type: Transform pos: 11.5,18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4158 components: - type: Transform pos: 10.5,18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4204 components: - type: Transform pos: 1.5,18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4205 components: - type: Transform pos: 2.5,18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4306 components: - type: Transform rot: 1.5707963267948966 rad pos: -33.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4307 components: - type: Transform rot: 1.5707963267948966 rad pos: -35.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5499 components: - type: Transform pos: -29.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5501 components: - type: Transform pos: -29.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8265 components: - type: Transform pos: -4.5,21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10519 components: - type: Transform pos: -21.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10526 components: - type: Transform pos: -20.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11239 components: - type: Transform pos: -19.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13996 components: - type: Transform pos: 18.5,8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14025 components: - type: Transform pos: -18.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15000 components: - type: Transform pos: 18.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15433 components: - type: Transform pos: -5.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15680 components: - type: Transform pos: -5.5,-6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15708 components: - type: Transform pos: -32.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15709 components: - type: Transform pos: -32.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16912 components: - type: Transform pos: 18.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindowDirectional entities: - uid: 239 @@ -125858,93 +125023,69 @@ entities: - type: Transform pos: 7.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 610 components: - type: Transform pos: 9.5,24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1686 components: - type: Transform rot: 1.5707963267948966 rad pos: 18.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1689 components: - type: Transform rot: 1.5707963267948966 rad pos: 18.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3121 components: - type: Transform rot: 1.5707963267948966 rad pos: -19.5,-24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4033 components: - type: Transform rot: -1.5707963267948966 rad pos: 26.5,8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4169 components: - type: Transform rot: -1.5707963267948966 rad pos: 12.5,19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4170 components: - type: Transform rot: -1.5707963267948966 rad pos: 12.5,21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5913 components: - type: Transform pos: -18.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11118 components: - type: Transform pos: 9.5,28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13809 components: - type: Transform rot: 3.141592653589793 rad pos: 16.5,12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16200 components: - type: Transform rot: -1.5707963267948966 rad pos: 15.5,12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindowFrostedDirectional entities: - uid: 161 @@ -125952,71 +125093,53 @@ entities: - type: Transform pos: -1.5,-6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 208 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3900 components: - type: Transform rot: -1.5707963267948966 rad pos: 35.5,11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3902 components: - type: Transform rot: -1.5707963267948966 rad pos: 37.5,11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5428 components: - type: Transform rot: 3.141592653589793 rad pos: 0.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5989 components: - type: Transform rot: 3.141592653589793 rad pos: -1.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5990 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15929 components: - type: Transform rot: 1.5707963267948966 rad pos: -43.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15930 components: - type: Transform pos: -43.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindowReinforcedDirectional entities: - uid: 555 @@ -126025,623 +125148,465 @@ entities: rot: 1.5707963267948966 rad pos: -10.5,-6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1045 components: - type: Transform rot: 1.5707963267948966 rad pos: 18.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1106 components: - type: Transform rot: 1.5707963267948966 rad pos: 32.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1193 components: - type: Transform rot: 3.141592653589793 rad pos: 32.5,22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1614 components: - type: Transform rot: -1.5707963267948966 rad pos: 27.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1616 components: - type: Transform rot: -1.5707963267948966 rad pos: 27.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1798 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,-31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1861 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1881 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1986 components: - type: Transform rot: 1.5707963267948966 rad pos: 32.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2888 components: - type: Transform rot: 3.141592653589793 rad pos: 24.5,-10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3507 components: - type: Transform rot: 3.141592653589793 rad pos: -36.5,-32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3525 components: - type: Transform rot: 3.141592653589793 rad pos: -34.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3530 components: - type: Transform rot: -1.5707963267948966 rad pos: -33.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3572 components: - type: Transform pos: -36.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3573 components: - type: Transform rot: 1.5707963267948966 rad pos: -35.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3585 components: - type: Transform rot: 1.5707963267948966 rad pos: -29.5,22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3820 components: - type: Transform rot: -1.5707963267948966 rad pos: -39.5,24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3901 components: - type: Transform rot: 1.5707963267948966 rad pos: 32.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3970 components: - type: Transform rot: -1.5707963267948966 rad pos: 24.5,10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3971 components: - type: Transform rot: -1.5707963267948966 rad pos: 24.5,11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3972 components: - type: Transform rot: 3.141592653589793 rad pos: 24.5,11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4098 components: - type: Transform rot: -1.5707963267948966 rad pos: 24.5,26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4207 components: - type: Transform rot: 3.141592653589793 rad pos: 30.5,22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4217 components: - type: Transform rot: -1.5707963267948966 rad pos: -25.5,22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4520 components: - type: Transform rot: 3.141592653589793 rad pos: 22.5,-10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4567 components: - type: Transform rot: 1.5707963267948966 rad pos: 15.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4568 components: - type: Transform rot: 1.5707963267948966 rad pos: 15.5,0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4628 components: - type: Transform rot: -1.5707963267948966 rad pos: -34.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4629 components: - type: Transform rot: 1.5707963267948966 rad pos: -38.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4632 components: - type: Transform pos: -42.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4636 components: - type: Transform rot: 3.141592653589793 rad pos: -42.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4640 components: - type: Transform rot: -1.5707963267948966 rad pos: -35.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4641 components: - type: Transform rot: -1.5707963267948966 rad pos: -37.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4642 components: - type: Transform rot: -1.5707963267948966 rad pos: -39.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4644 components: - type: Transform pos: -39.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4645 components: - type: Transform rot: -1.5707963267948966 rad pos: -37.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4646 components: - type: Transform rot: -1.5707963267948966 rad pos: -35.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4647 components: - type: Transform rot: -1.5707963267948966 rad pos: -39.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4648 components: - type: Transform rot: 1.5707963267948966 rad pos: -42.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4649 components: - type: Transform rot: -1.5707963267948966 rad pos: -38.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4654 components: - type: Transform pos: -37.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4655 components: - type: Transform pos: -35.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5074 components: - type: Transform rot: -1.5707963267948966 rad pos: -39.5,26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5149 components: - type: Transform rot: 3.141592653589793 rad pos: -28.5,18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5302 components: - type: Transform rot: -1.5707963267948966 rad pos: -27.5,18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5453 components: - type: Transform rot: -1.5707963267948966 rad pos: -41.5,16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5478 components: - type: Transform rot: -1.5707963267948966 rad pos: -41.5,14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5705 components: - type: Transform pos: -35.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6360 components: - type: Transform rot: 3.141592653589793 rad pos: 29.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6392 components: - type: Transform rot: 3.141592653589793 rad pos: 32.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7479 components: - type: Transform rot: -1.5707963267948966 rad pos: -4.5,30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7844 components: - type: Transform pos: 1.5,38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8413 components: - type: Transform rot: 3.141592653589793 rad pos: -23.5,31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9085 components: - type: Transform rot: 3.141592653589793 rad pos: 28.5,5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9086 components: - type: Transform rot: 3.141592653589793 rad pos: 26.5,5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9087 components: - type: Transform rot: -1.5707963267948966 rad pos: 26.5,5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9088 components: - type: Transform rot: -1.5707963267948966 rad pos: 26.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9572 components: - type: Transform rot: 3.141592653589793 rad pos: -29.5,31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9629 components: - type: Transform rot: 1.5707963267948966 rad pos: 15.5,-0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10606 components: - type: Transform rot: -1.5707963267948966 rad pos: -27.5,17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11131 components: - type: Transform rot: -1.5707963267948966 rad pos: -25.5,18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11183 components: - type: Transform rot: 3.141592653589793 rad pos: -24.5,18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11246 components: - type: Transform rot: 3.141592653589793 rad pos: -26.5,18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12915 components: - type: Transform rot: -1.5707963267948966 rad pos: -2.5,8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12916 components: - type: Transform rot: -1.5707963267948966 rad pos: -2.5,10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13952 components: - type: Transform rot: 3.141592653589793 rad pos: -26.5,31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14206 components: - type: Transform pos: 24.5,38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14207 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14468 components: - type: Transform rot: 3.141592653589793 rad pos: -9.5,19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14646 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15148 components: - type: Transform rot: 1.5707963267948966 rad pos: -35.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16179 components: - type: Transform rot: -1.5707963267948966 rad pos: 37.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16180 components: - type: Transform rot: -1.5707963267948966 rad pos: 37.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16192 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16286 components: - type: Transform rot: 3.141592653589793 rad pos: 31.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16383 components: - type: Transform rot: -1.5707963267948966 rad pos: -25.5,17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16501 components: - type: Transform rot: 1.5707963267948966 rad pos: -18.5,26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16981 components: - type: Transform pos: -1.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WoodblockInstrument entities: - uid: 18236 From 3d095c8eeda9927c89e7a6e5e151385f9a375ca9 Mon Sep 17 00:00:00 2001 From: Connor Huffine Date: Sat, 1 Nov 2025 05:42:05 -0400 Subject: [PATCH 074/121] Remove unused dependency (#41231) --- .../Singularity/EntitySystems/SingularityGeneratorSystem.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs b/Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs index 44c5da13a8..e303717e9a 100644 --- a/Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs +++ b/Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs @@ -17,7 +17,6 @@ public sealed class SingularityGeneratorSystem : SharedSingularityGeneratorSyste [Dependency] private readonly SharedTransformSystem _transformSystem = default!; [Dependency] private readonly PhysicsSystem _physics = default!; [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly MetaDataSystem _metadata = default!; #endregion Dependencies public override void Initialize() From 04b71d820356eddfcf6cfa5b7f8225bf39766308 Mon Sep 17 00:00:00 2001 From: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com> Date: Sat, 1 Nov 2025 06:22:13 -0700 Subject: [PATCH 075/121] Make CuffableComponent and CuffableSystem not Crash (Hopefully) (#39123) * This system is ancient * Destroy that API * Address reviews * Destroy merge conflicts from orbit * seems to work fine --------- Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> --- .../Inventory/StrippableBoundUserInterface.cs | 2 +- Content.Server/Cuffs/CuffableSystem.cs | 12 +- .../Cuffs/Components/CuffableComponent.cs | 6 - Content.Shared/Cuffs/SharedCuffableSystem.cs | 117 ++++++++++++------ .../Strip/SharedStrippableSystem.cs | 6 +- .../Trigger/Systems/UncuffOnTriggerSystem.cs | 4 +- 6 files changed, 89 insertions(+), 58 deletions(-) diff --git a/Content.Client/Inventory/StrippableBoundUserInterface.cs b/Content.Client/Inventory/StrippableBoundUserInterface.cs index 6d18bd6bda..f9a6cd46d6 100644 --- a/Content.Client/Inventory/StrippableBoundUserInterface.cs +++ b/Content.Client/Inventory/StrippableBoundUserInterface.cs @@ -190,7 +190,7 @@ namespace Content.Client.Inventory if (EntMan.TryGetComponent(heldEntity, out var virt)) { button.Blocked = true; - if (EntMan.TryGetComponent(Owner, out var cuff) && _cuffable.GetAllCuffs(cuff).Contains(virt.BlockingEntity)) + if (_cuffable.TryGetAllCuffs(Owner, out var cuffs) && cuffs.Contains(virt.BlockingEntity)) button.BlockedRect.MouseFilter = MouseFilterMode.Ignore; } diff --git a/Content.Server/Cuffs/CuffableSystem.cs b/Content.Server/Cuffs/CuffableSystem.cs index 2c28603c3f..622eabd953 100644 --- a/Content.Server/Cuffs/CuffableSystem.cs +++ b/Content.Server/Cuffs/CuffableSystem.cs @@ -15,7 +15,7 @@ namespace Content.Server.Cuffs SubscribeLocalEvent(OnCuffableGetState); } - private void OnCuffableGetState(EntityUid uid, CuffableComponent component, ref ComponentGetState args) + private void OnCuffableGetState(Entity entity, ref ComponentGetState args) { // there are 2 approaches i can think of to handle the handcuff overlay on players // 1 - make the current RSI the handcuff type that's currently active. all handcuffs on the player will appear the same. @@ -23,12 +23,12 @@ namespace Content.Server.Cuffs // approach #2 would be more difficult/time consuming to do and the payoff doesn't make it worth it. // right now we're doing approach #1. HandcuffComponent? cuffs = null; - if (component.CuffedHandCount > 0) - TryComp(component.LastAddedCuffs, out cuffs); - args.State = new CuffableComponentState(component.CuffedHandCount, - component.CanStillInteract, + if (TryGetLastCuff((entity, entity.Comp), out var cuff)) + TryComp(cuff, out cuffs); + args.State = new CuffableComponentState(entity.Comp.CuffedHandCount, + entity.Comp.CanStillInteract, cuffs?.CuffedRSI, - $"{cuffs?.BodyIconState}-{component.CuffedHandCount}", + $"{cuffs?.BodyIconState}-{entity.Comp.CuffedHandCount}", cuffs?.Color); // the iconstate is formatted as blah-2, blah-4, blah-6, etc. // the number corresponds to how many hands are cuffed. diff --git a/Content.Shared/Cuffs/Components/CuffableComponent.cs b/Content.Shared/Cuffs/Components/CuffableComponent.cs index a7eba34d8c..046dd504c0 100644 --- a/Content.Shared/Cuffs/Components/CuffableComponent.cs +++ b/Content.Shared/Cuffs/Components/CuffableComponent.cs @@ -24,12 +24,6 @@ public sealed partial class CuffableComponent : Component [ViewVariables] public int CuffedHandCount => Container.ContainedEntities.Count * 2; - /// - /// The last pair of cuffs that was added to this entity. - /// - [ViewVariables] - public EntityUid LastAddedCuffs => Container.ContainedEntities[^1]; - /// /// Container of various handcuffs currently applied to the entity. /// diff --git a/Content.Shared/Cuffs/SharedCuffableSystem.cs b/Content.Shared/Cuffs/SharedCuffableSystem.cs index ff4201acaf..f8efa20afa 100644 --- a/Content.Shared/Cuffs/SharedCuffableSystem.cs +++ b/Content.Shared/Cuffs/SharedCuffableSystem.cs @@ -1,3 +1,4 @@ +using System.Diagnostics.CodeAnalysis; using System.Linq; using Content.Shared.ActionBlocker; using Content.Shared.Administration.Components; @@ -260,7 +261,7 @@ namespace Content.Shared.Cuffs { if (args.Handled) return; - TryUncuff(ent, ent, cuffable: ent.Comp); + TryUncuff((ent, ent.Comp), ent); args.Handled = true; } @@ -278,7 +279,7 @@ namespace Content.Shared.Cuffs Verb verb = new() { - Act = () => TryUncuff(uid, args.User, cuffable: component), + Act = () => TryUncuff((uid, component), args.User), DoContactInteraction = true, Text = Loc.GetString("uncuff-verb-get-data-text") }; @@ -585,41 +586,31 @@ namespace Content.Shared.Cuffs return true; } + /// + public void TryUncuff(Entity target, EntityUid user) + { + if (!TryGetLastCuff(target, out var cuff)) + return; + + TryUncuff(target, user, cuff.Value); + } + /// /// Attempt to uncuff a cuffed entity. Can be called by the cuffed entity, or another entity trying to help uncuff them. /// If the uncuffing succeeds, the cuffs will drop on the floor. /// - /// - /// The cuffed entity - /// Optional param for the handcuff entity to remove from the cuffed entity. If null, uses the most recently added handcuff entity. - /// - /// - public void TryUncuff(EntityUid target, EntityUid user, EntityUid? cuffsToRemove = null, CuffableComponent? cuffable = null, HandcuffComponent? cuff = null) + /// The entity we're trying to remove cuffs from. + /// The entity doing the cuffing. + /// The handcuff entity we're attempting to remove. + public void TryUncuff(Entity target, EntityUid user, Entity cuff) { - if (!Resolve(target, ref cuffable)) + if (!Resolve(target, ref target.Comp) || !Resolve(cuff, ref cuff.Comp)) return; - var isOwner = user == target; + var isOwner = user == target.Owner; - if (cuffsToRemove == null) - { - if (cuffable.Container.ContainedEntities.Count == 0) - { - return; - } - - cuffsToRemove = cuffable.LastAddedCuffs; - } - else - { - if (!cuffable.Container.ContainedEntities.Contains(cuffsToRemove.Value)) - { - Log.Warning("A user is trying to remove handcuffs that aren't in the owner's container. This should never happen!"); - } - } - - if (!Resolve(cuffsToRemove.Value, ref cuff)) - return; + if (!target.Comp.Container.ContainedEntities.Contains(cuff)) + Log.Warning("A user is trying to remove handcuffs that aren't in the owner's container. This should never happen!"); var attempt = new UncuffAttemptEvent(user, target); RaiseLocalEvent(user, ref attempt, true); @@ -629,29 +620,28 @@ namespace Content.Shared.Cuffs return; } - if (!isOwner && !_interaction.InRangeUnobstructed(user, target)) + if (!isOwner && !_interaction.InRangeUnobstructed(user, target.Owner)) { _popup.PopupClient(Loc.GetString("cuffable-component-cannot-remove-cuffs-too-far-message"), user, user); return; } - - var ev = new ModifyUncuffDurationEvent(user, target, isOwner ? cuff.BreakoutTime : cuff.UncuffTime); + var ev = new ModifyUncuffDurationEvent(user, target, isOwner ? cuff.Comp.BreakoutTime : cuff.Comp.UncuffTime); RaiseLocalEvent(user, ref ev); var uncuffTime = ev.Duration; if (isOwner) { - if (!TryComp(cuffsToRemove.Value, out UseDelayComponent? useDelay)) + if (!TryComp(cuff, out UseDelayComponent? useDelay)) return; - if (!_delay.TryResetDelay((cuffsToRemove.Value, useDelay), true)) + if (!_delay.TryResetDelay((cuff, useDelay), true)) { return; } } - var doAfterEventArgs = new DoAfterArgs(EntityManager, user, uncuffTime, new UnCuffDoAfterEvent(), target, target, cuffsToRemove) + var doAfterEventArgs = new DoAfterArgs(EntityManager, user, uncuffTime, new UnCuffDoAfterEvent(), target, target, cuff) { BreakOnMove = true, BreakOnWeightlessMove = false, @@ -666,7 +656,7 @@ namespace Content.Shared.Cuffs _adminLog.Add(LogType.Action, LogImpact.High, $"{ToPrettyString(user):player} is trying to uncuff {ToPrettyString(target):subject}"); - var popupText = user == target + var popupText = user == target.Owner ? "cuffable-component-start-uncuffing-self-observer" : "cuffable-component-start-uncuffing-observer"; _popup.PopupEntity( @@ -678,7 +668,7 @@ namespace Content.Shared.Cuffs .RemoveWhere(e => e.AttachedEntity == target || e.AttachedEntity == user), true); - if (target == user) + if (isOwner) { _popup.PopupClient(Loc.GetString("cuffable-component-start-uncuffing-self"), user, user); } @@ -694,7 +684,7 @@ namespace Content.Shared.Cuffs target); } - _audio.PlayPredicted(isOwner ? cuff.StartBreakoutSound : cuff.StartUncuffSound, target, user); + _audio.PlayPredicted(isOwner ? cuff.Comp.StartBreakoutSound : cuff.Comp.StartUncuffSound, target, user); } public void Uncuff(EntityUid target, EntityUid? user, EntityUid cuffsToRemove, CuffableComponent? cuffable = null, HandcuffComponent? cuff = null) @@ -818,9 +808,56 @@ namespace Content.Shared.Cuffs #endregion - public IReadOnlyList GetAllCuffs(CuffableComponent component) + /// + /// Tries to get a list of all the handcuffs stored in an entity's . + /// + /// The cuffable entity in question. + /// A list of cuffs if it exists. + /// True if a list of cuffs with cuffs exists. False if no list exists or if it is empty. + public bool TryGetAllCuffs(Entity entity, out IReadOnlyList cuffs) { - return component.Container.ContainedEntities; + cuffs = GetAllCuffs(entity); + + return cuffs.Count > 0; + } + + /// + /// Tries to get a list of all the handcuffs stored in a entity's . + /// + /// The cuffable entity in question. + /// A list of cuffs if it exists, or null if there are no cuffs. + public IReadOnlyList GetAllCuffs(Entity entity) + { + if (!Resolve(entity, ref entity.Comp)) + return []; + + return entity.Comp.Container.ContainedEntities; + } + + /// + /// Tries to get the most recently added pair of handcuffs added to an entity with . + /// + /// The cuffable entity in question. + /// The most recently added cuff. + /// Returns true if a cuff exists and false if one doesn't. + public bool TryGetLastCuff(Entity entity, [NotNullWhen(true)] out EntityUid? cuff) + { + cuff = GetLastCuffOrNull(entity); + + return cuff != null; + } + + /// + /// Tries to get the most recently added pair of handcuffs added to an entity with . + /// + /// The cuffable entity in question. + /// The most recently added cuff or null if none exists. + public EntityUid? GetLastCuffOrNull(Entity entity) + { + if (!Resolve(entity, ref entity.Comp)) + return null; + + return entity.Comp.Container.ContainedEntities.Count == 0 ? null : entity.Comp.Container.ContainedEntities.Last(); } } diff --git a/Content.Shared/Strip/SharedStrippableSystem.cs b/Content.Shared/Strip/SharedStrippableSystem.cs index aca0e42945..fe9c4adb83 100644 --- a/Content.Shared/Strip/SharedStrippableSystem.cs +++ b/Content.Shared/Strip/SharedStrippableSystem.cs @@ -128,10 +128,10 @@ public abstract class SharedStrippableSystem : EntitySystem // Is the target a handcuff? if (TryComp(heldEntity, out var virtualItem) && - TryComp(target.Owner, out var cuffable) && - _cuffableSystem.GetAllCuffs(cuffable).Contains(virtualItem.BlockingEntity)) + _cuffableSystem.TryGetAllCuffs(target.Owner, out var cuffs) && + cuffs.Contains(virtualItem.BlockingEntity)) { - _cuffableSystem.TryUncuff(target.Owner, user, virtualItem.BlockingEntity, cuffable); + _cuffableSystem.TryUncuff(target.Owner, user, virtualItem.BlockingEntity); return; } diff --git a/Content.Shared/Trigger/Systems/UncuffOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/UncuffOnTriggerSystem.cs index ebcfc05de4..ab012ecd90 100644 --- a/Content.Shared/Trigger/Systems/UncuffOnTriggerSystem.cs +++ b/Content.Shared/Trigger/Systems/UncuffOnTriggerSystem.cs @@ -10,10 +10,10 @@ public sealed class UncuffOnTriggerSystem : XOnTriggerSystem ent, EntityUid target, ref TriggerEvent args) { - if (!TryComp(target, out var cuffs) || cuffs.Container.ContainedEntities.Count < 1) + if (!TryComp(target, out var cuffs) || !_cuffable.TryGetLastCuff(target, out var cuff)) return; - _cuffable.Uncuff(target, args.User, cuffs.LastAddedCuffs); + _cuffable.Uncuff(target, args.User, cuff.Value); args.Handled = true; } } From 026541b985bb0e78e7c5c1a77e881e707c3e7726 Mon Sep 17 00:00:00 2001 From: Justin Pfeifler Date: Sat, 1 Nov 2025 08:25:47 -0500 Subject: [PATCH 076/121] Edible Chameleon Clothing (#41232) * Remove ignore for WhitelistChameleon tag * Add correct tags to chameleon clothing * Apply suggestions from code review --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --- Resources/Prototypes/Entities/Clothing/Hands/specific.yml | 4 +++- Resources/Prototypes/Entities/Clothing/Head/specific.yml | 3 ++- Resources/Prototypes/Entities/Clothing/Neck/specific.yml | 4 +++- Resources/Prototypes/Entities/Clothing/Shoes/specific.yml | 4 +++- Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml | 4 +++- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Hands/specific.yml b/Resources/Prototypes/Entities/Clothing/Hands/specific.yml index 1a2ed4301a..a6fc405770 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/specific.yml @@ -6,7 +6,9 @@ suffix: Chameleon components: - type: Tag - tags: [] # ignore "WhitelistChameleon" tag + tags: # ignore "WhitelistChameleon" tag + - ClothMade + - Recyclable - type: Sprite sprite: Clothing/Hands/Gloves/Color/black.rsi - type: Clothing diff --git a/Resources/Prototypes/Entities/Clothing/Head/specific.yml b/Resources/Prototypes/Entities/Clothing/Head/specific.yml index 4528d8cabd..b25a7c4a5e 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/specific.yml @@ -6,7 +6,8 @@ suffix: Chameleon components: - type: Tag - tags: [] # ignore "WhitelistChameleon" tag + tags: # ignore "WhitelistChameleon" tag + - ClothMade - type: Sprite sprite: Clothing/Head/Hats/beret.rsi - type: Clothing diff --git a/Resources/Prototypes/Entities/Clothing/Neck/specific.yml b/Resources/Prototypes/Entities/Clothing/Neck/specific.yml index a32d9b5eea..f3de2c6060 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/specific.yml @@ -6,7 +6,9 @@ suffix: Chameleon components: - type: Tag - tags: [] # ignore "WhitelistChameleon" tag + tags: # ignore "WhitelistChameleon" tag + - ClothMade + - Recyclable - type: Sprite sprite: Clothing/Neck/Scarfs/red.rsi - type: Clothing diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml index 845be002e2..d35ce558c7 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml @@ -170,7 +170,9 @@ description: Stylish black shoes. components: - type: Tag - tags: [] # ignore "WhitelistChameleon" tag + tags: # ignore "WhitelistChameleon" tag + - ClothMade + - Recyclable - type: Sprite sprite: Clothing/Shoes/color.rsi layers: diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml index f7ce37fe19..5e3481e9a4 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml @@ -6,7 +6,9 @@ suffix: Chameleon components: - type: Tag - tags: [] # ignore "WhitelistChameleon" tag + tags: # ignore "WhitelistChameleon" tag + - ClothMade + - Recyclable - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/color.rsi layers: From 9133aca00bb8198a74fa5ca940379a9882404a9e Mon Sep 17 00:00:00 2001 From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Date: Sat, 1 Nov 2025 16:16:51 +0100 Subject: [PATCH 077/121] Fix walls and other unanchorable objects being unanchored by the G.O.R.I.L.L.A gauntlet (#41219) * Initial commit * Review fixes * Bitwise? Yeah my wisdom score is a 10 * Review comments --- .../EntitySystems/AnchorableSystem.cs | 1 + Content.Shared/Throwing/ThrowingSystem.cs | 45 ++++++++++++++++--- .../Components/MeleeThrowOnHitComponent.cs | 3 +- .../Objects/Specific/Research/anomaly.yml | 2 +- 4 files changed, 43 insertions(+), 8 deletions(-) diff --git a/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs b/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs index d53a100acc..3985bd3051 100644 --- a/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs +++ b/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs @@ -1,3 +1,4 @@ +using System.Diagnostics.CodeAnalysis; using Content.Shared.Administration.Logs; using Content.Shared.Examine; using Content.Shared.Construction.Components; diff --git a/Content.Shared/Throwing/ThrowingSystem.cs b/Content.Shared/Throwing/ThrowingSystem.cs index 6b121baf58..61ea2de26c 100644 --- a/Content.Shared/Throwing/ThrowingSystem.cs +++ b/Content.Shared/Throwing/ThrowingSystem.cs @@ -3,6 +3,7 @@ using Content.Shared.Administration.Logs; using Content.Shared.Camera; using Content.Shared.CCVar; using Content.Shared.Construction.Components; +using Content.Shared.Construction.EntitySystems; using Content.Shared.Database; using Content.Shared.Friction; using Content.Shared.Projectiles; @@ -11,6 +12,7 @@ using Robust.Shared.Map; using Robust.Shared.Physics; using Robust.Shared.Physics.Components; using Robust.Shared.Physics.Systems; +using Robust.Shared.Serialization; using Robust.Shared.Timing; namespace Content.Shared.Throwing; @@ -35,11 +37,16 @@ public sealed class ThrowingSystem : EntitySystem [Dependency] private readonly SharedCameraRecoilSystem _recoil = default!; [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; [Dependency] private readonly IConfigurationManager _configManager = default!; + [Dependency] private readonly AnchorableSystem _anchorable = default!; + + private EntityQuery _anchorableQuery; public override void Initialize() { base.Initialize(); + _anchorableQuery = GetEntityQuery(); + Subs.CVar(_configManager, CCVars.TileFrictionModifier, value => _frictionModifier = value, true); Subs.CVar(_configManager, CCVars.AirFriction, value => _airDamping = value, true); } @@ -56,7 +63,7 @@ public sealed class ThrowingSystem : EntitySystem bool animated = true, bool playSound = true, bool doSpin = true, - bool unanchor = false) + ThrowingUnanchorStrength unanchor = ThrowingUnanchorStrength.None) { var thrownPos = _transform.GetMapCoordinates(uid); var mapPos = _transform.ToMapCoordinates(coordinates); @@ -77,7 +84,7 @@ public sealed class ThrowingSystem : EntitySystem /// friction value used for the distance calculation. If set to null this defaults to the standard tile values /// True will adjust the throw so the item stops at the target coordinates. False means it will land at the target and keep sliding. /// Whether spin will be applied to the thrown entity. - /// If true and the thrown entity has , unanchor the thrown entity + /// If set to Unanchorable, if the entity has and is unanchorable, it will unanchor the thrown entity. If set to All, it will unanchor the entity regardless. public void TryThrow(EntityUid uid, Vector2 direction, float baseThrowSpeed = 10.0f, @@ -89,7 +96,7 @@ public sealed class ThrowingSystem : EntitySystem bool animated = true, bool playSound = true, bool doSpin = true, - bool unanchor = false) + ThrowingUnanchorStrength unanchor = ThrowingUnanchorStrength.None) { var physicsQuery = GetEntityQuery(); if (!physicsQuery.TryGetComponent(uid, out var physics)) @@ -119,7 +126,7 @@ public sealed class ThrowingSystem : EntitySystem /// friction value used for the distance calculation. If set to null this defaults to the standard tile values /// True will adjust the throw so the item stops at the target coordinates. False means it will land at the target and keep sliding. /// Whether spin will be applied to the thrown entity. - /// If true and the thrown entity has , unanchor the thrown entity + /// If set to Unanchorable, if the entity has and is unanchorable, it will unanchor the thrown entity. If set to All, it will unanchor the entity regardless. public void TryThrow(EntityUid uid, Vector2 direction, PhysicsComponent physics, @@ -134,12 +141,16 @@ public sealed class ThrowingSystem : EntitySystem bool animated = true, bool playSound = true, bool doSpin = true, - bool unanchor = false) + ThrowingUnanchorStrength unanchor = ThrowingUnanchorStrength.None) { if (baseThrowSpeed <= 0 || direction == Vector2Helpers.Infinity || direction == Vector2Helpers.NaN || direction == Vector2.Zero || friction < 0) return; - if (unanchor && HasComp(uid)) + // Unanchor the entity if applicable + if (unanchor == ThrowingUnanchorStrength.All || + unanchor == ThrowingUnanchorStrength.Unanchorable && + _anchorableQuery.TryComp(uid, out var anchorableComponent) && + (anchorableComponent.Flags & AnchorableFlags.Unanchorable) != 0) _transform.Unanchor(uid); if ((physics.BodyType & (BodyType.Dynamic | BodyType.KinematicController)) == 0x0) @@ -243,4 +254,26 @@ public sealed class ThrowingSystem : EntitySystem if (pushEv.Push) _physics.ApplyLinearImpulse(user.Value, -impulseVector / physics.Mass * pushbackRatio * MathF.Min(massLimit, physics.Mass), body: userPhysics); } + + +} + +/// +/// If a throwing action should attempt to unanchor anchored entities. +/// +[Serializable, NetSerializable] +public enum ThrowingUnanchorStrength : byte +{ + /// + /// No entites will be unanchored. + /// + None, + /// + /// Only entities that can be unanchored (e.g. via wrench) will be unanchored. + /// + Unanchorable, + /// + /// All entities will be unanchored. + /// + All, } diff --git a/Content.Shared/Weapons/Melee/Components/MeleeThrowOnHitComponent.cs b/Content.Shared/Weapons/Melee/Components/MeleeThrowOnHitComponent.cs index 42b72efede..2c16ea7582 100644 --- a/Content.Shared/Weapons/Melee/Components/MeleeThrowOnHitComponent.cs +++ b/Content.Shared/Weapons/Melee/Components/MeleeThrowOnHitComponent.cs @@ -1,3 +1,4 @@ +using Content.Shared.Throwing; using Robust.Shared.GameStates; namespace Content.Shared.Weapons.Melee.Components; @@ -26,7 +27,7 @@ public sealed partial class MeleeThrowOnHitComponent : Component /// Whether or not anchorable entities should be unanchored when hit. /// [DataField, AutoNetworkedField] - public bool UnanchorOnHit; + public ThrowingUnanchorStrength UnanchorOnHit = ThrowingUnanchorStrength.None; /// /// How long should this stun the target, if applicable? diff --git a/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml b/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml index 71dbed0aac..e9b365de9a 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml @@ -188,7 +188,7 @@ path: "/Audio/Weapons/Guns/Gunshots/kinetic_accel.ogg" - type: CorePoweredThrower - type: MeleeThrowOnHit - unanchorOnHit: true + unanchorOnHit: Unanchorable - type: ItemSlots slots: core_slot: From e45c9975fad9e3e78a44cbd8f1a9ee4d4c9acf5c Mon Sep 17 00:00:00 2001 From: Connor Huffine Date: Sat, 1 Nov 2025 11:37:20 -0400 Subject: [PATCH 078/121] Remove some warnings generated by SolutionTests (#41194) * Add indirection * Address feedback * const * VSC trolled me --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --- .../Tests/Chemistry/SolutionSystemTests.cs | 52 ++-- .../Shared/Chemistry/SolutionTests.cs | 246 ++++++++++-------- 2 files changed, 163 insertions(+), 135 deletions(-) diff --git a/Content.IntegrationTests/Tests/Chemistry/SolutionSystemTests.cs b/Content.IntegrationTests/Tests/Chemistry/SolutionSystemTests.cs index 6b71dd08be..6f50f54103 100644 --- a/Content.IntegrationTests/Tests/Chemistry/SolutionSystemTests.cs +++ b/Content.IntegrationTests/Tests/Chemistry/SolutionSystemTests.cs @@ -43,6 +43,13 @@ public sealed class SolutionSystemTests desc: reagent-desc-nothing physicalDesc: reagent-physical-desc-nothing "; + + private const string TestReagentA = "TestReagentA"; + private const string TestReagentB = "TestReagentB"; + private const string TestReagentC = "TestReagentC"; + private const string Water = "Water"; + private const string Oil = "Oil"; + [Test] public async Task TryAddTwoNonReactiveReagent() { @@ -62,8 +69,8 @@ public sealed class SolutionSystemTests var oilQuantity = FixedPoint2.New(15); var waterQuantity = FixedPoint2.New(10); - var oilAdded = new Solution("Oil", oilQuantity); - var originalWater = new Solution("Water", waterQuantity); + var oilAdded = new Solution(Oil, oilQuantity); + var originalWater = new Solution(Water, waterQuantity); beaker = entityManager.SpawnEntity("SolutionTarget", coordinates); Assert.That(containerSystem @@ -73,8 +80,8 @@ public sealed class SolutionSystemTests Assert.That(containerSystem .TryAddSolution(solutionEnt.Value, oilAdded)); - var water = solution.GetTotalPrototypeQuantity("Water"); - var oil = solution.GetTotalPrototypeQuantity("Oil"); + var water = solution.GetTotalPrototypeQuantity(Water); + var oil = solution.GetTotalPrototypeQuantity(Oil); Assert.Multiple(() => { Assert.That(water, Is.EqualTo(waterQuantity)); @@ -107,8 +114,8 @@ public sealed class SolutionSystemTests var oilQuantity = FixedPoint2.New(1500); var waterQuantity = FixedPoint2.New(10); - var oilAdded = new Solution("Oil", oilQuantity); - var originalWater = new Solution("Water", waterQuantity); + var oilAdded = new Solution(Oil, oilQuantity); + var originalWater = new Solution(Water, waterQuantity); beaker = entityManager.SpawnEntity("SolutionTarget", coordinates); Assert.That(containerSystem @@ -118,8 +125,8 @@ public sealed class SolutionSystemTests Assert.That(containerSystem .TryAddSolution(solutionEnt.Value, oilAdded), Is.False); - var water = solution.GetTotalPrototypeQuantity("Water"); - var oil = solution.GetTotalPrototypeQuantity("Oil"); + var water = solution.GetTotalPrototypeQuantity(Water); + var oil = solution.GetTotalPrototypeQuantity(Oil); Assert.Multiple(() => { Assert.That(water, Is.EqualTo(waterQuantity)); @@ -153,8 +160,8 @@ public sealed class SolutionSystemTests var waterQuantity = FixedPoint2.New(10); var oilQuantity = FixedPoint2.New(ratio * waterQuantity.Int()); - var oilAdded = new Solution("Oil", oilQuantity); - var originalWater = new Solution("Water", waterQuantity); + var oilAdded = new Solution(Oil, oilQuantity); + var originalWater = new Solution(Water, waterQuantity); beaker = entityManager.SpawnEntity("SolutionTarget", coordinates); Assert.That(containerSystem @@ -168,15 +175,15 @@ public sealed class SolutionSystemTests { Assert.That(solution.Volume, Is.EqualTo(FixedPoint2.New(threshold))); - var waterMix = solution.GetTotalPrototypeQuantity("Water"); - var oilMix = solution.GetTotalPrototypeQuantity("Oil"); + var waterMix = solution.GetTotalPrototypeQuantity(Water); + var oilMix = solution.GetTotalPrototypeQuantity(Oil); Assert.That(waterMix, Is.EqualTo(FixedPoint2.New(threshold / (ratio + 1)))); Assert.That(oilMix, Is.EqualTo(FixedPoint2.New(threshold / (ratio + 1) * ratio))); Assert.That(overflowingSolution.Volume, Is.EqualTo(FixedPoint2.New(80))); - var waterOverflow = overflowingSolution.GetTotalPrototypeQuantity("Water"); - var oilOverFlow = overflowingSolution.GetTotalPrototypeQuantity("Oil"); + var waterOverflow = overflowingSolution.GetTotalPrototypeQuantity(Water); + var oilOverFlow = overflowingSolution.GetTotalPrototypeQuantity(Oil); Assert.That(waterOverflow, Is.EqualTo(waterQuantity - waterMix)); Assert.That(oilOverFlow, Is.EqualTo(oilQuantity - oilMix)); }); @@ -207,8 +214,8 @@ public sealed class SolutionSystemTests var waterQuantity = FixedPoint2.New(10); var oilQuantity = FixedPoint2.New(ratio * waterQuantity.Int()); - var oilAdded = new Solution("Oil", oilQuantity); - var originalWater = new Solution("Water", waterQuantity); + var oilAdded = new Solution(Oil, oilQuantity); + var originalWater = new Solution(Water, waterQuantity); beaker = entityManager.SpawnEntity("SolutionTarget", coordinates); Assert.That(containerSystem @@ -234,24 +241,23 @@ public sealed class SolutionSystemTests // Adding reagent with adjusts temperature await server.WaitAssertion(() => { - - var solution = new Solution("TestReagentA", FixedPoint2.New(100)) { Temperature = temp }; + var solution = new Solution(TestReagentA, FixedPoint2.New(100)) { Temperature = temp }; Assert.That(solution.Temperature, Is.EqualTo(temp * 1)); - solution.AddSolution(new Solution("TestReagentA", FixedPoint2.New(100)) { Temperature = temp * 3 }, protoMan); + solution.AddSolution(new Solution(TestReagentA, FixedPoint2.New(100)) { Temperature = temp * 3 }, protoMan); Assert.That(solution.Temperature, Is.EqualTo(temp * 2)); - solution.AddSolution(new Solution("TestReagentB", FixedPoint2.New(100)) { Temperature = temp * 5 }, protoMan); + solution.AddSolution(new Solution(TestReagentB, FixedPoint2.New(100)) { Temperature = temp * 5 }, protoMan); Assert.That(solution.Temperature, Is.EqualTo(temp * 3)); }); // adding solutions combines thermal energy await server.WaitAssertion(() => { - var solutionOne = new Solution("TestReagentA", FixedPoint2.New(100)) { Temperature = temp }; + var solutionOne = new Solution(TestReagentA, FixedPoint2.New(100)) { Temperature = temp }; - var solutionTwo = new Solution("TestReagentB", FixedPoint2.New(100)) { Temperature = temp }; - solutionTwo.AddReagent("TestReagentC", FixedPoint2.New(100)); + var solutionTwo = new Solution(TestReagentB, FixedPoint2.New(100)) { Temperature = temp }; + solutionTwo.AddReagent(TestReagentC, FixedPoint2.New(100)); var thermalEnergyOne = solutionOne.GetHeatCapacity(protoMan) * solutionOne.Temperature; var thermalEnergyTwo = solutionTwo.GetHeatCapacity(protoMan) * solutionTwo.Temperature; diff --git a/Content.Tests/Shared/Chemistry/SolutionTests.cs b/Content.Tests/Shared/Chemistry/SolutionTests.cs index 7f6e335b36..8b7bbb0d6f 100644 --- a/Content.Tests/Shared/Chemistry/SolutionTests.cs +++ b/Content.Tests/Shared/Chemistry/SolutionTests.cs @@ -9,6 +9,10 @@ namespace Content.Tests.Shared.Chemistry; [TestFixture, Parallelizable, TestOf(typeof(Solution))] public sealed class SolutionTests : ContentUnitTest { + private const string Water = "water"; + private const string Fire = "fire"; + private const string Earth = "earth"; + [OneTimeSetUp] public void Setup() { @@ -19,8 +23,8 @@ public sealed class SolutionTests : ContentUnitTest public void AddReagentAndGetSolution() { var solution = new Solution(); - solution.AddReagent("water", FixedPoint2.New(1000)); - var quantity = solution.GetTotalPrototypeQuantity("water"); + solution.AddReagent(Water, FixedPoint2.New(1000)); + var quantity = solution.GetTotalPrototypeQuantity(Water); Assert.That(quantity.Int(), Is.EqualTo(1000)); } @@ -29,8 +33,8 @@ public sealed class SolutionTests : ContentUnitTest public void ScaleSolution() { var solution = new Solution(); - solution.AddReagent("water", FixedPoint2.New(20)); - solution.AddReagent("fire", FixedPoint2.New(30)); + solution.AddReagent(Water, FixedPoint2.New(20)); + solution.AddReagent(Fire, FixedPoint2.New(30)); // Test integer scaling { @@ -43,8 +47,8 @@ public sealed class SolutionTests : ContentUnitTest tmp.ScaleSolution(2); Assert.That(tmp.Contents.Count, Is.EqualTo(2)); Assert.That(tmp.Volume, Is.EqualTo(FixedPoint2.New(100))); - Assert.That(tmp.GetTotalPrototypeQuantity("water"), Is.EqualTo(FixedPoint2.New(40))); - Assert.That(tmp.GetTotalPrototypeQuantity("fire"), Is.EqualTo(FixedPoint2.New(60))); + Assert.That(tmp.GetTotalPrototypeQuantity(Water), Is.EqualTo(FixedPoint2.New(40))); + Assert.That(tmp.GetTotalPrototypeQuantity(Fire), Is.EqualTo(FixedPoint2.New(60))); } // Test float scaling @@ -58,23 +62,23 @@ public sealed class SolutionTests : ContentUnitTest tmp.ScaleSolution(2f); Assert.That(tmp.Contents.Count, Is.EqualTo(2)); Assert.That(tmp.Volume, Is.EqualTo(FixedPoint2.New(100))); - Assert.That(tmp.GetTotalPrototypeQuantity("water"), Is.EqualTo(FixedPoint2.New(40))); - Assert.That(tmp.GetTotalPrototypeQuantity("fire"), Is.EqualTo(FixedPoint2.New(60))); + Assert.That(tmp.GetTotalPrototypeQuantity(Water), Is.EqualTo(FixedPoint2.New(40))); + Assert.That(tmp.GetTotalPrototypeQuantity(Fire), Is.EqualTo(FixedPoint2.New(60))); tmp = solution.Clone(); tmp.ScaleSolution(0.3f); Assert.That(tmp.Contents.Count, Is.EqualTo(2)); Assert.That(tmp.Volume, Is.EqualTo(FixedPoint2.New(15))); - Assert.That(tmp.GetTotalPrototypeQuantity("water"), Is.EqualTo(FixedPoint2.New(6))); - Assert.That(tmp.GetTotalPrototypeQuantity("fire"), Is.EqualTo(FixedPoint2.New(9))); + Assert.That(tmp.GetTotalPrototypeQuantity(Water), Is.EqualTo(FixedPoint2.New(6))); + Assert.That(tmp.GetTotalPrototypeQuantity(Fire), Is.EqualTo(FixedPoint2.New(9))); } } [Test] public void ConstructorAddReagent() { - var solution = new Solution("water", FixedPoint2.New(1000)); - var quantity = solution.GetTotalPrototypeQuantity("water"); + var solution = new Solution(Water, FixedPoint2.New(1000)); + var quantity = solution.GetTotalPrototypeQuantity(Water); Assert.That(quantity.Int(), Is.EqualTo(1000)); } @@ -83,7 +87,7 @@ public sealed class SolutionTests : ContentUnitTest public void NonExistingReagentReturnsZero() { var solution = new Solution(); - var quantity = solution.GetTotalPrototypeQuantity("water"); + var quantity = solution.GetTotalPrototypeQuantity(Water); Assert.That(quantity.Int(), Is.EqualTo(0)); } @@ -92,8 +96,8 @@ public sealed class SolutionTests : ContentUnitTest [Test] public void AddLessThanZeroReagentReturnsZero() { - var solution = new Solution("water", FixedPoint2.New(-1000)); - var quantity = solution.GetTotalPrototypeQuantity("water"); + var solution = new Solution(Water, FixedPoint2.New(-1000)); + var quantity = solution.GetTotalPrototypeQuantity(Water); Assert.That(quantity.Int(), Is.EqualTo(0)); } @@ -103,9 +107,9 @@ public sealed class SolutionTests : ContentUnitTest public void AddingReagentsSumsProperly() { var solution = new Solution(); - solution.AddReagent("water", FixedPoint2.New(1000)); - solution.AddReagent("water", FixedPoint2.New(2000)); - var quantity = solution.GetTotalPrototypeQuantity("water"); + solution.AddReagent(Water, FixedPoint2.New(1000)); + solution.AddReagent(Water, FixedPoint2.New(2000)); + var quantity = solution.GetTotalPrototypeQuantity(Water); Assert.That(quantity.Int(), Is.EqualTo(3000)); } @@ -114,19 +118,19 @@ public sealed class SolutionTests : ContentUnitTest public void ReagentQuantitiesStayUnique() { var solution = new Solution(); - solution.AddReagent("water", FixedPoint2.New(1000)); - solution.AddReagent("fire", FixedPoint2.New(2000)); + solution.AddReagent(Water, FixedPoint2.New(1000)); + solution.AddReagent(Fire, FixedPoint2.New(2000)); - Assert.That(solution.GetTotalPrototypeQuantity("water").Int(), Is.EqualTo(1000)); - Assert.That(solution.GetTotalPrototypeQuantity("fire").Int(), Is.EqualTo(2000)); + Assert.That(solution.GetTotalPrototypeQuantity(Water).Int(), Is.EqualTo(1000)); + Assert.That(solution.GetTotalPrototypeQuantity(Fire).Int(), Is.EqualTo(2000)); } [Test] public void TotalVolumeIsCorrect() { var solution = new Solution(); - solution.AddReagent("water", FixedPoint2.New(1000)); - solution.AddReagent("fire", FixedPoint2.New(2000)); + solution.AddReagent(Water, FixedPoint2.New(1000)); + solution.AddReagent(Fire, FixedPoint2.New(2000)); Assert.That(solution.Volume.Int(), Is.EqualTo(3000)); } @@ -135,13 +139,13 @@ public sealed class SolutionTests : ContentUnitTest public void CloningSolutionIsCorrect() { var solution = new Solution(); - solution.AddReagent("water", FixedPoint2.New(1000)); - solution.AddReagent("fire", FixedPoint2.New(2000)); + solution.AddReagent(Water, FixedPoint2.New(1000)); + solution.AddReagent(Fire, FixedPoint2.New(2000)); var newSolution = solution.Clone(); - Assert.That(newSolution.GetTotalPrototypeQuantity("water").Int(), Is.EqualTo(1000)); - Assert.That(newSolution.GetTotalPrototypeQuantity("fire").Int(), Is.EqualTo(2000)); + Assert.That(newSolution.GetTotalPrototypeQuantity(Water).Int(), Is.EqualTo(1000)); + Assert.That(newSolution.GetTotalPrototypeQuantity(Fire).Int(), Is.EqualTo(2000)); Assert.That(newSolution.Volume.Int(), Is.EqualTo(3000)); } @@ -149,70 +153,70 @@ public sealed class SolutionTests : ContentUnitTest public void RemoveSolutionRecalculatesProperly() { var solution = new Solution(); - solution.AddReagent("water", FixedPoint2.New(1000)); - solution.AddReagent("fire", FixedPoint2.New(2000)); + solution.AddReagent(Water, FixedPoint2.New(1000)); + solution.AddReagent(Fire, FixedPoint2.New(2000)); - solution.RemoveReagent("water", FixedPoint2.New(500)); + solution.RemoveReagent(Water, FixedPoint2.New(500)); - Assert.That(solution.GetTotalPrototypeQuantity("water").Int(), Is.EqualTo(500)); - Assert.That(solution.GetTotalPrototypeQuantity("fire").Int(), Is.EqualTo(2000)); + Assert.That(solution.GetTotalPrototypeQuantity(Water).Int(), Is.EqualTo(500)); + Assert.That(solution.GetTotalPrototypeQuantity(Fire).Int(), Is.EqualTo(2000)); Assert.That(solution.Volume.Int(), Is.EqualTo(2500)); } [Test] public void RemoveLessThanOneQuantityDoesNothing() { - var solution = new Solution("water", FixedPoint2.New(100)); + var solution = new Solution(Water, FixedPoint2.New(100)); - solution.RemoveReagent("water", FixedPoint2.New(-100)); + solution.RemoveReagent(Water, FixedPoint2.New(-100)); - Assert.That(solution.GetTotalPrototypeQuantity("water").Int(), Is.EqualTo(100)); + Assert.That(solution.GetTotalPrototypeQuantity(Water).Int(), Is.EqualTo(100)); Assert.That(solution.Volume.Int(), Is.EqualTo(100)); } [Test] public void RemoveMoreThanTotalRemovesAllReagent() { - var solution = new Solution("water", FixedPoint2.New(100)); + var solution = new Solution(Water, FixedPoint2.New(100)); - solution.RemoveReagent("water", FixedPoint2.New(1000)); + solution.RemoveReagent(Water, FixedPoint2.New(1000)); - Assert.That(solution.GetTotalPrototypeQuantity("water").Int(), Is.EqualTo(0)); + Assert.That(solution.GetTotalPrototypeQuantity(Water).Int(), Is.EqualTo(0)); Assert.That(solution.Volume.Int(), Is.EqualTo(0)); } [Test] public void RemoveNonExistReagentDoesNothing() { - var solution = new Solution("water", FixedPoint2.New(100)); + var solution = new Solution(Water, FixedPoint2.New(100)); - solution.RemoveReagent("fire", FixedPoint2.New(1000)); + solution.RemoveReagent(Fire, FixedPoint2.New(1000)); - Assert.That(solution.GetTotalPrototypeQuantity("water").Int(), Is.EqualTo(100)); + Assert.That(solution.GetTotalPrototypeQuantity(Water).Int(), Is.EqualTo(100)); Assert.That(solution.Volume.Int(), Is.EqualTo(100)); } [Test] public void RemoveSolution() { - var solution = new Solution("water", FixedPoint2.New(700)); + var solution = new Solution(Water, FixedPoint2.New(700)); solution.RemoveSolution(FixedPoint2.New(500)); //Check that edited solution is correct - Assert.That(solution.GetTotalPrototypeQuantity("water").Int(), Is.EqualTo(200)); + Assert.That(solution.GetTotalPrototypeQuantity(Water).Int(), Is.EqualTo(200)); Assert.That(solution.Volume.Int(), Is.EqualTo(200)); } [Test] public void RemoveSolutionMoreThanTotalRemovesAll() { - var solution = new Solution("water", FixedPoint2.New(800)); + var solution = new Solution(Water, FixedPoint2.New(800)); solution.RemoveSolution(FixedPoint2.New(1000)); //Check that edited solution is correct - Assert.That(solution.GetTotalPrototypeQuantity("water").Int(), Is.EqualTo(0)); + Assert.That(solution.GetTotalPrototypeQuantity(Water).Int(), Is.EqualTo(0)); Assert.That(solution.Volume.Int(), Is.EqualTo(0)); } @@ -220,24 +224,24 @@ public sealed class SolutionTests : ContentUnitTest public void RemoveSolutionRatioPreserved() { var solution = new Solution(); - solution.AddReagent("water", FixedPoint2.New(1000)); - solution.AddReagent("fire", FixedPoint2.New(2000)); + solution.AddReagent(Water, FixedPoint2.New(1000)); + solution.AddReagent(Fire, FixedPoint2.New(2000)); solution.RemoveSolution(FixedPoint2.New(1500)); - Assert.That(solution.GetTotalPrototypeQuantity("water").Int(), Is.EqualTo(500)); - Assert.That(solution.GetTotalPrototypeQuantity("fire").Int(), Is.EqualTo(1000)); + Assert.That(solution.GetTotalPrototypeQuantity(Water).Int(), Is.EqualTo(500)); + Assert.That(solution.GetTotalPrototypeQuantity(Fire).Int(), Is.EqualTo(1000)); Assert.That(solution.Volume.Int(), Is.EqualTo(1500)); } [Test] public void RemoveSolutionLessThanOneDoesNothing() { - var solution = new Solution("water", FixedPoint2.New(800)); + var solution = new Solution(Water, FixedPoint2.New(800)); solution.RemoveSolution(FixedPoint2.New(-200)); - Assert.That(solution.GetTotalPrototypeQuantity("water").Int(), Is.EqualTo(800)); + Assert.That(solution.GetTotalPrototypeQuantity(Water).Int(), Is.EqualTo(800)); Assert.That(solution.Volume.Int(), Is.EqualTo(800)); } @@ -245,17 +249,17 @@ public sealed class SolutionTests : ContentUnitTest public void SplitSolution() { var solution = new Solution(); - solution.AddReagent("water", FixedPoint2.New(1000)); - solution.AddReagent("fire", FixedPoint2.New(2000)); + solution.AddReagent(Water, FixedPoint2.New(1000)); + solution.AddReagent(Fire, FixedPoint2.New(2000)); var splitSolution = solution.SplitSolution(FixedPoint2.New(750)); - Assert.That(solution.GetTotalPrototypeQuantity("water").Int(), Is.EqualTo(750)); - Assert.That(solution.GetTotalPrototypeQuantity("fire").Int(), Is.EqualTo(1500)); + Assert.That(solution.GetTotalPrototypeQuantity(Water).Int(), Is.EqualTo(750)); + Assert.That(solution.GetTotalPrototypeQuantity(Fire).Int(), Is.EqualTo(1500)); Assert.That(solution.Volume.Int(), Is.EqualTo(2250)); - Assert.That(splitSolution.GetTotalPrototypeQuantity("water").Int(), Is.EqualTo(250)); - Assert.That(splitSolution.GetTotalPrototypeQuantity("fire").Int(), Is.EqualTo(500)); + Assert.That(splitSolution.GetTotalPrototypeQuantity(Water).Int(), Is.EqualTo(250)); + Assert.That(splitSolution.GetTotalPrototypeQuantity(Fire).Int(), Is.EqualTo(500)); Assert.That(splitSolution.Volume.Int(), Is.EqualTo(750)); } @@ -263,17 +267,17 @@ public sealed class SolutionTests : ContentUnitTest public void SplitSolutionFractional() { var solution = new Solution(); - solution.AddReagent("water", FixedPoint2.New(1)); - solution.AddReagent("fire", FixedPoint2.New(2)); + solution.AddReagent(Water, FixedPoint2.New(1)); + solution.AddReagent(Fire, FixedPoint2.New(2)); var splitSolution = solution.SplitSolution(FixedPoint2.New(1)); - Assert.That(solution.GetTotalPrototypeQuantity("water").Float(), Is.EqualTo(0.66f)); - Assert.That(solution.GetTotalPrototypeQuantity("fire").Float(), Is.EqualTo(1.34f)); + Assert.That(solution.GetTotalPrototypeQuantity(Water).Float(), Is.EqualTo(0.66f)); + Assert.That(solution.GetTotalPrototypeQuantity(Fire).Float(), Is.EqualTo(1.34f)); Assert.That(solution.Volume.Int(), Is.EqualTo(2)); - Assert.That(splitSolution.GetTotalPrototypeQuantity("water").Float(), Is.EqualTo(0.34f)); - Assert.That(splitSolution.GetTotalPrototypeQuantity("fire").Float(), Is.EqualTo(0.66f)); + Assert.That(splitSolution.GetTotalPrototypeQuantity(Water).Float(), Is.EqualTo(0.34f)); + Assert.That(splitSolution.GetTotalPrototypeQuantity(Fire).Float(), Is.EqualTo(0.66f)); Assert.That(splitSolution.Volume.Int(), Is.EqualTo(1)); } @@ -281,17 +285,17 @@ public sealed class SolutionTests : ContentUnitTest public void SplitSolutionFractionalOpposite() { var solution = new Solution(); - solution.AddReagent("water", FixedPoint2.New(1)); - solution.AddReagent("fire", FixedPoint2.New(2)); + solution.AddReagent(Water, FixedPoint2.New(1)); + solution.AddReagent(Fire, FixedPoint2.New(2)); var splitSolution = solution.SplitSolution(FixedPoint2.New(2)); - Assert.That(solution.GetTotalPrototypeQuantity("water").Float(), Is.EqualTo(0.33f)); - Assert.That(solution.GetTotalPrototypeQuantity("fire").Float(), Is.EqualTo(0.67f)); + Assert.That(solution.GetTotalPrototypeQuantity(Water).Float(), Is.EqualTo(0.33f)); + Assert.That(solution.GetTotalPrototypeQuantity(Fire).Float(), Is.EqualTo(0.67f)); Assert.That(solution.Volume.Int(), Is.EqualTo(1)); - Assert.That(splitSolution.GetTotalPrototypeQuantity("water").Float(), Is.EqualTo(0.67f)); - Assert.That(splitSolution.GetTotalPrototypeQuantity("fire").Float(), Is.EqualTo(1.33f)); + Assert.That(splitSolution.GetTotalPrototypeQuantity(Water).Float(), Is.EqualTo(0.67f)); + Assert.That(splitSolution.GetTotalPrototypeQuantity(Fire).Float(), Is.EqualTo(1.33f)); Assert.That(splitSolution.Volume.Int(), Is.EqualTo(2)); } @@ -301,14 +305,14 @@ public sealed class SolutionTests : ContentUnitTest public void SplitSolutionTinyFractionalBigSmall(float initial, float reduce, float remainder) { var solution = new Solution(); - solution.AddReagent("water", FixedPoint2.New(initial)); + solution.AddReagent(Water, FixedPoint2.New(initial)); var splitSolution = solution.SplitSolution(FixedPoint2.New(reduce)); - Assert.That(solution.GetTotalPrototypeQuantity("water").Float(), Is.EqualTo(remainder)); + Assert.That(solution.GetTotalPrototypeQuantity(Water).Float(), Is.EqualTo(remainder)); Assert.That(solution.Volume.Float(), Is.EqualTo(remainder)); - Assert.That(splitSolution.GetTotalPrototypeQuantity("water").Float(), Is.EqualTo(reduce)); + Assert.That(splitSolution.GetTotalPrototypeQuantity(Water).Float(), Is.EqualTo(reduce)); Assert.That(splitSolution.Volume.Float(), Is.EqualTo(reduce)); } @@ -319,10 +323,14 @@ public sealed class SolutionTests : ContentUnitTest [TestCase(1000)] public void SplitRounding(int amount) { + var foo = "foo"; + var bar = "bar"; + var baz = "baz"; + var solutionOne = new Solution(); - solutionOne.AddReagent("foo", FixedPoint2.New(amount)); - solutionOne.AddReagent("bar", FixedPoint2.New(amount)); - solutionOne.AddReagent("baz", FixedPoint2.New(amount)); + solutionOne.AddReagent(foo, FixedPoint2.New(amount)); + solutionOne.AddReagent(bar, FixedPoint2.New(amount)); + solutionOne.AddReagent(baz, FixedPoint2.New(amount)); var splitAmount = FixedPoint2.New(5); var split = solutionOne.SplitSolution(splitAmount); @@ -333,48 +341,62 @@ public sealed class SolutionTests : ContentUnitTest [Test] public void SplitSolutionMoreThanTotalRemovesAll() { - var solution = new Solution("water", FixedPoint2.New(800)); + var solution = new Solution(Water, FixedPoint2.New(800)); var splitSolution = solution.SplitSolution(FixedPoint2.New(1000)); - Assert.That(solution.GetTotalPrototypeQuantity("water").Int(), Is.EqualTo(0)); + Assert.That(solution.GetTotalPrototypeQuantity(Water).Int(), Is.EqualTo(0)); Assert.That(solution.Volume.Int(), Is.EqualTo(0)); - Assert.That(splitSolution.GetTotalPrototypeQuantity("water").Int(), Is.EqualTo(800)); + Assert.That(splitSolution.GetTotalPrototypeQuantity(Water).Int(), Is.EqualTo(800)); Assert.That(splitSolution.Volume.Int(), Is.EqualTo(800)); } [Test] public void SplitSolutionLessThanOneDoesNothing() { - var solution = new Solution("water", FixedPoint2.New(800)); + var solution = new Solution(Water, FixedPoint2.New(800)); var splitSolution = solution.SplitSolution(FixedPoint2.New(-200)); - Assert.That(solution.GetTotalPrototypeQuantity("water").Int(), Is.EqualTo(800)); + Assert.That(solution.GetTotalPrototypeQuantity(Water).Int(), Is.EqualTo(800)); Assert.That(solution.Volume.Int(), Is.EqualTo(800)); - Assert.That(splitSolution.GetTotalPrototypeQuantity("water").Int(), Is.EqualTo(0)); + Assert.That(splitSolution.GetTotalPrototypeQuantity(Water).Int(), Is.EqualTo(0)); Assert.That(splitSolution.Volume.Int(), Is.EqualTo(0)); } [Test] public void SplitSolutionZero() { + var impedrezene = "Impedrezene"; + var thermite = "Thermite"; + var lithium = "Li"; + var flourine = "F"; + var sodium = "Na"; + var mercury = "Hg"; + var copper = "Cu"; + var uranium = "U"; + var iron = "Fe"; + var spaceDrugs = "SpaceDrugs"; + var aluminum = "Al"; + var glucose = "Glucose"; + var oxygen = "O"; + var solution = new Solution(); - solution.AddReagent("Impedrezene", FixedPoint2.New(0.01 + 0.19)); - solution.AddReagent("Thermite", FixedPoint2.New(0.01 + 0.39)); - solution.AddReagent("Li", FixedPoint2.New(0.01 + 0.17)); - solution.AddReagent("F", FixedPoint2.New(0.01 + 0.17)); - solution.AddReagent("Na", FixedPoint2.New(0 + 0.13)); - solution.AddReagent("Hg", FixedPoint2.New(0.15 + 4.15)); - solution.AddReagent("Cu", FixedPoint2.New(0 + 0.13)); - solution.AddReagent("U", FixedPoint2.New(0.76 + 20.77)); - solution.AddReagent("Fe", FixedPoint2.New(0.01 + 0.36)); - solution.AddReagent("SpaceDrugs", FixedPoint2.New(0.02 + 0.41)); - solution.AddReagent("Al", FixedPoint2.New(0)); - solution.AddReagent("Glucose", FixedPoint2.New(0)); - solution.AddReagent("O", FixedPoint2.New(0)); + solution.AddReagent(impedrezene, FixedPoint2.New(0.01 + 0.19)); + solution.AddReagent(thermite, FixedPoint2.New(0.01 + 0.39)); + solution.AddReagent(lithium, FixedPoint2.New(0.01 + 0.17)); + solution.AddReagent(flourine, FixedPoint2.New(0.01 + 0.17)); + solution.AddReagent(sodium, FixedPoint2.New(0 + 0.13)); + solution.AddReagent(mercury, FixedPoint2.New(0.15 + 4.15)); + solution.AddReagent(copper, FixedPoint2.New(0 + 0.13)); + solution.AddReagent(uranium, FixedPoint2.New(0.76 + 20.77)); + solution.AddReagent(iron, FixedPoint2.New(0.01 + 0.36)); + solution.AddReagent(spaceDrugs, FixedPoint2.New(0.02 + 0.41)); + solution.AddReagent(aluminum, FixedPoint2.New(0)); + solution.AddReagent(glucose, FixedPoint2.New(0)); + solution.AddReagent(oxygen, FixedPoint2.New(0)); solution.SplitSolution(FixedPoint2.New(0.98)); } @@ -383,18 +405,18 @@ public sealed class SolutionTests : ContentUnitTest public void AddSolution() { var solutionOne = new Solution(); - solutionOne.AddReagent("water", FixedPoint2.New(1000)); - solutionOne.AddReagent("fire", FixedPoint2.New(2000)); + solutionOne.AddReagent(Water, FixedPoint2.New(1000)); + solutionOne.AddReagent(Fire, FixedPoint2.New(2000)); var solutionTwo = new Solution(); - solutionTwo.AddReagent("water", FixedPoint2.New(500)); - solutionTwo.AddReagent("earth", FixedPoint2.New(1000)); + solutionTwo.AddReagent(Water, FixedPoint2.New(500)); + solutionTwo.AddReagent(Earth, FixedPoint2.New(1000)); solutionOne.AddSolution(solutionTwo, null); - Assert.That(solutionOne.GetTotalPrototypeQuantity("water").Int(), Is.EqualTo(1500)); - Assert.That(solutionOne.GetTotalPrototypeQuantity("fire").Int(), Is.EqualTo(2000)); - Assert.That(solutionOne.GetTotalPrototypeQuantity("earth").Int(), Is.EqualTo(1000)); + Assert.That(solutionOne.GetTotalPrototypeQuantity(Water).Int(), Is.EqualTo(1500)); + Assert.That(solutionOne.GetTotalPrototypeQuantity(Fire).Int(), Is.EqualTo(2000)); + Assert.That(solutionOne.GetTotalPrototypeQuantity(Earth).Int(), Is.EqualTo(1000)); Assert.That(solutionOne.Volume.Int(), Is.EqualTo(4500)); } @@ -414,12 +436,12 @@ public sealed class SolutionTests : ContentUnitTest { const float initialTemp = 100.0f; - var solution = new Solution("water", FixedPoint2.New(100)) { Temperature = initialTemp }; + var solution = new Solution(Water, FixedPoint2.New(100)) { Temperature = initialTemp }; - solution.AddReagent("water", FixedPoint2.New(100)); + solution.AddReagent(Water, FixedPoint2.New(100)); Assert.That(solution.Temperature, Is.EqualTo(initialTemp)); - solution.AddReagent("earth", FixedPoint2.New(100)); + solution.AddReagent(Earth, FixedPoint2.New(100)); Assert.That(solution.Temperature, Is.EqualTo(initialTemp)); } @@ -429,12 +451,12 @@ public sealed class SolutionTests : ContentUnitTest const float initialTemp = 100.0f; var solutionOne = new Solution(); - solutionOne.AddReagent("water", FixedPoint2.New(100)); + solutionOne.AddReagent(Water, FixedPoint2.New(100)); solutionOne.Temperature = initialTemp; var solutionTwo = new Solution(); - solutionTwo.AddReagent("water", FixedPoint2.New(100)); - solutionTwo.AddReagent("earth", FixedPoint2.New(100)); + solutionTwo.AddReagent(Water, FixedPoint2.New(100)); + solutionTwo.AddReagent(Earth, FixedPoint2.New(100)); solutionTwo.Temperature = initialTemp; solutionOne.AddSolution(solutionTwo, null); @@ -446,8 +468,8 @@ public sealed class SolutionTests : ContentUnitTest { const float initialTemp = 100.0f; - var solution = new Solution("water", FixedPoint2.New(100)) { Temperature = initialTemp }; - solution.RemoveReagent("water", FixedPoint2.New(50)); + var solution = new Solution(Water, FixedPoint2.New(100)) { Temperature = initialTemp }; + solution.RemoveReagent(Water, FixedPoint2.New(50)); Assert.That(solution.Temperature, Is.EqualTo(initialTemp)); } @@ -456,7 +478,7 @@ public sealed class SolutionTests : ContentUnitTest { const float initialTemp = 100.0f; - var solution = new Solution("water", FixedPoint2.New(100)) { Temperature = initialTemp }; + var solution = new Solution(Water, FixedPoint2.New(100)) { Temperature = initialTemp }; solution.RemoveSolution(FixedPoint2.New(50)); Assert.That(solution.Temperature, Is.EqualTo(initialTemp)); } @@ -466,7 +488,7 @@ public sealed class SolutionTests : ContentUnitTest { const float initialTemp = 100.0f; - var solution = new Solution("water", FixedPoint2.New(100)) { Temperature = initialTemp }; + var solution = new Solution(Water, FixedPoint2.New(100)) { Temperature = initialTemp }; solution.SplitSolution(FixedPoint2.New(50)); Assert.That(solution.Temperature, Is.EqualTo(initialTemp)); } From 4efb02609e65b192ca4bb56fe31420ed1a49617e Mon Sep 17 00:00:00 2001 From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com> Date: Sat, 1 Nov 2025 11:49:53 -0400 Subject: [PATCH 079/121] Assorted tweaks to towel trinkets (#39831) * Added tactical katana + tactical katana shipment (placeholder descriptions) * Revert "Added tactical katana + tactical katana shipment (placeholder descriptions)" This reverts commit aa1928be7f4d938df1838943781e63c47a03cc11. Whoops, committed to master by mistake * Cleaned up trinket menu * Fixed dark green towel clothingVisuals color values * Sorted towels by color * Undo move of candles * Sorted towels by actual HSV Hue value * Remove 10h playtime requirement from white towels * Removed cheap lighter from PR --- .../Entities/Clothing/Multiple/towel.yml | 12 +- .../Loadouts/Miscellaneous/trinkets.yml | 251 +++++++++--------- .../Prototypes/Loadouts/loadout_groups.yml | 20 +- 3 files changed, 139 insertions(+), 144 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Multiple/towel.yml b/Resources/Prototypes/Entities/Clothing/Multiple/towel.yml index f5f2053fea..3d5840697c 100644 --- a/Resources/Prototypes/Entities/Clothing/Multiple/towel.yml +++ b/Resources/Prototypes/Entities/Clothing/Multiple/towel.yml @@ -387,26 +387,26 @@ - type: Sprite layers: - state: icon - color: "#79CC26" + color: "#639137" - type: Item inhandVisuals: left: - state: inhand-left - color: "#79CC26" + color: "#639137" right: - state: inhand-right - color: "#79CC26" + color: "#639137" - type: Clothing clothingVisuals: head: - state: equipped-HELMET - color: "#79CC26" + color: "#639137" jumpsuit: - state: equipped-INNERCLOTHING - color: "#79CC26" + color: "#639137" belt: - state: equipped-BELT - color: "#79CC26" + color: "#639137" - type: Fiber fiberColor: fibers-green diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml index 9b502bd7d1..3642300ba7 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml @@ -329,131 +329,11 @@ # Towels - type: loadout id: TowelColorWhite - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:OverallPlaytimeRequirement - time: 10h storage: back: - TowelColorWhite groupBy: "towels" -- type: loadout - id: TowelColorSilver - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:OverallPlaytimeRequirement - time: 500h - storage: - back: - - TowelColorSilver - groupBy: "towels" - -- type: loadout - id: TowelColorGold - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:OverallPlaytimeRequirement - time: 1000h - storage: - back: - - TowelColorGold - groupBy: "towels" - -- type: loadout - id: TowelColorLightBrown - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:DepartmentTimeRequirement - department: Cargo - time: 100h - storage: - back: - - TowelColorLightBrown - groupBy: "towels" - -- type: loadout - id: TowelColorGreen - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:DepartmentTimeRequirement - department: Civilian - time: 100h - storage: - back: - - TowelColorGreen - groupBy: "towels" - -- type: loadout - id: TowelColorDarkBlue - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:DepartmentTimeRequirement - department: Command - time: 100h - storage: - back: - - TowelColorDarkBlue - groupBy: "towels" - -- type: loadout - id: TowelColorOrange - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:DepartmentTimeRequirement - department: Engineering - time: 100h - storage: - back: - - TowelColorOrange - groupBy: "towels" - -- type: loadout - id: TowelColorLightBlue - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:DepartmentTimeRequirement - department: Medical - time: 100h - storage: - back: - - TowelColorLightBlue - groupBy: "towels" - -- type: loadout - id: TowelColorPurple - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:DepartmentTimeRequirement - department: Science - time: 100h - storage: - back: - - TowelColorPurple - groupBy: "towels" - -- type: loadout - id: TowelColorRed - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:DepartmentTimeRequirement - department: Security - time: 100h - storage: - back: - - TowelColorRed - groupBy: "towels" - - type: loadout id: TowelColorGray effects: @@ -481,29 +361,42 @@ groupBy: "towels" - type: loadout - id: TowelColorDarkGreen + id: TowelColorRed effects: - !type:JobRequirementLoadoutEffect requirement: - !type:RoleTimeRequirement - role: JobLibrarian + !type:DepartmentTimeRequirement + department: Security time: 100h storage: back: - - TowelColorDarkGreen + - TowelColorRed groupBy: "towels" - type: loadout - id: TowelColorMaroon + id: TowelColorOrange effects: - !type:JobRequirementLoadoutEffect requirement: - !type:RoleTimeRequirement - role: JobLawyer + !type:DepartmentTimeRequirement + department: Engineering time: 100h storage: back: - - TowelColorMaroon + - TowelColorOrange + groupBy: "towels" + +- type: loadout + id: TowelColorLightBrown + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Cargo + time: 100h + storage: + back: + - TowelColorLightBrown groupBy: "towels" - type: loadout @@ -519,6 +412,84 @@ - TowelColorYellow groupBy: "towels" +- type: loadout + id: TowelColorDarkGreen + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobLibrarian + time: 100h + storage: + back: + - TowelColorDarkGreen + groupBy: "towels" + +- type: loadout + id: TowelColorGreen + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Civilian + time: 100h + storage: + back: + - TowelColorGreen + groupBy: "towels" + +- type: loadout + id: TowelColorLightBlue + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Medical + time: 100h + storage: + back: + - TowelColorLightBlue + groupBy: "towels" + +- type: loadout + id: TowelColorDarkBlue + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Command + time: 100h + storage: + back: + - TowelColorDarkBlue + groupBy: "towels" + +- type: loadout + id: TowelColorPurple + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Science + time: 100h + storage: + back: + - TowelColorPurple + groupBy: "towels" + +- type: loadout + id: TowelColorMaroon + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobLawyer + time: 100h + storage: + back: + - TowelColorMaroon + groupBy: "towels" + - type: loadout id: TowelColorMime effects: @@ -531,3 +502,27 @@ back: - TowelColorMime groupBy: "towels" + +- type: loadout + id: TowelColorSilver + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:OverallPlaytimeRequirement + time: 500h + storage: + back: + - TowelColorSilver + groupBy: "towels" + +- type: loadout + id: TowelColorGold + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:OverallPlaytimeRequirement + time: 1000h + storage: + back: + - TowelColorGold + groupBy: "towels" diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 58876e595a..185b68ab36 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -45,22 +45,22 @@ - OffsetCaneMime - OffsetCaneNT - Cane - - TowelColorBlack - - TowelColorDarkBlue - - TowelColorDarkGreen - - TowelColorGold + - TowelColorWhite - TowelColorGray + - TowelColorBlack + - TowelColorRed + - TowelColorOrange + - TowelColorLightBrown + - TowelColorYellow + - TowelColorDarkGreen - TowelColorGreen - TowelColorLightBlue - - TowelColorLightBrown + - TowelColorDarkBlue + - TowelColorPurple - TowelColorMaroon - TowelColorMime - - TowelColorOrange - - TowelColorPurple - - TowelColorRed - TowelColorSilver - - TowelColorWhite - - TowelColorYellow + - TowelColorGold - type: loadoutGroup id: Glasses From fb22cefd8d76a91afd5d5b3b2a96f34deec9711c Mon Sep 17 00:00:00 2001 From: eoineoineoin Date: Sat, 1 Nov 2025 17:13:57 +0000 Subject: [PATCH 080/121] Borg module action QOL: put module name into tooltips (#38750) * Borg module action QOL: put module name into tooltips * Fix tests * Tidy up component lookups * formatting --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --- Content.Server/Silicons/Borgs/BorgSystem.Modules.cs | 10 ++++++++++ Resources/Locale/en-US/borg/borg.ftl | 5 +++-- .../Objects/Specific/Robotics/borg_modules.yml | 1 + 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs b/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs index bbd62d7a01..67408d1d5a 100644 --- a/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs +++ b/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs @@ -65,6 +65,16 @@ public sealed partial class BorgSystem _actions.SetEntityIcon(actEnt, uid); if (TryComp(uid, out var moduleIconComp)) _actions.SetIcon(actEnt, moduleIconComp.Icon); + + /// Set a custom name and description on the action. The borg module action prototypes are shared across + /// all modules. Extract localized names, then populate variables with the info from the module itself. + var moduleName = Name(uid); + var actionMetaData = MetaData(component.ModuleSwapActionEntity.Value); + + var instanceName = Loc.GetString("borg-module-action-name", ("moduleName", moduleName)); + _metaData.SetEntityName(component.ModuleSwapActionEntity.Value, instanceName, actionMetaData); + var instanceDesc = Loc.GetString("borg-module-action-description", ("moduleName", moduleName)); + _metaData.SetEntityDescription(component.ModuleSwapActionEntity.Value, instanceDesc, actionMetaData); } if (!TryComp(chassis, out BorgChassisComponent? chassisComp)) diff --git a/Resources/Locale/en-US/borg/borg.ftl b/Resources/Locale/en-US/borg/borg.ftl index 9c9dc71069..54a733e1cf 100644 --- a/Resources/Locale/en-US/borg/borg.ftl +++ b/Resources/Locale/en-US/borg/borg.ftl @@ -10,6 +10,9 @@ borg-module-too-many = There's not enough room for another module... borg-module-duplicate = This module is already installed in this cyborg. borg-module-whitelist-deny = This module doesn't fit in this type of cyborg... +borg-module-action-name = Activate {$moduleName} +borg-module-action-description = Select the {$moduleName}, enabling you to use the tools it provides. + borg-construction-guide-string = The cyborg limbs and torso must be attached to the endoskeleton. borg-ui-menu-title = Cyborg Interface @@ -60,5 +63,3 @@ borg-type-medical-transponder = medical cyborg borg-type-service-name = Service borg-type-service-desc = Help out with a wide range of crew services, ranging from serving snacks and drinks to botany to entertainment. borg-type-service-transponder = service cyborg - - diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml index e023133f27..9cc47d5b10 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -51,6 +51,7 @@ - type: entity parent: BaseAction id: ActionBorgSwapModule + # Name and description will normally be changed by BorgSystem name: Swap Module description: Select this module, enabling you to use the tools it provides. components: From f07bf83c9baee93d146676d73ed76f5a0651bd24 Mon Sep 17 00:00:00 2001 From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Date: Sat, 1 Nov 2025 21:48:28 +0100 Subject: [PATCH 081/121] Update Exo with latest signage and consoles (#41234) Commit --- Resources/Maps/exo.yml | 2915 +++++++++------------------------------- 1 file changed, 660 insertions(+), 2255 deletions(-) diff --git a/Resources/Maps/exo.yml b/Resources/Maps/exo.yml index b357069817..8b893c2b82 100644 --- a/Resources/Maps/exo.yml +++ b/Resources/Maps/exo.yml @@ -1,11 +1,11 @@ meta: format: 7 category: Map - engineVersion: 267.1.0 + engineVersion: 267.3.0 forkId: "" forkVersion: "" - time: 09/25/2025 21:06:16 - entityCount: 19960 + time: 11/01/2025 14:27:42 + entityCount: 20005 maps: - 1 grids: @@ -133,7 +133,7 @@ entities: version: 7 0,-3: ind: 0,-3 - tiles: IAAAAAACAAMAAAAAAAADAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAAIAAAAAAAACUAAAAAAAAlAAAAAAIAJQAAAAACACUAAAAAAwAlAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAcAAAAAAAADAAAAAAAAAwAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAALgAAAAAAAi0AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAi4AAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAgQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAAC0AAAAAAAAlAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAIEAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAABBy0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAS4AAAAAAAOBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAuAAAAAAABLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAKwAAAAADBy4AAAAAAAEYAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADKwAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAACUAAAAAAwArAAAAAAMAGAAAAAAAACsAAAAAAgArAAAAAAEAKwAAAAAAACsAAAAAAwArAAAAAAMAKwAAAAADACsAAAAAAgArAAAAAAEAKwAAAAACAC4AAAAAAAItAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAxgAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAwBgAAAAAAMAYAAAAAACAA== + tiles: IAAAAAACAAMAAAAAAAADAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAAIAAAAAAAACUAAAAAAAAlAAAAAAIAJQAAAAACACUAAAAAAwAlAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAcAAAAAAAADAAAAAAAAAwAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAALgAAAAAAAi0AAAAAAAMHAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAi4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAgQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAAC0AAAAAAAAlAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAIEAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAABBy0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAS4AAAAAAAOBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAuAAAAAAABLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAKwAAAAADBy4AAAAAAAEYAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADKwAAAAAAACsAAAAAAAArAAAAAAAAKwAAAAAAACUAAAAAAwArAAAAAAMAGAAAAAAAACsAAAAAAgArAAAAAAEAKwAAAAAAACsAAAAAAwArAAAAAAMAKwAAAAADACsAAAAAAgArAAAAAAEAKwAAAAACAC4AAAAAAAItAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAxgAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAwBgAAAAAAMAYAAAAAACAA== version: 7 1,-3: ind: 1,-3 @@ -141,7 +141,7 @@ entities: version: 7 -1,-3: ind: -1,-3 - tiles: gQAAAAAAAC0AAAAAAAArAAAAAAMHLQAAAAAAAIEAAAAAAAAeAAAAAAAAIAAAAAABACAAAAAAAQAgAAAAAAMAgQAAAAAAACAAAAAAAwAgAAAAAAMAIAAAAAAAACAAAAAAAwCBAAAAAAAAIAAAAAADAIEAAAAAAAAtAAAAAAAAKwAAAAABBy0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAAAYAAAAAAAALQAAAAAAACsAAAAAAgctAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAALwAAAAAAAIEAAAAAAAAgAAAAAAMAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAC8AAAAAAACBAAAAAAAAIAAAAAADAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAALQAAAAAAACsAAAAAAwctAAAAAAAAgQAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAIHLQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAABBy0AAAAAAAAuAAAAAAABLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAxgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAABcAAAAAAAAYAAAAAAAALQAAAAAAACUAAAAAAwArAAAAAAEAJQAAAAADAC4AAAAAAAItAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAxgAAAAAAAAYAAAAAAAAGAAAAAAAACAAAAAAAgCBAAAAAAAAGAAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABvAAAAAAAALQAAAAAABxgAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAuAAAAAAABbwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAAC4AAAAAAAEtAAAAAAADGAAAAAAAAIEAAAAAAAAYAAAAAAAALQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAAAYAAAAAAAAJQAAAAACABgAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABvAAAAAAAALQAAAAAAACsAAAAAAAcYAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAAC0AAAAAAAArAAAAAAMHGAAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAAAtAAAAAAAAKwAAAAABBw== + tiles: gQAAAAAAAC0AAAAAAAArAAAAAAMHLQAAAAAAAIEAAAAAAAAeAAAAAAAAIAAAAAABACAAAAAAAQAgAAAAAAMAgQAAAAAAACAAAAAAAwAgAAAAAAMAIAAAAAAAACAAAAAAAwCBAAAAAAAAIAAAAAADAIEAAAAAAAAtAAAAAAAAKwAAAAABBy0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAAAYAAAAAAAALQAAAAAAACsAAAAAAgctAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAALwAAAAAAAIEAAAAAAAAgAAAAAAMAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAC8AAAAAAACBAAAAAAAAIAAAAAADAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAALQAAAAAAACsAAAAAAwctAAAAAAAAgQAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAIHLQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAABBy0AAAAAAAAuAAAAAAABLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAxgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAABcAAAAAAAAYAAAAAAAALQAAAAAAACUAAAAAAwArAAAAAAEAJQAAAAADAC4AAAAAAAItAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAxgAAAAAAAAYAAAAAAAAGAAAAAAAACAAAAAAAgCBAAAAAAAAGAAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABvAAAAAAAALQAAAAAABxgAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAuAAAAAAABbwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAAC4AAAAAAAEtAAAAAAADGAAAAAAAAIEAAAAAAAAYAAAAAAAALQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAAAYAAAAAAAAJQAAAAACABgAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABvAAAAAAAALQAAAAAAACsAAAAAAAcYAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAAC0AAAAAAAArAAAAAAMHGAAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAAAtAAAAAAAAKwAAAAABBw== version: 7 -2,-2: ind: -2,-2 @@ -1704,7 +1704,7 @@ entities: id: DeliveryGreyscale decals: 4660: 59,-38 - 4753: 67,-44 + 5262: 64,-48 - node: color: '#0000008C' id: DiagonalCheckerAOverlay @@ -2551,6 +2551,9 @@ entities: 4383: 35,-18 4604: 34,-77 5222: 59,-24 + 5256: 9,-44 + 5257: 10,-44 + 5258: 11,-44 - node: color: '#C8C8FFFF' id: MiniTileDarkLineS @@ -2583,6 +2586,9 @@ entities: 4605: 34,-77 4636: 72,-45 4958: 38,-77 + 5259: 9,-42 + 5260: 10,-42 + 5261: 11,-42 - node: color: '#C8C8FFFF' id: MiniTileDarkLineW @@ -4339,7 +4345,7 @@ entities: 5,-8: 0: 48059 5,-7: - 0: 39305 + 0: 39304 5,-6: 0: 28927 5,-9: @@ -4369,8 +4375,8 @@ entities: 8,-5: 0: 40955 0,-12: - 0: 119 - 1: 24576 + 0: 375 + 1: 16384 -1,-12: 0: 48011 -1,-11: @@ -4477,7 +4483,7 @@ entities: -3,-13: 0: 65262 -2,-12: - 0: 36621 + 0: 36749 -2,-11: 0: 63803 -2,-10: @@ -4647,10 +4653,10 @@ entities: 0: 51711 8,-16: 0: 271 - 2: 17408 + 4: 17408 8,-15: 1: 4096 - 2: 4 + 4: 4 8,-14: 0: 32752 8,-13: @@ -5344,8 +5350,8 @@ entities: 0: 65535 9,-16: 0: 15 - 3: 4352 - 4: 17408 + 5: 4352 + 2: 17408 10,-20: 0: 65280 10,-19: @@ -5356,8 +5362,8 @@ entities: 0: 65535 10,-16: 0: 15 - 4: 4352 - 5: 17408 + 2: 4352 + 6: 17408 11,-20: 0: 65024 11,-19: @@ -5369,7 +5375,7 @@ entities: 11,-16: 0: 15 1: 35840 - 4: 4352 + 2: 4352 12,-20: 0: 65280 12,-19: @@ -5403,7 +5409,7 @@ entities: 0: 61183 12,-16: 0: 7 - 4: 2184 + 2: 2184 1: 8960 13,-20: 0: 65024 @@ -5417,7 +5423,7 @@ entities: 13,-21: 1: 16179 13,-16: - 4: 819 + 2: 819 1: 8 14,-20: 0: 53504 @@ -5550,7 +5556,7 @@ entities: 19,-13: 0: 5911 19,-12: - 0: 57309 + 0: 57308 20,-16: 0: 35225 20,-12: @@ -5617,7 +5623,7 @@ entities: 0: 59392 11,-15: 1: 32904 - 4: 1 + 2: 1 12,-14: 0: 62926 11,-14: @@ -5738,12 +5744,12 @@ entities: 0: 60625 11,-10: 0: 34944 - 6: 13104 + 3: 13104 12,-9: 0: 56784 11,-9: 0: 65416 - 6: 2 + 3: 2 12,-8: 0: 57117 13,-11: @@ -5885,11 +5891,11 @@ entities: 9,-13: 0: 16307 10,-12: - 0: 65535 + 0: 65531 10,-11: 0: 65535 10,-10: - 6: 65520 + 3: 65520 0: 4 10,-13: 0: 12276 @@ -5952,14 +5958,14 @@ entities: 11,-3: 1: 12288 9,-15: - 3: 1 - 4: 4 + 5: 1 + 2: 4 1: 32768 9,-14: 0: 36848 10,-15: - 4: 1 - 5: 4 + 2: 1 + 6: 4 10,-14: 0: 65520 -8,-24: @@ -6044,6 +6050,14 @@ entities: - volume: 2500 immutable: True moles: {} + - volume: 2500 + temperature: 293.15 + moles: {} + - volume: 2500 + temperature: 235 + moles: + Oxygen: 27.225372 + Nitrogen: 102.419266 - volume: 2500 temperature: 293.15 moles: @@ -6052,18 +6066,10 @@ entities: temperature: 293.15 moles: Nitrogen: 6666.982 - - volume: 2500 - temperature: 293.15 - moles: {} - volume: 2500 temperature: 293.15 moles: Plasma: 6666.982 - - volume: 2500 - temperature: 235 - moles: - Oxygen: 27.225372 - Nitrogen: 102.419266 chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance @@ -6129,12 +6135,6 @@ entities: components: - type: Transform parent: 7697 - - uid: 7990 - mapInit: true - paused: true - components: - - type: Transform - parent: 7692 - uid: 7999 components: - type: Transform @@ -6162,6 +6162,15 @@ entities: components: - type: Transform parent: 18387 + - uid: 18526 + mapInit: true + paused: true + components: + - type: Transform + parent: 18513 + - type: Action + originalIconColor: '#FFFFFFFF' + container: 18513 - uid: 18754 components: - type: Transform @@ -6210,6 +6219,15 @@ entities: components: - type: Transform parent: 33 + - uid: 1877 + mapInit: true + paused: true + components: + - type: Transform + parent: 5675 + - type: Action + originalIconColor: '#FFFFFFFF' + container: 5675 - uid: 3844 mapInit: true paused: true @@ -6342,33 +6360,6 @@ entities: - 9819 - type: Fixtures fixtures: {} - - uid: 14458 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,-8.5 - parent: 2 - - type: DeviceList - devices: - - 5917 - - 5921 - - 5920 - - 5919 - - 5918 - - 5916 - - 5915 - - 5914 - - 6634 - - 6635 - - 6636 - - 14552 - - 14553 - - 9606 - - 9647 - - 7459 - - 1833 - - type: Fixtures - fixtures: {} - uid: 14460 components: - type: Transform @@ -6667,6 +6658,7 @@ entities: - 17601 - 17516 - 17996 + - 6699 - type: Fixtures fixtures: {} - uid: 17282 @@ -6736,6 +6728,33 @@ entities: - 4170 - type: Fixtures fixtures: {} + - uid: 18299 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-8.5 + parent: 2 + - type: DeviceList + devices: + - 5914 + - 5915 + - 5916 + - 5917 + - 5918 + - 5919 + - 5920 + - 5921 + - 1833 + - 7459 + - 6634 + - 6635 + - 6636 + - 9606 + - 14553 + - 14552 + - 9647 + - type: Fixtures + fixtures: {} - uid: 18493 components: - type: Transform @@ -7824,17 +7843,6 @@ entities: - 7594 - type: Fixtures fixtures: {} - - uid: 12980 - components: - - type: Transform - pos: -4.5,-46.5 - parent: 2 - - type: DeviceList - devices: - - 10474 - - 10473 - - type: Fixtures - fixtures: {} - uid: 15885 components: - type: Transform @@ -8006,6 +8014,17 @@ entities: - 19891 - type: Fixtures fixtures: {} + - uid: 18329 + components: + - type: Transform + pos: -3.5,-46.5 + parent: 2 + - type: DeviceList + devices: + - 10473 + - 10474 + - type: Fixtures + fixtures: {} - uid: 18736 components: - type: Transform @@ -9976,6 +9995,11 @@ entities: - type: Transform pos: -0.5,-44.5 parent: 2 + - uid: 12980 + components: + - type: Transform + pos: -4.5,-46.5 + parent: 2 - proto: AirlockMaintJanitorLocked entities: - uid: 1025 @@ -10078,7 +10102,7 @@ entities: pos: 11.5,-30.5 parent: 2 - type: Door - secondsUntilStateChange: -245383 + secondsUntilStateChange: -254267.98 state: Opening - type: DeviceLinkSource lastSignals: @@ -10434,7 +10458,7 @@ entities: pos: 34.5,-36.5 parent: 2 - type: Door - secondsUntilStateChange: -20880.693 + secondsUntilStateChange: -29765.682 state: Opening - type: DeviceLinkSource lastSignals: @@ -11192,7 +11216,7 @@ entities: parent: 2 - type: DeviceNetwork deviceLists: - - 14458 + - 18299 - uid: 9647 components: - type: Transform @@ -11200,7 +11224,7 @@ entities: parent: 2 - type: DeviceNetwork deviceLists: - - 14458 + - 18299 - uid: 9649 components: - type: Transform @@ -11542,6 +11566,21 @@ entities: - type: DeviceNetwork deviceLists: - 14759 +- proto: AirTank + entities: + - uid: 18513 + components: + - type: Transform + pos: 46.752895,-75.3866 + parent: 2 + - type: GasTank + toggleActionEntity: 18526 + - type: ActionsContainer + - type: ContainerContainer + containers: + actions: !type:Container + ents: + - 18526 - proto: AltarConvertMaint entities: - uid: 17343 @@ -13573,10 +13612,10 @@ entities: - type: Transform pos: -5.5,-66.5 parent: 2 - - uid: 3671 + - uid: 3536 components: - type: Transform - pos: -6.5,-64.5 + pos: -6.5,-63.5 parent: 2 - uid: 4340 components: @@ -13601,12 +13640,7 @@ entities: - uid: 4802 components: - type: Transform - pos: -6.5,-62.5 - parent: 2 - - uid: 4803 - components: - - type: Transform - pos: -6.5,-63.5 + pos: -6.5,-64.5 parent: 2 - uid: 4806 components: @@ -13760,6 +13794,13 @@ entities: - type: Transform pos: 5.560184,-22.212818 parent: 2 +- proto: BoxCandle + entities: + - uid: 18884 + components: + - type: Transform + pos: -25.615393,-29.280642 + parent: 2 - proto: BoxCartridgeCap entities: - uid: 17387 @@ -13884,7 +13925,7 @@ entities: - uid: 17839 components: - type: Transform - pos: 25.531982,-90.27344 + pos: 23.591558,-90.32967 parent: 2 - uid: 18183 components: @@ -13931,7 +13972,7 @@ entities: - uid: 17791 components: - type: Transform - pos: 32.59527,-78.26717 + pos: 32.362144,-78.24512 parent: 2 - uid: 17795 components: @@ -13950,7 +13991,7 @@ entities: - uid: 17790 components: - type: Transform - pos: 33.139053,-78.4258 + pos: 32.72105,-78.39337 parent: 2 - uid: 17794 components: @@ -14021,7 +14062,7 @@ entities: - uid: 9364 components: - type: Transform - pos: 55.498257,-56.247276 + pos: 56.597763,-56.98071 parent: 2 - uid: 19673 components: @@ -14070,12 +14111,12 @@ entities: - uid: 19513 components: - type: Transform - pos: -4.324075,-47.534866 + pos: 0.73597443,-47.56734 parent: 2 - uid: 19514 components: - type: Transform - pos: -4.667825,-47.378506 + pos: 0.48597443,-47.306744 parent: 2 - proto: ButtonFrameCaution entities: @@ -42295,12 +42336,6 @@ entities: rot: -1.5707963267948966 rad pos: -1.5554351,-26.347584 parent: 2 - - uid: 4613 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 22.5,-20.5 - parent: 2 - uid: 4614 components: - type: Transform @@ -42415,6 +42450,12 @@ entities: rot: -1.5707963267948966 rad pos: 22.5,-19.5 parent: 2 + - uid: 18840 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 20.5,-19.5 + parent: 2 - uid: 19152 components: - type: Transform @@ -42650,6 +42691,11 @@ entities: rot: 3.141592653589793 rad pos: -1.5,-64.5 parent: 2 + - uid: 7692 + components: + - type: Transform + pos: -6.5,-61.5 + parent: 2 - proto: ChairXeno entities: - uid: 5085 @@ -42762,6 +42808,42 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,-78.5 parent: 2 + - uid: 18846 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -15.5,-30.5 + parent: 2 + - uid: 18847 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -15.5,-31.5 + parent: 2 + - uid: 18851 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -15.5,-32.5 + parent: 2 + - uid: 18852 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -15.5,-33.5 + parent: 2 + - uid: 18853 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -15.5,-34.5 + parent: 2 + - uid: 18867 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -15.5,-35.5 + parent: 2 - uid: 19198 components: - type: Transform @@ -43484,6 +43566,18 @@ entities: - type: Transform pos: -7.5,-51.5 parent: 2 +- proto: ClosetL3Filled + entities: + - uid: 4613 + components: + - type: Transform + pos: 3.5,-71.5 + parent: 2 + - uid: 18902 + components: + - type: Transform + pos: -2.5,-75.5 + parent: 2 - proto: ClosetL3JanitorFilled entities: - uid: 5618 @@ -43667,11 +43761,6 @@ entities: - type: Transform pos: 82.5,-20.5 parent: 2 - - uid: 17607 - components: - - type: Transform - pos: 3.5,-71.5 - parent: 2 - uid: 18250 components: - type: Transform @@ -43972,7 +44061,7 @@ entities: - uid: 8216 components: - type: Transform - pos: -41.384144,-26.542435 + pos: -41.45619,-26.591906 parent: 2 - proto: ClothingEyesHudDiagnostic entities: @@ -44005,7 +44094,7 @@ entities: - uid: 7686 components: - type: Transform - pos: 77.54572,-19.45285 + pos: 77.48632,-19.524714 parent: 2 - proto: ClothingHandsGlovesColorYellow entities: @@ -44307,6 +44396,11 @@ entities: - type: Transform pos: -12.630263,-28.354128 parent: 2 + - uid: 18339 + components: + - type: Transform + pos: -49.6526,-27.300232 + parent: 2 - proto: ClothingHeadHatWeldingMaskFlame entities: - uid: 15883 @@ -44409,7 +44503,7 @@ entities: - uid: 8217 components: - type: Transform - pos: -41.60229,-26.3552 + pos: -41.253063,-26.41991 parent: 2 - proto: ClothingMaskBee entities: @@ -44524,6 +44618,13 @@ entities: - type: Transform pos: -31.529379,-64.33237 parent: 2 +- proto: ClothingNeckCloakPan + entities: + - uid: 3532 + components: + - type: Transform + pos: 44.5,-38.5 + parent: 2 - proto: ClothingNeckCloakPirateCap entities: - uid: 17307 @@ -44543,7 +44644,7 @@ entities: - uid: 19011 components: - type: Transform - pos: -21.34203,-46.832394 + pos: -21.397709,-46.9229 parent: 2 - proto: ClothingNeckStethoscope entities: @@ -44914,13 +45015,20 @@ entities: rot: -1.5707963267948966 rad pos: 42.513027,-17.663967 parent: 2 +- proto: ClothingUniformJumpskirtSeniorOfficer + entities: + - uid: 4803 + components: + - type: Transform + pos: 9.473994,-47.657307 + parent: 2 - proto: ClothingUniformJumpskirtWeb entities: - uid: 249 components: - type: Transform rot: -1.5707963267948966 rad - pos: 68.50647,-53.550026 + pos: 67.63037,-53.474205 parent: 2 - proto: ClothingUniformJumpsuitColorGrey entities: @@ -45000,8 +45108,8 @@ entities: - uid: 7173 components: - type: Transform - rot: -1.5707965016404568 rad - pos: 68.14163,-53.268776 + rot: -1.5707963267948966 rad + pos: 67.29681,-53.30754 parent: 2 - proto: Cobweb1 entities: @@ -45696,12 +45804,45 @@ entities: - type: Transform pos: -40.5,-52.5 parent: 2 + - uid: 8861 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-67.5 + parent: 2 + - uid: 9795 + components: + - type: Transform + pos: 35.5,-71.5 + parent: 2 - uid: 17423 components: - type: Transform rot: 1.5707963267948966 rad pos: 35.5,-42.5 parent: 2 + - uid: 17836 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 68.5,-53.5 + parent: 2 + - uid: 18451 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 25.5,-90.5 + parent: 2 + - uid: 18475 + components: + - type: Transform + pos: 55.5,-56.5 + parent: 2 + - uid: 18839 + components: + - type: Transform + pos: 22.5,-20.5 + parent: 2 - proto: ContainmentFieldGenerator entities: - uid: 5784 @@ -46620,10 +46761,10 @@ entities: parent: 2 - proto: CrateLockBoxSecurity entities: - - uid: 9795 + - uid: 18636 components: - type: Transform - pos: 67.5,-43.5 + pos: 64.5,-47.5 parent: 2 - proto: CrateLockBoxService entities: @@ -46812,6 +46953,13 @@ entities: - type: Transform pos: -19.472525,-51.559082 parent: 2 +- proto: CrowbarGreen + entities: + - uid: 18494 + components: + - type: Transform + pos: 35.5,-91.5 + parent: 2 - proto: CrowbarRed entities: - uid: 5592 @@ -53576,6 +53724,18 @@ entities: - type: Transform pos: -9.316594,-6.1209764 parent: 2 +- proto: DoubleEmergencyNitrogenTankFilled + entities: + - uid: 969 + components: + - type: Transform + pos: 80.587364,-23.486897 + parent: 2 + - uid: 5684 + components: + - type: Transform + pos: -41.588768,-26.373003 + parent: 2 - proto: DoubleEmergencyOxygenTankFilled entities: - uid: 4161 @@ -53588,11 +53748,6 @@ entities: - type: Transform pos: 80.4613,-23.302551 parent: 2 - - uid: 7692 - components: - - type: Transform - pos: 80.568535,-23.507742 - parent: 2 - proto: DresserCaptainFilled entities: - uid: 15240 @@ -53836,11 +53991,6 @@ entities: - type: Transform pos: 35.546436,-45.469894 parent: 2 - - uid: 19379 - components: - - type: Transform - pos: 9.108965,-47.932705 - parent: 2 - proto: DrinkGoldenCup entities: - uid: 6760 @@ -53898,7 +54048,7 @@ entities: - uid: 3394 components: - type: Transform - pos: 46.66693,-75.508766 + pos: 45.912617,-75.52733 parent: 2 - proto: DrinkMugRainbow entities: @@ -53954,6 +54104,13 @@ entities: - type: Transform pos: -3.766451,-19.48293 parent: 2 +- proto: DrinkSugarJug + entities: + - uid: 6812 + components: + - type: Transform + pos: 8.980915,-47.69106 + parent: 2 - proto: DrinkWaterBottleFull entities: - uid: 901 @@ -53979,7 +54136,7 @@ entities: - uid: 5785 components: - type: Transform - pos: -22.248049,-44.28955 + pos: -22.758299,-44.27436 parent: 2 - uid: 14928 components: @@ -54066,12 +54223,6 @@ entities: rot: 3.141592653589793 rad pos: 48.5,-72.5 parent: 2 - - uid: 5843 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 21.5,-31.5 - parent: 2 - uid: 5875 components: - type: Transform @@ -54400,12 +54551,6 @@ entities: rot: -1.5707963267948966 rad pos: -51.5,-47.5 parent: 2 - - uid: 18299 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 44.5,-44.5 - parent: 2 - uid: 18634 components: - type: Transform @@ -54552,14 +54697,6 @@ entities: - type: Transform pos: -14.58285,-63.3528 parent: 2 -- proto: EncryptionKeyCargo - entities: - - uid: 15026 - components: - - type: Transform - parent: 6930 - - type: Physics - canCollide: False - proto: EncryptionKeyCommon entities: - uid: 6028 @@ -54569,22 +54706,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: EncryptionKeyMedical - entities: - - uid: 6927 - components: - - type: Transform - parent: 6812 - - type: Physics - canCollide: False -- proto: EncryptionKeyService - entities: - - uid: 6605 - components: - - type: Transform - parent: 6591 - - type: Physics - canCollide: False - proto: ExosuitFabricator entities: - uid: 1690 @@ -55113,6 +55234,7 @@ entities: - 16238 - 19903 - 19904 + - 6699 - type: Fixtures fixtures: {} - uid: 18593 @@ -56836,7 +56958,7 @@ entities: - type: DeviceNetwork deviceLists: - 14460 - - 14458 + - 18299 - 14459 - uid: 2157 components: @@ -57046,7 +57168,7 @@ entities: parent: 2 - type: DeviceNetwork deviceLists: - - 14458 + - 18299 - 14459 - 3897 - 9200 @@ -57057,7 +57179,7 @@ entities: parent: 2 - type: DeviceNetwork deviceLists: - - 14458 + - 18299 - 14459 - 3897 - 9200 @@ -57068,7 +57190,7 @@ entities: parent: 2 - type: DeviceNetwork deviceLists: - - 14458 + - 18299 - 14459 - 3897 - 9200 @@ -57079,7 +57201,7 @@ entities: parent: 2 - type: DeviceNetwork deviceLists: - - 14458 + - 18299 - 14459 - 3897 - 9200 @@ -57090,7 +57212,7 @@ entities: parent: 2 - type: DeviceNetwork deviceLists: - - 14458 + - 18299 - 14459 - 3897 - 9200 @@ -57101,7 +57223,7 @@ entities: parent: 2 - type: DeviceNetwork deviceLists: - - 14458 + - 18299 - 14459 - 3897 - 9200 @@ -57112,7 +57234,7 @@ entities: parent: 2 - type: DeviceNetwork deviceLists: - - 14458 + - 18299 - 14459 - 3897 - 9200 @@ -57123,7 +57245,7 @@ entities: parent: 2 - type: DeviceNetwork deviceLists: - - 14458 + - 18299 - 14459 - 3897 - 9200 @@ -57161,7 +57283,7 @@ entities: parent: 2 - type: DeviceNetwork deviceLists: - - 14458 + - 18299 - 14459 - uid: 6635 components: @@ -57170,7 +57292,7 @@ entities: parent: 2 - type: DeviceNetwork deviceLists: - - 14458 + - 18299 - 14459 - uid: 6636 components: @@ -57179,7 +57301,7 @@ entities: parent: 2 - type: DeviceNetwork deviceLists: - - 14458 + - 18299 - 14459 - uid: 6640 components: @@ -57194,6 +57316,15 @@ entities: - type: DeviceNetwork deviceLists: - 8767 + - uid: 6699 + components: + - type: Transform + pos: 69.5,-44.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 16357 + - 16356 - uid: 6976 components: - type: Transform @@ -57329,7 +57460,7 @@ entities: - type: DeviceNetwork deviceLists: - 14460 - - 14458 + - 18299 - 14459 - uid: 7954 components: @@ -60160,17 +60291,17 @@ entities: - uid: 18998 components: - type: Transform - pos: -22.623049,-44.41464 + pos: -22.318483,-44.40408 parent: 2 - uid: 18999 components: - type: Transform - pos: -22.669924,-44.25828 + pos: -22.23515,-44.251194 parent: 2 - uid: 19010 components: - type: Transform - pos: -22.544924,-44.570995 + pos: -22.517557,-44.543064 parent: 2 - proto: FoodBreadMeatXeno entities: @@ -60313,13 +60444,6 @@ entities: parent: 14704 - type: Physics canCollide: False - - uid: 19380 - components: - - type: Transform - pos: 8.877762,-47.739597 - parent: 2 - - type: Openable - opened: True - proto: FoodDonkpocketBerry entities: - uid: 6974 @@ -60670,7 +60794,7 @@ entities: - uid: 10307 components: - type: Transform - pos: 33.576553,-78.39452 + pos: 33.29152,-78.392746 parent: 2 - uid: 20022 components: @@ -61139,6 +61263,13 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 7699 + components: + - type: Transform + pos: 47.5,-77.5 + parent: 2 + - type: AtmosPipeLayers + pipeLayer: Tertiary - uid: 7839 components: - type: Transform @@ -63051,6 +63182,12 @@ entities: parent: 2 - type: AtmosPipeColor color: '#947507FF' + - uid: 18409 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 47.5,-76.5 + parent: 2 - proto: GasPipeBendAlt2 entities: - uid: 10411 @@ -63200,6 +63337,11 @@ entities: color: '#FF1212FF' - proto: GasPipeManifold entities: + - uid: 3312 + components: + - type: Transform + pos: 47.5,-78.5 + parent: 2 - uid: 10223 components: - type: Transform @@ -63216,6 +63358,12 @@ entities: parent: 2 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 18416 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 48.5,-76.5 + parent: 2 - proto: GasPipeSensorDistribution entities: - uid: 10763 @@ -63787,12 +63935,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#03FCD3FF' - - uid: 6926 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 47.5,-78.5 - parent: 2 - uid: 7167 components: - type: Transform @@ -64187,8 +64329,7 @@ entities: - uid: 8621 components: - type: Transform - rot: 3.141592653589793 rad - pos: 49.5,-75.5 + pos: 47.5,-77.5 parent: 2 - uid: 8636 components: @@ -71382,12 +71523,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#03FCD3FF' - - uid: 12879 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 49.5,-76.5 - parent: 2 - uid: 12910 components: - type: Transform @@ -75891,12 +76026,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 3312 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 47.5,-77.5 - parent: 2 - uid: 4200 components: - type: Transform @@ -77583,6 +77712,12 @@ entities: parent: 2 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 18406 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 49.5,-76.5 + parent: 2 - uid: 18419 components: - type: Transform @@ -77662,17 +77797,19 @@ entities: - type: Transform pos: -18.5,-24.5 parent: 2 - - uid: 7699 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 45.5,-77.5 - parent: 2 - uid: 12871 components: - type: Transform pos: 47.5,-75.5 parent: 2 + - uid: 12879 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 45.5,-77.5 + parent: 2 + - type: AtmosPipeLayers + pipeLayer: Tertiary - uid: 13329 components: - type: Transform @@ -77775,6 +77912,11 @@ entities: - type: Transform pos: 33.5,-63.5 parent: 2 + - uid: 7990 + components: + - type: Transform + pos: 47.5,-76.5 + parent: 2 - uid: 10655 components: - type: Transform @@ -77871,6 +78013,13 @@ entities: open: False - type: AtmosPipeColor color: '#FF1212FF' + - uid: 6926 + components: + - type: Transform + pos: 49.5,-75.5 + parent: 2 + - type: GasValve + open: False - uid: 7906 components: - type: Transform @@ -77889,12 +78038,17 @@ entities: color: '#FF1212FF' - type: GasValve open: False - - uid: 12794 +- proto: GasValveAlt1 + entities: + - uid: 18401 components: - type: Transform - rot: 3.141592653589793 rad - pos: 47.5,-76.5 + pos: 47.5,-77.5 parent: 2 + - type: GasValve + open: False +- proto: GasValveAlt2 + entities: - uid: 12884 components: - type: Transform @@ -78702,7 +78856,7 @@ entities: - type: DeviceNetwork deviceLists: - 5107 - - 12980 + - 18329 - type: AtmosPipeColor color: '#0335FCFF' - uid: 10832 @@ -78794,7 +78948,7 @@ entities: parent: 2 - type: DeviceNetwork deviceLists: - - 14458 + - 18299 - type: AtmosPipeColor color: '#0335FCFF' - uid: 14554 @@ -80030,7 +80184,7 @@ entities: - type: DeviceNetwork deviceLists: - 5107 - - 12980 + - 18329 - type: AtmosPipeColor color: '#FF1212FF' - uid: 10595 @@ -80149,7 +80303,7 @@ entities: parent: 2 - type: DeviceNetwork deviceLists: - - 14458 + - 18299 - type: AtmosPipeColor color: '#FF1212FF' - uid: 14569 @@ -80657,6 +80811,11 @@ entities: - type: Transform pos: 18.363403,-17.43988 parent: 2 + - uid: 17607 + components: + - type: Transform + pos: 12.5,-69.5 + parent: 2 - proto: GeigerCounter entities: - uid: 3819 @@ -86126,7 +86285,7 @@ entities: - uid: 13879 components: - type: Transform - pos: 57.514305,-35.453518 + pos: 57.556595,-35.46747 parent: 2 - uid: 13988 components: @@ -86140,6 +86299,16 @@ entities: - type: Transform pos: 53.64448,-99.06088 parent: 2 + - uid: 18357 + components: + - type: Transform + pos: 77.61427,-19.356634 + parent: 2 + - uid: 18358 + components: + - type: Transform + pos: 33.63159,-78.45598 + parent: 2 - proto: HandheldHealthAnalyzerUnpowered entities: - uid: 5242 @@ -86896,6 +87065,11 @@ entities: - type: Transform pos: 0.5,-46.5 parent: 2 + - uid: 18192 + components: + - type: Transform + pos: 0.5,-45.5 + parent: 2 - proto: HydroponicsTrayMachineCircuitboard entities: - uid: 5182 @@ -86949,52 +87123,38 @@ entities: rot: -1.5707963267948966 rad pos: -10.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3207 components: - type: Transform pos: 26.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4385 components: - type: Transform pos: -41.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4394 components: - type: Transform rot: 3.141592653589793 rad pos: 54.5,-25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4653 components: - type: Transform pos: 26.5,-55.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6238 components: - type: Transform rot: -1.5707963267948966 rad pos: -3.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14108 components: - type: Transform pos: -37.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: InflatableWallStack entities: - uid: 8002 @@ -87299,6 +87459,11 @@ entities: - type: Transform pos: 40.52011,-36.396408 parent: 2 + - uid: 18889 + components: + - type: Transform + pos: -22.647186,-44.417976 + parent: 2 - proto: KitchenMicrowave entities: - uid: 6805 @@ -87471,8 +87636,22 @@ entities: - uid: 5675 components: - type: Transform - pos: -21.674894,-47.12969 + pos: -21.68552,-47.277313 parent: 2 + - type: HandheldLight + toggleActionEntity: 1877 + - type: ContainerContainer + containers: + cell_slot: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + actions: !type:Container + showEnts: False + occludes: True + ents: + - 1877 + - type: ActionsContainer - uid: 9331 components: - type: Transform @@ -88256,6 +88435,11 @@ entities: - type: Transform pos: 56.648838,-18.357616 parent: 2 + - uid: 18361 + components: + - type: Transform + pos: -23.5,-92.5 + parent: 2 - proto: MachineAnomalyGenerator entities: - uid: 583 @@ -88390,18 +88574,6 @@ entities: - type: Transform pos: 69.312454,-32.493797 parent: 2 -- proto: MagazinePistolSubMachineGunTopMounted - entities: - - uid: 3532 - components: - - type: Transform - pos: 64.45614,-50.54994 - parent: 2 - - uid: 3536 - components: - - type: Transform - pos: 64.62281,-50.643757 - parent: 2 - proto: MailBag entities: - uid: 3843 @@ -88527,7 +88699,7 @@ entities: - uid: 18996 components: - type: Transform - pos: -21.27906,-47.504948 + pos: -25.334143,-29.509966 parent: 2 - proto: MatchstickSpent entities: @@ -88872,7 +89044,7 @@ entities: - uid: 17358 components: - type: Transform - pos: -32.45135,-29.305899 + pos: -33.9196,-29.568325 parent: 2 - uid: 19739 components: @@ -89118,7 +89290,7 @@ entities: - uid: 8339 components: - type: Transform - pos: -49.51708,-27.465076 + pos: -49.381767,-27.529047 parent: 2 - proto: NitrogenCanister entities: @@ -89201,6 +89373,13 @@ entities: - type: Transform pos: 43.5,-73.5 parent: 2 +- proto: NitrousOxideTank + entities: + - uid: 18511 + components: + - type: Transform + pos: 46.5314,-75.36489 + parent: 2 - proto: NitrousOxideTankFilled entities: - uid: 6652 @@ -89399,6 +89578,16 @@ entities: - type: Transform pos: 45.417492,-75.34028 parent: 2 +- proto: PaintingNightHawks + entities: + - uid: 18784 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,-60.5 + parent: 2 + - type: Fixtures + fixtures: {} - proto: PaintingRedBlueYellow entities: - uid: 5015 @@ -89510,11 +89699,6 @@ entities: - type: Transform pos: 23.406704,-90.19731 parent: 2 - - uid: 17836 - components: - - type: Transform - pos: 23.552538,-90.35367 - parent: 2 - uid: 17837 components: - type: Transform @@ -89635,6 +89819,23 @@ entities: - type: Transform pos: -1.9558083,-63.42666 parent: 2 +- proto: PaperOffice + entities: + - uid: 6930 + components: + - type: Transform + pos: -6.4573073,-62.250538 + parent: 2 + - uid: 18177 + components: + - type: Transform + pos: -6.313114,-62.49587 + parent: 2 + - uid: 18178 + components: + - type: Transform + pos: -6.3837967,-62.36824 + parent: 2 - proto: PaperScrap entities: - uid: 6071 @@ -89788,6 +89989,11 @@ entities: - type: Transform pos: 23.399412,-90.41783 parent: 2 + - uid: 18185 + components: + - type: Transform + pos: -6.686571,-62.51079 + parent: 2 - uid: 19182 components: - type: Transform @@ -89887,240 +90093,176 @@ entities: rot: 3.141592653589793 rad pos: 61.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3780 components: - type: Transform rot: 3.141592653589793 rad pos: 58.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4704 components: - type: Transform pos: 45.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4723 components: - type: Transform pos: 46.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4724 components: - type: Transform rot: 3.141592653589793 rad pos: -59.5,-66.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4921 components: - type: Transform pos: 48.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4923 components: - type: Transform pos: 44.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4924 components: - type: Transform pos: 42.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4927 components: - type: Transform pos: 47.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5073 components: - type: Transform rot: 3.141592653589793 rad pos: -58.5,-66.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5074 components: - type: Transform rot: 3.141592653589793 rad pos: -57.5,-66.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5146 components: - type: Transform pos: 43.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5183 components: - type: Transform rot: 3.141592653589793 rad pos: -56.5,-66.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5691 components: - type: Transform pos: 54.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5692 components: - type: Transform pos: 55.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5976 components: - type: Transform rot: -1.5707963267948966 rad pos: -61.5,-63.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9585 components: - type: Transform rot: 3.141592653589793 rad pos: 6.5,-77.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11612 components: - type: Transform rot: 3.141592653589793 rad pos: 89.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11723 components: - type: Transform pos: 56.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11755 components: - type: Transform pos: 89.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14000 components: - type: Transform pos: 51.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14001 components: - type: Transform pos: 52.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14002 components: - type: Transform pos: 50.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14003 components: - type: Transform pos: 53.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14004 components: - type: Transform pos: 49.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15212 components: - type: Transform rot: -1.5707963267948966 rad pos: 81.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15233 components: - type: Transform rot: -1.5707963267948966 rad pos: 81.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15238 components: - type: Transform rot: 1.5707963267948966 rad pos: 79.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15239 components: - type: Transform rot: 1.5707963267948966 rad pos: 79.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16336 components: - type: Transform rot: 1.5707963267948966 rad pos: -62.5,-61.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16337 components: - type: Transform rot: -1.5707963267948966 rad pos: -60.5,-63.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16338 components: - type: Transform rot: -1.5707963267948966 rad pos: -59.5,-61.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: PlasmaTank entities: - uid: 7689 @@ -90148,43 +90290,31 @@ entities: - type: Transform pos: 34.5,-61.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19302 components: - type: Transform pos: 36.5,-61.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19303 components: - type: Transform pos: 38.5,-61.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19304 components: - type: Transform pos: 40.5,-61.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19305 components: - type: Transform pos: 42.5,-61.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19306 components: - type: Transform pos: 44.5,-61.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: PlasmaWindoorSecureChemistryLocked entities: - uid: 6282 @@ -90193,24 +90323,18 @@ entities: rot: 3.141592653589793 rad pos: 18.5,-76.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6283 components: - type: Transform rot: 3.141592653589793 rad pos: 19.5,-76.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6284 components: - type: Transform rot: 3.141592653589793 rad pos: 20.5,-76.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: PlasmaWindoorSecureCommandLocked entities: - uid: 529 @@ -90219,90 +90343,66 @@ entities: rot: 3.141592653589793 rad pos: 81.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2896 components: - type: Transform rot: 1.5707963267948966 rad pos: -37.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5609 components: - type: Transform pos: -44.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5611 components: - type: Transform pos: -45.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7139 components: - type: Transform rot: 3.141592653589793 rad pos: 80.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7540 components: - type: Transform pos: 80.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7564 components: - type: Transform pos: 81.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7606 components: - type: Transform rot: 1.5707963267948966 rad pos: 92.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10491 components: - type: Transform pos: 78.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15816 components: - type: Transform rot: 3.141592653589793 rad pos: 78.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17594 components: - type: Transform rot: 3.141592653589793 rad pos: 79.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17633 components: - type: Transform pos: 79.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: PlasmaWindoorSecureEngineeringLocked entities: - uid: 356 @@ -90311,40 +90411,30 @@ entities: rot: 3.141592653589793 rad pos: -31.5,-74.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10831 components: - type: Transform rot: 1.5707963267948966 rad pos: 94.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10833 components: - type: Transform rot: -1.5707963267948966 rad pos: 96.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11467 components: - type: Transform rot: 1.5707963267948966 rad pos: 88.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17096 components: - type: Transform rot: 3.141592653589793 rad pos: -32.5,-74.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: PlasmaWindoorSecureScienceLocked entities: - uid: 11364 @@ -90352,15 +90442,11 @@ entities: - type: Transform pos: -7.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13975 components: - type: Transform pos: -6.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: PlasmaWindoorSecureSecurityLocked entities: - uid: 2724 @@ -90369,40 +90455,30 @@ entities: rot: 3.141592653589793 rad pos: 60.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3065 components: - type: Transform rot: 3.141592653589793 rad pos: 59.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4742 components: - type: Transform rot: -1.5707963267948966 rad pos: 57.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6143 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,-49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18316 components: - type: Transform rot: -1.5707963267948966 rad pos: 62.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: PlasticFlapsAirtightClear entities: - uid: 3692 @@ -90642,13 +90718,23 @@ entities: - uid: 7585 components: - type: Transform + anchored: False pos: 57.5,-31.5 parent: 2 + - type: TriggerOnProximity + enabled: False + - type: Physics + bodyType: Dynamic - uid: 9196 components: - type: Transform + anchored: False pos: 63.5,-36.5 parent: 2 + - type: TriggerOnProximity + enabled: False + - type: Physics + bodyType: Dynamic - proto: PortableGeneratorJrPacman entities: - uid: 8372 @@ -91131,13 +91217,6 @@ entities: parent: 2 - type: Fixtures fixtures: {} - - uid: 19219 - components: - - type: Transform - pos: -6.5,-60.5 - parent: 2 - - type: Fixtures - fixtures: {} - uid: 19316 components: - type: Transform @@ -91382,6 +91461,15 @@ entities: parent: 2 - type: Fixtures fixtures: {} +- proto: PosterLegitNTTGC + entities: + - uid: 18190 + components: + - type: Transform + pos: -1.5,-60.5 + parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitObey entities: - uid: 7159 @@ -91754,6 +91842,11 @@ entities: - type: Transform pos: 65.5,-31.5 parent: 2 + - uid: 977 + components: + - type: Transform + pos: -32.5,-29.5 + parent: 2 - uid: 1879 components: - type: Transform @@ -91786,6 +91879,11 @@ entities: rot: 3.141592653589793 rad pos: -11.5,-18.5 parent: 2 + - uid: 18330 + components: + - type: Transform + pos: 28.5,-13.5 + parent: 2 - uid: 18523 components: - type: Transform @@ -91984,6 +92082,12 @@ entities: rot: 1.5707963267948966 rad pos: 17.5,-70.5 parent: 2 + - uid: 5213 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 21.5,-31.5 + parent: 2 - uid: 5298 components: - type: Transform @@ -92789,6 +92893,16 @@ entities: rot: 1.5707963267948966 rad pos: -35.5,-15.5 parent: 2 + - uid: 18144 + components: + - type: Transform + pos: 33.5,-52.5 + parent: 2 + - uid: 18146 + components: + - type: Transform + pos: 50.5,-43.5 + parent: 2 - uid: 18147 components: - type: Transform @@ -92806,12 +92920,36 @@ entities: rot: 1.5707963267948966 rad pos: -25.5,-25.5 parent: 2 + - uid: 18152 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -14.5,-41.5 + parent: 2 + - uid: 18153 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 36.5,-20.5 + parent: 2 - uid: 18155 components: - type: Transform rot: 3.141592653589793 rad pos: -25.5,-58.5 parent: 2 + - uid: 18156 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 70.5,-24.5 + parent: 2 + - uid: 18157 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 17.5,-22.5 + parent: 2 - uid: 18179 components: - type: Transform @@ -93306,11 +93444,6 @@ entities: - type: Transform pos: -32.5,-48.5 parent: 2 - - uid: 5684 - components: - - type: Transform - pos: -6.5,-61.5 - parent: 2 - uid: 5685 components: - type: Transform @@ -93798,6 +93931,28 @@ entities: rot: -1.5707963267948966 rad pos: -44.5,-37.5 parent: 2 + - uid: 18176 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 9.5,-23.5 + parent: 2 + - uid: 18252 + components: + - type: Transform + pos: -7.5,-61.5 + parent: 2 + - uid: 18692 + components: + - type: Transform + pos: 67.5,-43.5 + parent: 2 + - uid: 18802 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 13.5,-49.5 + parent: 2 - uid: 19273 components: - type: Transform @@ -95816,582 +95971,418 @@ entities: - type: Transform pos: -23.5,-32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 191 components: - type: Transform pos: -23.5,-31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 192 components: - type: Transform pos: -21.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 211 components: - type: Transform pos: -18.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 213 components: - type: Transform pos: -18.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 214 components: - type: Transform pos: -17.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 223 components: - type: Transform pos: 52.5,-60.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 231 components: - type: Transform pos: -21.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 238 components: - type: Transform pos: -22.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 317 components: - type: Transform pos: -20.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 804 components: - type: Transform pos: -21.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 808 components: - type: Transform pos: -17.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 809 components: - type: Transform pos: -23.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 936 components: - type: Transform pos: -18.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1134 components: - type: Transform pos: -23.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1135 components: - type: Transform pos: -22.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1136 components: - type: Transform pos: -22.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1415 components: - type: Transform pos: -17.5,-31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2617 components: - type: Transform pos: -20.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3546 components: - type: Transform pos: 58.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3590 components: - type: Transform pos: -24.5,-72.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3591 components: - type: Transform pos: -23.5,-72.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3600 components: - type: Transform pos: -21.5,-72.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3635 components: - type: Transform pos: -22.5,-72.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3950 components: - type: Transform pos: 61.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4422 components: - type: Transform pos: -20.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4423 components: - type: Transform pos: -23.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4546 components: - type: Transform pos: -22.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4547 components: - type: Transform pos: -21.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4548 components: - type: Transform pos: -20.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4549 components: - type: Transform pos: -20.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4550 components: - type: Transform pos: -20.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4741 components: - type: Transform pos: -18.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4743 components: - type: Transform pos: -18.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4745 components: - type: Transform pos: -18.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4747 components: - type: Transform pos: -17.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4749 components: - type: Transform pos: -17.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6248 components: - type: Transform pos: 17.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6644 components: - type: Transform pos: 8.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6902 components: - type: Transform pos: 19.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7066 components: - type: Transform pos: 6.5,-48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7099 components: - type: Transform pos: 20.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7413 components: - type: Transform rot: -1.5707963267948966 rad pos: 53.5,-64.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7660 components: - type: Transform pos: 6.5,-50.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7933 components: - type: Transform pos: 9.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8192 components: - type: Transform pos: 51.5,-60.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10766 components: - type: Transform rot: 1.5707963267948966 rad pos: 92.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10792 components: - type: Transform rot: 1.5707963267948966 rad pos: 91.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10823 components: - type: Transform rot: 1.5707963267948966 rad pos: 92.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10826 components: - type: Transform rot: 1.5707963267948966 rad pos: 91.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11401 components: - type: Transform pos: -25.5,-72.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11403 components: - type: Transform pos: 16.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12796 components: - type: Transform rot: 1.5707963267948966 rad pos: 49.5,-64.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13803 components: - type: Transform pos: 51.5,-64.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13942 components: - type: Transform pos: 15.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14024 components: - type: Transform pos: 20.5,-41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14053 components: - type: Transform pos: 14.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14151 components: - type: Transform pos: 27.5,-64.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14222 components: - type: Transform pos: 54.5,-63.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14223 components: - type: Transform pos: 53.5,-60.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14241 components: - type: Transform pos: 18.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14435 components: - type: Transform pos: 14.5,-41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14436 components: - type: Transform pos: 20.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14437 components: - type: Transform pos: 18.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15237 components: - type: Transform rot: 3.141592653589793 rad pos: 52.5,-64.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16052 components: - type: Transform pos: 20.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16097 components: - type: Transform pos: 17.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16170 components: - type: Transform pos: 14.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16466 components: - type: Transform pos: -17.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16521 components: - type: Transform pos: 15.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16875 components: - type: Transform pos: 20.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17373 components: - type: Transform pos: -17.5,-32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17968 components: - type: Transform pos: 14.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18328 components: - type: Transform pos: 44.5,-62.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18331 components: - type: Transform pos: 62.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18367 components: - type: Transform pos: 34.5,-62.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18368 components: - type: Transform pos: 42.5,-62.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18527 components: - type: Transform pos: 40.5,-62.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18528 components: - type: Transform pos: 38.5,-62.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18553 components: - type: Transform pos: 36.5,-62.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19070 components: - type: Transform pos: 19.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19569 components: - type: Transform pos: 16.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: ReinforcedPlasmaWindowDiagonal entities: - uid: 1731 @@ -96400,39 +96391,29 @@ entities: rot: 3.141592653589793 rad pos: 20.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6916 components: - type: Transform rot: -1.5707963267948966 rad pos: 20.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14034 components: - type: Transform pos: 14.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14035 components: - type: Transform rot: 1.5707963267948966 rad pos: 14.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15251 components: - type: Transform rot: 1.5707963267948966 rad pos: 48.5,-64.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: ReinforcedUraniumWindow entities: - uid: 7264 @@ -96440,106 +96421,76 @@ entities: - type: Transform pos: 19.5,-41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8016 components: - type: Transform pos: 16.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10446 components: - type: Transform pos: 19.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10447 components: - type: Transform pos: 19.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10774 components: - type: Transform pos: 19.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11402 components: - type: Transform pos: 15.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13274 components: - type: Transform pos: 17.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13452 components: - type: Transform pos: 16.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13978 components: - type: Transform pos: 18.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14005 components: - type: Transform pos: 18.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14025 components: - type: Transform pos: 17.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14029 components: - type: Transform pos: 19.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14047 components: - type: Transform pos: 15.5,-41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15698 components: - type: Transform pos: 15.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17173 components: - type: Transform pos: 15.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: ReinforcedWindow entities: - uid: 79 @@ -96547,1297 +96498,927 @@ entities: - type: Transform pos: 0.5,-0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 80 components: - type: Transform pos: -0.5,-0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 81 components: - type: Transform pos: 1.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 82 components: - type: Transform pos: 2.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 83 components: - type: Transform pos: 3.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 149 components: - type: Transform pos: -5.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 150 components: - type: Transform pos: -5.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 151 components: - type: Transform pos: -5.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 152 components: - type: Transform pos: -5.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 166 components: - type: Transform pos: 64.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 258 components: - type: Transform pos: -4.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 322 components: - type: Transform pos: 3.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 324 components: - type: Transform pos: 3.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 326 components: - type: Transform pos: 28.5,-100.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 328 components: - type: Transform pos: 11.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 329 components: - type: Transform pos: 8.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 330 components: - type: Transform pos: 8.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 331 components: - type: Transform pos: 8.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 332 components: - type: Transform pos: 9.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 333 components: - type: Transform pos: 10.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 336 components: - type: Transform pos: 7.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 338 components: - type: Transform pos: 11.5,-32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 353 components: - type: Transform pos: 11.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 460 components: - type: Transform pos: 9.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 946 components: - type: Transform pos: 2.5,-49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 947 components: - type: Transform pos: 2.5,-50.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 993 components: - type: Transform pos: -5.5,-52.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 994 components: - type: Transform pos: -3.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 995 components: - type: Transform pos: -3.5,-52.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1033 components: - type: Transform pos: 1.5,-0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1164 components: - type: Transform pos: -26.5,-68.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1465 components: - type: Transform pos: -40.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1466 components: - type: Transform pos: -39.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1467 components: - type: Transform pos: -38.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1829 components: - type: Transform pos: 3.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1839 components: - type: Transform pos: 64.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1840 components: - type: Transform pos: 24.5,-88.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2226 components: - type: Transform pos: 12.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2288 components: - type: Transform pos: 12.5,-56.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2326 components: - type: Transform pos: -2.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2327 components: - type: Transform pos: -1.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2589 components: - type: Transform pos: 7.5,-96.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2590 components: - type: Transform pos: 7.5,-97.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2591 components: - type: Transform pos: 8.5,-97.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2592 components: - type: Transform pos: 8.5,-98.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2593 components: - type: Transform pos: 9.5,-98.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2594 components: - type: Transform pos: 9.5,-99.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2595 components: - type: Transform pos: 10.5,-99.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2596 components: - type: Transform pos: 16.5,-97.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2597 components: - type: Transform pos: 16.5,-94.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2598 components: - type: Transform pos: 15.5,-91.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2599 components: - type: Transform pos: 8.5,-91.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2600 components: - type: Transform pos: 11.5,-89.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2601 components: - type: Transform pos: 11.5,-88.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2602 components: - type: Transform pos: 11.5,-87.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2603 components: - type: Transform pos: 13.5,-87.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2604 components: - type: Transform pos: 13.5,-89.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2605 components: - type: Transform pos: 13.5,-88.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2606 components: - type: Transform pos: 12.5,-85.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2608 components: - type: Transform pos: 7.5,-87.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2609 components: - type: Transform pos: 7.5,-88.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2610 components: - type: Transform pos: 7.5,-89.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2655 components: - type: Transform pos: -14.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2662 components: - type: Transform pos: -29.5,-64.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2875 components: - type: Transform pos: 25.5,-86.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2876 components: - type: Transform pos: 24.5,-86.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2877 components: - type: Transform pos: 23.5,-86.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2892 components: - type: Transform pos: -30.5,-65.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2897 components: - type: Transform pos: -22.5,-65.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2902 components: - type: Transform pos: -23.5,-65.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2903 components: - type: Transform pos: 20.5,-101.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2904 components: - type: Transform pos: 20.5,-102.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2905 components: - type: Transform pos: -24.5,-65.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2907 components: - type: Transform pos: 22.5,-102.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2908 components: - type: Transform pos: -29.5,-63.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2909 components: - type: Transform pos: 26.5,-101.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2910 components: - type: Transform pos: 26.5,-102.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2911 components: - type: Transform pos: -27.5,-61.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2913 components: - type: Transform pos: 28.5,-102.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2914 components: - type: Transform pos: 28.5,-101.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2915 components: - type: Transform pos: 32.5,-100.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2916 components: - type: Transform pos: 32.5,-97.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2918 components: - type: Transform pos: 36.5,-100.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2939 components: - type: Transform pos: 22.5,-80.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2940 components: - type: Transform pos: 26.5,-80.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3008 components: - type: Transform pos: -29.5,-65.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3030 components: - type: Transform pos: 60.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3071 components: - type: Transform pos: 60.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3172 components: - type: Transform pos: 3.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3328 components: - type: Transform pos: -20.5,-69.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3399 components: - type: Transform pos: 67.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3489 components: - type: Transform pos: 10.5,-56.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3520 components: - type: Transform pos: 57.5,-25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3571 components: - type: Transform pos: 55.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3655 components: - type: Transform pos: -31.5,-65.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3958 components: - type: Transform pos: -17.5,-62.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4014 components: - type: Transform pos: 10.5,-55.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4205 components: - type: Transform pos: -40.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4211 components: - type: Transform pos: -39.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4303 components: - type: Transform pos: -38.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4396 components: - type: Transform pos: -40.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4411 components: - type: Transform pos: -38.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4511 components: - type: Transform pos: -41.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4540 components: - type: Transform pos: -41.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4551 components: - type: Transform pos: 3.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4553 components: - type: Transform pos: -3.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4814 components: - type: Transform pos: 59.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4876 components: - type: Transform pos: 59.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5144 components: - type: Transform pos: 11.5,-31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5215 components: - type: Transform pos: 14.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5231 components: - type: Transform pos: 15.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5257 components: - type: Transform pos: 5.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5260 components: - type: Transform pos: 6.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5261 components: - type: Transform pos: 7.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5429 components: - type: Transform pos: 58.5,-25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6095 components: - type: Transform pos: 64.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6671 components: - type: Transform pos: -10.5,-41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6857 components: - type: Transform pos: 36.5,-97.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6859 components: - type: Transform pos: 51.5,-95.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6866 components: - type: Transform pos: 52.5,-95.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6891 components: - type: Transform pos: 50.5,-95.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6951 components: - type: Transform pos: 22.5,-101.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6952 components: - type: Transform pos: 20.5,-100.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7040 components: - type: Transform rot: 1.5707963267948966 rad pos: 60.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7154 components: - type: Transform pos: 60.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7158 components: - type: Transform pos: -9.5,-41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7160 components: - type: Transform pos: 59.5,-25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7213 components: - type: Transform pos: 64.5,-49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7230 components: - type: Transform pos: 66.5,-49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7234 components: - type: Transform pos: -6.5,-41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7260 components: - type: Transform pos: -8.5,-41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7309 components: - type: Transform pos: 61.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7748 components: - type: Transform pos: 56.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8080 components: - type: Transform pos: 10.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8145 components: - type: Transform pos: 10.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9893 components: - type: Transform pos: 63.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9898 components: - type: Transform pos: 56.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10276 components: - type: Transform pos: 67.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10654 components: - type: Transform pos: 3.5,-48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10820 components: - type: Transform pos: 4.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10821 components: - type: Transform pos: 4.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13192 components: - type: Transform pos: 22.5,-87.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13196 components: - type: Transform pos: 24.5,-10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14007 components: - type: Transform pos: 25.5,-88.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14011 components: - type: Transform pos: 26.5,-41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14012 components: - type: Transform pos: 26.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14014 components: - type: Transform pos: 26.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14018 components: - type: Transform pos: 26.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14037 components: - type: Transform pos: -40.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14039 components: - type: Transform pos: -30.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14041 components: - type: Transform pos: -30.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14048 components: - type: Transform pos: -30.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14054 components: - type: Transform pos: 26.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14057 components: - type: Transform pos: 27.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14074 components: - type: Transform pos: -32.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14075 components: - type: Transform pos: -32.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14076 components: - type: Transform pos: -32.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14077 components: - type: Transform pos: -40.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14078 components: - type: Transform pos: -38.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14080 components: - type: Transform pos: -40.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14085 components: - type: Transform pos: -36.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14087 components: - type: Transform pos: -36.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14088 components: - type: Transform pos: -38.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14092 components: - type: Transform pos: -36.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14095 components: - type: Transform pos: -38.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14117 components: - type: Transform pos: -39.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14129 components: - type: Transform pos: -41.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14359 components: - type: Transform pos: 64.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15027 components: - type: Transform pos: 26.5,-88.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15329 components: - type: Transform pos: 10.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15376 components: - type: Transform pos: 26.5,-87.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15379 components: - type: Transform pos: 26.5,-86.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15406 components: - type: Transform pos: 61.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16349 components: - type: Transform pos: 4.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16383 components: - type: Transform pos: 22.5,-88.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16385 components: - type: Transform pos: 22.5,-86.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17780 components: - type: Transform pos: 58.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17825 components: - type: Transform pos: 23.5,-88.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18402 components: - type: Transform pos: 24.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18540 components: - type: Transform pos: 10.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18541 components: - type: Transform pos: 7.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19261 components: - type: Transform pos: -27.5,-60.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19726 components: - type: Transform pos: 57.5,-98.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19727 components: - type: Transform pos: 57.5,-99.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19728 components: - type: Transform pos: 57.5,-100.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: RemoteSignaller entities: - uid: 8033 @@ -98234,7 +97815,7 @@ entities: - uid: 7104 components: - type: Transform - pos: 67.39479,-53.358547 + pos: 67.43503,-51.29747 parent: 2 - proto: SeedExtractor entities: @@ -98677,65 +98258,47 @@ entities: rot: 1.5707963267948966 rad pos: -30.5,-24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 696 components: - type: Transform pos: -11.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 697 components: - type: Transform pos: -11.5,-52.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 698 components: - type: Transform pos: -11.5,-53.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1077 components: - type: Transform pos: -10.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1216 components: - type: Transform pos: 9.5,-74.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3189 components: - type: Transform pos: -11.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6040 components: - type: Transform rot: 1.5707963267948966 rad pos: -30.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15886 components: - type: Transform pos: 8.5,-74.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: ShuttersNormalOpen entities: - uid: 4973 @@ -98743,202 +98306,146 @@ entities: - type: Transform pos: 22.5,-88.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5539 components: - type: Transform pos: 64.5,-49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5666 components: - type: Transform pos: 66.5,-49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6208 components: - type: Transform rot: -1.5707963267948966 rad pos: 12.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6210 components: - type: Transform rot: -1.5707963267948966 rad pos: 12.5,-56.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6600 components: - type: Transform rot: 1.5707963267948966 rad pos: -27.5,-60.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6601 components: - type: Transform rot: 1.5707963267948966 rad pos: -27.5,-61.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6937 components: - type: Transform pos: 25.5,-88.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6938 components: - type: Transform pos: 26.5,-87.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7717 components: - type: Transform pos: 26.5,-88.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7719 components: - type: Transform pos: 24.5,-86.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7720 components: - type: Transform pos: 25.5,-86.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7721 components: - type: Transform pos: 26.5,-86.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7772 components: - type: Transform pos: 22.5,-87.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7773 components: - type: Transform pos: 22.5,-86.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7809 components: - type: Transform pos: 23.5,-86.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8852 components: - type: Transform pos: -20.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8853 components: - type: Transform pos: -20.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8854 components: - type: Transform pos: -20.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8855 components: - type: Transform pos: -22.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9960 components: - type: Transform pos: -29.5,-64.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10024 components: - type: Transform pos: -29.5,-65.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10203 components: - type: Transform pos: -29.5,-63.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15102 components: - type: Transform pos: -30.5,-65.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15103 components: - type: Transform pos: -31.5,-65.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17741 components: - type: Transform rot: -1.5707963267948966 rad pos: 12.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17826 components: - type: Transform pos: 24.5,-88.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17827 components: - type: Transform pos: 23.5,-88.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: ShuttersRadiationOpen entities: - uid: 10890 @@ -98946,43 +98453,31 @@ entities: - type: Transform pos: -29.5,-71.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13335 components: - type: Transform pos: -27.5,-71.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15229 components: - type: Transform pos: -19.5,-71.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15231 components: - type: Transform pos: -28.5,-71.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15232 components: - type: Transform pos: -18.5,-71.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18213 components: - type: Transform pos: -17.5,-71.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: ShuttersWindow entities: - uid: 4938 @@ -98991,64 +98486,48 @@ entities: rot: -1.5707963267948966 rad pos: 36.5,-86.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4939 components: - type: Transform rot: -1.5707963267948966 rad pos: 36.5,-85.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4940 components: - type: Transform rot: -1.5707963267948966 rad pos: 36.5,-84.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4941 components: - type: Transform rot: -1.5707963267948966 rad pos: 36.5,-83.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4942 components: - type: Transform rot: 1.5707963267948966 rad pos: 38.5,-85.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4943 components: - type: Transform rot: 1.5707963267948966 rad pos: 38.5,-86.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4944 components: - type: Transform rot: 1.5707963267948966 rad pos: 38.5,-84.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4945 components: - type: Transform rot: 1.5707963267948966 rad pos: 38.5,-83.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: ShuttersWindowOpen entities: - uid: 17740 @@ -99057,8 +98536,6 @@ entities: rot: -1.5707963267948966 rad pos: 12.5,-59.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: ShuttleGunKineticOld entities: - uid: 6224 @@ -99104,106 +98581,76 @@ entities: - type: Transform pos: -2.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 94 components: - type: Transform pos: -3.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 95 components: - type: Transform pos: 3.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 138 components: - type: Transform pos: -10.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 139 components: - type: Transform pos: -10.5,0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 140 components: - type: Transform pos: -10.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 141 components: - type: Transform pos: -10.5,-2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 142 components: - type: Transform pos: -10.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 143 components: - type: Transform pos: -10.5,-0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 144 components: - type: Transform pos: -10.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 145 components: - type: Transform pos: -10.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 146 components: - type: Transform pos: -10.5,-6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 288 components: - type: Transform pos: 2.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4641 components: - type: Transform pos: 4.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16319 components: - type: Transform pos: 1.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: SignAi entities: - uid: 793 @@ -100240,6 +99687,30 @@ entities: parent: 2 - type: Fixtures fixtures: {} +- proto: SignArrivals + entities: + - uid: 10243 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-8.5 + parent: 2 + - type: Fixtures + fixtures: {} + - uid: 18264 + components: + - type: Transform + pos: 0.5,3.5 + parent: 2 + - type: Fixtures + fixtures: {} + - uid: 18281 + components: + - type: Transform + pos: 5.5,3.5 + parent: 2 + - type: Fixtures + fixtures: {} - proto: SignAtmos entities: - uid: 8652 @@ -100870,14 +100341,6 @@ entities: parent: 2 - type: Fixtures fixtures: {} - - uid: 5213 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5015326,-8.71623 - parent: 2 - - type: Fixtures - fixtures: {} - uid: 7888 components: - type: Transform @@ -103610,6 +103073,13 @@ entities: - type: Transform pos: 70.5,-53.5 parent: 2 +- proto: SpawnPointHeadOfSecurityWeapon + entities: + - uid: 15026 + components: + - type: Transform + pos: 64.5,-50.5 + parent: 2 - proto: SpawnPointJanitor entities: - uid: 17085 @@ -103702,6 +103172,11 @@ entities: parent: 2 - proto: SpawnPointMedicalIntern entities: + - uid: 3456 + components: + - type: Transform + pos: 20.5,-19.5 + parent: 2 - uid: 7278 components: - type: Transform @@ -103712,11 +103187,6 @@ entities: - type: Transform pos: 20.5,-20.5 parent: 2 - - uid: 8861 - components: - - type: Transform - pos: 22.5,-20.5 - parent: 2 - proto: SpawnPointMime entities: - uid: 15310 @@ -103961,6 +103431,13 @@ entities: - type: Transform pos: 54.5,-37.5 parent: 2 +- proto: SpawnPointWardenWeapon + entities: + - uid: 6927 + components: + - type: Transform + pos: 54.5,-37.5 + parent: 2 - proto: SpawnVendingMachineRestockFoodDrink entities: - uid: 8340 @@ -104286,6 +103763,13 @@ entities: - type: Transform pos: 27.420341,-61.6539 parent: 2 +- proto: StationAiFixerComputer + entities: + - uid: 18306 + components: + - type: Transform + pos: -22.5,-20.5 + parent: 2 - proto: StationAiUploadComputer entities: - uid: 15546 @@ -105067,6 +104551,14 @@ entities: - SurveillanceCameraCommand nameSet: True id: Bridge, Northwest + - uid: 18769 + components: + - type: MetaData + name: AI Upload Entrance + - type: Transform + rot: -1.5707963267948966 rad + pos: 75.5,-45.5 + parent: 2 - uid: 18872 components: - type: Transform @@ -105109,17 +104601,6 @@ entities: - SurveillanceCameraCommand nameSet: True id: AI Core, East Outside - - uid: 18884 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 76.5,-44.5 - parent: 2 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraCommand - nameSet: True - id: AI Upload Entrance - uid: 19040 components: - type: Transform @@ -107090,6 +106571,11 @@ entities: - type: Transform pos: -0.5,-57.5 parent: 2 + - uid: 12794 + components: + - type: Transform + pos: 22.5,-20.5 + parent: 2 - uid: 13860 components: - type: Transform @@ -107339,6 +106825,11 @@ entities: - type: Transform pos: 0.5,-66.5 parent: 2 + - uid: 3671 + components: + - type: Transform + pos: -6.5,-62.5 + parent: 2 - uid: 4341 components: - type: Transform @@ -107647,11 +107138,6 @@ entities: - type: Transform pos: 32.5,-91.5 parent: 2 - - uid: 1877 - components: - - type: Transform - pos: 68.5,-53.5 - parent: 2 - uid: 2331 components: - type: Transform @@ -107849,11 +107335,6 @@ entities: - type: Transform pos: 13.5,-63.5 parent: 2 - - uid: 6699 - components: - - type: Transform - pos: 25.5,-90.5 - parent: 2 - uid: 6700 components: - type: Transform @@ -108122,11 +107603,6 @@ entities: rot: -1.5707963267948966 rad pos: 36.5,-51.5 parent: 2 - - uid: 3456 - components: - - type: Transform - pos: 55.5,-56.5 - parent: 2 - uid: 4352 components: - type: Transform @@ -108684,68 +108160,6 @@ entities: parent: 2 - type: PointLight color: '#FF3300FF' -- proto: TelecomServer - entities: - - uid: 6591 - components: - - type: Transform - pos: 19.5,-60.5 - parent: 2 - - type: ContainerContainer - containers: - key_slots: !type:Container - showEnts: False - occludes: True - ents: - - 6605 - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - - uid: 6812 - components: - - type: Transform - pos: 7.5,-25.5 - parent: 2 - - type: ContainerContainer - containers: - key_slots: !type:Container - showEnts: False - occludes: True - ents: - - 6927 - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - - uid: 6930 - components: - - type: Transform - pos: 33.5,-94.5 - parent: 2 - - type: ContainerContainer - containers: - key_slots: !type:Container - showEnts: False - occludes: True - ents: - - 15026 - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - proto: TelecomServerCircuitboard entities: - uid: 18310 @@ -108753,6 +108167,13 @@ entities: - type: Transform pos: 27.46202,-60.6176 parent: 2 +- proto: TelecomServerFilledCargo + entities: + - uid: 5843 + components: + - type: Transform + pos: 33.5,-94.5 + parent: 2 - proto: TelecomServerFilledCommand entities: - uid: 15384 @@ -108774,6 +108195,13 @@ entities: - type: Transform pos: -11.5,-72.5 parent: 2 +- proto: TelecomServerFilledMedical + entities: + - uid: 6591 + components: + - type: Transform + pos: 7.5,-25.5 + parent: 2 - proto: TelecomServerFilledScience entities: - uid: 17868 @@ -108788,6 +108216,13 @@ entities: - type: Transform pos: 53.5,-28.5 parent: 2 +- proto: TelecomServerFilledService + entities: + - uid: 6605 + components: + - type: Transform + pos: 19.5,-60.5 + parent: 2 - proto: TeslaCoil entities: - uid: 17287 @@ -108904,8 +108339,6 @@ entities: - type: Transform pos: 51.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: ToiletEmpty entities: - uid: 6200 @@ -109225,7 +108658,7 @@ entities: - uid: 2799 components: - type: Transform - pos: -20.55822,-65.533104 + pos: -20.356453,-65.337494 parent: 2 - proto: TubaInstrument entities: @@ -120439,6 +119872,12 @@ entities: - type: Transform pos: -18.5,-18.5 parent: 2 + - uid: 18742 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 76.5,-47.5 + parent: 2 - uid: 18744 components: - type: Transform @@ -121522,11 +120961,6 @@ entities: - type: Transform pos: 0.5,-44.5 parent: 2 - - uid: 969 - components: - - type: Transform - pos: 0.5,-45.5 - parent: 2 - uid: 970 components: - type: Transform @@ -121562,11 +120996,6 @@ entities: - type: Transform pos: -3.5,-46.5 parent: 2 - - uid: 977 - components: - - type: Transform - pos: -4.5,-46.5 - parent: 2 - uid: 978 components: - type: Transform @@ -125123,6 +124552,11 @@ entities: - type: Transform pos: 47.5,-29.5 parent: 2 + - uid: 14458 + components: + - type: Transform + pos: 1.5,-44.5 + parent: 2 - uid: 14620 components: - type: Transform @@ -125781,13 +125215,6 @@ entities: - type: Transform pos: 69.531204,-32.545918 parent: 2 -- proto: WeaponSubMachineGunWt550 - entities: - - uid: 10243 - components: - - type: Transform - pos: 64.538445,-50.39843 - parent: 2 - proto: WeaponTurretXeno entities: - uid: 1718 @@ -125839,7 +125266,7 @@ entities: - uid: 9285 components: - type: Transform - pos: 28.519037,-13.301477 + pos: 29.452105,-12.421089 parent: 2 - proto: WeldingFuelTank entities: @@ -125927,152 +125354,112 @@ entities: rot: -1.5707963267948966 rad pos: 10.5,-59.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5690 components: - type: Transform rot: 3.141592653589793 rad pos: 11.5,-55.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6205 components: - type: Transform rot: -1.5707963267948966 rad pos: 12.5,-59.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6209 components: - type: Transform rot: -1.5707963267948966 rad pos: 12.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7262 components: - type: Transform pos: 58.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7671 components: - type: Transform rot: -1.5707963267948966 rad pos: 77.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7672 components: - type: Transform rot: -1.5707963267948966 rad pos: 77.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7679 components: - type: Transform rot: -1.5707963267948966 rad pos: 77.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7681 components: - type: Transform pos: 79.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7768 components: - type: Transform pos: 30.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8011 components: - type: Transform rot: -1.5707963267948966 rad pos: 26.5,-70.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8012 components: - type: Transform rot: -1.5707963267948966 rad pos: 26.5,-69.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8577 components: - type: Transform pos: 59.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8617 components: - type: Transform pos: 32.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9213 components: - type: Transform pos: 57.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9894 components: - type: Transform rot: -1.5707963267948966 rad pos: 63.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9895 components: - type: Transform rot: -1.5707963267948966 rad pos: 63.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11761 components: - type: Transform rot: -1.5707963267948966 rad pos: 53.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16121 components: - type: Transform pos: 40.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16631 components: - type: Transform pos: -38.5,-76.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorBarKitchenLocked entities: - uid: 7018 @@ -126081,39 +125468,29 @@ entities: rot: 1.5707963267948966 rad pos: 38.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7019 components: - type: Transform rot: 1.5707963267948966 rad pos: 38.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7020 components: - type: Transform rot: 1.5707963267948966 rad pos: 38.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18763 components: - type: Transform rot: 1.5707963267948966 rad pos: 38.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19747 components: - type: Transform pos: 39.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorCargoLocked entities: - uid: 3041 @@ -126122,16 +125499,12 @@ entities: rot: 3.141592653589793 rad pos: 27.5,-85.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15175 components: - type: Transform rot: 3.141592653589793 rad pos: 21.5,-85.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorHydroponicsLocked entities: - uid: 938 @@ -126140,39 +125513,29 @@ entities: rot: 3.141592653589793 rad pos: -2.5,-52.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 939 components: - type: Transform rot: 3.141592653589793 rad pos: -4.5,-52.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2404 components: - type: Transform pos: 0.5,-56.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5178 components: - type: Transform rot: -1.5707963267948966 rad pos: 2.5,-54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5179 components: - type: Transform rot: -1.5707963267948966 rad pos: 2.5,-53.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorPlasma entities: - uid: 6144 @@ -126181,45 +125544,33 @@ entities: rot: -1.5707963267948966 rad pos: 6.5,-49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6285 components: - type: Transform pos: 18.5,-76.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6286 components: - type: Transform pos: 19.5,-76.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6287 components: - type: Transform pos: 20.5,-76.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8491 components: - type: Transform rot: 3.141592653589793 rad pos: -6.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10558 components: - type: Transform rot: 3.141592653589793 rad pos: -7.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureArmoryLocked entities: - uid: 1211 @@ -126228,70 +125579,52 @@ entities: rot: 1.5707963267948966 rad pos: 58.5,-49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1451 components: - type: Transform rot: -1.5707963267948966 rad pos: 62.5,-49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4100 components: - type: Transform rot: 1.5707963267948966 rad pos: 58.5,-50.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4204 components: - type: Transform rot: -1.5707963267948966 rad pos: 62.5,-50.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4710 components: - type: Transform pos: 58.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4913 components: - type: Transform pos: 57.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6165 components: - type: Transform rot: 3.141592653589793 rad pos: 57.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6261 components: - type: Transform rot: 3.141592653589793 rad pos: 58.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9217 components: - type: Transform rot: 3.141592653589793 rad pos: 59.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureAtmosphericsLocked entities: - uid: 8009 @@ -126300,16 +125633,12 @@ entities: rot: 1.5707963267948966 rad pos: 26.5,-70.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8010 components: - type: Transform rot: 1.5707963267948966 rad pos: 26.5,-69.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureCommandLocked entities: - uid: 13568 @@ -126318,16 +125647,12 @@ entities: rot: -1.5707963267948966 rad pos: 29.5,-61.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13570 components: - type: Transform rot: -1.5707963267948966 rad pos: 29.5,-60.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureEngineeringLocked entities: - uid: 4657 @@ -126336,91 +125661,67 @@ entities: rot: 1.5707963267948966 rad pos: 26.5,-53.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4865 components: - type: Transform rot: 3.141592653589793 rad pos: -20.5,-61.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5186 components: - type: Transform rot: 3.141592653589793 rad pos: -10.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5187 components: - type: Transform rot: 1.5707963267948966 rad pos: -11.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5188 components: - type: Transform pos: -10.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5700 components: - type: Transform pos: -15.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5701 components: - type: Transform pos: -16.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7121 components: - type: Transform rot: -1.5707963267948966 rad pos: 67.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7123 components: - type: Transform rot: -1.5707963267948966 rad pos: 67.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8021 components: - type: Transform pos: -10.5,-71.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14314 components: - type: Transform rot: -1.5707963267948966 rad pos: 67.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17136 components: - type: Transform pos: -11.5,-71.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureExternalLocked entities: - uid: 5974 @@ -126429,23 +125730,17 @@ entities: rot: 3.141592653589793 rad pos: -63.5,-61.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6236 components: - type: Transform pos: -63.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19349 components: - type: Transform rot: 3.141592653589793 rad pos: 7.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureHeadOfPersonnelLocked entities: - uid: 2934 @@ -126454,16 +125749,12 @@ entities: rot: 1.5707963267948966 rad pos: 12.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6204 components: - type: Transform rot: 1.5707963267948966 rad pos: 12.5,-59.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureMedicalLocked entities: - uid: 292 @@ -126471,69 +125762,51 @@ entities: - type: Transform pos: 17.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 439 components: - type: Transform rot: 1.5707963267948966 rad pos: 7.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5422 components: - type: Transform rot: 3.141592653589793 rad pos: 32.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7796 components: - type: Transform rot: 3.141592653589793 rad pos: 30.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8691 components: - type: Transform rot: 1.5707963267948966 rad pos: 33.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9483 components: - type: Transform rot: 1.5707963267948966 rad pos: 19.5,-25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13977 components: - type: Transform pos: 16.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13990 components: - type: Transform pos: 15.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16391 components: - type: Transform pos: 14.5,-70.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureSecurityLocked entities: - uid: 3579 @@ -126542,112 +125815,84 @@ entities: rot: -1.5707963267948966 rad pos: 57.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4086 components: - type: Transform rot: 1.5707963267948966 rad pos: 51.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4377 components: - type: Transform rot: 3.141592653589793 rad pos: 57.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5960 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5961 components: - type: Transform rot: 1.5707963267948966 rad pos: -1.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5962 components: - type: Transform rot: 3.141592653589793 rad pos: -3.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6097 components: - type: Transform rot: -1.5707963267948966 rad pos: 57.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7067 components: - type: Transform rot: 1.5707963267948966 rad pos: 57.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7208 components: - type: Transform rot: 3.141592653589793 rad pos: 58.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7952 components: - type: Transform rot: 1.5707963267948966 rad pos: 57.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8414 components: - type: Transform rot: -1.5707963267948966 rad pos: 61.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14133 components: - type: Transform rot: 1.5707963267948966 rad pos: 63.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14134 components: - type: Transform rot: 1.5707963267948966 rad pos: 63.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19647 components: - type: Transform rot: 1.5707963267948966 rad pos: 61.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureServiceLocked entities: - uid: 6038 @@ -126656,16 +125901,12 @@ entities: rot: 1.5707963267948966 rad pos: -32.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6043 components: - type: Transform rot: 1.5707963267948966 rad pos: -32.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorTheatreLocked entities: - uid: 19533 @@ -126674,16 +125915,12 @@ entities: rot: 1.5707963267948966 rad pos: 27.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19534 components: - type: Transform rot: 1.5707963267948966 rad pos: 27.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: Window entities: - uid: 5232 @@ -126691,43 +125928,31 @@ entities: - type: Transform pos: 21.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5233 components: - type: Transform pos: 20.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5234 components: - type: Transform pos: 19.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7665 components: - type: Transform pos: 80.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7666 components: - type: Transform pos: 78.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7680 components: - type: Transform pos: 77.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindowDirectional entities: - uid: 1836 @@ -126736,48 +125961,36 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8058 components: - type: Transform rot: 3.141592653589793 rad pos: -40.5,-78.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9244 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12744 components: - type: Transform rot: -1.5707963267948966 rad pos: -39.5,-77.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17102 components: - type: Transform rot: 1.5707963267948966 rad pos: -41.5,-77.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19748 components: - type: Transform rot: -1.5707963267948966 rad pos: 40.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindowFrostedDirectional entities: - uid: 6162 @@ -126785,16 +125998,12 @@ entities: - type: Transform pos: 13.5,-48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6163 components: - type: Transform rot: 3.141592653589793 rad pos: 13.5,-50.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindowReinforcedDirectional entities: - uid: 296 @@ -126803,392 +126012,290 @@ entities: rot: 1.5707963267948966 rad pos: 76.5,-62.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 457 components: - type: Transform rot: -1.5707963267948966 rad pos: 18.5,-31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2223 components: - type: Transform pos: 62.5,-48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3353 components: - type: Transform rot: 3.141592653589793 rad pos: 76.5,-62.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4569 components: - type: Transform rot: 3.141592653589793 rad pos: 22.5,-52.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4570 components: - type: Transform rot: 3.141592653589793 rad pos: 25.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4610 components: - type: Transform rot: 1.5707963267948966 rad pos: 52.5,-31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4654 components: - type: Transform rot: -1.5707963267948966 rad pos: 23.5,-55.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4655 components: - type: Transform rot: -1.5707963267948966 rad pos: 22.5,-54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4656 components: - type: Transform pos: 26.5,-54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4658 components: - type: Transform pos: 24.5,-55.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4659 components: - type: Transform pos: 23.5,-55.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4660 components: - type: Transform rot: 1.5707963267948966 rad pos: 26.5,-52.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4661 components: - type: Transform pos: 25.5,-55.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4662 components: - type: Transform rot: -1.5707963267948966 rad pos: 23.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4663 components: - type: Transform pos: 22.5,-54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5377 components: - type: Transform pos: 30.5,-72.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5944 components: - type: Transform rot: 1.5707963267948966 rad pos: 52.5,-32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6703 components: - type: Transform rot: -1.5707963267948966 rad pos: 22.5,-85.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6704 components: - type: Transform rot: 1.5707963267948966 rad pos: 26.5,-85.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7070 components: - type: Transform rot: 1.5707963267948966 rad pos: 25.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7097 components: - type: Transform rot: -1.5707963267948966 rad pos: 22.5,-52.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7272 components: - type: Transform pos: 31.5,-72.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7285 components: - type: Transform pos: 33.5,-72.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7668 components: - type: Transform rot: 3.141592653589793 rad pos: 24.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7710 components: - type: Transform rot: 3.141592653589793 rad pos: 23.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7758 components: - type: Transform rot: -1.5707963267948966 rad pos: 22.5,-53.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7943 components: - type: Transform rot: 1.5707963267948966 rad pos: 26.5,-54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7944 components: - type: Transform rot: 3.141592653589793 rad pos: 26.5,-52.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8037 components: - type: Transform rot: 3.141592653589793 rad pos: 25.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8367 components: - type: Transform rot: 1.5707963267948966 rad pos: 25.5,-55.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8826 components: - type: Transform rot: 1.5707963267948966 rad pos: 51.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9092 components: - type: Transform pos: 58.5,-48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9304 components: - type: Transform rot: 1.5707963267948966 rad pos: 33.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9341 components: - type: Transform pos: 20.5,-24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10554 components: - type: Transform rot: -1.5707963267948966 rad pos: -9.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11869 components: - type: Transform rot: 1.5707963267948966 rad pos: 76.5,-66.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11880 components: - type: Transform pos: 76.5,-66.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13991 components: - type: Transform rot: 1.5707963267948966 rad pos: 17.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14135 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14136 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14137 components: - type: Transform rot: 3.141592653589793 rad pos: -5.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14145 components: - type: Transform pos: -6.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16394 components: - type: Transform pos: 15.5,-70.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16395 components: - type: Transform pos: 12.5,-70.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16417 components: - type: Transform pos: 13.5,-70.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16544 components: - type: Transform rot: 3.141592653589793 rad pos: -19.5,-61.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16548 components: - type: Transform rot: 3.141592653589793 rad pos: -21.5,-61.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17059 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17900 components: - type: Transform rot: -1.5707963267948966 rad pos: 30.5,-72.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19535 components: - type: Transform rot: 3.141592653589793 rad pos: 27.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: Wirecutter entities: - uid: 8104 @@ -127262,2466 +126369,1764 @@ entities: - type: Transform pos: -30.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 760 components: - type: Transform pos: -45.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 761 components: - type: Transform pos: 32.5,-62.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 764 components: - type: Transform pos: -45.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 769 components: - type: Transform pos: -45.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 772 components: - type: Transform pos: -57.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 774 components: - type: Transform pos: 2.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 775 components: - type: Transform pos: 1.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 776 components: - type: Transform pos: 36.5,-55.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 777 components: - type: Transform pos: 75.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 778 components: - type: Transform pos: 75.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 779 components: - type: Transform pos: 0.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 798 components: - type: Transform rot: 1.5707963267948966 rad pos: 37.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 822 components: - type: Transform pos: 75.5,-72.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 860 components: - type: Transform rot: 1.5707963267948966 rad pos: 37.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 861 components: - type: Transform rot: 1.5707963267948966 rad pos: 37.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 902 components: - type: Transform pos: 0.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1123 components: - type: Transform rot: -1.5707963267948966 rad pos: 53.5,-66.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1159 components: - type: Transform pos: 3.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1171 components: - type: Transform pos: 3.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1198 components: - type: Transform pos: 2.5,-41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1219 components: - type: Transform pos: 2.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1220 components: - type: Transform pos: 2.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1231 components: - type: Transform pos: -1.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1568 components: - type: Transform pos: -13.5,-76.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1593 components: - type: Transform pos: -16.5,-10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1685 components: - type: Transform pos: 49.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1686 components: - type: Transform pos: 50.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1804 components: - type: Transform pos: 47.5,-78.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1817 components: - type: Transform pos: 47.5,-79.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1818 components: - type: Transform pos: 81.5,-59.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1827 components: - type: Transform pos: -19.5,-53.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1841 components: - type: Transform pos: 34.5,-55.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1842 components: - type: Transform pos: 22.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1843 components: - type: Transform pos: -12.5,-76.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1844 components: - type: Transform pos: -6.5,-80.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1845 components: - type: Transform pos: 42.5,-55.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1846 components: - type: Transform pos: 43.5,-55.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1850 components: - type: Transform pos: 33.5,-55.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1851 components: - type: Transform pos: 20.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1852 components: - type: Transform pos: 22.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1853 components: - type: Transform pos: -3.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1854 components: - type: Transform pos: -4.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1857 components: - type: Transform pos: 17.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1858 components: - type: Transform pos: 18.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1859 components: - type: Transform pos: 16.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1860 components: - type: Transform pos: -20.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1961 components: - type: Transform pos: -5.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1963 components: - type: Transform pos: -6.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2203 components: - type: Transform pos: 3.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2204 components: - type: Transform pos: -0.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2225 components: - type: Transform pos: 0.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2274 components: - type: Transform rot: -1.5707963267948966 rad pos: 52.5,-66.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2310 components: - type: Transform pos: 18.5,-50.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2311 components: - type: Transform pos: 14.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2312 components: - type: Transform pos: 15.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2313 components: - type: Transform pos: 37.5,-55.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2314 components: - type: Transform pos: 22.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2315 components: - type: Transform pos: 17.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2318 components: - type: Transform pos: 16.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2322 components: - type: Transform pos: 18.5,-49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2323 components: - type: Transform pos: 15.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2345 components: - type: Transform pos: -54.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2346 components: - type: Transform pos: -54.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2347 components: - type: Transform pos: -55.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2348 components: - type: Transform pos: -47.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2349 components: - type: Transform pos: -45.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2350 components: - type: Transform pos: -46.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2368 components: - type: Transform pos: -46.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2369 components: - type: Transform pos: -47.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2370 components: - type: Transform pos: -45.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2371 components: - type: Transform pos: -56.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2378 components: - type: Transform pos: 47.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2389 components: - type: Transform pos: -57.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2456 components: - type: Transform pos: -50.5,-31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2457 components: - type: Transform pos: -51.5,-31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2458 components: - type: Transform pos: -53.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2514 components: - type: Transform pos: -54.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2525 components: - type: Transform pos: 51.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2549 components: - type: Transform pos: -55.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2611 components: - type: Transform pos: -57.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2613 components: - type: Transform pos: -25.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2649 components: - type: Transform pos: 42.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2673 components: - type: Transform pos: -25.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2674 components: - type: Transform pos: -25.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2704 components: - type: Transform pos: 40.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2709 components: - type: Transform pos: 48.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2726 components: - type: Transform pos: 43.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2727 components: - type: Transform pos: 19.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2836 components: - type: Transform pos: 44.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2843 components: - type: Transform pos: 45.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2851 components: - type: Transform pos: 46.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2886 components: - type: Transform pos: 54.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2887 components: - type: Transform pos: 56.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2968 components: - type: Transform pos: 55.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3105 components: - type: Transform pos: -18.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3220 components: - type: Transform pos: 16.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3288 components: - type: Transform pos: -40.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3304 components: - type: Transform pos: -45.5,-69.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3332 components: - type: Transform pos: 73.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3439 components: - type: Transform pos: 47.5,-54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3467 components: - type: Transform pos: -57.5,-61.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3468 components: - type: Transform pos: -54.5,-69.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3472 components: - type: Transform pos: -45.5,-70.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3476 components: - type: Transform pos: -54.5,-70.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3477 components: - type: Transform pos: -47.5,-76.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3478 components: - type: Transform pos: -55.5,-69.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3482 components: - type: Transform pos: -47.5,-78.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3484 components: - type: Transform pos: -46.5,-69.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3596 components: - type: Transform pos: -29.5,-73.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3604 components: - type: Transform pos: -47.5,-70.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3605 components: - type: Transform pos: -47.5,-69.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3619 components: - type: Transform pos: 45.5,-54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3636 components: - type: Transform pos: -42.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3642 components: - type: Transform pos: 53.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3658 components: - type: Transform pos: -57.5,-63.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3660 components: - type: Transform pos: -57.5,-62.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3670 components: - type: Transform pos: -49.5,-59.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3779 components: - type: Transform pos: 15.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3916 components: - type: Transform pos: -51.5,-59.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3947 components: - type: Transform pos: -40.5,-63.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4012 components: - type: Transform pos: -54.5,-60.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4013 components: - type: Transform pos: -56.5,-60.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4015 components: - type: Transform pos: 19.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4016 components: - type: Transform pos: 17.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4021 components: - type: Transform pos: 17.5,-10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4072 components: - type: Transform pos: -55.5,-60.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4074 components: - type: Transform pos: -53.5,-60.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4075 components: - type: Transform pos: 45.5,-79.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4079 components: - type: Transform pos: 45.5,-78.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4195 components: - type: Transform pos: 80.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4196 components: - type: Transform pos: 19.5,-10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4197 components: - type: Transform pos: -41.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4198 components: - type: Transform pos: -46.5,-70.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4199 components: - type: Transform pos: -12.5,-77.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4207 components: - type: Transform pos: 16.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4209 components: - type: Transform pos: 81.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4210 components: - type: Transform pos: -4.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4221 components: - type: Transform pos: -1.5,-41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4231 components: - type: Transform pos: -1.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4310 components: - type: Transform pos: -3.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4313 components: - type: Transform pos: 44.5,-54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4320 components: - type: Transform pos: 44.5,-55.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4334 components: - type: Transform pos: 46.5,-54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4350 components: - type: Transform pos: 45.5,-55.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4378 components: - type: Transform pos: 83.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4382 components: - type: Transform pos: -8.5,-80.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4386 components: - type: Transform pos: 22.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4388 components: - type: Transform pos: -49.5,-31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4390 components: - type: Transform pos: 22.5,-41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4392 components: - type: Transform pos: -5.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4397 components: - type: Transform pos: -2.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4398 components: - type: Transform pos: 18.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4403 components: - type: Transform pos: 49.5,-79.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4404 components: - type: Transform pos: 80.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4408 components: - type: Transform pos: 81.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4409 components: - type: Transform pos: 81.5,-31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4410 components: - type: Transform pos: 80.5,-31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4418 components: - type: Transform pos: -13.5,-77.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4420 components: - type: Transform pos: 35.5,-55.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4421 components: - type: Transform pos: 21.5,-10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4424 components: - type: Transform pos: 19.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4429 components: - type: Transform pos: -14.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4432 components: - type: Transform pos: -14.5,-10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4433 components: - type: Transform pos: 73.5,-72.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4439 components: - type: Transform pos: -16.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4440 components: - type: Transform pos: -50.5,-59.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4461 components: - type: Transform pos: 41.5,-55.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4464 components: - type: Transform pos: 73.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4466 components: - type: Transform pos: 73.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4467 components: - type: Transform pos: 77.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4468 components: - type: Transform pos: 77.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4469 components: - type: Transform pos: -2.5,-25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4470 components: - type: Transform pos: -2.5,-24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4471 components: - type: Transform pos: 1.5,-75.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4472 components: - type: Transform pos: -22.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4474 components: - type: Transform pos: -20.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4475 components: - type: Transform pos: -53.5,-54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4476 components: - type: Transform pos: -52.5,-55.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4477 components: - type: Transform pos: -55.5,-48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4479 components: - type: Transform pos: -54.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4480 components: - type: Transform pos: -55.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4481 components: - type: Transform pos: -55.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4482 components: - type: Transform pos: -55.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4483 components: - type: Transform pos: -51.5,-55.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4484 components: - type: Transform pos: -54.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4485 components: - type: Transform pos: -54.5,-41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4486 components: - type: Transform pos: -54.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4487 components: - type: Transform pos: -49.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4488 components: - type: Transform pos: -0.5,-80.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4489 components: - type: Transform pos: 3.5,-80.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4490 components: - type: Transform pos: 5.5,-80.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4491 components: - type: Transform pos: 37.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4493 components: - type: Transform pos: 37.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4495 components: - type: Transform pos: 41.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4497 components: - type: Transform pos: 39.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4498 components: - type: Transform pos: 35.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4504 components: - type: Transform pos: 43.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4506 components: - type: Transform pos: 43.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4508 components: - type: Transform pos: 33.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4509 components: - type: Transform pos: 33.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4510 components: - type: Transform pos: 34.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4512 components: - type: Transform pos: 46.5,-60.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4513 components: - type: Transform pos: 40.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4514 components: - type: Transform pos: 45.5,-60.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4515 components: - type: Transform pos: 38.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4517 components: - type: Transform pos: 39.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4518 components: - type: Transform pos: 45.5,-59.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4519 components: - type: Transform pos: 33.5,-59.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4531 components: - type: Transform pos: 46.5,-59.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4539 components: - type: Transform pos: 21.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4543 components: - type: Transform pos: 39.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4571 components: - type: Transform pos: -28.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4579 components: - type: Transform pos: -28.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4580 components: - type: Transform pos: -28.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4581 components: - type: Transform pos: -30.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4680 components: - type: Transform pos: -30.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4682 components: - type: Transform pos: -30.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4695 components: - type: Transform pos: -33.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4696 components: - type: Transform pos: -32.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4697 components: - type: Transform pos: -32.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4698 components: - type: Transform pos: -32.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4761 components: - type: Transform pos: -47.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4839 components: - type: Transform pos: -47.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4846 components: - type: Transform pos: 21.5,-75.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4934 components: - type: Transform rot: -1.5707963267948966 rad pos: 50.5,-65.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4937 components: - type: Transform pos: -53.5,-53.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5008 components: - type: Transform pos: -54.5,-52.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5011 components: - type: Transform pos: -54.5,-50.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5012 components: - type: Transform pos: -54.5,-49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5027 components: - type: Transform pos: -55.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5051 components: - type: Transform pos: -55.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5054 components: - type: Transform pos: -55.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5056 components: - type: Transform pos: -50.5,-56.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5057 components: - type: Transform pos: -49.5,-56.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5067 components: - type: Transform pos: -48.5,-56.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5068 components: - type: Transform pos: -54.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5099 components: - type: Transform rot: -1.5707963267948966 rad pos: 51.5,-66.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5140 components: - type: Transform pos: -53.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5147 components: - type: Transform pos: -53.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5191 components: - type: Transform pos: -52.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5194 components: - type: Transform pos: -50.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5258 components: - type: Transform pos: -48.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5332 components: - type: Transform pos: 82.5,-41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5375 components: - type: Transform pos: -51.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5394 components: - type: Transform pos: -47.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5431 components: - type: Transform pos: 16.5,-71.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5434 components: - type: Transform pos: 75.5,-73.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5436 components: - type: Transform pos: 77.5,-73.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5438 components: - type: Transform pos: 39.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5439 components: - type: Transform pos: 39.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5441 components: - type: Transform pos: 39.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5442 components: - type: Transform pos: 43.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5443 components: - type: Transform pos: 47.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5446 components: - type: Transform pos: 37.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5447 components: - type: Transform pos: 47.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5448 components: - type: Transform pos: 46.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5449 components: - type: Transform pos: 44.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5450 components: - type: Transform pos: 46.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5451 components: - type: Transform pos: 45.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5511 components: - type: Transform pos: 43.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5513 components: - type: Transform pos: -2.5,-80.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5517 components: - type: Transform pos: 3.5,-81.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5522 components: - type: Transform pos: 5.5,-81.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5528 components: - type: Transform pos: 16.5,-73.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5529 components: - type: Transform pos: 16.5,-74.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5530 components: - type: Transform pos: 17.5,-76.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5531 components: - type: Transform pos: 17.5,-75.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5532 components: - type: Transform pos: 22.5,-74.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5533 components: - type: Transform pos: 22.5,-73.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5535 components: - type: Transform pos: 22.5,-72.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5536 components: - type: Transform pos: 22.5,-71.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5604 components: - type: Transform pos: 47.5,-62.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5632 components: - type: Transform pos: 77.5,-72.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5634 components: - type: Transform pos: 40.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5657 components: - type: Transform pos: 42.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5658 components: - type: Transform pos: 41.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5659 components: - type: Transform pos: 42.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5663 components: - type: Transform pos: 36.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5694 components: - type: Transform pos: 36.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5696 components: - type: Transform pos: 44.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5786 components: - type: Transform pos: 34.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5899 components: - type: Transform pos: 35.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6046 components: - type: Transform pos: 45.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6104 components: - type: Transform pos: 80.5,-49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6106 components: - type: Transform pos: 82.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6114 components: - type: Transform pos: 46.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6142 components: - type: Transform pos: 45.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6301 components: - type: Transform pos: 33.5,-60.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6386 components: - type: Transform pos: 82.5,-49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6387 components: - type: Transform pos: 82.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6598 components: - type: Transform pos: 32.5,-59.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6659 components: - type: Transform pos: 29.5,-68.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6666 components: - type: Transform pos: 27.5,-68.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6677 components: - type: Transform pos: 32.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6678 components: - type: Transform pos: 44.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7320 components: - type: Transform pos: 82.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7409 components: - type: Transform pos: 73.5,-73.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7764 components: - type: Transform pos: 44.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7792 components: - type: Transform pos: 45.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7794 components: - type: Transform pos: 32.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7869 components: - type: Transform pos: 54.5,-65.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8063 components: - type: Transform pos: 80.5,-41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8144 components: - type: Transform pos: 38.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8346 components: - type: Transform pos: 21.5,-76.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8358 components: - type: Transform pos: 16.5,-72.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8422 components: - type: Transform pos: 66.5,-59.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8503 components: - type: Transform pos: 69.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9294 components: - type: Transform pos: 51.5,-53.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9329 components: - type: Transform pos: 81.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9337 components: - type: Transform pos: 28.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9354 components: - type: Transform pos: 29.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9446 components: - type: Transform pos: 83.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9695 components: - type: Transform pos: 80.5,-59.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9847 components: - type: Transform pos: 65.5,-59.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10305 components: - type: Transform pos: 52.5,-53.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10516 components: - type: Transform pos: 81.5,-49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10721 components: - type: Transform pos: 81.5,-41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10752 components: - type: Transform pos: 81.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10889 components: - type: Transform pos: -17.5,-73.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11716 components: - type: Transform pos: -30.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12851 components: - type: Transform pos: 49.5,-62.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13647 components: - type: Transform pos: 52.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13888 components: - type: Transform pos: -14.5,-32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13963 components: - type: Transform pos: -0.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13981 components: - type: Transform pos: -30.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14115 components: - type: Transform pos: -26.5,-73.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14189 components: - type: Transform pos: -28.5,-73.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14587 components: - type: Transform pos: -20.5,-73.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15156 components: - type: Transform pos: 83.5,-48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15157 components: - type: Transform pos: 82.5,-48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15164 components: - type: Transform pos: 81.5,-48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15166 components: - type: Transform pos: 81.5,-50.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15230 components: - type: Transform pos: -19.5,-73.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15252 components: - type: Transform pos: 55.5,-64.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15960 components: - type: Transform rot: -1.5707963267948966 rad pos: -32.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16314 components: - type: Transform rot: -1.5707963267948966 rad pos: -32.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16445 components: - type: Transform pos: 46.5,-62.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16449 components: - type: Transform pos: 49.5,-78.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16677 components: - type: Transform pos: -22.5,-53.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17657 components: - type: Transform pos: -18.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18467 components: - type: Transform pos: -18.5,-73.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18734 components: - type: Transform pos: 56.5,-63.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18767 components: - type: Transform pos: 2.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18787 components: - type: Transform rot: -1.5707963267948966 rad pos: -18.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18804 components: - type: Transform pos: 32.5,-60.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18932 components: - type: Transform pos: -16.5,-70.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19193 components: - type: Transform pos: -20.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19321 components: - type: Transform pos: -27.5,-73.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19347 components: - type: Transform pos: 26.5,-62.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19348 components: - type: Transform pos: 26.5,-63.5 parent: 2 - - type: DeltaPressure - gridUid: 2 ... From 1e2570c2812109877b311268980d7bea0811dcc7 Mon Sep 17 00:00:00 2001 From: Connor Huffine Date: Sat, 1 Nov 2025 17:29:35 -0400 Subject: [PATCH 082/121] Update SolutionRoundingTest.cs (#41238) --- .../Tests/Chemistry/SolutionRoundingTest.cs | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/Content.IntegrationTests/Tests/Chemistry/SolutionRoundingTest.cs b/Content.IntegrationTests/Tests/Chemistry/SolutionRoundingTest.cs index 89d33186a2..5b5829d386 100644 --- a/Content.IntegrationTests/Tests/Chemistry/SolutionRoundingTest.cs +++ b/Content.IntegrationTests/Tests/Chemistry/SolutionRoundingTest.cs @@ -64,6 +64,11 @@ public sealed class SolutionRoundingTest SolutionRoundingTestReagentD: 1 "; + private const string SolutionRoundingTestReagentA = "SolutionRoundingTestReagentA"; + private const string SolutionRoundingTestReagentB = "SolutionRoundingTestReagentB"; + private const string SolutionRoundingTestReagentC = "SolutionRoundingTestReagentC"; + private const string SolutionRoundingTestReagentD = "SolutionRoundingTestReagentD"; + [Test] public async Task Test() { @@ -84,12 +89,12 @@ public sealed class SolutionRoundingTest solutionEnt = newSolutionEnt!.Value; solution = newSolution!; - system.TryAddSolution(solutionEnt, new Solution("SolutionRoundingTestReagentC", 50)); - system.TryAddSolution(solutionEnt, new Solution("SolutionRoundingTestReagentB", 30)); + system.TryAddSolution(solutionEnt, new Solution(SolutionRoundingTestReagentC, 50)); + system.TryAddSolution(solutionEnt, new Solution(SolutionRoundingTestReagentB, 30)); for (var i = 0; i < 9; i++) { - system.TryAddSolution(solutionEnt, new Solution("SolutionRoundingTestReagentA", 10)); + system.TryAddSolution(solutionEnt, new Solution(SolutionRoundingTestReagentA, 10)); } }); @@ -98,21 +103,21 @@ public sealed class SolutionRoundingTest Assert.Multiple(() => { Assert.That( - solution.ContainsReagent("SolutionRoundingTestReagentA", null), + solution.ContainsReagent(SolutionRoundingTestReagentA, null), Is.False, "Solution should not contain reagent A"); Assert.That( - solution.ContainsReagent("SolutionRoundingTestReagentB", null), + solution.ContainsReagent(SolutionRoundingTestReagentB, null), Is.False, "Solution should not contain reagent B"); Assert.That( - solution![new ReagentId("SolutionRoundingTestReagentC", null)].Quantity, + solution![new ReagentId(SolutionRoundingTestReagentC, null)].Quantity, Is.EqualTo((FixedPoint2) 20)); Assert.That( - solution![new ReagentId("SolutionRoundingTestReagentD", null)].Quantity, + solution![new ReagentId(SolutionRoundingTestReagentD, null)].Quantity, Is.EqualTo((FixedPoint2) 30)); }); }); From 6f253bcf04341bd1fdef5b22d964c7ae48053750 Mon Sep 17 00:00:00 2001 From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Date: Sun, 2 Nov 2025 12:34:19 +1300 Subject: [PATCH 083/121] Fix note heisentest (#41244) --- .../Tests/Interaction/InteractionTest.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs index 746717e785..245aeab9ee 100644 --- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs +++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs @@ -228,14 +228,14 @@ public abstract partial class InteractionTest ServerSession = sPlayerMan.GetSessionById(ClientSession.UserId); // Spawn player entity & attach - EntityUid? old = default; + NetEntity? old = default; await Server.WaitPost(() => { // Fuck you mind system I want an hour of my life back // Mind system is a time vampire SEntMan.System().WipeMind(ServerSession.ContentData()?.Mind); - old = cPlayerMan.LocalEntity; + CEntMan.TryGetNetEntity(cPlayerMan.LocalEntity, out old); SPlayer = SEntMan.SpawnEntity(PlayerPrototype, SEntMan.GetCoordinates(PlayerCoords)); Player = SEntMan.GetNetEntity(SPlayer); Server.PlayerMan.SetAttachedEntity(ServerSession, SPlayer); @@ -251,8 +251,8 @@ public abstract partial class InteractionTest // Delete old player entity. await Server.WaitPost(() => { - if (old != null) - SEntMan.DeleteEntity(old.Value); + if (SEntMan.TryGetEntity(old, out var uid)) + SEntMan.DeleteEntity(uid); }); // Change UI state to in-game. From d5a46b982433c0ce3070d7c391f746163b5f059e Mon Sep 17 00:00:00 2001 From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Date: Sun, 2 Nov 2025 13:10:52 +1300 Subject: [PATCH 084/121] Improve CreateDeleteCreateTest failure messages (#40996) * Improve CreateDeleteCreateTest failure messages * nameof --- .../Tests/Lobby/CharacterCreationTest.cs | 194 +++++++++--------- 1 file changed, 101 insertions(+), 93 deletions(-) diff --git a/Content.IntegrationTests/Tests/Lobby/CharacterCreationTest.cs b/Content.IntegrationTests/Tests/Lobby/CharacterCreationTest.cs index 60501a781f..d5791861cf 100644 --- a/Content.IntegrationTests/Tests/Lobby/CharacterCreationTest.cs +++ b/Content.IntegrationTests/Tests/Lobby/CharacterCreationTest.cs @@ -1,114 +1,122 @@ using Content.Client.Lobby; using Content.Server.Preferences.Managers; +using Content.Shared.Humanoid; using Content.Shared.Preferences; using Robust.Client.State; -using Robust.Shared.Network; -namespace Content.IntegrationTests.Tests.Lobby +namespace Content.IntegrationTests.Tests.Lobby; + +[TestFixture] +[TestOf(typeof(ClientPreferencesManager))] +[TestOf(typeof(ServerPreferencesManager))] +public sealed class CharacterCreationTest { - [TestFixture] - [TestOf(typeof(ClientPreferencesManager))] - [TestOf(typeof(ServerPreferencesManager))] - public sealed class CharacterCreationTest + [Test] + public async Task CreateDeleteCreateTest() { - [Test] - public async Task CreateDeleteCreateTest() + await using var pair = await PoolManager.GetServerClient(new PoolSettings { InLobby = true }); + var server = pair.Server; + var client = pair.Client; + var user = pair.Client.User!.Value; + var clientPrefManager = client.Resolve(); + var serverPrefManager = server.Resolve(); + + Assert.That(client.Resolve().CurrentState, Is.TypeOf()); + await client.WaitPost(() => clientPrefManager.SelectCharacter(0)); + await pair.RunTicksSync(5); + + var clientCharacters = clientPrefManager.Preferences?.Characters; + Assert.That(clientCharacters, Is.Not.Null); + Assert.That(clientCharacters, Has.Count.EqualTo(1)); + + HumanoidCharacterProfile profile = null; + await client.WaitPost(() => { - await using var pair = await PoolManager.GetServerClient(new PoolSettings { InLobby = true }); - var server = pair.Server; - var client = pair.Client; + profile = HumanoidCharacterProfile.Random(); + clientPrefManager.CreateCharacter(profile); + }); + await pair.RunTicksSync(5); - var clientNetManager = client.ResolveDependency(); - var clientStateManager = client.ResolveDependency(); - var clientPrefManager = client.ResolveDependency(); + clientCharacters = clientPrefManager.Preferences?.Characters; + Assert.That(clientCharacters, Is.Not.Null); + Assert.That(clientCharacters, Has.Count.EqualTo(2)); + AssertEqual(clientCharacters[1], profile); - var serverPrefManager = server.ResolveDependency(); + await PoolManager.WaitUntil(server, () => serverPrefManager.GetPreferences(user).Characters.Count == 2, maxTicks: 60); + var serverCharacters = serverPrefManager.GetPreferences(user).Characters; + Assert.That(serverCharacters, Has.Count.EqualTo(2)); + AssertEqual(serverCharacters[1], profile); - // Need to run them in sync to receive the messages. - await pair.RunTicksSync(1); + await client.WaitAssertion(() => clientPrefManager.DeleteCharacter(1)); + await pair.RunTicksSync(5); + Assert.That(clientPrefManager.Preferences?.Characters.Count, Is.EqualTo(1)); + await PoolManager.WaitUntil(server, () => serverPrefManager.GetPreferences(user).Characters.Count == 1, maxTicks: 60); + Assert.That(serverPrefManager.GetPreferences(user).Characters.Count, Is.EqualTo(1)); - await PoolManager.WaitUntil(client, () => clientStateManager.CurrentState is LobbyState, 600); + await client.WaitIdleAsync(); - Assert.That(clientNetManager.ServerChannel, Is.Not.Null); + await client.WaitAssertion(() => + { + profile = HumanoidCharacterProfile.Random(); + clientPrefManager.CreateCharacter(profile); + }); + await pair.RunTicksSync(5); - var clientNetId = clientNetManager.ServerChannel.UserId; - HumanoidCharacterProfile profile = null; + clientCharacters = clientPrefManager.Preferences?.Characters; + Assert.That(clientCharacters, Is.Not.Null); + Assert.That(clientCharacters, Has.Count.EqualTo(2)); + AssertEqual(clientCharacters[1], profile); - await client.WaitAssertion(() => - { - clientPrefManager.SelectCharacter(0); + await PoolManager.WaitUntil(server, () => serverPrefManager.GetPreferences(user).Characters.Count == 2, maxTicks: 60); + serverCharacters = serverPrefManager.GetPreferences(user).Characters; + Assert.That(serverCharacters, Has.Count.EqualTo(2)); + AssertEqual(serverCharacters[1], profile); + await pair.CleanReturnAsync(); + } - var clientCharacters = clientPrefManager.Preferences?.Characters; - Assert.That(clientCharacters, Is.Not.Null); - Assert.Multiple(() => - { - Assert.That(clientCharacters, Has.Count.EqualTo(1)); + private void AssertEqual(ICharacterProfile clientCharacter, HumanoidCharacterProfile b) + { + if (clientCharacter.MemberwiseEquals(b)) + return; - Assert.That(clientStateManager.CurrentState, Is.TypeOf()); - }); - - profile = HumanoidCharacterProfile.Random(); - clientPrefManager.CreateCharacter(profile); - - clientCharacters = clientPrefManager.Preferences?.Characters; - - Assert.That(clientCharacters, Is.Not.Null); - Assert.That(clientCharacters, Has.Count.EqualTo(2)); - Assert.That(clientCharacters[1].MemberwiseEquals(profile)); - }); - - await PoolManager.WaitUntil(server, () => serverPrefManager.GetPreferences(clientNetId).Characters.Count == 2, maxTicks: 60); - - await server.WaitAssertion(() => - { - var serverCharacters = serverPrefManager.GetPreferences(clientNetId).Characters; - - Assert.That(serverCharacters, Has.Count.EqualTo(2)); - Assert.That(serverCharacters[1].MemberwiseEquals(profile)); - }); - - await client.WaitAssertion(() => - { - clientPrefManager.DeleteCharacter(1); - - var clientCharacters = clientPrefManager.Preferences?.Characters.Count; - Assert.That(clientCharacters, Is.EqualTo(1)); - }); - - await PoolManager.WaitUntil(server, () => serverPrefManager.GetPreferences(clientNetId).Characters.Count == 1, maxTicks: 60); - - await server.WaitAssertion(() => - { - var serverCharacters = serverPrefManager.GetPreferences(clientNetId).Characters.Count; - Assert.That(serverCharacters, Is.EqualTo(1)); - }); - - await client.WaitIdleAsync(); - - await client.WaitAssertion(() => - { - profile = HumanoidCharacterProfile.Random(); - - clientPrefManager.CreateCharacter(profile); - - var clientCharacters = clientPrefManager.Preferences?.Characters; - - Assert.That(clientCharacters, Is.Not.Null); - Assert.That(clientCharacters, Has.Count.EqualTo(2)); - Assert.That(clientCharacters[1].MemberwiseEquals(profile)); - }); - - await PoolManager.WaitUntil(server, () => serverPrefManager.GetPreferences(clientNetId).Characters.Count == 2, maxTicks: 60); - - await server.WaitAssertion(() => - { - var serverCharacters = serverPrefManager.GetPreferences(clientNetId).Characters; - - Assert.That(serverCharacters, Has.Count.EqualTo(2)); - Assert.That(serverCharacters[1].MemberwiseEquals(profile)); - }); - await pair.CleanReturnAsync(); + if (clientCharacter is not HumanoidCharacterProfile a) + { + Assert.Fail($"Not a {nameof(HumanoidCharacterProfile)}"); + return; } + + Assert.Multiple(() => + { + Assert.That(a.Name, Is.EqualTo(b.Name)); + Assert.That(a.Age, Is.EqualTo(b.Age)); + Assert.That(a.Sex, Is.EqualTo(b.Sex)); + Assert.That(a.Gender, Is.EqualTo(b.Gender)); + Assert.That(a.Species, Is.EqualTo(b.Species)); + Assert.That(a.PreferenceUnavailable, Is.EqualTo(b.PreferenceUnavailable)); + Assert.That(a.SpawnPriority, Is.EqualTo(b.SpawnPriority)); + Assert.That(a.FlavorText, Is.EqualTo(b.FlavorText)); + Assert.That(a.JobPriorities, Is.EquivalentTo(b.JobPriorities)); + Assert.That(a.AntagPreferences, Is.EquivalentTo(b.AntagPreferences)); + Assert.That(a.TraitPreferences, Is.EquivalentTo(b.TraitPreferences)); + Assert.That(a.Loadouts, Is.EquivalentTo(b.Loadouts)); + AssertEqual(a.Appearance, b.Appearance); + Assert.Fail("Profile not equal"); + }); + } + + private void AssertEqual(HumanoidCharacterAppearance a, HumanoidCharacterAppearance b) + { + if (a.MemberwiseEquals(b)) + return; + + Assert.That(a.HairStyleId, Is.EqualTo(b.HairStyleId)); + Assert.That(a.HairColor, Is.EqualTo(b.HairColor)); + Assert.That(a.FacialHairStyleId, Is.EqualTo(b.FacialHairStyleId)); + Assert.That(a.FacialHairColor, Is.EqualTo(b.FacialHairColor)); + Assert.That(a.EyeColor, Is.EqualTo(b.EyeColor)); + Assert.That(a.SkinColor, Is.EqualTo(b.SkinColor)); + Assert.That(a.Markings, Is.EquivalentTo(b.Markings)); + Assert.Fail("Appearance not equal"); } } From 4b6c5b671c91048ab7062822927399fc31045a90 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 2 Nov 2025 01:40:29 +0100 Subject: [PATCH 085/121] Update Credits (#41245) Co-authored-by: PJBot --- 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 b81e816676..1fd1cf2ef9 100644 --- a/Resources/Credits/GitHub.txt +++ b/Resources/Credits/GitHub.txt @@ -1 +1 @@ -0leshe, 0tito, 0x6273, 12rabbits, 1337dakota, 13spacemen, 154942, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 27alaing, 2DSiggy, 3nderall, 4310v343k, 4dplanner, 5tickman, 612git, 778b, 96flo, aaron, abadaba695, Ablankmann, abregado, Absolute-Potato, Absotively, achookh, Acruid, ActiveMammmoth, actually-reb, ada-please, adamsong, Adeinitas, adm2play, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aearo-Deepwater, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, AftrLite, AgentSmithRadio, Agoichi, Ahion, aiden, Aidenkrz, Aisu9, ajcm, AJCM-git, AjexRose, Alekshhh, alexalexmax, alexkar598, AlexMorgan3817, alexum418, alexumandxgabriel08x, Alice4267, Alithsko, Alkheemist, alliephante, ALMv1, Alpaccalypse, Alpha-Two, AlphaQwerty, Altoids1, amatwiedle, amylizzle, ancientpower, Andre19926, Andrew-Fall, AndrewEyeke, AndrewFenriz, AndreyCamper, anri, Anzarot121, ApolloVector, Appiah, ar4ill, Arcane-Waffle, archee1, ArchPigeon, ArchRBX, areitpog, Arendian, areyouconfused, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, Artxmisery, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, AverageNotDoingAnythingEnjoyer, avghdev, AwareFoxy, Awlod, AzzyIsNotHere, azzyisnothere, B-Kirill, B3CKDOOR, baa14453, BackeTako, BadaBoomie, Bakke, BananaFlambe, Baptr0b0t, BarryNorfolk, BasedUser, beck-thompson, beesterman, bellwetherlogic, ben, benbryant0, benev0, benjamin-burges, BGare, bhespiritu, bibbly, BigfootBravo, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blitzthesquishy, Blobadoodle, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, Bokser815, bolantej, Booblesnoot42, Boolean-Buckeye, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, breeplayx3, BriBrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, BWTCK, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, Camdot, capnsockless, CaptainMaru, captainsqrbeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, catdotjs, catlord, Catofquestionableethics, CatTheSystem, CawsForConcern, Centronias, Chaboricks, chairbender, Chaoticaa, Charlese2, charlie, chartman, ChaseFlorom, chavonadelal, Cheackraze, CheddaCheez, cheesePizza2, CheesePlated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbicous, Chubbygummibear, Ciac32, ciaran, citrea, civilCornball, claustro305, Clement-O, cloudyias, clyf, Clyybber, CMDR-Piboy314, cnv41, coco, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, Compilatron144, CookieMasterT, coolboy911, CoolioDudio, coolmankid12345, Coolsurf6, cooperwallace, corentt, CormosLemming, CrafterKolyan, CraftyRenter, crazybrain23, Crazydave91920, creadth, CrigCrag, CroilBird, Crotalus, CrudeWax, cryals, CrzyPotato, cubixthree, cutemoongod, Cyberboss, d34d10cc, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, dan, dangerrevolution, daniel-cr, DanSAussieITS, Daracke, Darkenson, david, DawBla, Daxxi3, dch-GH, ddeegan, de0rix, Deahaka, dean, DEATHB4DEFEAT, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DeepwaterCreations, Deerstop, degradka, Delete69, deltanedas, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, devinschubert14, dexlerxd, dffdff2423, DieselMohawk, DieselMohawkTheSequel, digitalic, Dimastra, DinnerCalzone, DinoWattz, Disp-Dev, DisposableCrewmember42, dissidentbullet, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, DR-DOCTOR-EVIL-EVIL, Dragonjspider, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, DuckManZach, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, dylanstrategie, dylanwhittingham, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, Ekkosangen, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, EnrichedCaramel, Entvari, eoineoineoin, ephememory, eris, erohrs2, ERORR404V1, Errant-4, ertanic, esguard, estacaoespacialpirata, eugene, ewokswagger, exincore, exp111, f0x-n3rd, F1restar4, FacePluslll, Fahasor, FairlySadPanda, farrellka-dev, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, firenamefn, Firewars763, FirinMaLazors, Fishfish458, fl-oz, Flareguy, flashgnash, FlipBrooke, FluffiestFloof, FluffMe, FluidRock, flymo5678, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, foxhorn, freeman2651, freeze2222, frobnic8, Froffy025, Fromoriss, froozigiusz, FrostMando, FrostRibbon, Funce, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, gamer3107, Gamewar360, gansulalan, GaussiArson, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, Gentleman-Bird, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, GitHubUser53123, gituhabu, GlassEclipse, GnarpGnarp, GNF54, godisdeadLOL, goet, GoldenCan, Goldminermac, Golinth, golubgik, GoodWheatley, Gorox221, GR1231, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, GreyMario, GrownSamoyedDog, GTRsound, gusxyz, Gyrandola, h3half, hamurlik, Hanzdegloker, HappyRoach, Hardly3D, harikattar, Hayden, he1acdvv, Hebi, Helix-ctrl, helm4142, Henry, HerCoyote23, Hi-Im-Shot, HighTechPuddle, Hitlinemoss, hiucko, hivehum, Hmeister-fake, Hmeister-real, Hobbitmax, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, hoshizora-sayo, Hreno, Hrosts, htmlsystem, Huaqas, hubismal, Hugal31, Hyenh, hyperb1, hyperDelegate, hyphenationc, i-justuser-i, iaada, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imatsoup, IMCB, impubbi, imrenq, imweax, indeano, Injazz, Insineer, insoPL, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, JackRyd3r, jacksonzck, Jacktastic09, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jarmer123, Jaskanbe, JasperJRoth, jbox144, JCGWE30, jerryimmouse, JerryImMouse, Jessetriesagain, jessicamaybe, JesterX666, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jkwookee, jmcb, JohnGinnane, johnku1, Jophire, Jopogrechkin, joshepvodka, JpegOfAFrog, jproads, JrInventor05, Jrpl, jukereise, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, JustinWinningham, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, kaiserbirch, KaiShibaa, kalane15, kalanosh, KamTheSythe, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KieueCaprie, Kimpes, KingFroozy, kira-er, kiri-yoshikage, Kirillcas, Kirus59, Kistras, Kit, Kit0vras, KittenColony, Kittygyat, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kontakt, kosticia, koteq, kotobdev, Kowlin, KrasnoshchekovPavel, Krosus777, Krunklehorn, Kupie, kxvvv, Kyoth25f, kyupolaris, kzhanik, LaCumbiaDelCoronavirus, lajolico, Lamrr, lanedon, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leah, leander-0, leonardo-dabepis, leonidussaks, leonsfriedrich, LeoSantich, lettern, LetterN, Level10Cybermancer, LEVELcat, lever1209, LevitatingTree, Lgibb18, lgruthes, LightVillet, lilazero, liltenhead, linkbro1, LinkUyx, Litraxx, little-meow-meow, LittleBuilderJane, LittleNorthStar, LittleNyanCat, lizelive, ljm862, lmsnoise, localcc, lokachop, lolman360, Lomcastar, Lordbrandon12, LordCarve, LordEclipse, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luegamer, luizwritescode, Lukasz825700516, luminight, lunarcomets, Lusatia, Luxeator, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M1tht1c, M3739, M4rchy-S, M87S, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, magnuscrowe, maland1, malchanceux, MaloTV, manelnavola, ManelNavola, Mangohydra, marboww, Markek1, MarkerWicker, marlyn, matt, Matz05, max, MaxNox7, maylokana, MDuch369, meganerobot, MehimoNemo, Mehnix, MeltedPixel, memeproof, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, mifia, MilenVolf, MilonPL, Minemoder5000, Minty642, minus1over12, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterImp, MisterMecky, Mith-randalf, Mixelz, mjarduk, MjrLandWhale, mkanke-real, MLGTASTICa, mnva0, moderatelyaware, modern-nm, mokiros, momo, Moneyl, monotheonist, Moomoobeef, moony, Morb0, MossyGreySlope, mqole, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, mtrs163, muburu, MureixloI, murolem, murphyneko, musicmanvr, MWKane, Myakot, Myctai, N3X15, nabegator, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikitosych, nikthechampiongr, Nimfar11, ninruB, Nirnael, NIXC, nkokic, NkoKirkto, nmajask, noctyrnal, noelkathegod, noirogen, nok-ko, NonchalantNoob, NoobyLegion, Nopey, NoreUhh, not-gavnaed, notafet, notquitehadouken, notsodana, noudoit, noverd, Nox38, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, Nyxilath, och-och, OctoRocket, OldDanceJacket, OliverOtter, onesch, OneZerooo0, OnsenCapy, OnyxTheBrave, opl-, Orange-Winds, OrangeMoronage9622, OrbitSystem07, Orsoniks, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paige404, paigemaeforrest, pali6, Palladinium, Pangogie, panzer-iv1, partyaddict, patrikturi, PaulRitter, pavlockblaine03, peccneck, Peptide90, peptron1, perryprog, PeterFuto, PetMudstone, pewter-wiz, PGrayCS, pgraycs, Pgriha, phantom-lily, pheenty, philingham, Phill101, Phooooooooooooooooooooooooooooooosphate, phunnyguy, PicklOH, PilgrimViis, Pill-U, pinkbat5, Piras314, Pireax, Pissachu, pissdemon, Pixel8-dev, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, poeMota, pofitlo, pointer-to-null, Pok27, pok27, poklj, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, PotRoastPiggy, Princess-Cheeseballs, ProfanedBane, PROG-MohamedDwidar, Prole0, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykana, psykzz, PuceTint, pumkin69, PuroSlavKing, PursuitInAshes, Putnam3145, py01, Pyrovi, qrtDaniil, qrwas, Quantum-cross, quasr-9, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, RamZ, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, RedBookcase, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, ReeZer2, RemberBM, RemieRichards, RemTim, rene-descartes2021, Renlou, retequizzle, rhailrake, rhsvenson, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, rlebell33, RobbyTheFish, robinthedragon, Rockdtben, Rohesie, rok-povsic, rokudara-sen, rolfero, RomanNovo, rosieposieeee, Roudenn, router, ruddygreat, rumaks, RumiTiger, Ruzihm, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, Samuka-C, SaphireLattice, SapphicOverload, sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, ScholarNZL, schrodinger71, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, SeamLesss, Segonist, semensponge, sephtasm, ser1-1y, Serkket, sewerpig, SG6732, sh18rw, Shaddap1, ShadeAware, ShadowCommander, shadowtheprotogen546, shaeone, shampunj, shariathotpatrol, SharkSnake98, shibechef, Siginanto, signalsender, SignalWalker, siigiil, silicon14wastaken, Silverfur-underscore, Simyon264, sirdragooon, Sirionaut, sirwarock, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skybailey-dev, skye, Skyedra, SlamBamActionman, slarticodefast, Slava0135, sleepyyapril, slimmslamm, Slyfox333, Smugman, SnappingOpossum, snebl, snicket, sniperchance, Snowni, snowsignal, SolidSyn, SolidusSnek, solstar2, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, soupkilove, southbridge-fur, sowelipililimute, Soydium, SpaceLizard24, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, Spangs04, spanky-spanky, Sparlight, spartak, SpartanKadence, spderman3333, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, starbuckss14, Stealthbomber16, Steffo99, stellar-novas, stewie523, stomf, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, SuperGDPWYL, superjj18, Supernorn, SurrealShibe, SweetAplle, SweptWasTaken, SyaoranFox, Sybil, SYNCHRONIC, Szunti, t, Tainakov, takemysoult, taonewt, tap, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TeenSarlacc, TekuNut, telavivgamers, telyonok, temm1ie, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, Tezzaide, TGODiamond, TGRCdev, tgrkzus, thanosdegraf, ThatGuyUSA, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, TheBlueYowie, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheFlyingSentry, TheGrimbeeper, TheIntoxicatedCat, thekilk, themias, theomund, TheProNoob678, TherapyGoth, ThereDrD0, TheSecondLord, TheShuEd, thetolbean, thevinter, TheWaffleJesus, thinbug0, ThunderBear2006, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, TiniestShark, Titian3, tk-a369, tkdrg, tmtmtl30, ToastEnjoyer, Toby222, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, tornado-technology, TornadoTechnology, tosatur, TotallyLemon, ToxicSonicFan04, Tr1bute, travis-g-reid, treytipton, trixxedbit, TrixxedHeart, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, TytosB, Tyzemol, UbaserB, Uberration, ubis1, UBlueberry, uhbg, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, unusualcrow, Uriende, UristMcDorf, user424242420, Utmanarn, Vaaankas, valentfingerov, valquaint, Varen, Vasilis, VasilisThePikachu, veliebm, Velken, VelonacepsCalyxEggs, veprolet, VerinSenpai, veritable-calamity, Veritius, Vermidia, vero5123, verslebas, vexerot, vgskye, viceemargo, VigersRay, violet754, Visne, vitopigno, vitusveit, vlad, vlados1408, VMSolidus, vmzd, VoidMeticulous, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, Vortebo, vulppine, wachte1, wafehling, walksanatora, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, whatston3, widgetbeck, Will-Oliver-Br, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, Wolfkey-SomeoneElseTookMyUsername, Worldwaker, wrexbe, wtcwr68, xeri7, xkreksx, xprospero, xRiriq, xsainteer, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, YoungThugSS14, Yousifb26, youtissoum, yunii, yuriykiss, YuriyKiss, zach-hill, Zadeon, Zalycon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zHonys, zionnBE, ZNixian, Zokkie, ZoldorfTheWizard, zonespace27, Zylofan, Zymem, zzylex +0leshe, 0tito, 0x6273, 12rabbits, 1337dakota, 13spacemen, 154942, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 27alaing, 2DSiggy, 3nderall, 4310v343k, 4dplanner, 5tickman, 612git, 778b, 96flo, aaron, abadaba695, Ablankmann, abregado, Absolute-Potato, Absotively, achookh, Acruid, ActiveMammmoth, actually-reb, ada-please, adamsong, Adeinitas, adm2play, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aearo-Deepwater, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, AftrLite, AgentSmithRadio, Agoichi, Ahion, aiden, Aidenkrz, Aisu9, ajcm, AJCM-git, AjexRose, Alekshhh, alexalexmax, alexkar598, AlexMorgan3817, alexum418, alexumandxgabriel08x, Alice4267, Alithsko, Alkheemist, alliephante, ALMv1, Alpaccalypse, Alpha-Two, AlphaQwerty, Altoids1, amatwiedle, amylizzle, ancientpower, Andre19926, Andrew-Fall, AndrewEyeke, AndrewFenriz, AndreyCamper, anri, Anzarot121, ApolloVector, Appiah, ar4ill, Arcane-Waffle, archee1, ArchPigeon, ArchRBX, areitpog, Arendian, areyouconfused, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, Artxmisery, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, Atakku, august-sun, AutoOtter, AverageNotDoingAnythingEnjoyer, avghdev, AwareFoxy, Awlod, AzzyIsNotHere, azzyisnothere, B-Kirill, B3CKDOOR, baa14453, BackeTako, BadaBoomie, Bakke, BananaFlambe, Baptr0b0t, BarryNorfolk, BasedUser, beck-thompson, beesterman, bellwetherlogic, ben, benbryant0, benev0, benjamin-burges, BGare, bhespiritu, bibbly, BigfootBravo, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blitzthesquishy, Blobadoodle, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, Bokser815, bolantej, Booblesnoot42, Boolean-Buckeye, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, breeplayx3, BriBrooo, Bright0, BRINGit34, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, BWTCK, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, Camdot, capnsockless, CaptainMaru, captainsqrbeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, catdotjs, catlord, Catofquestionableethics, CatTheSystem, CawsForConcern, Centronias, Chaboricks, chairbender, Chaoticaa, Charlese2, charlie, chartman, ChaseFlorom, chavonadelal, Cheackraze, CheddaCheez, cheesePizza2, CheesePlated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbicous, Chubbygummibear, Ciac32, ciaran, citrea, civilCornball, claustro305, Clement-O, cloudyias, clyf, Clyybber, CMDR-Piboy314, cnv41, coco, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, Compilatron144, CookieMasterT, coolboy911, CoolioDudio, coolmankid12345, Coolsurf6, cooperwallace, corentt, CormosLemming, CrafterKolyan, CraftyRenter, crazybrain23, Crazydave91920, creadth, CrigCrag, CroilBird, Crotalus, CrudeWax, cryals, CrzyPotato, cubixthree, cutemoongod, Cyberboss, d34d10cc, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, dan, dangerrevolution, daniel-cr, DanSAussieITS, Daracke, Darkenson, david, DawBla, Daxxi3, dch-GH, ddeegan, de0rix, Deahaka, dean, DEATHB4DEFEAT, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DeepwaterCreations, Deerstop, degradka, Delete69, deltanedas, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, devinschubert14, dexlerxd, dffdff2423, DieselMohawk, DieselMohawkTheSequel, digitalic, Dimastra, DinnerCalzone, DinoWattz, Disp-Dev, DisposableCrewmember42, dissidentbullet, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, DR-DOCTOR-EVIL-EVIL, Dragonjspider, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, DuckManZach, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, dylanstrategie, dylanwhittingham, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, Ekkosangen, ElectroSR, elsie, elthundercloud, Elysium206, emberwinters, Emisse, emmafornash, EmoGarbage404, Endecc, EnrichedCaramel, Entvari, eoineoineoin, ephememory, eris, erohrs2, ERORR404V1, Errant-4, ertanic, esguard, estacaoespacialpirata, eugene, ewokswagger, exincore, exp111, f0x-n3rd, F1restar4, FacePluslll, Fahasor, FairlySadPanda, farrellka-dev, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, firenamefn, Firewars763, FirinMaLazors, Fishfish458, fl-oz, Flareguy, flashgnash, FlipBrooke, FluffiestFloof, FluffMe, FluidRock, flymo5678, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, foxhorn, freeman2651, freeze2222, frobnic8, Froffy025, Fromoriss, froozigiusz, FrostMando, FrostRibbon, Funce, FungiFellow, FunkySphere, FunTust, Futuristic-OK, GalacticChimp, gamer3107, Gamewar360, gansulalan, GaussiArson, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, Gentleman-Bird, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, GitHubUser53123, gituhabu, GlassEclipse, GnarpGnarp, GNF54, godisdeadLOL, goet, GoldenCan, Goldminermac, Golinth, golubgik, GoodWheatley, Gorox221, GR1231, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, GreyMario, GrownSamoyedDog, GTRsound, gusxyz, Gyrandola, h3half, hamurlik, Hanzdegloker, HappyRoach, Hardly3D, harikattar, Hayden, he1acdvv, Hebi, Helix-ctrl, helm4142, Henry, HerCoyote23, Hi-Im-Shot, HighTechPuddle, Hitlinemoss, hiucko, hivehum, Hmeister-fake, Hmeister-real, Hobbitmax, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, hoshizora-sayo, Hreno, Hrosts, htmlsystem, Huaqas, hubismal, Hugal31, Hyenh, hyperb1, hyperDelegate, hyphenationc, i-justuser-i, iaada, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imatsoup, IMCB, impubbi, imrenq, imweax, indeano, Injazz, Insineer, insoPL, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, JackRyd3r, jacksonzck, Jacktastic09, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jarmer123, Jaskanbe, JasperJRoth, jbox144, JCGWE30, jerryimmouse, JerryImMouse, Jessetriesagain, jessicamaybe, JesterX666, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jkwookee, jmcb, JohnGinnane, johnku1, Jophire, Jopogrechkin, joshepvodka, JpegOfAFrog, jproads, JrInventor05, Jrpl, jukereise, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, JustinWinningham, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, kaiserbirch, KaiShibaa, kalane15, kalanosh, KamTheSythe, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KieueCaprie, Kimpes, KingFroozy, kira-er, kiri-yoshikage, Kirillcas, Kirus59, Kistras, Kit, Kit0vras, KittenColony, Kittygyat, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kontakt, kosticia, koteq, kotobdev, Kowlin, KrasnoshchekovPavel, Krosus777, Krunklehorn, Kryyto, Kupie, kxvvv, Kyoth25f, kyupolaris, kzhanik, LaCumbiaDelCoronavirus, lajolico, Lamrr, lanedon, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leah, leander-0, leonardo-dabepis, leonidussaks, leonsfriedrich, LeoSantich, LetterN, lettern, Level10Cybermancer, LEVELcat, lever1209, LevitatingTree, Lgibb18, lgruthes, LightVillet, lilazero, liltenhead, linkbro1, linkuyx, Litraxx, little-meow-meow, LittleBuilderJane, LittleNorthStar, LittleNyanCat, lizelive, ljm862, lmsnoise, localcc, lokachop, lolman360, Lomcastar, Lordbrandon12, LordCarve, LordEclipse, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luegamer, luizwritescode, Lukasz825700516, luminight, lunarcomets, Lusatia, Luxeator, lvvova1, Lyndomen, lyroth001, lzimann, M1tht1c, M3739, M4rchy-S, M87S, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, magnuscrowe, maland1, malchanceux, MaloTV, ManelNavola, manelnavola, Mangohydra, marboww, Markek1, MarkerWicker, marlyn, matt, Matz05, max, MaxNox7, maylokana, MDuch369, meganerobot, MehimoNemo, Mehnix, MeltedPixel, memeproof, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, mifia, MilenVolf, MilonPL, Minemoder5000, Minty642, minus1over12, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterImp, MisterMecky, Mith-randalf, Mixelz, mjarduk, MjrLandWhale, mkanke-real, MLGTASTICa, mnva0, moderatelyaware, modern-nm, mokiros, momo, Moneyl, monotheonist, Moomoobeef, moony, Morb0, MossyGreySlope, mqole, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, mtrs163, muburu, MureixloI, murolem, murphyneko, musicmanvr, MWKane, Myakot, Myctai, N3X15, nabegator, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikitosych, nikthechampiongr, Nimfar11, ninruB, Nirnael, NIXC, nkokic, NkoKirkto, nmajask, noctyrnal, noelkathegod, noirogen, nok-ko, NonchalantNoob, NoobyLegion, Nopey, NoreUhh, not-gavnaed, notafet, notquitehadouken, notsodana, noudoit, noverd, Nox38, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, Nyxilath, och-och, OctoRocket, OldDanceJacket, OliverOtter, onesch, OneZerooo0, OnsenCapy, OnyxTheBrave, opl-, Orange-Winds, OrangeMoronage9622, OrbitSystem07, Orsoniks, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paige404, paigemaeforrest, pali6, Palladinium, Pangogie, panzer-iv1, partyaddict, patrikturi, PaulRitter, pavlockblaine03, peccneck, Peptide90, peptron1, perryprog, PeterFuto, PetMudstone, pewter-wiz, PGrayCS, pgraycs, Pgriha, phantom-lily, pheenty, philingham, Phill101, Phooooooooooooooooooooooooooooooosphate, phunnyguy, PicklOH, PilgrimViis, Pill-U, pinkbat5, Piras314, Pireax, Pissachu, pissdemon, Pixel8-dev, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, poeMota, pofitlo, pointer-to-null, pok27, Pok27, poklj, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, PotRoastPiggy, Princess-Cheeseballs, ProfanedBane, PROG-MohamedDwidar, Prole0, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykana, psykzz, PuceTint, pumkin69, PuroSlavKing, PursuitInAshes, Putnam3145, py01, Pyrovi, qrtDaniil, qrwas, Quantum-cross, quasr-9, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, RamZ, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, RedBookcase, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, ReeZer2, RemberBM, RemieRichards, RemTim, rene-descartes2021, Renlou, retequizzle, rhailrake, rhsvenson, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, rlebell33, RobbyTheFish, robinthedragon, Rockdtben, Rohesie, rok-povsic, rokudara-sen, rolfero, RomanNovo, rosieposieeee, Roudenn, router, ruddygreat, rumaks, RumiTiger, Ruzihm, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, Samuka-C, SaphireLattice, SapphicOverload, sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, ScholarNZL, schrodinger71, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, SeamLesss, Segonist, semensponge, sephtasm, ser1-1y, Serkket, sewerpig, SG6732, sh18rw, Shaddap1, ShadeAware, ShadowCommander, shadowtheprotogen546, shaeone, shampunj, shariathotpatrol, SharkSnake98, shibechef, Siginanto, signalsender, SignalWalker, siigiil, silicon14wastaken, Silverfur-underscore, Simyon264, sirdragooon, Sirionaut, SirWarock, Sk1tch, SkaldetSkaeg, Skarletto, Skybailey-dev, skye, Skyedra, SlamBamActionman, slarticodefast, Slava0135, sleepyyapril, slimmslamm, Slyfox333, Smugman, SnappingOpossum, snebl, snicket, sniperchance, Snowni, snowsignal, SolidSyn, SolidusSnek, solstar2, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, soupkilove, southbridge-fur, sowelipililimute, Soydium, SpaceLizard24, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, Spangs04, spanky-spanky, Sparlight, spartak, SpartanKadence, spderman3333, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, starbuckss14, Stealthbomber16, Steffo99, stellar-novas, stewie523, stomf, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, SuperGDPWYL, superjj18, Supernorn, SurrealShibe, SweetAplle, SweptWasTaken, SyaoranFox, Sybil, SYNCHRONIC, Szunti, t, Tainakov, takemysoult, taonewt, tap, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TeenSarlacc, TekuNut, telavivgamers, telyonok, temm1ie, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, Tezzaide, TGODiamond, TGRCdev, tgrkzus, thanosdegraf, ThatGuyUSA, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, TheBlueYowie, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheFlyingSentry, TheGrimbeeper, TheIntoxicatedCat, thekilk, themias, theomund, TheProNoob678, TherapyGoth, ThereDrD0, TheSecondLord, TheShuEd, thetolbean, thevinter, TheWaffleJesus, thinbug0, ThunderBear2006, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, TiniestShark, Titian3, tk-a369, tkdrg, tmtmtl30, ToastEnjoyer, Toby222, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, tornado-technology, TornadoTechnology, tosatur, TotallyLemon, ToxicSonicFan04, Tr1bute, travis-g-reid, treytipton, trixxedbit, TrixxedHeart, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, TytosB, Tyzemol, UbaserB, Uberration, ubis1, UBlueberry, uhbg, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, unusualcrow, Uriende, UristMcDorf, user424242420, Utmanarn, Vaaankas, valentfingerov, valquaint, Varen, Vasilis, VasilisThePikachu, veliebm, Velken, VelonacepsCalyxEggs, veprolet, VerinSenpai, veritable-calamity, Veritius, Vermidia, vero5123, verslebas, vexerot, vgskye, viceemargo, VigersRay, violet754, Visne, vitopigno, vitusveit, vlad, vlados1408, VMSolidus, vmzd, VoidMeticulous, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, Vortebo, vulppine, wachte1, wafehling, walksanatora, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, whatston3, widgetbeck, Will-Oliver-Br, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, Wolfkey-SomeoneElseTookMyUsername, Worldwaker, wrexbe, wtcwr68, xeri7, xkreksx, xprospero, xRiriq, xsainteer, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, YoungThugSS14, Yousifb26, youtissoum, yunii, YuriyKiss, yuriykiss, zach-hill, Zadeon, Zalycon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zHonys, zionnBE, ZNixian, Zokkie, ZoldorfTheWizard, zonespace27, Zylofan, Zymem, zzylex From 16cfbd3d14c3860ffc84c6051057e7d5b1e36ef5 Mon Sep 17 00:00:00 2001 From: Connor Huffine Date: Sat, 1 Nov 2025 21:08:19 -0400 Subject: [PATCH 086/121] Remove warning from CloningPodSystem (#41246) * Change raw string to protoId * Address comment --- Content.Server/Cloning/CloningPodSystem.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Content.Server/Cloning/CloningPodSystem.cs b/Content.Server/Cloning/CloningPodSystem.cs index 2f113bee57..67d6dc39a6 100644 --- a/Content.Server/Cloning/CloningPodSystem.cs +++ b/Content.Server/Cloning/CloningPodSystem.cs @@ -29,6 +29,7 @@ using Robust.Shared.Containers; using Robust.Shared.Physics.Components; using Robust.Shared.Prototypes; using Robust.Shared.Random; +using Content.Shared.Chemistry.Reagent; namespace Content.Server.Cloning; @@ -58,6 +59,7 @@ public sealed class CloningPodSystem : EntitySystem public readonly Dictionary ClonesWaitingForMind = new(); public readonly ProtoId SettingsId = "CloningPod"; public const float EasyModeCloningCost = 0.7f; + private static readonly ProtoId BloodId = "Blood"; public override void Initialize() { @@ -302,7 +304,7 @@ public sealed class CloningPodSystem : EntitySystem while (i < 1) { tileMix?.AdjustMoles(Gas.Ammonia, 6f); - bloodSolution.AddReagent("Blood", 50); + bloodSolution.AddReagent(BloodId, 50); if (_robustRandom.Prob(0.2f)) i++; } From 101a5bbc9f664b6a24a17cfb8f8eaa53aa624811 Mon Sep 17 00:00:00 2001 From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> Date: Sun, 2 Nov 2025 07:06:25 -0800 Subject: [PATCH 087/121] Cleanup and document AirtightData/MonstermosInfo (#41258) cleanup and document airtightdata/monstermosinfo --- .../EntitySystems/AtmosphereSystem.Utils.cs | 17 +- Content.Server/Atmos/MonstermosInfo.cs | 208 ++++++++++++------ 2 files changed, 154 insertions(+), 71 deletions(-) diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Utils.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Utils.cs index 36355d7ba0..596368f000 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Utils.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Utils.cs @@ -61,7 +61,22 @@ public partial class AtmosphereSystem return Atmospherics.CellVolume * mapGrid.TileSize * tiles; } - public readonly record struct AirtightData(AtmosDirection BlockedDirections, bool NoAirWhenBlocked, + /// + /// Data on the airtightness of a . + /// Cached on the and updated during + /// if it was invalidated. + /// + /// The current directions blocked on this tile. + /// This is where air cannot flow to. + /// Whether the tile can have air when blocking directions. + /// Common for entities like thin windows which only block one face but can still have air in the residing tile. + /// If true, Atmospherics will generate air (yes, creating matter from nothing) + /// using the adjacent tiles as a seed if the airtightness is removed and the tile has no air. + /// This allows stuff like airlocks that void air when becoming airtight to keep opening/closing without + /// draining a room by continuously voiding air. + public readonly record struct AirtightData( + AtmosDirection BlockedDirections, + bool NoAirWhenBlocked, bool FixVacuum); private void UpdateAirtightData(EntityUid uid, GridAtmosphereComponent atmos, MapGridComponent grid, TileAtmosphere tile) diff --git a/Content.Server/Atmos/MonstermosInfo.cs b/Content.Server/Atmos/MonstermosInfo.cs index 810ce71d2c..67995b5fb5 100644 --- a/Content.Server/Atmos/MonstermosInfo.cs +++ b/Content.Server/Atmos/MonstermosInfo.cs @@ -1,80 +1,148 @@ using Content.Shared.Atmos; -namespace Content.Server.Atmos +namespace Content.Server.Atmos; + +/// +/// Atmospherics class that stores data on tiles for Monstermos calculations and operations. +/// +public struct MonstermosInfo { - public struct MonstermosInfo + /// + /// The last cycle this tile was processed for monstermos calculations. + /// Used to determine if Monstermos has already processed this tile in the + /// current tick's processing run. + /// + [ViewVariables] + public int LastCycle; + + /// + /// The last global cycle (on the GridAtmosphereComponent) this tile was processed for + /// monstermos calculations. + /// Monstermos can process multiple groups, and these groups may intersect with each other. + /// This allows Monstermos to check if a tile belongs to another group that has already been processed, + /// and skip processing it again. + /// + /// Used for exploring the current area for determining tiles that should be equalized + /// using a BFS fill (see https://en.wikipedia.org/wiki/Breadth-first_search) + /// + [ViewVariables] + public long LastQueueCycle; + + /// + /// Similar to . Monstermos performs a second slow pass after the main + /// BFS fill in order to build a gradient map to determine transfer directions and amounts. + /// This field also tracks if we've already processed this tile in that slow pass so we don't re-queue it. + /// + [ViewVariables] + public long LastSlowQueueCycle; + + /// + /// Difference in the amount of moles in this tile compared to the tile's neighbors. + /// Used to determine "how strongly" air wants to flow in/out of this tile from/to its neighbors. + /// + [ViewVariables] + public float MoleDelta; + + /// + /// Number of moles that are going to be transferred in this direction during final equalization. + /// + [ViewVariables] + public float TransferDirectionEast; + + /// + /// Number of moles that are going to be transferred in this direction during final equalization. + /// + [ViewVariables] + public float TransferDirectionWest; + + /// + /// Number of moles that are going to be transferred in this direction during final equalization. + /// + [ViewVariables] + public float TransferDirectionNorth; + + /// + /// Number of moles that are going to be transferred in this direction during final equalization. + /// + [ViewVariables] + public float TransferDirectionSouth; + + /// + /// Number of moles that are going to be transferred to this tile during final equalization. + /// You can think of this as molar flow rate, or the amount of air currently flowing through this tile. + /// Used for space wind and airflow sounds during explosive decompression or big movements. + /// + /// During equalization calculations, Monstermos determines how much air is going to be transferred + /// between tiles, and sums that up into this field. It then either + /// + /// determines how many moles to transfer in the direction of , or + /// + /// determines how many moles to move in each direction using , + /// setting the TransferDirection fields accordingly based on the ratio obtained + /// from . + /// + [ViewVariables] + public float CurrentTransferAmount; + + /// + /// A pointer from the current tile to the direction in which air is being transferred the most. + /// + [ViewVariables] + public AtmosDirection CurrentTransferDirection; + + /// + /// Marks this tile as being equalized using the O(n log n) algorithm. + /// + [ViewVariables] + public bool FastDone; + + /// + /// Gets or sets the TransferDirection in the given direction. + /// + /// + /// Thrown when an invalid direction is given + /// (a non-cardinal direction) + public float this[AtmosDirection direction] { - [ViewVariables] - public int LastCycle; - - [ViewVariables] - public long LastQueueCycle; - - [ViewVariables] - public long LastSlowQueueCycle; - - [ViewVariables] - public float MoleDelta; - - [ViewVariables] - public float TransferDirectionEast; - - [ViewVariables] - public float TransferDirectionWest; - - [ViewVariables] - public float TransferDirectionNorth; - - [ViewVariables] - public float TransferDirectionSouth; - - [ViewVariables] - public float CurrentTransferAmount; - - [ViewVariables] - public AtmosDirection CurrentTransferDirection; - - [ViewVariables] - public bool FastDone; - - public float this[AtmosDirection direction] - { - get => - direction switch - { - AtmosDirection.East => TransferDirectionEast, - AtmosDirection.West => TransferDirectionWest, - AtmosDirection.North => TransferDirectionNorth, - AtmosDirection.South => TransferDirectionSouth, - _ => throw new ArgumentOutOfRangeException(nameof(direction)) - }; - - set + get => + direction switch { - switch (direction) - { - case AtmosDirection.East: - TransferDirectionEast = value; - break; - case AtmosDirection.West: - TransferDirectionWest = value; - break; - case AtmosDirection.North: - TransferDirectionNorth = value; - break; - case AtmosDirection.South: - TransferDirectionSouth = value; - break; - default: - throw new ArgumentOutOfRangeException(nameof(direction)); - } + AtmosDirection.East => TransferDirectionEast, + AtmosDirection.West => TransferDirectionWest, + AtmosDirection.North => TransferDirectionNorth, + AtmosDirection.South => TransferDirectionSouth, + _ => throw new ArgumentOutOfRangeException(nameof(direction)) + }; + + set + { + switch (direction) + { + case AtmosDirection.East: + TransferDirectionEast = value; + break; + case AtmosDirection.West: + TransferDirectionWest = value; + break; + case AtmosDirection.North: + TransferDirectionNorth = value; + break; + case AtmosDirection.South: + TransferDirectionSouth = value; + break; + default: + throw new ArgumentOutOfRangeException(nameof(direction)); } } + } - public float this[int index] - { - get => this[(AtmosDirection) (1 << index)]; - set => this[(AtmosDirection) (1 << index)] = value; - } + /// + /// Gets or sets the TransferDirection by index. + /// + /// The index of the direction + public float this[int index] + { + get => this[(AtmosDirection) (1 << index)]; + set => this[(AtmosDirection) (1 << index)] = value; } } From fde820fb3a65501750443dd000a10ba1c8bc58df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=81da?= Date: Sun, 2 Nov 2025 09:09:12 -0600 Subject: [PATCH 088/121] Document tags.yml: R-Z (#41257) * the letter R * the letter S * extras * the letter T * the letter U * the letter V * the letter W * the final letter ( X ) --------- Co-authored-by: iaada --- .../Smokeables/Cigarettes/rolling_paper.yml | 5 - .../Objects/Materials/Sheets/other.yml | 4 - .../Entities/Objects/Misc/folders.yml | 3 - .../Guns/Ammunition/Magazines/pistol.yml | 3 - .../Weapons/Guns/Launchers/launchers.yml | 6 - .../Weapons/Guns/Revolvers/revolvers.yml | 4 - Resources/Prototypes/Voice/speech_emotes.yml | 20 +- Resources/Prototypes/tags.yml | 281 +++++++++--------- 8 files changed, 154 insertions(+), 172 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml index d28fd027e5..01a203bcfe 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml @@ -27,11 +27,6 @@ id: PackPaperRollingFilters description: A pack of filters and thin pieces of paper used to make fine smokeables. components: - - type: Storage # Redundant - whitelist: - tags: - - RollingPaper - - CigFilter - type: StorageFill contents: - id: PaperRolling diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml index 7634f8e3a7..66edafe763 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml @@ -108,10 +108,6 @@ - ReagentId: Plasma Quantity: 10 canReact: false - - type: Tag # Redundant - tags: - - Sheet - - ConstructionMaterial - type: entity parent: SheetPlasma diff --git a/Resources/Prototypes/Entities/Objects/Misc/folders.yml b/Resources/Prototypes/Entities/Objects/Misc/folders.yml index c24694fefa..e4e0896003 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/folders.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/folders.yml @@ -319,9 +319,6 @@ - type: Storage grid: - 0,0,5,3 - whitelist: # Redundant - tags: - - Document - type: ItemMapper mapLayers: clipboard_paper: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml index 47c09282c6..9320e1627f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml @@ -337,9 +337,6 @@ components: - type: BallisticAmmoProvider proto: CartridgePistol - whitelist: # Redundant - tags: - - CartridgePistol soundInsert: path: /Audio/Weapons/Guns/MagIn/bullet_insert.ogg - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index 7a2b44e615..7229fa0923 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -425,9 +425,6 @@ description: It fires large meteors. components: - type: BallisticAmmoProvider - whitelist: # Redundant - tags: - - CartridgeRocket proto: MeteorMedium - type: entity @@ -438,7 +435,4 @@ description: It fires slow immovable rods. components: - type: BallisticAmmoProvider - whitelist: # Redundant - tags: - - CartridgeRocket proto: ImmovableRodSlow diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index 1ea835a2cd..7d234d5e1e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -153,10 +153,6 @@ suffix: armor-piercing components: - type: RevolverAmmoProvider - whitelist: # Redundant - tags: - - CartridgeMagnum - - SpeedLoaderMagnum proto: CartridgeMagnumAP diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml index 811c1d3b82..cce5be1c42 100644 --- a/Resources/Prototypes/Voice/speech_emotes.yml +++ b/Resources/Prototypes/Voice/speech_emotes.yml @@ -208,8 +208,8 @@ components: - Vocal blacklist: - components: - - BorgChassis + tags: + - SiliconEmotes chatMessages: ["chat-emote-msg-bark"] chatTriggers: - bark @@ -226,8 +226,8 @@ components: - Vocal blacklist: - components: - - BorgChassis + tags: + - SiliconEmotes chatMessages: ["chat-emote-msg-snarl"] chatTriggers: - snarl @@ -244,8 +244,8 @@ components: - Vocal blacklist: - components: - - BorgChassis + tags: + - SiliconEmotes chatMessages: ["chat-emote-msg-whine"] chatTriggers: - whine @@ -262,8 +262,8 @@ components: - Vocal blacklist: - components: - - BorgChassis + tags: + - SiliconEmotes chatMessages: ["chat-emote-msg-howl"] chatTriggers: - howl @@ -280,8 +280,8 @@ components: - Vocal blacklist: - components: - - BorgChassis + tags: + - SiliconEmotes chatMessages: ["chat-emote-msg-growl"] chatTriggers: - growl diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index a974fa8b6f..cec1aa4baa 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -230,7 +230,8 @@ id: CannotSuicide # Used by SuicideSystem. Tagged entities ghost when attempting to suicide. - type: Tag - id: CanPilot # Used by ShuttleConsoleSystem to guard who's allowed to pilot ships. + id: CanPilot # Used by ShuttleConsoleSystem to guard who's allowed to pilot ships. Semi-synonymous with a sentient person/creature. + # Storage whitelist: BodyBag, MachineArtifactCrusher - type: Tag id: CaptainSabre # Storage whitelist: ClothingBeltSheath. ItemMapper: ClothingBeltSheath @@ -710,7 +711,7 @@ ## H ## - type: Tag - id: Hamster # Pilot whitelist: MechHamtr + id: Hamster # storage whitelist: MechHamtr - type: Tag id: HamsterWearable # Used by inventoryTemplate:hamster to whitelist clothes wearable by brown rats @@ -880,7 +881,8 @@ id: Knife # MachineBoard construction: BiomassReclaimerMachineCircuitboard. Storage whitelist: ClothingShoesMilitaryBase, ClothingShoesClownBase - type: Tag - id: KnockdownImmune # Blacklisted by MobStandStatusEffectBase + id: KnockdownImmune # Tagged mob entity is immune to knockdown I'm guessing. (no implementations of MobStandStatusEffectBase). + # Blacklist on MobStandStatusEffectBase. ## L ## @@ -1039,7 +1041,7 @@ id: NoConsoleSound # Blacklist on BaseComputer, StationMap. Tagged entity will not make sound when opening the UI. - type: Tag - id: NozzleBackTank # Storage whitelist: WeaponSprayNozzle + id: NozzleBackTank # Used by WeaponSprayNozzle to find a tagged entity for supplying ammo. - type: Tag id: Nugget # ItemCounter: FoodBoxNugget @@ -1214,288 +1216,288 @@ ## R ## - type: Tag - id: Radio + id: Radio # Storage whitelist: BaseClothingBeltEngineering, ClothingBeltMedical, ClothingBeltSecurity. + # CargoBounty: BountyRadio. ConstructionGraph: HudMedSec - type: Tag - id: RawMaterial + id: RawMaterial # MaterialStorage whitelist for many machines and lathes. Storage whitelist: MaterialBag # Give this to something that doesn't need any special recycler behavior and just needs deleting. - type: Tag id: Recyclable - type: Tag - id: ReinforcedGlassShard + id: ReinforcedGlassShard # ConstructionGraph: ReinforcedShiv, SpearReinforced - type: Tag - id: RemoteSignaller + id: RemoteSignaller # Storage whitelist: BaseClothingBeltEngineering - type: Tag - id: ReptilianFood + id: ReptilianFood # SpecialDigestible: OrganReptilianStomach - type: Tag - id: RifleStock + id: RifleStock # ConstructionGraph: ImprovisedShotgunGraph - type: Tag - id: Ring + id: Ring # CargoBounty: BountyRing - type: Tag - id: RipleyCentralControlModule + id: RipleyCentralControlModule # ConstructionGraph: Ripley - type: Tag - id: RipleyPeripheralsControlModule + id: RipleyPeripheralsControlModule # ConstructionGraph: Ripley - type: Tag - id: RipleyLArm + id: RipleyLArm # PartAssembly: RipleyHarness. ItemMapper: RipleyHarness - type: Tag - id: RipleyLLeg + id: RipleyLLeg # PartAssembly: RipleyHarness. ItemMapper: RipleyHarness - type: Tag - id: RipleyRArm + id: RipleyRArm # PartAssembly: RipleyHarness. ItemMapper: RipleyHarness - type: Tag - id: RipleyRLeg + id: RipleyRLeg # PartAssembly: RipleyHarness. ItemMapper: RipleyHarness - type: Tag - id: RodMetal1 + id: RodMetal1 # Unused (Exists on PartRodMetal1, PartRodMetal10) - type: Tag - id: RollingPaper + id: RollingPaper # Storage whitelist: PackPaperRolling, PackPaperRollingFilters - type: Tag - id: RollingPin + id: RollingPin # Storage whitelist: ClothingBeltChef. ItemMapper: ClothingBeltChef - type: Tag - id: Ruminant + id: Ruminant # SpecialDigestible: OrganAnimalRuminantStomach ## S ## - type: Tag - id: SaltShaker + id: SaltShaker # Storage whitelist: ClothingBeltChef. ItemMapper: ClothingBeltChef + +- type: Tag # Used on DungeonRoom prototypes. + id: SalvageExperiment # PrefabDunGen whitelist on Experiment DungeonConfig. - type: Tag - id: SalvageExperiment + id: SalvageScrap # CargoBounty: BountySalvageScrap - type: Tag - id: SalvageScrap + id: Scarf # CargoBounty: BountyWarmCloth - type: Tag - id: Scarf - -- type: Tag - id: Screwdriver + id: Screwdriver # Storage whitelist: BaseClothingBeltEngineering. ItemMapper: BaseClothingBeltEngineering - type: Tag # Flags items that scurrets can wear in their back and outerwear slots. id: ScurretWearable - type: Tag - id: SecBeltEquip + id: SecBeltEquip # Storage whitelist: ClothingBeltSecurity - type: Tag - id: SecurePlasmaWindoor + id: SecurePlasmaWindoor # Used in ConstructionGraph "Windoor" to navigate between Windoor, PlasmaWindoor, and UraniumWindoor airlocks. - type: Tag - id: SecureUraniumWindoor + id: SecureUraniumWindoor # Used in ConstructionGraph "Windoor" to navigate between Windoor, PlasmaWindoor, and UraniumWindoor airlocks. - type: Tag - id: SecureWindoor + id: SecureWindoor # Used in ConstructionGraph "Windoor" to navigate between Windoor, PlasmaWindoor, and UraniumWindoor airlocks. - type: Tag - id: SecurityHelmet + id: SecurityHelmet # ConstructionGraph: HelmetJustice - type: Tag - id: SecwayKeys + id: SecwayKeys # Unused x2 - type: Tag - id: Sheet + id: Sheet # MaterialStorage whitelist for many machines and lathes. Storage whitelist: MaterialBag - type: Tag - id: ShellShotgun + id: ShellShotgun # Ammo: AmmoProviderShotgunShell, ClothingBeltBandolier, BaseMagazineShotgun, BaseWeaponShotgun, WeaponFlareGunSecurity - type: Tag - id: ShellShotgunLight # shotgun shells that are compatible with the flare gun. + id: ShellShotgunLight # Shotgun shells that are compatible with the flare gun. Subset of ShellShotgun. - type: Tag - id: Shiv + id: Shiv # CargoBounty: BountyShiv - type: Tag - id: Shovel + id: Sidearm # Storage whitelist: ClothingBeltSecurity, ClothingShoesMilitaryBase - type: Tag - id: Sidearm - -- type: Tag - id: SignalTrigger + id: SignalTrigger # ConstructionGraph: GlassBox - type: Tag id: SilentStorageUser # used in SharedStorageSystem, so the entity will do all silently - type: Tag - id: SiliconEmotes + id: SiliconEmotes # Whitelisted and blacklisted in various EmotePrototypes to create a silicon emote group. - type: Tag - id: SkeletonMotorcycleKeys + id: SkeletonMotorcycleKeys # Unused x2 - type: Tag id: Skewer # Food sequence key -- type: Tag - id: Slice # sliced fruit, vegetables, pizza etc. +- type: Tag # sliced fruit, vegetables, pizza etc. + id: Slice # CargoBounty blacklist: BountyFruit, BountyVegetable, BountyBread, BountyPie - type: Tag - id: SlowImmune + id: SlowImmune # Tagged mob entity cannot gain the slowed status effect. Blacklist on StatusEffectSlowdown. - type: Tag - id: SmallAIChip + id: SmallAIChip # ConstructionGraph: PotatoAI + +- type: Tag # Used on mech equipment. + id: SmallMech # Equipment whitelist on MechHamtr - type: Tag - id: SmallMech + id: Smokable # Storage whitelist: BaseSmokingPipe (and children) + +- type: Tag # Used on DungeonRoom prototypes. + id: SnowyLabs # PrefabDunGen whitelist on SnowyLabs DungeonConfig. - type: Tag - id: Smokable + id: Soap # Storage whitelist: BorgModuleCustodial, ClothingBeltJanitor. CargoBounty: BountySoap - type: Tag - id: SnowyLabs + id: SolarTrackerElectronics # ConstructionGraph: SolarPanel - type: Tag - id: Soap + id: Soup # CargoBounty: BountySoup - type: Tag - id: SolarTrackerElectronics + id: Spear # CargoBounty: BountySpear - type: Tag - id: Soup + id: SpeedLoaderCap # Ammo: RevolverCapGun, RevolverCapGunFake - type: Tag - id: Spear + id: SpeedLoaderMagnum # Ammo: BaseWeaponRevolver, XenoArtifactGun - type: Tag - id: SpeedLoaderCap + id: SpeedLoaderPistol # Unused (Exists on BaseSpeedLoaderPistol) - type: Tag - id: SpeedLoaderMagnum + id: SpeedLoaderRifle # Unused (Exists on SpeedLoaderLightRifle) - type: Tag - id: SpeedLoaderPistol + id: SpiderCraft # Used on various ConstructionPrototypes to create exclusive recipes for tagged entity. - type: Tag - id: SpeedLoaderRifle + id: SpookyFog # Used by RulesPrototype SpookyFog inside AmbientMusicPrototype to play sounds when tagged entity is near the listener. - type: Tag - id: SpiderCraft + id: Spray # Storage whitelist: ClothingBeltJanitor, ClothingBeltMedical, JanitorialTrolley. + # ItemMapper: ClothingBeltJanitor, ClothingBeltMedical, JanitorialTrolley - type: Tag - id: SpookyFog + id: SprayNozzle # Storage whitelist: ClothingBackpackWaterTank. ItemMapper: ClothingBackpackWaterTank - type: Tag - id: Spray + id: SpreaderIgnore # Used by SpreaderSystem to block spreading in a direction when a tagged airtight entity is on the same tile. - type: Tag - id: SprayNozzle + id: StationAi # Storage whitelist: AiHolder - type: Tag - id: SpreaderIgnore + id: StationAiCoreElectronics # ConstructionGraph: StationAiCore - type: Tag - id: StationAi + id: StationMapElectronics # ConstructionGraph: StationMap - type: Tag - id: StationAiCoreElectronics - -- type: Tag - id: StationMapElectronics - -- type: Tag - id: Steak + id: Steak # CargoBounty: BountySteak - type: Tag id: StringInstrument # MachineBoard construction: DawInstrumentMachineCircuitboard - type: Tag - id: StunImmune + id: StunImmune # Tagged mob entity cannot gain the stunned status effect. Blacklist on StatusEffectStunned. - type: Tag - id: SubdermalImplant + id: SubdermalImplant # Storage whitelist: BaseImplanter - type: Tag - id: SuitEVA + id: SuitEVA # ConstructionGraph: ClownHardsuit, MimeHardsuit - type: Tag - id: Sunglasses + id: Sunglasses # ConstructionGraph: GlassesSecHUD - type: Tag - id: SurgeryTool + id: SurgeryTool # Storage whitelist: ClothingBeltMedical - type: Tag - id: SurveillanceCameraMonitorCircuitboard + id: SurveillanceCameraMonitorCircuitboard # ConstructionGraph: WallmountTelescreen - type: Tag - id: Syndicate + id: Syndicate # FTLDestination whitelist in nukieplanet.yml. Tag exists on ComputerShuttleSyndie and infiltrator.yml - type: Tag - id: SyndicateSegwayKeys + id: SyndicateSegwayKeys # Unused x2 - type: Tag - id: Syringe + id: Syringe # Storage whitelist: ClothingBeltPlant, ChemBag, SmartFridge. CargoBounty: BountySyringe - type: Tag - id: SyringeGunAmmo + id: SyringeGunAmmo # Storage whitelist: LauncherSyringe - type: Tag - id: Spellbook + id: Spellbook # Storage whitelist: Bookshelf ## T ## - type: Tag - id: TabletopBoard + id: TabletopBoard # Storage whitelist: BooksBag, BorgModuleService - type: Tag id: Taco # Food sequence key - type: Tag - id: TabletopPiece + id: TabletopPiece # Unused (Exists on BaseTabletopPiece) - type: Tag - id: Taser + id: Taser # Storage whitelist: ClothingBeltSecurity - type: Tag - id: TimerBrigElectronics + id: TimerBrigElectronics # ConstructionGraph: Timer - type: Tag - id: TimerScreenElectronics + id: TimerScreenElectronics # ConstructionGraph: Timer - type: Tag - id: TimerSignalElectronics + id: TimerSignalElectronics # ConstructionGraph: Timer - type: Tag - id: Toolbox + id: Toolbox # CargoBounty: BountyToolbox - type: Tag - id: ToothSharkminnow + id: ToothSharkminnow # CargoBounty: BountyTeethSharkminnow - type: Tag - id: ToothSpaceCarp + id: ToothSpaceCarp # CargoBounty: BountyTeethSpaceCarp - type: Tag - id: Torch + id: Torch # CargoBounty: BountyTorch. ConstructionGraph: PumpkinAddLight - type: Tag - id: ToteBase + id: ToteBase # Unused (Exists on ToteBase) - type: Tag - id: ToyRubberDuck + id: ToyRubberDuck # ConstructionGraph: ClothingShoeSlippersDuck - type: Tag - id: ToySidearm + id: ToySidearm # Storage whitelist: ClothingShoesClownBase - type: Tag - id: Trash + id: Trash # Tagged entities are generic garbage. They fit inside TrashBag and are destroyed by Recycler. + # CargoBounty: BountyTrash. SpecialDigestible: OrganVoxStomach - type: Tag - id: TrashBag + id: TrashBag # Storage whitelist: BoxTrashbag, ClothingBeltJanitor, JanitorialTrolley. ItemMapper: JanitorialTrolley - type: Tag - id: Truncheon + id: Truncheon # Storage whitelist: ClothingBeltSecurity - type: Tag id: TurretCompatibleWeapon # Used in the construction of sentry turrets @@ -1506,92 +1508,96 @@ ## U ## - type: Tag - id: Unimplantable + id: Unimplantable # Targeting blacklist: BaseImplanter - type: Tag id: Unstackable # To prevent things like atmos devices (filters etc) being stacked on one tile. See NoUnstackableInTile - type: Tag - id: UraniumGlassShard + id: UraniumGlassShard # ConstructionGraph: ImprovisedArrowUranium, UraniumShiv, SpearUranium - type: Tag - id: UtilityBelt + id: UtilityBelt # ConstructionGraph: scraparmor - type: Tag - id: UtilityKnife + id: UtilityKnife # Storage whitelist: BaseClothingBeltEngineering, BountyKnife ## V ## - type: Tag - id: Vegetable + id: Vegetable # CargoBounty: BountyVegetable + +- type: Tag # Used on DungeonRoom prototypes. + id: VGRoidInterior # RoomFill spawner whitelist for VGRoidInteriorRoomMarker. - type: Tag - id: VGRoidInterior + id: VimPilot # Used synonymously with harmless animals such as mice, station pets, or genetic ancestors (monkeys). + # Storage whitelist: MechVim, PetCarrier, BodyBag, MachineArtifactCrusher - type: Tag - id: VimPilot - -- type: Tag - id: VoiceTrigger + id: VoiceTrigger # ConstructionGraph: Vim ## W ## - type: Tag - id: Wall + id: Wall # Tagged entity is a wall. Several systems and several targeting whitelists (BaseMobDragon) care about this. + # .cs: SharedNavMapSystem, WallmountCondition, TileWallsCommand, DungeonJob - type: Tag - id: WallmountGeneratorAPUElectronics + id: WallmountGeneratorAPUElectronics # ConstructionGraph: WallmountGenerator - type: Tag - id: WallmountGeneratorElectronics + id: WallmountGeneratorElectronics # ConstructionGraph: WallmountGenerator - type: Tag - id: WallmountSubstationElectronics + id: WallmountSubstationElectronics # ConstructionGraph: WallmountSubstation - type: Tag - id: WeaponAntiqueLaser + id: WeaponAntiqueLaser # Storage whitelist: GlassBoxLaser - type: Tag - id: WeaponPistolCHIMPUpgradeKit + id: WeaponPistolCHIMPUpgradeKit # ConstructionGraph: UpgradeWeaponPistolCHIMP - type: Tag - id: WeaponShotgunKammerer + id: WeaponShotgunKammerer # Storage whitelist: ShotGunCabinet - type: Tag - id: WeldingMask + id: WeldingMask # Storage whitelist: BaseClothingBeltEngineering - type: Tag - id: WetFloorSign + id: WetFloorSign # Storage whitelist: ClothingBeltJanitor, JanitorialTrolley. ItemMapper: JanitorialTrolley - type: Tag - id: Wheat + id: Wheat # SpecialDigestible: OrganAnimalRuminantStomach. ConstructionGraph: StrawHat - type: Tag - id: WhitelistChameleon + id: WhitelistChameleon # Used by SharedChameleonClothingSystem to validate if tagged entity can be a disguise. - type: Tag - id: WhitelistChameleonIdCard + id: WhitelistChameleonIdCard # Chameleon key for AgentIDCard - type: Tag - id: WhitelistChameleonPDA + id: WhitelistChameleonPDA # Chameleon key for ChameleonPDA - type: Tag - id: Window + id: Window # Tagged entity is a window. Several systems and several targeting whitelists (XenoArtifactShatterWindows) care about this. + # .cs: SharedNavMapSystem, ElectrocutionSystem, RevenantSystem, NoWindowsInTile - type: Tag - id: Wine + id: Wine # CargoBounty: BountyWine - type: Tag - id: WireBrush + id: WireBrush # Storage whitelist: ClothingBeltJanitor - type: Tag - id: Wirecutter + id: Wirecutter # Storage whitelist: BaseClothingBeltEngineering. ItemMapper: BaseClothingBeltEngineering - type: Tag - id: WizardStaff + id: WizardStaff # Unused (Exists on WeaponStaffBase) - type: Tag id: WizardWand # that evil vvizard vvand + # .cs: ChargeSpellEvent. Storage whitelist: ClothingBeltWand - type: Tag id: Wooden # just like our atmos @@ -1602,33 +1608,34 @@ # MachineBoard construction: DawInstrumentMachineCircuitboard - type: Tag - id: Wrench + id: Wrench # Storage whitelist: BaseClothingBeltEngineering, ClothingBeltJanitor, ClothingBeltMedical. + # ItemMapper: BaseClothingBeltEngineering, ClothingBeltJanitor, ClothingBeltMedical - type: Tag - id: Wringer + id: Wringer # Unused (Exists on JanitorialTrolley, MopBucket) - type: Tag - id: Write + id: Write # Used by PaperSystem to make tagged entity a writing tool. Many storages whitelist this as well. - type: Tag - id: WriteIgnoreStamps + id: WriteIgnoreStamps # Used by PaperSystem to allow tagged entity to bypass stamps. ## X ## - type: Tag - id: XenoborgModuleEngi + id: XenoborgModuleEngi # Cyborg module category - type: Tag - id: XenoborgModuleGeneric + id: XenoborgModuleGeneric # Cyborg module category - type: Tag - id: XenoborgModuleHeavy + id: XenoborgModuleHeavy # Cyborg module category - type: Tag - id: XenoborgModuleScout + id: XenoborgModuleScout # Cyborg module category - type: Tag - id: XenoborgModuleStealth + id: XenoborgModuleStealth # Cyborg module category ## Y ## ## Z ## From b75571d618f2c84a333f21c06557c4191623e9bb Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 2 Nov 2025 18:03:15 -0500 Subject: [PATCH 089/121] Oasis: Rework the TEG (#40623) * Update oasis teg * Decor * Small changes --- Resources/Maps/oasis.yml | 4704 ++++++++++++-------------------------- 1 file changed, 1522 insertions(+), 3182 deletions(-) diff --git a/Resources/Maps/oasis.yml b/Resources/Maps/oasis.yml index c29ea16fcb..d44554e980 100644 --- a/Resources/Maps/oasis.yml +++ b/Resources/Maps/oasis.yml @@ -1,11 +1,11 @@ meta: format: 7 category: Map - engineVersion: 266.0.0 + engineVersion: 267.1.0 forkId: "" forkVersion: "" - time: 09/20/2025 09:29:01 - entityCount: 31382 + time: 09/30/2025 17:56:42 + entityCount: 31151 maps: - 1 grids: @@ -18,6 +18,7 @@ tilemap: 45: FloorArcadeBlue2 52: FloorAsteroidIronsand 42: FloorAsteroidSand + 59: FloorAsteroidSandUnvariantized 6: FloorAstroGrass 36: FloorAstroIce 35: FloorAstroSnow @@ -270,11 +271,11 @@ entities: version: 7 -1,2: ind: -1,2 - tiles: DAAAAAABABwAAAAAAwAMAAAAAAEADAAAAAAAAAwAAAAAAQACAAAAAAAADAAAAAAAAAwAAAAAAQAMAAAAAAIADAAAAAADAAwAAAAAAAAMAAAAAAMADAAAAAABAAIAAAAAAAARAAAAAAMAEQAAAAABAAIAAAAAAAACAAAAAAAADAAAAAACAAwAAAAAAwAMAAAAAAEAAgAAAAAAAAwAAAAAAgAMAAAAAAMADAAAAAAAAAwAAAAAAgAMAAAAAAAADAAAAAAAAAwAAAAAAAACAAAAAAAAEQAAAAADABEAAAAAAAAPAAAAAAAAAgAAAAAAAAIAAAAAAAAcAAAAAAEAAgAAAAAAAAIAAAAAAAAMAAAAAAAADAAAAAACAAwAAAAAAAAMAAAAAAEADAAAAAABAAwAAAAAAQAMAAAAAAAAAgAAAAAAABEAAAAAAgARAAAAAAIADwAAAAAAAAIAAAAAAAAMAAAAAAEADAAAAAADAAwAAAAAAAAMAAAAAAMADAAAAAABAAwAAAAAAQAMAAAAAAEADAAAAAADAAwAAAAAAgAMAAAAAAEADAAAAAAAAAIAAAAAAAARAAAAAAIAEQAAAAACAA8AAAAAAAACAAAAAAAADAAAAAABAAwAAAAAAQAMAAAAAAEADAAAAAABAAwAAAAAAgAMAAAAAAEADAAAAAABAAwAAAAAAAAMAAAAAAMADAAAAAAAAAwAAAAAAgARAAAAAAAAEQAAAAABABEAAAAAAwAPAAAAAAAADwAAAAAAAAwAAAAAAQAMAAAAAAIADAAAAAADAAwAAAAAAgAMAAAAAAAADAAAAAADAAwAAAAAAwAMAAAAAAIADAAAAAACAAwAAAAAAgAMAAAAAAMAEQAAAAAAABEAAAAAAgARAAAAAAAAAgAAAAAAAAIAAAAAAAAMAAAAAAIADAAAAAACAAwAAAAAAgAMAAAAAAIADAAAAAADAAwAAAAAAQAMAAAAAAMADAAAAAADAAwAAAAAAQAMAAAAAAMADAAAAAADAAIAAAAAAAARAAAAAAIAEQAAAAABAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAABEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAARAAAAAAMAEQAAAAACABEAAAAAAwARAAAAAAIAEQAAAAAAABEAAAAAAQARAAAAAAEAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAVAAAAAAAAEQAAAAAAACEAAAAAAAAhAAAAAAAAIQAAAAAAACEAAAAAAAARAAAAAAMAEQAAAAABAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAFQAAAAAAABEAAAAAAwAhAAAAAAAAIQAAAAAAACEAAAAAAAAhAAAAAAAAEQAAAAAAABEAAAAAAQACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAARAAAAAAMAEQAAAAADABEAAAAAAAARAAAAAAMAEQAAAAAAABEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAUAAAAAAMAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAFAAAAAADAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAABQAAAAAAQACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAFAAAAAABABQAAAAAAwAUAAAAAAEAFAAAAAADABQAAAAAAgAUAAAAAAIAAgAAAAAAAA== + tiles: DAAAAAABABwAAAAAAwAMAAAAAAEADAAAAAAAAAwAAAAAAQACAAAAAAAADAAAAAAAAAwAAAAAAQAMAAAAAAIADAAAAAADAAwAAAAAAAAMAAAAAAMADAAAAAABAAIAAAAAAAARAAAAAAMAEQAAAAABAAIAAAAAAAACAAAAAAAADAAAAAACAAwAAAAAAwAMAAAAAAEAAgAAAAAAAAwAAAAAAgAMAAAAAAMADAAAAAAAAAwAAAAAAgAMAAAAAAAADAAAAAAAAAwAAAAAAAACAAAAAAAAEQAAAAADABEAAAAAAAAPAAAAAAAAAgAAAAAAAAIAAAAAAAAcAAAAAAEAAgAAAAAAAAIAAAAAAAAMAAAAAAAADAAAAAACAAwAAAAAAAAMAAAAAAEADAAAAAABAAwAAAAAAQAMAAAAAAAAAgAAAAAAABEAAAAAAgARAAAAAAIADwAAAAAAAAIAAAAAAAAMAAAAAAEADAAAAAADAAwAAAAAAAAMAAAAAAMADAAAAAABAAwAAAAAAQAMAAAAAAEADAAAAAADAAwAAAAAAgAMAAAAAAEADAAAAAAAAAIAAAAAAAARAAAAAAIAEQAAAAACAA8AAAAAAAACAAAAAAAADAAAAAABAAwAAAAAAQAMAAAAAAEADAAAAAABAAwAAAAAAgAMAAAAAAEADAAAAAABAAwAAAAAAAAMAAAAAAMADAAAAAAAAAwAAAAAAgARAAAAAAAAEQAAAAABABEAAAAAAwAPAAAAAAAADwAAAAAAAAwAAAAAAQAMAAAAAAIADAAAAAADAAwAAAAAAgAMAAAAAAAADAAAAAADAAwAAAAAAwAMAAAAAAIADAAAAAACAAwAAAAAAgAMAAAAAAMAEQAAAAAAABEAAAAAAgARAAAAAAAAAgAAAAAAAAIAAAAAAAAMAAAAAAIADAAAAAACAAwAAAAAAgAMAAAAAAIADAAAAAADAAwAAAAAAQAMAAAAAAMADAAAAAADAAwAAAAAAQAMAAAAAAMADAAAAAADAAIAAAAAAAARAAAAAAIAEQAAAAABAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAABEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAARAAAAAAMAEQAAAAACABEAAAAAAwARAAAAAAIAEQAAAAAAABEAAAAAAQARAAAAAAEAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAVAAAAAAAAEQAAAAAAACEAAAAAAAAhAAAAAAAAIQAAAAAAACEAAAAAAAARAAAAAAMAEQAAAAABAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAFQAAAAAAABEAAAAAAwAhAAAAAAAAIQAAAAAAACEAAAAAAAAhAAAAAAAAEQAAAAAAABEAAAAAAQACAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAAIAAAAAAAARAAAAAAMAEQAAAAADABEAAAAAAAARAAAAAAMAEQAAAAAAABEAAAAAAAACAAAAAAAAAgAAAAAAAA8AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAUAAAAAAMAAgAAAAAAAA8AAAAAAAAPAAAAAAAAAgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAFAAAAAADAAIAAAAAAAAPAAAAAAAADwAAAAAAAAIAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAABQAAAAAAQACAAAAAAAADwAAAAAAAA8AAAAAAAACAAAAAAAAEQAAAAAAABEAAAAAAAARAAAAAAAAEQAAAAAAABEAAAAAAAACAAAAAAAAFAAAAAABABQAAAAAAwAUAAAAAAEAFAAAAAADABQAAAAAAgAUAAAAAAIAAgAAAAAAAA== version: 7 -2,2: ind: -2,2 - tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAwAAAAAAQAMAAAAAAIADAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAFAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA8AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAAgAAAAAAAA8AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAPAAAAAAAAAgAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAACAAAAAAAADwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA8AAAAAAAACAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAABEAAAAAAwARAAAAAAMAEQAAAAACABEAAAAAAAARAAAAAAIAEQAAAAACAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAhAAAAAAAAIQAAAAAAACEAAAAAAAAhAAAAAAAAIQAAAAAAABEAAAAAAgARAAAAAAIAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAIQAAAAAAACEAAAAAAAAhAAAAAAAAIQAAAAAAACEAAAAAAAARAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAACEAAAAAAAAhAAAAAAAAIQAAAAAAACEAAAAAAAAhAAAAAAAAEQAAAAACABEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAARAAAAAAEAEQAAAAAAABEAAAAAAgARAAAAAAEAEQAAAAAAABEAAAAAAQACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA4AAAAAAAAxAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAxAAAAAAAAMQAAAAAAAA4AAAAAAAAxAAAAAAAAMQAAAAAAADEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAADgAAAAAAADEAAAAAAAAOAAAAAAAAMQAAAAAAAA4AAAAAAAAOAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA== + tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAwAAAAAAQAMAAAAAAIADAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAFAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA8AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAAgAAAAAAAA8AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAPAAAAAAAAAgAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAACAAAAAAAADwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA8AAAAAAAACAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAABEAAAAAAwARAAAAAAMAEQAAAAACABEAAAAAAAARAAAAAAIAEQAAAAACAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAhAAAAAAAAIQAAAAAAACEAAAAAAAAhAAAAAAAAIQAAAAAAABEAAAAAAgARAAAAAAIAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAIQAAAAAAACEAAAAAAAAhAAAAAAAAIQAAAAAAACEAAAAAAAARAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAACEAAAAAAAAhAAAAAAAAIQAAAAAAACEAAAAAAAAhAAAAAAAAEQAAAAACABEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAARAAAAAAEAEQAAAAAAABEAAAAAAgARAAAAAAEAEQAAAAAAABEAAAAAAQACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA4AAAAAAAAxAAAAAAAAMQAAAAAAADEAAAAAAAAxAAAAAAAAMQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAxAAAAAAAAMQAAAAAAADEAAAAAAAAxAAAAAAAAMQAAAAAAADEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAADgAAAAAAADEAAAAAAAAOAAAAAAAADgAAAAAAADEAAAAAAAAxAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA== version: 7 -3,2: ind: -3,2 @@ -290,11 +291,11 @@ entities: version: 7 -2,3: ind: -2,3 - tiles: DgAAAAAAADEAAAAAAAAOAAAAAAAAMQAAAAAAAA4AAAAAAAAxAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA4AAAAAAAAxAAAAAAAADgAAAAAAADEAAAAAAAAOAAAAAAAAMQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAOAAAAAAAAMQAAAAAAAA4AAAAAAAAxAAAAAAAADgAAAAAAAA4AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAADgAAAAAAADEAAAAAAAAOAAAAAAAAMQAAAAAAADEAAAAAAAAxAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA4AAAAAAAAxAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAOAAAAAAAAMQAAAAAAADEAAAAAAAAxAAAAAAAAMQAAAAAAADEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAMQAAAAAAADEAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAADEAAAAAAAAxAAAAAAAAMQAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAxAAAAAAAAKgAAAAAMACoAAAAAAAAqAAAAAAYAKgAAAAAMACoAAAAAAAAqAAAAAAAAKgAAAAAAACoAAAAAAAAxAAAAAAAAMQAAAAAAADEAAAAAAAAxAAAAAAAAMQAAAAAAADEAAAAAAAAxAAAAAAAAMQAAAAAAADEAAAAAAAAqAAAAAAAAKgAAAAAAACoAAAAADAAqAAAAAAAAKgAAAAAAACoAAAAAAAAqAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAxAAAAAAAAMQAAAAAAACoAAAAAAAAqAAAAAAAAKgAAAAAIACoAAAAAAAAqAAAAAAAAAgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAKgAAAAAAACoAAAAAAAAqAAAAAAAAKgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACoAAAAAAAAqAAAAAAAAKgAAAAAAACoAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAqAAAAAAAAKgAAAAAAACoAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAKgAAAAAAACoAAAAAAAAqAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAqAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAKgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA== + tiles: DgAAAAAAADEAAAAAAAAOAAAAAAAADgAAAAAAADEAAAAAAAAxAAAAAAAAAgAAAAAAAA8AAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA4AAAAAAAAxAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAMQAAAAAAAAIAAAAAAAAPAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAOAAAAAAAAMQAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAADEAAAAAAAACAAAAAAAADwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAADgAAAAAAADEAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAxAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA4AAAAAAAAxAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAMQAAAAAAADEAAAAAAAAxAAAAAAAAMQAAAAAAADEAAAAAAAAxAAAAAAAAMQAAAAAAADEAAAAAAAAxAAAAAAAAMQAAAAAAADEAAAAAAAAOAAAAAAAAMQAAAAAAADEAAAAAAAAxAAAAAAAAMQAAAAAAADEAAAAAAAAxAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAMQAAAAAAADEAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAADEAAAAAAAAxAAAAAAAAMQAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAxAAAAAAAAMQAAAAAAADEAAAAAAAAxAAAAAAAAMQAAAAAAADEAAAAAAAAxAAAAAAAAMQAAAAAAADEAAAAAAAAxAAAAAAAAOwAAAAAAADsAAAAAAAA7AAAAAAAAOwAAAAAAADsAAAAAAAA7AAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAxAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAACoAAAAAAAAqAAAAAAAAKgAAAAAIACoAAAAAAAAqAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAMQAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAKgAAAAAAACoAAAAAAAAqAAAAAAAAKgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAADEAAAAAAAAxAAAAAAAAMQAAAAAAADEAAAAAAAAxAAAAAAAAMQAAAAAAACoAAAAAAAAqAAAAAAAAKgAAAAAAACoAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAqAAAAAAAAKgAAAAAAACoAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAKgAAAAAAACoAAAAAAAAqAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAqAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAKgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA== version: 7 -1,3: ind: -1,3 - tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAABEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAABEAAAAAAQARAAAAAAIAEQAAAAAAABEAAAAAAQARAAAAAAMAEQAAAAACABEAAAAAAQARAAAAAAAAEQAAAAACABEAAAAAAAARAAAAAAEAEQAAAAAAABEAAAAAAQACAAAAAAAAAgAAAAAAAAIAAAAAAAARAAAAAAIAEQAAAAADABEAAAAAAAARAAAAAAAAEQAAAAACABEAAAAAAAARAAAAAAAAEQAAAAACABEAAAAAAwARAAAAAAEAEQAAAAABABEAAAAAAgARAAAAAAMAAgAAAAAAAAIAAAAAAAACAAAAAAAAEQAAAAADABEAAAAAAQARAAAAAAIAEQAAAAABABEAAAAAAwACAAAAAAAADwAAAAAAAAIAAAAAAAAPAAAAAAAAAgAAAAAAABEAAAAAAgARAAAAAAIAEQAAAAACAAIAAAAAAAACAAAAAAAAAgAAAAAAABEAAAAAAwARAAAAAAAAEQAAAAACABEAAAAAAwARAAAAAAEAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAARAAAAAAAAEQAAAAABABEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAARAAAAAAEAEQAAAAACABEAAAAAAAARAAAAAAEAEQAAAAADAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAEQAAAAACABEAAAAAAAARAAAAAAMAGgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAACoAAAAAAAAqAAAAAAAAKgAAAAAAACoAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAAgAAAAAAABoAAAAAAAACAAAAAAAAGgAAAAAAAAIAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAqAAAAAAUAKgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA== + tiles: DwAAAAAAAA8AAAAAAAACAAAAAAAAEQAAAAAAABEAAAAAAAARAAAAAAAAEQAAAAAAABEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAABEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAABEAAAAAAQARAAAAAAIAEQAAAAAAABEAAAAAAQARAAAAAAMAEQAAAAACABEAAAAAAQARAAAAAAAAEQAAAAACABEAAAAAAAARAAAAAAEAEQAAAAAAABEAAAAAAQACAAAAAAAAAgAAAAAAAAIAAAAAAAARAAAAAAIAEQAAAAADABEAAAAAAAARAAAAAAAAEQAAAAACABEAAAAAAAARAAAAAAAAEQAAAAACABEAAAAAAwARAAAAAAEAEQAAAAABABEAAAAAAgARAAAAAAMAAgAAAAAAAAIAAAAAAAACAAAAAAAAEQAAAAADABEAAAAAAQARAAAAAAIAEQAAAAABABEAAAAAAwACAAAAAAAADwAAAAAAAAIAAAAAAAAPAAAAAAAAAgAAAAAAABEAAAAAAgARAAAAAAIAEQAAAAACADEAAAAAAAAxAAAAAAAAAgAAAAAAABEAAAAAAwARAAAAAAAAEQAAAAACABEAAAAAAwARAAAAAAEAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAARAAAAAAAAEQAAAAABABEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAARAAAAAAEAEQAAAAACABEAAAAAAAARAAAAAAEAEQAAAAADAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAEQAAAAACABEAAAAAAAARAAAAAAMAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAACoAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAAgAAAAAAABoAAAAAAAACAAAAAAAAGgAAAAAAAAIAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAxAAAAAAAAMQAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA== version: 7 0,3: ind: 0,3 @@ -6062,7 +6063,7 @@ entities: decals: 3572: -31,35 3929: -58,-14 - 5092: -19,43 + 5110: -22,45 - node: color: '#FFFFFFFF' id: WarnCornerSmallNW @@ -6072,14 +6073,14 @@ entities: 3573: -24,35 3928: -54,-14 3940: -56,-9 - 5093: -15,43 + 5111: -18,45 - node: color: '#FFFFFFFF' id: WarnCornerSmallSE decals: 3571: -31,37 3927: -58,-9 - 5094: -19,45 + 5109: -22,47 - node: color: '#FFFFFFFF' id: WarnCornerSmallSW @@ -6090,7 +6091,7 @@ entities: 3570: -24,37 3926: -54,-9 3939: -56,-7 - 5095: -15,45 + 5108: -18,47 - node: color: '#FFFFFFFF' id: WarnFull @@ -6121,7 +6122,7 @@ entities: 3336: -58,-10 3924: -58,-13 3945: -54,-15 - 5088: -19,44 + 5112: -22,46 - node: color: '#FFFFFFFF' id: WarnLineGreyscaleE @@ -6149,6 +6150,13 @@ entities: 3500: -5,-30 3501: -4,-30 3502: -3,-30 + - node: + color: '#0D5C6DFF' + id: WarnLineGreyscaleW + decals: + 5193: -25,47 + 5194: -25,46 + 5195: -25,45 - node: color: '#FFFFFFFF' id: WarnLineGreyscaleW @@ -6170,9 +6178,16 @@ entities: 3920: -55,-9 3934: -58,-7 3935: -57,-7 - 5089: -18,45 - 5090: -17,45 - 5091: -16,45 + 5105: -19,47 + 5106: -20,47 + 5107: -21,47 + - node: + color: '#0D5C6DFF' + id: WarnLineS + decals: + 5190: -25,47 + 5191: -25,46 + 5192: -25,45 - node: color: '#FFFFFFFF' id: WarnLineS @@ -6189,7 +6204,16 @@ entities: 3543: 21,49 3925: -54,-13 3938: -56,-8 - 5087: -15,44 + 5104: -18,46 + - node: + color: '#870C0DFF' + id: WarnLineW + decals: + 5179: -22,50 + 5180: -21,50 + 5181: -20,50 + 5182: -19,50 + 5183: -18,50 - node: color: '#FFFFFFFF' id: WarnLineW @@ -6212,9 +6236,9 @@ entities: 3933: -58,-7 3936: -58,-9 3937: -57,-9 - 5084: -18,43 - 5085: -17,43 - 5086: -16,43 + 5113: -21,45 + 5114: -20,45 + 5115: -19,45 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerNe @@ -6532,6 +6556,19 @@ entities: 4463: 49,-5 4475: 50,-8 4483: 43,-6 + - node: + cleanable: True + color: '#DE654196' + id: a + decals: + 5147: -17.988615,42.090855 + - node: + cleanable: True + color: '#EFB34196' + id: a + decals: + 5138: -18.907356,42.907543 + 5144: -16.340664,42.645054 - node: cleanable: True angle: 1.5707963267948966 rad @@ -6568,6 +6605,68 @@ entities: id: burnt4 decals: 5022: 56,23 + - node: + cleanable: True + color: '#DE654196' + id: d + decals: + 5149: -17.157356,42.032543 + - node: + cleanable: True + angle: 6.1086523819801535 rad + color: '#FF190496' + id: fireaxe + decals: + 5152: -17.86899,41.374073 + - node: + cleanable: True + color: '#EFB34196' + id: i + decals: + 5143: -16.690681,42.732536 + - node: + cleanable: True + color: '#EFB34196' + id: m + decals: + 5140: -18.003181,42.83463 + - node: + cleanable: True + color: '#DE654196' + id: n + decals: + 5148: -17.609423,42.04711 + - node: + cleanable: True + color: '#EFB34196' + id: o + decals: + 5141: -17.492765,42.790886 + - node: + cleanable: True + color: '#DE654196' + id: s + decals: + 5145: -18.688606,42.17838 + 5150: -16.705248,41.95963 + - node: + cleanable: True + color: '#EFB34196' + id: s + decals: + 5142: -17.02609,42.747105 + - node: + cleanable: True + color: '#DE654196' + id: t + decals: + 5146: -18.353197,42.12003 + - node: + cleanable: True + color: '#EFB34196' + id: t + decals: + 5139: -18.513597,42.849194 - type: GridAtmosphere version: 2 data: @@ -8128,17 +8227,17 @@ entities: -5,10: 0: 65535 -4,11: - 0: 62463 + 0: 13107 -5,11: 0: 65535 -4,12: - 0: 47283 + 0: 43915 -3,9: 0: 4095 -3,10: 0: 65535 - -3,11: - 3: 65248 + -3,12: + 0: 65535 -2,9: 0: 4095 -2,10: @@ -8157,31 +8256,31 @@ entities: -9,10: 0: 52428 -8,11: - 2: 43808 + 2: 12256 -9,11: 2: 20224 -8,12: - 2: 43690 + 2: 8738 -7,9: 0: 45311 -7,10: 0: 49087 -7,11: - 2: 768 + 2: 13104 0: 34952 + -7,12: + 2: 8739 + 0: 2184 -6,9: 0: 61661 -6,10: 0: 65535 -6,11: 0: 65535 - -7,12: - 0: 34952 - 2: 12322 -6,12: - 0: 65535 + 0: 4095 -5,12: - 0: 63487 + 0: 3967 -12,9: 2: 65497 -13,9: @@ -8245,25 +8344,26 @@ entities: -8,14: 2: 15 -7,13: - 2: 32816 - 3: 128 + 2: 126 + 3: 2048 -7,14: - 2: 15 + 2: 57903 -6,13: - 3: 240 + 2: 15 + 3: 3840 -6,14: - 2: 49 + 2: 28675 -5,13: - 3: 49392 + 2: 15 + 3: 3840 -5,14: - 3: 264 + 3: 256 -4,13: - 3: 28722 + 2: 3 + 3: 800 0: 136 -4,14: - 3: 3 - -3,12: - 0: 65520 + 2: 3 -3,13: 0: 255 -2,12: @@ -10050,6 +10150,17 @@ entities: - 9168 - type: Fixtures fixtures: {} + - uid: 9214 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -16.5,49.5 + parent: 2 + - type: DeviceList + devices: + - 9198 + - type: Fixtures + fixtures: {} - uid: 9410 components: - type: Transform @@ -12838,39 +12949,12 @@ entities: - 31036 - type: Fixtures fixtures: {} - - uid: 31253 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,45.5 - parent: 2 - - type: DeviceList - devices: - - 28857 - - 9198 - - type: Fixtures - fixtures: {} - - uid: 31254 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -16.5,50.5 - parent: 2 - - type: DeviceList - devices: - - 8149 - - type: Fixtures - fixtures: {} - uid: 31353 components: - type: Transform rot: 3.141592653589793 rad pos: -13.5,39.5 parent: 2 - - type: DeviceList - devices: - - 28844 - - 31169 - type: Fixtures fixtures: {} - proto: AirCanister @@ -13954,17 +14038,36 @@ entities: - DoorBolt - proto: AirlockExternalGlassAtmosphericsLocked entities: - - uid: 8127 + - uid: 5795 components: - type: Transform - pos: -14.5,52.5 + pos: -14.5,53.5 parent: 2 - - uid: 8212 + - uid: 7814 components: - type: Transform rot: -1.5707963267948966 rad - pos: -16.5,51.5 + pos: -16.5,50.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 8074: + - - DoorStatus + - DoorBolt + - uid: 8074 + components: + - type: Transform + pos: -14.5,51.5 + parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 7814: + - - DoorStatus + - DoorBolt - uid: 8424 components: - type: Transform @@ -14013,18 +14116,6 @@ entities: 8504: - - DoorStatus - DoorBolt - - uid: 31224 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -13.5,47.5 - parent: 2 - - uid: 31231 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,47.5 - parent: 2 - proto: AirlockExternalGlassCargoLocked entities: - uid: 11331 @@ -15420,7 +15511,7 @@ entities: pos: -22.5,26.5 parent: 2 - type: Door - secondsUntilStateChange: -232512.1 + secondsUntilStateChange: -245166.06 state: Opening - type: DeviceLinkSource lastSignals: @@ -16276,7 +16367,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -331340.72 + secondsUntilStateChange: -343994.7 state: Opening - uid: 6934 components: @@ -16288,7 +16379,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -331343.34 + secondsUntilStateChange: -343997.3 state: Opening - uid: 6935 components: @@ -16300,7 +16391,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -331342.2 + secondsUntilStateChange: -343996.16 state: Opening - uid: 6936 components: @@ -16311,7 +16402,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -331341.4 + secondsUntilStateChange: -343995.38 state: Opening - proto: AirlockTheatreLocked entities: @@ -16433,14 +16524,6 @@ entities: - type: DeviceNetwork deviceLists: - 10169 - - uid: 8149 - components: - - type: Transform - pos: -19.5,53.5 - parent: 2 - - type: DeviceNetwork - deviceLists: - - 31254 - uid: 9168 components: - type: Transform @@ -16449,6 +16532,15 @@ entities: - type: DeviceNetwork deviceLists: - 9177 + - uid: 9198 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -19.5,54.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 9214 - uid: 9276 components: - type: Transform @@ -17422,15 +17514,6 @@ entities: deviceLists: - 28611 - 29904 - - uid: 28857 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -9.5,46.5 - parent: 2 - - type: DeviceNetwork - deviceLists: - - 31253 - uid: 28968 components: - type: Transform @@ -18958,11 +19041,6 @@ entities: - type: Transform pos: -28.5,-58.5 parent: 2 - - uid: 19259 - components: - - type: Transform - pos: -22.5,55.5 - parent: 2 - uid: 19268 components: - type: Transform @@ -19188,21 +19266,6 @@ entities: - type: Transform pos: -37.5,-60.5 parent: 2 - - uid: 19316 - components: - - type: Transform - pos: -21.5,55.5 - parent: 2 - - uid: 19317 - components: - - type: Transform - pos: -20.5,55.5 - parent: 2 - - uid: 19318 - components: - - type: Transform - pos: -23.5,55.5 - parent: 2 - uid: 19319 components: - type: Transform @@ -19998,26 +20061,6 @@ entities: - type: Transform pos: -51.5,-51.5 parent: 2 - - uid: 19486 - components: - - type: Transform - pos: -19.5,55.5 - parent: 2 - - uid: 19487 - components: - - type: Transform - pos: -18.5,55.5 - parent: 2 - - uid: 19488 - components: - - type: Transform - pos: -17.5,56.5 - parent: 2 - - uid: 19489 - components: - - type: Transform - pos: -16.5,57.5 - parent: 2 - uid: 19490 components: - type: Transform @@ -20038,36 +20081,6 @@ entities: - type: Transform pos: -20.5,57.5 parent: 2 - - uid: 19495 - components: - - type: Transform - pos: -21.5,57.5 - parent: 2 - - uid: 19496 - components: - - type: Transform - pos: -22.5,56.5 - parent: 2 - - uid: 19497 - components: - - type: Transform - pos: -21.5,56.5 - parent: 2 - - uid: 19498 - components: - - type: Transform - pos: -20.5,56.5 - parent: 2 - - uid: 19499 - components: - - type: Transform - pos: -19.5,56.5 - parent: 2 - - uid: 19500 - components: - - type: Transform - pos: -18.5,56.5 - parent: 2 - uid: 19501 components: - type: Transform @@ -37429,6 +37442,16 @@ entities: - type: Transform pos: -37.5,-71.5 parent: 2 + - uid: 9259 + components: + - type: Transform + pos: -24.5,54.5 + parent: 2 + - uid: 9260 + components: + - type: Transform + pos: -23.5,54.5 + parent: 2 - uid: 9290 components: - type: Transform @@ -37489,45 +37512,55 @@ entities: - type: Transform pos: -42.5,19.5 parent: 2 - - uid: 28667 + - uid: 9394 components: - type: Transform - pos: -17.5,55.5 + pos: -22.5,54.5 parent: 2 - - uid: 28668 + - uid: 9422 components: - type: Transform - pos: -16.5,55.5 + pos: -21.5,54.5 parent: 2 - - uid: 28669 + - uid: 9423 components: - type: Transform - pos: -15.5,55.5 + pos: -19.5,54.5 parent: 2 - - uid: 28670 + - uid: 11911 components: - type: Transform - pos: -14.5,55.5 + pos: -20.5,54.5 parent: 2 - - uid: 28671 + - uid: 13508 components: - type: Transform - pos: -13.5,55.5 + pos: -18.5,54.5 parent: 2 - - uid: 28672 + - uid: 13582 components: - type: Transform - pos: -14.5,56.5 + pos: -17.5,54.5 parent: 2 - - uid: 28673 + - uid: 13583 components: - type: Transform - pos: -15.5,56.5 + pos: -16.5,54.5 parent: 2 - - uid: 28674 + - uid: 13586 components: - type: Transform - pos: -16.5,56.5 + pos: -15.5,54.5 + parent: 2 + - uid: 13588 + components: + - type: Transform + pos: -14.5,54.5 + parent: 2 + - uid: 14817 + components: + - type: Transform + pos: -14.5,53.5 parent: 2 - uid: 28677 components: @@ -38079,121 +38112,6 @@ entities: - type: Transform pos: 23.5,52.5 parent: 2 - - uid: 31255 - components: - - type: Transform - pos: -15.5,54.5 - parent: 2 - - uid: 31261 - components: - - type: Transform - pos: -24.5,53.5 - parent: 2 - - uid: 31262 - components: - - type: Transform - pos: -23.5,53.5 - parent: 2 - - uid: 31263 - components: - - type: Transform - pos: -22.5,53.5 - parent: 2 - - uid: 31264 - components: - - type: Transform - pos: -21.5,53.5 - parent: 2 - - uid: 31265 - components: - - type: Transform - pos: -20.5,53.5 - parent: 2 - - uid: 31266 - components: - - type: Transform - pos: -19.5,53.5 - parent: 2 - - uid: 31267 - components: - - type: Transform - pos: -18.5,53.5 - parent: 2 - - uid: 31268 - components: - - type: Transform - pos: -17.5,53.5 - parent: 2 - - uid: 31269 - components: - - type: Transform - pos: -16.5,53.5 - parent: 2 - - uid: 31270 - components: - - type: Transform - pos: -15.5,53.5 - parent: 2 - - uid: 31271 - components: - - type: Transform - pos: -14.5,53.5 - parent: 2 - - uid: 31272 - components: - - type: Transform - pos: -10.5,47.5 - parent: 2 - - uid: 31273 - components: - - type: Transform - pos: -10.5,46.5 - parent: 2 - - uid: 31274 - components: - - type: Transform - pos: -10.5,45.5 - parent: 2 - - uid: 31275 - components: - - type: Transform - pos: -9.5,47.5 - parent: 2 - - uid: 31276 - components: - - type: Transform - pos: -9.5,46.5 - parent: 2 - - uid: 31277 - components: - - type: Transform - pos: -9.5,45.5 - parent: 2 - - uid: 31278 - components: - - type: Transform - pos: -8.5,47.5 - parent: 2 - - uid: 31279 - components: - - type: Transform - pos: -8.5,46.5 - parent: 2 - - uid: 31280 - components: - - type: Transform - pos: -8.5,45.5 - parent: 2 - - uid: 31281 - components: - - type: Transform - pos: -11.5,47.5 - parent: 2 - - uid: 31282 - components: - - type: Transform - pos: -14.5,52.5 - parent: 2 - proto: AtmosFixFreezerMarker entities: - uid: 2169 @@ -39059,6 +38977,13 @@ entities: parent: 2 - proto: BlastDoor entities: + - uid: 5357 + components: + - type: Transform + pos: -23.5,55.5 + parent: 2 + - type: AccessReader + accessListsOriginal: [] - uid: 7042 components: - type: Transform @@ -39139,11 +39064,6 @@ entities: - type: Transform pos: -31.5,11.5 parent: 2 - - uid: 8846 - components: - - type: Transform - pos: -15.5,54.5 - parent: 2 - uid: 9638 components: - type: Transform @@ -40798,14 +40718,13 @@ entities: - type: Transform pos: 36.5,-9.5 parent: 2 - - uid: 31258 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -14.5,50.5 - parent: 2 - proto: ButtonFrameCautionSecurity entities: + - uid: 8075 + components: + - type: Transform + pos: -22.5,51.5 + parent: 2 - uid: 24360 components: - type: Transform @@ -40834,16 +40753,6 @@ entities: - type: Transform pos: 54.5,26.5 parent: 2 - - uid: 31256 - components: - - type: Transform - pos: -11.5,44.5 - parent: 2 - - uid: 31257 - components: - - type: Transform - pos: -22.5,52.5 - parent: 2 - proto: ButtonFrameExit entities: - uid: 1629 @@ -41120,6 +41029,11 @@ entities: - type: Transform pos: -41.5,-31.5 parent: 2 + - uid: 620 + components: + - type: Transform + pos: -15.5,46.5 + parent: 2 - uid: 813 components: - type: Transform @@ -46760,11 +46674,6 @@ entities: - type: Transform pos: 18.5,9.5 parent: 2 - - uid: 6457 - components: - - type: Transform - pos: -15.5,43.5 - parent: 2 - uid: 6690 components: - type: Transform @@ -47655,6 +47564,11 @@ entities: - type: Transform pos: 0.5,42.5 parent: 2 + - uid: 7826 + components: + - type: Transform + pos: -16.5,46.5 + parent: 2 - uid: 7913 components: - type: Transform @@ -47875,6 +47789,71 @@ entities: - type: Transform pos: -16.5,28.5 parent: 2 + - uid: 8038 + components: + - type: Transform + pos: -19.5,46.5 + parent: 2 + - uid: 8039 + components: + - type: Transform + pos: -18.5,46.5 + parent: 2 + - uid: 8040 + components: + - type: Transform + pos: -17.5,46.5 + parent: 2 + - uid: 8048 + components: + - type: Transform + pos: -23.5,46.5 + parent: 2 + - uid: 8049 + components: + - type: Transform + pos: -10.5,49.5 + parent: 2 + - uid: 8050 + components: + - type: Transform + pos: -10.5,48.5 + parent: 2 + - uid: 8051 + components: + - type: Transform + pos: -14.5,46.5 + parent: 2 + - uid: 8052 + components: + - type: Transform + pos: -22.5,46.5 + parent: 2 + - uid: 8055 + components: + - type: Transform + pos: -21.5,46.5 + parent: 2 + - uid: 8057 + components: + - type: Transform + pos: -20.5,46.5 + parent: 2 + - uid: 8058 + components: + - type: Transform + pos: -19.5,47.5 + parent: 2 + - uid: 8073 + components: + - type: Transform + pos: -14.5,44.5 + parent: 2 + - uid: 8082 + components: + - type: Transform + pos: -14.5,43.5 + parent: 2 - uid: 8189 components: - type: Transform @@ -48575,11 +48554,6 @@ entities: - type: Transform pos: -0.5,52.5 parent: 2 - - uid: 9394 - components: - - type: Transform - pos: -16.5,43.5 - parent: 2 - uid: 9398 components: - type: Transform @@ -59180,11 +59154,6 @@ entities: - type: Transform pos: 60.5,13.5 parent: 2 - - uid: 31205 - components: - - type: Transform - pos: -16.5,44.5 - parent: 2 - uid: 31284 components: - type: Transform @@ -59220,16 +59189,6 @@ entities: - type: Transform pos: -19.5,45.5 parent: 2 - - uid: 31291 - components: - - type: Transform - pos: -19.5,46.5 - parent: 2 - - uid: 31292 - components: - - type: Transform - pos: -19.5,47.5 - parent: 2 - uid: 31293 components: - type: Transform @@ -59295,56 +59254,6 @@ entities: - type: Transform pos: -14.5,51.5 parent: 2 - - uid: 31306 - components: - - type: Transform - pos: -14.5,52.5 - parent: 2 - - uid: 31307 - components: - - type: Transform - pos: -19.5,47.5 - parent: 2 - - uid: 31308 - components: - - type: Transform - pos: -18.5,47.5 - parent: 2 - - uid: 31309 - components: - - type: Transform - pos: -17.5,47.5 - parent: 2 - - uid: 31310 - components: - - type: Transform - pos: -16.5,47.5 - parent: 2 - - uid: 31311 - components: - - type: Transform - pos: -15.5,47.5 - parent: 2 - - uid: 31312 - components: - - type: Transform - pos: -14.5,47.5 - parent: 2 - - uid: 31313 - components: - - type: Transform - pos: -13.5,47.5 - parent: 2 - - uid: 31314 - components: - - type: Transform - pos: -12.5,47.5 - parent: 2 - - uid: 31315 - components: - - type: Transform - pos: -11.5,47.5 - parent: 2 - uid: 31316 components: - type: Transform @@ -59450,26 +59359,11 @@ entities: - type: Transform pos: -8.5,42.5 parent: 2 - - uid: 31337 - components: - - type: Transform - pos: -14.5,46.5 - parent: 2 - uid: 31338 components: - type: Transform pos: -14.5,45.5 parent: 2 - - uid: 31339 - components: - - type: Transform - pos: -20.5,47.5 - parent: 2 - - uid: 31340 - components: - - type: Transform - pos: -14.5,43.5 - parent: 2 - uid: 31341 components: - type: Transform @@ -59480,21 +59374,6 @@ entities: - type: Transform pos: -14.5,41.5 parent: 2 - - uid: 31343 - components: - - type: Transform - pos: -21.5,47.5 - parent: 2 - - uid: 31344 - components: - - type: Transform - pos: -22.5,47.5 - parent: 2 - - uid: 31345 - components: - - type: Transform - pos: -23.5,47.5 - parent: 2 - proto: CableApcStack entities: - uid: 21060 @@ -62539,6 +62418,11 @@ entities: - type: Transform pos: 56.5,22.5 parent: 2 + - uid: 8989 + components: + - type: Transform + pos: -19.5,46.5 + parent: 2 - uid: 9393 components: - type: Transform @@ -65914,6 +65798,11 @@ entities: - type: Transform pos: 63.5,27.5 parent: 2 + - uid: 20631 + components: + - type: Transform + pos: -19.5,46.5 + parent: 2 - uid: 20654 components: - type: Transform @@ -65934,6 +65823,11 @@ entities: - type: Transform pos: 51.5,-21.5 parent: 2 + - uid: 20901 + components: + - type: Transform + pos: -19.5,46.5 + parent: 2 - uid: 20911 components: - type: Transform @@ -66729,16 +66623,66 @@ entities: - type: Transform pos: 14.5,40.5 parent: 2 + - uid: 23644 + components: + - type: Transform + pos: -19.5,45.5 + parent: 2 + - uid: 23646 + components: + - type: Transform + pos: -19.5,44.5 + parent: 2 - uid: 23657 components: - type: Transform pos: -6.5,45.5 parent: 2 + - uid: 23677 + components: + - type: Transform + pos: -19.5,43.5 + parent: 2 - uid: 23711 components: - type: Transform pos: -6.5,41.5 parent: 2 + - uid: 23712 + components: + - type: Transform + pos: -19.5,42.5 + parent: 2 + - uid: 23713 + components: + - type: Transform + pos: -19.5,41.5 + parent: 2 + - uid: 23714 + components: + - type: Transform + pos: -19.5,40.5 + parent: 2 + - uid: 23715 + components: + - type: Transform + pos: -18.5,40.5 + parent: 2 + - uid: 23716 + components: + - type: Transform + pos: -17.5,40.5 + parent: 2 + - uid: 23717 + components: + - type: Transform + pos: -16.5,40.5 + parent: 2 + - uid: 23718 + components: + - type: Transform + pos: -15.5,40.5 + parent: 2 - uid: 23724 components: - type: Transform @@ -67064,36 +67008,6 @@ entities: - type: Transform pos: 56.5,-10.5 parent: 2 - - uid: 31207 - components: - - type: Transform - pos: -16.5,44.5 - parent: 2 - - uid: 31208 - components: - - type: Transform - pos: -16.5,43.5 - parent: 2 - - uid: 31209 - components: - - type: Transform - pos: -15.5,43.5 - parent: 2 - - uid: 31210 - components: - - type: Transform - pos: -14.5,43.5 - parent: 2 - - uid: 31358 - components: - - type: Transform - pos: -14.5,42.5 - parent: 2 - - uid: 31359 - components: - - type: Transform - pos: -14.5,41.5 - parent: 2 - uid: 31360 components: - type: Transform @@ -73192,11 +73106,6 @@ entities: - type: Transform pos: 28.5,-35.5 parent: 21002 - - uid: 28625 - components: - - type: Transform - pos: -21.5,39.5 - parent: 2 - proto: CargoBountyComputerCircuitboard entities: - uid: 23275 @@ -80349,6 +80258,12 @@ entities: - type: Transform pos: 39.479088,15.666133 parent: 2 + - uid: 19318 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -24.533377,49.56239 + parent: 2 - proto: ChemDispenser entities: - uid: 1635 @@ -80419,6 +80334,12 @@ entities: rot: -1.5707963267948966 rad pos: -40.504517,-42.41375 parent: 2 + - uid: 8107 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.511748,48.59111 + parent: 2 - uid: 23002 components: - type: Transform @@ -80508,6 +80429,13 @@ entities: rot: 3.141592653589793 rad pos: 10.137915,37.803234 parent: 2 +- proto: CigaretteFrezon + entities: + - uid: 9235 + components: + - type: Transform + pos: -10.989619,45.558743 + parent: 1 - proto: CigaretteSpent entities: - uid: 3443 @@ -80578,6 +80506,13 @@ entities: rot: 1.5707963267948966 rad pos: -46.538147,-11.384542 parent: 2 +- proto: CigPackMixed + entities: + - uid: 8209 + components: + - type: Transform + pos: -10.245695,48.470387 + parent: 2 - proto: CigPackRed entities: - uid: 3455 @@ -81037,6 +80972,11 @@ entities: - type: Transform pos: 23.5,-38.5 parent: 2 + - uid: 19488 + components: + - type: Transform + pos: -14.5,44.5 + parent: 2 - uid: 23749 components: - type: Transform @@ -82963,6 +82903,18 @@ entities: rot: 3.141592653589793 rad pos: -1.5,52.5 parent: 2 + - uid: 8098 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,48.5 + parent: 2 + - uid: 8131 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -11.5,48.5 + parent: 2 - uid: 9888 components: - type: Transform @@ -85775,6 +85727,13 @@ entities: - type: Transform pos: -45.5,-21.5 parent: 2 +- proto: DefaultStationBeaconTEG + entities: + - uid: 18563 + components: + - type: Transform + pos: -19.5,45.5 + parent: 2 - proto: DefaultStationBeaconTelecoms entities: - uid: 11590 @@ -85978,6 +85937,12 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,38.5 parent: 2 + - uid: 8062 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -12.5,49.5 + parent: 2 - uid: 8166 components: - type: Transform @@ -87251,12 +87216,27 @@ entities: rot: 3.141592653589793 rad pos: 0.5,48.5 parent: 2 + - uid: 9006 + components: + - type: Transform + pos: -22.5,53.5 + parent: 2 - uid: 9125 components: - type: Transform rot: 1.5707963267948966 rad pos: -30.5,33.5 parent: 2 + - uid: 9226 + components: + - type: Transform + pos: -22.5,51.5 + parent: 2 + - uid: 9227 + components: + - type: Transform + pos: -22.5,52.5 + parent: 2 - uid: 9328 components: - type: Transform @@ -93945,6 +93925,12 @@ entities: - type: Transform pos: -48.5,2.5 parent: 2 + - uid: 8061 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,48.5 + parent: 2 - uid: 9367 components: - type: Transform @@ -93974,12 +93960,6 @@ entities: - type: Transform pos: 54.5,3.5 parent: 2 - - uid: 16677 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -12.5,49.5 - parent: 2 - uid: 16691 components: - type: Transform @@ -94506,6 +94486,11 @@ entities: - type: Transform pos: -52.5,3.5 parent: 2 + - uid: 7822 + components: + - type: Transform + pos: -12.5,48.5 + parent: 2 - uid: 8437 components: - type: Transform @@ -94581,11 +94566,6 @@ entities: - type: Transform pos: 4.5,-59.5 parent: 2 - - uid: 14817 - components: - - type: Transform - pos: -12.5,49.5 - parent: 2 - uid: 17523 components: - type: Transform @@ -95004,6 +94984,16 @@ entities: - 3604 - proto: DrinkBeerCan entities: + - uid: 19497 + components: + - type: Transform + pos: -13.654144,43.808117 + parent: 2 + - uid: 19498 + components: + - type: Transform + pos: -13.508311,43.603973 + parent: 2 - uid: 29203 components: - type: Transform @@ -95620,6 +95610,11 @@ entities: parent: 2 - proto: DrinkMugDog entities: + - uid: 19496 + components: + - type: Transform + pos: -13.110922,43.488834 + parent: 2 - uid: 28875 components: - type: Transform @@ -100266,7 +100261,7 @@ entities: pos: -13.5,-1.5 parent: 2 - type: Door - secondsUntilStateChange: -322664.72 + secondsUntilStateChange: -335318.7 - type: DeviceNetwork deviceLists: - 18275 @@ -104574,14 +104569,6 @@ entities: color: '#0335FCFF' - proto: GasOutletInjector entities: - - uid: 8126 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -24.5,53.5 - parent: 2 - - type: AtmosPipeLayers - pipeLayer: Secondary - uid: 8573 components: - type: Transform @@ -104617,22 +104604,13 @@ entities: - type: Transform pos: -42.5,25.5 parent: 2 - - uid: 8811 + - uid: 9187 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,53.5 + pos: -23.5,54.5 parent: 2 - - type: AtmosPipeLayers - pipeLayer: Tertiary - - uid: 8972 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -9.5,45.5 - parent: 2 - - type: AtmosPipeLayers - pipeLayer: Tertiary + - type: AtmosPipeColor + color: '#B3A234FF' - uid: 9778 components: - type: Transform @@ -104654,22 +104632,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#03FCD3FF' - - uid: 8106 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -24.5,51.5 - parent: 2 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 9226 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -19.5,41.5 - parent: 2 - - type: AtmosPipeColor - color: '#947507FF' - uid: 16790 components: - type: Transform @@ -104678,22 +104640,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 20901 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -17.5,50.5 - parent: 2 - - type: AtmosPipeColor - color: '#3AB334FF' - - uid: 23807 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -22.5,50.5 - parent: 2 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 28607 components: - type: Transform @@ -104726,27 +104672,13 @@ entities: rot: 1.5707963267948966 rad pos: -40.5,13.5 parent: 2 - - uid: 7775 + - uid: 8125 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -8.5,47.5 + pos: -24.5,54.5 parent: 2 - type: AtmosPipeColor color: '#333333FF' - - uid: 8099 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -20.5,53.5 - parent: 2 - - type: Construction - step: 1 - edge: 0 - - type: AtmosPipeLayers - pipeLayer: Tertiary - - type: AtmosPipeColor - color: '#333333FF' - uid: 8527 components: - type: Transform @@ -104794,21 +104726,11 @@ entities: - uid: 8844 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -26.5,48.5 + rot: -1.5707963267948966 rad + pos: -22.5,52.5 parent: 2 - type: AtmosPipeColor color: '#333333FF' - - uid: 9189 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -18.5,53.5 - parent: 2 - - type: AtmosPipeLayers - pipeLayer: Secondary - - type: AtmosPipeColor - color: '#990000FF' - uid: 9636 components: - type: Transform @@ -104835,14 +104757,6 @@ entities: rot: 3.141592653589793 rad pos: 20.5,-34.5 parent: 2 - - uid: 13583 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -26.5,49.5 - parent: 2 - - type: AtmosPipeColor - color: '#333333FF' - uid: 16952 components: - type: Transform @@ -104893,6 +104807,21 @@ entities: - type: Transform pos: 36.5,-6.5 parent: 21002 + - uid: 23719 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -26.5,46.5 + parent: 2 + - type: AtmosPipeColor + color: '#947507FF' + - uid: 23720 + components: + - type: Transform + pos: -19.5,52.5 + parent: 2 + - type: AtmosPipeColor + color: '#947507FF' - uid: 23960 components: - type: Transform @@ -105013,13 +104942,13 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 506 + - uid: 679 components: - type: Transform - pos: -19.5,49.5 + pos: -17.5,54.5 parent: 2 - type: AtmosPipeColor - color: '#333333FF' + color: '#FF1212FF' - uid: 896 components: - type: Transform @@ -105257,42 +105186,38 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 7774 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -23.5,50.5 - parent: 2 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 8038 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -17.5,42.5 - parent: 2 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8055 + - uid: 7781 components: - type: Transform rot: 1.5707963267948966 rad - pos: -21.5,44.5 + pos: -21.5,54.5 parent: 2 - - uid: 8061 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -21.5,41.5 - parent: 2 - - uid: 8124 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 7785 components: - type: Transform rot: 3.141592653589793 rad - pos: -19.5,46.5 + pos: -24.5,52.5 parent: 2 - type: AtmosPipeColor color: '#333333FF' + - uid: 7819 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -27.5,45.5 + parent: 2 + - type: AtmosPipeColor + color: '#03FCD3FF' + - uid: 7823 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -27.5,47.5 + parent: 2 + - type: AtmosPipeColor + color: '#03FCD3FF' - uid: 8187 components: - type: Transform @@ -105485,38 +105410,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#03FCD3FF' - - uid: 9192 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -18.5,42.5 - parent: 2 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 9197 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,46.5 - parent: 2 - - type: AtmosPipeColor - color: '#333333FF' - - uid: 9208 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -15.5,41.5 - parent: 2 - - type: AtmosPipeColor - color: '#947507FF' - - uid: 9228 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -20.5,41.5 - parent: 2 - - type: AtmosPipeColor - color: '#947507FF' - uid: 9280 components: - type: Transform @@ -107351,20 +107244,6 @@ entities: parent: 21002 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 28852 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -22.5,45.5 - parent: 2 - - uid: 29184 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -14.5,47.5 - parent: 2 - - type: AtmosPipeColor - color: '#333333FF' - uid: 29690 components: - type: Transform @@ -107487,347 +107366,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 31158 - components: - - type: Transform - pos: -20.5,44.5 - parent: 2 -- proto: GasPipeBendAlt1 - entities: - - uid: 5795 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -23.5,50.5 - parent: 2 - - uid: 7814 - components: - - type: Transform - pos: -16.5,49.5 - parent: 2 - - type: AtmosPipeColor - color: '#3AB334FF' - - uid: 8062 - components: - - type: Transform - pos: -20.5,44.5 - parent: 2 - - uid: 8080 - components: - - type: Transform - pos: -18.5,51.5 - parent: 2 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 8123 - components: - - type: Transform - pos: -20.5,46.5 - parent: 2 - - type: AtmosPipeColor - color: '#3AB334FF' - - uid: 8148 - components: - - type: Transform - pos: -23.5,53.5 - parent: 2 - - uid: 8800 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -20.5,41.5 - parent: 2 - - type: AtmosPipeColor - color: '#947507FF' - - uid: 8842 - components: - - type: Transform - pos: -15.5,53.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 9207 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -22.5,45.5 - parent: 2 - - uid: 9235 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -21.5,44.5 - parent: 2 - - uid: 23677 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -22.5,43.5 - parent: 2 - - uid: 23712 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -20.5,45.5 - parent: 2 - - type: AtmosPipeColor - color: '#3AB334FF' - - uid: 28840 - components: - - type: Transform - pos: -19.5,50.5 - parent: 2 - - type: AtmosPipeColor - color: '#947507FF' - - uid: 31149 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -16.5,48.5 - parent: 2 - - type: AtmosPipeColor - color: '#3AB334FF' - - uid: 31179 - components: - - type: Transform - pos: -10.5,47.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 31181 - components: - - type: Transform - pos: -14.5,48.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 31182 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -12.5,47.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 31186 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -15.5,48.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 31194 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -22.5,42.5 - parent: 2 - - uid: 31201 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -22.5,41.5 - parent: 2 - - uid: 31204 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,42.5 - parent: 2 - - uid: 31214 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -15.5,45.5 - parent: 2 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 31244 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -12.5,43.5 - parent: 2 -- proto: GasPipeBendAlt2 - entities: - - uid: 8075 - components: - - type: Transform - pos: -19.5,46.5 - parent: 2 - - type: AtmosPipeColor - color: '#947507FF' - - uid: 8131 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -23.5,53.5 - parent: 2 - - type: AtmosPipeColor - color: '#333333FF' - - uid: 8801 - components: - - type: Transform - pos: -15.5,47.5 - parent: 2 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9184 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -22.5,43.5 - parent: 2 - - type: AtmosPipeLayers - pipeLayer: Primary - - uid: 9188 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -15.5,45.5 - parent: 2 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9196 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -10.5,45.5 - parent: 2 - - uid: 9219 - components: - - type: Transform - pos: -20.5,44.5 - parent: 2 - - uid: 9223 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -23.5,49.5 - parent: 2 - - type: AtmosPipeColor - color: '#333333FF' - - uid: 9230 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -20.5,41.5 - parent: 2 - - type: AtmosPipeColor - color: '#947507FF' - - uid: 9252 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -15.5,53.5 - parent: 2 - - uid: 16797 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -15.5,48.5 - parent: 2 - - uid: 23717 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -21.5,44.5 - parent: 2 - - uid: 28623 - components: - - type: Transform - pos: -10.5,47.5 - parent: 2 - - uid: 28629 - components: - - type: Transform - pos: -18.5,48.5 - parent: 2 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 29118 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -14.5,47.5 - parent: 2 - - uid: 29183 - components: - - type: Transform - pos: -14.5,48.5 - parent: 2 - - uid: 31140 - components: - - type: Transform - pos: -18.5,50.5 - parent: 2 - - type: AtmosPipeColor - color: '#3AB334FF' - - uid: 31141 - components: - - type: Transform - pos: -19.5,51.5 - parent: 2 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 31142 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -18.5,47.5 - parent: 2 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 31150 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -18.5,49.5 - parent: 2 - - type: AtmosPipeColor - color: '#3AB334FF' - - uid: 31172 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -21.5,41.5 - parent: 2 - - uid: 31175 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -20.5,45.5 - parent: 2 - - uid: 31178 - components: - - type: Transform - pos: -20.5,47.5 - parent: 2 - - uid: 31215 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -14.5,45.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 31216 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,42.5 - parent: 2 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 31222 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -18.5,42.5 - parent: 2 - - type: AtmosPipeColor - color: '#0335FCFF' - proto: GasPipeFourway entities: - uid: 666 @@ -108180,127 +107718,6 @@ entities: parent: 21002 - type: AtmosPipeColor color: '#0335FCFF' -- proto: GasPipeManifold - entities: - - uid: 2174 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -24.5,48.5 - parent: 2 - - type: AtmosPipeColor - color: '#333333FF' - - uid: 3083 - components: - - type: Transform - pos: -17.5,47.5 - parent: 2 - - type: AtmosPipeColor - color: '#3AB334FF' - - uid: 8107 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -15.5,46.5 - parent: 2 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 8217 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -23.5,46.5 - parent: 2 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8939 - components: - - type: Transform - pos: -20.5,43.5 - parent: 2 - - type: AtmosPipeColor - color: '#947507FF' - - uid: 9183 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -16.5,41.5 - parent: 2 - - type: AtmosPipeColor - color: '#947507FF' - - uid: 9217 - components: - - type: Transform - pos: -18.5,43.5 - parent: 2 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 9250 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -22.5,51.5 - parent: 2 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 9254 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -24.5,49.5 - parent: 2 - - type: AtmosPipeColor - color: '#333333FF' - - uid: 23738 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -21.5,45.5 - parent: 2 - - type: AtmosPipeColor - color: '#3AB334FF' - - uid: 29117 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -21.5,50.5 - parent: 2 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 31152 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -17.5,51.5 - parent: 2 - - type: AtmosPipeColor - color: '#3AB334FF' - - uid: 31157 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -23.5,41.5 - parent: 2 - - uid: 31165 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -23.5,43.5 - parent: 2 - - uid: 31213 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -13.5,45.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 31243 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -13.5,43.5 - parent: 2 - proto: GasPipeSensorDistribution entities: - uid: 15414 @@ -108323,26 +107740,22 @@ entities: color: '#03FCD3FF' - proto: GasPipeSensorTEGCold entities: - - uid: 31169 + - uid: 506 components: - type: Transform - pos: -17.5,43.5 + rot: 3.141592653589793 rad + pos: -20.5,45.5 parent: 2 - - type: DeviceNetwork - deviceLists: - - 31353 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#03FCD3FF' - proto: GasPipeSensorTEGHot entities: - - uid: 28844 + - uid: 7816 components: - type: Transform - pos: -15.5,45.5 + rot: 3.141592653589793 rad + pos: -18.5,47.5 parent: 2 - - type: DeviceNetwork - deviceLists: - - 31353 - type: AtmosPipeColor color: '#FF1212FF' - proto: GasPipeSensorWaste @@ -109381,13 +108794,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 5357 - components: - - type: Transform - pos: -18.5,47.5 - parent: 2 - - type: AtmosPipeColor - color: '#B3A234FF' - uid: 5383 components: - type: Transform @@ -109458,6 +108864,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' + - uid: 6240 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -23.5,51.5 + parent: 2 + - type: AtmosPipeColor + color: '#B3A234FF' - uid: 7355 components: - type: Transform @@ -109474,53 +108888,58 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 7777 + - uid: 7784 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -17.5,48.5 - parent: 2 - - type: AtmosPipeColor - color: '#B3A234FF' - - uid: 7816 - components: - - type: Transform - pos: -15.5,50.5 - parent: 2 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 7827 - components: - - type: Transform - pos: -23.5,51.5 - parent: 2 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 8052 - components: - - type: Transform - pos: -21.5,42.5 - parent: 2 - - uid: 8110 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -22.5,49.5 + pos: -24.5,53.5 parent: 2 - type: AtmosPipeColor color: '#333333FF' + - uid: 7787 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -23.5,52.5 + parent: 2 + - type: AtmosPipeColor + color: '#B3A234FF' + - uid: 8083 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -21.5,53.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 8089 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -21.5,51.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 8110 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -21.5,52.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 8120 components: - type: Transform rot: 1.5707963267948966 rad - pos: -21.5,49.5 + pos: -25.5,45.5 parent: 2 - type: AtmosPipeColor - color: '#333333FF' - - uid: 8130 + color: '#03FCD3FF' + - uid: 8148 components: - type: Transform - pos: -23.5,52.5 + rot: 3.141592653589793 rad + pos: -17.5,51.5 parent: 2 - type: AtmosPipeColor color: '#FF1212FF' @@ -109585,6 +109004,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#B3A234FF' + - uid: 8195 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -17.5,53.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 8198 components: - type: Transform @@ -109593,14 +109020,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 8211 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -25.5,46.5 - parent: 2 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 8213 components: - type: Transform @@ -109609,14 +109028,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 8214 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -25.5,51.5 - parent: 2 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 8216 components: - type: Transform @@ -110755,21 +110166,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#3AB334FF' - - uid: 8843 - components: - - type: Transform - pos: -15.5,52.5 - parent: 2 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 8848 + - uid: 8846 components: - type: Transform rot: 1.5707963267948966 rad - pos: -15.5,46.5 + pos: -25.5,47.5 parent: 2 - type: AtmosPipeColor - color: '#333333FF' + color: '#03FCD3FF' - uid: 8854 components: - type: Transform @@ -110859,22 +110263,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 8989 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -18.5,46.5 - parent: 2 - - type: AtmosPipeColor - color: '#333333FF' - - uid: 9000 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -19.5,53.5 - parent: 2 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 9008 components: - type: Transform @@ -110920,52 +110308,21 @@ entities: parent: 2 - type: AtmosPipeColor color: '#03FCD3FF' - - uid: 9195 + - uid: 9186 components: - type: Transform - pos: -15.5,43.5 + pos: -17.5,52.5 parent: 2 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 9206 - components: - - type: Transform - pos: -17.5,45.5 - parent: 2 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 9209 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -16.5,46.5 + rot: 3.141592653589793 rad + pos: -23.5,53.5 parent: 2 - type: AtmosPipeColor - color: '#333333FF' - - uid: 9221 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,47.5 - parent: 2 - - type: AtmosPipeColor - color: '#333333FF' - - uid: 9231 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -23.5,51.5 - parent: 2 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 9260 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -18.5,53.5 - parent: 2 - - type: AtmosPipeColor - color: '#FF1212FF' + color: '#B3A234FF' - uid: 9332 components: - type: Transform @@ -111332,14 +110689,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 11911 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -20.5,49.5 - parent: 2 - - type: AtmosPipeColor - color: '#333333FF' - uid: 12289 components: - type: Transform @@ -113798,22 +113147,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 13582 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -25.5,49.5 - parent: 2 - - type: AtmosPipeColor - color: '#333333FF' - - uid: 13586 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -25.5,48.5 - parent: 2 - - type: AtmosPipeColor - color: '#333333FF' - uid: 13590 components: - type: Transform @@ -127007,14 +126340,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 16796 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -20.5,42.5 - parent: 2 - - type: AtmosPipeColor - color: '#947507FF' - uid: 16798 components: - type: Transform @@ -127359,14 +126684,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 18563 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -20.5,53.5 - parent: 2 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 19075 components: - type: Transform @@ -128562,37 +127879,21 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 23713 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -10.5,47.5 - parent: 2 - - type: AtmosPipeColor - color: '#333333FF' - - uid: 23719 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -9.5,47.5 - parent: 2 - - type: AtmosPipeColor - color: '#333333FF' - - uid: 23739 - components: - - type: Transform - pos: -18.5,46.5 - parent: 2 - - type: AtmosPipeColor - color: '#B3A234FF' - - uid: 23740 + - uid: 23735 components: - type: Transform rot: 1.5707963267948966 rad - pos: -23.5,49.5 + pos: -25.5,46.5 parent: 2 - type: AtmosPipeColor - color: '#333333FF' + color: '#947507FF' + - uid: 23736 + components: + - type: Transform + pos: -19.5,51.5 + parent: 2 + - type: AtmosPipeColor + color: '#947507FF' - uid: 23843 components: - type: Transform @@ -129528,22 +128829,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 28624 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -17.5,46.5 - parent: 2 - - type: AtmosPipeColor - color: '#333333FF' - - uid: 28630 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -23.5,48.5 - parent: 2 - - type: AtmosPipeColor - color: '#333333FF' - uid: 28758 components: - type: Transform @@ -129552,29 +128837,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 28837 - components: - - type: Transform - pos: -15.5,51.5 - parent: 2 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 28841 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -18.5,44.5 - parent: 2 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 28854 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -13.5,47.5 - parent: 2 - - type: AtmosPipeColor - color: '#333333FF' - uid: 28904 components: - type: Transform @@ -130295,698 +129557,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 31145 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -19.5,47.5 - parent: 2 - - type: AtmosPipeColor - color: '#333333FF' - - uid: 31146 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -19.5,48.5 - parent: 2 - - type: AtmosPipeColor - color: '#333333FF' - - uid: 31154 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -20.5,48.5 - parent: 2 - - type: AtmosPipeColor - color: '#B3A234FF' - - uid: 31155 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -21.5,48.5 - parent: 2 - - type: AtmosPipeColor - color: '#B3A234FF' - - uid: 31156 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -19.5,48.5 - parent: 2 - - type: AtmosPipeColor - color: '#B3A234FF' - - uid: 31159 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -17.5,48.5 - parent: 2 - - type: AtmosPipeColor - color: '#3AB334FF' - - uid: 31170 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -18.5,41.5 - parent: 2 - - type: AtmosPipeColor - color: '#947507FF' - - uid: 31202 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -22.5,41.5 - parent: 2 -- proto: GasPipeStraightAlt1 - entities: - - uid: 6240 - components: - - type: Transform - pos: -19.5,44.5 - parent: 2 - - type: AtmosPipeColor - color: '#947507FF' - - uid: 7620 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -19.5,47.5 - parent: 2 - - type: AtmosPipeColor - color: '#947507FF' - - uid: 7826 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -21.5,40.5 - parent: 2 - - uid: 7832 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -12.5,46.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 8037 - components: - - type: Transform - pos: -18.5,46.5 - parent: 2 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 8049 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -17.5,41.5 - parent: 2 - - type: AtmosPipeColor - color: '#947507FF' - - uid: 8050 - components: - - type: Transform - pos: -15.5,49.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 8100 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -16.5,53.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 8101 - components: - - type: Transform - pos: -15.5,52.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 8111 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -19.5,48.5 - parent: 2 - - type: AtmosPipeColor - color: '#3AB334FF' - - uid: 8804 - components: - - type: Transform - pos: -21.5,43.5 - parent: 2 - - uid: 8849 - components: - - type: Transform - pos: -15.5,50.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 9006 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -17.5,48.5 - parent: 2 - - type: AtmosPipeColor - color: '#3AB334FF' - - uid: 9205 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -18.5,45.5 - parent: 2 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 9220 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -20.5,48.5 - parent: 2 - - type: AtmosPipeColor - color: '#3AB334FF' - - uid: 9233 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -23.5,49.5 - parent: 2 - - type: AtmosPipeColor - color: '#333333FF' - - uid: 9251 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -23.5,52.5 - parent: 2 - - uid: 9259 - components: - - type: Transform - pos: -21.5,42.5 - parent: 2 - - uid: 13508 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -22.5,48.5 - parent: 2 - - type: AtmosPipeColor - color: '#3AB334FF' - - uid: 23718 - components: - - type: Transform - pos: -19.5,45.5 - parent: 2 - - type: AtmosPipeColor - color: '#947507FF' - - uid: 23735 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -17.5,53.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 28621 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -20.5,49.5 - parent: 2 - - type: AtmosPipeColor - color: '#947507FF' - - uid: 28628 - components: - - type: Transform - pos: -18.5,47.5 - parent: 2 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 28636 - components: - - type: Transform - pos: -19.5,43.5 - parent: 2 - - type: AtmosPipeColor - color: '#947507FF' - - uid: 28658 - components: - - type: Transform - pos: -19.5,42.5 - parent: 2 - - type: AtmosPipeColor - color: '#947507FF' - - uid: 28662 - components: - - type: Transform - pos: -14.5,47.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 28836 - components: - - type: Transform - pos: -18.5,48.5 - parent: 2 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 28842 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -20.5,51.5 - parent: 2 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 28845 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -19.5,48.5 - parent: 2 - - type: AtmosPipeColor - color: '#947507FF' - - uid: 31147 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -21.5,49.5 - parent: 2 - - type: AtmosPipeColor - color: '#947507FF' - - uid: 31148 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -21.5,47.5 - parent: 2 - - type: AtmosPipeColor - color: '#3AB334FF' - - uid: 31151 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -18.5,48.5 - parent: 2 - - type: AtmosPipeColor - color: '#3AB334FF' - - uid: 31161 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -19.5,51.5 - parent: 2 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 31166 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -19.5,46.5 - parent: 2 - - type: AtmosPipeColor - color: '#947507FF' - - uid: 31167 - components: - - type: Transform - pos: -18.5,50.5 - parent: 2 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 31171 - components: - - type: Transform - pos: -18.5,49.5 - parent: 2 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 31180 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -11.5,47.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 31187 - components: - - type: Transform - pos: -14.5,46.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 31188 - components: - - type: Transform - pos: -14.5,45.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 31191 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -18.5,42.5 - parent: 2 - - uid: 31196 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -20.5,42.5 - parent: 2 - - uid: 31200 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -17.5,42.5 - parent: 2 - - uid: 31203 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -21.5,42.5 - parent: 2 - - uid: 31206 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -15.5,42.5 - parent: 2 - - uid: 31240 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -16.5,42.5 - parent: 2 -- proto: GasPipeStraightAlt2 - entities: - - uid: 605 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -20.5,48.5 - parent: 2 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 606 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -21.5,46.5 - parent: 2 - - type: AtmosPipeColor - color: '#947507FF' - - uid: 620 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -20.5,46.5 - parent: 2 - - type: AtmosPipeColor - color: '#947507FF' - - uid: 7818 - components: - - type: Transform - pos: -15.5,50.5 - parent: 2 - - uid: 8064 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -13.5,47.5 - parent: 2 - - uid: 8065 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -22.5,45.5 - parent: 2 - - uid: 8066 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -10.5,46.5 - parent: 2 - - uid: 8802 - components: - - type: Transform - pos: -19.5,45.5 - parent: 2 - - type: AtmosPipeColor - color: '#947507FF' - - uid: 8841 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -22.5,53.5 - parent: 2 - - type: AtmosPipeColor - color: '#333333FF' - - uid: 8974 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -23.5,52.5 - parent: 2 - - type: AtmosPipeColor - color: '#333333FF' - - uid: 9025 - components: - - type: Transform - pos: -19.5,42.5 - parent: 2 - - type: AtmosPipeColor - color: '#947507FF' - - uid: 9186 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -23.5,50.5 - parent: 2 - - type: AtmosPipeColor - color: '#333333FF' - - uid: 9229 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -19.5,50.5 - parent: 2 - - type: AtmosPipeColor - color: '#3AB334FF' - - uid: 9232 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -22.5,41.5 - parent: 2 - - uid: 9253 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -15.5,52.5 - parent: 2 - - uid: 13588 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -17.5,47.5 - parent: 2 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 23716 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -19.5,49.5 - parent: 2 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 23725 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -20.5,51.5 - parent: 2 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 23741 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -16.5,43.5 - parent: 2 - - uid: 23829 - components: - - type: Transform - pos: -21.5,43.5 - parent: 2 - - uid: 28647 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -17.5,41.5 - parent: 2 - - type: AtmosPipeColor - color: '#947507FF' - - uid: 28666 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -21.5,53.5 - parent: 2 - - type: AtmosPipeColor - color: '#333333FF' - - uid: 28676 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -22.5,48.5 - parent: 2 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 28827 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -21.5,48.5 - parent: 2 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 28848 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -17.5,45.5 - parent: 2 - - uid: 29027 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,47.5 - parent: 2 - - uid: 31143 - components: - - type: Transform - pos: -19.5,43.5 - parent: 2 - - type: AtmosPipeColor - color: '#947507FF' - - uid: 31144 - components: - - type: Transform - pos: -19.5,44.5 - parent: 2 - - type: AtmosPipeColor - color: '#947507FF' - - uid: 31163 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -19.5,50.5 - parent: 2 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 31168 - components: - - type: Transform - pos: -20.5,46.5 - parent: 2 - - uid: 31174 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -19.5,45.5 - parent: 2 - - uid: 31176 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -22.5,47.5 - parent: 2 - - uid: 31177 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -21.5,47.5 - parent: 2 - - uid: 31192 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -20.5,43.5 - parent: 2 - - uid: 31198 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -21.5,43.5 - parent: 2 - - uid: 31199 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -22.5,43.5 - parent: 2 - - uid: 31218 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -14.5,43.5 - parent: 2 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 31219 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -15.5,42.5 - parent: 2 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 31220 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -16.5,42.5 - parent: 2 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 31221 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -17.5,42.5 - parent: 2 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 31238 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -18.5,43.5 - parent: 2 - - uid: 31239 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -17.5,43.5 - parent: 2 - - uid: 31241 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -15.5,43.5 - parent: 2 - - uid: 31242 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,43.5 - parent: 2 - proto: GasPipeTJunction entities: - uid: 17 @@ -134064,21 +132634,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 28650 - components: - - type: Transform - pos: -18.5,48.5 - parent: 2 - - type: AtmosPipeColor - color: '#B3A234FF' - - uid: 28839 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -15.5,48.5 - parent: 2 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 29608 components: - type: Transform @@ -134199,98 +132754,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' -- proto: GasPipeTJunctionAlt1 - entities: - - uid: 8058 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -21.5,46.5 - parent: 2 - - type: AtmosPipeColor - color: '#3AB334FF' - - uid: 9215 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -19.5,41.5 - parent: 2 - - type: AtmosPipeColor - color: '#947507FF' - - uid: 9218 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -19.5,49.5 - parent: 2 - - type: AtmosPipeColor - color: '#947507FF' - - uid: 16804 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -17.5,49.5 - parent: 2 - - type: AtmosPipeColor - color: '#3AB334FF' - - uid: 24120 - components: - - type: Transform - pos: -21.5,48.5 - parent: 2 - - type: AtmosPipeColor - color: '#3AB334FF' - - uid: 31183 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -12.5,45.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 31190 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -14.5,43.5 - parent: 2 -- proto: GasPipeTJunctionAlt2 - entities: - - uid: 7819 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -17.5,49.5 - parent: 2 - - type: AtmosPipeColor - color: '#3AB334FF' - - uid: 8046 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -15.5,49.5 - parent: 2 - - uid: 8943 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -19.5,48.5 - parent: 2 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 28853 - components: - - type: Transform - pos: -18.5,45.5 - parent: 2 - - uid: 31173 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -19.5,41.5 - parent: 2 - - type: AtmosPipeColor - color: '#947507FF' - proto: GasPort entities: - uid: 1675 @@ -134509,46 +132972,6 @@ entities: - type: Transform pos: -26.5,15.5 parent: 2 - - uid: 28619 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -21.5,39.5 - parent: 2 - - type: AtmosPipeLayers - pipeLayer: Secondary - - uid: 28659 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,49.5 - parent: 2 - - type: AtmosPipeLayers - pipeLayer: Tertiary - - uid: 28838 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -24.5,50.5 - parent: 2 - - type: AtmosPipeLayers - pipeLayer: Secondary - - uid: 28855 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -24.5,47.5 - parent: 2 - - type: AtmosPipeLayers - pipeLayer: Tertiary - - uid: 28861 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -24.5,45.5 - parent: 2 - - type: AtmosPipeLayers - pipeLayer: Tertiary - uid: 30939 components: - type: Transform @@ -134621,11 +133044,14 @@ entities: rot: 1.5707963267948966 rad pos: -36.5,29.5 parent: 2 - - uid: 8051 + - uid: 7778 components: - type: Transform - pos: -21.5,43.5 + rot: 3.141592653589793 rad + pos: -23.5,50.5 parent: 2 + - type: AtmosPipeColor + color: '#B3A234FF' - uid: 9752 components: - type: Transform @@ -134660,46 +133086,16 @@ entities: targetPressure: 501.325 - type: AtmosPipeColor color: '#0335FCFF' -- proto: GasPressurePumpAlt1 - entities: - - uid: 28849 - components: - - type: Transform - pos: -22.5,44.5 - parent: 2 -- proto: GasPressurePumpAlt2 - entities: - - uid: 8044 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -22.5,44.5 - parent: 2 - - type: AtmosPipeLayers - pipeLayer: Primary - - uid: 9238 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -21.5,42.5 - parent: 2 - proto: GasPressureRegulator entities: - - uid: 28645 + - uid: 7786 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -12.5,47.5 - parent: 2 - - type: AtmosPipeColor - color: '#333333FF' -- proto: GasPressureRegulatorAlt2 - entities: - - uid: 9001 - components: - - type: Transform - pos: -23.5,51.5 + rot: 1.5707963267948966 rad + pos: -23.5,52.5 parent: 2 + - type: GasPressureRegulator + threshold: 95000 - type: AtmosPipeColor color: '#333333FF' - proto: GasRecycler @@ -134733,6 +133129,12 @@ entities: parent: 2 - proto: GasThermoMachineFreezerEnabled entities: + - uid: 8079 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,46.5 + parent: 2 - uid: 8874 components: - type: Transform @@ -134758,6 +133160,12 @@ entities: parent: 2 - proto: GasThermoMachineHeaterEnabled entities: + - uid: 8127 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,45.5 + parent: 2 - uid: 8871 components: - type: Transform @@ -134778,14 +133186,6 @@ entities: open: False - type: AtmosPipeColor color: '#3AB334FF' - - uid: 7780 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -15.5,47.5 - parent: 2 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 8180 components: - type: Transform @@ -134876,16 +133276,6 @@ entities: open: False - type: AtmosPipeColor color: '#B3A234FF' - - uid: 9185 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -17.5,41.5 - parent: 2 - - type: GasValve - open: False - - type: AtmosPipeColor - color: '#947507FF' - uid: 9203 components: - type: Transform @@ -134893,24 +133283,6 @@ entities: parent: 2 - type: GasValve open: False - - uid: 9214 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -16.5,48.5 - parent: 2 - - type: GasValve - open: False - - type: AtmosPipeColor - color: '#B3A234FF' - - uid: 9227 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -22.5,48.5 - parent: 2 - - type: AtmosPipeColor - color: '#B3A234FF' - uid: 9759 components: - type: Transform @@ -134948,16 +133320,26 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 19163 + - uid: 23725 components: - type: Transform - rot: 3.141592653589793 rad - pos: -18.5,45.5 + rot: -1.5707963267948966 rad + pos: -24.5,46.5 parent: 2 - type: GasValve open: False - type: AtmosPipeColor - color: '#B3A234FF' + color: '#947507FF' + - uid: 23734 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -19.5,50.5 + parent: 2 + - type: GasValve + open: False + - type: AtmosPipeColor + color: '#947507FF' - uid: 23828 components: - type: Transform @@ -134975,261 +133357,6 @@ entities: parent: 2 - type: GasValve open: False - - uid: 31153 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -17.5,49.5 - parent: 2 - - type: GasValve - open: False - - type: AtmosPipeColor - color: '#3AB334FF' -- proto: GasValveAlt1 - entities: - - uid: 715 - components: - - type: Transform - pos: -20.5,42.5 - parent: 2 - - type: GasValve - open: False - - type: AtmosPipeColor - color: '#947507FF' - - uid: 8067 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -18.5,41.5 - parent: 2 - - type: AtmosPipeColor - color: '#947507FF' - - uid: 8121 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -17.5,48.5 - parent: 2 - - type: AtmosPipeColor - color: '#3AB334FF' - - uid: 8215 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -22.5,46.5 - parent: 2 - - type: AtmosPipeColor - color: '#3AB334FF' - - uid: 8945 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -18.5,44.5 - parent: 2 - - type: GasValve - open: False - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 28622 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -22.5,49.5 - parent: 2 - - type: AtmosPipeColor - color: '#947507FF' - - uid: 28637 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -20.5,50.5 - parent: 2 - - type: GasValve - open: False - - type: AtmosPipeColor - color: '#947507FF' - - uid: 28646 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -23.5,48.5 - parent: 2 - - type: GasValve - open: False - - type: AtmosPipeColor - color: '#3AB334FF' - - uid: 28660 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -17.5,50.5 - parent: 2 - - type: GasValve - open: False - - type: AtmosPipeColor - color: '#3AB334FF' - - uid: 28843 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -21.5,51.5 - parent: 2 - - type: GasValve - open: False - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 28846 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -15.5,51.5 - parent: 2 - - type: GasValve - open: False - - type: AtmosPipeColor - color: '#990000FF' - - uid: 31189 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -14.5,44.5 - parent: 2 - - type: GasValve - open: False - - type: AtmosPipeColor - color: '#990000FF' - - uid: 31195 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -12.5,44.5 - parent: 2 - - type: GasValve - open: False - - type: AtmosPipeColor - color: '#990000FF' - - uid: 31197 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -19.5,42.5 - parent: 2 - - type: GasValve - open: False - - uid: 31212 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -14.5,45.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' -- proto: GasValveAlt2 - entities: - - uid: 679 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -18.5,41.5 - parent: 2 - - type: GasValve - open: False - - type: AtmosPipeColor - color: '#947507FF' - - uid: 7732 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -20.5,50.5 - parent: 2 - - type: AtmosPipeColor - color: '#3AB334FF' - - uid: 8040 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -23.5,48.5 - parent: 2 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 8981 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -22.5,46.5 - parent: 2 - - type: AtmosPipeColor - color: '#947507FF' - - uid: 9237 - components: - - type: Transform - pos: -20.5,42.5 - parent: 2 - - type: AtmosPipeColor - color: '#947507FF' - - uid: 9239 - components: - - type: Transform - pos: -17.5,48.5 - parent: 2 - - type: GasValve - open: False - - type: AtmosPipeColor - color: '#3AB334FF' - - uid: 23734 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -16.5,45.5 - parent: 2 - - type: GasValve - open: False - - uid: 28656 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -17.5,50.5 - parent: 2 - - type: GasValve - open: False - - type: AtmosPipeColor - color: '#3AB334FF' - - uid: 28829 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -16.5,47.5 - parent: 2 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 31160 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -18.5,44.5 - parent: 2 - - uid: 31162 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -21.5,51.5 - parent: 2 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 31193 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -19.5,43.5 - parent: 2 - - uid: 31217 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -14.5,44.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - proto: GasVentPump entities: - uid: 56 @@ -137684,19 +135811,6 @@ entities: - 29904 - type: AtmosPipeColor color: '#990000FF' - - uid: 9198 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -10.5,46.5 - parent: 2 - - type: DeviceNetwork - deviceLists: - - 31253 - - type: AtmosPipeLayers - pipeLayer: Secondary - - type: AtmosPipeColor - color: '#990000FF' - uid: 9858 components: - type: Transform @@ -139721,78 +137835,52 @@ entities: color: '#990000FF' - proto: GasVolumePump entities: - - uid: 7778 + - uid: 8044 components: - type: Transform - pos: -15.5,49.5 + rot: 3.141592653589793 rad + pos: -20.5,47.5 + parent: 2 + - type: AtmosPipeColor + color: '#03FCD3FF' + - uid: 8045 + components: + - type: Transform + pos: -18.5,45.5 parent: 2 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 8105 + - uid: 8046 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -17.5,50.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 8047 + components: + - type: Transform + pos: -21.5,50.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 8972 components: - type: Transform rot: -1.5707963267948966 rad - pos: -24.5,46.5 + pos: -24.5,47.5 parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 9225 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -17.5,46.5 - parent: 2 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 28856 + color: '#03FCD3FF' + - uid: 8990 components: - type: Transform rot: 1.5707963267948966 rad - pos: -23.5,45.5 - parent: 2 - - type: AtmosPipeLayers - pipeLayer: Tertiary - - uid: 31164 - components: - - type: Transform - pos: -15.5,42.5 + pos: -24.5,45.5 parent: 2 - type: AtmosPipeColor - color: '#FF1212FF' -- proto: GasVolumePumpAlt1 - entities: - - uid: 7787 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -23.5,51.5 - parent: 2 - - uid: 7831 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -21.5,41.5 - parent: 2 -- proto: GasVolumePumpAlt2 - entities: - - uid: 7784 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -15.5,51.5 - parent: 2 - - uid: 23646 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -23.5,47.5 - parent: 2 - - uid: 28657 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -12.5,47.5 - parent: 2 + color: '#03FCD3FF' - proto: Gateway entities: - uid: 3678 @@ -139929,6 +138017,18 @@ entities: - type: Transform pos: -11.5,27.5 parent: 2 + - uid: 606 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.5,44.5 + parent: 2 + - uid: 715 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -11.5,47.5 + parent: 2 - uid: 747 components: - type: Transform @@ -140360,6 +138460,11 @@ entities: rot: 1.5707963267948966 rad pos: 7.5,-83.5 parent: 2 + - uid: 2174 + components: + - type: Transform + pos: -23.5,51.5 + parent: 2 - uid: 2297 components: - type: Transform @@ -141773,6 +139878,12 @@ entities: rot: 1.5707963267948966 rad pos: 19.5,38.5 parent: 2 + - uid: 7732 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -15.5,49.5 + parent: 2 - uid: 7741 components: - type: Transform @@ -141833,17 +139944,28 @@ entities: rot: 3.141592653589793 rad pos: -7.5,52.5 parent: 2 - - uid: 7776 + - uid: 7777 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -12.5,46.5 + pos: -18.5,53.5 parent: 2 - - uid: 7781 + - uid: 7817 components: - type: Transform - rot: 3.141592653589793 rad - pos: -15.5,50.5 + rot: 1.5707963267948966 rad + pos: -8.5,47.5 + parent: 2 + - uid: 7818 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,47.5 + parent: 2 + - uid: 7824 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.5,47.5 parent: 2 - uid: 7834 components: @@ -141934,60 +140056,66 @@ entities: - type: Transform pos: -14.5,28.5 parent: 2 - - uid: 8039 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -13.5,51.5 - parent: 2 - - uid: 8045 - components: - - type: Transform - pos: -9.5,44.5 - parent: 2 - - uid: 8047 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -15.5,52.5 - parent: 2 - - uid: 8059 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -10.5,48.5 - parent: 2 - - uid: 8060 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -9.5,48.5 - parent: 2 - uid: 8063 components: - type: Transform rot: -1.5707963267948966 rad pos: -7.5,46.5 parent: 2 + - uid: 8064 + components: + - type: Transform + pos: -15.5,53.5 + parent: 2 + - uid: 8066 + components: + - type: Transform + pos: -18.5,51.5 + parent: 2 + - uid: 8068 + components: + - type: Transform + pos: -20.5,53.5 + parent: 2 - uid: 8096 components: - type: Transform - pos: -17.5,52.5 + pos: -19.5,51.5 parent: 2 - - uid: 8102 + - uid: 8099 components: - type: Transform - pos: -8.5,48.5 + pos: -24.5,53.5 + parent: 2 + - uid: 8101 + components: + - type: Transform + pos: -23.5,53.5 parent: 2 - uid: 8103 components: - type: Transform - pos: -14.5,54.5 + pos: -24.5,51.5 parent: 2 - - uid: 8122 + - uid: 8105 components: - type: Transform - pos: -10.5,44.5 + pos: -19.5,53.5 + parent: 2 + - uid: 8111 + components: + - type: Transform + pos: -17.5,53.5 + parent: 2 + - uid: 8124 + components: + - type: Transform + pos: -20.5,51.5 + parent: 2 + - uid: 8126 + components: + - type: Transform + pos: -21.5,53.5 parent: 2 - uid: 8137 components: @@ -142004,11 +140132,6 @@ entities: - type: Transform pos: -25.5,39.5 parent: 2 - - uid: 8150 - components: - - type: Transform - pos: -18.5,52.5 - parent: 2 - uid: 8153 components: - type: Transform @@ -142025,21 +140148,17 @@ entities: - type: Transform pos: -25.5,46.5 parent: 2 - - uid: 8195 - components: - - type: Transform - pos: -25.5,49.5 - parent: 2 - uid: 8208 components: - type: Transform rot: -1.5707963267948966 rad pos: -25.5,46.5 parent: 2 - - uid: 8209 + - uid: 8217 components: - type: Transform - pos: -25.5,51.5 + rot: 1.5707963267948966 rad + pos: -13.5,45.5 parent: 2 - uid: 8232 components: @@ -142327,27 +140446,111 @@ entities: rot: 3.141592653589793 rad pos: -24.5,3.5 parent: 2 - - uid: 8799 - components: - - type: Transform - pos: -16.5,54.5 - parent: 2 - - uid: 8809 - components: - - type: Transform - pos: -19.5,52.5 - parent: 2 - - uid: 9021 + - uid: 8808 components: - type: Transform rot: -1.5707963267948966 rad - pos: -24.5,52.5 + pos: -25.5,45.5 parent: 2 - - uid: 9187 + - uid: 8811 components: - type: Transform + rot: 1.5707963267948966 rad + pos: -24.5,55.5 + parent: 2 + - uid: 8841 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,44.5 + parent: 2 + - uid: 8842 + components: + - type: Transform + pos: -21.5,51.5 + parent: 2 + - uid: 8845 + components: + - type: Transform + pos: -15.5,51.5 + parent: 2 + - uid: 8981 + components: + - type: Transform + pos: -17.5,51.5 + parent: 2 + - uid: 9185 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -13.5,50.5 + parent: 2 + - uid: 9189 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -22.5,55.5 + parent: 2 + - uid: 9196 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,44.5 + parent: 2 + - uid: 9213 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -12.5,47.5 + parent: 2 + - uid: 9215 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -26.5,58.5 + parent: 2 + - uid: 9217 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -13.5,46.5 + parent: 2 + - uid: 9219 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -25.5,59.5 + parent: 2 + - uid: 9222 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -25.5,47.5 + parent: 2 + - uid: 9223 + components: + - type: Transform + rot: 1.5707963267948966 rad pos: -8.5,44.5 parent: 2 + - uid: 9229 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -23.5,59.5 + parent: 2 + - uid: 9230 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,45.5 + parent: 2 + - uid: 9233 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -21.5,59.5 + parent: 2 - uid: 9257 components: - type: Transform @@ -143936,6 +142139,42 @@ entities: rot: 1.5707963267948966 rad pos: 16.5,42.5 parent: 2 + - uid: 16677 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -24.5,59.5 + parent: 2 + - uid: 16795 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -30.5,49.5 + parent: 2 + - uid: 16796 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -30.5,50.5 + parent: 2 + - uid: 16797 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -33.5,48.5 + parent: 2 + - uid: 16804 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -33.5,47.5 + parent: 2 + - uid: 16807 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -33.5,49.5 + parent: 2 - uid: 16970 components: - type: Transform @@ -143987,6 +142226,12 @@ entities: - type: Transform pos: 44.5,-22.5 parent: 2 + - uid: 17431 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -30.5,53.5 + parent: 2 - uid: 17462 components: - type: Transform @@ -145799,12 +144044,6 @@ entities: rot: 3.141592653589793 rad pos: -2.5,-19.5 parent: 21002 - - uid: 24121 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -23.5,52.5 - parent: 2 - uid: 24133 components: - type: Transform @@ -146635,16 +144874,6 @@ entities: rot: -1.5707963267948966 rad pos: 50.5,-10.5 parent: 2 - - uid: 28675 - components: - - type: Transform - pos: -20.5,52.5 - parent: 2 - - uid: 28847 - components: - - type: Transform - pos: -21.5,52.5 - parent: 2 - uid: 28870 components: - type: Transform @@ -147454,12 +145683,6 @@ entities: rot: 3.141592653589793 rad pos: 79.5,37.5 parent: 2 - - uid: 20631 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -25.5,56.5 - parent: 2 - uid: 20632 components: - type: Transform @@ -148140,129 +146363,50 @@ entities: parent: 2 - proto: HeatExchanger entities: - - uid: 8108 + - uid: 8071 components: - type: Transform rot: -1.5707963267948966 rad - pos: -22.5,53.5 + pos: -19.5,54.5 parent: 2 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 8109 + - uid: 8076 components: - type: Transform rot: -1.5707963267948966 rad - pos: -16.5,53.5 + pos: -26.5,47.5 + parent: 2 + - type: AtmosPipeColor + color: '#03FCD3FF' + - uid: 8081 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -18.5,54.5 parent: 2 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 8221 + - uid: 8128 components: - type: Transform - rot: 3.141592653589793 rad - pos: -28.5,47.5 - parent: 2 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8994 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -26.5,46.5 - parent: 2 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 9024 - components: - - type: Transform - pos: -28.5,50.5 - parent: 2 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 9210 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -26.5,51.5 - parent: 2 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 9222 - components: - - type: Transform - pos: -28.5,49.5 - parent: 2 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 9224 - components: - - type: Transform - pos: -28.5,48.5 - parent: 2 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 9423 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -21.5,53.5 - parent: 2 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 16807 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -27.5,51.5 - parent: 2 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 17431 - components: - - type: Transform - rot: -1.5707963267948966 rad pos: -27.5,46.5 parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 23736 + color: '#03FCD3FF' + - uid: 8129 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -26.5,45.5 + parent: 2 + - type: AtmosPipeColor + color: '#03FCD3FF' + - uid: 8130 components: - type: Transform rot: -1.5707963267948966 rad - pos: -17.5,53.5 - parent: 2 - - type: AtmosPipeColor - color: '#FF1212FF' -- proto: HeatExchangerBend - entities: - - uid: 8190 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -23.5,53.5 - parent: 2 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 8990 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -28.5,51.5 - parent: 2 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 9213 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -28.5,46.5 - parent: 2 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 28634 - components: - - type: Transform - pos: -15.5,53.5 + pos: -20.5,54.5 parent: 2 - type: AtmosPipeColor color: '#FF1212FF' @@ -149072,7 +147216,7 @@ entities: pos: 36.5,-35.5 parent: 2 - type: Door - secondsUntilStateChange: -359496.5 + secondsUntilStateChange: -372150.47 state: Opening - uid: 5211 components: @@ -149485,11 +147629,6 @@ entities: parent: 2 - proto: Igniter entities: - - uid: 23720 - components: - - type: Transform - pos: -19.741884,53.264633 - parent: 2 - uid: 28832 components: - type: Transform @@ -149500,11 +147639,6 @@ entities: - type: Transform pos: -19.21745,39.409294 parent: 2 - - uid: 31184 - components: - - type: Transform - pos: -8.459323,46.421654 - parent: 2 - proto: InflatableDoor entities: - uid: 27940 @@ -152378,6 +150512,11 @@ entities: - type: Transform pos: -11.642696,-33.56171 parent: 2 + - uid: 19489 + components: + - type: Transform + pos: -12.195773,43.60229 + parent: 2 - proto: MedkitCombatFilled entities: - uid: 13961 @@ -152482,6 +150621,43 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage +- proto: MeteorRock + entities: + - uid: 6457 + components: + - type: Transform + pos: -16.5,56.5 + parent: 2 + - uid: 7780 + components: + - type: Transform + pos: -17.5,56.5 + parent: 2 + - uid: 7782 + components: + - type: Transform + pos: -19.5,56.5 + parent: 2 + - uid: 7821 + components: + - type: Transform + pos: -20.5,56.5 + parent: 2 + - uid: 8802 + components: + - type: Transform + pos: -21.5,57.5 + parent: 2 + - uid: 8939 + components: + - type: Transform + pos: -21.5,56.5 + parent: 2 + - uid: 8994 + components: + - type: Transform + pos: -18.5,56.5 + parent: 2 - proto: MicroManipulatorStockPart entities: - uid: 23591 @@ -152841,6 +151017,11 @@ entities: parent: 8002 - type: Physics canCollide: False + - uid: 19163 + components: + - type: Transform + pos: -12.717164,43.67841 + parent: 2 - uid: 31116 components: - type: Transform @@ -153251,11 +151432,6 @@ entities: - type: Transform pos: 57.5,-15.5 parent: 2 - - uid: 31223 - components: - - type: Transform - pos: -12.5,45.5 - parent: 2 - proto: PaintingHelloWorld entities: - uid: 3736 @@ -155365,6 +153541,11 @@ entities: parent: 2 - proto: PlasmaCanister entities: + - uid: 8060 + components: + - type: Transform + pos: -14.5,48.5 + parent: 2 - uid: 8857 components: - type: Transform @@ -155380,11 +153561,6 @@ entities: - type: Transform pos: -42.5,17.5 parent: 2 - - uid: 31230 - components: - - type: Transform - pos: -13.5,45.5 - parent: 2 - proto: PlasmaReinforcedWindowDirectional entities: - uid: 3386 @@ -155615,6 +153791,13 @@ entities: - type: Transform pos: 55.5,22.5 parent: 2 +- proto: PlushieAtmosian + entities: + - uid: 8988 + components: + - type: Transform + pos: -24.504452,54.444206 + parent: 2 - proto: PlushieCarp entities: - uid: 19089 @@ -156038,6 +154221,13 @@ entities: fixtures: {} - proto: PosterLegitJustAWeekAway entities: + - uid: 19495 + components: + - type: Transform + pos: -10.5,44.5 + parent: 2 + - type: Fixtures + fixtures: {} - uid: 28438 components: - type: Transform @@ -158484,18 +156674,18 @@ entities: rot: -1.5707963267948966 rad pos: -15.5,29.5 parent: 2 - - uid: 8089 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -11.5,49.5 - parent: 2 - uid: 8090 components: - type: Transform rot: -1.5707963267948966 rad pos: 1.5,45.5 parent: 2 + - uid: 8190 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -12.5,49.5 + parent: 2 - uid: 8793 components: - type: Transform @@ -158582,7 +156772,67 @@ entities: components: - type: Transform rot: 1.5707963267948966 rad - pos: -24.5,47.5 + pos: -24.5,49.5 + parent: 2 + - uid: 9237 + components: + - type: Transform + anchored: False + rot: 3.141592653589793 rad + pos: -11.010417,45 + parent: 1 + - type: Physics + bodyType: Dynamic + - uid: 9238 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -14.5,50.5 + parent: 2 + - uid: 9239 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,48.5 + parent: 2 + - uid: 9249 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -17.5,49.5 + parent: 2 + - uid: 9250 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -22.5,54.5 + parent: 2 + - uid: 9251 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -16.5,54.5 + parent: 2 + - uid: 9252 + components: + - type: Transform + pos: -19.5,54.5 + parent: 2 + - uid: 9253 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -24.5,44.5 + parent: 2 + - uid: 9254 + components: + - type: Transform + pos: -22.5,52.5 + parent: 2 + - uid: 9255 + components: + - type: Transform + pos: -16.5,52.5 parent: 2 - uid: 9281 components: @@ -159568,29 +157818,12 @@ entities: - type: Transform pos: 54.5,20.5 parent: 2 - - uid: 31347 - components: - - type: Transform - pos: -16.5,49.5 - parent: 2 - - uid: 31348 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,46.5 - parent: 2 - uid: 31349 components: - type: Transform rot: 3.141592653589793 rad pos: -11.5,40.5 parent: 2 - - uid: 31352 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -24.5,50.5 - parent: 2 - proto: PoweredlightEmpty entities: - uid: 12295 @@ -160307,6 +158540,11 @@ entities: rot: 1.5707963267948966 rad pos: -30.5,37.5 parent: 2 + - uid: 9001 + components: + - type: Transform + pos: -14.5,47.5 + parent: 2 - uid: 20810 components: - type: Transform @@ -162957,11 +161195,6 @@ entities: - type: Transform pos: -59.5,-37.5 parent: 2 - - uid: 30221 - components: - - type: Transform - pos: -17.5,55.5 - parent: 2 - uid: 30224 components: - type: Transform @@ -164688,6 +162921,13 @@ entities: parent: 2 - proto: ReinforcedPlasmaWindow entities: + - uid: 605 + components: + - type: Transform + pos: -23.5,53.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 1061 components: - type: Transform @@ -164967,82 +163207,10 @@ entities: parent: 2 - type: DeltaPressure gridUid: 2 - - uid: 7782 + - uid: 7827 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -13.5,51.5 - parent: 2 - - type: DeltaPressure - gridUid: 2 - - uid: 7821 - components: - - type: Transform - pos: -21.5,52.5 - parent: 2 - - type: DeltaPressure - gridUid: 2 - - uid: 7822 - components: - - type: Transform - pos: -9.5,48.5 - parent: 2 - - type: DeltaPressure - gridUid: 2 - - uid: 7823 - components: - - type: Transform - pos: -20.5,52.5 - parent: 2 - - type: DeltaPressure - gridUid: 2 - - uid: 7824 - components: - - type: Transform - pos: -14.5,54.5 - parent: 2 - - type: DeltaPressure - gridUid: 2 - - uid: 7825 - components: - - type: Transform - pos: -10.5,48.5 - parent: 2 - - type: DeltaPressure - gridUid: 2 - - uid: 8057 - components: - - type: Transform - pos: -24.5,52.5 - parent: 2 - - type: DeltaPressure - gridUid: 2 - - uid: 8083 - components: - - type: Transform - pos: -16.5,54.5 - parent: 2 - - type: DeltaPressure - gridUid: 2 - - uid: 8097 - components: - - type: Transform - pos: -17.5,52.5 - parent: 2 - - type: DeltaPressure - gridUid: 2 - - uid: 8098 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -15.5,52.5 - parent: 2 - - type: DeltaPressure - gridUid: 2 - - uid: 8129 - components: - - type: Transform - pos: -8.5,48.5 + pos: -19.5,53.5 parent: 2 - type: DeltaPressure gridUid: 2 @@ -165054,6 +163222,20 @@ entities: parent: 2 - type: DeltaPressure gridUid: 2 + - uid: 8214 + components: + - type: Transform + pos: -17.5,53.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 + - uid: 8221 + components: + - type: Transform + pos: -21.5,53.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8360 components: - type: Transform @@ -165103,18 +163285,45 @@ entities: parent: 2 - type: DeltaPressure gridUid: 2 - - uid: 8988 + - uid: 8843 components: - type: Transform - pos: -18.5,52.5 + pos: -24.5,55.5 parent: 2 - type: DeltaPressure gridUid: 2 - - uid: 9255 + - uid: 9184 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -12.5,46.5 + pos: -20.5,53.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 + - uid: 9192 + components: + - type: Transform + pos: -24.5,53.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 + - uid: 9206 + components: + - type: Transform + pos: -18.5,53.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 + - uid: 9207 + components: + - type: Transform + pos: -22.5,55.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 + - uid: 9225 + components: + - type: Transform + pos: -15.5,53.5 parent: 2 - type: DeltaPressure gridUid: 2 @@ -165141,13 +163350,6 @@ entities: parent: 2 - type: DeltaPressure gridUid: 2 - - uid: 9422 - components: - - type: Transform - pos: -10.5,44.5 - parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9586 components: - type: Transform @@ -165240,13 +163442,6 @@ entities: parent: 2 - type: DeltaPressure gridUid: 2 - - uid: 16795 - components: - - type: Transform - pos: -9.5,44.5 - parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17304 components: - type: Transform @@ -165300,28 +163495,6 @@ entities: parent: 2 - type: DeltaPressure gridUid: 2 - - uid: 23715 - components: - - type: Transform - pos: -8.5,44.5 - parent: 2 - - type: DeltaPressure - gridUid: 2 - - uid: 23737 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -15.5,50.5 - parent: 2 - - type: DeltaPressure - gridUid: 2 - - uid: 23742 - components: - - type: Transform - pos: -19.5,52.5 - parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 28512 components: - type: Transform @@ -165350,14 +163523,6 @@ entities: parent: 21002 - type: DeltaPressure gridUid: 21002 - - uid: 28851 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -23.5,52.5 - parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 29154 components: - type: Transform @@ -165458,13 +163623,6 @@ entities: parent: 2 - type: DeltaPressure gridUid: 2 - - uid: 31185 - components: - - type: Transform - pos: -7.5,46.5 - parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: ReinforcedUraniumWindow entities: - uid: 13028 @@ -167123,6 +165281,46 @@ entities: parent: 2 - type: DeltaPressure gridUid: 2 + - uid: 7825 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -13.5,50.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 + - uid: 7831 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -24.5,51.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 + - uid: 8037 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,47.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 + - uid: 8059 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -13.5,45.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 + - uid: 8065 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -25.5,47.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8077 components: - type: Transform @@ -167130,17 +165328,11 @@ entities: parent: 2 - type: DeltaPressure gridUid: 2 - - uid: 8078 + - uid: 8080 components: - type: Transform - pos: -25.5,49.5 - parent: 2 - - type: DeltaPressure - gridUid: 2 - - uid: 8081 - components: - - type: Transform - pos: -25.5,51.5 + rot: -1.5707963267948966 rad + pos: -12.5,47.5 parent: 2 - type: DeltaPressure gridUid: 2 @@ -167152,6 +165344,62 @@ entities: parent: 2 - type: DeltaPressure gridUid: 2 + - uid: 8097 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -19.5,51.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 + - uid: 8102 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -20.5,51.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 + - uid: 8109 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -11.5,44.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 + - uid: 8121 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,44.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 + - uid: 8150 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -23.5,51.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 + - uid: 8210 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,47.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 + - uid: 8215 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -15.5,51.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8228 components: - type: Transform @@ -167464,6 +165712,30 @@ entities: parent: 2 - type: DeltaPressure gridUid: 2 + - uid: 8799 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,46.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 + - uid: 8800 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,44.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 + - uid: 8801 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -11.5,47.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8820 components: - type: Transform @@ -167472,6 +165744,22 @@ entities: parent: 2 - type: DeltaPressure gridUid: 2 + - uid: 8848 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,47.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 + - uid: 8849 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,45.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 8875 components: - type: Transform @@ -167508,6 +165796,54 @@ entities: parent: 2 - type: DeltaPressure gridUid: 2 + - uid: 9000 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -17.5,51.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 + - uid: 9024 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -12.5,44.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 + - uid: 9025 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -18.5,51.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 + - uid: 9188 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -21.5,51.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 + - uid: 9195 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -15.5,49.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 + - uid: 9197 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -13.5,46.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9200 components: - type: Transform @@ -167516,6 +165852,14 @@ entities: parent: 2 - type: DeltaPressure gridUid: 2 + - uid: 9208 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -25.5,45.5 + parent: 2 + - type: DeltaPressure + gridUid: 2 - uid: 9256 components: - type: Transform @@ -170407,6 +168751,11 @@ entities: - type: Transform pos: -29.65705,25.650564 parent: 2 + - uid: 9224 + components: + - type: Transform + pos: -14.483412,47.586296 + parent: 2 - uid: 9316 components: - type: Transform @@ -170434,6 +168783,11 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage + - uid: 19317 + components: + - type: Transform + pos: -14.384479,47.51929 + parent: 2 - uid: 20900 components: - type: Transform @@ -171502,6 +169856,20 @@ entities: parent: 2 - type: Fixtures fixtures: {} +- proto: SignalButton + entities: + - uid: 8106 + components: + - type: Transform + pos: -22.5,51.5 + parent: 2 + - type: DeviceLinkSource + linkedPorts: + 5357: + - - Pressed + - Toggle + - type: Fixtures + fixtures: {} - proto: SignalButtonDirectional entities: - uid: 1014 @@ -172296,49 +170664,6 @@ entities: - Toggle - type: Fixtures fixtures: {} - - uid: 31250 - components: - - type: MetaData - name: igniter - - type: Transform - pos: -22.5,52.5 - parent: 2 - - type: DeviceLinkSource - linkedPorts: - 23720: - - - Pressed - - Trigger - - type: Fixtures - fixtures: {} - - uid: 31251 - components: - - type: MetaData - name: igniter - - type: Transform - pos: -11.5,44.5 - parent: 2 - - type: DeviceLinkSource - linkedPorts: - 31184: - - - Pressed - - Trigger - - type: Fixtures - fixtures: {} - - uid: 31252 - components: - - type: MetaData - name: blast door - - type: Transform - rot: 3.141592653589793 rad - pos: -14.5,50.5 - parent: 2 - - type: DeviceLinkSource - linkedPorts: - 8846: - - - Pressed - - Toggle - - type: Fixtures - fixtures: {} - proto: SignalControlledValve entities: - uid: 12892 @@ -174071,6 +172396,16 @@ entities: parent: 2 - type: Fixtures fixtures: {} +- proto: SignFlammableMed + entities: + - uid: 19500 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -25.5,50.5 + parent: 2 + - type: Fixtures + fixtures: {} - proto: SignGenpop entities: - uid: 4825 @@ -178917,6 +177252,17 @@ entities: - type: Transform pos: -46.5,-40.5 parent: 2 + - uid: 19486 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -24.562551,48.804047 + parent: 2 + - uid: 19487 + components: + - type: Transform + pos: -24.547983,50.670708 + parent: 2 - proto: StoolBar entities: - uid: 321 @@ -180018,38 +178364,6 @@ entities: - SurveillanceCameraEngineering nameSet: True id: Anchorage - - uid: 31346 - components: - - type: Transform - pos: -12.5,40.5 - parent: 2 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraEngineering - nameSet: True - id: TEG East - - uid: 31350 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -24.5,44.5 - parent: 2 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraEngineering - nameSet: True - id: TEG West - - uid: 31351 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -22.5,51.5 - parent: 2 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraEngineering - nameSet: True - id: TEG North - uid: 31355 components: - type: Transform @@ -180084,6 +178398,17 @@ entities: - SurveillanceCameraGeneral nameSet: True id: Atrium B + - uid: 9021 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -12.5,49.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Chess match - uid: 10260 components: - type: Transform @@ -180634,17 +178959,6 @@ entities: - SurveillanceCameraGeneral nameSet: True id: Evac 3 - - uid: 31356 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -12.5,50.5 - parent: 2 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraGeneral - nameSet: True - id: Engi Dock - proto: SurveillanceCameraMedical entities: - uid: 20915 @@ -182330,6 +180644,16 @@ entities: - type: Transform pos: 34.5,-41.5 parent: 2 + - uid: 19316 + components: + - type: Transform + pos: -12.5,43.5 + parent: 2 + - uid: 19499 + components: + - type: Transform + pos: -13.5,43.5 + parent: 2 - uid: 20194 components: - type: Transform @@ -183770,6 +182094,12 @@ entities: rot: 3.141592653589793 rad pos: 37.5,-11.5 parent: 2 + - uid: 19259 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -24.5,49.5 + parent: 2 - uid: 23398 components: - type: Transform @@ -184265,6 +182595,12 @@ entities: - type: Transform pos: -11.5,35.5 parent: 2 + - uid: 8211 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,48.5 + parent: 2 - uid: 8944 components: - type: Transform @@ -184722,26 +183058,26 @@ entities: parent: 2 - proto: TegCenter entities: - - uid: 23644 + - uid: 8122 components: - type: Transform rot: -1.5707963267948966 rad - pos: -16.5,44.5 + pos: -19.5,46.5 parent: 2 - proto: TegCirculator entities: - - uid: 9249 + - uid: 8108 components: - type: Transform rot: 3.141592653589793 rad - pos: -17.5,44.5 + pos: -20.5,46.5 parent: 2 - type: PointLight color: '#FF3300FF' - - uid: 31139 + - uid: 8149 components: - type: Transform - pos: -15.5,44.5 + pos: -18.5,46.5 parent: 2 - type: PointLight color: '#FF3300FF' @@ -186610,6 +184946,13 @@ entities: - type: Transform pos: 3.5,24.5 parent: 2 +- proto: VendingMachinePride + entities: + - uid: 7832 + components: + - type: Transform + pos: -8.5,48.5 + parent: 2 - proto: VendingMachineRoboDrobe entities: - uid: 10175 @@ -189188,6 +187531,12 @@ entities: - type: Transform pos: 25.5,-2.5 parent: 2 + - uid: 3083 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,55.5 + parent: 2 - uid: 3086 components: - type: Transform @@ -192619,6 +190968,11 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,55.5 parent: 2 + - uid: 7620 + components: + - type: Transform + pos: -22.5,51.5 + parent: 2 - uid: 7636 components: - type: Transform @@ -192715,29 +191069,28 @@ entities: rot: 3.141592653589793 rad pos: -5.5,51.5 parent: 2 + - uid: 7774 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,49.5 + parent: 2 + - uid: 7775 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -16.5,49.5 + parent: 2 + - uid: 7776 + components: + - type: Transform + pos: -25.5,54.5 + parent: 2 - uid: 7779 components: - type: Transform pos: -7.5,48.5 parent: 2 - - uid: 7785 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -12.5,48.5 - parent: 2 - - uid: 7786 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -13.5,48.5 - parent: 2 - - uid: 7817 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -17.5,54.5 - parent: 2 - uid: 7828 components: - type: Transform @@ -192759,70 +191112,30 @@ entities: - type: Transform pos: 9.5,38.5 parent: 2 - - uid: 8048 + - uid: 8067 components: - type: Transform - pos: -14.5,50.5 - parent: 2 - - uid: 8068 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -18.5,54.5 + pos: -19.5,55.5 parent: 2 - uid: 8069 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -19.5,54.5 + pos: -22.5,53.5 parent: 2 - uid: 8070 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -20.5,54.5 - parent: 2 - - uid: 8071 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -21.5,54.5 + pos: -25.5,53.5 parent: 2 - uid: 8072 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -22.5,54.5 + pos: -13.5,51.5 parent: 2 - - uid: 8073 + - uid: 8078 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -23.5,54.5 - parent: 2 - - uid: 8074 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -24.5,54.5 - parent: 2 - - uid: 8076 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -25.5,53.5 - parent: 2 - - uid: 8079 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -25.5,50.5 - parent: 2 - - uid: 8082 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -25.5,47.5 + pos: -17.5,55.5 parent: 2 - uid: 8085 components: @@ -192836,17 +191149,15 @@ entities: rot: -1.5707963267948966 rad pos: -26.5,44.5 parent: 2 - - uid: 8125 + - uid: 8100 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -13.5,46.5 + pos: -16.5,55.5 parent: 2 - - uid: 8128 + - uid: 8123 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,46.5 + pos: -16.5,53.5 parent: 2 - uid: 8191 components: @@ -192854,10 +191165,11 @@ entities: rot: 3.141592653589793 rad pos: 29.5,-13.5 parent: 2 - - uid: 8210 + - uid: 8212 components: - type: Transform - pos: -22.5,52.5 + rot: 1.5707963267948966 rad + pos: -10.5,44.5 parent: 2 - uid: 8225 components: @@ -193375,15 +191687,17 @@ entities: rot: 3.141592653589793 rad pos: -44.5,6.5 parent: 2 - - uid: 8808 + - uid: 8804 components: - type: Transform - pos: -16.5,50.5 + rot: 1.5707963267948966 rad + pos: -13.5,48.5 parent: 2 - - uid: 8845 + - uid: 8809 components: - type: Transform - pos: -11.5,45.5 + rot: -1.5707963267948966 rad + pos: -25.5,51.5 parent: 2 - uid: 8894 components: @@ -193407,6 +191721,16 @@ entities: - type: Transform pos: 37.5,33.5 parent: 2 + - uid: 8943 + components: + - type: Transform + pos: -16.5,51.5 + parent: 2 + - uid: 8945 + components: + - type: Transform + pos: -21.5,55.5 + parent: 2 - uid: 8946 components: - type: Transform @@ -193436,6 +191760,11 @@ entities: rot: 1.5707963267948966 rad pos: 25.5,-52.5 parent: 2 + - uid: 8974 + components: + - type: Transform + pos: -18.5,55.5 + parent: 2 - uid: 9012 components: - type: Transform @@ -193451,11 +191780,61 @@ entities: - type: Transform pos: -29.5,24.5 parent: 2 + - uid: 9183 + components: + - type: Transform + pos: -15.5,55.5 + parent: 2 - uid: 9199 components: - type: Transform pos: 28.5,54.5 parent: 2 + - uid: 9205 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -13.5,44.5 + parent: 2 + - uid: 9210 + components: + - type: Transform + pos: -20.5,55.5 + parent: 2 + - uid: 9218 + components: + - type: Transform + pos: -14.5,55.5 + parent: 2 + - uid: 9220 + components: + - type: Transform + pos: -25.5,55.5 + parent: 2 + - uid: 9221 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -25.5,49.5 + parent: 2 + - uid: 9228 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -25.5,50.5 + parent: 2 + - uid: 9231 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -13.5,47.5 + parent: 2 + - uid: 9232 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -13.5,49.5 + parent: 2 - uid: 9383 components: - type: Transform @@ -198087,11 +196466,6 @@ entities: rot: 3.141592653589793 rad pos: -0.5,44.5 parent: 2 - - uid: 23714 - components: - - type: Transform - pos: -11.5,44.5 - parent: 2 - uid: 23759 components: - type: Transform @@ -199160,45 +197534,6 @@ entities: - type: Transform pos: -7.5,47.5 parent: 2 - - uid: 28631 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -25.5,54.5 - parent: 2 - - uid: 28632 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -25.5,45.5 - parent: 2 - - uid: 28633 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -25.5,52.5 - parent: 2 - - uid: 28649 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -13.5,50.5 - parent: 2 - - uid: 28652 - components: - - type: Transform - pos: -7.5,45.5 - parent: 2 - - uid: 28653 - components: - - type: Transform - pos: -13.5,49.5 - parent: 2 - - uid: 28655 - components: - - type: Transform - pos: -11.5,48.5 - parent: 2 - uid: 28733 components: - type: Transform @@ -199522,11 +197857,6 @@ entities: - type: Transform pos: -14.5,-60.5 parent: 2 - - uid: 29769 - components: - - type: Transform - pos: -16.5,52.5 - parent: 2 - uid: 29833 components: - type: Transform @@ -205539,6 +203869,11 @@ entities: - type: Transform pos: -28.5,8.5 parent: 2 + - uid: 23738 + components: + - type: Transform + pos: -15.5,48.5 + parent: 2 - proto: WeaponCapacitorRecharger entities: - uid: 2387 @@ -205967,6 +204302,11 @@ entities: - type: Transform pos: 52.5,4.5 parent: 2 + - uid: 23737 + components: + - type: Transform + pos: -14.5,43.5 + parent: 2 - uid: 25718 components: - type: Transform @@ -208224,7 +206564,7 @@ entities: pos: 24.5,2.5 parent: 21002 - type: Door - secondsUntilStateChange: -704701.1 + secondsUntilStateChange: -717355.06 state: Opening - uid: 28863 components: From eaad5e156579126d52d5abc87748b6e95e848263 Mon Sep 17 00:00:00 2001 From: Connor Huffine Date: Mon, 3 Nov 2025 00:11:22 -0500 Subject: [PATCH 090/121] Clean up implanter player guides (#41268) Remove references to rags cleaning DNA --- Resources/Locale/en-US/tips.ftl | 2 +- Resources/Prototypes/Entities/Objects/Misc/implanters.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/en-US/tips.ftl b/Resources/Locale/en-US/tips.ftl index 2cd3ec8e63..9ea332ed33 100644 --- a/Resources/Locale/en-US/tips.ftl +++ b/Resources/Locale/en-US/tips.ftl @@ -136,4 +136,4 @@ tips-dataset-135 = Instead of picking it up, you can alt-click food to eat it. T tips-dataset-136 = If you're trapped behind an electrified door, disable the APC or throw your ID at the door to avoid getting shocked! tips-dataset-137 = If the AI electrifies a door and you have insulated gloves, snip and mend the power wire to reset their electrification! tips-dataset-138 = If you want to stop your prisoner from escaping from the cell right after being uncuffed, turn on combat mode while uncuffing - this will shove the prisoner down. -tips-dataset-139 = Make sure to clean your illegal implanters with a soap or a damp rag after you use them! Detectives can scan used implanters for incriminating DNA evidence, but not if they've been wiped clean. +tips-dataset-139 = Make sure to clean your illegal implanters with a soap after you use them! Detectives can scan used implanters for incriminating DNA evidence, but not if they've been wiped clean. diff --git a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml index a142ea75cb..7d2408a06d 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml @@ -126,7 +126,7 @@ id: BaseImplantOnlyImplanterSyndi parent: [BaseImplantOnlyImplanter, BaseSyndicateContraband] name: syndicate implanter - description: A compact disposable syringe exclusively designed for the injection of subdermal implants. Make sure to scrub it with soap or a rag to remove residual DNA after use! + description: A compact disposable syringe exclusively designed for the injection of subdermal implants. Make sure to scrub it with soap to remove residual DNA after use! abstract: true components: - type: Item From 94d04c74d914c861894843fbb325385c621bcb54 Mon Sep 17 00:00:00 2001 From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> Date: Mon, 3 Nov 2025 01:18:20 -0800 Subject: [PATCH 091/121] Cleanup and document TileAtmosphere (#41254) * Cleanup and document TileAtmosphere * superconduction --- Content.Server/Atmos/TileAtmosphere.cs | 375 +++++++++++++++---------- 1 file changed, 229 insertions(+), 146 deletions(-) diff --git a/Content.Server/Atmos/TileAtmosphere.cs b/Content.Server/Atmos/TileAtmosphere.cs index 46a85990fa..eba0df192a 100644 --- a/Content.Server/Atmos/TileAtmosphere.cs +++ b/Content.Server/Atmos/TileAtmosphere.cs @@ -1,165 +1,248 @@ using Content.Server.Atmos.Components; using Content.Server.Atmos.EntitySystems; using Content.Shared.Atmos; -using Content.Shared.Maps; -using Robust.Shared.Map; -namespace Content.Server.Atmos +namespace Content.Server.Atmos; + +/// +/// Internal Atmospherics class that stores data on an atmosphere in a single tile. +/// You should not be using these directly outside of . +/// Use the public APIs in instead. +/// +[Access(typeof(AtmosphereSystem), typeof(GasTileOverlaySystem), typeof(AtmosDebugOverlaySystem))] +public sealed class TileAtmosphere : IGasMixtureHolder { /// - /// Internal Atmos class that stores data about the atmosphere in a grid. - /// You shouldn't use this directly, use instead. + /// The last cycle this tile's air was archived into . + /// See for more info on archival. /// - [Access(typeof(AtmosphereSystem), typeof(GasTileOverlaySystem), typeof(AtmosDebugOverlaySystem))] - public sealed class TileAtmosphere : IGasMixtureHolder + [ViewVariables] + public int ArchivedCycle; + + /// + /// Current cycle this tile was processed. + /// Used to prevent double-processing in a single cycle in many processing stages. + /// + [ViewVariables] + public int CurrentCycle; + + /// + /// Current temperature of this tile, in Kelvin. + /// Used for Superconduction. + /// This is not the temperature of the attached ! + /// + [ViewVariables] + public float Temperature = Atmospherics.T20C; + + /// + /// The current target tile for pressure movement for the current cycle. + /// Gas will be moved towards this tile during pressure equalization. + /// Also see . + /// + [ViewVariables] + public TileAtmosphere? PressureSpecificTarget; + + /// + /// The current pressure difference (delta) between this tile and its pressure target. + /// If Monstermos is enabled, this value represents the quantity of moles transferred. + /// + [ViewVariables] + public float PressureDifference; + + /// + /// The current heat capacity of this tile. + /// Used for Superconduction. + /// This is not the heat capacity of the attached ! + /// + [ViewVariables(VVAccess.ReadWrite)] + public float HeatCapacity = Atmospherics.MinimumHeatCapacity; + + /// + /// The current thermal conductivity of this tile. + /// Describes how well heat moves between this tile and adjacent tiles during superconduction. + /// + [ViewVariables] + public float ThermalConductivity = 0.05f; + + /// + /// Designates whether this tile is currently excited for processing in an excited group or LINDA. + /// + [ViewVariables] + public bool Excited; + + /// + /// Whether this tile should be considered space. + /// + [ViewVariables] + public bool Space; + + /// + /// Cached adjacent tiles for this tile. + /// Ordered in the same order as + /// (should be North, South, East, West). + /// Adjacent tiles can be null if air cannot flow to them. + /// + [ViewVariables] + public readonly TileAtmosphere?[] AdjacentTiles = new TileAtmosphere[Atmospherics.Directions]; + + /// + /// Neighbouring tiles to which air can flow. This is a combination of this tile's unblocked direction, and the + /// unblocked directions on adjacent tiles. + /// + [ViewVariables] + public AtmosDirection AdjacentBits = AtmosDirection.Invalid; + + /// + /// Current information for this tile. + /// + [ViewVariables] + [Access(typeof(AtmosphereSystem), Other = AccessPermissions.ReadExecute)] + public MonstermosInfo MonstermosInfo; + + /// + /// Current information for this tile. + /// + [ViewVariables] + public Hotspot Hotspot; + + /// + /// Points to the direction of the recipient tile for pressure equalization logic + /// (Monstermos or HighPressureDelta otherwise). + /// + [ViewVariables] + public AtmosDirection PressureDirection; + + /// + /// Last cycle's for debugging purposes. + /// + [ViewVariables] + public AtmosDirection LastPressureDirection; + + /// + /// Grid entity this tile belongs to. + /// + [ViewVariables] + [Access(typeof(AtmosphereSystem))] + public EntityUid GridIndex; + + /// + /// The grid indices of this tile. + /// + [ViewVariables] + public Vector2i GridIndices; + + /// + /// The excited group this tile belongs to, if any. + /// + [ViewVariables] + public ExcitedGroup? ExcitedGroup; + + /// + /// The air in this tile. If null, this tile is completely air-blocked. + /// This can be immutable if the tile is spaced. + /// + [ViewVariables] + [Access(typeof(AtmosphereSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends + public GasMixture? Air; + + /// + /// A copy of the air in this tile from the last time it was archived at . + /// LINDA archives the air before doing any necessary processing and uses this to perform its calculations, + /// making the results of LINDA independent of the order in which tiles are processed. + /// + [ViewVariables] + public GasMixture? AirArchived; + + /// + /// The amount of gas last shared to adjacent tiles during LINDA processing. + /// Used to determine when LINDA should dismantle an excited group + /// or extend its time alive. + /// + [DataField("lastShare")] + public float LastShare; + + /// + /// Implementation of . + /// + GasMixture IGasMixtureHolder.Air { - [ViewVariables] - public int ArchivedCycle; + get => Air ?? new GasMixture(Atmospherics.CellVolume){ Temperature = Temperature }; + set => Air = value; + } - [ViewVariables] - public int CurrentCycle; + /// + /// The maximum temperature this tile has sustained during hotspot fire processing. + /// Used for debugging. + /// + [ViewVariables] + public float MaxFireTemperatureSustained; - [ViewVariables] - public float Temperature { get; set; } = Atmospherics.T20C; + /// + /// If true, then this tile is directly exposed to the map's atmosphere, either because the grid has no tile at + /// this position, or because the tile type is not airtight. + /// + [ViewVariables] + public bool MapAtmosphere; - [ViewVariables] - public TileAtmosphere? PressureSpecificTarget { get; set; } + /// + /// If true, this tile does not actually exist on the grid, it only exists to represent the map's atmosphere for + /// adjacent grid tiles. + /// This tile often has immutable air and is sitting off the edge of the grid, where there is no grid. + /// + [ViewVariables] + public bool NoGridTile; - /// - /// This is either the pressure difference, or the quantity of moles transferred if monstermos is enabled. - /// - [ViewVariables] - public float PressureDifference { get; set; } + /// + /// If true, this tile is queued for processing in + /// + [ViewVariables] + public bool TrimQueued; - [ViewVariables(VVAccess.ReadWrite)] - public float HeatCapacity { get; set; } = Atmospherics.MinimumHeatCapacity; + /// + /// Cached information about airtight entities on this tile. This gets updated anytime a tile gets invalidated + /// (i.e., gets added to ). + /// + public AtmosphereSystem.AirtightData AirtightData; - [ViewVariables] - public float ThermalConductivity { get; set; } = 0.05f; + /// + /// Creates a new TileAtmosphere. + /// + /// The grid entity this tile belongs to. + /// >The grid indices of this tile. + /// The gas mixture of this tile. + /// If true, the gas mixture will be marked immutable. + /// If true, this tile is considered space. + public TileAtmosphere(EntityUid gridIndex, Vector2i gridIndices, GasMixture? mixture = null, bool immutable = false, bool space = false) + { + GridIndex = gridIndex; + GridIndices = gridIndices; + Air = mixture; + AirArchived = Air?.Clone(); + Space = space; - [ViewVariables] - public bool Excited { get; set; } + if(immutable) + Air?.MarkImmutable(); + } - /// - /// Whether this tile should be considered space. - /// - [ViewVariables] - public bool Space { get; set; } + /// + /// Creates a copy of another TileAtmosphere. + /// + /// The TileAtmosphere to copy. + public TileAtmosphere(TileAtmosphere other) + { + GridIndex = other.GridIndex; + GridIndices = other.GridIndices; + Space = other.Space; + NoGridTile = other.NoGridTile; + MapAtmosphere = other.MapAtmosphere; + Air = other.Air?.Clone(); + AirArchived = Air != null ? Air.Clone() : null; + } - /// - /// Adjacent tiles in the same order as . (NSEW) - /// - [ViewVariables] - public readonly TileAtmosphere?[] AdjacentTiles = new TileAtmosphere[Atmospherics.Directions]; - - /// - /// Neighbouring tiles to which air can flow. This is a combination of this tile's unblocked direction, and the - /// unblocked directions on adjacent tiles. - /// - [ViewVariables] - public AtmosDirection AdjacentBits = AtmosDirection.Invalid; - - [ViewVariables, Access(typeof(AtmosphereSystem), Other = AccessPermissions.ReadExecute)] - public MonstermosInfo MonstermosInfo; - - [ViewVariables] - public Hotspot Hotspot; - - [ViewVariables] - public AtmosDirection PressureDirection; - - // For debug purposes. - [ViewVariables] - public AtmosDirection LastPressureDirection; - - [ViewVariables] - [Access(typeof(AtmosphereSystem))] - public EntityUid GridIndex { get; set; } - - [ViewVariables] - public Vector2i GridIndices; - - [ViewVariables] - public ExcitedGroup? ExcitedGroup { get; set; } - - /// - /// The air in this tile. If null, this tile is completely air-blocked. - /// This can be immutable if the tile is spaced. - /// - [ViewVariables] - [Access(typeof(AtmosphereSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends - public GasMixture? Air { get; set; } - - /// - /// Like Air, but a copy stored each atmos tick before tile processing takes place. This lets us update Air - /// in-place without affecting the results based on update order. - /// - [ViewVariables] - public GasMixture? AirArchived; - - [DataField("lastShare")] - public float LastShare; - - GasMixture IGasMixtureHolder.Air - { - get => Air ?? new GasMixture(Atmospherics.CellVolume){ Temperature = Temperature }; - set => Air = value; - } - - [ViewVariables] - public float MaxFireTemperatureSustained { get; set; } - - /// - /// If true, then this tile is directly exposed to the map's atmosphere, either because the grid has no tile at - /// this position, or because the tile type is not airtight. - /// - [ViewVariables] - public bool MapAtmosphere; - - /// - /// If true, this tile does not actually exist on the grid, it only exists to represent the map's atmosphere for - /// adjacent grid tiles. - /// - [ViewVariables] - public bool NoGridTile; - - /// - /// If true, this tile is queued for processing in - /// - [ViewVariables] - public bool TrimQueued; - - /// - /// Cached information about airtight entities on this tile. This gets updated anytime a tile gets invalidated - /// (i.e., gets added to ). - /// - public AtmosphereSystem.AirtightData AirtightData; - - public TileAtmosphere(EntityUid gridIndex, Vector2i gridIndices, GasMixture? mixture = null, bool immutable = false, bool space = false) - { - GridIndex = gridIndex; - GridIndices = gridIndices; - Air = mixture; - AirArchived = Air != null ? Air.Clone() : null; - Space = space; - - if(immutable) - Air?.MarkImmutable(); - } - - public TileAtmosphere(TileAtmosphere other) - { - GridIndex = other.GridIndex; - GridIndices = other.GridIndices; - Space = other.Space; - NoGridTile = other.NoGridTile; - MapAtmosphere = other.MapAtmosphere; - Air = other.Air?.Clone(); - AirArchived = Air != null ? Air.Clone() : null; - } - - public TileAtmosphere() - { - } + /// + /// Creates a new empty TileAtmosphere. + /// + public TileAtmosphere() + { } } From c7143a4fd3fd35748df1bb76aa0e5eb4c6843c06 Mon Sep 17 00:00:00 2001 From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com> Date: Mon, 3 Nov 2025 04:34:36 -0500 Subject: [PATCH 092/121] Clown and Mime can now be selected as roles on Reach (#41072) * Clown and Mime can now be selected as roles on Reach * Reloaded and resaved map * Whoops, forgot to merge master before last commit * Code comment fixes (+ testfail fix?) * Swapped Musician and Clown spawners --- Resources/Maps/reach.yml | 290 +++++++++++++++++++++++----- Resources/Prototypes/Maps/reach.yml | 6 +- 2 files changed, 241 insertions(+), 55 deletions(-) diff --git a/Resources/Maps/reach.yml b/Resources/Maps/reach.yml index 47632d9922..8903421fa7 100644 --- a/Resources/Maps/reach.yml +++ b/Resources/Maps/reach.yml @@ -1,11 +1,11 @@ meta: format: 7 category: Map - engineVersion: 260.1.0 + engineVersion: 267.3.0 forkId: "" forkVersion: "" - time: 05/21/2025 05:14:05 - entityCount: 2639 + time: 11/02/2025 23:05:17 + entityCount: 2641 maps: - 1 grids: @@ -1343,64 +1343,20 @@ entities: uniqueMixes: - volume: 2500 immutable: True - moles: - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + moles: {} - volume: 2500 temperature: 293.15 moles: - - 21.824879 - - 82.10312 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 21.824879 + Nitrogen: 82.10312 - volume: 2500 temperature: 293.15 moles: - - 0 - - 6666.982 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Nitrogen: 6666.982 - volume: 2500 temperature: 293.15 moles: - - 6666.982 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 6666.982 chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance @@ -1419,6 +1375,8 @@ entities: - 1503 - 1473 - 1505 + - type: Fixtures + fixtures: {} - uid: 4 components: - type: Transform @@ -1429,6 +1387,8 @@ entities: devices: - 1472 - 1504 + - type: Fixtures + fixtures: {} - uid: 5 components: - type: Transform @@ -1445,6 +1405,8 @@ entities: - 1492 - 1491 - 1493 + - type: Fixtures + fixtures: {} - uid: 6 components: - type: Transform @@ -1454,6 +1416,8 @@ entities: devices: - 1464 - 1489 + - type: Fixtures + fixtures: {} - uid: 7 components: - type: Transform @@ -1468,6 +1432,8 @@ entities: - 1495 - 1501 - 1464 + - type: Fixtures + fixtures: {} - uid: 8 components: - type: Transform @@ -1482,6 +1448,8 @@ entities: - 1479 - 1500 - 1481 + - type: Fixtures + fixtures: {} - uid: 9 components: - type: Transform @@ -1495,6 +1463,8 @@ entities: - 1478 - 1474 - 1477 + - type: Fixtures + fixtures: {} - uid: 12 components: - type: Transform @@ -1508,6 +1478,8 @@ entities: - 1509 - 1465 - 1077 + - type: Fixtures + fixtures: {} - uid: 13 components: - type: Transform @@ -1529,6 +1501,8 @@ entities: - 1097 - 1096 - 1083 + - type: Fixtures + fixtures: {} - uid: 1753 components: - type: Transform @@ -1542,6 +1516,8 @@ entities: - 1100 - 1098 - 1099 + - type: Fixtures + fixtures: {} - uid: 2366 components: - type: Transform @@ -1553,6 +1529,8 @@ entities: - 1443 - 1483 - 2562 + - type: Fixtures + fixtures: {} - uid: 2500 components: - type: Transform @@ -1564,6 +1542,8 @@ entities: - 1453 - 1454 - 1486 + - type: Fixtures + fixtures: {} - uid: 2575 components: - type: Transform @@ -1576,6 +1556,8 @@ entities: - 2330 - 2563 - 2564 + - type: Fixtures + fixtures: {} - uid: 2621 components: - type: Transform @@ -1589,6 +1571,8 @@ entities: - 2564 - 1456 - 1512 + - type: Fixtures + fixtures: {} - uid: 2623 components: - type: Transform @@ -1599,6 +1583,8 @@ entities: devices: - 2622 - 1457 + - type: Fixtures + fixtures: {} - proto: AirCanister entities: - uid: 15 @@ -1921,71 +1907,97 @@ entities: rot: -1.5707963267948966 rad pos: -19.5,-1.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 57 components: - type: Transform pos: -18.5,5.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 58 components: - type: Transform pos: -6.5,2.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 59 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,6.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 60 components: - type: Transform rot: 3.141592653589793 rad pos: -7.5,-1.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 61 components: - type: Transform rot: 1.5707963267948966 rad pos: -2.5,-5.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 62 components: - type: Transform pos: 9.5,-1.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 63 components: - type: Transform pos: 4.5,6.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 64 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,13.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 65 components: - type: Transform pos: 9.5,17.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 66 components: - type: Transform pos: 4.5,-9.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 67 components: - type: Transform pos: 17.5,2.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 68 components: - type: Transform rot: 1.5707963267948966 rad pos: 20.5,2.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: APECircuitboard entities: - uid: 69 @@ -2001,6 +2013,8 @@ entities: rot: 1.5707963267948966 rad pos: 5.5,17.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: Ashtray entities: - uid: 70 @@ -2087,6 +2101,8 @@ entities: - type: Transform pos: -9.5,6.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: BaseResearchAndDevelopmentPointSource entities: - uid: 82 @@ -6440,6 +6456,8 @@ entities: - type: Transform pos: -3.5,-5.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: ClosetChefFilled entities: - uid: 878 @@ -6539,16 +6557,22 @@ entities: - type: Transform pos: 4.5,-5.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 894 components: - type: Transform pos: -5.5,2.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 895 components: - type: Transform pos: 11.5,6.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: ClosetWallFireFilledRandom entities: - uid: 896 @@ -6556,11 +6580,15 @@ entities: - type: Transform pos: 5.5,-5.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 897 components: - type: Transform pos: 12.5,6.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: ClosetWallMaintenanceFilledRandom entities: - uid: 898 @@ -6568,6 +6596,8 @@ entities: - type: Transform pos: 6.5,-5.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: ClothingBackpackERTJanitor entities: - uid: 887 @@ -7175,12 +7205,16 @@ entities: - type: Transform pos: 4.5,2.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 984 components: - type: Transform rot: 3.141592653589793 rad pos: 11.5,-5.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: DisposalBend entities: - uid: 985 @@ -7703,16 +7737,22 @@ entities: - type: Transform pos: 9.5,6.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 2458 components: - type: Transform pos: 7.5,-9.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 2459 components: - type: Transform pos: 1.5,-9.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: FaxMachineBase entities: - uid: 2496 @@ -7988,6 +8028,8 @@ entities: rot: -1.5707963267948966 rad pos: 11.5,-8.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: GasMinerNitrogen entities: - uid: 1109 @@ -12062,6 +12104,8 @@ entities: rot: 1.5707963267948966 rad pos: -15.5,-0.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: IntercomMedical entities: - uid: 1633 @@ -12070,6 +12114,8 @@ entities: rot: -1.5707963267948966 rad pos: 5.5,-0.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: IntercomSecurity entities: - uid: 2554 @@ -12077,6 +12123,8 @@ entities: - type: Transform pos: 12.5,11.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: JanitorialTrolley entities: - uid: 1634 @@ -12180,6 +12228,8 @@ entities: 2615: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - proto: LockerAtmosphericsFilledHardsuit entities: - uid: 2499 @@ -12297,6 +12347,8 @@ entities: - type: Transform pos: 5.5,-1.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: LootSpawnerRandomLockbox entities: - uid: 1841 @@ -12572,6 +12624,8 @@ entities: - type: Transform pos: 8.5,-9.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterContrabandBeachStarYamamoto entities: - uid: 1697 @@ -12579,6 +12633,8 @@ entities: - type: Transform pos: 11.5,-7.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterContrabandHighEffectEngineering entities: - uid: 1698 @@ -12586,6 +12642,8 @@ entities: - type: Transform pos: -23.5,3.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterContrabandSpaceCola entities: - uid: 1699 @@ -12593,6 +12651,8 @@ entities: - type: Transform pos: -11.5,5.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterContrabandTools entities: - uid: 1700 @@ -12600,6 +12660,8 @@ entities: - type: Transform pos: -19.5,-2.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitAnatomyPoster entities: - uid: 1701 @@ -12607,6 +12669,8 @@ entities: - type: Transform pos: 13.5,-2.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitCleanliness entities: - uid: 1702 @@ -12614,6 +12678,8 @@ entities: - type: Transform pos: -2.5,-6.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitCohibaRobustoAd entities: - uid: 1703 @@ -12621,6 +12687,8 @@ entities: - type: Transform pos: -7.5,6.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitHelpOthers entities: - uid: 1704 @@ -12628,6 +12696,8 @@ entities: - type: Transform pos: -4.5,-5.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitHereForYourSafety entities: - uid: 1705 @@ -12635,6 +12705,8 @@ entities: - type: Transform pos: 13.5,6.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitHighClassMartini entities: - uid: 1706 @@ -12642,6 +12714,8 @@ entities: - type: Transform pos: -2.5,-3.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitJustAWeekAway entities: - uid: 1707 @@ -12649,6 +12723,8 @@ entities: - type: Transform pos: 4.5,11.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitNanomichiAd entities: - uid: 1708 @@ -12656,6 +12732,8 @@ entities: - type: Transform pos: 4.5,8.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitNanotrasenLogo entities: - uid: 1709 @@ -12663,26 +12741,36 @@ entities: - type: Transform pos: -11.5,-1.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 1710 components: - type: Transform pos: 10.5,17.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 1711 components: - type: Transform pos: 4.5,17.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 1712 components: - type: Transform pos: 10.5,6.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 1713 components: - type: Transform pos: 26.5,-1.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitNTTGC entities: - uid: 1714 @@ -12690,6 +12778,8 @@ entities: - type: Transform pos: 11.5,2.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitPDAAd entities: - uid: 1715 @@ -12697,6 +12787,8 @@ entities: - type: Transform pos: 20.5,3.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitPeriodicTable entities: - uid: 1716 @@ -12704,6 +12796,8 @@ entities: - type: Transform pos: 9.5,1.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitSafetyInternals entities: - uid: 1718 @@ -12711,6 +12805,8 @@ entities: - type: Transform pos: -4.5,6.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitScience entities: - uid: 1719 @@ -12718,6 +12814,8 @@ entities: - type: Transform pos: -1.5,13.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitSecWatch entities: - uid: 1720 @@ -12725,6 +12823,8 @@ entities: - type: Transform pos: 20.5,5.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitSpaceCops entities: - uid: 1721 @@ -12732,6 +12832,8 @@ entities: - type: Transform pos: 14.5,-1.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitUeNo entities: - uid: 1722 @@ -12739,6 +12841,8 @@ entities: - type: Transform pos: 9.5,-9.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitVacation entities: - uid: 1723 @@ -12746,6 +12850,8 @@ entities: - type: Transform pos: 7.5,2.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PottedPlant21 entities: - uid: 1724 @@ -13459,26 +13565,36 @@ entities: - type: Transform pos: 5.5,6.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 1831 components: - type: Transform pos: -15.5,-1.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 1832 components: - type: Transform pos: -2.5,-1.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 1833 components: - type: Transform pos: 1.5,-10.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 1834 components: - type: Transform pos: 21.5,-1.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SecurityTechFab entities: - uid: 1835 @@ -14188,6 +14304,8 @@ entities: 1849: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 1947 components: - type: Transform @@ -14199,6 +14317,8 @@ entities: 1853: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 1948 components: - type: Transform @@ -14213,6 +14333,8 @@ entities: 1852: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - proto: SignalSwitchDirectional entities: - uid: 1802 @@ -14225,6 +14347,8 @@ entities: 910: - - Status - Toggle + - type: Fixtures + fixtures: {} - proto: SignAtmos entities: - uid: 2296 @@ -14232,6 +14356,8 @@ entities: - type: Transform pos: 1.5,-13.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignBar entities: - uid: 1950 @@ -14239,6 +14365,8 @@ entities: - type: Transform pos: -2.5,2.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignCargoDock entities: - uid: 1951 @@ -14246,6 +14374,8 @@ entities: - type: Transform pos: 3.5,14.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignChem entities: - uid: 1952 @@ -14253,6 +14383,8 @@ entities: - type: Transform pos: 5.5,1.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignElectricalMed entities: - uid: 1953 @@ -14260,6 +14392,8 @@ entities: - type: Transform pos: 3.5,-8.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignEngine entities: - uid: 1806 @@ -14267,6 +14401,8 @@ entities: - type: Transform pos: -19.5,2.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignEngineering entities: - uid: 1954 @@ -14274,6 +14410,8 @@ entities: - type: Transform pos: -15.5,1.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignEVA entities: - uid: 1955 @@ -14281,6 +14419,8 @@ entities: - type: Transform pos: -15.5,6.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignGenpop entities: - uid: 336 @@ -14289,6 +14429,8 @@ entities: rot: -1.5707963267948966 rad pos: 16.5,5.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignHydro1 entities: - uid: 81 @@ -14296,6 +14438,8 @@ entities: - type: Transform pos: -12.5,2.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignMedical entities: - uid: 1957 @@ -14303,6 +14447,8 @@ entities: - type: Transform pos: 1.5,-1.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignPlaque entities: - uid: 1958 @@ -14310,6 +14456,8 @@ entities: - type: Transform pos: 24.5,-1.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignScience entities: - uid: 1960 @@ -14317,6 +14465,8 @@ entities: - type: Transform pos: -0.5,6.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignSecureMed entities: - uid: 1961 @@ -14324,12 +14474,16 @@ entities: - type: Transform pos: 20.5,-1.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 2576 components: - type: Transform rot: 3.141592653589793 rad pos: 18.5,6.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignSecureSmallRed entities: - uid: 1962 @@ -14337,6 +14491,8 @@ entities: - type: Transform pos: 15.5,-1.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignSecurity entities: - uid: 1963 @@ -14344,6 +14500,8 @@ entities: - type: Transform pos: 13.5,2.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignShipDock entities: - uid: 1359 @@ -14351,6 +14509,8 @@ entities: - type: Transform pos: -1.5,-14.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignToolStorage entities: - uid: 1964 @@ -14358,6 +14518,8 @@ entities: - type: Transform pos: -19.5,4.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: Sink entities: - uid: 2620 @@ -14499,6 +14661,13 @@ entities: - type: Transform pos: 8.5,0.5 parent: 2 +- proto: SpawnPointClown + entities: + - uid: 2640 + components: + - type: Transform + pos: -4.5,-2.5 + parent: 2 - proto: SpawnPointHeadOfSecurity entities: - uid: 1986 @@ -14557,12 +14726,19 @@ entities: - type: Transform pos: 4.5,-2.5 parent: 2 +- proto: SpawnPointMime + entities: + - uid: 2641 + components: + - type: Transform + pos: -4.5,-3.5 + parent: 2 - proto: SpawnPointMusician entities: - uid: 1993 components: - type: Transform - pos: -4.5,-2.5 + pos: -6.5,-3.5 parent: 2 - proto: SpawnPointObserver entities: @@ -14647,11 +14823,15 @@ entities: - type: Transform pos: 1.5,-8.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 2498 components: - type: Transform pos: 4.5,12.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: StatueVenusBlue entities: - uid: 1842 @@ -17054,6 +17234,8 @@ entities: - type: Transform pos: 8.5,-14.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: WarningO2 entities: - uid: 2416 @@ -17061,6 +17243,8 @@ entities: - type: Transform pos: 8.5,-12.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: WaterTankFull entities: - uid: 2573 diff --git a/Resources/Prototypes/Maps/reach.yml b/Resources/Prototypes/Maps/reach.yml index 36652f3a66..e410ddbfd3 100644 --- a/Resources/Prototypes/Maps/reach.yml +++ b/Resources/Prototypes/Maps/reach.yml @@ -16,7 +16,7 @@ - type: StationEmergencyShuttle emergencyShuttlePath: /Maps/Shuttles/emergency.yml - type: StationJobs - availableJobs: # 15 jobs total w/o latejoins, 19 jobs total w/ latejoins + availableJobs: # 17 jobs total w/o latejoins, 21 jobs total w/ latejoins #command (2) Captain: [ 1, 1 ] HeadOfSecurity: [ 1, 1 ] @@ -38,6 +38,8 @@ #supply (2) CargoTechnician: [ 1, 1 ] SalvageSpecialist: [ 1, 1 ] - #civilian (1+) + #civilian (3+) Passenger: [ -1, -1 ] #infinite, not counted + Clown: [ 1, 1 ] + Mime: [ 1, 1 ] Musician: [ 1, 1 ] From 7b6f01ca6984f6c4220d0aafb5d92569969768ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=81da?= Date: Mon, 3 Nov 2025 04:22:17 -0600 Subject: [PATCH 093/121] Remove unused tags (#41265) * the letter R * the letter S * extras * the letter T * the letter U * the letter V * the letter W * the final letter ( X ) * the easy ones * Unused b and c * unused d * unused G * unused I * unused K * un used m and p * the letter R * unused T * un used W * re-add heavy rifle, document magazines * final alphabet * Merge remote-tracking branch 'upstream/master' into work/tag-nuke # Conflicts: # Resources/Prototypes/tags.yml * delete haunted * Revert "delete haunted" This reverts commit 870d782f7d97a1d7cb34cd14a288cc0cd0299cce. * mistake --------- Co-authored-by: iaada --- .../Prototypes/Entities/Clothing/Belt/job.yml | 5 - .../Entities/Debugging/clicktest.yml | 3 - .../Entities/Debugging/debug_sweps.yml | 23 +- .../Prototypes/Entities/Debugging/drugs.yml | 3 - .../Prototypes/Entities/Debugging/item.yml | 3 - .../Entities/Debugging/options_visualizer.yml | 3 - .../Entities/Debugging/spanisharmyknife.yml | 3 - .../Objects/Consumable/Drinks/drinks_cups.yml | 4 - .../Objects/Consumable/Drinks/drinks_fun.yml | 6 - .../Consumable/Drinks/drinks_metamorphic.yml | 4 - .../Consumable/Drinks/drinks_special.yml | 6 - .../Objects/Consumable/Food/ingredients.yml | 12 - .../Entities/Objects/Fun/Tabletop/base.yml | 3 - .../Prototypes/Entities/Objects/Fun/toys.yml | 3 - .../Entities/Objects/Materials/parts.yml | 8 - .../Entities/Objects/Materials/shards.yml | 4 - .../Prototypes/Entities/Objects/Misc/box.yml | 3 - .../Entities/Objects/Misc/briefcases.yml | 3 - .../Entities/Objects/Misc/rubber_stamp.yml | 3 - .../Objects/Misc/subdermal_implants.yml | 2 - .../Entities/Objects/Tools/gas_tanks.yml | 3 - .../Ammunition/Cartridges/heavy_rifle.yml | 2 +- .../Objects/Weapons/Guns/Basic/base_staff.yml | 3 - .../Entities/Objects/Weapons/Melee/sword.yml | 9 - .../Structures/Furniture/Tables/tables.yml | 3 - .../Entities/Structures/Power/debug_power.yml | 43 ---- .../Structures/Specific/Janitor/janicart.yml | 6 - .../Entities/Structures/Walls/walls.yml | 3 +- Resources/Prototypes/tags.yml | 238 ++++++------------ 29 files changed, 82 insertions(+), 332 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Belt/job.yml b/Resources/Prototypes/Entities/Clothing/Belt/job.yml index 4024d8c06a..39a331dc0d 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/job.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/job.yml @@ -247,7 +247,6 @@ - type: Storage whitelist: tags: - # - PlantAnalyzer - PlantSampleTaker - BotanyShovel - BotanyHoe @@ -268,10 +267,6 @@ whitelist: tags: - BotanyHatchet - # hydro: - # whitelist: - # tags: - # - PlantAnalyzer # Dunno what to put here, should be aight. hoe: whitelist: tags: diff --git a/Resources/Prototypes/Entities/Debugging/clicktest.yml b/Resources/Prototypes/Entities/Debugging/clicktest.yml index 7eb0a06330..f6301dc714 100644 --- a/Resources/Prototypes/Entities/Debugging/clicktest.yml +++ b/Resources/Prototypes/Entities/Debugging/clicktest.yml @@ -9,9 +9,6 @@ id: ClickTestBase suffix: DEBUG components: - - type: Tag - tags: - - Debug - type: Clickable - type: InteractionOutline - type: Sprite diff --git a/Resources/Prototypes/Entities/Debugging/debug_sweps.yml b/Resources/Prototypes/Entities/Debugging/debug_sweps.yml index 9ba7c85e1e..a71548ebee 100644 --- a/Resources/Prototypes/Entities/Debugging/debug_sweps.yml +++ b/Resources/Prototypes/Entities/Debugging/debug_sweps.yml @@ -5,9 +5,6 @@ description: ded suffix: DEBUG components: - - type: Tag - tags: - - Debug - type: Sprite sprite: Objects/Weapons/Guns/Pistols/debug.rsi state: icon @@ -32,14 +29,14 @@ priority: 2 whitelist: tags: - - Debug + - MagazineDebug gun_chamber: name: Chamber startingItem: CartridgeDebug priority: 1 whitelist: tags: - - CartridgePistol + - CartridgeDebug - type: entity id: MagazinePistolDebug @@ -49,7 +46,7 @@ components: - type: Tag tags: - - Debug + - MagazineDebug - type: BallisticAmmoProvider proto: CartridgeDebug capacity: 1000 @@ -63,9 +60,6 @@ categories: [ Debug, HideSpawnMenu ] suffix: DEBUG components: - - type: Tag - tags: - - Debug - type: Projectile damage: types: @@ -79,7 +73,7 @@ components: - type: Tag tags: - - Debug + - CartridgeDebug - type: CartridgeAmmo proto: BulletDebug @@ -90,9 +84,6 @@ description: hit hard ye suffix: DEBUG components: - - type: Tag - tags: - - Debug - type: Sprite sprite: Objects/Weapons/Melee/debug.rsi state: icon @@ -109,9 +100,6 @@ parent: MeleeDebugGib id: MeleeDebug100 components: - - type: Tag - tags: - - Debug - type: MeleeWeapon damage: types: @@ -122,9 +110,6 @@ parent: MeleeDebugGib id: MeleeDebug200 components: - - type: Tag - tags: - - Debug - type: MeleeWeapon damage: types: diff --git a/Resources/Prototypes/Entities/Debugging/drugs.yml b/Resources/Prototypes/Entities/Debugging/drugs.yml index 2bb8fdae71..0ba92443ad 100644 --- a/Resources/Prototypes/Entities/Debugging/drugs.yml +++ b/Resources/Prototypes/Entities/Debugging/drugs.yml @@ -5,9 +5,6 @@ description: Just a whole glass of meth. suffix: DEBUG components: - - type: Tag - tags: - - Debug - type: SolutionContainerManager solutions: drink: diff --git a/Resources/Prototypes/Entities/Debugging/item.yml b/Resources/Prototypes/Entities/Debugging/item.yml index e3c8ffddd2..5e74412fe9 100644 --- a/Resources/Prototypes/Entities/Debugging/item.yml +++ b/Resources/Prototypes/Entities/Debugging/item.yml @@ -5,9 +5,6 @@ description: What is it...? suffix: DEBUG components: - - type: Tag - tags: - - Debug - type: Sprite sprite: Objects/Misc/skub.rsi state: icon diff --git a/Resources/Prototypes/Entities/Debugging/options_visualizer.yml b/Resources/Prototypes/Entities/Debugging/options_visualizer.yml index 229ffa00cc..c2b51c8a5a 100644 --- a/Resources/Prototypes/Entities/Debugging/options_visualizer.yml +++ b/Resources/Prototypes/Entities/Debugging/options_visualizer.yml @@ -2,9 +2,6 @@ id: OptionsVisualizerTest suffix: DEBUG components: - - type: Tag - tags: - - Debug - type: Sprite sprite: Effects/optionsvisualizertest.rsi layers: diff --git a/Resources/Prototypes/Entities/Debugging/spanisharmyknife.yml b/Resources/Prototypes/Entities/Debugging/spanisharmyknife.yml index 023ba8c08a..569889375d 100644 --- a/Resources/Prototypes/Entities/Debugging/spanisharmyknife.yml +++ b/Resources/Prototypes/Entities/Debugging/spanisharmyknife.yml @@ -5,9 +5,6 @@ description: The pain of using this is almost too great to bear. suffix: DEBUG components: - - type: Tag - tags: - - Debug - type: Sprite sprite: Objects/Tools/debug.rsi state: icon diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml index ea11162c99..896142562f 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml @@ -13,9 +13,6 @@ - type: SolutionTransfer canChangeTransferAmount: true maxTransferAmount: 10 - - type: Tag - tags: - - DrinkCup - type: StaticPrice price: 10 @@ -88,7 +85,6 @@ - type: Tag tags: - Trash - - DrinkCup - WhitelistChameleon - type: Clothing slots: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml index f7c984171d..3ae53b077b 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml @@ -38,9 +38,6 @@ reagents: - ReagentId: SpaceGlue Quantity: 30 - - type: Tag - tags: - - DrinkSpaceGlue - type: Glue - type: entity @@ -92,9 +89,6 @@ sprite: Objects/Consumable/Drinks/jar_what.rsi - type: FitsInDispenser solution: drink - - type: Tag - tags: - - DrinkGlass # Mopwata - type: weightedRandomFillSolution diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml index aaa58be59c..2b2ae6117d 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml @@ -21,10 +21,6 @@ metamorphicDefaultSprite: sprite: Objects/Consumable/Drinks/glass_clear.rsi state: icon - - type: Tag - tags: - - DrinkCup # Do these tags - - DrinkGlass # even do anything? - type: TransformableContainer - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml index 931620b665..66ddc0e74d 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml @@ -17,9 +17,6 @@ inHandsMaxFillLevels: 1 - type: FitsInDispenser solution: drink - - type: Tag - tags: - - DrinkGlass - type: entity parent: [DrinkBaseMaterialMetal, DrinkBase] @@ -208,9 +205,6 @@ solution: drink - type: FitsInDispenser solution: drink - - type: Tag - tags: - - DrinkGlass - type: entity parent: DrinkShakeBase diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml index fda43d65fe..28dfe41ba8 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml @@ -35,10 +35,6 @@ solution: food - type: TrashOnSolutionEmpty solution: food - - type: Tag - tags: - - Ingredient - - type: entity abstract: true parent: ReagentContainerBase @@ -278,9 +274,6 @@ reagents: - ReagentId: Nutriment Quantity: 15 - - type: Tag - tags: - - Ingredient - type: entity parent: FoodBakingBase @@ -468,7 +461,6 @@ node: start - type: Tag tags: - - Ingredient - ClothMade - type: SolutionContainerManager solutions: @@ -540,7 +532,6 @@ - type: Tag tags: - ClothMade - - Ingredient - type: entity name: raw pastry base @@ -934,9 +925,6 @@ reagents: - ReagentId: CocoaPowder Quantity: 2 - - type: Tag - tags: - - Ingredient - type: entity parent: FoodBakingBase diff --git a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/base.yml b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/base.yml index f7d9e0973a..f9ef69b1d1 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/base.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/base.yml @@ -23,9 +23,6 @@ - type: Sprite noRot: true - type: Appearance - - type: Tag - tags: - - TabletopPiece - type: entity id: BaseBoardTabletop diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 12eaf2cee6..d6d989680a 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -1083,9 +1083,6 @@ collection: packetOpenSounds - type: TrashOnSolutionEmpty solution: drink - - type: Tag - tags: - - DrinkSpaceGlue - type: entity parent: DrinkBase diff --git a/Resources/Prototypes/Entities/Objects/Materials/parts.yml b/Resources/Prototypes/Entities/Objects/Materials/parts.yml index 71e2704fce..5a3c0992f0 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/parts.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/parts.yml @@ -81,10 +81,6 @@ name: metal rod suffix: 10 components: - - type: Tag - tags: - - RodMetal1 - - ConstructionMaterial - type: Sprite state: rods - type: Stack @@ -96,10 +92,6 @@ name: metal rod suffix: Single components: - - type: Tag - tags: - - RodMetal1 - - ConstructionMaterial - type: Sprite state: rods - type: Stack diff --git a/Resources/Prototypes/Entities/Objects/Materials/shards.yml b/Resources/Prototypes/Entities/Objects/Materials/shards.yml index c649ef921c..33da82de7c 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml @@ -242,10 +242,6 @@ damage: types: Piercing: 5 - - type: Tag - tags: - - ClockworkGlassShard - - Trash - type: Extractable grindableSolutionName: shardcglass - type: SolutionContainerManager diff --git a/Resources/Prototypes/Entities/Objects/Misc/box.yml b/Resources/Prototypes/Entities/Objects/Misc/box.yml index 73d72e4fb0..6a26b3d900 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/box.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/box.yml @@ -60,6 +60,3 @@ Cloth: 25 - type: StaticPrice price: 15 - - type: Tag - tags: - - ToteBase diff --git a/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml b/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml index 77ddcf0d98..55d4bb33ce 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml @@ -9,9 +9,6 @@ - type: Storage grid: - 0,0,5,3 - - type: Tag - tags: - - Briefcase - type: MeleeWeapon damage: types: diff --git a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml index 07a332afb1..4ff8864bb7 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml @@ -101,9 +101,6 @@ stampState: "paper_stamp-clown" - type: Sprite state: stamp-clown - - type: Tag - tags: - - ClownRubberStamp - type: entity name: chief engineer's rubber stamp diff --git a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml index 5ff8c79fb4..8f6acd91d6 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml @@ -313,7 +313,6 @@ tags: - SubdermalImplant - HideContextMenu - - MacroBomb - type: entity parent: BaseSubdermalImplant @@ -339,7 +338,6 @@ tags: - SubdermalImplant - HideContextMenu - - DeathAcidifier - type: entity parent: BaseSubdermalImplant diff --git a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml index dd9ac8232d..cb038b3c5a 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml @@ -9,9 +9,6 @@ - type: Item size: Normal sprite: Objects/Tanks/generic.rsi - - type: Tag - tags: - - GasTank - type: Clothing quickEquip: false sprite: Objects/Tanks/generic.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml index a953985e9a..4e2db33abc 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml @@ -6,7 +6,7 @@ components: - type: Tag tags: - - CartridgeHeavyRifle + - CartridgeHeavyRifle - type: CartridgeAmmo proto: BulletHeavyRifle - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_staff.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_staff.yml index 0ce441d291..681bf4ff8c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_staff.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_staff.yml @@ -17,7 +17,4 @@ # All staves recharge. Wands are not. - type: RechargeBasicEntityAmmo rechargeCooldown: 30 - - type: Tag - tags: - - WizardStaff diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml index a468760035..507dd8504d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml @@ -29,9 +29,6 @@ id: Cutlass description: A wickedly curved blade, often seen in the hands of space pirates. components: - - type: Tag - tags: - - Machete - type: Sprite sprite: Objects/Weapons/Melee/cutlass.rsi - type: MeleeWeapon @@ -54,9 +51,6 @@ id: Machete description: A large, vicious looking blade. components: - - type: Tag - tags: - - Machete - type: Sprite sprite: Objects/Weapons/Melee/machete.rsi - type: MeleeWeapon @@ -116,9 +110,6 @@ id: Katana description: Ancient craftwork made with not so ancient plasteel. components: - - type: Tag - tags: - - Katana - type: Sprite sprite: Objects/Weapons/Melee/katana.rsi - type: MeleeWeapon diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml index f90f20db35..5442816d4f 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml @@ -900,9 +900,6 @@ description: PUT ON THEM CODERSOCKS!! suffix: DEBUG components: - - type: Tag - tags: - - Debug - type: Sprite sprite: Structures/Furniture/Tables/debug.rsi - type: Icon diff --git a/Resources/Prototypes/Entities/Structures/Power/debug_power.yml b/Resources/Prototypes/Entities/Structures/Power/debug_power.yml index d2fa8d08a3..a2e1c585fb 100644 --- a/Resources/Prototypes/Entities/Structures/Power/debug_power.yml +++ b/Resources/Prototypes/Entities/Structures/Power/debug_power.yml @@ -7,9 +7,6 @@ supplyRate: 300000 supplyRampRate: 50000 supplyRampTolerance: 500 - - type: Tag - tags: - - Debug - type: entity id: DebugConsumer @@ -18,9 +15,6 @@ placement: mode: SnapgridCenter components: - - type: Tag - tags: - - Debug - type: Clickable - type: InteractionOutline - type: Physics @@ -63,9 +57,6 @@ placement: mode: SnapgridCenter components: - - type: Tag - tags: - - Debug - type: Clickable - type: InteractionOutline - type: Physics @@ -96,9 +87,6 @@ placement: mode: SnapgridCenter components: - - type: Tag - tags: - - Debug - type: Clickable - type: PowerNetworkBattery - type: InteractionOutline @@ -128,10 +116,6 @@ parent: BaseSMES id: DebugSMES suffix: DEBUG, Empty - components: - - type: Tag - tags: - - Debug - type: entity parent: BaseSMES @@ -141,18 +125,11 @@ - type: BatterySelfRecharger autoRechargeRate: 50000 autoRecharge: True - - type: Tag - tags: - - Debug - type: entity parent: BaseSubstation id: DebugSubstation suffix: DEBUG, Empty - components: - - type: Tag - tags: - - Debug - type: entity parent: BaseSubstation @@ -162,18 +139,11 @@ - type: BatterySelfRecharger autoRechargeRate: 50000 autoRecharge: True - - type: Tag - tags: - - Debug - type: entity parent: BaseSubstationWall id: DebugSubstationWall suffix: DEBUG, Empty - components: - - type: Tag - tags: - - Debug - type: entity parent: BaseSubstationWall @@ -183,18 +153,11 @@ - type: BatterySelfRecharger autoRechargeRate: 50000 autoRecharge: True - - type: Tag - tags: - - Debug - type: entity parent: BaseAPC id: DebugAPC suffix: DEBUG, Empty - components: - - type: Tag - tags: - - Debug - type: entity parent: BaseAPC @@ -204,9 +167,6 @@ - type: BatterySelfRecharger autoRechargeRate: 50000 autoRecharge: True - - type: Tag - tags: - - Debug - type: entity id: DebugPowerReceiver @@ -215,9 +175,6 @@ placement: mode: SnapgridCenter components: - - type: Tag - tags: - - Debug - type: Clickable - type: InteractionOutline - type: Physics diff --git a/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml b/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml index 90893cd432..038ac70d82 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml @@ -30,9 +30,6 @@ solution: bucket - type: ExaminableSolution solution: bucket - - type: Tag - tags: - - Wringer - type: ItemMapper mapLayers: mopbucket_shark_blue: @@ -270,9 +267,6 @@ solution: bucket - type: ExaminableSolution solution: bucket - - type: Tag - tags: - - Wringer - type: Damageable damageContainer: Inorganic damageModifierSet: Metallic diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml index 2964b71162..8fbc14393b 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml @@ -10,7 +10,7 @@ - Wall components: - type: Anchorable - flags: + flags: - Anchorable - type: Rotatable - type: RangedDamageSound @@ -268,7 +268,6 @@ - type: Tag tags: - Wall - - Debug - type: Sprite sprite: Structures/Walls/debug.rsi - type: Icon diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index cec1aa4baa..8a466cc8c8 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -42,9 +42,6 @@ - type: Tag id: ArtifactFragment # Storage whitelist: OreBag. CargoBounty: BountyArtifactFragment. ConstructionGraph: Artifact -- type: Tag - id: ATVKeys # Unused x2 - ## B ## - type: Tag @@ -101,6 +98,9 @@ - type: Tag id: BorgHead # Used by PartAssemblyComponent on CyborgEndoskeleton. Also in ConstructionGraphs for various bots +- type: Tag + id: BorgLeg # Used by PartAssemblyComponent on VimHarness + - type: Tag id: BorgLArm # Used by PartAssemblyComponent on CyborgEndoskeleton @@ -116,9 +116,6 @@ - type: Tag id: BorgTorso # Used by PartAssemblyComponent on CyborgEndoskeleton -- type: Tag - id: BorgLeg # Used by PartAssemblyComponent on VimHarness - - type: Tag id: BorgModuleCargo # Cyborg module category for salvage and cargo @@ -147,7 +144,7 @@ id: BorgModuleSyndicateAssault # Cyborg module category for extra evil red robots (nukies) - type: Tag - id: Bot # Unused (Exists on MobRobotic, MobSupplyBot) + id: Bot # Targeting whitelist: ChameleonProjector - type: Tag id: BotanyHatchet # Storage whitelist: ClothingBeltPlant. ItemMapper: ClothingBeltPlant @@ -176,9 +173,6 @@ - type: Tag id: Bread # CargoBounty: BountyBread. Blacklisted in BountyFruit and BountyVegetable -- type: Tag - id: Briefcase # Unused (exists on BriefcaseBase) - - type: Tag id: BrimFlatcapBrown # ConstructionGraph: BladedFlatcapBrown @@ -191,17 +185,17 @@ - type: Tag id: Bucket # Storage whitelist: JanitorialTrolley. ItemMapper: JanitorialTrolley. ConstructionGraph: CleanBot, scraphelmet -- type: Tag - id: Burger # Food sequence key - - type: Tag id: BulletFoam # Ammo: WeaponRifleFoam, FoamCrossbow, MagazineFoamBox, BoxDonkSoftBox - type: Tag - id: Burnt # Storage whitelist: ashtray. Seemingly redundant? + id: Bun # LastElement key on burger associated MetamorphRecipes. - type: Tag - id: Bun # Unused (Exists on FoodSequenceElements BunTopBurger and CottonBunTopBurger) + id: Burger # Food sequence key + +- type: Tag + id: Burnt # Storage whitelist: ashtray. Seemingly redundant? - type: Tag id: BypassDropChecks # Tagged entities don't care about drop distance or walls (Aghost). @@ -215,10 +209,10 @@ id: CableCoil # Storage whitelist: BaseClothingBeltEngineering, BorgModuleCable - type: Tag - id: Candle # Storage whitelist: BoxCandle + id: Cake # CargoBounty blacklist: BountyFruit, BountyVegetable - type: Tag - id: Cake # CargoBounty blacklist: BountyFruit, BountyVegetable + id: Candle # Storage whitelist: BoxCandle - type: Tag id: CaneBlade # Storage whitelist: CaneSheath. ItemMapper: CaneSheath @@ -236,6 +230,9 @@ - type: Tag id: CaptainSabre # Storage whitelist: ClothingBeltSheath. ItemMapper: ClothingBeltSheath +- type: Tag + id: Carp # CargoBounty: BountyCarp + - type: Tag id: Carpet # CreateEntityTileReaction whitelist on Carpetium @@ -245,44 +242,45 @@ - type: Tag id: CarrotFries # CargoBounty: BountyCarrotFries -- type: Tag - id: Carp # CargoBounty: BountyCarp - - type: Tag # NOT bullets. This is for the cart to load PDA programs. id: Cartridge # Storage whitelist: BasePDA -- type: Tag - id: CartridgeAntiMateriel # Ammo: WeaponSniperHristov, Musket, BaseMagazineBoxAntiMateriel +#region Cartridge (Ammo) + +# Entities tagged with the following are some fashion of bullet. Guns, magazines, and ammo boxes have storage whitelists for these tags. +# Tagged entities always have CartridgeAmmoComponent. - type: Tag - id: CartridgeCap # Ammo: RevolverCapGun, RevolverCapGunFake, BaseSpeedLoaderCap + id: CartridgeAntiMateriel # .60 high caliber ammo for powerful rifles like WeaponSniperHristov, Musket. - type: Tag - id: CartridgeCaselessRifle # Ammo: WeaponPistolCobra, BaseMagazineCaselessRifle, BaseMagazineBoxCaselessRifle + id: CartridgeCap # Specialty ammo for RevolverCapGun, RevolverCapGunFake. - type: Tag - id: CartridgeCHIMP # Unused x2 + id: CartridgeCaselessRifle # Specialty ammo for WeaponPistolCobra. - type: Tag - id: CartridgeHeavyRifle # Unused (exists on BaseCartridgeHeavyRifle) + id: CartridgeDebug # Specialty ammo for debug guns like the deadly WeaponPistolDebug. - type: Tag - id: CartridgeLightRifle # Ammo: BaseWeaponLightMachineGun, BaseWeaponRifle, BaseWeaponSniper - # SpeedLoaderLightRifle, BaseMagazineLightRifle, BaseMagazineBoxLightRifle + id: CartridgeHeavyRifle # .10 caliber ammo type only used by WeaponMinigun (but the tag is unused). - type: Tag - id: CartridgeMagnum # Ammo: BaseWeaponRevolver, RevolverCapGunFake, WeaponPistolN1984, WeaponPistolFlintlock, XenoArtifactGun - # BaseMagazineBoxMagnum, BaseMagazineMagnum, BaseSpeedLoaderMagnum + id: CartridgeLightRifle # .30 caliber used by lmgs and middle range rifles like WeaponLightMachineGunL6, WeaponRifleAk, WeaponSniperMosin. - type: Tag - id: CartridgePistol # Ammo: BaseWeaponPistol, BasePistol, BaseWeaponSubMachineGun, WeaponPistolViper, WeaponSubMachineGunDrozd, WeaponSubMachineGunWt550 - # BaseMagazineBoxPistol, BaseMagazinePistol, BaseMagazinePistolHighCapacity, BaseMagazinePistolSubMachineGun, MagazinePistolSubMachineGunTopMounted, BaseSpeedLoaderPistol + id: CartridgeMagnum # .45 caliber used by revolvers and big boy pistols like BaseWeaponRevolver, WeaponPistolN1984. - type: Tag - id: CartridgeRifle # Ammo: BaseMagazineRifle, WeaponRifleLecter, WeaponRifleEstoc, WeaponRifleM90GrenadeLauncher, BaseMagazineBoxRifle + id: CartridgePistol # .35 caliber used by pistols and smgs like WeaponPistolMk58, WeaponSubMachineGunC20r, WeaponSubMachineGunDrozd. - type: Tag - id: CartridgeRocket # Ammo: WeaponLauncherRocket, WeaponLauncherMultipleRocket + id: CartridgeRifle # .20 caliber used by precise rifles like WeaponRifleLecter, WeaponRifleEstoc. + +- type: Tag + id: CartridgeRocket # Specialty ammo for WeaponLauncherRocket. + +#endregion - type: Tag id: Catwalk # If a tagged entity is intersecting a hazard tile entity such as lava or chasms, step triggers on those hazards are cancelled. @@ -290,9 +288,6 @@ - type: Tag id: CentrifugeCompatible # Storage whitelist: MachineCentrifuge -- type: Tag - id: Chicken # Reproductive partner key. MetamorphRecipe: FoodBurgerChicken - - type: Tag id: Cheese # MetamorphRecipe: FoodBurgerCheese, FoodBurgerDuck @@ -302,6 +297,9 @@ - type: Tag id: ChemDispensable # Storage whitelist: ChemDispenserEmpty, SmartFridge, BorgModuleAdvancedChemical +- type: Tag + id: Chicken # Reproductive partner key. MetamorphRecipe: FoodBurgerChicken + - type: Tag id: ChiliBowl # CargoBounty: BountyChili @@ -320,9 +318,6 @@ - type: Tag id: Cleaver # Storage whitelist: ClothingBeltChef. ItemMapper: ClothingBeltChef -- type: Tag - id: ClockworkGlassShard # Unused (Exists on ShardGlassClockwork) - - type: Tag id: ClothMade # SpecialDigestible: OrganMothStomach. Storage whitelist: FoodBoxCloth @@ -332,9 +327,6 @@ - type: Tag id: ClownRecorder # ConstructionGraph: ClownHardsuit -- type: Tag - id: ClownRubberStamp # Unused (Exists on RubberStampClown) - - type: Tag id: ClownShoes # CargoBounty: BountyClownCostume. ConstructionGraph: Honker, BananaClownShoes @@ -422,9 +414,6 @@ - type: Tag id: CrowbarRed # Storage whitelist: BaseClothingBeltEngineering, ClothingBeltChiefEngineer. ItemMapper: BaseClothingBeltEngineering, ClothingBeltChiefEngineer -- type: Tag - id: Cryobeaker # Unused x2 - - type: Tag id: CrystalBlack # ConstructionGraph: BlackLight, BlackLightBulb @@ -454,12 +443,6 @@ ## D ## -- type: Tag - id: DeathAcidifier # Unused (Exists on DeathAcidifierImplant) - -- type: Tag - id: Debug # Exists on various debug / testing entities, but seemingly unused. - - type: Tag # Exists on diagonal walls and windows id: Diagonal # Used by TileWallsCommand and FixRotationsCommand @@ -478,9 +461,6 @@ - type: Tag id: DockArrivals # Used by ArrivalsSystem for finding a priority FTL destination. -- type: Tag - id: DockCargo # Unused x2 - - type: Tag id: DockEmergency # Used bv EmergencyShuttleSystem for finding a priority FTL destination. @@ -509,15 +489,6 @@ - type: Tag id: DrinkCan # ConstructionGraph: FireBomb -- type: Tag - id: DrinkCup # Unused (Exists on DrinkBaseCup, DrinkWaterCup, DrinkGlass) - -- type: Tag - id: DrinkGlass # Unused (Exists on DrinkGlass, DrinkShotGlass, DrinkJarWhat, DrinkShakeBase) - -- type: Tag - id: DrinkSpaceGlue # Unused (Exists on DrinkSpaceGlue, CrazyGlue) - - type: Tag id: Dropper # Storage whitelist: ClothingBeltMedical, ClothingBeltPlant, ChemBag @@ -547,9 +518,6 @@ - type: Tag id: EncryptionCommon # ItemMapper: TelecomServer -- type: Tag - id: EncryptionElse # Unused x2 - - type: Tag id: EncryptionEngineering # ItemMapper: TelecomServer @@ -571,9 +539,6 @@ - type: Tag id: ExCable # Placement blacklist on CableDetStack. Placement whitelist on WiredDetonator -- type: Tag - id: ExplosivePassable # Unused x2 - ## F ## - type: Tag @@ -594,15 +559,15 @@ - type: Tag id: FireAxe # Storage whitelist: FireAxeCabinet -- type: Tag - id: FirelockElectronics # ConstructionGraph: Firelock - - type: Tag id: FireExtinguisher # ConstructionGraph: FireBot - type: Tag id: FireHelmet # ConstructionGraph: FireBot +- type: Tag + id: FirelockElectronics # ConstructionGraph: Firelock + - type: Tag id: Flare # Storage whitelist: BaseClothingBeltEngineering @@ -647,9 +612,6 @@ - type: Tag id: GasScrubber # Used by AtmosAlarmableComponent for syncing devices. -- type: Tag - id: GasTank # Unused (Exists on GasTankBase) - - type: Tag id: GasVent # Used by AtmosAlarmableComponent for syncing devices. @@ -664,7 +626,7 @@ id: GhostOnlyWarp - type: Tag - id: GenderPin # ChameleonClothing key. + id: GenderPin # Chameleon key for ClothingGenderPinBase. - type: Tag id: GlassAirlock # Used in ConstructionGraph "Airlock" to navigate between regular, glass, and highsec airlocks. @@ -719,15 +681,15 @@ - type: Tag id: HamtrCentralControlModule # ConstructionGraph: Hamtr -- type: Tag - id: HamtrPeripheralsControlModule # ConstructionGraph: Hamtr - - type: Tag id: HamtrLArm # PartAssembly: HamtrHarness. ItemMapper: HamtrHarness - type: Tag id: HamtrLLeg # PartAssembly: HamtrHarness. ItemMapper: HamtrHarness +- type: Tag + id: HamtrPeripheralsControlModule # ConstructionGraph: Hamtr + - type: Tag id: HamtrRArm # PartAssembly: HamtrHarness. ItemMapper: HamtrHarness @@ -767,9 +729,6 @@ - type: Tag id: HidesHair # Used by MagicMirrorSystem to prevent haircuts if a tagged entity is worn. -- type: Tag - id: HidesNose # Unused x2 - - type: Tag id: HighRiskItem # Storage blacklist: ClothingHeadHatDetGadget. Blacklisted on MaterialReclaimerComponent by both entities # Used by EventHorizonSystem to send an admin alert. @@ -795,24 +754,24 @@ - type: Tag id: HonkerCentralControlModule # ConstructionGraph: Honker -- type: Tag - id: HonkerPeripheralsControlModule # ConstructionGraph: Honker - -- type: Tag - id: HonkerTargetingControlModule # ConstructionGraph: Honker - - type: Tag id: HonkerLArm # PartAssembly: HonkerHarness. ItemMapper: HonkerHarness - type: Tag id: HonkerLLeg # PartAssembly: HonkerHarness. ItemMapper: HonkerHarness +- type: Tag + id: HonkerPeripheralsControlModule # ConstructionGraph: Honker + - type: Tag id: HonkerRArm # PartAssembly: HonkerHarness. ItemMapper: HonkerHarness - type: Tag id: HonkerRLeg # PartAssembly: HonkerHarness. ItemMapper: HonkerHarness +- type: Tag + id: HonkerTargetingControlModule # ConstructionGraph: Honker + - type: Tag id: Hotsauce # Storage whitelist: ClothingBeltChef and FoodCartHot. ItemMapper: ClothingBeltChef and FoodCartHot @@ -831,16 +790,13 @@ id: Igniter # ConstructionGraph: makeshiftstunprod, FireBomb. Common ingredient in machines (HyperConvection) - type: Tag - id: Ingredient # Unused. (Exists on items in igredients.yml) - -- type: Tag #Drop this innate tool instead of deleting it. - id: InnateDontDelete # Basically used as a bool for InnateToolComponent in InnateToolSystem. TODO remove + id: Inflatable # Storage whitelist: BorgModuleInflatable - type: Tag id: Ingot # MaterialStorage whitelist for many machines and lathes. Storage whitelist: MaterialBag -- type: Tag - id: Inflatable # Storage whitelist: BorgModuleInflatable +- type: Tag #Drop this innate tool instead of deleting it. + id: InnateDontDelete # Basically used as a bool for InnateToolComponent in InnateToolSystem. TODO remove - type: Tag id: InstantDoAfters # Used by SharedDoAfterSystem for tagged entities to skip DoAfters (aghost). TODO remove @@ -865,9 +821,6 @@ - type: Tag id: Kangaroo # Used by inventoryTemplate:kangaroo to whitelist clothes wearable by the man shaped animal. -- type: Tag - id: Katana # Unused. (Exists on Katana) - - type: Tag id: Ketchup # Storage whitelist: ClothingBeltChef and FoodCartHot. ItemMapper: ClothingBeltChef and FoodCartHot @@ -900,63 +853,54 @@ ## M ## -- type: Tag - id: Machete # Unused (Exists on Machete, Cutlass) +#region Magazine (Ammo) -- type: Tag - id: MacroBomb # Unused (Exists on MacroBombImplant) - -# Magazines ordered by slot then caliber - -- type: Tag - id: MagazineCalico # Unused x2 +# Entities tagged with the following are some sort of gun magazine. Guns whitelist their storage using these tags. +# Tagged entities always have BallisticAmmoProviderComponent. - type: Tag id: MagazineCaselessRifle # Unused (Exists on BaseMagazineCaselessRifle) +- type: Tag + id: MagazineDebug # WeaponPistolDebug + +- type: Tag + id: MagazineGrenade # ShuttleGunDuster + - type: Tag id: MagazineHeavyRifle # Unused (Exists on BaseMagazineHeavyRifle) - type: Tag - id: MagazineHeavyRifleBox # Unused x2 + id: MagazineLightRifle # WeaponRifleAk - type: Tag - id: MagazineLightRifle # Storage whitelist: BaseWeaponRifle, WeaponRifleAk + id: MagazineLightRifleBox # WeaponLightMachineGunL6 - type: Tag - id: MagazineLightRifleBox # Storage whitelist: BaseWeaponLightMachineGun + id: MagazineMagnum # WeaponPistolN1984 - type: Tag - id: MagazineLightRiflePan # Unused x2 + id: MagazinePistol # WeaponPistolMk58, WeaponPistolViper, ClothingBeltSecurity - type: Tag - id: MagazineMagnum # Storage whitelist: ClothingBeltSecurity, WeaponPistolN1984 + id: MagazinePistolCaselessRifle # WeaponPistolCobra - type: Tag - id: MagazinePistol # Storage whitelist: ClothingBeltSecurity, BaseWeaponPistol, WeaponPistolViper + id: MagazinePistolHighCapacity # WeaponPistolViper - type: Tag - id: MagazinePistolCaselessRifle # Storage whitelist: WeaponPistolCobra + id: MagazinePistolSubMachineGun # WeaponSubMachineGunC20r, WeaponSubMachineGunDrozd, WeaponSubMachineGunAtreides - type: Tag - id: MagazinePistolHighCapacity # Storage whitelist: WeaponPistolViper + id: MagazinePistolSubMachineGunTopMounted # WeaponSubMachineGunWt550 - type: Tag - id: MagazinePistolSubMachineGunTopMounted # Storage whitelist: WeaponSubMachineGunWt550 + id: MagazineRifle # WeaponRifleLecter, WeaponRifleEstoc, WeaponRifleM90GrenadeLauncher - type: Tag - id: MagazineRifle # Storage whitelist: WeaponRifleLecter, WeaponRifleEstoc, WeaponRifleM90GrenadeLauncher + id: MagazineShotgun # WeaponShotgunBulldog -- type: Tag - id: MagazineShotgun # Storage whitelist: WeaponShotgunBulldog - -- type: Tag - id: MagazinePistolSubMachineGun # Storage whitelist: BaseWeaponSubMachineGun, WeaponSubMachineGunDrozd - -- type: Tag - id: MagazineGrenade # Storage whitelist: ShuttleGunDuster - -# Magazines end +#endregion - type: Tag id: MailingUnitElectronics # ConstructionGraph: DisposalMachine @@ -1034,9 +978,6 @@ - type: Tag id: NinjaBombingTargetBlocker # Ninjas will not target this warp point -- type: Tag - id: NoBlockAnchoring # Unused x2 - - type: Tag id: NoConsoleSound # Blacklist on BaseComputer, StationMap. Tagged entity will not make sound when opening the UI. @@ -1078,13 +1019,13 @@ id: Packet # Storage whitelist: ClothingBeltChef - type: Tag - id: ParadoxCloneObjectiveBlacklist # objective entities with this tag don't get copied to paradox clones + id: Pancake # CargoBounty: BountyPancake - type: Tag id: Paper # A writeable piece of paper. Subset of Document tag. SpecialDigestible: OrganMothStomach, OrganReptilianStomach - type: Tag - id: Pancake # CargoBounty: BountyPancake + id: ParadoxCloneObjectiveBlacklist # objective entities with this tag don't get copied to paradox clones - type: Tag id: ParcelWrapBlacklist # Tagged entities can't be wrapped in ParcelWrap. @@ -1135,9 +1076,6 @@ - type: Tag id: PKAUpgrade # UpgradeableGun whitelist for WeaponProtoKineticAccelerator. -- type: Tag - id: PlantAnalyzer # Commented out on ClothingBeltPlant, so currently unused x2. - - type: Tag id: PlantBGone # Storage whitelist: ClothingBeltPlant. ItemMapper: ClothingBeltPlant @@ -1244,24 +1182,21 @@ - type: Tag id: RipleyCentralControlModule # ConstructionGraph: Ripley -- type: Tag - id: RipleyPeripheralsControlModule # ConstructionGraph: Ripley - - type: Tag id: RipleyLArm # PartAssembly: RipleyHarness. ItemMapper: RipleyHarness - type: Tag id: RipleyLLeg # PartAssembly: RipleyHarness. ItemMapper: RipleyHarness +- type: Tag + id: RipleyPeripheralsControlModule # ConstructionGraph: Ripley + - type: Tag id: RipleyRArm # PartAssembly: RipleyHarness. ItemMapper: RipleyHarness - type: Tag id: RipleyRLeg # PartAssembly: RipleyHarness. ItemMapper: RipleyHarness -- type: Tag - id: RodMetal1 # Unused (Exists on PartRodMetal1, PartRodMetal10) - - type: Tag id: RollingPaper # Storage whitelist: PackPaperRolling, PackPaperRollingFilters @@ -1306,9 +1241,6 @@ - type: Tag id: SecurityHelmet # ConstructionGraph: HelmetJustice -- type: Tag - id: SecwayKeys # Unused x2 - - type: Tag id: Sheet # MaterialStorage whitelist for many machines and lathes. Storage whitelist: MaterialBag @@ -1333,9 +1265,6 @@ - type: Tag id: SiliconEmotes # Whitelisted and blacklisted in various EmotePrototypes to create a silicon emote group. -- type: Tag - id: SkeletonMotorcycleKeys # Unused x2 - - type: Tag id: Skewer # Food sequence key @@ -1433,9 +1362,6 @@ - type: Tag id: Syndicate # FTLDestination whitelist in nukieplanet.yml. Tag exists on ComputerShuttleSyndie and infiltrator.yml -- type: Tag - id: SyndicateSegwayKeys # Unused x2 - - type: Tag id: Syringe # Storage whitelist: ClothingBeltPlant, ChemBag, SmartFridge. CargoBounty: BountySyringe @@ -1453,9 +1379,6 @@ - type: Tag id: Taco # Food sequence key -- type: Tag - id: TabletopPiece # Unused (Exists on BaseTabletopPiece) - - type: Tag id: Taser # Storage whitelist: ClothingBeltSecurity @@ -1480,9 +1403,6 @@ - type: Tag id: Torch # CargoBounty: BountyTorch. ConstructionGraph: PumpkinAddLight -- type: Tag - id: ToteBase # Unused (Exists on ToteBase) - - type: Tag id: ToyRubberDuck # ConstructionGraph: ClothingShoeSlippersDuck @@ -1592,9 +1512,6 @@ - type: Tag id: Wirecutter # Storage whitelist: BaseClothingBeltEngineering. ItemMapper: BaseClothingBeltEngineering -- type: Tag - id: WizardStaff # Unused (Exists on WeaponStaffBase) - - type: Tag id: WizardWand # that evil vvizard vvand # .cs: ChargeSpellEvent. Storage whitelist: ClothingBeltWand @@ -1611,9 +1528,6 @@ id: Wrench # Storage whitelist: BaseClothingBeltEngineering, ClothingBeltJanitor, ClothingBeltMedical. # ItemMapper: BaseClothingBeltEngineering, ClothingBeltJanitor, ClothingBeltMedical -- type: Tag - id: Wringer # Unused (Exists on JanitorialTrolley, MopBucket) - - type: Tag id: Write # Used by PaperSystem to make tagged entity a writing tool. Many storages whitelist this as well. From e6bbd40e724bf4516d62b839a1b6dc6168b244dd Mon Sep 17 00:00:00 2001 From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> Date: Mon, 3 Nov 2025 03:49:36 -0800 Subject: [PATCH 094/121] Document Atmospherics ExcitedGroups (#41269) Document ExcitedGroups --- .../AtmosphereSystem.ExcitedGroup.cs | 313 ++++++++++-------- .../EntitySystems/AtmosphereSystem.LINDA.cs | 7 + .../AtmosphereSystem.Processing.cs | 1 - Content.Server/Atmos/ExcitedGroup.cs | 47 ++- 4 files changed, 228 insertions(+), 140 deletions(-) diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.ExcitedGroup.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.ExcitedGroup.cs index 0d622f3067..6ae251dd29 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.ExcitedGroup.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.ExcitedGroup.cs @@ -4,148 +4,199 @@ using Content.Shared.Atmos.Components; using Robust.Shared.Map.Components; using Robust.Shared.Utility; -namespace Content.Server.Atmos.EntitySystems +namespace Content.Server.Atmos.EntitySystems; + +public sealed partial class AtmosphereSystem { - public sealed partial class AtmosphereSystem + /* + Handles Excited Groups, an optimization routine executed during LINDA + that groups active tiles together. + + Groups of active tiles that have very low mole deltas between them + are dissolved after a cooldown period, performing a final equalization + on all tiles in the group before deactivating them. + + If tiles are so close together in pressure that the final equalization + would result in negligible gas transfer, the group is dissolved without + performing an equalization. + + This prevents LINDA from constantly transferring tiny amounts of gas + between tiles that are already nearly equalized. + */ + + /// + /// Adds a tile to an , resetting the group's cooldowns in the process. + /// + /// The to add the tile to. + /// The to add. + private void ExcitedGroupAddTile(ExcitedGroup excitedGroup, TileAtmosphere tile) { - private void ExcitedGroupAddTile(ExcitedGroup excitedGroup, TileAtmosphere tile) + DebugTools.Assert(!excitedGroup.Disposed, "Excited group is disposed!"); + DebugTools.Assert(tile.ExcitedGroup == null, "Tried to add a tile to an excited group when it's already in another one!"); + excitedGroup.Tiles.Add(tile); + tile.ExcitedGroup = excitedGroup; + ExcitedGroupResetCooldowns(excitedGroup); + } + + /// + /// Removes a tile from an . + /// + /// The to remove the tile from. + /// The to remove. + private void ExcitedGroupRemoveTile(ExcitedGroup excitedGroup, TileAtmosphere tile) + { + DebugTools.Assert(!excitedGroup.Disposed, "Excited group is disposed!"); + DebugTools.Assert(tile.ExcitedGroup == excitedGroup, "Tried to remove a tile from an excited group it's not present in!"); + tile.ExcitedGroup = null; + excitedGroup.Tiles.Remove(tile); + } + + /// + /// Merges two , transferring all tiles from one to the other. + /// The larger group receives the tiles of the smaller group. + /// The smaller group is then disposed of without deactivating its tiles. + /// + /// The of the grid. + /// The first to merge. + /// The second to merge. + private void ExcitedGroupMerge(GridAtmosphereComponent gridAtmosphere, ExcitedGroup ourGroup, ExcitedGroup otherGroup) + { + DebugTools.Assert(!ourGroup.Disposed, "Excited group is disposed!"); + DebugTools.Assert(!otherGroup.Disposed, "Excited group is disposed!"); + DebugTools.Assert(gridAtmosphere.ExcitedGroups.Contains(ourGroup), "Grid Atmosphere does not contain Excited Group!"); + DebugTools.Assert(gridAtmosphere.ExcitedGroups.Contains(otherGroup), "Grid Atmosphere does not contain Excited Group!"); + var ourSize = ourGroup.Tiles.Count; + var otherSize = otherGroup.Tiles.Count; + + ExcitedGroup winner; + ExcitedGroup loser; + + if (ourSize > otherSize) { - DebugTools.Assert(!excitedGroup.Disposed, "Excited group is disposed!"); - DebugTools.Assert(tile.ExcitedGroup == null, "Tried to add a tile to an excited group when it's already in another one!"); - excitedGroup.Tiles.Add(tile); - tile.ExcitedGroup = excitedGroup; - ExcitedGroupResetCooldowns(excitedGroup); + winner = ourGroup; + loser = otherGroup; + } + else + { + winner = otherGroup; + loser = ourGroup; } - private void ExcitedGroupRemoveTile(ExcitedGroup excitedGroup, TileAtmosphere tile) + foreach (var tile in loser.Tiles) + { + tile.ExcitedGroup = winner; + winner.Tiles.Add(tile); + } + + loser.Tiles.Clear(); + ExcitedGroupDispose(gridAtmosphere, loser); + ExcitedGroupResetCooldowns(winner); + } + + /// + /// Resets the cooldowns of an excited group. + /// + /// The to reset cooldowns for. + private void ExcitedGroupResetCooldowns(ExcitedGroup excitedGroup) + { + DebugTools.Assert(!excitedGroup.Disposed, "Excited group is disposed!"); + excitedGroup.BreakdownCooldown = 0; + excitedGroup.DismantleCooldown = 0; + } + + /// + /// Performs a final equalization on all tiles in an excited group before deactivating it. + /// + /// The grid. + /// The to equalize and dissolve. + private void ExcitedGroupSelfBreakdown( + Entity ent, + ExcitedGroup excitedGroup) + { + DebugTools.Assert(!excitedGroup.Disposed, "Excited group is disposed!"); + DebugTools.Assert(ent.Comp1.ExcitedGroups.Contains(excitedGroup), "Grid Atmosphere does not contain Excited Group!"); + var combined = new GasMixture(Atmospherics.CellVolume); + + var tileSize = excitedGroup.Tiles.Count; + + if (excitedGroup.Disposed) + return; + + if (tileSize == 0) + { + ExcitedGroupDispose(ent.Comp1, excitedGroup); + return; + } + + // Combine all gasses in the group into a single mixture + // for distribution into each individual tile. + foreach (var tile in excitedGroup.Tiles) + { + if (tile?.Air == null) + continue; + + Merge(combined, tile.Air); + + // If this tile is space and space is all-consuming, the final equalization + // will result in a vacuum, so we can skip the rest of the equalization. + if (!ExcitedGroupsSpaceIsAllConsuming || !tile.Space) + continue; + + combined.Clear(); + break; + } + + combined.Multiply(1 / (float)tileSize); + + // Distribute the combined mixture evenly to all tiles in the group. + foreach (var tile in excitedGroup.Tiles) + { + if (tile?.Air == null) + continue; + + tile.Air.CopyFrom(combined); + InvalidateVisuals(ent, tile); + } + + excitedGroup.BreakdownCooldown = 0; + } + + /// + /// Deactivates and removes all tiles from an excited group without performing a final equalization. + /// Used when an excited group is expected to be nearly equalized already to avoid unnecessary processing. + /// + /// The of the grid. + /// The to dissolve. + private void DeactivateGroupTiles(GridAtmosphereComponent gridAtmosphere, ExcitedGroup excitedGroup) + { + foreach (var tile in excitedGroup.Tiles) { - DebugTools.Assert(!excitedGroup.Disposed, "Excited group is disposed!"); - DebugTools.Assert(tile.ExcitedGroup == excitedGroup, "Tried to remove a tile from an excited group it's not present in!"); tile.ExcitedGroup = null; - excitedGroup.Tiles.Remove(tile); + RemoveActiveTile(gridAtmosphere, tile); } - private void ExcitedGroupMerge(GridAtmosphereComponent gridAtmosphere, ExcitedGroup ourGroup, ExcitedGroup otherGroup) + excitedGroup.Tiles.Clear(); + } + + /// + /// Removes and disposes of an excited group without performing any final equalization + /// or deactivation of its tiles. + /// + private void ExcitedGroupDispose(GridAtmosphereComponent gridAtmosphere, ExcitedGroup excitedGroup) + { + if (excitedGroup.Disposed) + return; + + DebugTools.Assert(gridAtmosphere.ExcitedGroups.Contains(excitedGroup), "Grid Atmosphere does not contain Excited Group!"); + + excitedGroup.Disposed = true; + gridAtmosphere.ExcitedGroups.Remove(excitedGroup); + + foreach (var tile in excitedGroup.Tiles) { - DebugTools.Assert(!ourGroup.Disposed, "Excited group is disposed!"); - DebugTools.Assert(!otherGroup.Disposed, "Excited group is disposed!"); - DebugTools.Assert(gridAtmosphere.ExcitedGroups.Contains(ourGroup), "Grid Atmosphere does not contain Excited Group!"); - DebugTools.Assert(gridAtmosphere.ExcitedGroups.Contains(otherGroup), "Grid Atmosphere does not contain Excited Group!"); - var ourSize = ourGroup.Tiles.Count; - var otherSize = otherGroup.Tiles.Count; - - ExcitedGroup winner; - ExcitedGroup loser; - - if (ourSize > otherSize) - { - winner = ourGroup; - loser = otherGroup; - } - else - { - winner = otherGroup; - loser = ourGroup; - } - - foreach (var tile in loser.Tiles) - { - tile.ExcitedGroup = winner; - winner.Tiles.Add(tile); - } - - loser.Tiles.Clear(); - ExcitedGroupDispose(gridAtmosphere, loser); - ExcitedGroupResetCooldowns(winner); + tile.ExcitedGroup = null; } - private void ExcitedGroupResetCooldowns(ExcitedGroup excitedGroup) - { - DebugTools.Assert(!excitedGroup.Disposed, "Excited group is disposed!"); - excitedGroup.BreakdownCooldown = 0; - excitedGroup.DismantleCooldown = 0; - } - - private void ExcitedGroupSelfBreakdown( - Entity ent, - ExcitedGroup excitedGroup) - { - DebugTools.Assert(!excitedGroup.Disposed, "Excited group is disposed!"); - DebugTools.Assert(ent.Comp1.ExcitedGroups.Contains(excitedGroup), "Grid Atmosphere does not contain Excited Group!"); - var combined = new GasMixture(Atmospherics.CellVolume); - - var tileSize = excitedGroup.Tiles.Count; - - if (excitedGroup.Disposed) - return; - - if (tileSize == 0) - { - ExcitedGroupDispose(ent.Comp1, excitedGroup); - return; - } - - foreach (var tile in excitedGroup.Tiles) - { - if (tile?.Air == null) - continue; - - Merge(combined, tile.Air); - - if (!ExcitedGroupsSpaceIsAllConsuming || !tile.Space) - continue; - - combined.Clear(); - break; - } - - combined.Multiply(1 / (float)tileSize); - - foreach (var tile in excitedGroup.Tiles) - { - if (tile?.Air == null) - continue; - - tile.Air.CopyFrom(combined); - InvalidateVisuals(ent, tile); - } - - excitedGroup.BreakdownCooldown = 0; - } - - /// - /// This de-activates and removes all tiles in an excited group. - /// - private void DeactivateGroupTiles(GridAtmosphereComponent gridAtmosphere, ExcitedGroup excitedGroup) - { - foreach (var tile in excitedGroup.Tiles) - { - tile.ExcitedGroup = null; - RemoveActiveTile(gridAtmosphere, tile); - } - - excitedGroup.Tiles.Clear(); - } - - /// - /// This removes an excited group without de-activating its tiles. - /// - private void ExcitedGroupDispose(GridAtmosphereComponent gridAtmosphere, ExcitedGroup excitedGroup) - { - if (excitedGroup.Disposed) - return; - - DebugTools.Assert(gridAtmosphere.ExcitedGroups.Contains(excitedGroup), "Grid Atmosphere does not contain Excited Group!"); - - excitedGroup.Disposed = true; - gridAtmosphere.ExcitedGroups.Remove(excitedGroup); - - foreach (var tile in excitedGroup.Tiles) - { - tile.ExcitedGroup = null; - } - - excitedGroup.Tiles.Clear(); - } + excitedGroup.Tiles.Clear(); } } diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.LINDA.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.LINDA.cs index 55b38924c0..ad19770bfe 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.LINDA.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.LINDA.cs @@ -129,9 +129,16 @@ namespace Content.Server.Atmos.EntitySystems switch (tile.LastShare) { + // Refresh this tile's suspension cooldown if it had significant sharing. case > Atmospherics.MinimumAirToSuspend: ExcitedGroupResetCooldowns(tile.ExcitedGroup); break; + + // If this tile moved a very small amount of air, but not enough to matter, + // we set the dismantle cooldown to 0. + // This dissolves the group without performing an equalization as we expect + // the group to be mostly equalized already if we're moving around miniscule + // amounts of air. case > Atmospherics.MinimumMolesDeltaToMove: tile.ExcitedGroup.DismantleCooldown = 0; break; diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs index 72e4b5f151..c0f081f9ba 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs @@ -365,7 +365,6 @@ namespace Content.Server.Atmos.EntitySystems ExcitedGroupSelfBreakdown(ent, excitedGroup); else if (excitedGroup.DismantleCooldown > Atmospherics.ExcitedGroupsDismantleCycles) DeactivateGroupTiles(gridAtmosphere, excitedGroup); - // TODO ATMOS. What is the point of this? why is this only de-exciting the group? Shouldn't it also dismantle it? if (number++ < LagCheckIterations) continue; diff --git a/Content.Server/Atmos/ExcitedGroup.cs b/Content.Server/Atmos/ExcitedGroup.cs index 73dc6c2329..1554318f65 100644 --- a/Content.Server/Atmos/ExcitedGroup.cs +++ b/Content.Server/Atmos/ExcitedGroup.cs @@ -1,13 +1,44 @@ -namespace Content.Server.Atmos +namespace Content.Server.Atmos; + +/// +/// Internal Atmospherics class that stores data about a group of s +/// that are excited and need to be processed. +/// +/// Excited Groups is an optimization routine executed during LINDA +/// that bunches small groups of active s +/// together and performs equalization processing on the entire group when the group dissolves. +/// Dissolution happens when LINDA operations between the tiles decrease to very low mole deltas. +/// +public sealed class ExcitedGroup { - public sealed class ExcitedGroup - { - [ViewVariables] public bool Disposed = false; + /// + /// Whether this Active Group has been disposed of. + /// Used to make sure we don't perform operations on active groups that + /// we've already dissolved. + /// + [ViewVariables] + public bool Disposed = false; - [ViewVariables] public readonly List Tiles = new(100); + /// + /// List of tiles that belong to this excited group. + /// + [ViewVariables] + public readonly List Tiles = new(100); - [ViewVariables] public int DismantleCooldown { get; set; } = 0; + /// + /// Cycles before this excited group will be queued for dismantling. + /// Dismantling is the process of equalizing the atmosphere + /// across all tiles in the excited group and removing the group. + /// + [ViewVariables] + public int DismantleCooldown = 0; - [ViewVariables] public int BreakdownCooldown { get; set; } = 0; - } + /// + /// Cycles before this excited group will be allowed to break down and deactivate. + /// Breakdown occurs when the excited group is small enough and inactive enough + /// to be safely removed without equalization. Used where the mole deltas across + /// the group are very low but not high enough for an equalization to occur. + /// + [ViewVariables] + public int BreakdownCooldown = 0; } From bccae54b03dc6f2b0db71405f665ac9d3b58644b Mon Sep 17 00:00:00 2001 From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Mon, 3 Nov 2025 13:02:48 +0100 Subject: [PATCH 095/121] Add DNA injector (#41271) * add item * Update Content.Shared/Changeling/Systems/ChangelingClonerSystem.cs Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com> --------- Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com> --- .../Components/ChangelingClonerComponent.cs | 100 ++++++ .../Systems/ChangelingClonerSystem.cs | 308 ++++++++++++++++++ .../Systems/SharedChangelingIdentitySystem.cs | 37 ++- .../changeling-cloner-component.ftl | 11 + .../Syndicate_Gadgets/dna_injector.yml | 47 +++ 5 files changed, 494 insertions(+), 9 deletions(-) create mode 100644 Content.Shared/Changeling/Components/ChangelingClonerComponent.cs create mode 100644 Content.Shared/Changeling/Systems/ChangelingClonerSystem.cs create mode 100644 Resources/Locale/en-US/changeling/changeling-cloner-component.ftl create mode 100644 Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/dna_injector.yml diff --git a/Content.Shared/Changeling/Components/ChangelingClonerComponent.cs b/Content.Shared/Changeling/Components/ChangelingClonerComponent.cs new file mode 100644 index 0000000000..20cb690835 --- /dev/null +++ b/Content.Shared/Changeling/Components/ChangelingClonerComponent.cs @@ -0,0 +1,100 @@ +using Content.Shared.Charges.Components; +using Content.Shared.Cloning; +using Robust.Shared.Audio; +using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization; + +namespace Content.Shared.Changeling.Components; + +/// +/// Changeling transformation in item form! +/// An entity with this component works like an implanter: +/// First you use it on a humanoid to make a copy of their identity, along with all species relevant components, +/// then use it on someone else to tranform them into a clone of them. +/// Can be used in combination with +/// +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState] +public sealed partial class ChangelingClonerComponent : Component +{ + /// + /// A clone of the player you have copied the identity from. + /// This is a full humanoid backup, stored on a paused map. + /// + /// + /// Since this entity is stored on a separate map it will be outside PVS range. + /// + [DataField, AutoNetworkedField] + public EntityUid? ClonedBackup; + + /// + /// Current state of the item. + /// + [DataField, AutoNetworkedField] + public ChangelingClonerState State = ChangelingClonerState.Empty; + + /// + /// The cloning settings to use. + /// + [DataField, AutoNetworkedField] + public ProtoId Settings = "ChangelingCloningSettings"; + + /// + /// Doafter time for drawing and injecting. + /// + [DataField, AutoNetworkedField] + public TimeSpan DoAfter = TimeSpan.FromSeconds(5); + + /// + /// Can this item be used more than once? + /// + [DataField, AutoNetworkedField] + public bool Reusable = true; + + /// + /// Whether or not to add a reset verb to purge the stored identity, + /// allowing you to draw a new one. + /// + [DataField, AutoNetworkedField] + public bool CanReset = true; + + /// + /// Raise events when renaming the target? + /// This will change their ID card, crew manifest entry, and so on. + /// For admeme purposes. + /// + [DataField, AutoNetworkedField] + public bool RaiseNameChangeEvents; + + /// + /// The sound to play when taking someone's identity with the item. + /// + [DataField, AutoNetworkedField] + public SoundSpecifier? DrawSound; + + /// + /// The sound to play when someone is transformed. + /// + [DataField, AutoNetworkedField] + public SoundSpecifier? InjectSound; +} + +/// +/// Current state of the item. +/// +[Serializable, NetSerializable] +public enum ChangelingClonerState : byte +{ + /// + /// No sample taken yet. + /// + Empty, + /// + /// Filled with a DNA sample. + /// + Filled, + /// + /// Has been used (single use only). + /// + Spent, +} diff --git a/Content.Shared/Changeling/Systems/ChangelingClonerSystem.cs b/Content.Shared/Changeling/Systems/ChangelingClonerSystem.cs new file mode 100644 index 0000000000..d65d39ca40 --- /dev/null +++ b/Content.Shared/Changeling/Systems/ChangelingClonerSystem.cs @@ -0,0 +1,308 @@ +using Content.Shared.Administration.Logs; +using Content.Shared.Changeling.Components; +using Content.Shared.Cloning; +using Content.Shared.Database; +using Content.Shared.DoAfter; +using Content.Shared.Examine; +using Content.Shared.Forensics.Systems; +using Content.Shared.Humanoid; +using Content.Shared.IdentityManagement; +using Content.Shared.Interaction; +using Content.Shared.Popups; +using Content.Shared.Verbs; +using Robust.Shared.Audio.Systems; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization; + +namespace Content.Shared.Changeling.Systems; + +public sealed class ChangelingClonerSystem : EntitySystem +{ + [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; + [Dependency] private readonly SharedHumanoidAppearanceSystem _humanoidAppearance = default!; + [Dependency] private readonly MetaDataSystem _metaData = default!; + [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; + [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private readonly SharedCloningSystem _cloning = default!; + [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private readonly SharedChangelingIdentitySystem _changelingIdentity = default!; + [Dependency] private readonly SharedForensicsSystem _forensics = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnExamine); + SubscribeLocalEvent>(OnGetVerbs); + SubscribeLocalEvent(OnAfterInteract); + SubscribeLocalEvent(OnDraw); + SubscribeLocalEvent(OnInject); + SubscribeLocalEvent(OnShutDown); + } + + private void OnShutDown(Entity ent, ref ComponentShutdown args) + { + // Delete the stored clone. + PredictedQueueDel(ent.Comp.ClonedBackup); + } + + private void OnExamine(Entity ent, ref ExaminedEvent args) + { + if (!args.IsInDetailsRange) + return; + + var msg = ent.Comp.State switch + { + ChangelingClonerState.Empty => "changeling-cloner-component-empty", + ChangelingClonerState.Filled => "changeling-cloner-component-filled", + ChangelingClonerState.Spent => "changeling-cloner-component-spent", + _ => "error" + }; + + args.PushMarkup(Loc.GetString(msg)); + + } + + private void OnGetVerbs(Entity ent, ref GetVerbsEvent args) + { + if (!args.CanInteract || !args.CanAccess || args.Hands == null) + return; + + if (!ent.Comp.CanReset || ent.Comp.State == ChangelingClonerState.Spent) + return; + + var user = args.User; + args.Verbs.Add(new Verb + { + Text = Loc.GetString("changeling-cloner-component-reset-verb"), + Disabled = ent.Comp.ClonedBackup == null, + Act = () => Reset(ent.AsNullable(), user), + DoContactInteraction = true, + }); + } + + private void OnAfterInteract(Entity ent, ref AfterInteractEvent args) + { + if (args.Handled || !args.CanReach || args.Target == null) + return; + + switch (ent.Comp.State) + { + case ChangelingClonerState.Empty: + args.Handled |= TryDraw(ent.AsNullable(), args.Target.Value, args.User); + break; + case ChangelingClonerState.Filled: + args.Handled |= TryInject(ent.AsNullable(), args.Target.Value, args.User); + break; + case ChangelingClonerState.Spent: + default: + break; + } + + } + + private void OnDraw(Entity ent, ref ClonerDrawDoAfterEvent args) + { + if (args.Handled || args.Cancelled || args.Target == null) + return; + + Draw(ent.AsNullable(), args.Target.Value, args.User); + args.Handled = true; + } + + private void OnInject(Entity ent, ref ClonerInjectDoAfterEvent args) + { + if (args.Handled || args.Cancelled || args.Target == null) + return; + + Inject(ent.AsNullable(), args.Target.Value, args.User); + args.Handled = true; + } + + /// + /// Start a DoAfter to draw a DNA sample from the target. + /// + public bool TryDraw(Entity ent, EntityUid target, EntityUid user) + { + if (!Resolve(ent, ref ent.Comp)) + return false; + + if (ent.Comp.State != ChangelingClonerState.Empty) + return false; + + if (!HasComp(target)) + return false; // cloning only works for humanoids at the moment + + var args = new DoAfterArgs(EntityManager, user, ent.Comp.DoAfter, new ClonerDrawDoAfterEvent(), ent, target: target, used: ent) + { + BreakOnDamage = true, + BreakOnMove = true, + NeedHand = true, + }; + + if (!_doAfter.TryStartDoAfter(args)) + return false; + + var userIdentity = Identity.Entity(user, EntityManager); + var targetIdentity = Identity.Entity(target, EntityManager); + var userMsg = Loc.GetString("changeling-cloner-component-draw-user", ("user", userIdentity), ("target", targetIdentity)); + var targetMsg = Loc.GetString("changeling-cloner-component-draw-target", ("user", userIdentity), ("target", targetIdentity)); + _popup.PopupClient(userMsg, target, user); + + if (user != target) // don't show the warning if using the item on yourself + _popup.PopupEntity(targetMsg, user, target, PopupType.LargeCaution); + + return true; + } + + /// + /// Start a DoAfter to inject a DNA sample into someone, turning them into a clone of the original. + /// + public bool TryInject(Entity ent, EntityUid target, EntityUid user) + { + if (!Resolve(ent, ref ent.Comp)) + return false; + + if (ent.Comp.State != ChangelingClonerState.Filled) + return false; + + if (!HasComp(target)) + return false; // cloning only works for humanoids at the moment + + var args = new DoAfterArgs(EntityManager, user, ent.Comp.DoAfter, new ClonerInjectDoAfterEvent(), ent, target: target, used: ent) + { + BreakOnDamage = true, + BreakOnMove = true, + NeedHand = true, + }; + + if (!_doAfter.TryStartDoAfter(args)) + return false; + + var userIdentity = Identity.Entity(user, EntityManager); + var targetIdentity = Identity.Entity(target, EntityManager); + var userMsg = Loc.GetString("changeling-cloner-component-inject-user", ("user", userIdentity), ("target", targetIdentity)); + var targetMsg = Loc.GetString("changeling-cloner-component-inject-target", ("user", userIdentity), ("target", targetIdentity)); + _popup.PopupClient(userMsg, target, user); + + if (user != target) // don't show the warning if using the item on yourself + _popup.PopupEntity(targetMsg, user, target, PopupType.LargeCaution); + + return true; + } + + /// + /// Draw a DNA sample from the target. + /// This will create a clone stored on a paused map for data storage. + /// + public void Draw(Entity ent, EntityUid target, EntityUid user) + { + if (!Resolve(ent, ref ent.Comp)) + return; + + if (ent.Comp.State != ChangelingClonerState.Empty) + return; + + if (!HasComp(target)) + return; // cloning only works for humanoids at the moment + + if (!_prototype.Resolve(ent.Comp.Settings, out var settings)) + return; + + _adminLogger.Add(LogType.Identity, + $"{user} is using {ent.Owner} to draw DNA from {target}."); + + // Make a copy of the target on a paused map, so that we can apply their components later. + ent.Comp.ClonedBackup = _changelingIdentity.CloneToPausedMap(settings, target); + ent.Comp.State = ChangelingClonerState.Filled; + _appearance.SetData(ent.Owner, ChangelingClonerVisuals.State, ChangelingClonerState.Filled); + Dirty(ent); + + _audio.PlayPredicted(ent.Comp.DrawSound, target, user); + _forensics.TransferDna(ent, target); + } + + /// + /// Inject a DNA sample into someone, turning them into a clone of the original. + /// + public void Inject(Entity ent, EntityUid target, EntityUid user) + { + if (!Resolve(ent, ref ent.Comp)) + return; + + if (ent.Comp.State != ChangelingClonerState.Filled) + return; + + if (!HasComp(target)) + return; // cloning only works for humanoids at the moment + + if (!_prototype.Resolve(ent.Comp.Settings, out var settings)) + return; + + _audio.PlayPredicted(ent.Comp.InjectSound, target, user); + _forensics.TransferDna(ent, target); // transfer DNA before overwriting it + + if (!ent.Comp.Reusable) + { + ent.Comp.State = ChangelingClonerState.Spent; + _appearance.SetData(ent.Owner, ChangelingClonerVisuals.State, ChangelingClonerState.Spent); + Dirty(ent); + } + + if (!Exists(ent.Comp.ClonedBackup)) + return; // the entity is likely out of PVS range on the client + + _adminLogger.Add(LogType.Identity, + $"{user} is using {ent.Owner} to inject DNA into {target} changing their identity to {ent.Comp.ClonedBackup.Value}."); + + // Do the actual transformation. + _humanoidAppearance.CloneAppearance(ent.Comp.ClonedBackup.Value, target); + _cloning.CloneComponents(ent.Comp.ClonedBackup.Value, target, settings); + _metaData.SetEntityName(target, Name(ent.Comp.ClonedBackup.Value), raiseEvents: ent.Comp.RaiseNameChangeEvents); + + } + + /// + /// Purge the stored DNA and allow to draw again. + /// + public void Reset(Entity ent, EntityUid? user) + { + if (!Resolve(ent, ref ent.Comp)) + return; + + // Delete the stored clone. + PredictedQueueDel(ent.Comp.ClonedBackup); + ent.Comp.ClonedBackup = null; + ent.Comp.State = ChangelingClonerState.Empty; + _appearance.SetData(ent.Owner, ChangelingClonerVisuals.State, ChangelingClonerState.Empty); + Dirty(ent); + + if (user == null) + return; + + _popup.PopupClient(Loc.GetString("changeling-cloner-component-reset-popup"), user.Value, user.Value); + } +} + +/// +/// Doafter event for drawing a DNA sample. +/// +[Serializable, NetSerializable] +public sealed partial class ClonerDrawDoAfterEvent : SimpleDoAfterEvent; + +/// +/// DoAfterEvent for injecting a DNA sample, turning a player into someone else. +/// +[Serializable, NetSerializable] +public sealed partial class ClonerInjectDoAfterEvent : SimpleDoAfterEvent; + +/// +/// Key for the generic visualizer. +/// +[Serializable, NetSerializable] +public enum ChangelingClonerVisuals : byte +{ + State, +} diff --git a/Content.Shared/Changeling/Systems/SharedChangelingIdentitySystem.cs b/Content.Shared/Changeling/Systems/SharedChangelingIdentitySystem.cs index e7e46d79a1..830aed6ab6 100644 --- a/Content.Shared/Changeling/Systems/SharedChangelingIdentitySystem.cs +++ b/Content.Shared/Changeling/Systems/SharedChangelingIdentitySystem.cs @@ -83,20 +83,19 @@ public abstract class SharedChangelingIdentitySystem : EntitySystem } /// - /// Clone a target humanoid into nullspace and add it to the Changelings list of identities. - /// It creates a perfect copy of the target and can be used to pull components down for future use + /// Clone a target humanoid to a paused map. + /// It creates a perfect copy of the target and can be used to pull components down for future use. /// - /// the Changeling - /// the targets uid - public EntityUid? CloneToPausedMap(Entity ent, EntityUid target) + /// The settings to use for cloning. + /// The target to clone. + public EntityUid? CloneToPausedMap(CloningSettingsPrototype settings, EntityUid target) { // Don't create client side duplicate clones or a clientside map. if (_net.IsClient) return null; if (!TryComp(target, out var humanoid) - || !_prototype.Resolve(humanoid.Species, out var speciesPrototype) - || !_prototype.Resolve(ent.Comp.IdentityCloningSettings, out var settings)) + || !_prototype.Resolve(humanoid.Species, out var speciesPrototype)) return null; EnsurePausedMap(); @@ -117,10 +116,30 @@ public abstract class SharedChangelingIdentitySystem : EntitySystem var targetName = _nameMod.GetBaseName(target); _metaSystem.SetEntityName(clone, targetName); - ent.Comp.ConsumedIdentities.Add(clone); + + return clone; + } + + /// + /// Clone a target humanoid to a paused map and add it to the Changelings list of identities. + /// It creates a perfect copy of the target and can be used to pull components down for future use. + /// + /// The Changeling. + /// The target to clone. + public EntityUid? CloneToPausedMap(Entity ent, EntityUid target) + { + if (!_prototype.Resolve(ent.Comp.IdentityCloningSettings, out var settings)) + return null; + + var clone = CloneToPausedMap(settings, target); + + if (clone == null) + return null; + + ent.Comp.ConsumedIdentities.Add(clone.Value); Dirty(ent); - HandlePvsOverride(ent, clone); + HandlePvsOverride(ent, clone.Value); return clone; } diff --git a/Resources/Locale/en-US/changeling/changeling-cloner-component.ftl b/Resources/Locale/en-US/changeling/changeling-cloner-component.ftl new file mode 100644 index 0000000000..ffcab1e43c --- /dev/null +++ b/Resources/Locale/en-US/changeling/changeling-cloner-component.ftl @@ -0,0 +1,11 @@ +changeling-cloner-component-empty = It is empty. +changeling-cloner-component-filled = It has a DNA sample in it. +changeling-cloner-component-spent = It has been used. + +changeling-cloner-component-reset-verb = Reset DNA +changeling-cloner-component-reset-popup = You purge the injector's DNA storage. + +changeling-cloner-component-draw-user = You start drawing DNA from {THE($target)}. +changeling-cloner-component-draw-target = {CAPITALIZE(THE($user))} starts drawing DNA from you. +changeling-cloner-component-inject-user = You start injecting DNA into {THE($target)}. +changeling-cloner-component-inject-target = {CAPITALIZE(THE($user))} starts injecting DNA into you. diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/dna_injector.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/dna_injector.yml new file mode 100644 index 0000000000..16454c25c4 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/dna_injector.yml @@ -0,0 +1,47 @@ +- type: entity + parent: BaseItem + id: DnaInjectorUnlimited + suffix: Admeme, unlimited + # Should not be a traitor item for several reasons: + # - Changeling code is still in development, and copying organs etc does not work yet. + # - Giving this to traitors makes them overlap with changelings or paradox clones too much. + # - It completely makes the voice mask redundant. + # - Unlike when disguising yourself as someone else, there is no way to get caught. + name: DNA injector + description: Can be used to take a DNA sample from someone and inject it into another person, turning them into a clone of the original. + components: + - type: Sprite + sprite: Objects/Specific/Medical/implanter.rsi + state: implanter0 + layers: + - state: implanter0 + map: [ "injector" ] + visible: true + - state: implanter1 + map: [ "fillState" ] + visible: false + - type: Item + sprite: Objects/Specific/Medical/implanter.rsi + heldPrefix: implanter + size: Small + - type: Appearance + - type: GenericVisualizer + visuals: + enum.ChangelingClonerVisuals.State: + injector: + Empty: {state: implanter0} + Filled: {state: implanter0} + Spent: {state: broken} + fillState: + Empty: {visible: false} + Filled: {visible: true} + Spent: {visible: false} + - type: ChangelingCloner + +- type: entity + parent: DnaInjectorUnlimited + id: DnaInjector + suffix: Admeme, single use + components: + - type: ChangelingCloner + reusable: false From 57481181889473c5520b7c9ea0597008767f786d Mon Sep 17 00:00:00 2001 From: ScarKy0 <106310278+ScarKy0@users.noreply.github.com> Date: Mon, 3 Nov 2025 14:05:56 +0100 Subject: [PATCH 096/121] Clone toolshed commands (#41261) * init * fuck this file its such a mess why wont anyone sort this holy shit * review --- Content.Server/Cloning/CloningSystem.cs | 8 ++ .../Toolshed/Commands/Misc/CloneCommand.cs | 82 +++++++++++++++++++ Content.Shared/Cloning/SharedCloningSystem.cs | 12 +++ .../en-US/commands/toolshed-commands.ftl | 10 +++ 4 files changed, 112 insertions(+) create mode 100644 Content.Server/Toolshed/Commands/Misc/CloneCommand.cs diff --git a/Content.Server/Cloning/CloningSystem.cs b/Content.Server/Cloning/CloningSystem.cs index 6e0f38ad51..40f8a36dfa 100644 --- a/Content.Server/Cloning/CloningSystem.cs +++ b/Content.Server/Cloning/CloningSystem.cs @@ -84,6 +84,14 @@ public sealed partial class CloningSystem : SharedCloningSystem return true; } + public override void CloneComponents(EntityUid original, EntityUid clone, ProtoId settings) + { + if (!_prototype.Resolve(settings, out var proto)) + return; + + CloneComponents(original, clone, proto); + } + public override void CloneComponents(EntityUid original, EntityUid clone, CloningSettingsPrototype settings) { var componentsToCopy = settings.Components; diff --git a/Content.Server/Toolshed/Commands/Misc/CloneCommand.cs b/Content.Server/Toolshed/Commands/Misc/CloneCommand.cs new file mode 100644 index 0000000000..d7434c48c9 --- /dev/null +++ b/Content.Server/Toolshed/Commands/Misc/CloneCommand.cs @@ -0,0 +1,82 @@ +using Content.Server.Administration; +using Content.Server.Humanoid; +using Content.Shared.Administration; +using Content.Shared.Cloning; +using Content.Shared.Inventory; +using Robust.Shared.Prototypes; +using Robust.Shared.Toolshed; + +namespace Content.Server.Cloning.Commands; + +[ToolshedCommand, AdminCommand(AdminFlags.Fun)] +public sealed class CloneCommand : ToolshedCommand +{ + private HumanoidAppearanceSystem? _appearance; + private CloningSystem? _cloning; + private MetaDataSystem? _metadata; + + [CommandImplementation("humanoidappearance")] + public IEnumerable HumanoidAppearance([PipedArgument] IEnumerable targets, EntityUid source, bool rename) + { + _appearance ??= GetSys(); + _metadata ??= GetSys(); + + foreach (var ent in targets) + { + _appearance.CloneAppearance(source, ent); + + if (rename) + _metadata.SetEntityName(ent, MetaData(source).EntityName, raiseEvents: true); + + yield return ent; + } + } + + [CommandImplementation("comps")] + public IEnumerable Comps([PipedArgument] IEnumerable targets, EntityUid source, ProtoId settings) + { + _cloning ??= GetSys(); + + foreach (var ent in targets) + { + _cloning.CloneComponents(source, ent, settings); + yield return ent; + } + } + + [CommandImplementation("equipment")] + public IEnumerable Equipment([PipedArgument] IEnumerable targets, EntityUid source, SlotFlags flags) + { + _cloning ??= GetSys(); + + foreach (var ent in targets) + { + _cloning.CopyEquipment(source, ent, flags); + yield return ent; + } + } + + [CommandImplementation("implants")] + public IEnumerable Implants([PipedArgument] IEnumerable targets, EntityUid source, bool copyStorage) + { + _cloning ??= GetSys(); + + foreach (var ent in targets) + { + _cloning.CopyImplants(source, ent, copyStorage); + yield return ent; + } + } + + [CommandImplementation("storage")] + public IEnumerable InternalStorage([PipedArgument] IEnumerable targets, EntityUid source) + { + _cloning ??= GetSys(); + + foreach (var ent in targets) + { + _cloning.CopyStorage(source, ent); + yield return ent; + } + } +} diff --git a/Content.Shared/Cloning/SharedCloningSystem.cs b/Content.Shared/Cloning/SharedCloningSystem.cs index d8ab8a2aa1..e44264fb41 100644 --- a/Content.Shared/Cloning/SharedCloningSystem.cs +++ b/Content.Shared/Cloning/SharedCloningSystem.cs @@ -1,3 +1,5 @@ +using Robust.Shared.Prototypes; + namespace Content.Shared.Cloning; public abstract partial class SharedCloningSystem : EntitySystem @@ -11,4 +13,14 @@ public abstract partial class SharedCloningSystem : EntitySystem public virtual void CloneComponents(EntityUid original, EntityUid clone, CloningSettingsPrototype settings) { } + + /// + /// Copy components from one entity to another based on a CloningSettingsPrototype. + /// + /// The orignal Entity to clone components from. + /// The target Entity to clone components to. + /// The clone settings prototype id containing the list of components to clone. + public virtual void CloneComponents(EntityUid original, EntityUid clone, ProtoId settings) + { + } } diff --git a/Resources/Locale/en-US/commands/toolshed-commands.ftl b/Resources/Locale/en-US/commands/toolshed-commands.ftl index 218235338c..85eae1ef3d 100644 --- a/Resources/Locale/en-US/commands/toolshed-commands.ftl +++ b/Resources/Locale/en-US/commands/toolshed-commands.ftl @@ -16,6 +16,16 @@ command-description-bank-set = Sets the money for the given bank account. command-description-bank-amount = Returns the money for the given bank account. +command-description-clone-humanoidappearance = + Clones the humanoid appearance of provided entity to all input entities. +command-description-clone-comps = + Clones all components from the provided entity to all input entities. Only works for supported components. +command-description-clone-equipment = + Clones the equipment from the provided entity to all input entities. Uses base prototypes, meaning changes to equipment won't persist to the cloned versions. +command-description-clone-implants = + Clones the implants from the provided entity to all input entities. Uses base prototypes, meaning changes to implants won't persist to the cloned versions. +command-description-clone-storage = + Clones the storage from the provided entity to all input entities. Uses base prototypes, meaning changes to contents won't persist to the cloned versions. command-description-jobs-jobs = Returns all jobs on a station. command-description-jobs-job = From 1fceb747cb0f1f406eeb6b50a7bd47094817d9a4 Mon Sep 17 00:00:00 2001 From: LukaSlade Date: Mon, 3 Nov 2025 14:31:57 -0800 Subject: [PATCH 097/121] Voice Sensor Item (#41098) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Voice Signaler can be Linked * Fixes and Balancing * a space has officially been added * thinmfg * things * finalized everything I think? * fixed?? * actually commit please (imagine this fixes everything im gonna cry) * new fix * Update Resources/Prototypes/Entities/Objects/Devices/Electronics/misc_linking_utilities.yml added as per review Co-authored-by: āda * connection range from 25 to 15 * Renamed state from 'voice' to 'icon' * Change state from 'voice' to 'icon' in YAML * removed comma from voicesensor sprite yml * Modify defaultLinks for Trigger source port Updated defaultLinks for Trigger source port. * Changed PNG name from voice to icon * Removed G menu recipe and added autolathe recipe * Fixed test fail * removed empty line * removed another line * removed extra lines in meta.json * test commit to rerun tests --------- Co-authored-by: āda --- .../Prototypes/DeviceLinking/source_ports.yml | 2 +- .../Electronics/misc_linking_utilities.yml | 28 ++++++++++++++++++ .../Recipes/Lathes/Packs/engineering.yml | 1 + .../Prototypes/Recipes/Lathes/devices.yml | 13 ++++++-- .../Prototypes/SoundCollections/machines.yml | 5 ++++ .../Objects/Devices/voicesensor.rsi/icon.png | Bin 0 -> 520 bytes .../Objects/Devices/voicesensor.rsi/meta.json | 15 ++++++++++ 7 files changed, 61 insertions(+), 3 deletions(-) create mode 100644 Resources/Prototypes/Entities/Objects/Devices/Electronics/misc_linking_utilities.yml create mode 100644 Resources/Textures/Objects/Devices/voicesensor.rsi/icon.png create mode 100644 Resources/Textures/Objects/Devices/voicesensor.rsi/meta.json diff --git a/Resources/Prototypes/DeviceLinking/source_ports.yml b/Resources/Prototypes/DeviceLinking/source_ports.yml index 5eb059b191..1c13d692df 100644 --- a/Resources/Prototypes/DeviceLinking/source_ports.yml +++ b/Resources/Prototypes/DeviceLinking/source_ports.yml @@ -162,7 +162,7 @@ id: Trigger name: signal-port-name-trigger-sender description: signal-port-description-trigger-sender - defaultLinks: [ AutoClose, On, Open, Forward, Trigger, Timer ] + defaultLinks: [ Toggle, Trigger, Timer ] - type: sourcePort id: ItemDetected diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/misc_linking_utilities.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/misc_linking_utilities.yml new file mode 100644 index 0000000000..a4b5e01ffe --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/misc_linking_utilities.yml @@ -0,0 +1,28 @@ +- type: entity + parent: BaseItem + id: voicesensor + name: voice sensor + description: This microphone, invented by Micheal Phone during his time working at Michealsoft, sends signals when a prerecorded code phrase is uttered! + components: + - type: Sprite + sprite: Objects/Devices/voicesensor.rsi + state: icon + - type: StaticPrice + price: 40 + - type: DeviceLinkSource + ports: + - Trigger + - type: SignalOnTrigger + port: Trigger + - type: TriggerOnVoice + - type: UseDelayOnTrigger + - type: UseDelayTriggerCondition + - type: UseDelay + - type: EmitSoundOnTrigger + sound: + collection: TriggerActivate + - type: DeviceNetwork + deviceNetId: Wireless + receiveFrequencyId: BasicDevice + - type: WirelessNetworkConnection + range: 15 diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/engineering.yml b/Resources/Prototypes/Recipes/Lathes/Packs/engineering.yml index 1f504e3ae4..6f5b09521e 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/engineering.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/engineering.yml @@ -3,6 +3,7 @@ - type: latheRecipePack id: ToolsStatic recipes: + - VoiceSensor - Wirecutter - Screwdriver - Welder diff --git a/Resources/Prototypes/Recipes/Lathes/devices.yml b/Resources/Prototypes/Recipes/Lathes/devices.yml index b703aa1240..64c1dfbaae 100644 --- a/Resources/Prototypes/Recipes/Lathes/devices.yml +++ b/Resources/Prototypes/Recipes/Lathes/devices.yml @@ -62,6 +62,15 @@ Plastic: 200 Glass: 100 +- type: latheRecipe + parent: BasePartRecipe + id: VoiceSensor + result: voicesensor + materials: + Steel: 100 + Plastic: 200 + Glass: 100 + - type: latheRecipe parent: BasePartRecipe id: SignallerAdvanced @@ -220,7 +229,7 @@ - type: latheRecipe id: CableDetStack1 result: CableDetStack1 - categories: + categories: - Weapons completetime: 2 materials: @@ -231,7 +240,7 @@ - type: latheRecipe id: EmptyDetonator result: EmptyDetonator - categories: + categories: - Weapons completetime: 3 materials: diff --git a/Resources/Prototypes/SoundCollections/machines.yml b/Resources/Prototypes/SoundCollections/machines.yml index 45768bfa88..4207e37005 100644 --- a/Resources/Prototypes/SoundCollections/machines.yml +++ b/Resources/Prototypes/SoundCollections/machines.yml @@ -37,3 +37,8 @@ id: MachineInsert files: - /Audio/Weapons/Guns/MagIn/revolver_magin.ogg + +- type: soundCollection + id: TriggerActivate + files: + - /Audio/Weapons/click.ogg diff --git a/Resources/Textures/Objects/Devices/voicesensor.rsi/icon.png b/Resources/Textures/Objects/Devices/voicesensor.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5a0f5e80c20d018b0440f22c58115963381ed8ba GIT binary patch literal 520 zcmV+j0{8uiP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0i8)iK~z{r?UFG| z!%z^%{}qZZq1amb3K`l4Y9}2mj}8S_*FuMmE`A9=hnx5fia0qHM95;z5EqG*Zf|I) zO=z=p5aM7{?8An4w&Ic>gpkX=08bLAPE!-1qdOK$z)*L_Of}gScDJ)rBVsKUQa$23;E`9&O_IA zq3b%P(2wrhujSdYlxmYE z@OHD0t6dGA@2`Ch@_G4KEF^*ZqbC5s`1WfO>)sTU#)QQRJ|0eRdHjlNV{heOwOU>I zejksOSD=)Hg@7E3!}C0)+Db_ghG8g442MHfT_q?JpyVbbBzyvx1hZAcE6B0{0000< KMNUMnLSTY8kJS1A literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Devices/voicesensor.rsi/meta.json b/Resources/Textures/Objects/Devices/voicesensor.rsi/meta.json new file mode 100644 index 0000000000..8471ef613d --- /dev/null +++ b/Resources/Textures/Objects/Devices/voicesensor.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c71e03214013191760284361aaff7af90505aaab", + + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} From 9241a13413527ec6d5cee34bc55ccf9c40ab3a8a Mon Sep 17 00:00:00 2001 From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> Date: Tue, 4 Nov 2025 03:27:10 -0800 Subject: [PATCH 098/121] Document Atmospherics Hotspot (#41283) * hotspot partial docs * Finalize docs --- .../EntitySystems/AtmosphereSystem.Hotspot.cs | 414 +++++++++++------- Content.Server/Atmos/Hotspot.cs | 69 ++- 2 files changed, 298 insertions(+), 185 deletions(-) diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs index 613fcd14a6..c2702679d9 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs @@ -10,198 +10,280 @@ using Robust.Shared.Map.Components; using Robust.Shared.Prototypes; using Robust.Shared.Random; -namespace Content.Server.Atmos.EntitySystems +namespace Content.Server.Atmos.EntitySystems; + +public sealed partial class AtmosphereSystem { - public sealed partial class AtmosphereSystem + /* + Handles Hotspots, which are gas-based tile fires that slowly grow and spread + to adjacent tiles if conditions are met. + + You can think of a hotspot as a small flame on a tile that + grows by consuming a fuel and oxidizer from the tile's air, + with a certain volume and temperature. + + This volume grows bigger and bigger as the fire continues, + until it effectively engulfs the entire tile, at which point + it starts spreading to adjacent tiles by radiating heat. + */ + + /// + /// Collection of hotspot sounds to play. + /// + private static readonly ProtoId DefaultHotspotSounds = "AtmosHotspot"; + + [Dependency] private readonly DecalSystem _decalSystem = default!; + [Dependency] private readonly IRobustRandom _random = default!; + + /// + /// Number of cycles the hotspot system must process before it can play another sound + /// on a hotspot. + /// + private const int HotspotSoundCooldownCycles = 200; + + /// + /// Cooldown counter for hotspot sounds. + /// + private int _hotspotSoundCooldown = 0; + + [ViewVariables(VVAccess.ReadWrite)] + public SoundSpecifier? HotspotSound = new SoundCollectionSpecifier(DefaultHotspotSounds); + + /// + /// Processes a hotspot on a . + /// + /// The grid entity that belongs to the tile to process. + /// The to process. + private void ProcessHotspot( + Entity ent, + TileAtmosphere tile) { - private static readonly ProtoId DefaultHotspotSounds = "AtmosHotspot"; + var gridAtmosphere = ent.Comp1; - [Dependency] private readonly DecalSystem _decalSystem = default!; - [Dependency] private readonly IRobustRandom _random = default!; - - private const int HotspotSoundCooldownCycles = 200; - - private int _hotspotSoundCooldown = 0; - - [ViewVariables(VVAccess.ReadWrite)] - public SoundSpecifier? HotspotSound { get; private set; } = new SoundCollectionSpecifier(DefaultHotspotSounds); - - private void ProcessHotspot( - Entity ent, - TileAtmosphere tile) + // Hotspots that have fizzled out are assigned a new Hotspot struct + // with Valid set to false, so we can just check that here in + // one central place instead of manually removing it everywhere. + if (!tile.Hotspot.Valid) { - var gridAtmosphere = ent.Comp1; - if (!tile.Hotspot.Valid) + gridAtmosphere.HotspotTiles.Remove(tile); + return; + } + + AddActiveTile(gridAtmosphere, tile); + + // Prevent the hotspot from processing on the same cycle it was created (???) + // TODO ATMOS: Is this even necessary anymore? The queue is kept per processing stage + // and is not updated until tne next cycle, so the condition of a hotspot being created + // and processed in the same cycle is impossible. + if (!tile.Hotspot.SkippedFirstProcess) + { + tile.Hotspot.SkippedFirstProcess = true; + return; + } + + if (tile.ExcitedGroup != null) + ExcitedGroupResetCooldowns(tile.ExcitedGroup); + + if (tile.Hotspot.Temperature < Atmospherics.FireMinimumTemperatureToExist || + tile.Hotspot.Volume <= 1f || + tile.Air == null || + tile.Air.GetMoles(Gas.Oxygen) < 0.5f || + tile.Air.GetMoles(Gas.Plasma) < 0.5f && tile.Air.GetMoles(Gas.Tritium) < 0.5f) + { + tile.Hotspot = new Hotspot(); + InvalidateVisuals(ent, tile); + return; + } + + PerformHotspotExposure(tile); + + // This tile has now turned into a full-blown tile-fire. + // Start applying fire effects and spreading to adjacent tiles. + if (tile.Hotspot.Bypassing) + { + tile.Hotspot.State = 3; + + var gridUid = ent.Owner; + var tilePos = tile.GridIndices; + + // Get the existing decals on the tile + var tileDecals = _decalSystem.GetDecalsInRange(gridUid, tilePos); + + // Count the burnt decals on the tile + var tileBurntDecals = 0; + + foreach (var set in tileDecals) { - gridAtmosphere.HotspotTiles.Remove(tile); - return; + if (Array.IndexOf(_burntDecals, set.Decal.Id) == -1) + continue; + + tileBurntDecals++; + + if (tileBurntDecals > 4) + break; } - AddActiveTile(gridAtmosphere, tile); - - if (!tile.Hotspot.SkippedFirstProcess) + // Add a random burned decal to the tile only if there are less than 4 of them + if (tileBurntDecals < 4) { - tile.Hotspot.SkippedFirstProcess = true; - return; + _decalSystem.TryAddDecal(_burntDecals[_random.Next(_burntDecals.Length)], + new EntityCoordinates(gridUid, tilePos), + out _, + cleanable: true); } - if(tile.ExcitedGroup != null) - ExcitedGroupResetCooldowns(tile.ExcitedGroup); - - if ((tile.Hotspot.Temperature < Atmospherics.FireMinimumTemperatureToExist) || (tile.Hotspot.Volume <= 1f) - || tile.Air == null || tile.Air.GetMoles(Gas.Oxygen) < 0.5f || (tile.Air.GetMoles(Gas.Plasma) < 0.5f && tile.Air.GetMoles(Gas.Tritium) < 0.5f)) + if (tile.Air.Temperature > Atmospherics.FireMinimumTemperatureToSpread) { - tile.Hotspot = new Hotspot(); - InvalidateVisuals(ent, tile); - return; - } - - PerformHotspotExposure(tile); - - if (tile.Hotspot.Bypassing) - { - tile.Hotspot.State = 3; - - var gridUid = ent.Owner; - var tilePos = tile.GridIndices; - - // Get the existing decals on the tile - var tileDecals = _decalSystem.GetDecalsInRange(gridUid, tilePos); - - // Count the burnt decals on the tile - var tileBurntDecals = 0; - - foreach (var set in tileDecals) + var radiatedTemperature = tile.Air.Temperature * Atmospherics.FireSpreadRadiosityScale; + foreach (var otherTile in tile.AdjacentTiles) { - if (Array.IndexOf(_burntDecals, set.Decal.Id) == -1) + // TODO ATMOS: This is sus. Suss this out. + // Spread this fire to other tiles by exposing them to a hotspot if air can flow there. + // Unsure as to why this is sus. + if (otherTile == null) continue; - tileBurntDecals++; - - if (tileBurntDecals > 4) - break; + if (!otherTile.Hotspot.Valid) + HotspotExpose(gridAtmosphere, otherTile, radiatedTemperature, Atmospherics.CellVolume / 4); } - - // Add a random burned decal to the tile only if there are less than 4 of them - if (tileBurntDecals < 4) - _decalSystem.TryAddDecal(_burntDecals[_random.Next(_burntDecals.Length)], new EntityCoordinates(gridUid, tilePos), out _, cleanable: true); - - if (tile.Air.Temperature > Atmospherics.FireMinimumTemperatureToSpread) - { - var radiatedTemperature = tile.Air.Temperature * Atmospherics.FireSpreadRadiosityScale; - foreach (var otherTile in tile.AdjacentTiles) - { - // TODO ATMOS: This is sus. Suss this out. - if (otherTile == null) - continue; - - if(!otherTile.Hotspot.Valid) - HotspotExpose(gridAtmosphere, otherTile, radiatedTemperature, Atmospherics.CellVolume/4); - } - } - } - else - { - tile.Hotspot.State = (byte) (tile.Hotspot.Volume > Atmospherics.CellVolume * 0.4f ? 2 : 1); - } - - if (tile.Hotspot.Temperature > tile.MaxFireTemperatureSustained) - tile.MaxFireTemperatureSustained = tile.Hotspot.Temperature; - - if (_hotspotSoundCooldown++ == 0 && HotspotSound != null) - { - var coordinates = _mapSystem.ToCenterCoordinates(tile.GridIndex, tile.GridIndices); - - // A few details on the audio parameters for fire. - // The greater the fire state, the lesser the pitch variation. - // The greater the fire state, the greater the volume. - _audio.PlayPvs(HotspotSound, coordinates, HotspotSound.Params.WithVariation(0.15f / tile.Hotspot.State).WithVolume(-5f + 5f * tile.Hotspot.State)); - } - - if (_hotspotSoundCooldown > HotspotSoundCooldownCycles) - _hotspotSoundCooldown = 0; - - // TODO ATMOS Maybe destroy location here? - } - - private void HotspotExpose(GridAtmosphereComponent gridAtmosphere, TileAtmosphere tile, - float exposedTemperature, float exposedVolume, bool soh = false, EntityUid? sparkSourceUid = null) - { - if (tile.Air == null) - return; - - var oxygen = tile.Air.GetMoles(Gas.Oxygen); - - if (oxygen < 0.5f) - return; - - var plasma = tile.Air.GetMoles(Gas.Plasma); - var tritium = tile.Air.GetMoles(Gas.Tritium); - - if (tile.Hotspot.Valid) - { - if (soh) - { - if (plasma > 0.5f || tritium > 0.5f) - { - if (tile.Hotspot.Temperature < exposedTemperature) - tile.Hotspot.Temperature = exposedTemperature; - if (tile.Hotspot.Volume < exposedVolume) - tile.Hotspot.Volume = exposedVolume; - } - } - - return; - } - - if ((exposedTemperature > Atmospherics.PlasmaMinimumBurnTemperature) && (plasma > 0.5f || tritium > 0.5f)) - { - if (sparkSourceUid.HasValue) - _adminLog.Add(LogType.Flammable, LogImpact.High, $"Heat/spark of {ToPrettyString(sparkSourceUid.Value)} caused atmos ignition of gas: {tile.Air.Temperature.ToString():temperature}K - {oxygen}mol Oxygen, {plasma}mol Plasma, {tritium}mol Tritium"); - - tile.Hotspot = new Hotspot - { - Volume = exposedVolume * 25f, - Temperature = exposedTemperature, - SkippedFirstProcess = tile.CurrentCycle > gridAtmosphere.UpdateCounter, - Valid = true, - State = 1 - }; - - AddActiveTile(gridAtmosphere, tile); - gridAtmosphere.HotspotTiles.Add(tile); } } - - private void PerformHotspotExposure(TileAtmosphere tile) + else { - if (tile.Air == null || !tile.Hotspot.Valid) return; + // Little baby fire. Set the sprite state based on the current size of the fire. + tile.Hotspot.State = (byte)(tile.Hotspot.Volume > Atmospherics.CellVolume * 0.4f ? 2 : 1); + } - tile.Hotspot.Bypassing = tile.Hotspot.SkippedFirstProcess && tile.Hotspot.Volume > tile.Air.Volume*0.95f; + if (tile.Hotspot.Temperature > tile.MaxFireTemperatureSustained) + tile.MaxFireTemperatureSustained = tile.Hotspot.Temperature; - if (tile.Hotspot.Bypassing) + if (_hotspotSoundCooldown++ == 0 && HotspotSound != null) + { + var coordinates = _mapSystem.ToCenterCoordinates(tile.GridIndex, tile.GridIndices); + + // A few details on the audio parameters for fire. + // The greater the fire state, the lesser the pitch variation. + // The greater the fire state, the greater the volume. + _audio.PlayPvs(HotspotSound, + coordinates, + HotspotSound.Params.WithVariation(0.15f / tile.Hotspot.State) + .WithVolume(-5f + 5f * tile.Hotspot.State)); + } + + if (_hotspotSoundCooldown > HotspotSoundCooldownCycles) + _hotspotSoundCooldown = 0; + + // TODO ATMOS Maybe destroy location here? + } + + /// + /// Exposes a tile to a hotspot of given temperature and volume, igniting it if conditions are met. + /// + /// The of the grid the tile is on. + /// The to expose. + /// The temperature of the hotspot to expose. + /// You can think of this as exposing a temperature of a flame. + /// The volume of the hotspot to expose. + /// You can think of this as how big the flame is initially. + /// Bigger flames will ramp a fire faster. + /// Whether to "boost" a fire that's currently on the tile already. + /// Does nothing if the tile isn't already a hotspot. + /// This clamps the temperature and volume of the hotspot to the maximum + /// of the provided parameters and whatever's on the tile. + /// Entity that started the exposure for admin logging. + private void HotspotExpose(GridAtmosphereComponent gridAtmosphere, + TileAtmosphere tile, + float exposedTemperature, + float exposedVolume, + bool soh = false, + EntityUid? sparkSourceUid = null) + { + if (tile.Air == null) + return; + + var oxygen = tile.Air.GetMoles(Gas.Oxygen); + + if (oxygen < 0.5f) + return; + + var plasma = tile.Air.GetMoles(Gas.Plasma); + var tritium = tile.Air.GetMoles(Gas.Tritium); + + if (tile.Hotspot.Valid) + { + if (soh) { - tile.Hotspot.Volume = tile.Air.ReactionResults[(byte)GasReaction.Fire] * Atmospherics.FireGrowthRate; - tile.Hotspot.Temperature = tile.Air.Temperature; - } - else - { - var affected = tile.Air.RemoveVolume(tile.Hotspot.Volume); - affected.Temperature = tile.Hotspot.Temperature; - React(affected, tile); - tile.Hotspot.Temperature = affected.Temperature; - tile.Hotspot.Volume = affected.ReactionResults[(byte)GasReaction.Fire] * Atmospherics.FireGrowthRate; - Merge(tile.Air, affected); + if (plasma > 0.5f || tritium > 0.5f) + { + tile.Hotspot.Temperature = MathF.Max(tile.Hotspot.Temperature, exposedTemperature); + tile.Hotspot.Volume = MathF.Max(tile.Hotspot.Volume, exposedVolume); + } } - var fireEvent = new TileFireEvent(tile.Hotspot.Temperature, tile.Hotspot.Volume); - _entSet.Clear(); - _lookup.GetLocalEntitiesIntersecting(tile.GridIndex, tile.GridIndices, _entSet, 0f); + return; + } - foreach (var entity in _entSet) + if (exposedTemperature > Atmospherics.PlasmaMinimumBurnTemperature && (plasma > 0.5f || tritium > 0.5f)) + { + if (sparkSourceUid.HasValue) { - RaiseLocalEvent(entity, ref fireEvent); + _adminLog.Add(LogType.Flammable, + LogImpact.High, + $"Heat/spark of {ToPrettyString(sparkSourceUid.Value)} caused atmos ignition of gas: {tile.Air.Temperature.ToString():temperature}K - {oxygen}mol Oxygen, {plasma}mol Plasma, {tritium}mol Tritium"); } + + tile.Hotspot = new Hotspot + { + Volume = exposedVolume * 25f, + Temperature = exposedTemperature, + SkippedFirstProcess = tile.CurrentCycle > gridAtmosphere.UpdateCounter, + Valid = true, + State = 1 + }; + + AddActiveTile(gridAtmosphere, tile); + gridAtmosphere.HotspotTiles.Add(tile); + } + } + + /// + /// Performs hotspot exposure processing on a . + /// + /// The to process. + private void PerformHotspotExposure(TileAtmosphere tile) + { + if (tile.Air == null || !tile.Hotspot.Valid) + return; + + // Determine if the tile has become a full-blown fire if the volume of the fire has effectively reached + // the volume of the tile's air. + tile.Hotspot.Bypassing = tile.Hotspot.SkippedFirstProcess && tile.Hotspot.Volume > tile.Air.Volume * 0.95f; + + // If the tile is effectively a full fire, use the tile's air for reactions, don't bother partitioning. + if (tile.Hotspot.Bypassing) + { + tile.Hotspot.Volume = tile.Air.ReactionResults[(byte)GasReaction.Fire] * Atmospherics.FireGrowthRate; + tile.Hotspot.Temperature = tile.Air.Temperature; + } + // Otherwise, pull out a fraction of the tile's air (the current hotspot volume) to perform reactions on. + else + { + var affected = tile.Air.RemoveVolume(tile.Hotspot.Volume); + affected.Temperature = tile.Hotspot.Temperature; + React(affected, tile); + tile.Hotspot.Temperature = affected.Temperature; + // Scale the fire based on the type of reaction that occured. + tile.Hotspot.Volume = affected.ReactionResults[(byte)GasReaction.Fire] * Atmospherics.FireGrowthRate; + Merge(tile.Air, affected); + } + + var fireEvent = new TileFireEvent(tile.Hotspot.Temperature, tile.Hotspot.Volume); + _entSet.Clear(); + _lookup.GetLocalEntitiesIntersecting(tile.GridIndex, tile.GridIndices, _entSet, 0f); + + foreach (var entity in _entSet) + { + RaiseLocalEvent(entity, ref fireEvent); } } } diff --git a/Content.Server/Atmos/Hotspot.cs b/Content.Server/Atmos/Hotspot.cs index 987acf73c2..2783362c31 100644 --- a/Content.Server/Atmos/Hotspot.cs +++ b/Content.Server/Atmos/Hotspot.cs @@ -1,26 +1,57 @@ -namespace Content.Server.Atmos +namespace Content.Server.Atmos; + +/// +/// Internal Atmospherics struct that stores data about a hotspot in a tile. +/// Hotspots are used to model (slow-spreading) fires and firestarters. +/// +public struct Hotspot { - public struct Hotspot - { - [ViewVariables] - public bool Valid; + /// + /// Whether this hotspot is currently representing fire and needs to be processed. + /// Set when the hotspot "becomes alight". This is never set to false + /// because Atmospherics will just assign + /// a new struct when the fire goes out. + /// + [ViewVariables] + public bool Valid; - [ViewVariables] - public bool SkippedFirstProcess; + /// + /// Whether this hotspot has skipped its first process cycle. + /// AtmosphereSystem.Hotspot skips processing a hotspot beyond + /// setting it to active (for LINDA processing) the first + /// time it is processed. + /// + [ViewVariables] + public bool SkippedFirstProcess; - [ViewVariables] - public bool Bypassing; + /// + /// Whether this hotspot is currently using the tile for reacting and fire processing + /// instead of a fraction of the tile's air. + /// + /// When a tile is considered a hotspot, Hotspot will pull a fraction of that tile's + /// air out of the tile and perform a reaction on that air, merging it back afterward. + /// Bypassing triggers when the hotspot volume nears the tile's volume, making the system + /// use the tile's GasMixture instead of pulling a fraction out. + /// + [ViewVariables] + public bool Bypassing; - [ViewVariables] - public float Temperature; + /// + /// Current temperature of the hotspot's volume, in Kelvin. + /// + [ViewVariables] + public float Temperature; - [ViewVariables] - public float Volume; + /// + /// Current volume of the hotspot, in liters. + /// You can think of this as the volume of the current fire in the tile. + /// + [ViewVariables] + public float Volume; - /// - /// State for the fire sprite. - /// - [ViewVariables] - public byte State; - } + /// + /// State for the fire sprite. + /// + [ViewVariables] + public byte State; } From 8d0697d904660b785d8de8c22eb03107f87c4326 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Tue, 4 Nov 2025 13:49:22 +0100 Subject: [PATCH 099/121] Remove Lemmy from the README (#41284) Remove Lemmy --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2e88d9f547..db65a569b9 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ If you want to host or create content for SS14, this is the repo you need. It co
-[Website](https://spacestation14.com/) | [Discord](https://discord.ss14.io/) | [Forum](https://forum.spacestation14.com/) | [Mastodon](https://mastodon.gamedev.place/@spacestation14) | [Lemmy](https://lemmy.spacestation14.com/) | [Patreon](https://www.patreon.com/spacestation14) | [Steam](https://store.steampowered.com/app/1255460/Space_Station_14/) | [Standalone Download](https://spacestation14.com/about/nightlies/) +[Website](https://spacestation14.com/) | [Discord](https://discord.ss14.io/) | [Forum](https://forum.spacestation14.com/) | [Mastodon](https://mastodon.gamedev.place/@spacestation14) | [Patreon](https://www.patreon.com/spacestation14) | [Steam](https://store.steampowered.com/app/1255460/Space_Station_14/) | [Standalone Download](https://spacestation14.com/about/nightlies/)
From b79cee00e85fa9a6f4c411922b28fd8428456c4b Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Tue, 4 Nov 2025 13:05:11 -0700 Subject: [PATCH 100/121] amber update (#41289) update for hos warden weapon --- Resources/Maps/amber.yml | 2240 +------------------------------------- 1 file changed, 17 insertions(+), 2223 deletions(-) diff --git a/Resources/Maps/amber.yml b/Resources/Maps/amber.yml index d734e742cd..edd8d00b98 100644 --- a/Resources/Maps/amber.yml +++ b/Resources/Maps/amber.yml @@ -1,11 +1,11 @@ meta: format: 7 category: Map - engineVersion: 267.2.0 + engineVersion: 267.3.0 forkId: "" forkVersion: "" - time: 10/13/2025 20:41:56 - entityCount: 24853 + time: 11/04/2025 19:40:20 + entityCount: 24851 maps: - 1 grids: @@ -116045,8 +116045,6 @@ entities: - type: Transform pos: -30.5,20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: IngotGold entities: - uid: 8246 @@ -118775,18 +118773,6 @@ entities: - type: Transform pos: 32.5,-29.5 parent: 2 -- proto: MagazinePistolSubMachineGunTopMounted - entities: - - uid: 11315 - components: - - type: Transform - pos: -45.560265,1.886858 - parent: 2 - - uid: 11318 - components: - - type: Transform - pos: -45.36448,2.0459661 - parent: 2 - proto: MailingUnit entities: - uid: 2609 @@ -129468,344 +129454,246 @@ entities: - type: Transform pos: 6.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 34 components: - type: Transform pos: 8.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 37 components: - type: Transform pos: 8.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 39 components: - type: Transform pos: 6.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 67 components: - type: Transform pos: 3.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 531 components: - type: Transform pos: 3.5,7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 544 components: - type: Transform pos: 2.5,7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 576 components: - type: Transform pos: 9.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 612 components: - type: Transform pos: 4.5,7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 791 components: - type: Transform pos: 11.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 867 components: - type: Transform pos: 10.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 901 components: - type: Transform pos: 7.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1089 components: - type: Transform pos: 7.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1125 components: - type: Transform pos: 9.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1140 components: - type: Transform pos: 9.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1183 components: - type: Transform pos: 9.5,-10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1223 components: - type: Transform pos: 5.5,-10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1249 components: - type: Transform pos: 5.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1268 components: - type: Transform pos: 11.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1325 components: - type: Transform pos: 8.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1411 components: - type: Transform pos: -7.5,7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1415 components: - type: Transform pos: -5.5,7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1416 components: - type: Transform pos: 0.5,7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1417 components: - type: Transform pos: -3.5,7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1418 components: - type: Transform pos: -1.5,7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1463 components: - type: Transform pos: 0.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1464 components: - type: Transform pos: -1.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1465 components: - type: Transform pos: -3.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1466 components: - type: Transform pos: -5.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1467 components: - type: Transform pos: 2.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1468 components: - type: Transform pos: -7.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1470 components: - type: Transform pos: 3.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1471 components: - type: Transform pos: 4.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1696 components: - type: Transform pos: 5.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4475 components: - type: Transform pos: 41.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4527 components: - type: Transform pos: 37.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4528 components: - type: Transform pos: 37.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4529 components: - type: Transform pos: 37.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4530 components: - type: Transform pos: 41.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7123 components: - type: Transform pos: 3.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9123 components: - type: Transform pos: 3.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9621 components: - type: Transform pos: 3.5,-10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9698 components: - type: Transform pos: 3.5,-6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10227 components: - type: Transform pos: 6.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12517 components: - type: Transform pos: 7.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14625 components: - type: Transform pos: 87.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14714 components: - type: Transform pos: 88.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14861 components: - type: Transform pos: 86.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14876 components: - type: Transform pos: 87.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: ReinforcedWindow entities: - uid: 21 @@ -129813,4693 +129701,3355 @@ entities: - type: Transform pos: -31.5,-71.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 62 components: - type: Transform pos: -8.5,16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 80 components: - type: Transform pos: -4.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 91 components: - type: Transform pos: -3.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 135 components: - type: Transform pos: -5.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 139 components: - type: Transform pos: -27.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 168 components: - type: Transform pos: 47.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 169 components: - type: Transform pos: 51.5,-10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 181 components: - type: Transform pos: -35.5,-68.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 184 components: - type: Transform pos: -20.5,16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 196 components: - type: Transform pos: 38.5,26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 214 components: - type: Transform pos: -26.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 224 components: - type: Transform pos: -18.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 244 components: - type: Transform pos: -27.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 280 components: - type: Transform pos: -27.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 296 components: - type: Transform pos: -31.5,-76.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 318 components: - type: Transform pos: -17.5,13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 353 components: - type: Transform pos: -46.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 373 components: - type: Transform pos: -45.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 383 components: - type: Transform pos: 16.5,17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 385 components: - type: Transform pos: -26.5,7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 386 components: - type: Transform pos: -20.5,13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 387 components: - type: Transform pos: -18.5,-10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 400 components: - type: Transform pos: -22.5,16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 435 components: - type: Transform pos: 52.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 450 components: - type: Transform pos: -25.5,8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 462 components: - type: Transform pos: -24.5,8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 466 components: - type: Transform pos: -24.5,12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 469 components: - type: Transform pos: -22.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 482 components: - type: Transform pos: 51.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 499 components: - type: Transform pos: -23.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 515 components: - type: Transform pos: -28.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 522 components: - type: Transform pos: 33.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 574 components: - type: Transform pos: -31.5,-75.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 597 components: - type: Transform pos: -50.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 604 components: - type: Transform pos: 10.5,24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 619 components: - type: Transform pos: 3.5,-84.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 640 components: - type: Transform pos: 51.5,-50.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 642 components: - type: Transform pos: -9.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 647 components: - type: Transform pos: 53.5,-50.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 650 components: - type: Transform pos: -22.5,14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 675 components: - type: Transform pos: -29.5,-0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 683 components: - type: Transform pos: -27.5,-0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 703 components: - type: Transform pos: -4.5,17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 704 components: - type: Transform pos: -4.5,19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 710 components: - type: Transform pos: -20.5,14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 712 components: - type: Transform pos: -31.5,-77.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 731 components: - type: Transform pos: -36.5,-72.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 742 components: - type: Transform pos: -8.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 745 components: - type: Transform pos: -1.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 750 components: - type: Transform pos: -7.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 758 components: - type: Transform pos: -25.5,12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 763 components: - type: Transform pos: -2.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 770 components: - type: Transform pos: -21.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 782 components: - type: Transform pos: -26.5,5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 784 components: - type: Transform pos: -23.5,8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 826 components: - type: Transform pos: -22.5,15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 855 components: - type: Transform pos: 1.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 898 components: - type: Transform pos: 1.5,14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 906 components: - type: Transform pos: -17.5,15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 923 components: - type: Transform pos: -45.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 945 components: - type: Transform pos: -17.5,16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 972 components: - type: Transform pos: -3.5,22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 976 components: - type: Transform pos: -3.5,20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 991 components: - type: Transform pos: -22.5,13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1013 components: - type: Transform pos: 50.5,-10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1039 components: - type: Transform pos: 1.5,28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1046 components: - type: Transform pos: 7.5,28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1080 components: - type: Transform pos: -44.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1087 components: - type: Transform pos: -22.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1088 components: - type: Transform pos: -17.5,14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1098 components: - type: Transform pos: -5.5,22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1099 components: - type: Transform pos: -4.5,25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1100 components: - type: Transform pos: -4.5,23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1105 components: - type: Transform pos: -20.5,15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1141 components: - type: Transform pos: -55.5,-55.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1144 components: - type: Transform pos: -23.5,12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1160 components: - type: Transform pos: 8.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1189 components: - type: Transform pos: 7.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1222 components: - type: Transform pos: 9.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1234 components: - type: Transform pos: 2.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1282 components: - type: Transform pos: 5.5,-54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1375 components: - type: Transform pos: 1.5,28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1378 components: - type: Transform pos: 10.5,23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1473 components: - type: Transform pos: -6.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1474 components: - type: Transform pos: -5.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1475 components: - type: Transform pos: -7.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1485 components: - type: Transform pos: 2.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1495 components: - type: Transform pos: 0.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1496 components: - type: Transform pos: -1.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1498 components: - type: Transform pos: -2.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1499 components: - type: Transform pos: -8.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1500 components: - type: Transform pos: 42.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1501 components: - type: Transform pos: 4.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1505 components: - type: Transform pos: 6.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1513 components: - type: Transform pos: 3.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1518 components: - type: Transform pos: -25.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1519 components: - type: Transform pos: 41.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1547 components: - type: Transform pos: -16.5,29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1571 components: - type: Transform pos: 1.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1577 components: - type: Transform pos: 4.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1579 components: - type: Transform pos: -0.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1587 components: - type: Transform pos: 3.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1591 components: - type: Transform pos: -14.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1594 components: - type: Transform pos: -3.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1595 components: - type: Transform pos: -4.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1636 components: - type: Transform pos: -11.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1638 components: - type: Transform pos: 39.5,-68.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1649 components: - type: Transform pos: 34.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1654 components: - type: Transform pos: -29.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1687 components: - type: Transform pos: -24.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1712 components: - type: Transform pos: 15.5,28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1747 components: - type: Transform pos: 0.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1800 components: - type: Transform pos: 15.5,27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1832 components: - type: Transform pos: -21.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1854 components: - type: Transform pos: -21.5,-32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1900 components: - type: Transform pos: -12.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1902 components: - type: Transform pos: -10.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1916 components: - type: Transform pos: 35.5,27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1958 components: - type: Transform pos: -21.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2041 components: - type: Transform pos: -14.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2065 components: - type: Transform pos: -3.5,-59.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2178 components: - type: Transform pos: -6.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2292 components: - type: Transform pos: 72.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2329 components: - type: Transform pos: 34.5,27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2356 components: - type: Transform pos: 73.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2363 components: - type: Transform pos: 73.5,-41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2377 components: - type: Transform pos: -14.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2397 components: - type: Transform pos: -5.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2548 components: - type: Transform pos: -36.5,-79.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2552 components: - type: Transform pos: -9.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2599 components: - type: Transform pos: -38.5,32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2600 components: - type: Transform pos: -7.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2656 components: - type: Transform pos: -22.5,29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2663 components: - type: Transform pos: -22.5,30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2747 components: - type: Transform pos: -36.5,-68.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2766 components: - type: Transform pos: -36.5,-73.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2869 components: - type: Transform pos: 39.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2870 components: - type: Transform pos: 37.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2891 components: - type: Transform pos: -22.5,31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2956 components: - type: Transform pos: 38.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2966 components: - type: Transform pos: -30.5,-79.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3051 components: - type: Transform pos: 40.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3056 components: - type: Transform pos: 40.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3059 components: - type: Transform pos: 40.5,-41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3102 components: - type: Transform pos: 72.5,-67.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3121 components: - type: Transform pos: -9.5,-69.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3147 components: - type: Transform pos: -21.5,31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3148 components: - type: Transform pos: -42.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3202 components: - type: Transform pos: -16.5,30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3216 components: - type: Transform pos: -17.5,31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3262 components: - type: Transform pos: -36.5,-62.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3276 components: - type: Transform pos: -36.5,-63.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3313 components: - type: Transform pos: -44.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3354 components: - type: Transform pos: 73.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3387 components: - type: Transform pos: 65.5,-84.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3451 components: - type: Transform pos: -36.5,-64.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3496 components: - type: Transform pos: -27.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3524 components: - type: Transform pos: 72.5,-41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3562 components: - type: Transform pos: 60.5,-75.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3590 components: - type: Transform pos: 6.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3605 components: - type: Transform pos: 41.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3625 components: - type: Transform pos: 60.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3642 components: - type: Transform pos: 40.5,-66.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3725 components: - type: Transform pos: -9.5,-74.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3763 components: - type: Transform pos: -9.5,-67.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3791 components: - type: Transform pos: -9.5,-68.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3799 components: - type: Transform pos: 12.5,-71.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3847 components: - type: Transform pos: -21.5,29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3881 components: - type: Transform pos: 12.5,-75.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3959 components: - type: Transform pos: -2.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4108 components: - type: Transform pos: -30.5,-80.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4120 components: - type: Transform pos: -6.5,16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4154 components: - type: Transform pos: 2.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4206 components: - type: Transform pos: 31.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4237 components: - type: Transform pos: 23.5,-24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4263 components: - type: Transform pos: 33.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4287 components: - type: Transform pos: 36.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4334 components: - type: Transform pos: 33.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4343 components: - type: Transform pos: 26.5,-31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4424 components: - type: Transform pos: 28.5,-32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4430 components: - type: Transform pos: 1.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4453 components: - type: Transform pos: 48.5,-89.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4479 components: - type: Transform pos: 30.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4480 components: - type: Transform pos: 30.5,-41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4577 components: - type: Transform pos: -26.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4674 components: - type: Transform pos: -36.5,-76.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4680 components: - type: Transform pos: 47.5,-55.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4683 components: - type: Transform pos: -37.5,-76.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4686 components: - type: Transform pos: -35.5,-76.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4724 components: - type: Transform pos: 51.5,-68.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4728 components: - type: Transform pos: 48.5,-84.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4730 components: - type: Transform pos: 49.5,-86.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4745 components: - type: Transform pos: 51.5,20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4809 components: - type: Transform pos: -31.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4829 components: - type: Transform pos: 60.5,-79.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4847 components: - type: Transform pos: -33.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4894 components: - type: Transform pos: -31.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4901 components: - type: Transform pos: -26.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4903 components: - type: Transform pos: -31.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4919 components: - type: Transform pos: -7.5,13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4922 components: - type: Transform pos: 67.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4923 components: - type: Transform pos: 63.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4929 components: - type: Transform pos: -17.5,29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4930 components: - type: Transform pos: -16.5,31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4993 components: - type: Transform pos: -36.5,-71.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4995 components: - type: Transform pos: -28.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5036 components: - type: Transform pos: -31.5,-48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5037 components: - type: Transform pos: 49.5,-88.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5066 components: - type: Transform pos: -20.5,33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5071 components: - type: Transform pos: -19.5,33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5072 components: - type: Transform pos: -18.5,32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5073 components: - type: Transform pos: -18.5,33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5087 components: - type: Transform pos: -20.5,32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5103 components: - type: Transform pos: -7.5,16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5132 components: - type: Transform pos: 47.5,-72.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5137 components: - type: Transform pos: 47.5,-89.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5141 components: - type: Transform pos: -8.5,13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5145 components: - type: Transform pos: 45.5,-87.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5208 components: - type: Transform pos: -38.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5219 components: - type: Transform pos: -34.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5233 components: - type: Transform pos: -37.5,-68.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5293 components: - type: Transform pos: -31.5,-73.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5294 components: - type: Transform pos: -31.5,-72.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5415 components: - type: Transform pos: 9.5,28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5432 components: - type: Transform pos: 7.5,14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5449 components: - type: Transform pos: 66.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5508 components: - type: Transform pos: 46.5,23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5566 components: - type: Transform pos: 47.5,-73.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5571 components: - type: Transform pos: 28.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5575 components: - type: Transform pos: -39.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5599 components: - type: Transform pos: 69.5,-59.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5647 components: - type: Transform pos: 46.5,-63.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5655 components: - type: Transform pos: 26.5,-54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5658 components: - type: Transform pos: 26.5,-56.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5684 components: - type: Transform pos: 32.5,-53.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5692 components: - type: Transform pos: 32.5,-55.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5699 components: - type: Transform rot: -1.5707963267948966 rad pos: 65.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5706 components: - type: Transform pos: 45.5,-63.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5749 components: - type: Transform pos: -25.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5809 components: - type: Transform rot: -1.5707963267948966 rad pos: 65.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5837 components: - type: Transform pos: 35.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5844 components: - type: Transform pos: -33.5,-83.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5863 components: - type: Transform pos: 20.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5867 components: - type: Transform pos: 50.5,20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5871 components: - type: Transform pos: 49.5,20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5882 components: - type: Transform rot: -1.5707963267948966 rad pos: 65.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5889 components: - type: Transform pos: -14.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5902 components: - type: Transform pos: -1.5,-50.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5950 components: - type: Transform pos: 23.5,24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6031 components: - type: Transform pos: 27.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6043 components: - type: Transform pos: 73.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6083 components: - type: Transform pos: 44.5,-63.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6117 components: - type: Transform pos: 8.5,-50.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6167 components: - type: Transform pos: -33.5,-82.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6202 components: - type: Transform pos: -5.5,-50.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6220 components: - type: Transform pos: 4.5,-50.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6221 components: - type: Transform pos: -33.5,-81.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6223 components: - type: Transform pos: 66.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6265 components: - type: Transform pos: 41.5,-60.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6348 components: - type: Transform pos: 7.5,-54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6373 components: - type: Transform pos: 77.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6381 components: - type: Transform pos: 46.5,0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6382 components: - type: Transform pos: 45.5,0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6385 components: - type: Transform pos: 1.5,-82.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6401 components: - type: Transform pos: -0.5,-83.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6420 components: - type: Transform pos: -19.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6426 components: - type: Transform pos: -9.5,-75.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6431 components: - type: Transform pos: 1.5,-54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6456 components: - type: Transform pos: 2.5,-82.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6457 components: - type: Transform pos: 0.5,-83.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6485 components: - type: Transform pos: -18.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6486 components: - type: Transform pos: -15.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6487 components: - type: Transform pos: -17.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6489 components: - type: Transform pos: -19.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6490 components: - type: Transform pos: -16.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6491 components: - type: Transform pos: -15.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6519 components: - type: Transform pos: -10.5,-63.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6520 components: - type: Transform pos: -10.5,-62.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6521 components: - type: Transform pos: -10.5,-61.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6522 components: - type: Transform pos: -10.5,-60.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6583 components: - type: Transform pos: 67.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6621 components: - type: Transform pos: 34.5,-52.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6622 components: - type: Transform pos: 35.5,-52.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6625 components: - type: Transform pos: 30.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6626 components: - type: Transform pos: 31.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6635 components: - type: Transform pos: 41.5,-59.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6658 components: - type: Transform pos: 42.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6735 components: - type: Transform pos: 32.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6736 components: - type: Transform pos: 32.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6806 components: - type: Transform pos: 76.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6825 components: - type: Transform pos: 24.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6853 components: - type: Transform pos: 33.5,22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6881 components: - type: Transform pos: -7.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6926 components: - type: Transform pos: 46.5,-84.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6944 components: - type: Transform pos: 71.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6945 components: - type: Transform pos: 45.5,-78.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6967 components: - type: Transform pos: 45.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7039 components: - type: Transform pos: -14.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7062 components: - type: Transform pos: 49.5,-59.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7212 components: - type: Transform pos: 30.5,11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7275 components: - type: Transform pos: 34.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7292 components: - type: Transform pos: 51.5,10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7353 components: - type: Transform pos: 49.5,-87.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7360 components: - type: Transform pos: 48.5,13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7361 components: - type: Transform pos: 49.5,13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7365 components: - type: Transform pos: 51.5,11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7400 components: - type: Transform pos: 38.5,-66.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7405 components: - type: Transform pos: 47.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7406 components: - type: Transform pos: 46.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7407 components: - type: Transform pos: 45.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7539 components: - type: Transform pos: -14.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7541 components: - type: Transform pos: -12.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7543 components: - type: Transform pos: 3.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7548 components: - type: Transform pos: -16.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7559 components: - type: Transform pos: 7.5,-59.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7561 components: - type: Transform pos: -59.5,-52.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7580 components: - type: Transform pos: 6.5,-59.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7828 components: - type: Transform pos: -9.5,14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8243 components: - type: Transform pos: -36.5,-80.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8279 components: - type: Transform pos: 42.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8283 components: - type: Transform pos: 43.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8363 components: - type: Transform pos: 44.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8370 components: - type: Transform pos: 38.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8371 components: - type: Transform pos: 37.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8373 components: - type: Transform pos: 34.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8374 components: - type: Transform pos: 35.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8377 components: - type: Transform pos: 33.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8387 components: - type: Transform pos: 32.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8449 components: - type: Transform pos: 3.5,-83.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8545 components: - type: Transform pos: 49.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8546 components: - type: Transform pos: 49.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8583 components: - type: Transform pos: 33.5,21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8618 components: - type: Transform pos: 57.5,-25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8619 components: - type: Transform pos: 56.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8620 components: - type: Transform pos: 56.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8621 components: - type: Transform pos: 56.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8630 components: - type: Transform pos: 54.5,-25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8631 components: - type: Transform pos: 55.5,-25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8682 components: - type: Transform pos: 56.5,-25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8684 components: - type: Transform pos: 56.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8751 components: - type: Transform pos: 57.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8752 components: - type: Transform pos: 54.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8753 components: - type: Transform pos: 56.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8754 components: - type: Transform pos: 55.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8756 components: - type: Transform pos: 56.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8757 components: - type: Transform pos: 55.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8758 components: - type: Transform pos: 55.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8775 components: - type: Transform pos: 46.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8776 components: - type: Transform pos: 45.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8890 components: - type: Transform pos: 52.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8891 components: - type: Transform pos: 51.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8895 components: - type: Transform pos: 31.5,-59.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9206 components: - type: Transform pos: -46.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9254 components: - type: Transform pos: 2.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9258 components: - type: Transform pos: -4.5,-59.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9264 components: - type: Transform pos: -33.5,-25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9268 components: - type: Transform pos: 8.5,-78.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9273 components: - type: Transform pos: 43.5,-72.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9274 components: - type: Transform pos: 43.5,-71.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9296 components: - type: Transform pos: 43.5,-70.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9383 components: - type: Transform pos: 49.5,-60.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9421 components: - type: Transform pos: -9.5,15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9436 components: - type: Transform pos: 46.5,24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9541 components: - type: Transform pos: 46.5,-89.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9553 components: - type: Transform pos: -44.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9567 components: - type: Transform pos: -35.5,-25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9578 components: - type: Transform pos: -42.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9583 components: - type: Transform pos: 45.5,-88.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9584 components: - type: Transform pos: 45.5,-86.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9624 components: - type: Transform pos: -29.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9649 components: - type: Transform pos: -42.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9676 components: - type: Transform pos: 59.5,-49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9800 components: - type: Transform pos: 57.5,-49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9937 components: - type: Transform pos: -4.5,-54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9958 components: - type: Transform pos: -15.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10004 components: - type: Transform pos: 52.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10151 components: - type: Transform pos: -27.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10190 components: - type: Transform pos: 2.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10212 components: - type: Transform pos: -29.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10214 components: - type: Transform pos: -28.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10251 components: - type: Transform pos: -28.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10398 components: - type: Transform pos: -24.5,-49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10433 components: - type: Transform pos: -35.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10434 components: - type: Transform pos: -35.5,-54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10465 components: - type: Transform pos: -56.5,-55.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10513 components: - type: Transform pos: -39.5,-55.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10634 components: - type: Transform pos: -27.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10721 components: - type: Transform pos: -47.5,-2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10749 components: - type: Transform pos: -47.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10750 components: - type: Transform pos: -46.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10751 components: - type: Transform pos: -46.5,-6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10752 components: - type: Transform pos: -44.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10779 components: - type: Transform pos: -47.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10783 components: - type: Transform pos: -47.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10793 components: - type: Transform pos: 64.5,-60.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10808 components: - type: Transform pos: -46.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10814 components: - type: Transform pos: 71.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10818 components: - type: Transform pos: 9.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10828 components: - type: Transform pos: 64.5,-70.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10836 components: - type: Transform pos: 63.5,-82.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10900 components: - type: Transform pos: -47.5,-0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10915 components: - type: Transform pos: -46.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10969 components: - type: Transform pos: 2.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10998 components: - type: Transform pos: -25.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11002 components: - type: Transform pos: -30.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11003 components: - type: Transform pos: -45.5,0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11077 components: - type: Transform pos: 34.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11080 components: - type: Transform pos: -36.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11128 components: - type: Transform pos: -14.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11170 components: - type: Transform pos: 22.5,24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11193 components: - type: Transform pos: -63.5,-60.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11196 components: - type: Transform pos: 0.5,-82.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11211 components: - type: Transform pos: 2.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11285 components: - type: Transform pos: -39.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11327 components: - type: Transform pos: -5.5,21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11335 components: - type: Transform pos: 26.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11339 components: - type: Transform pos: -44.5,0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11391 components: - type: Transform pos: 24.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11397 components: - type: Transform pos: 25.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11400 components: - type: Transform pos: 25.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11401 components: - type: Transform pos: -41.5,-2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11428 components: - type: Transform pos: 26.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11441 components: - type: Transform pos: 13.5,15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11504 components: - type: Transform pos: -57.5,-61.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11582 components: - type: Transform pos: -56.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11610 components: - type: Transform pos: 2.5,-83.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11622 components: - type: Transform pos: 52.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11676 components: - type: Transform pos: 27.5,-59.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11677 components: - type: Transform pos: 28.5,-59.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11712 components: - type: Transform pos: 8.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11953 components: - type: Transform pos: -41.5,-6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12018 components: - type: Transform pos: 10.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12027 components: - type: Transform pos: -28.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12042 components: - type: Transform pos: -34.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12186 components: - type: Transform pos: 12.5,-67.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12192 components: - type: Transform pos: -9.5,-78.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12237 components: - type: Transform pos: -32.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12281 components: - type: Transform pos: -28.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12334 components: - type: Transform pos: -61.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12335 components: - type: Transform pos: -57.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12351 components: - type: Transform pos: -56.5,-61.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12493 components: - type: Transform pos: 13.5,7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12494 components: - type: Transform pos: 13.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12525 components: - type: Transform pos: -41.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12526 components: - type: Transform pos: -42.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12527 components: - type: Transform pos: -44.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12528 components: - type: Transform pos: -45.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12529 components: - type: Transform pos: -43.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12547 components: - type: Transform pos: -48.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12574 components: - type: Transform pos: 12.5,-73.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12583 components: - type: Transform pos: -41.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12584 components: - type: Transform pos: -42.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12585 components: - type: Transform pos: -43.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12586 components: - type: Transform pos: -44.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12587 components: - type: Transform pos: -45.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12597 components: - type: Transform pos: 12.5,-74.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12645 components: - type: Transform pos: -46.5,-32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12686 components: - type: Transform pos: -46.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12703 components: - type: Transform pos: -49.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12718 components: - type: Transform pos: -9.5,-77.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12728 components: - type: Transform pos: -54.5,-32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12767 components: - type: Transform pos: -55.5,-32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12779 components: - type: Transform pos: 8.5,-68.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12781 components: - type: Transform pos: -54.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12789 components: - type: Transform pos: -5.5,-71.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12794 components: - type: Transform pos: -5.5,-70.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12830 components: - type: Transform pos: -55.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12849 components: - type: Transform pos: 7.5,-75.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12864 components: - type: Transform pos: -56.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12874 components: - type: Transform pos: -60.5,-31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12875 components: - type: Transform pos: -60.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12876 components: - type: Transform pos: -60.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12877 components: - type: Transform pos: -60.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12878 components: - type: Transform pos: -60.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12879 components: - type: Transform pos: -59.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12882 components: - type: Transform pos: -33.5,24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12884 components: - type: Transform pos: -58.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12922 components: - type: Transform pos: -58.5,-32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12923 components: - type: Transform pos: -59.5,-32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12924 components: - type: Transform pos: -60.5,-32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13000 components: - type: Transform pos: 8.5,-70.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13011 components: - type: Transform pos: 49.5,-53.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13047 components: - type: Transform pos: -55.5,18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13048 components: - type: Transform pos: -49.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13087 components: - type: Transform pos: -55.5,19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13092 components: - type: Transform pos: -48.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13107 components: - type: Transform pos: -48.5,5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13116 components: - type: Transform pos: -4.5,-75.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13127 components: - type: Transform pos: -47.5,-25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13152 components: - type: Transform pos: -61.5,-60.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13163 components: - type: Transform pos: -60.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13172 components: - type: Transform pos: -60.5,-60.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13266 components: - type: Transform pos: -4.5,-62.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13277 components: - type: Transform pos: -5.5,-68.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13278 components: - type: Transform pos: 8.5,-73.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13341 components: - type: Transform pos: 37.5,26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13369 components: - type: Transform pos: 6.5,-54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13375 components: - type: Transform pos: 5.5,-59.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13385 components: - type: Transform pos: -3.5,-54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13393 components: - type: Transform pos: 12.5,-78.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13403 components: - type: Transform pos: -5.5,-78.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13422 components: - type: Transform pos: -52.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13445 components: - type: Transform pos: -50.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13447 components: - type: Transform pos: -50.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13462 components: - type: Transform pos: -50.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13475 components: - type: Transform pos: -50.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13610 components: - type: Transform pos: -45.5,7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13767 components: - type: Transform pos: 19.5,-60.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13768 components: - type: Transform pos: 21.5,-60.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13769 components: - type: Transform pos: 22.5,-60.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13770 components: - type: Transform pos: 24.5,-60.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13771 components: - type: Transform pos: 25.5,-60.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13772 components: - type: Transform pos: 18.5,-60.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13791 components: - type: Transform pos: 12.5,-77.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13798 components: - type: Transform pos: -51.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13879 components: - type: Transform pos: -49.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13898 components: - type: Transform pos: -44.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13905 components: - type: Transform pos: -45.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13918 components: - type: Transform pos: -42.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13919 components: - type: Transform pos: -41.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13926 components: - type: Transform pos: -49.5,-41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13990 components: - type: Transform pos: -23.5,-49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14301 components: - type: Transform pos: 7.5,28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14443 components: - type: Transform pos: -52.5,25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14445 components: - type: Transform pos: -51.5,25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14502 components: - type: Transform pos: -5.5,-77.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14568 components: - type: Transform pos: -2.5,-54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14633 components: - type: Transform pos: -30.5,25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14699 components: - type: Transform pos: -30.5,24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14786 components: - type: Transform pos: -31.5,29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14801 components: - type: Transform pos: -33.5,29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14802 components: - type: Transform pos: -32.5,29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14812 components: - type: Transform pos: -34.5,25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14813 components: - type: Transform pos: -34.5,24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14828 components: - type: Transform pos: -49.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14849 components: - type: Transform pos: -48.5,24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14879 components: - type: Transform pos: -55.5,20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14922 components: - type: Transform pos: -50.5,25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14996 components: - type: Transform pos: 7.5,-62.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14998 components: - type: Transform pos: -4.5,-63.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15005 components: - type: Transform pos: 7.5,-63.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15027 components: - type: Transform pos: -5.5,-55.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15236 components: - type: Transform pos: -64.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15263 components: - type: Transform pos: -57.5,12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15304 components: - type: Transform pos: -57.5,10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15308 components: - type: Transform pos: -57.5,11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15310 components: - type: Transform pos: -55.5,17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15314 components: - type: Transform pos: -57.5,13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15317 components: - type: Transform pos: -55.5,22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15320 components: - type: Transform pos: -56.5,8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15329 components: - type: Transform pos: -55.5,5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15334 components: - type: Transform pos: -55.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15454 components: - type: Transform pos: 36.5,21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15615 components: - type: Transform pos: -5.5,-73.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15704 components: - type: Transform pos: -53.5,16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15780 components: - type: Transform pos: 35.5,20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15866 components: - type: Transform pos: -54.5,16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15891 components: - type: Transform pos: -49.5,-0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15895 components: - type: Transform pos: -49.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15898 components: - type: Transform pos: -59.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15924 components: - type: Transform pos: -60.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15938 components: - type: Transform pos: -59.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15939 components: - type: Transform pos: -60.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15941 components: - type: Transform pos: -60.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15942 components: - type: Transform pos: -60.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15943 components: - type: Transform pos: -60.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16005 components: - type: Transform pos: -54.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16021 components: - type: Transform pos: 0.5,-54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16024 components: - type: Transform pos: 8.5,-77.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16093 components: - type: Transform pos: -9.5,-73.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16120 components: - type: Transform pos: 2.5,-54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16134 components: - type: Transform pos: -53.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16136 components: - type: Transform pos: -53.5,-0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16141 components: - type: Transform pos: -53.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16142 components: - type: Transform pos: -53.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16202 components: - type: Transform pos: 77.5,-72.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16218 components: - type: Transform pos: 54.5,-53.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16291 components: - type: Transform pos: -53.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16292 components: - type: Transform pos: -51.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16293 components: - type: Transform pos: -52.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16356 components: - type: Transform pos: -50.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16565 components: - type: Transform pos: 78.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16571 components: - type: Transform pos: 79.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16578 components: - type: Transform pos: 74.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16583 components: - type: Transform pos: 71.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16584 components: - type: Transform pos: 73.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16589 components: - type: Transform pos: 74.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16601 components: - type: Transform pos: 71.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16610 components: - type: Transform pos: 71.5,-41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16664 components: - type: Transform pos: -2.5,-59.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16679 components: - type: Transform pos: 57.5,-61.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16845 components: - type: Transform pos: 68.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16909 components: - type: Transform pos: -41.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17177 components: - type: Transform pos: -1.5,-96.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17418 components: - type: Transform pos: -25.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17707 components: - type: Transform pos: 60.5,-52.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17708 components: - type: Transform pos: 62.5,-54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17709 components: - type: Transform pos: 62.5,-52.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17740 components: - type: Transform pos: 80.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17821 components: - type: Transform pos: -59.5,-53.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17825 components: - type: Transform pos: 84.5,-24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17829 components: - type: Transform pos: 86.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17831 components: - type: Transform pos: 86.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17833 components: - type: Transform pos: 86.5,-31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17840 components: - type: Transform pos: 83.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17895 components: - type: Transform pos: 62.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17920 components: - type: Transform pos: 61.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17921 components: - type: Transform pos: 63.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17923 components: - type: Transform pos: 60.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17946 components: - type: Transform pos: 90.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18094 components: - type: Transform pos: 14.5,17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18160 components: - type: Transform pos: 90.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18239 components: - type: Transform pos: 95.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18415 components: - type: Transform pos: 21.5,24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18418 components: - type: Transform pos: 84.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18445 components: - type: Transform pos: 92.5,-32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18448 components: - type: Transform pos: 92.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18490 components: - type: Transform pos: 94.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18491 components: - type: Transform pos: 95.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18492 components: - type: Transform pos: 97.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18493 components: - type: Transform pos: 97.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18494 components: - type: Transform pos: 97.5,-24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18939 components: - type: Transform rot: -1.5707963267948966 rad pos: 65.5,-41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18997 components: - type: Transform pos: 92.5,-54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18999 components: - type: Transform pos: 96.5,-50.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19195 components: - type: Transform pos: -0.5,-96.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19202 components: - type: Transform pos: 1.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19215 components: - type: Transform pos: 0.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19244 components: - type: Transform pos: -0.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19258 components: - type: Transform pos: -4.5,-66.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19276 components: - type: Transform pos: 7.5,-66.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19566 components: - type: Transform pos: 69.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19567 components: - type: Transform pos: 68.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19583 components: - type: Transform rot: 1.5707963267948966 rad pos: 79.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19585 components: - type: Transform pos: 62.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19586 components: - type: Transform pos: 69.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19589 components: - type: Transform pos: 69.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19590 components: - type: Transform pos: 61.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19597 components: - type: Transform rot: -1.5707963267948966 rad pos: 65.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20168 components: - type: Transform pos: 8.5,-71.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21867 components: - type: Transform pos: 60.5,-54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21884 components: - type: Transform pos: 39.5,24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21901 components: - type: Transform pos: 36.5,22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21903 components: - type: Transform pos: 39.5,25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21904 components: - type: Transform pos: 32.5,26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21909 components: - type: Transform pos: 34.5,20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21917 components: - type: Transform pos: -26.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21918 components: - type: Transform pos: 31.5,26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21920 components: - type: Transform pos: 35.5,23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21921 components: - type: Transform pos: 34.5,23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21931 components: - type: Transform pos: 27.5,30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21942 components: - type: Transform pos: -55.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21946 components: - type: Transform pos: -57.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 22011 components: - type: Transform pos: 26.5,27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 22012 components: - type: Transform pos: 26.5,29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 22050 components: - type: Transform pos: 28.5,27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 22052 components: - type: Transform pos: -57.5,-55.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 22080 components: - type: Transform pos: 28.5,29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 22595 components: - type: Transform pos: 28.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 22596 components: - type: Transform pos: 28.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23338 components: - type: Transform pos: -13.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23341 components: - type: Transform pos: -26.5,-53.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23357 components: - type: Transform pos: -25.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23667 components: - type: Transform pos: 46.5,25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23668 components: - type: Transform pos: 46.5,26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24530 components: - type: Transform rot: 1.5707963267948966 rad pos: 80.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24531 components: - type: Transform rot: 1.5707963267948966 rad pos: 81.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24791 components: - type: Transform rot: -1.5707963267948966 rad pos: -21.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: RemoteSignaller entities: - uid: 4210 @@ -135503,32 +134053,24 @@ entities: rot: 3.141592653589793 rad pos: 33.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6578 components: - type: Transform rot: 1.5707963267948966 rad pos: 29.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6787 components: - type: Transform rot: 3.141592653589793 rad pos: 34.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7263 components: - type: Transform rot: 1.5707963267948966 rad pos: 29.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: ShuttersNormalOpen entities: - uid: 186 @@ -135537,817 +134079,603 @@ entities: rot: 1.5707963267948966 rad pos: -25.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1700 components: - type: Transform rot: 3.141592653589793 rad pos: -22.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2243 components: - type: Transform rot: 3.141592653589793 rad pos: -21.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2759 components: - type: Transform pos: -3.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3232 components: - type: Transform pos: -6.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3236 components: - type: Transform pos: -8.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3238 components: - type: Transform pos: -7.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3778 components: - type: Transform rot: 1.5707963267948966 rad pos: -35.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3779 components: - type: Transform rot: 1.5707963267948966 rad pos: -35.5,-54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4048 components: - type: Transform rot: -1.5707963267948966 rad pos: -14.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4698 components: - type: Transform rot: -1.5707963267948966 rad pos: -31.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4699 components: - type: Transform rot: 3.141592653589793 rad pos: -29.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4700 components: - type: Transform rot: 3.141592653589793 rad pos: -28.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4701 components: - type: Transform rot: -1.5707963267948966 rad pos: -31.5,-48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4721 components: - type: Transform rot: 3.141592653589793 rad pos: -27.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4782 components: - type: Transform rot: -1.5707963267948966 rad pos: -31.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4796 components: - type: Transform rot: -1.5707963267948966 rad pos: -31.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5439 components: - type: Transform pos: -8.5,16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6345 components: - type: Transform pos: -4.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6351 components: - type: Transform rot: -1.5707963267948966 rad pos: -13.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6517 components: - type: Transform pos: -5.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10771 components: - type: Transform rot: 3.141592653589793 rad pos: -42.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10807 components: - type: Transform rot: 3.141592653589793 rad pos: -44.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11419 components: - type: Transform rot: -1.5707963267948966 rad pos: -14.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11421 components: - type: Transform rot: -1.5707963267948966 rad pos: -14.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11756 components: - type: Transform rot: -1.5707963267948966 rad pos: -21.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12072 components: - type: Transform pos: -7.5,16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12076 components: - type: Transform pos: -6.5,16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12193 components: - type: Transform pos: -2.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15624 components: - type: Transform rot: 1.5707963267948966 rad pos: 33.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15646 components: - type: Transform rot: 3.141592653589793 rad pos: -24.5,-49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15647 components: - type: Transform rot: 3.141592653589793 rad pos: -23.5,-49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15654 components: - type: Transform rot: 3.141592653589793 rad pos: -16.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15656 components: - type: Transform rot: 3.141592653589793 rad pos: -14.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15657 components: - type: Transform rot: 3.141592653589793 rad pos: -12.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15749 components: - type: Transform rot: 3.141592653589793 rad pos: -15.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16035 components: - type: Transform rot: -1.5707963267948966 rad pos: -21.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16036 components: - type: Transform rot: -1.5707963267948966 rad pos: -21.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16037 components: - type: Transform rot: -1.5707963267948966 rad pos: -21.5,-32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16090 components: - type: Transform pos: -1.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17052 components: - type: Transform rot: 3.141592653589793 rad pos: -9.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17053 components: - type: Transform rot: 3.141592653589793 rad pos: -7.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17616 components: - type: Transform rot: 1.5707963267948966 rad pos: 33.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17741 components: - type: Transform rot: 1.5707963267948966 rad pos: 33.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17930 components: - type: Transform pos: 28.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17943 components: - type: Transform rot: 3.141592653589793 rad pos: 28.5,-32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19574 components: - type: Transform pos: -19.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19575 components: - type: Transform pos: -19.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19576 components: - type: Transform pos: -15.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19577 components: - type: Transform pos: -15.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19578 components: - type: Transform rot: 1.5707963267948966 rad pos: 32.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19579 components: - type: Transform rot: 1.5707963267948966 rad pos: 32.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20731 components: - type: Transform rot: 3.141592653589793 rad pos: -45.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20758 components: - type: Transform rot: 3.141592653589793 rad pos: -44.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20768 components: - type: Transform rot: 3.141592653589793 rad pos: -46.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20769 components: - type: Transform rot: 3.141592653589793 rad pos: -46.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20770 components: - type: Transform rot: -1.5707963267948966 rad pos: -46.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20771 components: - type: Transform pos: -45.5,0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20772 components: - type: Transform pos: -44.5,0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21229 components: - type: Transform pos: -47.5,-25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21230 components: - type: Transform rot: 3.141592653589793 rad pos: -48.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21231 components: - type: Transform rot: 3.141592653589793 rad pos: -49.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21234 components: - type: Transform pos: -45.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21235 components: - type: Transform pos: -44.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21236 components: - type: Transform pos: -43.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21237 components: - type: Transform pos: -42.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21238 components: - type: Transform pos: -41.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21242 components: - type: Transform pos: -44.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21243 components: - type: Transform pos: -42.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21244 components: - type: Transform rot: 3.141592653589793 rad pos: -45.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21245 components: - type: Transform rot: 3.141592653589793 rad pos: -44.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21246 components: - type: Transform rot: 3.141592653589793 rad pos: -43.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21247 components: - type: Transform rot: 3.141592653589793 rad pos: -42.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21248 components: - type: Transform rot: 3.141592653589793 rad pos: -41.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21251 components: - type: Transform rot: 3.141592653589793 rad pos: -34.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21252 components: - type: Transform rot: -1.5707963267948966 rad pos: -36.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21253 components: - type: Transform rot: -1.5707963267948966 rad pos: -36.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21254 components: - type: Transform pos: -33.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21255 components: - type: Transform pos: -34.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21256 components: - type: Transform pos: -29.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21257 components: - type: Transform pos: -28.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21258 components: - type: Transform pos: -27.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21880 components: - type: Transform rot: 1.5707963267948966 rad pos: -25.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 22769 components: - type: Transform rot: 3.141592653589793 rad pos: -27.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 22770 components: - type: Transform rot: 3.141592653589793 rad pos: -26.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 22771 components: - type: Transform pos: -27.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 22772 components: - type: Transform pos: -28.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 22773 components: - type: Transform rot: -1.5707963267948966 rad pos: -32.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23360 components: - type: Transform rot: 3.141592653589793 rad pos: -26.5,-53.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23361 components: - type: Transform pos: -26.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23362 components: - type: Transform pos: -25.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23378 components: - type: Transform pos: -24.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24120 components: - type: Transform rot: -1.5707963267948966 rad pos: -26.5,5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24121 components: - type: Transform rot: -1.5707963267948966 rad pos: -26.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24122 components: - type: Transform rot: -1.5707963267948966 rad pos: -26.5,7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24123 components: - type: Transform rot: 3.141592653589793 rad pos: -25.5,12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24124 components: - type: Transform rot: 3.141592653589793 rad pos: -24.5,12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24125 components: - type: Transform rot: 3.141592653589793 rad pos: -23.5,12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24126 components: - type: Transform pos: -23.5,8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24127 components: - type: Transform pos: -24.5,8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24128 components: - type: Transform pos: -25.5,8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24817 components: - type: Transform rot: 3.141592653589793 rad pos: -24.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24818 components: - type: Transform rot: 3.141592653589793 rad pos: -25.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24819 components: - type: Transform rot: 3.141592653589793 rad pos: -28.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24820 components: - type: Transform rot: 3.141592653589793 rad pos: -29.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24821 components: - type: Transform rot: 3.141592653589793 rad pos: -27.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24822 components: - type: Transform rot: -1.5707963267948966 rad pos: -30.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: ShuttersWindowOpen entities: - uid: 10682 @@ -136356,37 +134684,27 @@ entities: rot: -1.5707963267948966 rad pos: -26.5,11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10686 components: - type: Transform rot: -1.5707963267948966 rad pos: -26.5,10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15630 components: - type: Transform pos: -17.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15631 components: - type: Transform pos: -18.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15632 components: - type: Transform pos: -16.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: ShuttleConsoleCircuitboard entities: - uid: 21971 @@ -139661,6 +137979,13 @@ entities: - type: Transform pos: -44.5,2.5 parent: 2 +- proto: SpawnPointHeadOfSecurityWeapon + entities: + - uid: 11313 + components: + - type: Transform + pos: -45.5,1.5 + parent: 2 - proto: SpawnPointJanitor entities: - uid: 20500 @@ -140239,6 +138564,13 @@ entities: - type: Transform pos: -21.5,-7.5 parent: 2 +- proto: SpawnPointWardenWeapon + entities: + - uid: 11315 + components: + - type: Transform + pos: -22.5,-6.5 + parent: 2 - proto: SpawnVendingMachineRestockFoodDrink entities: - uid: 20685 @@ -145077,134 +143409,96 @@ entities: - type: Transform pos: 8.5,-41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 471 components: - type: Transform pos: 19.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3132 components: - type: Transform pos: 37.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4151 components: - type: Transform pos: 8.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4870 components: - type: Transform pos: 8.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4872 components: - type: Transform pos: 8.5,-31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5905 components: - type: Transform pos: 8.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9883 components: - type: Transform pos: 17.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11969 components: - type: Transform pos: 8.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11979 components: - type: Transform pos: 36.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11981 components: - type: Transform pos: 37.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12023 components: - type: Transform pos: -49.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12043 components: - type: Transform pos: -49.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12073 components: - type: Transform pos: 29.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13377 components: - type: Transform pos: -47.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13732 components: - type: Transform pos: 8.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13884 components: - type: Transform pos: -47.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14253 components: - type: Transform pos: -44.5,15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14498 components: - type: Transform pos: -42.5,15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: ToiletDirtyWater entities: - uid: 905 @@ -162503,20 +160797,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: WeaponShotgunEnforcer - entities: - - uid: 20591 - components: - - type: Transform - pos: -22.486067,-6.1998725 - parent: 2 -- proto: WeaponSubMachineGunWt550 - entities: - - uid: 11313 - components: - - type: Transform - pos: -45.46237,1.5808802 - parent: 2 - proto: WeaponWaterPistol entities: - uid: 1138 @@ -162637,30 +160917,22 @@ entities: rot: 3.141592653589793 rad pos: -51.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7524 components: - type: Transform pos: -20.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7556 components: - type: Transform pos: -19.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12154 components: - type: Transform rot: 3.141592653589793 rad pos: -25.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -162677,8 +160949,6 @@ entities: rot: 3.141592653589793 rad pos: -24.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -162695,32 +160965,24 @@ entities: rot: -1.5707963267948966 rad pos: -14.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20568 components: - type: Transform rot: -1.5707963267948966 rad pos: -14.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21410 components: - type: Transform rot: -1.5707963267948966 rad pos: -14.5,-2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 22474 components: - type: Transform rot: -1.5707963267948966 rad pos: -14.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorChapelLocked entities: - uid: 5903 @@ -162729,8 +160991,6 @@ entities: rot: 1.5707963267948966 rad pos: 41.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorHydroponicsLocked entities: - uid: 3456 @@ -162739,16 +160999,12 @@ entities: rot: 1.5707963267948966 rad pos: -21.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3457 components: - type: Transform rot: 1.5707963267948966 rad pos: -21.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecure entities: - uid: 3235 @@ -162757,74 +161013,54 @@ entities: rot: 3.141592653589793 rad pos: 19.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4225 components: - type: Transform rot: 3.141592653589793 rad pos: 20.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4228 components: - type: Transform rot: 3.141592653589793 rad pos: 21.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4855 components: - type: Transform pos: -28.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4981 components: - type: Transform pos: 20.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5408 components: - type: Transform pos: -29.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5470 components: - type: Transform pos: -27.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7566 components: - type: Transform pos: -16.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7569 components: - type: Transform pos: -12.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7610 components: - type: Transform rot: 3.141592653589793 rad pos: -13.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -162838,70 +161074,52 @@ entities: rot: 1.5707963267948966 rad pos: -33.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9634 components: - type: Transform rot: -1.5707963267948966 rad pos: -31.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12433 components: - type: Transform rot: 1.5707963267948966 rad pos: 18.5,17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18592 components: - type: Transform pos: 4.5,15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18595 components: - type: Transform pos: 5.5,15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21759 components: - type: Transform rot: 3.141592653589793 rad pos: 21.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 22306 components: - type: Transform rot: 3.141592653589793 rad pos: -29.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 22307 components: - type: Transform rot: 3.141592653589793 rad pos: -28.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 22311 components: - type: Transform rot: 3.141592653589793 rad pos: -27.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureArmoryLocked entities: - uid: 11716 @@ -162909,22 +161127,16 @@ entities: - type: Transform pos: -29.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11724 components: - type: Transform pos: -28.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11782 components: - type: Transform pos: -25.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -162940,8 +161152,6 @@ entities: - type: Transform pos: -24.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -162960,16 +161170,12 @@ entities: rot: 1.5707963267948966 rad pos: -14.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2183 components: - type: Transform rot: 1.5707963267948966 rad pos: -14.5,-2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureBrigLocked entities: - uid: 28 @@ -162978,16 +161184,12 @@ entities: rot: 3.141592653589793 rad pos: -29.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11971 components: - type: Transform rot: 3.141592653589793 rad pos: -28.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureCargoLocked entities: - uid: 5299 @@ -162995,47 +161197,35 @@ entities: - type: Transform pos: 6.5,16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11065 components: - type: Transform pos: 12.5,21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14289 components: - type: Transform rot: 3.141592653589793 rad pos: 5.5,15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15296 components: - type: Transform rot: 3.141592653589793 rad pos: 4.5,15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 22430 components: - type: Transform rot: 3.141592653589793 rad pos: 15.5,13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 22441 components: - type: Transform rot: 3.141592653589793 rad pos: 16.5,13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureChemistryLocked entities: - uid: 144 @@ -163043,45 +161233,33 @@ entities: - type: Transform pos: -29.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3361 components: - type: Transform rot: 1.5707963267948966 rad pos: -40.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10414 components: - type: Transform pos: -27.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11937 components: - type: Transform rot: 1.5707963267948966 rad pos: -27.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12508 components: - type: Transform pos: -28.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 22305 components: - type: Transform pos: -35.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureCommandLocked entities: - uid: 66 @@ -163090,47 +161268,35 @@ entities: rot: 3.141592653589793 rad pos: 27.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4818 components: - type: Transform rot: 1.5707963267948966 rad pos: 28.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7005 components: - type: Transform rot: 3.141592653589793 rad pos: 23.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7606 components: - type: Transform rot: -1.5707963267948966 rad pos: 30.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11497 components: - type: Transform pos: 9.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12609 components: - type: Transform rot: -1.5707963267948966 rad pos: 90.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureEngineeringLocked entities: - uid: 3998 @@ -163139,16 +161305,12 @@ entities: rot: 1.5707963267948966 rad pos: -14.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17470 components: - type: Transform rot: 1.5707963267948966 rad pos: -14.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureHeadOfPersonnelLocked entities: - uid: 7609 @@ -163156,8 +161318,6 @@ entities: - type: Transform pos: -13.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -163172,32 +161332,24 @@ entities: - type: Transform pos: 28.5,5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8316 components: - type: Transform rot: -1.5707963267948966 rad pos: 29.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17460 components: - type: Transform rot: -1.5707963267948966 rad pos: 29.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21885 components: - type: Transform rot: -1.5707963267948966 rad pos: 29.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureKitchenLocked entities: - uid: 5342 @@ -163206,32 +161358,24 @@ entities: rot: 3.141592653589793 rad pos: -6.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11750 components: - type: Transform rot: 3.141592653589793 rad pos: -5.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21283 components: - type: Transform rot: 3.141592653589793 rad pos: -8.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 22781 components: - type: Transform rot: 3.141592653589793 rad pos: -7.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureMedicalLocked entities: - uid: 4822 @@ -163240,47 +161384,35 @@ entities: rot: 3.141592653589793 rad pos: -35.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8732 components: - type: Transform rot: -1.5707963267948966 rad pos: -40.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21758 components: - type: Transform pos: 21.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 22137 components: - type: Transform rot: 3.141592653589793 rad pos: -29.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 22150 components: - type: Transform rot: 3.141592653589793 rad pos: -27.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 22310 components: - type: Transform rot: 3.141592653589793 rad pos: -28.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureSalvageLocked entities: - uid: 11054 @@ -163289,8 +161421,6 @@ entities: rot: 3.141592653589793 rad pos: 12.5,21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureScienceLocked entities: - uid: 4194 @@ -163298,79 +161428,57 @@ entities: - type: Transform pos: 20.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4229 components: - type: Transform pos: 19.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4230 components: - type: Transform pos: 21.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4273 components: - type: Transform pos: 20.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4373 components: - type: Transform pos: 39.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4392 components: - type: Transform pos: 40.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4396 components: - type: Transform pos: 39.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4402 components: - type: Transform pos: 38.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4514 components: - type: Transform rot: 1.5707963267948966 rad pos: 30.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5157 components: - type: Transform pos: 34.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23327 components: - type: Transform pos: 33.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureSecurityLocked entities: - uid: 152 @@ -163378,24 +161486,18 @@ entities: - type: Transform pos: -39.5,-0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11625 components: - type: Transform rot: 3.141592653589793 rad pos: -44.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13169 components: - type: Transform rot: -1.5707963267948966 rad pos: 16.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorServiceLocked entities: - uid: 5831 @@ -163404,16 +161506,12 @@ entities: rot: -1.5707963267948966 rad pos: 17.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6318 components: - type: Transform rot: -1.5707963267948966 rad pos: 17.5,-41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorTheatreLocked entities: - uid: 3475 @@ -163422,16 +161520,12 @@ entities: rot: 1.5707963267948966 rad pos: -4.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16043 components: - type: Transform rot: 3.141592653589793 rad pos: 13.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: Window entities: - uid: 724 @@ -163439,211 +161533,151 @@ entities: - type: Transform pos: -36.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2324 components: - type: Transform pos: 16.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2400 components: - type: Transform pos: 12.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2405 components: - type: Transform pos: 12.5,-25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2995 components: - type: Transform pos: -21.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3363 components: - type: Transform pos: -19.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3364 components: - type: Transform pos: -18.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3371 components: - type: Transform pos: -17.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3519 components: - type: Transform pos: -0.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3525 components: - type: Transform pos: 13.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3774 components: - type: Transform pos: 12.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3783 components: - type: Transform pos: 15.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3926 components: - type: Transform pos: -21.5,-24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6921 components: - type: Transform pos: 12.5,-49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7537 components: - type: Transform pos: 13.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7708 components: - type: Transform pos: 12.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7780 components: - type: Transform pos: 12.5,-53.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7885 components: - type: Transform pos: 17.5,-10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7891 components: - type: Transform pos: 17.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8902 components: - type: Transform pos: 16.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9433 components: - type: Transform pos: 12.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9573 components: - type: Transform pos: 12.5,-24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9620 components: - type: Transform pos: 13.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9652 components: - type: Transform pos: 17.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10257 components: - type: Transform pos: 13.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12070 components: - type: Transform pos: -36.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12197 components: - type: Transform pos: 41.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12752 components: - type: Transform pos: 20.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13220 components: - type: Transform pos: 20.5,-41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23124 components: - type: Transform pos: -0.5,-41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindowDirectional entities: - uid: 339 @@ -163652,152 +161686,112 @@ entities: rot: 3.141592653589793 rad pos: -44.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4198 components: - type: Transform rot: 1.5707963267948966 rad pos: 36.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4351 components: - type: Transform pos: 37.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4358 components: - type: Transform pos: 38.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4607 components: - type: Transform pos: -30.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4611 components: - type: Transform pos: -26.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5008 components: - type: Transform pos: -39.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6173 components: - type: Transform rot: -1.5707963267948966 rad pos: 17.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6715 components: - type: Transform pos: -40.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8470 components: - type: Transform rot: -1.5707963267948966 rad pos: -40.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9925 components: - type: Transform rot: 3.141592653589793 rad pos: -45.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10232 components: - type: Transform pos: -27.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10234 components: - type: Transform rot: 3.141592653589793 rad pos: -30.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10466 components: - type: Transform rot: -1.5707963267948966 rad pos: -42.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10659 components: - type: Transform rot: 3.141592653589793 rad pos: -27.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11263 components: - type: Transform rot: 3.141592653589793 rad pos: -29.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11334 components: - type: Transform rot: 3.141592653589793 rad pos: -26.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11940 components: - type: Transform pos: -29.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12634 components: - type: Transform rot: 1.5707963267948966 rad pos: -44.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 22130 components: - type: Transform rot: 1.5707963267948966 rad pos: -52.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindowFrostedDirectional entities: - uid: 3172 @@ -163806,118 +161800,88 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3798 components: - type: Transform rot: 1.5707963267948966 rad pos: -1.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4311 components: - type: Transform rot: 1.5707963267948966 rad pos: -1.5,-53.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4511 components: - type: Transform rot: 3.141592653589793 rad pos: -31.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4705 components: - type: Transform rot: 3.141592653589793 rad pos: -29.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4706 components: - type: Transform rot: 3.141592653589793 rad pos: -30.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5600 components: - type: Transform rot: 1.5707963267948966 rad pos: 41.5,-10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7503 components: - type: Transform pos: -18.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7512 components: - type: Transform pos: -21.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7526 components: - type: Transform rot: 1.5707963267948966 rad pos: -20.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7528 components: - type: Transform rot: -1.5707963267948966 rad pos: -19.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8353 components: - type: Transform rot: 1.5707963267948966 rad pos: 41.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10574 components: - type: Transform rot: 1.5707963267948966 rad pos: -1.5,-52.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12723 components: - type: Transform rot: -1.5707963267948966 rad pos: 4.5,-53.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14965 components: - type: Transform rot: -1.5707963267948966 rad pos: 4.5,-52.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindowReinforcedDirectional entities: - uid: 341 @@ -163926,643 +161890,473 @@ entities: rot: -1.5707963267948966 rad pos: 30.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 616 components: - type: Transform rot: 1.5707963267948966 rad pos: -18.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2249 components: - type: Transform rot: 3.141592653589793 rad pos: 24.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3098 components: - type: Transform pos: -3.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3416 components: - type: Transform pos: -19.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3417 components: - type: Transform pos: -15.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3420 components: - type: Transform pos: -18.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3421 components: - type: Transform pos: -17.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3422 components: - type: Transform pos: -16.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3474 components: - type: Transform pos: 13.5,-31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3510 components: - type: Transform rot: 3.141592653589793 rad pos: 12.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3553 components: - type: Transform pos: 31.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3587 components: - type: Transform rot: 3.141592653589793 rad pos: 14.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3618 components: - type: Transform pos: 14.5,-31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3645 components: - type: Transform rot: 1.5707963267948966 rad pos: 14.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3647 components: - type: Transform rot: 1.5707963267948966 rad pos: 14.5,-31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3648 components: - type: Transform rot: -1.5707963267948966 rad pos: 12.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3649 components: - type: Transform rot: -1.5707963267948966 rad pos: 12.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3653 components: - type: Transform pos: 12.5,-31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3654 components: - type: Transform rot: -1.5707963267948966 rad pos: 12.5,-31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3658 components: - type: Transform rot: 1.5707963267948966 rad pos: 14.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3961 components: - type: Transform pos: -1.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4144 components: - type: Transform rot: -1.5707963267948966 rad pos: -38.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4191 components: - type: Transform pos: 21.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4197 components: - type: Transform rot: 1.5707963267948966 rad pos: -9.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4224 components: - type: Transform pos: 19.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4389 components: - type: Transform rot: 1.5707963267948966 rad pos: 40.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4403 components: - type: Transform rot: -1.5707963267948966 rad pos: 38.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4715 components: - type: Transform rot: 1.5707963267948966 rad pos: 28.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4777 components: - type: Transform rot: 1.5707963267948966 rad pos: 10.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4916 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5595 components: - type: Transform rot: 1.5707963267948966 rad pos: 28.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5682 components: - type: Transform pos: 29.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6239 components: - type: Transform rot: -1.5707963267948966 rad pos: -38.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6497 components: - type: Transform pos: -18.5,-54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6662 components: - type: Transform rot: 3.141592653589793 rad pos: 25.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7393 components: - type: Transform rot: -1.5707963267948966 rad pos: 28.5,5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7565 components: - type: Transform pos: -15.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7567 components: - type: Transform pos: -14.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7568 components: - type: Transform pos: -13.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7622 components: - type: Transform rot: 3.141592653589793 rad pos: 48.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7645 components: - type: Transform rot: 1.5707963267948966 rad pos: -54.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7920 components: - type: Transform pos: 19.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8087 components: - type: Transform pos: 29.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8224 components: - type: Transform pos: 21.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8350 components: - type: Transform rot: 3.141592653589793 rad pos: 26.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9252 components: - type: Transform rot: 3.141592653589793 rad pos: 50.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9259 components: - type: Transform pos: 48.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9301 components: - type: Transform rot: 3.141592653589793 rad pos: 49.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9303 components: - type: Transform pos: 49.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9325 components: - type: Transform pos: 50.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9338 components: - type: Transform rot: 3.141592653589793 rad pos: 48.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9340 components: - type: Transform rot: 3.141592653589793 rad pos: 49.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9341 components: - type: Transform rot: 3.141592653589793 rad pos: 50.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9342 components: - type: Transform pos: 50.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9343 components: - type: Transform pos: 49.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9344 components: - type: Transform pos: 48.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9727 components: - type: Transform pos: -17.5,-54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9728 components: - type: Transform pos: -16.5,-54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10844 components: - type: Transform rot: 1.5707963267948966 rad pos: -36.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10847 components: - type: Transform rot: 1.5707963267948966 rad pos: -36.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10966 components: - type: Transform rot: 3.141592653589793 rad pos: -43.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11019 components: - type: Transform pos: 8.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11046 components: - type: Transform rot: 3.141592653589793 rad pos: -45.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11305 components: - type: Transform rot: -1.5707963267948966 rad pos: 16.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11356 components: - type: Transform rot: -1.5707963267948966 rad pos: 30.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11500 components: - type: Transform pos: 10.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12994 components: - type: Transform rot: 3.141592653589793 rad pos: -42.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12996 components: - type: Transform rot: 3.141592653589793 rad pos: -43.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12998 components: - type: Transform rot: 3.141592653589793 rad pos: -44.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12999 components: - type: Transform rot: 3.141592653589793 rad pos: -45.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13170 components: - type: Transform rot: 1.5707963267948966 rad pos: 10.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13231 components: - type: Transform rot: 1.5707963267948966 rad pos: -54.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18244 components: - type: Transform pos: 30.5,-78.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18245 components: - type: Transform rot: -1.5707963267948966 rad pos: 31.5,-79.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18247 components: - type: Transform rot: 1.5707963267948966 rad pos: 29.5,-79.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18248 components: - type: Transform rot: 3.141592653589793 rad pos: 30.5,-80.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18460 components: - type: Transform rot: 1.5707963267948966 rad pos: 89.5,-31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18462 components: - type: Transform rot: 1.5707963267948966 rad pos: 89.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19631 components: - type: Transform pos: -35.5,15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19632 components: - type: Transform pos: -34.5,15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19633 components: - type: Transform pos: -33.5,15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21157 components: - type: Transform rot: 1.5707963267948966 rad pos: -18.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 22703 components: - type: Transform pos: -22.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23011 components: - type: Transform pos: -23.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: Wirecutter entities: - uid: 7428 From 19b62382e0fd9b7b1b9d43111e0ebb1bd9e96df5 Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Tue, 4 Nov 2025 13:06:06 -0700 Subject: [PATCH 101/121] bagel update (#41290) --- Resources/Maps/bagel.yml | 3257 +------------------------------------- 1 file changed, 37 insertions(+), 3220 deletions(-) diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml index e94fcdd711..8f26ed0c13 100644 --- a/Resources/Maps/bagel.yml +++ b/Resources/Maps/bagel.yml @@ -1,11 +1,11 @@ meta: format: 7 category: Map - engineVersion: 266.0.0 + engineVersion: 267.3.0 forkId: "" forkVersion: "" - time: 09/15/2025 00:43:45 - entityCount: 25523 + time: 11/04/2025 19:44:06 + entityCount: 25522 maps: - 943 grids: @@ -139,7 +139,7 @@ entities: version: 7 -2,-1: ind: -2,-1 - tiles: XQAAAAAAAGwAAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAH4AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAfgAAAAAAAF0AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAH4AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABsAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAH4AAAAAAABdAAAAAAAAXQAAAAAAAGwAAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABsAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAfgAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAAB+AAAAAAAAXQAAAAAAAF0AAAAAAAB+AAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAGwAAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAfgAAAAAAAF0AAAAAAABdAAAAAAAAbAAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAGwAAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAAB+AAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAF0AAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAE8AAAAAAABPAAAAAAAATwAAAAAAAE8AAAAAAABPAAAAAAAAfgAAAAAAAGwAAAAAAABdAAAAAAAAbAAAAAAAAH4AAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAA/AAAAAAAAfgAAAAAAAGwAAAAAAABPAAAAAAAATwAAAAAAAE8AAAAAAABPAAAAAAAATwAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAPwAAAAAAAD8AAAAAAAA/AAAAAAAAPwAAAAAAAH4AAAAAAABsAAAAAAAATwAAAAAAAE8AAAAAAABPAAAAAAAATwAAAAAAAE8AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAE8AAAAAAABPAAAAAAAATwAAAAAAAE8AAAAAAABPAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAAB+AAAAAAAALgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAbAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAB8AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAH4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAfAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAABsAAAAAAAAHwAAAAAAAC4AAAAAAAAuAAAAAAAAHwAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAbAAAAAAAAB8AAAAAAAAuAAAAAAAALgAAAAAAAB8AAAAAAAB+AAAAAAAAfgAAAAAAAA== + tiles: XQAAAAAAAGwAAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAfgAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAH4AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAfgAAAAAAAF0AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAH4AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABsAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAH4AAAAAAABdAAAAAAAAXQAAAAAAAGwAAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABsAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAfgAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAAB+AAAAAAAAXQAAAAAAAF0AAAAAAAB+AAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAfgAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAGwAAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAfgAAAAAAAF0AAAAAAABdAAAAAAAAbAAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAGwAAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAAB+AAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAF0AAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAE8AAAAAAABPAAAAAAAATwAAAAAAAE8AAAAAAABPAAAAAAAAfgAAAAAAAGwAAAAAAABdAAAAAAAAbAAAAAAAAH4AAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAA/AAAAAAAAfgAAAAAAAGwAAAAAAABPAAAAAAAATwAAAAAAAE8AAAAAAABPAAAAAAAATwAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAPwAAAAAAAD8AAAAAAAA/AAAAAAAAPwAAAAAAAH4AAAAAAABsAAAAAAAATwAAAAAAAE8AAAAAAABPAAAAAAAATwAAAAAAAE8AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAE8AAAAAAABPAAAAAAAATwAAAAAAAE8AAAAAAABPAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAAB+AAAAAAAALgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAbAAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAB8AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAAAXQAAAAAAAH4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAfAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAABsAAAAAAAAHwAAAAAAAC4AAAAAAAAuAAAAAAAAHwAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAbAAAAAAAAB8AAAAAAAAuAAAAAAAALgAAAAAAAB8AAAAAAAB+AAAAAAAAfgAAAAAAAA== version: 7 -2,0: ind: -2,0 @@ -17942,11 +17942,6 @@ entities: - type: Transform pos: -16.5,8.5 parent: 60 - - uid: 1120 - components: - - type: Transform - pos: -24.5,9.5 - parent: 60 - uid: 1152 components: - type: Transform @@ -18072,10 +18067,10 @@ entities: - type: Transform pos: -57.5,-22.5 parent: 60 - - uid: 1821 + - uid: 1824 components: - type: Transform - pos: -23.5,9.5 + pos: -23.5,8.5 parent: 60 - uid: 1860 components: @@ -19217,6 +19212,16 @@ entities: - type: Transform pos: 10.5,-2.5 parent: 7536 + - uid: 8215 + components: + - type: Transform + pos: -24.5,8.5 + parent: 60 + - uid: 8221 + components: + - type: Transform + pos: -25.5,8.5 + parent: 60 - uid: 8275 components: - type: Transform @@ -27132,11 +27137,6 @@ entities: - type: Transform pos: -25.5,10.5 parent: 60 - - uid: 14578 - components: - - type: Transform - pos: -25.5,9.5 - parent: 60 - uid: 14579 components: - type: Transform @@ -111887,8 +111887,6 @@ entities: - type: Transform pos: -40.5,-33.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - proto: InflatableWallStack entities: - uid: 15194 @@ -113528,18 +113526,6 @@ entities: - type: Transform pos: -26.668507,-6.333041 parent: 60 -- proto: MagazinePistolSubMachineGunTopMounted - entities: - - uid: 8215 - components: - - type: Transform - pos: -29.675177,0.49813566 - parent: 60 - - uid: 8221 - components: - - type: Transform - pos: -29.435595,0.3834729 - parent: 60 - proto: MaintenanceFluffSpawner entities: - uid: 1463 @@ -115493,47 +115479,35 @@ entities: - type: Transform pos: 48.5,-26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3007 components: - type: Transform pos: 49.5,-26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3008 components: - type: Transform rot: -1.5707963267948966 rad pos: 50.5,-28.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3009 components: - type: Transform rot: -1.5707963267948966 rad pos: 50.5,-27.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3010 components: - type: Transform rot: -1.5707963267948966 rad pos: 50.5,-29.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 23865 components: - type: Transform rot: -1.5707963267948966 rad pos: -54.5,-3.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - proto: PlasmaWindoorSecureScienceLocked entities: - uid: 23868 @@ -115541,22 +115515,16 @@ entities: - type: Transform pos: -57.5,-2.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 23869 components: - type: Transform pos: -56.5,-2.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 23870 components: - type: Transform pos: -55.5,-2.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - proto: PlasticFlapsAirtightClear entities: - uid: 1873 @@ -122530,362 +122498,262 @@ entities: - type: Transform pos: -53.5,51.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7333 components: - type: Transform pos: -53.5,49.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7777 components: - type: Transform pos: 67.5,-27.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7778 components: - type: Transform pos: 68.5,-26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7779 components: - type: Transform pos: 69.5,-27.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7783 components: - type: Transform pos: 68.5,-28.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7942 components: - type: Transform pos: -12.5,-4.5 parent: 7536 - - type: DeltaPressure - gridUid: 7536 - uid: 7943 components: - type: Transform pos: -10.5,-4.5 parent: 7536 - - type: DeltaPressure - gridUid: 7536 - uid: 7944 components: - type: Transform pos: -10.5,-0.5 parent: 7536 - - type: DeltaPressure - gridUid: 7536 - uid: 7945 components: - type: Transform pos: -12.5,-0.5 parent: 7536 - - type: DeltaPressure - gridUid: 7536 - uid: 7946 components: - type: Transform pos: -4.5,-4.5 parent: 7536 - - type: DeltaPressure - gridUid: 7536 - uid: 7947 components: - type: Transform pos: -0.5,-4.5 parent: 7536 - - type: DeltaPressure - gridUid: 7536 - uid: 7948 components: - type: Transform pos: 3.5,-4.5 parent: 7536 - - type: DeltaPressure - gridUid: 7536 - uid: 7949 components: - type: Transform pos: 2.5,-0.5 parent: 7536 - - type: DeltaPressure - gridUid: 7536 - uid: 7950 components: - type: Transform pos: 3.5,-0.5 parent: 7536 - - type: DeltaPressure - gridUid: 7536 - uid: 7951 components: - type: Transform pos: 4.5,-0.5 parent: 7536 - - type: DeltaPressure - gridUid: 7536 - uid: 7952 components: - type: Transform pos: 12.5,-4.5 parent: 7536 - - type: DeltaPressure - gridUid: 7536 - uid: 7953 components: - type: Transform pos: 14.5,-2.5 parent: 7536 - - type: DeltaPressure - gridUid: 7536 - uid: 7954 components: - type: Transform pos: 12.5,-0.5 parent: 7536 - - type: DeltaPressure - gridUid: 7536 - uid: 9376 components: - type: Transform pos: -56.5,4.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12602 components: - type: Transform pos: -56.5,3.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12610 components: - type: Transform pos: -56.5,2.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14807 components: - type: Transform pos: -30.5,44.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14808 components: - type: Transform pos: -33.5,45.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14820 components: - type: Transform pos: -42.5,38.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14959 components: - type: Transform pos: -42.5,44.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14963 components: - type: Transform pos: -42.5,36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14970 components: - type: Transform pos: -31.5,44.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14975 components: - type: Transform pos: -33.5,46.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15031 components: - type: Transform pos: -42.5,42.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15037 components: - type: Transform pos: -42.5,40.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15040 components: - type: Transform pos: -42.5,34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15043 components: - type: Transform pos: -29.5,46.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15046 components: - type: Transform pos: -32.5,44.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15051 components: - type: Transform pos: -42.5,32.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15052 components: - type: Transform pos: -29.5,45.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15174 components: - type: Transform rot: 1.5707963267948966 rad pos: -19.5,50.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15273 components: - type: Transform pos: -29.5,47.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15276 components: - type: Transform pos: -33.5,47.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15336 components: - type: Transform rot: 1.5707963267948966 rad pos: -20.5,50.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15390 components: - type: Transform rot: 1.5707963267948966 rad pos: -20.5,54.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15422 components: - type: Transform rot: 1.5707963267948966 rad pos: -21.5,50.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15427 components: - type: Transform rot: 1.5707963267948966 rad pos: -22.5,51.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15451 components: - type: Transform rot: 1.5707963267948966 rad pos: -21.5,54.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15499 components: - type: Transform rot: 1.5707963267948966 rad pos: -22.5,52.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15500 components: - type: Transform rot: 1.5707963267948966 rad pos: -22.5,53.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16957 components: - type: Transform rot: 1.5707963267948966 rad pos: -18.5,51.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16961 components: - type: Transform rot: 1.5707963267948966 rad pos: -18.5,53.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16966 components: - type: Transform rot: 1.5707963267948966 rad pos: -19.5,54.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 23455 components: - type: Transform pos: -60.5,41.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - proto: ReinforcedWindow entities: - uid: 10 @@ -122893,5826 +122761,4168 @@ entities: - type: Transform pos: -25.5,-12.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 209 components: - type: Transform pos: 7.5,-18.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 256 components: - type: Transform pos: 57.5,-5.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 260 components: - type: Transform pos: 57.5,-6.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 320 components: - type: Transform pos: 57.5,-7.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 385 components: - type: Transform pos: -1.5,-14.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 386 components: - type: Transform pos: -1.5,-13.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 387 components: - type: Transform pos: 2.5,-13.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 388 components: - type: Transform pos: 2.5,-14.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 389 components: - type: Transform pos: 2.5,-16.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 390 components: - type: Transform pos: 2.5,-17.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 391 components: - type: Transform pos: -1.5,-16.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 392 components: - type: Transform pos: -1.5,-17.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 393 components: - type: Transform pos: -1.5,-19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 394 components: - type: Transform pos: -1.5,-20.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 395 components: - type: Transform pos: 2.5,-19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 396 components: - type: Transform pos: 2.5,-20.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 404 components: - type: Transform pos: 20.5,2.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 408 components: - type: Transform pos: 20.5,1.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 493 components: - type: Transform pos: -29.5,-12.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 524 components: - type: Transform pos: -5.5,7.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 525 components: - type: Transform pos: 5.5,7.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 563 components: - type: Transform pos: -68.5,11.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 603 components: - type: Transform pos: 14.5,-4.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 604 components: - type: Transform pos: -4.5,7.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 605 components: - type: Transform pos: -2.5,8.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 607 components: - type: Transform pos: -1.5,8.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 608 components: - type: Transform pos: -0.5,8.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 609 components: - type: Transform pos: 1.5,8.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 610 components: - type: Transform pos: 2.5,8.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 611 components: - type: Transform pos: 3.5,8.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 613 components: - type: Transform pos: 6.5,7.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 637 components: - type: Transform pos: -9.5,1.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 646 components: - type: Transform pos: 6.5,-18.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 665 components: - type: Transform pos: 5.5,-20.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 768 components: - type: Transform pos: 5.5,-19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 797 components: - type: Transform pos: -17.5,12.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 798 components: - type: Transform pos: -17.5,11.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 813 components: - type: Transform rot: -1.5707963267948966 rad pos: -16.5,-21.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 845 components: - type: Transform rot: -1.5707963267948966 rad pos: -15.5,-21.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 993 components: - type: Transform rot: 1.5707963267948966 rad pos: -21.5,-17.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1126 components: - type: Transform rot: 1.5707963267948966 rad pos: -14.5,-3.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1131 components: - type: Transform pos: -17.5,-10.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1133 components: - type: Transform rot: 1.5707963267948966 rad pos: -14.5,-2.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1139 components: - type: Transform rot: 1.5707963267948966 rad pos: -14.5,-1.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1140 components: - type: Transform rot: 1.5707963267948966 rad pos: -14.5,-0.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1156 components: - type: Transform rot: 1.5707963267948966 rad pos: -7.5,-13.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1158 components: - type: Transform rot: 1.5707963267948966 rad pos: -7.5,-14.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1174 components: - type: Transform rot: 1.5707963267948966 rad pos: -19.5,-10.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1192 components: - type: Transform pos: -6.5,-32.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1193 components: - type: Transform pos: -7.5,-32.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1194 components: - type: Transform pos: -8.5,-32.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1337 components: - type: Transform pos: 6.5,-26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1338 components: - type: Transform pos: 5.5,-26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1442 components: - type: Transform pos: 9.5,-17.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1444 components: - type: Transform pos: 9.5,-15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1450 components: - type: Transform pos: 2.5,-36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1474 components: - type: Transform rot: 1.5707963267948966 rad pos: -20.5,-10.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1550 components: - type: Transform pos: -21.5,-18.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1551 components: - type: Transform pos: -21.5,-19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1552 components: - type: Transform pos: -22.5,-2.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1676 components: - type: Transform pos: -23.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1723 components: - type: Transform pos: -25.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1813 components: - type: Transform rot: 1.5707963267948966 rad pos: -7.5,-12.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1836 components: - type: Transform pos: -28.5,-1.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1838 components: - type: Transform pos: -29.5,-1.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1916 components: - type: Transform rot: 1.5707963267948966 rad pos: -5.5,-16.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1926 components: - type: Transform rot: -1.5707963267948966 rad pos: -11.5,-10.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1927 components: - type: Transform rot: -1.5707963267948966 rad pos: -11.5,-9.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2057 components: - type: Transform pos: -30.5,-27.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2063 components: - type: Transform pos: -9.5,-33.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2112 components: - type: Transform rot: -1.5707963267948966 rad pos: -25.5,-15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2139 components: - type: Transform pos: 38.5,-15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2152 components: - type: Transform pos: 32.5,-15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2153 components: - type: Transform pos: 34.5,-15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2155 components: - type: Transform pos: 35.5,-15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2411 components: - type: Transform pos: 36.5,-28.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2517 components: - type: Transform pos: 42.5,-32.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2542 components: - type: Transform pos: 10.5,-10.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2591 components: - type: Transform pos: -69.5,-17.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2657 components: - type: Transform pos: 36.5,-22.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2663 components: - type: Transform pos: 42.5,-28.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2668 components: - type: Transform pos: 42.5,-26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2683 components: - type: Transform pos: 41.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2739 components: - type: Transform pos: 26.5,-42.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2740 components: - type: Transform pos: 27.5,-42.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2741 components: - type: Transform pos: 35.5,-42.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2742 components: - type: Transform pos: 36.5,-42.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2744 components: - type: Transform pos: 30.5,-41.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2745 components: - type: Transform pos: 31.5,-41.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2746 components: - type: Transform pos: 32.5,-41.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2767 components: - type: Transform pos: 36.5,-24.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2975 components: - type: Transform pos: 53.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2976 components: - type: Transform pos: 53.5,-26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2977 components: - type: Transform pos: 53.5,-27.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2978 components: - type: Transform pos: 53.5,-28.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3032 components: - type: Transform pos: -62.5,-24.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3040 components: - type: Transform pos: 46.5,-22.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3084 components: - type: Transform pos: 50.5,-12.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3101 components: - type: Transform pos: 51.5,-19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3102 components: - type: Transform pos: 49.5,-19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3105 components: - type: Transform pos: 48.5,-19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3131 components: - type: Transform pos: 32.5,-59.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3132 components: - type: Transform pos: 30.5,-59.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3140 components: - type: Transform pos: -64.5,-9.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3213 components: - type: Transform pos: 47.5,-19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3326 components: - type: Transform pos: 30.5,-58.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3359 components: - type: Transform pos: -54.5,-30.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3360 components: - type: Transform pos: -68.5,7.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3371 components: - type: Transform pos: -64.5,-2.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3388 components: - type: Transform pos: -64.5,-13.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3400 components: - type: Transform pos: -59.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3439 components: - type: Transform pos: 56.5,-26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3442 components: - type: Transform pos: 50.5,-16.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3443 components: - type: Transform pos: 56.5,-27.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3444 components: - type: Transform pos: 50.5,-14.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3445 components: - type: Transform pos: 50.5,-13.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3450 components: - type: Transform pos: 56.5,-31.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3470 components: - type: Transform pos: 60.5,-35.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3501 components: - type: Transform pos: 55.5,-33.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3503 components: - type: Transform pos: 54.5,-33.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3701 components: - type: Transform pos: 57.5,-12.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3704 components: - type: Transform pos: 57.5,-11.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3739 components: - type: Transform pos: 54.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3796 components: - type: Transform pos: -1.5,-33.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3797 components: - type: Transform pos: -1.5,-34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3809 components: - type: Transform pos: -16.5,-39.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3810 components: - type: Transform pos: -16.5,-40.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3811 components: - type: Transform pos: -16.5,-41.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3824 components: - type: Transform pos: -1.5,-38.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3825 components: - type: Transform pos: -1.5,-37.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3851 components: - type: Transform pos: -18.5,-44.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3877 components: - type: Transform pos: -11.5,-38.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3878 components: - type: Transform pos: -12.5,-38.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3879 components: - type: Transform pos: -10.5,-38.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3902 components: - type: Transform pos: -8.5,-36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3903 components: - type: Transform pos: -7.5,-36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3904 components: - type: Transform pos: -6.5,-36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3908 components: - type: Transform pos: -11.5,-35.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4056 components: - type: Transform pos: -36.5,-29.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4067 components: - type: Transform pos: -36.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4068 components: - type: Transform pos: -35.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4069 components: - type: Transform pos: -34.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4070 components: - type: Transform pos: -34.5,-29.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4071 components: - type: Transform pos: -35.5,-29.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4075 components: - type: Transform pos: 29.5,-56.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4084 components: - type: Transform pos: -40.5,-27.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4088 components: - type: Transform pos: 46.5,-20.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4091 components: - type: Transform pos: 39.5,-21.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4301 components: - type: Transform pos: -51.5,-35.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4341 components: - type: Transform pos: -52.5,-33.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4342 components: - type: Transform pos: -50.5,-27.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4343 components: - type: Transform pos: -51.5,-27.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4344 components: - type: Transform pos: -52.5,-28.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4446 components: - type: Transform pos: -55.5,-30.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4447 components: - type: Transform pos: -56.5,-32.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4454 components: - type: Transform pos: -66.5,-2.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4456 components: - type: Transform pos: -67.5,-1.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4466 components: - type: Transform pos: -52.5,-29.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4493 components: - type: Transform pos: 42.5,-16.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4512 components: - type: Transform pos: 8.5,-18.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4518 components: - type: Transform pos: 40.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4531 components: - type: Transform pos: 14.5,-13.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4549 components: - type: Transform pos: -62.5,-6.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4599 components: - type: Transform pos: 59.5,-19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4600 components: - type: Transform pos: 59.5,-18.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4601 components: - type: Transform pos: 59.5,-17.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4623 components: - type: Transform pos: 2.5,-35.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4750 components: - type: Transform pos: -19.5,-52.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4751 components: - type: Transform pos: -18.5,-52.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4752 components: - type: Transform pos: -17.5,-52.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4868 components: - type: Transform pos: -11.5,-56.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4869 components: - type: Transform pos: -10.5,-56.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4871 components: - type: Transform pos: -9.5,-56.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4880 components: - type: Transform pos: -3.5,-72.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4881 components: - type: Transform pos: -3.5,-73.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4882 components: - type: Transform pos: -12.5,-56.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4883 components: - type: Transform pos: -13.5,-56.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4893 components: - type: Transform pos: 10.5,-56.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4900 components: - type: Transform pos: -21.5,-53.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5035 components: - type: Transform pos: -15.5,-56.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5038 components: - type: Transform pos: -18.5,-56.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5039 components: - type: Transform pos: -8.5,-56.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5041 components: - type: Transform pos: -7.5,-56.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5052 components: - type: Transform pos: -16.5,-56.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5080 components: - type: Transform pos: -21.5,-55.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5114 components: - type: Transform pos: 1.5,-79.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5120 components: - type: Transform pos: 13.5,-55.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5140 components: - type: Transform pos: -20.5,-53.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5151 components: - type: Transform pos: 11.5,-55.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5152 components: - type: Transform pos: 11.5,-53.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5153 components: - type: Transform pos: 4.5,-71.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5154 components: - type: Transform pos: 5.5,-71.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5156 components: - type: Transform pos: 4.5,-73.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5157 components: - type: Transform pos: 4.5,-72.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5158 components: - type: Transform pos: 6.5,-71.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5163 components: - type: Transform pos: 5.5,-69.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5238 components: - type: Transform pos: 9.5,-56.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5243 components: - type: Transform pos: -61.5,30.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5257 components: - type: Transform pos: -23.5,-35.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5259 components: - type: Transform pos: -23.5,-36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5261 components: - type: Transform pos: -25.5,-36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5262 components: - type: Transform pos: -23.5,-34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5276 components: - type: Transform pos: -64.5,-12.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5308 components: - type: Transform pos: 66.5,-37.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5332 components: - type: Transform pos: -25.5,-35.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5347 components: - type: Transform pos: 9.5,2.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5348 components: - type: Transform pos: 10.5,6.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5349 components: - type: Transform pos: 8.5,5.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5353 components: - type: Transform pos: 10.5,1.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5354 components: - type: Transform pos: 8.5,4.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5355 components: - type: Transform pos: 8.5,3.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5356 components: - type: Transform pos: 11.5,1.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5357 components: - type: Transform pos: 12.5,1.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5362 components: - type: Transform pos: 13.5,2.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5363 components: - type: Transform pos: 13.5,6.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5371 components: - type: Transform pos: 9.5,6.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5372 components: - type: Transform pos: 14.5,3.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5373 components: - type: Transform pos: 14.5,5.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5374 components: - type: Transform pos: 12.5,6.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5457 components: - type: Transform pos: 14.5,-3.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5458 components: - type: Transform pos: 14.5,-2.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5519 components: - type: Transform pos: -45.5,8.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5520 components: - type: Transform pos: -45.5,9.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5521 components: - type: Transform pos: -45.5,7.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5548 components: - type: Transform pos: -39.5,3.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5555 components: - type: Transform pos: -39.5,4.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5566 components: - type: Transform pos: -45.5,2.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5580 components: - type: Transform pos: -45.5,4.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5588 components: - type: Transform pos: -48.5,7.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5591 components: - type: Transform pos: -48.5,8.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5592 components: - type: Transform pos: -48.5,9.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5631 components: - type: Transform pos: -19.5,10.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5635 components: - type: Transform pos: -17.5,13.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5637 components: - type: Transform pos: -21.5,12.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5638 components: - type: Transform pos: -21.5,13.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5641 components: - type: Transform pos: -19.5,14.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5793 components: - type: Transform pos: -63.5,28.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5804 components: - type: Transform pos: 66.5,-39.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5868 components: - type: Transform pos: -25.5,-34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5926 components: - type: Transform pos: 43.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6055 components: - type: Transform pos: -55.5,-24.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6061 components: - type: Transform pos: -53.5,-24.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6118 components: - type: Transform pos: -47.5,10.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6169 components: - type: Transform pos: -3.5,-69.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6183 components: - type: Transform pos: 26.5,2.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6188 components: - type: Transform pos: 26.5,1.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6211 components: - type: Transform pos: -19.5,-56.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6389 components: - type: Transform pos: -67.5,5.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6414 components: - type: Transform pos: 4.5,-69.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6439 components: - type: Transform pos: 16.5,-51.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6440 components: - type: Transform pos: 17.5,-51.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6441 components: - type: Transform pos: 18.5,-51.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6463 components: - type: Transform pos: 57.5,-13.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6520 components: - type: Transform pos: 4.5,16.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6521 components: - type: Transform pos: 6.5,16.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6523 components: - type: Transform pos: 7.5,18.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6529 components: - type: Transform pos: 7.5,20.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6538 components: - type: Transform pos: 12.5,21.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6539 components: - type: Transform pos: 13.5,21.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6607 components: - type: Transform pos: 8.5,22.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6659 components: - type: Transform pos: 28.5,1.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6720 components: - type: Transform pos: 14.5,23.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6726 components: - type: Transform pos: 14.5,25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6728 components: - type: Transform pos: 14.5,24.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6805 components: - type: Transform pos: 17.5,29.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6917 components: - type: Transform pos: 15.5,29.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6950 components: - type: Transform pos: -56.5,-30.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6951 components: - type: Transform pos: -55.5,-32.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6959 components: - type: Transform pos: -53.5,-32.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6960 components: - type: Transform pos: -54.5,-32.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6965 components: - type: Transform pos: -53.5,-30.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6969 components: - type: Transform pos: 26.5,0.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6984 components: - type: Transform pos: 45.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7068 components: - type: Transform pos: -47.5,6.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7075 components: - type: Transform pos: -46.5,6.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7094 components: - type: Transform pos: -40.5,-6.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7096 components: - type: Transform pos: -40.5,-7.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7106 components: - type: Transform pos: -2.5,-59.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7126 components: - type: Transform pos: 3.5,-74.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7193 components: - type: Transform pos: 9.5,-12.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7199 components: - type: Transform pos: 9.5,-13.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7223 components: - type: Transform pos: 12.5,-9.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7224 components: - type: Transform pos: 10.5,-14.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7244 components: - type: Transform pos: 3.5,-59.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7245 components: - type: Transform pos: -50.5,-35.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7246 components: - type: Transform pos: -52.5,-34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7247 components: - type: Transform pos: -49.5,-35.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7248 components: - type: Transform pos: -45.5,-35.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7249 components: - type: Transform pos: -44.5,-35.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7251 components: - type: Transform pos: -43.5,-35.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7252 components: - type: Transform pos: -45.5,-27.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7253 components: - type: Transform pos: -49.5,-27.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7318 components: - type: Transform pos: -46.5,-39.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7319 components: - type: Transform pos: -48.5,-39.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7320 components: - type: Transform pos: -48.5,-38.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7321 components: - type: Transform pos: -48.5,-37.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7322 components: - type: Transform pos: -48.5,-36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7323 components: - type: Transform pos: -46.5,-38.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7324 components: - type: Transform pos: -46.5,-37.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7325 components: - type: Transform pos: -46.5,-36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7346 components: - type: Transform pos: -5.5,-71.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7353 components: - type: Transform pos: 20.5,0.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7361 components: - type: Transform pos: -0.5,-80.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7365 components: - type: Transform pos: 3.5,-76.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7375 components: - type: Transform pos: 2.5,-78.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7376 components: - type: Transform pos: -1.5,-78.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7377 components: - type: Transform pos: 1.5,-78.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7389 components: - type: Transform pos: -2.5,-75.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7390 components: - type: Transform pos: 3.5,-77.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7391 components: - type: Transform pos: -0.5,-79.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7392 components: - type: Transform pos: -0.5,-78.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7393 components: - type: Transform pos: 1.5,-80.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7409 components: - type: Transform pos: -2.5,-77.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7410 components: - type: Transform pos: -2.5,-76.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7415 components: - type: Transform pos: -2.5,-74.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7417 components: - type: Transform pos: -5.5,-69.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7418 components: - type: Transform pos: -4.5,-71.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7419 components: - type: Transform pos: -3.5,-71.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7442 components: - type: Transform pos: -3.5,-64.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7445 components: - type: Transform pos: -4.5,-64.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7446 components: - type: Transform pos: -5.5,-64.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7452 components: - type: Transform pos: -4.5,-69.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7462 components: - type: Transform pos: 3.5,-75.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7468 components: - type: Transform pos: 6.5,-64.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7470 components: - type: Transform pos: 6.5,-69.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7477 components: - type: Transform pos: 5.5,-64.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7486 components: - type: Transform pos: 4.5,-64.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7487 components: - type: Transform pos: 13.5,-53.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7504 components: - type: Transform pos: -23.5,-53.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7506 components: - type: Transform pos: -20.5,-55.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7508 components: - type: Transform pos: -22.5,-53.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7521 components: - type: Transform pos: -22.5,-55.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7522 components: - type: Transform pos: -23.5,-55.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7561 components: - type: Transform pos: 60.5,-45.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7623 components: - type: Transform pos: 65.5,-37.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7631 components: - type: Transform pos: -67.5,0.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7641 components: - type: Transform pos: -69.5,-19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7665 components: - type: Transform pos: 42.5,-22.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7726 components: - type: Transform pos: -16.5,-44.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7730 components: - type: Transform pos: -17.5,-44.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7731 components: - type: Transform pos: -17.5,-42.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7734 components: - type: Transform pos: -19.5,-38.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7739 components: - type: Transform pos: -19.5,-35.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7801 components: - type: Transform pos: 46.5,-48.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7803 components: - type: Transform pos: 51.5,-48.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7807 components: - type: Transform pos: 55.5,-48.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7810 components: - type: Transform pos: 48.5,-48.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7816 components: - type: Transform pos: -63.5,14.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7839 components: - type: Transform pos: -65.5,14.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 8039 components: - type: Transform pos: 11.5,-9.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 8194 components: - type: Transform pos: 30.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 8361 components: - type: Transform pos: 50.5,-17.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 8362 components: - type: Transform pos: 50.5,-18.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 8363 components: - type: Transform pos: 52.5,18.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 8780 components: - type: Transform pos: 30.5,-57.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 8781 components: - type: Transform pos: 30.5,-56.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 8782 components: - type: Transform pos: 32.5,-58.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 8783 components: - type: Transform pos: 32.5,-57.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 8784 components: - type: Transform pos: 32.5,-56.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 8881 components: - type: Transform pos: 24.5,-1.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 8882 components: - type: Transform pos: 23.5,-1.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 8885 components: - type: Transform pos: 22.5,-1.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 8910 components: - type: Transform pos: 23.5,-3.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 8953 components: - type: Transform pos: -66.5,-20.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 8954 components: - type: Transform pos: -66.5,-19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 9231 components: - type: Transform pos: 57.5,13.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 9235 components: - type: Transform pos: -64.5,-6.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 9311 components: - type: Transform pos: -50.5,-8.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 9321 components: - type: Transform pos: -55.5,-8.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 9331 components: - type: Transform pos: -50.5,-2.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 9332 components: - type: Transform pos: -50.5,-1.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 9333 components: - type: Transform pos: -50.5,-0.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 9344 components: - type: Transform pos: -52.5,-7.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 9361 components: - type: Transform pos: 38.5,-21.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 9374 components: - type: Transform pos: -53.5,-7.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 9378 components: - type: Transform pos: -51.5,0.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 9379 components: - type: Transform pos: -53.5,0.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 9416 components: - type: Transform pos: 40.5,-21.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 9446 components: - type: Transform pos: -52.5,16.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 9483 components: - type: Transform pos: -35.5,12.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 9485 components: - type: Transform pos: -35.5,14.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 9488 components: - type: Transform rot: 1.5707963267948966 rad pos: -5.5,-17.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 9514 components: - type: Transform pos: -51.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 9572 components: - type: Transform pos: -56.5,16.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 9643 components: - type: Transform pos: -46.5,10.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 9645 components: - type: Transform pos: -52.5,-9.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 9646 components: - type: Transform pos: -53.5,-9.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 10582 components: - type: Transform pos: 24.5,3.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 10583 components: - type: Transform pos: 22.5,3.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11438 components: - type: Transform pos: -4.5,1.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11468 components: - type: Transform pos: -49.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11531 components: - type: Transform pos: -6.5,4.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11701 components: - type: Transform pos: 15.5,30.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11719 components: - type: Transform pos: 58.5,16.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11728 components: - type: Transform pos: 58.5,36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11729 components: - type: Transform pos: 57.5,36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11730 components: - type: Transform pos: 56.5,36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11740 components: - type: Transform pos: 58.5,38.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11741 components: - type: Transform pos: 57.5,38.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11742 components: - type: Transform pos: 56.5,38.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11743 components: - type: Transform pos: 58.5,40.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11744 components: - type: Transform pos: 57.5,40.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11745 components: - type: Transform pos: 56.5,40.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11748 components: - type: Transform pos: 52.5,40.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11749 components: - type: Transform pos: 64.5,-39.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11751 components: - type: Transform pos: 50.5,40.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11752 components: - type: Transform pos: 51.5,40.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11762 components: - type: Transform pos: 59.5,13.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11767 components: - type: Transform pos: 52.5,38.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11806 components: - type: Transform pos: 50.5,38.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11808 components: - type: Transform pos: 64.5,-36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11809 components: - type: Transform pos: 51.5,38.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11810 components: - type: Transform pos: 52.5,36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11832 components: - type: Transform pos: 45.5,11.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11835 components: - type: Transform pos: 64.5,-37.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11836 components: - type: Transform pos: 51.5,36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11839 components: - type: Transform pos: 50.5,36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11840 components: - type: Transform pos: 53.5,-14.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11842 components: - type: Transform pos: 19.5,5.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11857 components: - type: Transform pos: 52.5,44.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11863 components: - type: Transform pos: 53.5,-16.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11874 components: - type: Transform pos: 51.5,44.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11878 components: - type: Transform pos: 50.5,44.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11879 components: - type: Transform pos: 50.5,46.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11880 components: - type: Transform pos: 52.5,46.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11961 components: - type: Transform pos: 51.5,46.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11962 components: - type: Transform pos: 52.5,48.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11966 components: - type: Transform pos: 51.5,48.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11971 components: - type: Transform pos: 50.5,48.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11972 components: - type: Transform pos: 45.5,17.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11976 components: - type: Transform pos: 56.5,48.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11977 components: - type: Transform pos: 58.5,48.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11979 components: - type: Transform pos: 57.5,48.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11980 components: - type: Transform pos: 58.5,46.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11981 components: - type: Transform pos: 57.5,46.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12008 components: - type: Transform pos: 56.5,46.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12009 components: - type: Transform pos: 42.5,10.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12011 components: - type: Transform pos: 56.5,44.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12012 components: - type: Transform pos: 58.5,44.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12013 components: - type: Transform pos: 57.5,44.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12014 components: - type: Transform pos: 38.5,36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12016 components: - type: Transform pos: 58.5,13.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12035 components: - type: Transform pos: -6.5,3.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12039 components: - type: Transform pos: 37.5,36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12195 components: - type: Transform pos: -25.5,27.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12281 components: - type: Transform pos: 36.5,36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12290 components: - type: Transform pos: 36.5,38.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12291 components: - type: Transform pos: 37.5,38.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12299 components: - type: Transform pos: 40.5,-15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12320 components: - type: Transform pos: 42.5,-20.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12327 components: - type: Transform pos: 38.5,38.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12399 components: - type: Transform pos: 38.5,40.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12405 components: - type: Transform pos: 36.5,40.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12406 components: - type: Transform pos: 37.5,40.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12407 components: - type: Transform pos: 32.5,40.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12408 components: - type: Transform pos: 31.5,40.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12409 components: - type: Transform pos: 30.5,40.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12410 components: - type: Transform pos: 32.5,38.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12563 components: - type: Transform pos: 30.5,38.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12564 components: - type: Transform pos: 31.5,38.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12565 components: - type: Transform pos: 32.5,36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12566 components: - type: Transform pos: 31.5,36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12567 components: - type: Transform pos: 30.5,36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12568 components: - type: Transform pos: 32.5,44.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12605 components: - type: Transform pos: 30.5,44.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12621 components: - type: Transform pos: 31.5,44.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12638 components: - type: Transform pos: 32.5,46.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12644 components: - type: Transform pos: 30.5,46.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12652 components: - type: Transform pos: 31.5,46.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12656 components: - type: Transform pos: 64.5,-40.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12657 components: - type: Transform pos: 30.5,48.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12669 components: - type: Transform pos: 43.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12697 components: - type: Transform pos: 43.5,11.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12707 components: - type: Transform pos: 55.5,-1.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12710 components: - type: Transform pos: 52.5,-1.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12712 components: - type: Transform pos: 32.5,48.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12713 components: - type: Transform pos: 31.5,48.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12731 components: - type: Transform pos: 36.5,48.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12749 components: - type: Transform pos: 38.5,48.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12753 components: - type: Transform pos: 37.5,48.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12754 components: - type: Transform pos: 38.5,46.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12755 components: - type: Transform pos: 56.5,-30.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12789 components: - type: Transform pos: 37.5,46.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12802 components: - type: Transform pos: -62.5,20.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12803 components: - type: Transform pos: -64.5,20.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12805 components: - type: Transform pos: -64.5,-20.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12808 components: - type: Transform pos: -66.5,-16.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12809 components: - type: Transform pos: -66.5,-17.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12810 components: - type: Transform pos: -67.5,-17.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12812 components: - type: Transform pos: -68.5,-19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12816 components: - type: Transform pos: -68.5,-17.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12858 components: - type: Transform pos: -67.5,-19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12861 components: - type: Transform pos: -66.5,4.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12864 components: - type: Transform pos: 36.5,46.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12865 components: - type: Transform pos: 36.5,44.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12866 components: - type: Transform pos: 37.5,44.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12886 components: - type: Transform pos: 38.5,44.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12929 components: - type: Transform pos: -58.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12977 components: - type: Transform pos: -64.5,16.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12982 components: - type: Transform pos: -65.5,18.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13090 components: - type: Transform pos: 45.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13094 components: - type: Transform pos: 43.5,17.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13097 components: - type: Transform pos: 46.5,18.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13190 components: - type: Transform pos: 44.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13191 components: - type: Transform pos: 42.5,18.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13196 components: - type: Transform pos: 44.5,17.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13207 components: - type: Transform pos: 53.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13208 components: - type: Transform pos: 54.5,16.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13209 components: - type: Transform pos: 55.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13211 components: - type: Transform pos: 52.5,17.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13219 components: - type: Transform pos: 55.5,16.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13220 components: - type: Transform pos: 53.5,16.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13223 components: - type: Transform pos: 21.5,12.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13446 components: - type: Transform pos: 32.5,34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13547 components: - type: Transform pos: 65.5,-39.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13625 components: - type: Transform pos: -25.5,29.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13632 components: - type: Transform pos: -9.5,6.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13789 components: - type: Transform rot: -1.5707963267948966 rad pos: -25.5,-19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13813 components: - type: Transform pos: 7.5,17.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13816 components: - type: Transform pos: -0.5,12.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13896 components: - type: Transform pos: -48.5,16.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13900 components: - type: Transform pos: -48.5,17.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13941 components: - type: Transform pos: -29.5,29.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13942 components: - type: Transform pos: -27.5,29.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13946 components: - type: Transform pos: -22.5,27.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13950 components: - type: Transform pos: -14.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13964 components: - type: Transform pos: -20.5,27.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13976 components: - type: Transform pos: 32.5,35.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13977 components: - type: Transform pos: 36.5,34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14040 components: - type: Transform pos: 36.5,35.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14060 components: - type: Transform pos: 1.5,12.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14524 components: - type: Transform pos: -21.5,11.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14647 components: - type: Transform pos: -33.5,27.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14648 components: - type: Transform pos: -35.5,27.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14649 components: - type: Transform pos: -13.5,27.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14650 components: - type: Transform pos: -13.5,29.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14654 components: - type: Transform pos: -27.5,27.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14657 components: - type: Transform pos: -29.5,27.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14661 components: - type: Transform pos: -37.5,27.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14697 components: - type: Transform pos: -22.5,-4.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14732 components: - type: Transform pos: 37.5,41.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14733 components: - type: Transform pos: 37.5,43.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14756 components: - type: Transform pos: -36.5,29.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14780 components: - type: Transform pos: -27.5,43.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14783 components: - type: Transform pos: -33.5,29.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14792 components: - type: Transform pos: -40.5,36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14796 components: - type: Transform pos: -40.5,33.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14816 components: - type: Transform pos: -40.5,38.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14819 components: - type: Transform pos: -27.5,45.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14822 components: - type: Transform pos: -29.5,42.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14830 components: - type: Transform pos: -35.5,44.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14836 components: - type: Transform pos: -40.5,31.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14838 components: - type: Transform pos: -40.5,45.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14843 components: - type: Transform pos: -40.5,41.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14844 components: - type: Transform pos: -38.5,29.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14851 components: - type: Transform pos: -31.5,42.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14861 components: - type: Transform pos: -40.5,47.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14865 components: - type: Transform pos: 37.5,42.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14872 components: - type: Transform pos: -40.5,43.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14875 components: - type: Transform pos: -35.5,46.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14901 components: - type: Transform pos: -40.5,30.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14917 components: - type: Transform pos: -40.5,35.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14945 components: - type: Transform pos: -40.5,37.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14946 components: - type: Transform pos: -27.5,46.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14949 components: - type: Transform pos: -40.5,32.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14950 components: - type: Transform pos: -28.5,42.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14953 components: - type: Transform pos: -37.5,29.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14954 components: - type: Transform pos: -32.5,42.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14957 components: - type: Transform pos: -32.5,29.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14958 components: - type: Transform pos: -35.5,45.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14966 components: - type: Transform pos: -40.5,46.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14971 components: - type: Transform pos: -40.5,42.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14974 components: - type: Transform pos: -40.5,39.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14977 components: - type: Transform pos: -35.5,29.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14986 components: - type: Transform pos: -34.5,29.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14988 components: - type: Transform pos: -40.5,34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15016 components: - type: Transform pos: -27.5,44.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15021 components: - type: Transform pos: -30.5,42.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15033 components: - type: Transform pos: -34.5,42.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15038 components: - type: Transform pos: -35.5,43.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15044 components: - type: Transform pos: -40.5,44.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15045 components: - type: Transform pos: -40.5,40.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15097 components: - type: Transform pos: -19.5,34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15121 components: - type: Transform pos: -39.5,29.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15190 components: - type: Transform pos: 42.5,-24.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15191 components: - type: Transform pos: 31.5,41.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15265 components: - type: Transform pos: 31.5,42.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15275 components: - type: Transform pos: 31.5,43.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15299 components: - type: Transform pos: -14.5,48.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15300 components: - type: Transform pos: -14.5,49.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15341 components: - type: Transform rot: -1.5707963267948966 rad pos: -22.5,47.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15342 components: - type: Transform pos: -20.5,47.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15360 components: - type: Transform pos: -12.5,47.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15361 components: - type: Transform pos: -38.5,48.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15362 components: - type: Transform pos: -13.5,47.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15402 components: - type: Transform pos: -15.5,36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15429 components: - type: Transform pos: 52.5,34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15435 components: - type: Transform pos: 52.5,35.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15443 components: - type: Transform rot: -1.5707963267948966 rad pos: -28.5,-21.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15491 components: - type: Transform pos: -15.5,31.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15508 components: - type: Transform pos: -11.5,47.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15510 components: - type: Transform pos: -40.5,48.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15511 components: - type: Transform pos: -39.5,48.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15528 components: - type: Transform pos: -21.5,47.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15534 components: - type: Transform pos: -19.5,47.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15535 components: - type: Transform rot: -1.5707963267948966 rad pos: -10.5,47.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15540 components: - type: Transform pos: -36.5,48.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15553 components: - type: Transform rot: -1.5707963267948966 rad pos: -27.5,-21.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15577 components: - type: Transform pos: -27.5,40.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15591 components: - type: Transform pos: 56.5,34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15602 components: - type: Transform pos: -17.5,36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15636 components: - type: Transform pos: 56.5,35.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15715 components: - type: Transform pos: 10.5,22.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15725 components: - type: Transform pos: -19.5,35.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15849 components: - type: Transform pos: -53.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16001 components: - type: Transform pos: -13.5,35.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16022 components: - type: Transform pos: 3.5,27.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16023 components: - type: Transform pos: 3.5,28.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16024 components: - type: Transform pos: 3.5,29.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16027 components: - type: Transform pos: -2.5,44.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16081 components: - type: Transform pos: -55.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16105 components: - type: Transform pos: 57.5,41.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16327 components: - type: Transform pos: -2.5,43.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16357 components: - type: Transform pos: -3.5,44.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16359 components: - type: Transform pos: -1.5,43.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16361 components: - type: Transform pos: -0.5,43.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16362 components: - type: Transform pos: 0.5,43.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16366 components: - type: Transform pos: 1.5,43.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16367 components: - type: Transform pos: 2.5,43.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16368 components: - type: Transform pos: 4.5,44.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16369 components: - type: Transform pos: 5.5,44.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16374 components: - type: Transform pos: 11.5,25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16375 components: - type: Transform pos: 11.5,24.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16390 components: - type: Transform pos: -0.5,34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16391 components: - type: Transform pos: 1.5,34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16392 components: - type: Transform pos: 1.5,30.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16394 components: - type: Transform pos: -0.5,30.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16421 components: - type: Transform pos: 6.5,44.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16449 components: - type: Transform pos: -5.5,44.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16452 components: - type: Transform pos: -4.5,44.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16465 components: - type: Transform pos: 11.5,28.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16466 components: - type: Transform pos: 11.5,27.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16467 components: - type: Transform pos: 11.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16521 components: - type: Transform pos: 3.5,43.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16540 components: - type: Transform pos: 57.5,42.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16561 components: - type: Transform pos: 57.5,43.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16845 components: - type: Transform pos: -37.5,48.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16927 components: - type: Transform pos: -35.5,47.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16992 components: - type: Transform pos: -56.5,17.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17133 components: - type: Transform pos: 3.5,44.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17145 components: - type: Transform pos: 51.5,41.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17146 components: - type: Transform pos: 51.5,42.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17147 components: - type: Transform pos: 51.5,43.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17148 components: - type: Transform pos: 44.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17239 components: - type: Transform pos: 43.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17240 components: - type: Transform pos: 42.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17247 components: - type: Transform pos: -22.5,33.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17248 components: - type: Transform pos: -20.5,33.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17254 components: - type: Transform pos: -10.5,33.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17255 components: - type: Transform pos: -17.5,31.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17256 components: - type: Transform pos: -16.5,31.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17257 components: - type: Transform pos: -12.5,33.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17259 components: - type: Transform pos: 12.5,-53.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17299 components: - type: Transform pos: 45.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17303 components: - type: Transform pos: -49.5,18.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17305 components: - type: Transform pos: -51.5,18.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17306 components: - type: Transform pos: -52.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17307 components: - type: Transform pos: -52.5,20.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17308 components: - type: Transform pos: -52.5,21.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17309 components: - type: Transform pos: -48.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17310 components: - type: Transform pos: -48.5,20.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17311 components: - type: Transform pos: -48.5,21.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17312 components: - type: Transform pos: -48.5,23.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17313 components: - type: Transform pos: -48.5,24.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17314 components: - type: Transform pos: -48.5,25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17315 components: - type: Transform pos: -52.5,23.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17316 components: - type: Transform pos: -52.5,24.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17317 components: - type: Transform pos: -52.5,25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17341 components: - type: Transform pos: 46.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17343 components: - type: Transform pos: 40.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17461 components: - type: Transform pos: 37.5,32.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17503 components: - type: Transform pos: 39.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17504 components: - type: Transform pos: 48.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17505 components: - type: Transform pos: 49.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17545 components: - type: Transform pos: 37.5,31.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17600 components: - type: Transform pos: 31.5,32.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17615 components: - type: Transform pos: 31.5,30.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17740 components: - type: Transform pos: -62.5,30.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17787 components: - type: Transform pos: -46.5,-4.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17939 components: - type: Transform pos: 1.5,4.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17942 components: - type: Transform pos: 0.5,4.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17976 components: - type: Transform pos: 2.5,4.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17984 components: - type: Transform pos: 3.5,4.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18058 components: - type: Transform pos: -0.5,4.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18059 components: - type: Transform pos: -1.5,4.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18060 components: - type: Transform pos: -2.5,4.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18083 components: - type: Transform pos: -4.5,0.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18085 components: - type: Transform pos: -3.5,3.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18086 components: - type: Transform pos: -3.5,4.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18087 components: - type: Transform pos: 4.5,3.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18088 components: - type: Transform pos: 4.5,4.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18089 components: - type: Transform pos: 5.5,1.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18090 components: - type: Transform pos: 5.5,0.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18138 components: - type: Transform pos: -9.5,-4.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18413 components: - type: Transform pos: -0.5,-8.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18414 components: - type: Transform pos: 1.5,-8.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18415 components: - type: Transform pos: 1.5,-1.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18416 components: - type: Transform pos: -0.5,-1.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18436 components: - type: Transform pos: -9.5,-3.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18437 components: - type: Transform pos: -9.5,-5.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18679 components: - type: Transform pos: -46.5,-7.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18710 components: - type: Transform pos: 39.5,-15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18901 components: - type: Transform pos: 55.5,1.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18905 components: - type: Transform pos: 52.5,1.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18919 components: - type: Transform pos: 20.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18920 components: - type: Transform pos: 19.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18921 components: - type: Transform pos: 21.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18922 components: - type: Transform pos: 23.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18923 components: - type: Transform pos: 24.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18924 components: - type: Transform pos: 25.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18925 components: - type: Transform pos: 27.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18926 components: - type: Transform pos: 28.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18927 components: - type: Transform pos: 29.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18932 components: - type: Transform pos: 58.5,25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18933 components: - type: Transform pos: 59.5,21.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18934 components: - type: Transform pos: 59.5,20.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19021 components: - type: Transform pos: 58.5,20.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19032 components: - type: Transform pos: 42.5,5.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19060 components: - type: Transform pos: 58.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19061 components: - type: Transform pos: 57.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19062 components: - type: Transform pos: 58.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19063 components: - type: Transform pos: 59.5,22.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19064 components: - type: Transform pos: 59.5,23.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19067 components: - type: Transform pos: 59.5,24.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19068 components: - type: Transform pos: 59.5,25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19069 components: - type: Transform pos: 57.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19082 components: - type: Transform pos: 17.5,30.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19083 components: - type: Transform pos: 17.5,31.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19113 components: - type: Transform pos: 23.5,10.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19114 components: - type: Transform pos: 22.5,10.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19115 components: - type: Transform pos: 24.5,10.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19116 components: - type: Transform pos: 22.5,13.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19117 components: - type: Transform pos: 23.5,13.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19118 components: - type: Transform pos: 24.5,13.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19141 components: - type: Transform pos: 25.5,12.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19157 components: - type: Transform pos: -46.5,-6.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19640 components: - type: Transform pos: 31.5,49.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19641 components: - type: Transform pos: 31.5,50.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19642 components: - type: Transform pos: 31.5,51.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19643 components: - type: Transform pos: 32.5,51.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19644 components: - type: Transform pos: 32.5,52.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19691 components: - type: Transform pos: 34.5,52.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19692 components: - type: Transform pos: 33.5,52.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19695 components: - type: Transform pos: 36.5,52.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19698 components: - type: Transform pos: 12.5,-55.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19747 components: - type: Transform pos: 35.5,52.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19770 components: - type: Transform pos: 27.5,5.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19771 components: - type: Transform pos: -21.5,-34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19772 components: - type: Transform pos: 20.5,-3.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19775 components: - type: Transform pos: 18.5,1.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19803 components: - type: Transform pos: -13.5,34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19813 components: - type: Transform pos: 26.5,-3.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19821 components: - type: Transform pos: 36.5,51.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19823 components: - type: Transform pos: 37.5,51.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19827 components: - type: Transform pos: 37.5,50.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19829 components: - type: Transform pos: -16.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 20512 components: - type: Transform pos: -27.5,60.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 20515 components: - type: Transform pos: -23.5,60.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 20981 components: - type: Transform pos: 37.5,49.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 20982 components: - type: Transform pos: 51.5,49.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 20987 components: - type: Transform pos: 51.5,51.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 20988 components: - type: Transform pos: 51.5,50.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 20990 components: - type: Transform pos: 52.5,51.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 20999 components: - type: Transform pos: 52.5,52.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21000 components: - type: Transform pos: 54.5,52.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21009 components: - type: Transform pos: 55.5,52.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21034 components: - type: Transform pos: 56.5,52.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21035 components: - type: Transform pos: 53.5,52.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21036 components: - type: Transform pos: 56.5,51.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21037 components: - type: Transform pos: 57.5,51.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21038 components: - type: Transform pos: 57.5,49.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21039 components: - type: Transform pos: 57.5,50.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21059 components: - type: Transform pos: 46.5,-10.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21155 components: - type: Transform pos: 60.5,-42.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21189 components: - type: Transform pos: -63.5,16.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21190 components: - type: Transform pos: -66.5,18.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21192 components: - type: Transform pos: -64.5,18.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21196 components: - type: Transform pos: -65.5,16.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21197 components: - type: Transform pos: -63.5,18.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21198 components: - type: Transform pos: -66.5,16.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21303 components: - type: Transform pos: 46.5,-8.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21344 components: - type: Transform pos: 4.5,-26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21423 components: - type: Transform pos: -5.5,-37.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21424 components: - type: Transform pos: -5.5,-38.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21443 components: - type: Transform pos: -12.5,-35.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21445 components: - type: Transform pos: -9.5,-34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21446 components: - type: Transform pos: -10.5,-35.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21473 components: - type: Transform pos: 33.5,-56.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21856 components: - type: Transform pos: -115.5,9.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21857 components: - type: Transform pos: -115.5,10.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21858 components: - type: Transform pos: -115.5,11.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21871 components: - type: Transform pos: -107.5,9.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21872 components: - type: Transform pos: -107.5,11.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21873 components: - type: Transform pos: -107.5,10.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22461 components: - type: Transform pos: -111.5,27.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 23760 components: - type: Transform pos: 52.5,-11.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 23950 components: - type: Transform pos: 37.5,30.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 23951 components: - type: Transform pos: 31.5,31.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 23952 components: - type: Transform pos: 31.5,29.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 23953 components: - type: Transform pos: 37.5,29.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 24000 components: - type: Transform pos: 51.5,29.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 24001 components: - type: Transform pos: 51.5,30.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 24002 components: - type: Transform pos: 51.5,31.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 24003 components: - type: Transform pos: 51.5,32.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 24004 components: - type: Transform pos: 57.5,29.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 24005 components: - type: Transform pos: 57.5,30.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 24006 components: - type: Transform pos: 57.5,31.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 24007 components: - type: Transform pos: 57.5,32.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 24087 components: - type: Transform pos: 13.5,-9.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 24271 components: - type: Transform pos: 9.5,-11.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 24540 components: - type: Transform pos: -62.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 24541 components: - type: Transform pos: -64.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 24545 components: - type: Transform pos: -66.5,24.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 24547 components: - type: Transform pos: -62.5,-3.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 24659 components: - type: Transform pos: 59.5,9.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 24661 components: - type: Transform pos: 59.5,7.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 24667 components: - type: Transform pos: -66.5,22.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 25632 components: - type: Transform pos: 15.5,31.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - proto: RemoteSignaller entities: - uid: 3017 @@ -129444,8 +127654,6 @@ entities: - type: Transform pos: -55.5,0.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - type: DeviceLinkSink invokeCounter: 2 - uid: 914 @@ -129453,43 +127661,31 @@ entities: - type: Transform pos: -3.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 920 components: - type: Transform pos: -2.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5626 components: - type: Transform pos: -32.5,10.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5627 components: - type: Transform pos: -33.5,10.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5628 components: - type: Transform pos: -31.5,10.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7697 components: - type: Transform pos: -4.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - proto: ShuttersNormalOpen entities: - uid: 147 @@ -129498,380 +127694,280 @@ entities: rot: 1.5707963267948966 rad pos: 42.5,-32.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1454 components: - type: Transform pos: 41.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1631 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,-26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2250 components: - type: Transform rot: 1.5707963267948966 rad pos: 26.5,2.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2381 components: - type: Transform pos: 24.5,-1.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3106 components: - type: Transform rot: -1.5707963267948966 rad pos: 20.5,0.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3200 components: - type: Transform pos: 40.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3208 components: - type: Transform pos: 38.5,-15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3844 components: - type: Transform rot: 1.5707963267948966 rad pos: 27.5,-31.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3845 components: - type: Transform rot: 1.5707963267948966 rad pos: 27.5,-30.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4034 components: - type: Transform rot: 1.5707963267948966 rad pos: 42.5,-28.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4045 components: - type: Transform rot: -1.5707963267948966 rad pos: 20.5,2.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4109 components: - type: Transform rot: 1.5707963267948966 rad pos: 27.5,-32.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4355 components: - type: Transform pos: 35.5,-15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4487 components: - type: Transform pos: 32.5,-15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4496 components: - type: Transform pos: 34.5,-15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4670 components: - type: Transform rot: 1.5707963267948966 rad pos: 27.5,-33.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4679 components: - type: Transform rot: 1.5707963267948966 rad pos: 15.5,-36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5149 components: - type: Transform pos: -11.5,-52.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5560 components: - type: Transform rot: 1.5707963267948966 rad pos: -40.5,-6.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6207 components: - type: Transform pos: -25.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6522 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,17.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6524 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,20.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6526 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,18.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6772 components: - type: Transform rot: -1.5707963267948966 rad pos: 22.5,-33.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6773 components: - type: Transform rot: -1.5707963267948966 rad pos: 22.5,-30.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6774 components: - type: Transform rot: -1.5707963267948966 rad pos: 22.5,-31.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6775 components: - type: Transform rot: -1.5707963267948966 rad pos: 22.5,-34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7131 components: - type: Transform rot: 1.5707963267948966 rad pos: -40.5,-7.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7132 components: - type: Transform rot: 1.5707963267948966 rad pos: -40.5,-4.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7664 components: - type: Transform pos: 39.5,-15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 8381 components: - type: Transform pos: -13.5,-52.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 8382 components: - type: Transform pos: -12.5,-52.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 9167 components: - type: Transform rot: 3.141592653589793 rad pos: 14.5,-29.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 10577 components: - type: Transform rot: 3.141592653589793 rad pos: 12.5,-29.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12303 components: - type: Transform pos: 23.5,-1.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12509 components: - type: Transform rot: 1.5707963267948966 rad pos: 42.5,-26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14208 components: - type: Transform rot: 1.5707963267948966 rad pos: 26.5,1.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14548 components: - type: Transform pos: -36.5,10.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15575 components: - type: Transform pos: 13.5,21.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16058 components: - type: Transform pos: 12.5,21.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16129 components: - type: Transform rot: 1.5707963267948966 rad pos: 26.5,0.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16134 components: - type: Transform pos: 22.5,-1.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16735 components: - type: Transform pos: 8.5,22.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17671 components: - type: Transform rot: -1.5707963267948966 rad pos: 20.5,1.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18517 components: - type: Transform rot: -1.5707963267948966 rad pos: -9.5,-5.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18518 components: - type: Transform rot: -1.5707963267948966 rad pos: -9.5,-4.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18519 components: - type: Transform rot: -1.5707963267948966 rad pos: -9.5,-3.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21085 components: - type: Transform pos: 44.5,17.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21186 components: - type: Transform pos: 43.5,17.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - type: DeviceLinkSink invokeCounter: 1 - uid: 21334 @@ -129879,113 +127975,81 @@ entities: - type: Transform pos: 40.5,-15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21340 components: - type: Transform pos: 4.5,-26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21341 components: - type: Transform pos: 5.5,-26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21342 components: - type: Transform pos: 6.5,-26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21753 components: - type: Transform pos: 43.5,11.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21754 components: - type: Transform pos: 45.5,17.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21755 components: - type: Transform pos: 45.5,11.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22463 components: - type: Transform pos: -111.5,27.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22464 components: - type: Transform pos: -111.5,20.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 24366 components: - type: Transform pos: 38.5,-21.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 24367 components: - type: Transform pos: 39.5,-21.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 24368 components: - type: Transform pos: 40.5,-21.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 24369 components: - type: Transform pos: 42.5,-20.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 24372 components: - type: Transform pos: 42.5,-16.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 25409 components: - type: Transform pos: -23.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 25417 components: - type: Transform pos: 10.5,22.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - proto: ShuttersRadiationOpen entities: - uid: 16043 @@ -129993,29 +128057,21 @@ entities: - type: Transform pos: -0.5,30.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16302 components: - type: Transform pos: 1.5,34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16303 components: - type: Transform pos: 1.5,30.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16463 components: - type: Transform pos: -0.5,34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - proto: ShuttersWindow entities: - uid: 11583 @@ -130023,50 +128079,36 @@ entities: - type: Transform pos: -51.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11628 components: - type: Transform pos: -51.5,28.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11629 components: - type: Transform pos: -49.5,28.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12021 components: - type: Transform pos: -49.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13616 components: - type: Transform pos: -50.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13618 components: - type: Transform pos: -50.5,28.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13639 components: - type: Transform pos: -52.5,17.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - proto: ShuttersWindowOpen entities: - uid: 3978 @@ -130075,107 +128117,79 @@ entities: rot: 1.5707963267948966 rad pos: 15.5,-31.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4513 components: - type: Transform rot: 1.5707963267948966 rad pos: 15.5,-34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4671 components: - type: Transform rot: 1.5707963267948966 rad pos: 15.5,-35.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4673 components: - type: Transform rot: 1.5707963267948966 rad pos: 15.5,-32.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4677 components: - type: Transform rot: 1.5707963267948966 rad pos: 15.5,-33.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6771 components: - type: Transform rot: -1.5707963267948966 rad pos: 22.5,-32.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 8389 components: - type: Transform rot: 3.141592653589793 rad pos: 13.5,-29.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14547 components: - type: Transform pos: -37.5,10.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16527 components: - type: Transform pos: 42.5,-27.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17379 components: - type: Transform rot: 1.5707963267948966 rad pos: 38.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17491 components: - type: Transform rot: -1.5707963267948966 rad pos: 39.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19158 components: - type: Transform pos: 32.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19159 components: - type: Transform pos: 31.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21068 components: - type: Transform pos: -40.5,-5.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - proto: SignAi entities: - uid: 16533 @@ -136525,6 +134539,13 @@ entities: - type: Transform pos: -29.5,1.5 parent: 60 +- proto: SpawnPointHeadOfSecurityWeapon + entities: + - uid: 1821 + components: + - type: Transform + pos: -29.5,0.5 + parent: 60 - proto: SpawnPointJanitor entities: - uid: 3 @@ -136896,6 +134917,13 @@ entities: - type: Transform pos: -28.5,-18.5 parent: 60 +- proto: SpawnPointWardenWeapon + entities: + - uid: 1120 + components: + - type: Transform + pos: -29.5,-20.5 + parent: 60 - proto: SpawnVendingMachineRestockFoodDrink entities: - uid: 19888 @@ -142721,127 +140749,91 @@ entities: - type: Transform pos: 31.5,-16.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3223 components: - type: Transform pos: 31.5,-20.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3346 components: - type: Transform pos: -57.5,-12.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3510 components: - type: Transform pos: 51.5,-43.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4242 components: - type: Transform pos: -51.5,-17.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4254 components: - type: Transform pos: -51.5,-19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7071 components: - type: Transform pos: 18.5,-16.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7077 components: - type: Transform pos: 55.5,-43.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 8354 components: - type: Transform pos: -55.5,-12.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 9492 components: - type: Transform pos: -43.5,12.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 9622 components: - type: Transform pos: -43.5,11.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 9753 components: - type: Transform pos: -51.5,-18.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11735 components: - type: Transform pos: 38.5,17.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11766 components: - type: Transform pos: 38.5,13.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12301 components: - type: Transform pos: 31.5,-12.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13682 components: - type: Transform pos: 50.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14516 components: - type: Transform pos: -19.5,20.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16411 components: - type: Transform pos: 18.5,-19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - proto: TobaccoSeeds entities: - uid: 3263 @@ -143019,6 +141011,13 @@ entities: - type: Transform pos: -116.54863,15.725244 parent: 60 +- proto: ToyFigurineOwlman + entities: + - uid: 8021 + components: + - type: Transform + pos: 47.478683,-45.212933 + parent: 60 - proto: ToyFigurinePassenger entities: - uid: 6331 @@ -143033,13 +141032,6 @@ entities: - type: Transform pos: -6.522576,13.64284 parent: 60 -- proto: ToyOwlman - entities: - - uid: 8021 - components: - - type: Transform - pos: 47.478683,-45.212933 - parent: 60 - proto: ToyRubberDuck entities: - uid: 18370 @@ -159576,13 +157568,6 @@ entities: - type: Transform pos: -26.496874,-6.540243 parent: 60 -- proto: WeaponSubMachineGunWt550 - entities: - - uid: 1824 - components: - - type: Transform - pos: -29.44601,0.7170377 - parent: 60 - proto: WeaponTurretSyndicateBroken entities: - uid: 10821 @@ -159740,100 +157725,74 @@ entities: rot: 3.141592653589793 rad pos: 39.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1341 components: - type: Transform rot: 3.141592653589793 rad pos: 7.5,-26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1349 components: - type: Transform pos: 8.5,-24.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1350 components: - type: Transform pos: 3.5,-24.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2519 components: - type: Transform rot: 1.5707963267948966 rad pos: 42.5,-27.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6821 components: - type: Transform rot: 3.141592653589793 rad pos: 38.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 10854 components: - type: Transform pos: 0.5,-69.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 10855 components: - type: Transform rot: 3.141592653589793 rad pos: 0.5,-64.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14127 components: - type: Transform pos: -7.5,20.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14129 components: - type: Transform rot: -1.5707963267948966 rad pos: -8.5,21.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16409 components: - type: Transform rot: 3.141592653589793 rad pos: 34.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19886 components: - type: Transform rot: -1.5707963267948966 rad pos: 14.5,4.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19910 components: - type: Transform rot: 1.5707963267948966 rad pos: 22.5,-4.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - proto: WindoorBarLocked entities: - uid: 2235 @@ -159842,8 +157801,6 @@ entities: rot: 3.141592653589793 rad pos: 12.5,-29.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - proto: WindoorCargoLocked entities: - uid: 11870 @@ -159852,8 +157809,6 @@ entities: rot: -1.5707963267948966 rad pos: 43.5,7.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - proto: WindoorHydroponicsLocked entities: - uid: 2452 @@ -159861,23 +157816,17 @@ entities: - type: Transform pos: 32.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2453 components: - type: Transform pos: 31.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5815 components: - type: Transform rot: -1.5707963267948966 rad pos: 36.5,-29.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - proto: WindoorSecure entities: - uid: 3269 @@ -159886,123 +157835,91 @@ entities: rot: -1.5707963267948966 rad pos: 23.5,-46.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3911 components: - type: Transform rot: -1.5707963267948966 rad pos: -9.5,-41.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6181 components: - type: Transform rot: -1.5707963267948966 rad pos: -49.5,-31.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7291 components: - type: Transform rot: 3.141592653589793 rad pos: -47.5,-33.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 8083 components: - type: Transform pos: -11.5,-44.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 8109 components: - type: Transform rot: 3.141592653589793 rad pos: -3.5,-2.5 parent: 7536 - - type: DeltaPressure - gridUid: 7536 - uid: 8111 components: - type: Transform rot: 3.141592653589793 rad pos: -5.5,-2.5 parent: 7536 - - type: DeltaPressure - gridUid: 7536 - uid: 11002 components: - type: Transform rot: 1.5707963267948966 rad pos: 39.5,-46.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22014 components: - type: Transform rot: 3.141592653589793 rad pos: -120.5,34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22015 components: - type: Transform rot: 3.141592653589793 rad pos: -102.5,34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22016 components: - type: Transform rot: 3.141592653589793 rad pos: -123.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22017 components: - type: Transform pos: -123.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22018 components: - type: Transform pos: -99.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22019 components: - type: Transform pos: -118.5,5.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22051 components: - type: Transform pos: -104.5,5.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22088 components: - type: Transform rot: 3.141592653589793 rad pos: -99.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - proto: WindoorSecureArmoryLocked entities: - uid: 246 @@ -160011,68 +157928,50 @@ entities: rot: 1.5707963267948966 rad pos: -27.5,-6.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 776 components: - type: Transform pos: -26.5,-6.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 796 components: - type: Transform pos: -26.5,-14.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1556 components: - type: Transform pos: -28.5,-14.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1750 components: - type: Transform rot: -1.5707963267948966 rad pos: -25.5,-17.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1976 components: - type: Transform pos: -27.5,-14.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 8278 components: - type: Transform rot: 1.5707963267948966 rad pos: -31.5,-8.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 8420 components: - type: Transform rot: -1.5707963267948966 rad pos: -25.5,-16.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13642 components: - type: Transform rot: -1.5707963267948966 rad pos: -25.5,-18.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - proto: WindoorSecureAtmosphericsLocked entities: - uid: 13959 @@ -160080,16 +157979,12 @@ entities: - type: Transform pos: -17.5,27.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19416 components: - type: Transform rot: 3.141592653589793 rad pos: -15.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - proto: WindoorSecureBrigLocked entities: - uid: 4198 @@ -160097,32 +157992,24 @@ entities: - type: Transform pos: -43.5,-18.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 8277 components: - type: Transform rot: 1.5707963267948966 rad pos: -35.5,-0.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 8424 components: - type: Transform rot: 1.5707963267948966 rad pos: -35.5,-1.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 8437 components: - type: Transform rot: 1.5707963267948966 rad pos: -35.5,0.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - proto: WindoorSecureCargoLocked entities: - uid: 13104 @@ -160131,56 +158018,42 @@ entities: rot: 1.5707963267948966 rad pos: 42.5,8.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13105 components: - type: Transform rot: 1.5707963267948966 rad pos: 42.5,9.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19107 components: - type: Transform rot: 1.5707963267948966 rad pos: 56.5,7.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19108 components: - type: Transform rot: 1.5707963267948966 rad pos: 56.5,9.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19405 components: - type: Transform rot: 3.141592653589793 rad pos: 53.5,5.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19414 components: - type: Transform rot: 3.141592653589793 rad pos: 54.5,5.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 24814 components: - type: Transform rot: 3.141592653589793 rad pos: 43.5,3.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - proto: WindoorSecureChapelLocked entities: - uid: 14513 @@ -160189,8 +158062,6 @@ entities: rot: 3.141592653589793 rad pos: -20.5,16.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - proto: WindoorSecureChemistryLocked entities: - uid: 2684 @@ -160198,39 +158069,29 @@ entities: - type: Transform pos: 39.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2685 components: - type: Transform pos: 38.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5814 components: - type: Transform rot: 1.5707963267948966 rad pos: 36.5,-29.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 8895 components: - type: Transform rot: -1.5707963267948966 rad pos: 42.5,-27.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18548 components: - type: Transform rot: -1.5707963267948966 rad pos: 42.5,-30.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - proto: WindoorSecureCommandLocked entities: - uid: 18007 @@ -160239,104 +158100,78 @@ entities: rot: -1.5707963267948966 rad pos: -74.5,17.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18105 components: - type: Transform rot: 1.5707963267948966 rad pos: -11.5,2.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18327 components: - type: Transform rot: 1.5707963267948966 rad pos: -94.5,17.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 23052 components: - type: Transform rot: -1.5707963267948966 rad pos: -112.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 23053 components: - type: Transform rot: 1.5707963267948966 rad pos: -110.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 23079 components: - type: Transform rot: 1.5707963267948966 rad pos: -116.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 23080 components: - type: Transform rot: -1.5707963267948966 rad pos: -106.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 25384 components: - type: Transform rot: 3.141592653589793 rad pos: -113.5,8.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 25385 components: - type: Transform rot: 3.141592653589793 rad pos: -112.5,8.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 25386 components: - type: Transform rot: 3.141592653589793 rad pos: -110.5,8.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 25387 components: - type: Transform rot: 3.141592653589793 rad pos: -109.5,8.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 25390 components: - type: Transform rot: -1.5707963267948966 rad pos: -112.5,11.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 25391 components: - type: Transform rot: 1.5707963267948966 rad pos: -110.5,11.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - proto: WindoorSecureEngineeringLocked entities: - uid: 13804 @@ -160344,24 +158179,18 @@ entities: - type: Transform pos: -3.5,17.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21766 components: - type: Transform rot: 3.141592653589793 rad pos: 3.5,12.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21767 components: - type: Transform rot: 3.141592653589793 rad pos: 4.5,12.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - proto: WindoorSecureHeadOfPersonnelLocked entities: - uid: 1340 @@ -160369,16 +158198,12 @@ entities: - type: Transform pos: 7.5,-26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4691 components: - type: Transform rot: 3.141592653589793 rad pos: 4.5,-38.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - proto: WindoorSecureMedicalLocked entities: - uid: 3005 @@ -160386,24 +158211,18 @@ entities: - type: Transform pos: 47.5,-26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11101 components: - type: Transform rot: 1.5707963267948966 rad pos: 46.5,-18.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11102 components: - type: Transform rot: -1.5707963267948966 rad pos: 46.5,-17.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - proto: WindoorSecureSalvageLocked entities: - uid: 19006 @@ -160411,8 +158230,6 @@ entities: - type: Transform pos: 53.5,3.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -160425,8 +158242,6 @@ entities: - type: Transform pos: 54.5,3.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -160440,16 +158255,12 @@ entities: rot: 3.141592653589793 rad pos: 44.5,3.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19024 components: - type: Transform rot: 3.141592653589793 rad pos: 45.5,3.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - proto: WindoorSecureScienceLocked entities: - uid: 7057 @@ -160458,8 +158269,6 @@ entities: rot: -1.5707963267948966 rad pos: -40.5,-5.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7097 components: - type: MetaData @@ -160467,8 +158276,6 @@ entities: - type: Transform pos: -37.5,10.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7142 components: - type: MetaData @@ -160476,23 +158283,17 @@ entities: - type: Transform pos: -36.5,10.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 9359 components: - type: Transform pos: -45.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19029 components: - type: Transform rot: 1.5707963267948966 rad pos: -41.5,-4.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - proto: WindoorSecureSecurityLocked entities: - uid: 4298 @@ -160501,16 +158302,12 @@ entities: rot: 1.5707963267948966 rad pos: -42.5,-15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 8280 components: - type: Transform rot: -1.5707963267948966 rad pos: -31.5,-8.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - proto: Window entities: - uid: 1 @@ -160518,358 +158315,256 @@ entities: - type: Transform pos: -64.5,1.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1285 components: - type: Transform pos: -60.5,-8.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2132 components: - type: Transform pos: -39.5,-19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2386 components: - type: Transform pos: 19.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2564 components: - type: Transform pos: 20.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2568 components: - type: Transform pos: 21.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2570 components: - type: Transform pos: 17.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2597 components: - type: Transform pos: 15.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3347 components: - type: Transform pos: -56.5,-15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3455 components: - type: Transform pos: 49.5,-39.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3459 components: - type: Transform pos: 47.5,-39.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3520 components: - type: Transform pos: 55.5,-39.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3548 components: - type: Transform pos: 48.5,-43.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3690 components: - type: Transform pos: -40.5,21.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5508 components: - type: Transform pos: 46.5,-43.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5855 components: - type: Transform pos: -10.5,10.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5857 components: - type: Transform pos: -13.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6255 components: - type: Transform pos: 14.5,11.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6256 components: - type: Transform pos: 14.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6257 components: - type: Transform pos: 14.5,14.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6258 components: - type: Transform pos: 14.5,12.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7719 components: - type: Transform pos: -8.5,10.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 8001 components: - type: Transform pos: -65.5,1.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 8300 components: - type: Transform pos: 47.5,9.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 8734 components: - type: Transform pos: -63.5,1.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11789 components: - type: Transform pos: -59.5,18.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11795 components: - type: Transform pos: -57.5,18.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13671 components: - type: Transform pos: 50.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13751 components: - type: Transform pos: -40.5,20.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13821 components: - type: Transform pos: -13.5,17.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13909 components: - type: Transform pos: -60.5,21.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17285 components: - type: Transform pos: -39.5,22.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17332 components: - type: Transform pos: 32.5,16.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17349 components: - type: Transform pos: -60.5,24.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17350 components: - type: Transform pos: -60.5,25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17465 components: - type: Transform pos: -40.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18793 components: - type: Transform pos: 57.5,-36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19825 components: - type: Transform pos: -59.5,35.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19846 components: - type: Transform pos: -57.5,35.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 20995 components: - type: Transform pos: -56.5,38.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21131 components: - type: Transform pos: -55.5,43.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21136 components: - type: Transform pos: -55.5,42.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21138 components: - type: Transform pos: -55.5,41.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21141 components: - type: Transform pos: -55.5,40.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21143 components: - type: Transform pos: -55.5,49.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 23400 components: - type: Transform pos: -55.5,50.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 23401 components: - type: Transform pos: -55.5,51.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 23413 components: - type: Transform pos: -55.5,52.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 23414 components: - type: Transform pos: -56.5,36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 23415 components: - type: Transform pos: -56.5,37.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 23717 components: - type: Transform pos: -39.5,-21.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - proto: WindowDirectional entities: - uid: 3146 @@ -160878,76 +158573,56 @@ entities: rot: -1.5707963267948966 rad pos: 26.5,-51.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3152 components: - type: Transform rot: 1.5707963267948966 rad pos: 28.5,-51.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4051 components: - type: Transform rot: -1.5707963267948966 rad pos: -33.5,-30.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4579 components: - type: Transform rot: 1.5707963267948966 rad pos: -37.5,-30.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7287 components: - type: Transform rot: 1.5707963267948966 rad pos: -48.5,-34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7608 components: - type: Transform rot: 3.141592653589793 rad pos: -51.5,-32.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21347 components: - type: Transform pos: -67.5,9.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21358 components: - type: Transform pos: -66.5,9.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21359 components: - type: Transform pos: -64.5,9.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21360 components: - type: Transform pos: -63.5,9.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - proto: WindowFrostedDirectional entities: - uid: 2394 @@ -160956,247 +158631,183 @@ entities: rot: 1.5707963267948966 rad pos: 38.5,-39.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2756 components: - type: Transform rot: -1.5707963267948966 rad pos: 36.5,-39.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5172 components: - type: Transform pos: -51.5,-30.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5173 components: - type: Transform pos: -50.5,-30.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7292 components: - type: Transform rot: -1.5707963267948966 rad pos: -46.5,-34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7296 components: - type: Transform rot: -1.5707963267948966 rad pos: -46.5,-33.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7310 components: - type: Transform rot: 1.5707963267948966 rad pos: -48.5,-33.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7524 components: - type: Transform rot: 3.141592653589793 rad pos: -50.5,-32.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 9511 components: - type: Transform rot: 3.141592653589793 rad pos: -42.5,12.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17730 components: - type: Transform rot: 1.5707963267948966 rad pos: -39.5,12.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18014 components: - type: Transform rot: 1.5707963267948966 rad pos: -39.5,11.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18544 components: - type: Transform rot: 3.141592653589793 rad pos: 37.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18546 components: - type: Transform rot: 3.141592653589793 rad pos: 36.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18683 components: - type: Transform rot: 3.141592653589793 rad pos: 35.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21618 components: - type: Transform rot: 1.5707963267948966 rad pos: 19.5,14.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 24028 components: - type: Transform pos: -30.5,18.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 25164 components: - type: Transform rot: 3.141592653589793 rad pos: 43.5,22.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 25181 components: - type: Transform rot: -1.5707963267948966 rad pos: 43.5,22.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 25184 components: - type: Transform pos: 43.5,22.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 25304 components: - type: Transform pos: 44.5,22.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 25305 components: - type: Transform pos: 45.5,22.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 25306 components: - type: Transform rot: 1.5707963267948966 rad pos: 45.5,22.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 25307 components: - type: Transform rot: 3.141592653589793 rad pos: 45.5,22.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 25308 components: - type: Transform rot: 3.141592653589793 rad pos: 44.5,22.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 25316 components: - type: Transform rot: -1.5707963267948966 rad pos: 49.5,22.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 25317 components: - type: Transform rot: 1.5707963267948966 rad pos: 51.5,22.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 25318 components: - type: Transform pos: 51.5,22.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 25319 components: - type: Transform pos: 50.5,22.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 25320 components: - type: Transform pos: 49.5,22.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 25321 components: - type: Transform rot: 3.141592653589793 rad pos: 49.5,22.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 25322 components: - type: Transform rot: 3.141592653589793 rad pos: 50.5,22.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 25323 components: - type: Transform rot: 3.141592653589793 rad pos: 51.5,22.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - proto: WindowReinforcedDirectional entities: - uid: 521 @@ -161204,3066 +158815,2272 @@ entities: - type: Transform pos: 10.5,-9.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 836 components: - type: Transform pos: -34.5,-17.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 837 components: - type: Transform pos: -33.5,-17.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1345 components: - type: Transform pos: 4.5,-24.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1346 components: - type: Transform pos: 5.5,-24.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1347 components: - type: Transform pos: 6.5,-24.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 1348 components: - type: Transform pos: 7.5,-24.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2417 components: - type: Transform pos: 34.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2445 components: - type: Transform pos: 35.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2446 components: - type: Transform pos: 33.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2447 components: - type: Transform rot: -1.5707963267948966 rad pos: 33.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2448 components: - type: Transform rot: 1.5707963267948966 rad pos: 35.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2552 components: - type: Transform rot: 3.141592653589793 rad pos: 33.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2555 components: - type: Transform rot: 3.141592653589793 rad pos: 34.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 2556 components: - type: Transform rot: 3.141592653589793 rad pos: 35.5,-25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3398 components: - type: Transform rot: 3.141592653589793 rad pos: 3.5,-38.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3910 components: - type: Transform rot: -1.5707963267948966 rad pos: -9.5,-40.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 3912 components: - type: Transform rot: -1.5707963267948966 rad pos: -9.5,-42.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4192 components: - type: Transform pos: -46.5,-18.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4193 components: - type: Transform pos: -45.5,-18.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4194 components: - type: Transform pos: -44.5,-18.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4197 components: - type: Transform pos: -40.5,-18.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4199 components: - type: Transform pos: -41.5,-18.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4204 components: - type: Transform pos: -42.5,-18.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4231 components: - type: Transform rot: 3.141592653589793 rad pos: -40.5,-16.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4232 components: - type: Transform rot: 3.141592653589793 rad pos: -41.5,-16.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4470 components: - type: Transform pos: -13.5,-44.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4731 components: - type: Transform rot: 1.5707963267948966 rad pos: -4.5,-68.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4732 components: - type: Transform rot: 1.5707963267948966 rad pos: -4.5,-66.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4733 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,-68.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4734 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,-66.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4959 components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,-65.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 4996 components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,-66.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5002 components: - type: Transform rot: -1.5707963267948966 rad pos: -0.5,-69.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5008 components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,-69.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5013 components: - type: Transform rot: -1.5707963267948966 rad pos: -0.5,-65.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5027 components: - type: Transform rot: 3.141592653589793 rad pos: 5.5,-38.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5076 components: - type: Transform rot: -1.5707963267948966 rad pos: 6.5,-67.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5077 components: - type: Transform rot: -1.5707963267948966 rad pos: 6.5,-68.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5095 components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,-67.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5656 components: - type: Transform rot: 3.141592653589793 rad pos: 13.5,1.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5657 components: - type: Transform rot: 1.5707963267948966 rad pos: 8.5,2.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5658 components: - type: Transform rot: 3.141592653589793 rad pos: 9.5,1.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 5769 components: - type: Transform pos: -15.5,-44.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6478 components: - type: Transform rot: -1.5707963267948966 rad pos: 6.5,-66.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6480 components: - type: Transform rot: -1.5707963267948966 rad pos: 6.5,-65.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6481 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,-65.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6485 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,-66.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6528 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,-67.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6555 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,-68.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6594 components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,-64.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6595 components: - type: Transform rot: -1.5707963267948966 rad pos: -0.5,-67.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6599 components: - type: Transform rot: -1.5707963267948966 rad pos: -0.5,-66.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6637 components: - type: Transform rot: -1.5707963267948966 rad pos: -0.5,-64.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 6751 components: - type: Transform rot: -1.5707963267948966 rad pos: -0.5,-68.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7049 components: - type: Transform pos: -14.5,-44.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7226 components: - type: Transform rot: 1.5707963267948966 rad pos: 9.5,-10.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7436 components: - type: Transform rot: -1.5707963267948966 rad pos: -5.5,-66.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7437 components: - type: Transform rot: -1.5707963267948966 rad pos: -5.5,-65.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7438 components: - type: Transform rot: 1.5707963267948966 rad pos: -5.5,-65.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7439 components: - type: Transform rot: 1.5707963267948966 rad pos: -5.5,-66.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7440 components: - type: Transform rot: 1.5707963267948966 rad pos: -5.5,-67.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7441 components: - type: Transform rot: 1.5707963267948966 rad pos: -5.5,-68.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7443 components: - type: Transform rot: 3.141592653589793 rad pos: -113.5,10.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7448 components: - type: Transform rot: -1.5707963267948966 rad pos: -5.5,-68.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7451 components: - type: Transform rot: -1.5707963267948966 rad pos: -5.5,-67.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7456 components: - type: Transform rot: 3.141592653589793 rad pos: -109.5,10.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7469 components: - type: Transform rot: 1.5707963267948966 rad pos: -4.5,-67.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7474 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,-67.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7475 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,-65.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7489 components: - type: Transform rot: 1.5707963267948966 rad pos: -4.5,-65.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7499 components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,-68.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7500 components: - type: Transform pos: -109.5,12.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7505 components: - type: Transform rot: 1.5707963267948966 rad pos: -114.5,11.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7704 components: - type: Transform rot: -1.5707963267948966 rad pos: -108.5,11.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 7836 components: - type: Transform pos: -113.5,12.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 8159 components: - type: Transform pos: -12.5,-44.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 8160 components: - type: Transform pos: -10.5,-44.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 8385 components: - type: Transform rot: 3.141592653589793 rad pos: -40.5,-15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 9023 components: - type: Transform rot: -1.5707963267948966 rad pos: 46.5,-16.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 10850 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,-64.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 10851 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,-64.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 10852 components: - type: Transform pos: 1.5,-69.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 10853 components: - type: Transform pos: -0.5,-69.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11099 components: - type: Transform pos: 46.5,-17.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 11253 components: - type: Transform rot: -1.5707963267948966 rad pos: 15.5,-30.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12599 components: - type: Transform pos: -46.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 12601 components: - type: Transform pos: -47.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13043 components: - type: Transform rot: 3.141592653589793 rad pos: -81.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13801 components: - type: Transform pos: -2.5,17.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13803 components: - type: Transform pos: -4.5,17.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 13969 components: - type: Transform rot: 1.5707963267948966 rad pos: 56.5,8.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14114 components: - type: Transform rot: -1.5707963267948966 rad pos: -8.5,20.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14115 components: - type: Transform pos: -8.5,20.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14116 components: - type: Transform rot: -1.5707963267948966 rad pos: -8.5,22.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14130 components: - type: Transform pos: -6.5,20.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14511 components: - type: Transform rot: 3.141592653589793 rad pos: -18.5,16.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 14512 components: - type: Transform rot: 3.141592653589793 rad pos: -19.5,16.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15728 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15730 components: - type: Transform pos: 1.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15734 components: - type: Transform pos: 0.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15742 components: - type: Transform pos: -0.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15743 components: - type: Transform rot: 3.141592653589793 rad pos: 0.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15996 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15997 components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 15998 components: - type: Transform rot: -1.5707963267948966 rad pos: -0.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16005 components: - type: Transform rot: 3.141592653589793 rad pos: 0.5,22.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16358 components: - type: Transform rot: 3.141592653589793 rad pos: -82.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16616 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,22.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 16714 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,22.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17018 components: - type: Transform rot: 3.141592653589793 rad pos: -85.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17700 components: - type: Transform rot: 3.141592653589793 rad pos: -83.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17701 components: - type: Transform rot: 3.141592653589793 rad pos: -86.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17702 components: - type: Transform rot: 3.141592653589793 rad pos: -92.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17703 components: - type: Transform pos: -89.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17704 components: - type: Transform pos: -91.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17705 components: - type: Transform pos: -86.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17706 components: - type: Transform pos: -81.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17707 components: - type: Transform pos: -83.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17708 components: - type: Transform pos: -78.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17709 components: - type: Transform pos: -80.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17710 components: - type: Transform rot: 3.141592653589793 rad pos: -80.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17843 components: - type: Transform rot: 1.5707963267948966 rad pos: -11.5,5.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17845 components: - type: Transform rot: 1.5707963267948966 rad pos: -11.5,4.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 17910 components: - type: Transform rot: 1.5707963267948966 rad pos: -11.5,3.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18209 components: - type: Transform rot: -1.5707963267948966 rad pos: -5.5,-5.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18211 components: - type: Transform pos: -5.5,-6.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18579 components: - type: Transform rot: 3.141592653589793 rad pos: -76.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18586 components: - type: Transform rot: 1.5707963267948966 rad pos: -5.5,-5.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18587 components: - type: Transform rot: 1.5707963267948966 rad pos: -5.5,-6.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18588 components: - type: Transform rot: 3.141592653589793 rad pos: -5.5,-5.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18589 components: - type: Transform rot: -1.5707963267948966 rad pos: -5.5,-6.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 18870 components: - type: Transform rot: 1.5707963267948966 rad pos: 56.5,6.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19907 components: - type: Transform rot: 1.5707963267948966 rad pos: 22.5,-7.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19908 components: - type: Transform rot: 1.5707963267948966 rad pos: 22.5,-6.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19909 components: - type: Transform rot: 1.5707963267948966 rad pos: 22.5,-5.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 19996 components: - type: Transform pos: -47.5,5.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21152 components: - type: Transform pos: -46.5,5.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21191 components: - type: Transform rot: 3.141592653589793 rad pos: -77.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21195 components: - type: Transform rot: 3.141592653589793 rad pos: -78.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21208 components: - type: Transform pos: -82.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21212 components: - type: Transform pos: -85.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21213 components: - type: Transform pos: -87.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21222 components: - type: Transform pos: -90.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21223 components: - type: Transform pos: -92.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21228 components: - type: Transform rot: 3.141592653589793 rad pos: -90.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21229 components: - type: Transform rot: 3.141592653589793 rad pos: -87.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21230 components: - type: Transform rot: 3.141592653589793 rad pos: -89.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21231 components: - type: Transform rot: 3.141592653589793 rad pos: -91.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21244 components: - type: Transform rot: -1.5707963267948966 rad pos: -74.5,18.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21246 components: - type: Transform rot: -1.5707963267948966 rad pos: -74.5,16.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21957 components: - type: Transform pos: -95.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21958 components: - type: Transform pos: -96.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21959 components: - type: Transform pos: -97.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21960 components: - type: Transform rot: 3.141592653589793 rad pos: -97.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21961 components: - type: Transform rot: 3.141592653589793 rad pos: -96.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21962 components: - type: Transform rot: 3.141592653589793 rad pos: -95.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21963 components: - type: Transform pos: -96.5,22.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21964 components: - type: Transform pos: -95.5,22.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21969 components: - type: Transform pos: -93.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21970 components: - type: Transform rot: 1.5707963267948966 rad pos: -94.5,16.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21971 components: - type: Transform rot: 3.141592653589793 rad pos: -93.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21972 components: - type: Transform rot: 3.141592653589793 rad pos: -95.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21973 components: - type: Transform rot: 3.141592653589793 rad pos: -96.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21974 components: - type: Transform rot: 3.141592653589793 rad pos: -97.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21975 components: - type: Transform rot: 3.141592653589793 rad pos: -98.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21977 components: - type: Transform rot: 1.5707963267948966 rad pos: -94.5,18.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21981 components: - type: Transform rot: 3.141592653589793 rad pos: -100.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21983 components: - type: Transform pos: -100.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21993 components: - type: Transform pos: -101.5,23.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21994 components: - type: Transform pos: -100.5,23.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21995 components: - type: Transform pos: -99.5,23.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 21999 components: - type: Transform rot: 1.5707963267948966 rad pos: -100.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22000 components: - type: Transform rot: 1.5707963267948966 rad pos: -100.5,20.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22001 components: - type: Transform rot: 1.5707963267948966 rad pos: -100.5,21.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22002 components: - type: Transform rot: 3.141592653589793 rad pos: -100.5,21.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22003 components: - type: Transform rot: 3.141592653589793 rad pos: -101.5,21.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22004 components: - type: Transform rot: 3.141592653589793 rad pos: -102.5,21.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22020 components: - type: Transform pos: -77.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22021 components: - type: Transform rot: 1.5707963267948966 rad pos: -103.5,34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22022 components: - type: Transform rot: 1.5707963267948966 rad pos: -103.5,33.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22023 components: - type: Transform rot: 1.5707963267948966 rad pos: -103.5,32.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22024 components: - type: Transform rot: 1.5707963267948966 rad pos: -103.5,31.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22025 components: - type: Transform rot: 1.5707963267948966 rad pos: -103.5,30.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22026 components: - type: Transform rot: 1.5707963267948966 rad pos: -103.5,29.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22027 components: - type: Transform rot: 1.5707963267948966 rad pos: -103.5,28.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22028 components: - type: Transform rot: 1.5707963267948966 rad pos: -103.5,27.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22029 components: - type: Transform rot: 1.5707963267948966 rad pos: -103.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22030 components: - type: Transform rot: 1.5707963267948966 rad pos: -103.5,25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22031 components: - type: Transform rot: 1.5707963267948966 rad pos: -103.5,24.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22032 components: - type: Transform rot: 1.5707963267948966 rad pos: -103.5,23.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22033 components: - type: Transform rot: 1.5707963267948966 rad pos: -103.5,22.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22034 components: - type: Transform rot: -1.5707963267948966 rad pos: -101.5,23.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22035 components: - type: Transform rot: -1.5707963267948966 rad pos: -101.5,24.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22036 components: - type: Transform rot: -1.5707963267948966 rad pos: -101.5,25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22037 components: - type: Transform rot: -1.5707963267948966 rad pos: -101.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22038 components: - type: Transform rot: -1.5707963267948966 rad pos: -101.5,27.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22039 components: - type: Transform rot: -1.5707963267948966 rad pos: -101.5,28.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22040 components: - type: Transform rot: -1.5707963267948966 rad pos: -101.5,29.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22041 components: - type: Transform rot: -1.5707963267948966 rad pos: -101.5,30.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22042 components: - type: Transform rot: -1.5707963267948966 rad pos: -101.5,31.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22043 components: - type: Transform rot: -1.5707963267948966 rad pos: -101.5,32.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22044 components: - type: Transform rot: -1.5707963267948966 rad pos: -101.5,33.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22045 components: - type: Transform rot: -1.5707963267948966 rad pos: -101.5,34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22046 components: - type: Transform rot: -1.5707963267948966 rad pos: -101.5,35.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22047 components: - type: Transform pos: -76.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22048 components: - type: Transform pos: -75.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22049 components: - type: Transform rot: 3.141592653589793 rad pos: -113.5,1.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22050 components: - type: Transform rot: 3.141592653589793 rad pos: -112.5,1.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22060 components: - type: Transform rot: 3.141592653589793 rad pos: -103.5,34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22061 components: - type: Transform rot: 3.141592653589793 rad pos: -104.5,34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22062 components: - type: Transform rot: 3.141592653589793 rad pos: -105.5,34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22063 components: - type: Transform rot: 3.141592653589793 rad pos: -106.5,34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22064 components: - type: Transform rot: 3.141592653589793 rad pos: -107.5,34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22065 components: - type: Transform rot: 3.141592653589793 rad pos: -108.5,34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22066 components: - type: Transform rot: 3.141592653589793 rad pos: -109.5,34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22067 components: - type: Transform rot: 3.141592653589793 rad pos: -110.5,34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22068 components: - type: Transform rot: 3.141592653589793 rad pos: -111.5,34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22069 components: - type: Transform rot: 3.141592653589793 rad pos: -112.5,34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22070 components: - type: Transform rot: 3.141592653589793 rad pos: -113.5,34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22071 components: - type: Transform rot: 3.141592653589793 rad pos: -114.5,34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22072 components: - type: Transform rot: 3.141592653589793 rad pos: -115.5,34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22073 components: - type: Transform rot: 3.141592653589793 rad pos: -116.5,34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22074 components: - type: Transform rot: 3.141592653589793 rad pos: -117.5,34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22075 components: - type: Transform rot: 3.141592653589793 rad pos: -118.5,34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22076 components: - type: Transform rot: 3.141592653589793 rad pos: -119.5,34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22094 components: - type: Transform pos: -102.5,36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22095 components: - type: Transform pos: -103.5,36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22096 components: - type: Transform pos: -104.5,36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22097 components: - type: Transform pos: -105.5,36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22098 components: - type: Transform pos: -106.5,36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22099 components: - type: Transform pos: -107.5,36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22100 components: - type: Transform pos: -108.5,36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22108 components: - type: Transform rot: -1.5707963267948966 rad pos: -108.5,36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22109 components: - type: Transform rot: -1.5707963267948966 rad pos: -108.5,37.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22112 components: - type: Transform rot: 1.5707963267948966 rad pos: -114.5,36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22113 components: - type: Transform rot: 1.5707963267948966 rad pos: -114.5,37.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22121 components: - type: Transform pos: -109.5,38.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22122 components: - type: Transform pos: -110.5,38.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22123 components: - type: Transform pos: -111.5,38.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22124 components: - type: Transform pos: -112.5,38.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22125 components: - type: Transform pos: -113.5,38.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22126 components: - type: Transform pos: -114.5,36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22127 components: - type: Transform pos: -115.5,36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22128 components: - type: Transform pos: -116.5,36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22129 components: - type: Transform pos: -117.5,36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22130 components: - type: Transform pos: -118.5,36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22131 components: - type: Transform pos: -119.5,36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22132 components: - type: Transform pos: -120.5,36.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22140 components: - type: Transform rot: 1.5707963267948966 rad pos: -121.5,35.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22141 components: - type: Transform rot: 1.5707963267948966 rad pos: -121.5,34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22142 components: - type: Transform rot: 1.5707963267948966 rad pos: -121.5,33.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22143 components: - type: Transform rot: 1.5707963267948966 rad pos: -121.5,32.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22144 components: - type: Transform rot: 1.5707963267948966 rad pos: -121.5,31.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22145 components: - type: Transform rot: 1.5707963267948966 rad pos: -121.5,30.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22146 components: - type: Transform rot: 1.5707963267948966 rad pos: -121.5,29.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22147 components: - type: Transform rot: 1.5707963267948966 rad pos: -121.5,28.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22148 components: - type: Transform rot: 1.5707963267948966 rad pos: -121.5,27.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22149 components: - type: Transform rot: 1.5707963267948966 rad pos: -121.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22150 components: - type: Transform rot: 1.5707963267948966 rad pos: -121.5,25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22151 components: - type: Transform rot: 1.5707963267948966 rad pos: -121.5,24.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22152 components: - type: Transform rot: 1.5707963267948966 rad pos: -121.5,23.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22166 components: - type: Transform rot: -1.5707963267948966 rad pos: -119.5,34.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22167 components: - type: Transform rot: -1.5707963267948966 rad pos: -119.5,33.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22168 components: - type: Transform rot: -1.5707963267948966 rad pos: -119.5,32.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22169 components: - type: Transform rot: -1.5707963267948966 rad pos: -119.5,31.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22170 components: - type: Transform rot: -1.5707963267948966 rad pos: -119.5,30.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22171 components: - type: Transform rot: -1.5707963267948966 rad pos: -119.5,29.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22172 components: - type: Transform rot: -1.5707963267948966 rad pos: -119.5,28.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22173 components: - type: Transform rot: -1.5707963267948966 rad pos: -119.5,27.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22174 components: - type: Transform rot: -1.5707963267948966 rad pos: -119.5,26.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22175 components: - type: Transform rot: -1.5707963267948966 rad pos: -119.5,25.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22176 components: - type: Transform rot: -1.5707963267948966 rad pos: -119.5,24.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22177 components: - type: Transform rot: -1.5707963267948966 rad pos: -119.5,23.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22178 components: - type: Transform rot: -1.5707963267948966 rad pos: -119.5,22.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22192 components: - type: Transform rot: 1.5707963267948966 rad pos: -124.5,22.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22193 components: - type: Transform rot: 1.5707963267948966 rad pos: -124.5,21.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22194 components: - type: Transform rot: 1.5707963267948966 rad pos: -124.5,20.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22195 components: - type: Transform rot: 1.5707963267948966 rad pos: -124.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22196 components: - type: Transform rot: 1.5707963267948966 rad pos: -124.5,18.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22197 components: - type: Transform rot: 1.5707963267948966 rad pos: -124.5,17.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22198 components: - type: Transform rot: 1.5707963267948966 rad pos: -124.5,16.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22199 components: - type: Transform rot: 1.5707963267948966 rad pos: -124.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22200 components: - type: Transform rot: 1.5707963267948966 rad pos: -124.5,14.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22201 components: - type: Transform rot: 1.5707963267948966 rad pos: -124.5,13.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22202 components: - type: Transform rot: 1.5707963267948966 rad pos: -124.5,12.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22217 components: - type: Transform pos: -121.5,23.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22218 components: - type: Transform pos: -122.5,23.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22219 components: - type: Transform pos: -123.5,23.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22223 components: - type: Transform rot: 3.141592653589793 rad pos: -122.5,21.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22224 components: - type: Transform rot: 3.141592653589793 rad pos: -121.5,21.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22225 components: - type: Transform rot: 3.141592653589793 rad pos: -120.5,21.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22226 components: - type: Transform rot: -1.5707963267948966 rad pos: -122.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22227 components: - type: Transform rot: -1.5707963267948966 rad pos: -122.5,20.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22228 components: - type: Transform rot: -1.5707963267948966 rad pos: -122.5,21.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22232 components: - type: Transform pos: -122.5,19.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22234 components: - type: Transform rot: 3.141592653589793 rad pos: -122.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22236 components: - type: Transform rot: -1.5707963267948966 rad pos: -122.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22237 components: - type: Transform rot: -1.5707963267948966 rad pos: -122.5,14.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22238 components: - type: Transform rot: -1.5707963267948966 rad pos: -122.5,13.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22242 components: - type: Transform rot: 3.141592653589793 rad pos: -123.5,11.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22243 components: - type: Transform rot: 3.141592653589793 rad pos: -122.5,11.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22244 components: - type: Transform rot: 3.141592653589793 rad pos: -121.5,11.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22245 components: - type: Transform rot: 3.141592653589793 rad pos: -120.5,11.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22246 components: - type: Transform rot: 3.141592653589793 rad pos: -119.5,11.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22252 components: - type: Transform pos: -122.5,13.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22253 components: - type: Transform pos: -121.5,13.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22254 components: - type: Transform pos: -120.5,13.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22255 components: - type: Transform pos: -119.5,13.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22256 components: - type: Transform pos: -118.5,13.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22262 components: - type: Transform rot: -1.5707963267948966 rad pos: -117.5,12.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22263 components: - type: Transform rot: -1.5707963267948966 rad pos: -117.5,11.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22264 components: - type: Transform rot: -1.5707963267948966 rad pos: -117.5,10.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22265 components: - type: Transform rot: -1.5707963267948966 rad pos: -117.5,9.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22266 components: - type: Transform rot: -1.5707963267948966 rad pos: -117.5,8.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22267 components: - type: Transform rot: -1.5707963267948966 rad pos: -117.5,7.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22268 components: - type: Transform rot: -1.5707963267948966 rad pos: -117.5,6.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22269 components: - type: Transform rot: -1.5707963267948966 rad pos: -117.5,5.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22278 components: - type: Transform rot: 1.5707963267948966 rad pos: -119.5,11.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22279 components: - type: Transform rot: 1.5707963267948966 rad pos: -119.5,10.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22280 components: - type: Transform rot: 1.5707963267948966 rad pos: -119.5,9.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22281 components: - type: Transform rot: 1.5707963267948966 rad pos: -119.5,8.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22282 components: - type: Transform rot: 1.5707963267948966 rad pos: -119.5,7.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22283 components: - type: Transform rot: 1.5707963267948966 rad pos: -119.5,6.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22284 components: - type: Transform rot: 1.5707963267948966 rad pos: -119.5,5.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22285 components: - type: Transform rot: 1.5707963267948966 rad pos: -119.5,4.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22294 components: - type: Transform rot: 3.141592653589793 rad pos: -118.5,3.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22295 components: - type: Transform rot: 3.141592653589793 rad pos: -117.5,3.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22296 components: - type: Transform rot: 3.141592653589793 rad pos: -116.5,3.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22297 components: - type: Transform rot: 3.141592653589793 rad pos: -115.5,3.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22298 components: - type: Transform rot: 3.141592653589793 rad pos: -114.5,3.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22304 components: - type: Transform pos: -117.5,5.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22305 components: - type: Transform pos: -116.5,5.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22306 components: - type: Transform pos: -115.5,5.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22307 components: - type: Transform pos: -114.5,5.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22308 components: - type: Transform pos: -113.5,5.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22309 components: - type: Transform pos: -112.5,5.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22316 components: - type: Transform rot: 1.5707963267948966 rad pos: -114.5,2.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22317 components: - type: Transform rot: 1.5707963267948966 rad pos: -114.5,3.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22322 components: - type: Transform rot: 3.141592653589793 rad pos: -111.5,1.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22323 components: - type: Transform rot: 3.141592653589793 rad pos: -110.5,1.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22324 components: - type: Transform rot: 3.141592653589793 rad pos: -109.5,1.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22330 components: - type: Transform rot: -1.5707963267948966 rad pos: -108.5,2.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22331 components: - type: Transform rot: -1.5707963267948966 rad pos: -108.5,3.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22334 components: - type: Transform rot: 1.5707963267948966 rad pos: -112.5,5.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22335 components: - type: Transform rot: -1.5707963267948966 rad pos: -110.5,5.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22344 components: - type: Transform pos: -110.5,5.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22345 components: - type: Transform pos: -109.5,5.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22346 components: - type: Transform pos: -108.5,5.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22347 components: - type: Transform pos: -107.5,5.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22348 components: - type: Transform pos: -106.5,5.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22349 components: - type: Transform pos: -105.5,5.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22350 components: - type: Transform rot: 3.141592653589793 rad pos: -108.5,3.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22351 components: - type: Transform rot: 3.141592653589793 rad pos: -107.5,3.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22352 components: - type: Transform rot: 3.141592653589793 rad pos: -106.5,3.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22353 components: - type: Transform rot: 3.141592653589793 rad pos: -105.5,3.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22354 components: - type: Transform rot: 3.141592653589793 rad pos: -104.5,3.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22360 components: - type: Transform rot: -1.5707963267948966 rad pos: -103.5,4.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22361 components: - type: Transform rot: -1.5707963267948966 rad pos: -103.5,5.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22362 components: - type: Transform rot: -1.5707963267948966 rad pos: -103.5,6.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22363 components: - type: Transform rot: -1.5707963267948966 rad pos: -103.5,7.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22364 components: - type: Transform rot: -1.5707963267948966 rad pos: -103.5,8.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22365 components: - type: Transform rot: -1.5707963267948966 rad pos: -103.5,9.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22366 components: - type: Transform rot: -1.5707963267948966 rad pos: -103.5,10.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22367 components: - type: Transform rot: -1.5707963267948966 rad pos: -103.5,11.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22384 components: - type: Transform rot: 1.5707963267948966 rad pos: -105.5,5.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22385 components: - type: Transform rot: 1.5707963267948966 rad pos: -105.5,6.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22386 components: - type: Transform rot: 1.5707963267948966 rad pos: -105.5,7.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22387 components: - type: Transform rot: 1.5707963267948966 rad pos: -105.5,8.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22388 components: - type: Transform rot: 1.5707963267948966 rad pos: -105.5,9.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22389 components: - type: Transform rot: 1.5707963267948966 rad pos: -105.5,10.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22390 components: - type: Transform rot: 1.5707963267948966 rad pos: -105.5,11.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22391 components: - type: Transform rot: 1.5707963267948966 rad pos: -105.5,12.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22392 components: - type: Transform pos: -104.5,13.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22393 components: - type: Transform pos: -103.5,13.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22394 components: - type: Transform pos: -102.5,13.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22395 components: - type: Transform pos: -101.5,13.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22396 components: - type: Transform pos: -100.5,13.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22402 components: - type: Transform rot: 1.5707963267948966 rad pos: -100.5,13.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22403 components: - type: Transform rot: 1.5707963267948966 rad pos: -100.5,14.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22404 components: - type: Transform rot: 1.5707963267948966 rad pos: -100.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22408 components: - type: Transform rot: -1.5707963267948966 rad pos: -98.5,15.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22409 components: - type: Transform rot: -1.5707963267948966 rad pos: -98.5,14.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22410 components: - type: Transform rot: -1.5707963267948966 rad pos: -98.5,13.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22411 components: - type: Transform rot: -1.5707963267948966 rad pos: -98.5,12.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22416 components: - type: Transform rot: 3.141592653589793 rad pos: -99.5,11.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22417 components: - type: Transform rot: 3.141592653589793 rad pos: -100.5,11.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22418 components: - type: Transform rot: 3.141592653589793 rad pos: -101.5,11.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22419 components: - type: Transform rot: 3.141592653589793 rad pos: -102.5,11.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 22420 components: - type: Transform rot: 3.141592653589793 rad pos: -103.5,11.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 24660 components: - type: Transform rot: -1.5707963267948966 rad pos: -0.5,22.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 24663 components: - type: Transform pos: -0.5,22.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 24666 components: - type: Transform pos: 0.5,22.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 24675 components: - type: Transform pos: 1.5,22.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 24676 components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,22.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 25388 components: - type: Transform rot: -1.5707963267948966 rad pos: -110.5,8.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - uid: 25389 components: - type: Transform rot: 1.5707963267948966 rad pos: -112.5,8.5 parent: 60 - - type: DeltaPressure - gridUid: 60 - proto: Wirecutter entities: - uid: 19191 From 6fb31150d076b2ca93da521f17847dbef3a0a37b Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Tue, 4 Nov 2025 13:11:35 -0700 Subject: [PATCH 102/121] fland update (#41291) --- Resources/Maps/fland.yml | 2975 +------------------------------------- 1 file changed, 16 insertions(+), 2959 deletions(-) diff --git a/Resources/Maps/fland.yml b/Resources/Maps/fland.yml index 12543f1134..ca74bc64e7 100644 --- a/Resources/Maps/fland.yml +++ b/Resources/Maps/fland.yml @@ -4,8 +4,8 @@ meta: engineVersion: 267.3.0 forkId: "" forkVersion: "" - time: 10/16/2025 13:06:44 - entityCount: 36082 + time: 11/04/2025 19:48:31 + entityCount: 36081 maps: - 1 grids: @@ -164943,18 +164943,6 @@ entities: - type: Transform pos: 19.589119,11.494171 parent: 13329 -- proto: MagazinePistolSubMachineGunTopMounted - entities: - - uid: 10496 - components: - - type: Transform - pos: 35.578094,20.991646 - parent: 13329 - - uid: 10501 - components: - - type: Transform - pos: 35.578094,20.991646 - parent: 13329 - proto: MagazineRifle entities: - uid: 10597 @@ -167362,8 +167350,6 @@ entities: rot: 1.5707963267948966 rad pos: 99.5,-15.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - proto: PlasmaWindoorSecureArmoryLocked entities: - uid: 26292 @@ -167372,8 +167358,6 @@ entities: rot: -1.5707963267948966 rad pos: 22.5,13.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -167389,8 +167373,6 @@ entities: rot: 1.5707963267948966 rad pos: 22.5,13.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -177998,565 +177980,407 @@ entities: - type: Transform pos: -30.5,72.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 5634 components: - type: Transform pos: -30.5,73.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 5635 components: - type: Transform pos: -30.5,74.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13916 components: - type: Transform pos: 59.5,-32.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13917 components: - type: Transform pos: 59.5,-33.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13918 components: - type: Transform pos: 63.5,-33.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13919 components: - type: Transform pos: 59.5,-30.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13920 components: - type: Transform pos: 59.5,-29.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13922 components: - type: Transform pos: 66.5,-33.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15774 components: - type: Transform pos: 96.5,-28.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15775 components: - type: Transform pos: 98.5,-28.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20188 components: - type: Transform pos: 87.5,-12.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20189 components: - type: Transform pos: 87.5,-11.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20228 components: - type: Transform pos: 84.5,-4.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20229 components: - type: Transform pos: 79.5,-1.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20230 components: - type: Transform pos: 80.5,-1.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20231 components: - type: Transform pos: 81.5,-1.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20369 components: - type: Transform pos: 98.5,-18.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20370 components: - type: Transform pos: 99.5,-18.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20398 components: - type: Transform pos: 80.5,-39.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20399 components: - type: Transform pos: 71.5,-39.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20400 components: - type: Transform pos: 78.5,-39.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20403 components: - type: Transform pos: 73.5,-41.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20421 components: - type: Transform pos: 74.5,-39.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20422 components: - type: Transform pos: 76.5,-39.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20423 components: - type: Transform pos: 75.5,-39.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20424 components: - type: Transform pos: 79.5,-39.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20431 components: - type: Transform pos: 72.5,-39.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20432 components: - type: Transform pos: 70.5,-39.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20475 components: - type: Transform pos: 77.5,-41.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20503 components: - type: Transform pos: 92.5,-40.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20514 components: - type: Transform pos: 92.5,-36.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20518 components: - type: Transform pos: 90.5,-42.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20519 components: - type: Transform pos: 90.5,-38.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20526 components: - type: Transform pos: 92.5,-32.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20530 components: - type: Transform pos: 90.5,-34.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20558 components: - type: Transform pos: 90.5,-25.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20559 components: - type: Transform pos: 93.5,-28.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20561 components: - type: Transform pos: 91.5,-28.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20563 components: - type: Transform pos: 94.5,-25.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20565 components: - type: Transform pos: 94.5,-27.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20571 components: - type: Transform pos: 90.5,-27.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20573 components: - type: Transform pos: 90.5,-26.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20578 components: - type: Transform pos: 92.5,-28.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20630 components: - type: Transform pos: 98.5,-24.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20631 components: - type: Transform pos: 96.5,-24.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22716 components: - type: Transform pos: 88.5,2.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22721 components: - type: Transform pos: 88.5,-0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22806 components: - type: Transform pos: 92.5,-6.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22809 components: - type: Transform pos: 92.5,-5.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22810 components: - type: Transform pos: 92.5,-4.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22831 components: - type: Transform pos: 95.5,-1.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22832 components: - type: Transform pos: 93.5,-9.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22835 components: - type: Transform pos: 95.5,-9.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 23398 components: - type: Transform pos: 93.5,-1.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 23602 components: - type: Transform pos: 90.5,-43.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 23603 components: - type: Transform pos: 90.5,-41.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 23604 components: - type: Transform pos: 90.5,-39.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 23605 components: - type: Transform pos: 90.5,-37.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 23606 components: - type: Transform pos: 90.5,-35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 23607 components: - type: Transform pos: 90.5,-33.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 23635 components: - type: Transform rot: 3.141592653589793 rad pos: 108.5,-36.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 23636 components: - type: Transform rot: 3.141592653589793 rad pos: 112.5,-37.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 23638 components: - type: Transform rot: 3.141592653589793 rad pos: 109.5,-38.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 23693 components: - type: Transform rot: 3.141592653589793 rad pos: 112.5,-36.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 23702 components: - type: Transform rot: 3.141592653589793 rad pos: 108.5,-37.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 23908 components: - type: Transform rot: 3.141592653589793 rad pos: 108.5,-35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 23909 components: - type: Transform rot: 3.141592653589793 rad pos: 111.5,-34.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 23914 components: - type: Transform rot: 3.141592653589793 rad pos: 112.5,-35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 23920 components: - type: Transform rot: 3.141592653589793 rad pos: 110.5,-34.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 24256 components: - type: Transform rot: 3.141592653589793 rad pos: 111.5,-38.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 24646 components: - type: Transform rot: 3.141592653589793 rad pos: 109.5,-34.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 25460 components: - type: Transform pos: 84.5,-0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 25461 components: - type: Transform pos: 84.5,1.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 25503 components: - type: Transform pos: 84.5,-6.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 25984 components: - type: Transform pos: 96.5,-0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 26746 components: - type: Transform pos: 100.5,-18.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 29874 components: - type: Transform pos: 122.5,49.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 35306 components: - type: Transform pos: 99.5,-0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - proto: ReinforcedWindow entities: - uid: 167 @@ -178564,5426 +178388,3876 @@ entities: - type: Transform pos: -12.5,34.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 314 components: - type: Transform pos: -8.5,16.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 315 components: - type: Transform pos: -4.5,16.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 316 components: - type: Transform pos: -11.5,23.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 317 components: - type: Transform pos: -15.5,13.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 318 components: - type: Transform pos: -2.5,36.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 319 components: - type: Transform pos: -2.5,39.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 320 components: - type: Transform pos: -8.5,43.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 321 components: - type: Transform pos: -11.5,43.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 896 components: - type: Transform pos: -2.5,31.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 1403 components: - type: Transform pos: 5.5,31.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 1404 components: - type: Transform pos: 2.5,31.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 1405 components: - type: Transform pos: 1.5,30.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 1406 components: - type: Transform pos: 1.5,27.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 1407 components: - type: Transform pos: 1.5,24.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 1408 components: - type: Transform pos: 1.5,21.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 1502 components: - type: Transform pos: -10.5,27.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2055 components: - type: Transform pos: 9.5,-14.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2056 components: - type: Transform pos: 6.5,-14.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2057 components: - type: Transform pos: 3.5,-14.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2089 components: - type: Transform pos: -11.5,-7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2090 components: - type: Transform pos: -9.5,-7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2126 components: - type: Transform pos: 22.5,-13.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2127 components: - type: Transform pos: 22.5,-14.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2128 components: - type: Transform pos: 22.5,-9.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2129 components: - type: Transform pos: 22.5,-11.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2248 components: - type: Transform pos: -17.5,-7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2249 components: - type: Transform pos: -19.5,-7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2250 components: - type: Transform pos: -20.5,-8.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2251 components: - type: Transform pos: -20.5,-9.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2252 components: - type: Transform pos: -20.5,-10.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2662 components: - type: Transform pos: 19.5,-16.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2663 components: - type: Transform pos: 19.5,-17.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2687 components: - type: Transform pos: 10.5,-11.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2688 components: - type: Transform pos: 10.5,-9.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2689 components: - type: Transform pos: 14.5,-11.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2690 components: - type: Transform pos: 14.5,-9.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2715 components: - type: Transform pos: -42.5,-26.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2716 components: - type: Transform pos: -42.5,-25.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2717 components: - type: Transform pos: -42.5,-24.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2718 components: - type: Transform pos: -31.5,-27.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2719 components: - type: Transform pos: -30.5,-27.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2720 components: - type: Transform pos: -32.5,-29.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2721 components: - type: Transform pos: -34.5,-29.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2722 components: - type: Transform pos: -29.5,-29.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2723 components: - type: Transform pos: -27.5,-29.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2724 components: - type: Transform pos: -24.5,-29.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2725 components: - type: Transform pos: -20.5,-29.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2726 components: - type: Transform pos: -23.5,-31.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2727 components: - type: Transform pos: -21.5,-31.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2728 components: - type: Transform pos: -17.5,-29.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2729 components: - type: Transform pos: -15.5,-29.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2778 components: - type: Transform pos: -5.5,-28.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2779 components: - type: Transform pos: -4.5,-28.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2780 components: - type: Transform pos: -3.5,-28.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2781 components: - type: Transform pos: -1.5,-28.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2782 components: - type: Transform pos: -0.5,-28.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2783 components: - type: Transform pos: 0.5,-28.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2804 components: - type: Transform pos: 4.5,-26.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2805 components: - type: Transform pos: 4.5,-24.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2806 components: - type: Transform pos: 2.5,-22.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2807 components: - type: Transform pos: 1.5,-22.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2808 components: - type: Transform pos: 0.5,-22.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2809 components: - type: Transform pos: -0.5,-22.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2843 components: - type: Transform pos: -29.5,-8.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2844 components: - type: Transform pos: -28.5,-7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2845 components: - type: Transform pos: -27.5,-7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2846 components: - type: Transform pos: -26.5,-7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2847 components: - type: Transform pos: -25.5,-7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2848 components: - type: Transform pos: -29.5,-10.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2849 components: - type: Transform pos: -31.5,-10.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2850 components: - type: Transform pos: -31.5,-8.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2851 components: - type: Transform pos: -31.5,-7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2853 components: - type: Transform pos: -32.5,-9.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2856 components: - type: Transform pos: -44.5,-23.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2863 components: - type: Transform pos: -38.5,-21.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2864 components: - type: Transform pos: -35.5,-9.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2865 components: - type: Transform pos: -34.5,-9.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2866 components: - type: Transform pos: -33.5,-9.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2871 components: - type: Transform pos: -38.5,-22.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2872 components: - type: Transform pos: -39.5,-6.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2873 components: - type: Transform pos: -39.5,-5.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2874 components: - type: Transform pos: -39.5,-4.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2898 components: - type: Transform pos: -47.5,-2.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2899 components: - type: Transform pos: -46.5,-0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2900 components: - type: Transform pos: -49.5,0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2901 components: - type: Transform pos: -49.5,2.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2902 components: - type: Transform pos: -48.5,2.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2903 components: - type: Transform pos: -47.5,2.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2904 components: - type: Transform pos: -48.5,0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2905 components: - type: Transform pos: -47.5,0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2911 components: - type: Transform pos: -35.5,-21.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2912 components: - type: Transform pos: -34.5,-21.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2913 components: - type: Transform pos: -33.5,-21.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2918 components: - type: Transform pos: -36.5,-8.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2919 components: - type: Transform pos: -38.5,-10.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2934 components: - type: Transform pos: -31.5,-23.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2935 components: - type: Transform pos: -31.5,-22.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2936 components: - type: Transform pos: -29.5,-22.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2937 components: - type: Transform pos: -28.5,-23.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2938 components: - type: Transform pos: -27.5,-23.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2939 components: - type: Transform pos: -26.5,-23.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2940 components: - type: Transform pos: -25.5,-23.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2945 components: - type: Transform pos: -31.5,-20.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2946 components: - type: Transform pos: -29.5,-20.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2947 components: - type: Transform pos: -24.5,-19.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2948 components: - type: Transform pos: -24.5,-18.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2949 components: - type: Transform pos: -24.5,-17.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2950 components: - type: Transform pos: -24.5,-16.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2951 components: - type: Transform pos: -24.5,-14.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2952 components: - type: Transform pos: -24.5,-13.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2953 components: - type: Transform pos: -24.5,-12.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2954 components: - type: Transform pos: -24.5,-11.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2977 components: - type: Transform pos: -36.5,-22.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2978 components: - type: Transform pos: -36.5,-23.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3024 components: - type: Transform pos: -38.5,-9.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3025 components: - type: Transform pos: -38.5,-8.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3655 components: - type: Transform pos: -39.5,12.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3656 components: - type: Transform pos: -39.5,13.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3751 components: - type: Transform pos: -36.5,-20.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3753 components: - type: Transform pos: -36.5,-7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3762 components: - type: Transform pos: -41.5,43.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3763 components: - type: Transform pos: -39.5,44.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3764 components: - type: Transform pos: -38.5,43.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3765 components: - type: Transform pos: -40.5,41.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3766 components: - type: Transform pos: -41.5,41.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3767 components: - type: Transform pos: -41.5,39.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3768 components: - type: Transform pos: -39.5,39.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3769 components: - type: Transform pos: -38.5,39.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3770 components: - type: Transform pos: -38.5,38.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3771 components: - type: Transform pos: -41.5,35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3772 components: - type: Transform pos: -39.5,35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3773 components: - type: Transform pos: -38.5,35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3774 components: - type: Transform pos: -38.5,36.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3775 components: - type: Transform pos: -41.5,31.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3776 components: - type: Transform pos: -39.5,31.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3777 components: - type: Transform pos: -38.5,31.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3779 components: - type: Transform pos: -38.5,33.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3780 components: - type: Transform pos: -40.5,33.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3781 components: - type: Transform pos: -41.5,33.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3791 components: - type: Transform pos: -27.5,43.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3792 components: - type: Transform pos: -28.5,43.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3793 components: - type: Transform pos: -29.5,42.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3794 components: - type: Transform pos: -28.5,41.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3795 components: - type: Transform pos: -27.5,41.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3796 components: - type: Transform pos: -30.5,41.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3797 components: - type: Transform pos: -33.5,41.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3798 components: - type: Transform pos: -34.5,42.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3799 components: - type: Transform pos: -34.5,43.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3800 components: - type: Transform pos: -34.5,44.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3801 components: - type: Transform pos: -35.5,41.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3802 components: - type: Transform pos: -37.5,41.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3803 components: - type: Transform pos: -26.5,38.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3804 components: - type: Transform pos: -26.5,39.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3805 components: - type: Transform pos: -26.5,40.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3809 components: - type: Transform pos: -38.5,27.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3810 components: - type: Transform pos: -38.5,26.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3905 components: - type: Transform pos: -37.5,46.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3906 components: - type: Transform pos: -35.5,46.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3907 components: - type: Transform pos: -38.5,47.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3908 components: - type: Transform pos: -38.5,48.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3909 components: - type: Transform pos: -38.5,49.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3910 components: - type: Transform pos: -34.5,47.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3911 components: - type: Transform pos: -34.5,49.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 4027 components: - type: Transform pos: -22.5,43.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 4035 components: - type: Transform pos: -21.5,43.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 5140 components: - type: Transform pos: -38.5,52.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 5141 components: - type: Transform pos: -38.5,54.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 5142 components: - type: Transform pos: -38.5,55.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 5143 components: - type: Transform pos: -38.5,56.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 5144 components: - type: Transform pos: -38.5,58.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 5171 components: - type: Transform pos: -41.5,62.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 5172 components: - type: Transform pos: -41.5,63.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 5219 components: - type: Transform pos: -17.5,77.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 5220 components: - type: Transform pos: -16.5,77.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 5221 components: - type: Transform pos: -15.5,77.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 5242 components: - type: Transform pos: -7.5,76.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 5243 components: - type: Transform pos: -8.5,76.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 5244 components: - type: Transform pos: -11.5,76.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 5245 components: - type: Transform pos: -10.5,76.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 5424 components: - type: Transform pos: -5.5,72.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 5425 components: - type: Transform pos: -3.5,72.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 5427 components: - type: Transform pos: -5.5,76.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 5435 components: - type: Transform pos: -5.5,67.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 5436 components: - type: Transform pos: -3.5,67.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 5456 components: - type: Transform pos: -6.5,69.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 5457 components: - type: Transform pos: -6.5,70.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 5988 components: - type: Transform pos: -33.5,50.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 5989 components: - type: Transform pos: -30.5,50.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 6763 components: - type: Transform pos: -3.5,76.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7206 components: - type: Transform pos: 24.5,28.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7207 components: - type: Transform pos: 24.5,31.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7213 components: - type: Transform pos: 27.5,8.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7214 components: - type: Transform pos: 29.5,8.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7215 components: - type: Transform pos: 26.5,9.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7216 components: - type: Transform pos: 26.5,10.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7217 components: - type: Transform pos: 26.5,13.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7218 components: - type: Transform pos: 26.5,14.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7219 components: - type: Transform pos: 27.5,15.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7220 components: - type: Transform pos: 32.5,11.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7221 components: - type: Transform pos: 32.5,12.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7240 components: - type: Transform pos: 39.5,8.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7254 components: - type: Transform pos: 28.5,4.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7258 components: - type: Transform pos: 24.5,0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7259 components: - type: Transform pos: 24.5,4.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7276 components: - type: Transform pos: 34.5,8.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7277 components: - type: Transform pos: 36.5,8.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7299 components: - type: Transform pos: 28.5,0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7302 components: - type: Transform pos: 31.5,0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7333 components: - type: Transform pos: 24.5,15.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7334 components: - type: Transform pos: 26.5,17.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7335 components: - type: Transform pos: 26.5,19.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7336 components: - type: Transform pos: 26.5,21.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7337 components: - type: Transform pos: 26.5,22.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7338 components: - type: Transform pos: 26.5,24.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7339 components: - type: Transform pos: 26.5,26.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7353 components: - type: Transform pos: 31.5,27.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7378 components: - type: Transform pos: 34.5,17.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7379 components: - type: Transform pos: 34.5,19.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7417 components: - type: Transform pos: 30.5,0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7418 components: - type: Transform pos: 31.5,4.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7519 components: - type: Transform pos: 52.5,6.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7525 components: - type: Transform pos: 33.5,0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7533 components: - type: Transform pos: 27.5,4.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7556 components: - type: Transform pos: 52.5,20.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7557 components: - type: Transform pos: 52.5,21.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7559 components: - type: Transform pos: 52.5,23.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7560 components: - type: Transform pos: 52.5,24.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 8100 components: - type: Transform pos: 44.5,10.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 8130 components: - type: Transform pos: 27.5,0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 8134 components: - type: Transform pos: 34.5,0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 8141 components: - type: Transform pos: 37.5,6.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 8169 components: - type: Transform pos: 45.5,8.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 8387 components: - type: Transform pos: 27.5,31.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 8406 components: - type: Transform pos: 19.5,21.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 8407 components: - type: Transform pos: 19.5,22.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 8408 components: - type: Transform pos: 19.5,23.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 8681 components: - type: Transform pos: 46.5,8.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 8866 components: - type: Transform pos: 47.5,8.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 8958 components: - type: Transform pos: 46.5,11.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 8959 components: - type: Transform pos: 47.5,11.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9246 components: - type: Transform pos: 22.5,17.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9247 components: - type: Transform pos: 22.5,19.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9360 components: - type: Transform pos: 33.5,4.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9394 components: - type: Transform pos: 37.5,0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9477 components: - type: Transform pos: -10.5,-30.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9675 components: - type: Transform pos: 16.5,-27.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9679 components: - type: Transform pos: 13.5,-33.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9687 components: - type: Transform pos: 20.5,-33.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9691 components: - type: Transform pos: 15.5,-35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9692 components: - type: Transform pos: 15.5,-34.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9693 components: - type: Transform pos: 18.5,-35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9694 components: - type: Transform pos: 18.5,-34.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9695 components: - type: Transform pos: 17.5,-36.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9696 components: - type: Transform pos: 8.5,-39.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9697 components: - type: Transform pos: 7.5,-39.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9699 components: - type: Transform pos: 3.5,-33.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9700 components: - type: Transform pos: 2.5,-39.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9702 components: - type: Transform pos: 9.5,-39.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9706 components: - type: Transform pos: 6.5,-39.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9709 components: - type: Transform pos: 11.5,-37.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9710 components: - type: Transform pos: 2.5,-33.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9711 components: - type: Transform pos: 3.5,-39.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9712 components: - type: Transform pos: 11.5,-36.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9713 components: - type: Transform pos: 11.5,-35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9722 components: - type: Transform pos: 3.5,-36.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9723 components: - type: Transform pos: 1.5,-36.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9724 components: - type: Transform pos: -8.5,-30.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9725 components: - type: Transform pos: 22.5,-34.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9726 components: - type: Transform pos: 22.5,-35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9727 components: - type: Transform pos: 22.5,-37.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9728 components: - type: Transform pos: 22.5,-38.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9740 components: - type: Transform pos: 11.5,-32.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9741 components: - type: Transform pos: 11.5,-31.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9742 components: - type: Transform pos: 11.5,-30.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 10216 components: - type: Transform pos: 46.5,-8.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 10217 components: - type: Transform pos: 49.5,-8.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 10218 components: - type: Transform pos: 48.5,-8.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 10219 components: - type: Transform pos: 51.5,-8.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 10220 components: - type: Transform pos: 51.5,-3.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 10221 components: - type: Transform pos: 49.5,-3.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 10222 components: - type: Transform pos: 48.5,-3.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 10223 components: - type: Transform pos: 46.5,-3.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 10358 components: - type: Transform pos: 36.5,0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 10437 components: - type: Transform pos: 45.5,11.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 12192 components: - type: Transform pos: -37.5,-29.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 12193 components: - type: Transform pos: -41.5,-29.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 12203 components: - type: Transform pos: -42.5,-31.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 12206 components: - type: Transform pos: -42.5,-36.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 12207 components: - type: Transform pos: -42.5,-35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 12212 components: - type: Transform pos: -42.5,-41.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 12214 components: - type: Transform pos: -37.5,-33.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 12215 components: - type: Transform pos: -37.5,-32.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 12216 components: - type: Transform pos: -37.5,-36.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 12248 components: - type: Transform pos: -37.5,-42.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 12249 components: - type: Transform pos: -37.5,-41.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 12250 components: - type: Transform pos: -37.5,-39.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 12251 components: - type: Transform pos: -32.5,-39.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 12252 components: - type: Transform pos: -32.5,-40.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 12253 components: - type: Transform pos: -32.5,-41.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 12255 components: - type: Transform pos: -39.5,-44.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 12265 components: - type: Transform pos: -34.5,-48.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 12266 components: - type: Transform pos: -33.5,-48.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 12267 components: - type: Transform pos: -30.5,-48.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 12268 components: - type: Transform pos: -31.5,-46.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 12269 components: - type: Transform pos: -37.5,-50.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 12270 components: - type: Transform pos: -37.5,-51.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 12271 components: - type: Transform pos: -37.5,-52.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 12273 components: - type: Transform pos: -37.5,-54.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 12274 components: - type: Transform pos: -37.5,-55.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 12275 components: - type: Transform pos: -37.5,-56.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 12280 components: - type: Transform pos: -33.5,-58.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 12284 components: - type: Transform pos: -34.5,-58.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 12287 components: - type: Transform pos: -30.5,-58.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 12292 components: - type: Transform pos: -31.5,-60.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 12335 components: - type: Transform pos: -35.5,-62.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 12336 components: - type: Transform pos: -34.5,-62.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 12337 components: - type: Transform pos: -34.5,-64.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 12338 components: - type: Transform pos: -35.5,-64.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 12345 components: - type: Transform pos: -38.5,-63.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 12346 components: - type: Transform pos: -31.5,-63.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 12411 components: - type: Transform pos: -46.5,-59.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 12412 components: - type: Transform pos: -44.5,-59.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 12413 components: - type: Transform pos: -44.5,-62.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 12414 components: - type: Transform pos: -46.5,-62.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13082 components: - type: Transform pos: -31.5,-42.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13083 components: - type: Transform pos: -29.5,-42.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13149 components: - type: Transform pos: -32.5,-21.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13256 components: - type: Transform pos: -38.5,-20.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13257 components: - type: Transform pos: -38.5,-23.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13258 components: - type: Transform pos: -36.5,-10.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13272 components: - type: Transform pos: -38.5,-7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13274 components: - type: Transform pos: -41.5,-40.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13275 components: - type: Transform pos: -43.5,-40.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13614 components: - type: Transform pos: -23.5,-28.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13615 components: - type: Transform pos: -21.5,-28.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13705 components: - type: Transform pos: 40.5,-12.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13706 components: - type: Transform pos: 44.5,-12.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13707 components: - type: Transform pos: 35.5,-14.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13712 components: - type: Transform pos: 52.5,-13.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13713 components: - type: Transform pos: 54.5,-13.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13714 components: - type: Transform pos: 55.5,-13.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13718 components: - type: Transform pos: 49.5,-16.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13729 components: - type: Transform pos: 43.5,-19.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13730 components: - type: Transform pos: 44.5,-22.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13731 components: - type: Transform pos: 41.5,-19.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13732 components: - type: Transform pos: 41.5,-24.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13748 components: - type: Transform pos: 51.5,-21.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13769 components: - type: Transform pos: 37.5,-18.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13773 components: - type: Transform pos: 33.5,-18.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13777 components: - type: Transform pos: 31.5,-19.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13778 components: - type: Transform pos: 31.5,-20.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13812 components: - type: Transform pos: 44.5,-28.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13813 components: - type: Transform pos: 51.5,-28.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13814 components: - type: Transform pos: 40.5,-29.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13815 components: - type: Transform pos: 40.5,-30.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13819 components: - type: Transform pos: 42.5,-28.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13820 components: - type: Transform pos: 43.5,-28.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13832 components: - type: Transform pos: 33.5,-29.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13833 components: - type: Transform pos: 33.5,-28.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13837 components: - type: Transform pos: 46.5,-30.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13839 components: - type: Transform pos: 46.5,-29.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13847 components: - type: Transform pos: 54.5,-26.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13848 components: - type: Transform pos: 54.5,-27.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13859 components: - type: Transform pos: 55.5,-36.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13860 components: - type: Transform pos: 50.5,-32.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13921 components: - type: Transform pos: 59.5,-27.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13923 components: - type: Transform pos: 49.5,-36.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13924 components: - type: Transform pos: 47.5,-36.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13967 components: - type: Transform pos: 36.5,-39.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13968 components: - type: Transform pos: 36.5,-37.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13992 components: - type: Transform pos: 40.5,-39.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13993 components: - type: Transform pos: 42.5,-36.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13995 components: - type: Transform pos: 40.5,-37.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13996 components: - type: Transform pos: 44.5,-36.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15565 components: - type: Transform pos: 37.5,-44.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15566 components: - type: Transform pos: 39.5,-44.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15576 components: - type: Transform pos: 22.5,-44.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15577 components: - type: Transform pos: 22.5,-45.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15581 components: - type: Transform pos: 21.5,-48.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15586 components: - type: Transform pos: 22.5,-52.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15589 components: - type: Transform pos: 23.5,-54.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15590 components: - type: Transform pos: 25.5,-54.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15591 components: - type: Transform pos: 22.5,-55.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15592 components: - type: Transform pos: 22.5,-57.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15605 components: - type: Transform pos: 24.5,-61.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15606 components: - type: Transform pos: 24.5,-59.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15607 components: - type: Transform pos: 28.5,-61.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15608 components: - type: Transform pos: 28.5,-59.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15613 components: - type: Transform pos: 30.5,-59.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15623 components: - type: Transform pos: 30.5,-52.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15624 components: - type: Transform pos: 29.5,-52.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15648 components: - type: Transform pos: 47.5,-55.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15686 components: - type: Transform pos: 83.5,-54.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15688 components: - type: Transform pos: 83.5,-53.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15689 components: - type: Transform pos: 71.5,-54.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15690 components: - type: Transform pos: 71.5,-53.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15712 components: - type: Transform pos: 56.5,-59.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15713 components: - type: Transform pos: 57.5,-59.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15714 components: - type: Transform pos: 58.5,-59.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15750 components: - type: Transform pos: 101.5,-57.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15751 components: - type: Transform pos: 103.5,-57.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15757 components: - type: Transform pos: 100.5,-28.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15758 components: - type: Transform pos: 105.5,-50.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15759 components: - type: Transform pos: 105.5,-49.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15779 components: - type: Transform pos: 103.5,-21.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15780 components: - type: Transform pos: 104.5,-21.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15781 components: - type: Transform pos: 105.5,-21.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15782 components: - type: Transform pos: 106.5,-21.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15791 components: - type: Transform pos: 108.5,-22.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15812 components: - type: Transform pos: 117.5,30.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15813 components: - type: Transform pos: 117.5,32.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15842 components: - type: Transform pos: 117.5,13.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15843 components: - type: Transform pos: 118.5,12.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15844 components: - type: Transform pos: 118.5,10.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15870 components: - type: Transform pos: 127.5,-1.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15878 components: - type: Transform pos: 127.5,-8.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15879 components: - type: Transform pos: 127.5,-7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15880 components: - type: Transform pos: 127.5,-6.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15922 components: - type: Transform pos: 122.5,-20.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15923 components: - type: Transform pos: 122.5,-19.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15924 components: - type: Transform pos: 117.5,-22.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15925 components: - type: Transform pos: 117.5,-23.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15926 components: - type: Transform pos: 117.5,-26.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15927 components: - type: Transform pos: 117.5,-25.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15939 components: - type: Transform pos: 114.5,38.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15940 components: - type: Transform pos: 114.5,39.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15941 components: - type: Transform pos: 114.5,40.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15942 components: - type: Transform pos: 110.5,38.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15943 components: - type: Transform pos: 110.5,39.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15944 components: - type: Transform pos: 110.5,40.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15945 components: - type: Transform pos: 104.5,38.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15946 components: - type: Transform pos: 104.5,39.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15947 components: - type: Transform pos: 104.5,40.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16046 components: - type: Transform pos: 96.5,57.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16063 components: - type: Transform pos: 94.5,62.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16064 components: - type: Transform pos: 93.5,63.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16065 components: - type: Transform pos: 93.5,64.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16066 components: - type: Transform pos: 94.5,65.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16067 components: - type: Transform pos: 94.5,68.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16068 components: - type: Transform pos: 94.5,69.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16069 components: - type: Transform pos: 94.5,70.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16070 components: - type: Transform pos: 92.5,71.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16071 components: - type: Transform pos: 90.5,71.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16084 components: - type: Transform pos: 90.5,74.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16085 components: - type: Transform pos: 92.5,74.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16087 components: - type: Transform pos: 89.5,69.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16088 components: - type: Transform pos: 89.5,68.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16089 components: - type: Transform pos: 89.5,67.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16090 components: - type: Transform pos: 89.5,63.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16091 components: - type: Transform pos: 89.5,62.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16092 components: - type: Transform pos: 89.5,61.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16100 components: - type: Transform pos: 88.5,57.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16101 components: - type: Transform pos: 87.5,57.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16102 components: - type: Transform pos: 86.5,57.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16109 components: - type: Transform pos: 83.5,58.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16110 components: - type: Transform pos: 82.5,58.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16111 components: - type: Transform pos: 80.5,58.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16112 components: - type: Transform pos: 79.5,58.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16113 components: - type: Transform pos: 77.5,58.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16114 components: - type: Transform pos: 76.5,58.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16118 components: - type: Transform pos: 74.5,60.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16119 components: - type: Transform pos: 74.5,61.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16120 components: - type: Transform pos: 73.5,61.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16121 components: - type: Transform pos: 71.5,61.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16122 components: - type: Transform pos: 70.5,61.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16123 components: - type: Transform pos: 69.5,61.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16124 components: - type: Transform pos: 67.5,61.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16130 components: - type: Transform pos: 63.5,61.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16131 components: - type: Transform pos: 62.5,61.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16132 components: - type: Transform pos: 61.5,61.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16133 components: - type: Transform pos: 60.5,61.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16139 components: - type: Transform pos: 57.5,63.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16140 components: - type: Transform pos: 57.5,64.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16260 components: - type: Transform pos: 61.5,41.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16275 components: - type: Transform pos: 69.5,41.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16276 components: - type: Transform pos: 68.5,41.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16277 components: - type: Transform pos: 67.5,41.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16281 components: - type: Transform pos: 59.5,43.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16282 components: - type: Transform pos: 60.5,43.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16283 components: - type: Transform pos: 64.5,43.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16284 components: - type: Transform pos: 63.5,43.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16285 components: - type: Transform pos: 62.5,43.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16307 components: - type: Transform pos: 71.5,41.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16308 components: - type: Transform pos: 71.5,44.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16309 components: - type: Transform pos: 74.5,44.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16310 components: - type: Transform pos: 74.5,41.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16367 components: - type: Transform pos: 87.5,45.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16368 components: - type: Transform pos: 86.5,45.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16369 components: - type: Transform pos: 86.5,46.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16370 components: - type: Transform pos: 91.5,45.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16371 components: - type: Transform pos: 92.5,45.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16372 components: - type: Transform pos: 92.5,46.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16373 components: - type: Transform pos: 86.5,47.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16375 components: - type: Transform pos: 92.5,47.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16379 components: - type: Transform pos: 86.5,50.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16380 components: - type: Transform pos: 86.5,51.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16381 components: - type: Transform pos: 86.5,52.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16382 components: - type: Transform pos: 87.5,52.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16383 components: - type: Transform pos: 92.5,50.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16384 components: - type: Transform pos: 92.5,51.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16385 components: - type: Transform pos: 91.5,52.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16386 components: - type: Transform pos: 92.5,52.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16435 components: - type: Transform pos: 75.5,56.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16452 components: - type: Transform pos: 66.5,54.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16453 components: - type: Transform pos: 66.5,58.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16454 components: - type: Transform pos: 94.5,56.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16455 components: - type: Transform pos: 90.5,57.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16456 components: - type: Transform pos: 92.5,57.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16593 components: - type: Transform pos: 46.5,37.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16595 components: - type: Transform pos: 47.5,35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16596 components: - type: Transform pos: 52.5,35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16597 components: - type: Transform pos: 53.5,37.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16602 components: - type: Transform pos: 52.5,41.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16603 components: - type: Transform pos: 49.5,41.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16604 components: - type: Transform pos: 47.5,41.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16621 components: - type: Transform pos: 53.5,43.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16623 components: - type: Transform pos: 50.5,35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16624 components: - type: Transform pos: 49.5,35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16956 components: - type: Transform pos: 11.5,46.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16978 components: - type: Transform pos: 18.5,35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16979 components: - type: Transform pos: 20.5,35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16980 components: - type: Transform pos: 22.5,35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16981 components: - type: Transform pos: 24.5,35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16982 components: - type: Transform pos: 25.5,42.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16983 components: - type: Transform pos: 20.5,42.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16984 components: - type: Transform pos: 16.5,36.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16985 components: - type: Transform pos: 16.5,38.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17056 components: - type: Transform pos: 25.5,53.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17077 components: - type: Transform pos: 36.5,47.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17078 components: - type: Transform pos: 32.5,47.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17080 components: - type: Transform pos: 34.5,50.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17081 components: - type: Transform pos: 34.5,49.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17082 components: - type: Transform pos: 34.5,48.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17085 components: - type: Transform pos: 33.5,51.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17087 components: - type: Transform pos: 32.5,51.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17127 components: - type: Transform pos: 12.5,46.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17132 components: - type: Transform pos: 13.5,46.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17133 components: - type: Transform pos: 20.5,48.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17134 components: - type: Transform pos: 20.5,49.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17135 components: - type: Transform pos: 20.5,50.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17136 components: - type: Transform pos: 26.5,48.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17137 components: - type: Transform pos: 26.5,51.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17503 components: - type: Transform pos: 20.5,53.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17504 components: - type: Transform pos: 20.5,55.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17526 components: - type: Transform pos: 16.5,50.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17531 components: - type: Transform pos: 30.5,44.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17532 components: - type: Transform pos: 29.5,44.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17533 components: - type: Transform pos: 28.5,44.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17534 components: - type: Transform pos: 27.5,44.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17535 components: - type: Transform pos: 8.5,43.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17536 components: - type: Transform pos: 8.5,45.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17537 components: - type: Transform pos: 0.5,47.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17538 components: - type: Transform pos: -1.5,47.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17539 components: - type: Transform pos: -2.5,48.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17540 components: - type: Transform pos: -2.5,50.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17542 components: - type: Transform pos: 8.5,50.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17551 components: - type: Transform pos: 7.5,57.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17552 components: - type: Transform pos: 8.5,57.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17553 components: - type: Transform pos: 9.5,57.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17554 components: - type: Transform pos: 10.5,57.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17557 components: - type: Transform pos: -2.5,57.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17558 components: - type: Transform pos: -2.5,58.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17559 components: - type: Transform pos: 1.5,62.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17659 components: - type: Transform pos: 20.5,57.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17660 components: - type: Transform pos: 20.5,59.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17661 components: - type: Transform pos: 20.5,60.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17704 components: - type: Transform pos: 6.5,64.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17705 components: - type: Transform pos: 8.5,64.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17706 components: - type: Transform pos: 4.5,69.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18330 components: - type: Transform pos: 18.5,65.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18671 components: - type: Transform pos: 24.5,52.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18672 components: - type: Transform pos: 23.5,52.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18673 components: - type: Transform pos: 22.5,52.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 19052 components: - type: Transform pos: 33.5,53.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 19053 components: - type: Transform pos: 32.5,53.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 19054 components: - type: Transform pos: 35.5,51.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 19055 components: - type: Transform pos: 36.5,51.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 19056 components: - type: Transform pos: 37.5,52.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 19057 components: - type: Transform pos: 35.5,53.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 19058 components: - type: Transform pos: 36.5,53.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 19220 components: - type: Transform pos: 33.5,-51.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 19248 components: - type: Transform pos: 26.5,-47.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20128 components: - type: Transform pos: 59.5,-8.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20129 components: - type: Transform pos: 59.5,-6.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20130 components: - type: Transform pos: 61.5,-6.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20131 components: - type: Transform pos: 61.5,-8.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20132 components: - type: Transform pos: 61.5,0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20133 components: - type: Transform pos: 59.5,0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20167 components: - type: Transform pos: 67.5,-13.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20168 components: - type: Transform pos: 69.5,-13.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20169 components: - type: Transform pos: 70.5,-14.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20170 components: - type: Transform pos: 70.5,-16.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20171 components: - type: Transform pos: 69.5,-17.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20172 components: - type: Transform pos: 67.5,-17.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20173 components: - type: Transform pos: 70.5,-10.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20174 components: - type: Transform pos: 70.5,-8.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20175 components: - type: Transform pos: 74.5,-10.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20176 components: - type: Transform pos: 74.5,-9.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20177 components: - type: Transform pos: 74.5,-8.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20178 components: - type: Transform pos: 63.5,-13.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20179 components: - type: Transform pos: 75.5,-21.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20180 components: - type: Transform pos: 77.5,-21.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20181 components: - type: Transform pos: 75.5,-17.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20182 components: - type: Transform pos: 77.5,-17.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20183 components: - type: Transform pos: 79.5,-17.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20184 components: - type: Transform pos: 67.5,-22.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20185 components: - type: Transform pos: 69.5,-22.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20186 components: - type: Transform pos: 80.5,-14.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20187 components: - type: Transform pos: 80.5,-12.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20272 components: - type: Transform pos: 74.5,-3.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20273 components: - type: Transform pos: 70.5,-3.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20274 components: - type: Transform pos: 75.5,-5.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20275 components: - type: Transform pos: 75.5,-4.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20346 components: - type: Transform pos: 83.5,-22.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20347 components: - type: Transform pos: 84.5,-22.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20348 components: - type: Transform pos: 85.5,-22.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20349 components: - type: Transform pos: 87.5,-22.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20350 components: - type: Transform pos: 88.5,-22.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20351 components: - type: Transform pos: 89.5,-22.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20376 components: - type: Transform pos: 71.5,-24.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20377 components: - type: Transform pos: 71.5,-26.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20378 components: - type: Transform pos: 78.5,-26.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20379 components: - type: Transform pos: 77.5,-27.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20380 components: - type: Transform pos: 76.5,-27.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20381 components: - type: Transform pos: 74.5,-27.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20382 components: - type: Transform pos: 73.5,-27.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20560 components: - type: Transform pos: 101.5,-29.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20691 components: - type: Transform pos: 102.5,-42.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20692 components: - type: Transform pos: 105.5,-47.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20693 components: - type: Transform pos: 105.5,-45.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20694 components: - type: Transform pos: 108.5,-47.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20695 components: - type: Transform pos: 108.5,-45.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20773 components: - type: Transform pos: 75.5,-32.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20774 components: - type: Transform pos: 74.5,-32.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20775 components: - type: Transform pos: 76.5,-32.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20776 components: - type: Transform pos: 77.5,-32.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20845 components: - type: Transform pos: 75.5,-53.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20846 components: - type: Transform pos: 75.5,-54.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20847 components: - type: Transform pos: 75.5,-55.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20848 components: - type: Transform pos: 76.5,-55.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20849 components: - type: Transform pos: 77.5,-55.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20850 components: - type: Transform pos: 78.5,-55.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20855 components: - type: Transform pos: 75.5,-51.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20856 components: - type: Transform pos: 75.5,-52.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20857 components: - type: Transform pos: 80.5,-50.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20858 components: - type: Transform pos: 74.5,-50.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20859 components: - type: Transform pos: 73.5,-50.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20860 components: - type: Transform pos: 73.5,-51.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20861 components: - type: Transform pos: 72.5,-51.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20862 components: - type: Transform pos: 72.5,-52.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20863 components: - type: Transform pos: 79.5,-55.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20864 components: - type: Transform pos: 79.5,-54.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20865 components: - type: Transform pos: 79.5,-53.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20866 components: - type: Transform pos: 79.5,-52.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20867 components: - type: Transform pos: 79.5,-51.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20868 components: - type: Transform pos: 81.5,-50.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20869 components: - type: Transform pos: 82.5,-52.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20870 components: - type: Transform pos: 81.5,-51.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20871 components: - type: Transform pos: 82.5,-51.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21010 components: - type: Transform pos: 61.5,26.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21011 components: - type: Transform pos: 61.5,27.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21012 components: - type: Transform pos: 61.5,28.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21013 components: - type: Transform pos: 61.5,29.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21014 components: - type: Transform pos: 61.5,31.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21015 components: - type: Transform pos: 61.5,32.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21016 components: - type: Transform pos: 61.5,33.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21017 components: - type: Transform pos: 61.5,34.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21100 components: - type: Transform pos: 69.5,37.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21101 components: - type: Transform pos: 71.5,37.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21350 components: - type: Transform pos: 69.5,5.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21351 components: - type: Transform pos: 68.5,5.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21352 components: - type: Transform pos: 73.5,5.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21353 components: - type: Transform pos: 72.5,5.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21423 components: - type: Transform pos: 103.5,52.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21424 components: - type: Transform pos: 103.5,51.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21425 components: - type: Transform pos: 103.5,50.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21426 components: - type: Transform pos: 103.5,46.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21427 components: - type: Transform pos: 103.5,47.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21428 components: - type: Transform pos: 103.5,48.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21487 components: - type: Transform pos: 93.5,34.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21488 components: - type: Transform pos: 98.5,34.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21489 components: - type: Transform pos: 97.5,34.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21490 components: - type: Transform pos: 96.5,34.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21491 components: - type: Transform pos: 94.5,36.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21492 components: - type: Transform pos: 86.5,31.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21493 components: - type: Transform pos: 88.5,31.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21494 components: - type: Transform pos: 89.5,29.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21495 components: - type: Transform pos: 89.5,30.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21496 components: - type: Transform pos: 90.5,31.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21540 components: - type: Transform pos: 87.5,37.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22578 components: - type: Transform pos: 58.5,67.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22579 components: - type: Transform pos: 58.5,68.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22597 components: - type: Transform pos: 51.5,69.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22598 components: - type: Transform pos: 51.5,70.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22599 components: - type: Transform pos: 51.5,71.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22600 components: - type: Transform pos: 53.5,69.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22601 components: - type: Transform pos: 53.5,70.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22602 components: - type: Transform pos: 53.5,71.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22606 components: - type: Transform pos: 46.5,66.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22773 components: - type: Transform pos: 89.5,-13.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22774 components: - type: Transform pos: 89.5,-17.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22795 components: - type: Transform pos: 89.5,4.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22796 components: - type: Transform pos: 91.5,4.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22819 components: - type: Transform pos: 99.5,-7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22820 components: - type: Transform pos: 99.5,-6.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22821 components: - type: Transform pos: 99.5,-5.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22822 components: - type: Transform pos: 99.5,-4.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22823 components: - type: Transform pos: 99.5,-3.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22828 components: - type: Transform pos: 122.5,10.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22961 components: - type: Transform pos: 117.5,-7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22980 components: - type: Transform pos: 106.5,-14.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22981 components: - type: Transform pos: 107.5,-14.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22982 components: - type: Transform pos: 108.5,-14.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22983 components: - type: Transform pos: 109.5,-14.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22984 components: - type: Transform pos: 110.5,-14.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22985 components: - type: Transform pos: 110.5,3.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22986 components: - type: Transform pos: 109.5,3.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22987 components: - type: Transform pos: 108.5,3.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22988 components: - type: Transform pos: 107.5,3.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22989 components: - type: Transform pos: 106.5,3.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22990 components: - type: Transform pos: 117.5,-6.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22991 components: - type: Transform pos: 117.5,-5.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22992 components: - type: Transform pos: 117.5,-4.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 22993 components: - type: Transform pos: 117.5,-3.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 23058 components: - type: Transform pos: 122.5,-7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 23059 components: - type: Transform pos: 125.5,-0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 23060 components: - type: Transform pos: 123.5,-0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 23061 components: - type: Transform pos: 121.5,-2.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 23062 components: - type: Transform pos: 120.5,0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 23063 components: - type: Transform pos: 120.5,2.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 23067 components: - type: Transform pos: 123.5,5.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 23068 components: - type: Transform pos: 123.5,7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 23124 components: - type: Transform pos: 122.5,12.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 23906 components: - type: Transform pos: 106.5,-35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 23907 components: - type: Transform pos: 106.5,-36.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 23913 components: - type: Transform pos: 107.5,-38.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 23941 components: - type: Transform pos: 106.5,-37.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 24753 components: - type: Transform pos: 104.5,-40.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 24754 components: - type: Transform pos: 103.5,-40.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 25092 components: - type: Transform pos: 105.5,-40.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 26042 components: - type: Transform pos: 59.5,41.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 27811 components: - type: Transform pos: 80.5,32.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 27812 components: - type: Transform pos: 80.5,35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 28019 components: - type: Transform pos: 64.5,61.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 28169 components: - type: Transform pos: 129.5,-4.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 28219 components: - type: Transform pos: 45.5,35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 28220 components: - type: Transform pos: 44.5,35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 28221 components: - type: Transform pos: 41.5,35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 28222 components: - type: Transform pos: 43.5,35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 28223 components: - type: Transform pos: 42.5,35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 30153 components: - type: Transform pos: 109.5,42.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 30154 components: - type: Transform pos: 109.5,44.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 30244 components: - type: Transform pos: 86.5,41.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31731 components: - type: Transform pos: 85.5,41.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 33241 components: - type: Transform pos: 38.5,67.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 33537 components: - type: Transform pos: 44.5,39.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 33538 components: - type: Transform pos: 45.5,39.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 33541 components: - type: Transform pos: 41.5,39.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 33543 components: - type: Transform pos: 43.5,39.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 33544 components: - type: Transform pos: 42.5,39.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 33549 components: - type: Transform pos: 40.5,37.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 33653 components: - type: Transform pos: 52.5,53.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 33663 components: - type: Transform pos: 47.5,48.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 33664 components: - type: Transform pos: 46.5,48.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 33665 components: - type: Transform pos: 45.5,48.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 33666 components: - type: Transform pos: 46.5,60.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 33668 components: - type: Transform pos: 45.5,60.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 33669 components: - type: Transform pos: 47.5,60.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 34733 components: - type: Transform pos: 128.5,-5.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 34734 components: - type: Transform pos: 128.5,-2.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 35640 components: - type: Transform pos: 92.5,41.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 35641 components: - type: Transform pos: 93.5,41.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 35642 components: - type: Transform pos: 90.5,42.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 35643 components: - type: Transform pos: 88.5,42.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - proto: RemoteSignaller entities: - uid: 6986 @@ -184772,8 +183046,6 @@ entities: - type: Transform pos: 3.5,7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - type: DeviceLinkSink invokeCounter: 1 - uid: 1493 @@ -184781,82 +183053,60 @@ entities: - type: Transform pos: 4.5,7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 8154 components: - type: Transform pos: 46.5,8.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 8867 components: - type: Transform pos: 45.5,8.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9595 components: - type: Transform rot: 1.5707963267948966 rad pos: 22.5,-17.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9596 components: - type: Transform rot: 1.5707963267948966 rad pos: 22.5,-16.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9774 components: - type: Transform pos: -1.5,-8.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9775 components: - type: Transform pos: -0.5,-8.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9776 components: - type: Transform pos: 0.5,-8.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15304 components: - type: Transform rot: -1.5707963267948966 rad pos: 26.5,-20.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15305 components: - type: Transform rot: -1.5707963267948966 rad pos: 26.5,-19.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 35989 components: - type: Transform pos: 47.5,8.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - proto: ShuttersNormalOpen entities: - uid: 921 @@ -184864,527 +183114,385 @@ entities: - type: Transform pos: -18.5,23.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 922 components: - type: Transform pos: -17.5,23.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 923 components: - type: Transform pos: -16.5,23.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 924 components: - type: Transform pos: -15.5,23.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 925 components: - type: Transform pos: -14.5,23.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 926 components: - type: Transform pos: -13.5,23.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 927 components: - type: Transform pos: -8.5,16.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 928 components: - type: Transform pos: -4.5,16.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 929 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,18.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 930 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,19.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 931 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,20.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 932 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,21.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 933 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,22.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 934 components: - type: Transform rot: -1.5707963267948966 rad pos: -9.5,18.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 935 components: - type: Transform rot: -1.5707963267948966 rad pos: -9.5,19.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 936 components: - type: Transform rot: -1.5707963267948966 rad pos: -9.5,20.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 937 components: - type: Transform rot: -1.5707963267948966 rad pos: -9.5,21.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 1072 components: - type: Transform pos: -11.5,23.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 1311 components: - type: Transform pos: -2.5,34.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 1312 components: - type: Transform pos: -2.5,35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 1313 components: - type: Transform pos: -2.5,36.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 1314 components: - type: Transform pos: -2.5,39.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 1315 components: - type: Transform pos: -8.5,43.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 1316 components: - type: Transform pos: -11.5,43.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 1432 components: - type: Transform pos: -12.5,25.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 4518 components: - type: Transform rot: -1.5707963267948966 rad pos: -26.5,38.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 4519 components: - type: Transform rot: -1.5707963267948966 rad pos: -26.5,39.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 4520 components: - type: Transform rot: -1.5707963267948966 rad pos: -26.5,40.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 4521 components: - type: Transform pos: -22.5,43.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 4522 components: - type: Transform pos: -21.5,43.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 4748 components: - type: Transform rot: -1.5707963267948966 rad pos: -25.5,30.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 4749 components: - type: Transform rot: -1.5707963267948966 rad pos: -25.5,31.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 4750 components: - type: Transform rot: -1.5707963267948966 rad pos: -25.5,32.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7307 components: - type: Transform pos: 47.5,11.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7309 components: - type: Transform rot: -1.5707963267948966 rad pos: 44.5,10.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 8073 components: - type: Transform pos: 34.5,0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 8890 components: - type: Transform pos: 37.5,0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 8945 components: - type: Transform pos: 28.5,0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 8951 components: - type: Transform pos: 27.5,0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 8952 components: - type: Transform pos: 30.5,0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 8953 components: - type: Transform pos: 31.5,0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9150 components: - type: Transform pos: 36.5,0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9333 components: - type: Transform pos: 45.5,11.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9336 components: - type: Transform pos: 33.5,0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9342 components: - type: Transform pos: 46.5,11.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 10658 components: - type: Transform rot: -1.5707963267948966 rad pos: 22.5,42.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 10659 components: - type: Transform rot: 1.5707963267948966 rad pos: 21.5,42.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 10661 components: - type: Transform pos: 16.5,37.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 10879 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,-1.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 10880 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,-0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 10881 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 10882 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,2.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 10883 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,3.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 10884 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,4.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18460 components: - type: Transform pos: 18.5,35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18461 components: - type: Transform pos: 20.5,35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18462 components: - type: Transform pos: 22.5,35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18463 components: - type: Transform pos: 24.5,35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18498 components: - type: Transform pos: 20.5,42.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18502 components: - type: Transform pos: 25.5,42.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18503 components: - type: Transform rot: -1.5707963267948966 rad pos: 16.5,36.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18505 components: - type: Transform rot: -1.5707963267948966 rad pos: 16.5,38.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18758 components: - type: Transform rot: -1.5707963267948966 rad pos: -2.5,57.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18759 components: - type: Transform rot: -1.5707963267948966 rad pos: -2.5,58.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18760 components: - type: Transform pos: -1.5,59.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18761 components: - type: Transform pos: -0.5,59.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18762 components: - type: Transform pos: 0.5,59.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31550 components: - type: Transform pos: 65.5,41.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31551 components: - type: Transform pos: 56.5,42.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 35590 components: - type: Transform rot: 3.141592653589793 rad pos: 123.5,50.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 35591 components: - type: Transform pos: 123.5,48.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - proto: ShuttersRadiationOpen entities: - uid: 25901 @@ -185392,187 +183500,137 @@ entities: - type: Transform pos: 94.5,-9.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 25902 components: - type: Transform pos: 94.5,-1.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 32379 components: - type: Transform rot: -1.5707963267948966 rad pos: 99.5,-3.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 32380 components: - type: Transform rot: -1.5707963267948966 rad pos: 99.5,-4.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 32381 components: - type: Transform rot: -1.5707963267948966 rad pos: 99.5,-5.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 32456 components: - type: Transform rot: -1.5707963267948966 rad pos: 99.5,-7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 32702 components: - type: Transform rot: -1.5707963267948966 rad pos: 99.5,-7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 34226 components: - type: Transform rot: -1.5707963267948966 rad pos: 99.5,-6.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 34676 components: - type: Transform rot: 1.5707963267948966 rad pos: 117.5,-7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 34677 components: - type: Transform rot: 1.5707963267948966 rad pos: 117.5,-6.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 34678 components: - type: Transform rot: 1.5707963267948966 rad pos: 117.5,-5.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 34679 components: - type: Transform rot: 1.5707963267948966 rad pos: 117.5,-4.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 34680 components: - type: Transform rot: 1.5707963267948966 rad pos: 117.5,-3.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 34681 components: - type: Transform pos: 110.5,3.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 34682 components: - type: Transform pos: 109.5,3.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 34683 components: - type: Transform pos: 108.5,3.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 34684 components: - type: Transform pos: 107.5,3.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 34685 components: - type: Transform pos: 106.5,3.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 34686 components: - type: Transform pos: 110.5,-14.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 34687 components: - type: Transform pos: 109.5,-14.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 34688 components: - type: Transform pos: 108.5,-14.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 34689 components: - type: Transform pos: 107.5,-14.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 34690 components: - type: Transform pos: 106.5,-14.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 35310 components: - type: Transform pos: 96.5,-0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 35311 components: - type: Transform pos: 99.5,-0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - proto: ShuttleConsoleCircuitboard entities: - uid: 13064 @@ -192062,6 +190120,13 @@ entities: - type: Transform pos: 38.5,25.5 parent: 13329 +- proto: SpawnPointHeadOfSecurityWeapon + entities: + - uid: 10501 + components: + - type: Transform + pos: 35.5,20.5 + parent: 13329 - proto: SpawnPointJanitor entities: - uid: 1651 @@ -192513,6 +190578,13 @@ entities: - type: Transform pos: 29.5,12.5 parent: 13329 +- proto: SpawnPointWardenWeapon + entities: + - uid: 10496 + components: + - type: Transform + pos: 31.5,13.5 + parent: 13329 - proto: SprayBottle entities: - uid: 18495 @@ -201521,358 +199593,256 @@ entities: - type: Transform pos: -2.5,-26.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2811 components: - type: Transform pos: -2.5,-24.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 5017 components: - type: Transform pos: -19.5,61.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 5106 components: - type: Transform pos: -17.5,67.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 5107 components: - type: Transform pos: -15.5,67.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 6612 components: - type: Transform pos: -19.5,71.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 8163 components: - type: Transform pos: 48.5,15.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 8166 components: - type: Transform pos: 48.5,13.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9244 components: - type: Transform pos: 37.5,23.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9245 components: - type: Transform pos: 39.5,23.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13794 components: - type: Transform pos: 31.5,-25.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13834 components: - type: Transform pos: 36.5,-31.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13835 components: - type: Transform pos: 36.5,-29.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13953 components: - type: Transform pos: 51.5,-37.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13998 components: - type: Transform pos: 36.5,-35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13999 components: - type: Transform pos: 36.5,-33.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16935 components: - type: Transform pos: 5.5,42.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16936 components: - type: Transform pos: 6.5,42.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17545 components: - type: Transform pos: 8.5,60.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17546 components: - type: Transform pos: 10.5,60.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17547 components: - type: Transform pos: 16.5,53.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17548 components: - type: Transform pos: 16.5,55.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17549 components: - type: Transform pos: 16.5,57.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17550 components: - type: Transform pos: 16.5,59.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20457 components: - type: Transform pos: -11.5,29.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21216 components: - type: Transform pos: 63.5,19.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21217 components: - type: Transform pos: 65.5,17.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21218 components: - type: Transform pos: 67.5,17.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 25488 components: - type: Transform pos: 81.5,-22.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 25489 components: - type: Transform pos: 79.5,-22.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 28808 components: - type: Transform pos: 80.5,25.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 28809 components: - type: Transform pos: 84.5,25.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 28810 components: - type: Transform pos: 84.5,22.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 28811 components: - type: Transform pos: 80.5,22.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 28812 components: - type: Transform pos: 80.5,19.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 28813 components: - type: Transform pos: 84.5,19.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31829 components: - type: Transform pos: -28.5,9.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31830 components: - type: Transform pos: -27.5,9.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31831 components: - type: Transform pos: -26.5,1.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31842 components: - type: Transform pos: -26.5,0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31843 components: - type: Transform pos: -26.5,-0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31849 components: - type: Transform pos: -33.5,2.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31851 components: - type: Transform pos: -33.5,4.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 32142 components: - type: Transform pos: -35.5,14.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 32146 components: - type: Transform pos: -27.5,14.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 32147 components: - type: Transform pos: -26.5,14.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 32150 components: - type: Transform pos: -31.5,14.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 32151 components: - type: Transform pos: -30.5,14.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 32460 components: - type: Transform pos: 103.5,11.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 32461 components: - type: Transform pos: 102.5,11.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 32462 components: - type: Transform pos: 101.5,11.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - proto: ToiletDirtyWater entities: - uid: 4720 @@ -227118,13 +225088,6 @@ entities: - type: Transform pos: 18.617167,11.5497265 parent: 13329 -- proto: WeaponSubMachineGunWt550 - entities: - - uid: 10508 - components: - - type: Transform - pos: 35.515594,20.647896 - parent: 13329 - proto: WeedSpray entities: - uid: 1426 @@ -227301,16 +225264,12 @@ entities: - type: Transform pos: -6.5,15.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7602 components: - type: Transform rot: -1.5707963267948966 rad pos: 49.5,-15.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -227324,8 +225283,6 @@ entities: rot: -1.5707963267948966 rad pos: 49.5,-17.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -227338,91 +225295,67 @@ entities: - type: Transform pos: 28.5,8.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9386 components: - type: Transform rot: 3.141592653589793 rad pos: 28.5,15.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 10195 components: - type: Transform rot: -1.5707963267948966 rad pos: 12.5,-0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 10196 components: - type: Transform rot: -1.5707963267948966 rad pos: 12.5,3.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 10459 components: - type: Transform pos: 48.5,28.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18881 components: - type: Transform rot: -1.5707963267948966 rad pos: 11.5,65.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20009 components: - type: Transform rot: -1.5707963267948966 rad pos: 30.5,-39.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 26566 components: - type: Transform pos: 58.5,41.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 26567 components: - type: Transform pos: 62.5,41.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 29284 components: - type: Transform pos: 71.5,17.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31549 components: - type: Transform pos: 58.5,43.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31762 components: - type: Transform rot: -1.5707963267948966 rad pos: 16.5,37.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -227436,8 +225369,6 @@ entities: rot: 3.141592653589793 rad pos: -10.5,-7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -227451,8 +225382,6 @@ entities: rot: 3.141592653589793 rad pos: 53.5,-13.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -227468,16 +225397,12 @@ entities: rot: -1.5707963267948966 rad pos: -12.5,25.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 1221 components: - type: Transform rot: 1.5707963267948966 rad pos: -12.5,25.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - proto: WindoorCargoLocked entities: - uid: 2060 @@ -227486,37 +225411,27 @@ entities: rot: 3.141592653589793 rad pos: 7.5,-15.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 11490 components: - type: Transform rot: 3.141592653589793 rad pos: 5.5,-14.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 11491 components: - type: Transform pos: 4.5,-14.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 11510 components: - type: Transform pos: 13.5,-28.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 11851 components: - type: Transform pos: 20.5,-15.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - proto: WindoorHydroponicsLocked entities: - uid: 1309 @@ -227525,16 +225440,12 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,34.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 1310 components: - type: Transform rot: -1.5707963267948966 rad pos: -2.5,35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - proto: WindoorJanitorLocked entities: - uid: 9406 @@ -227542,15 +225453,11 @@ entities: - type: Transform pos: 3.5,8.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15508 components: - type: Transform pos: 4.5,8.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - proto: WindoorKitchenHydroponicsLocked entities: - uid: 1224 @@ -227558,32 +225465,24 @@ entities: - type: Transform pos: -9.5,33.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 1225 components: - type: Transform rot: 3.141592653589793 rad pos: -9.5,33.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20450 components: - type: Transform rot: 3.141592653589793 rad pos: -9.5,27.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20452 components: - type: Transform rot: 3.141592653589793 rad pos: -8.5,27.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - proto: WindoorSecure entities: - uid: 56 @@ -227591,22 +225490,16 @@ entities: - type: Transform pos: -10.5,0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9650 components: - type: Transform pos: 36.5,3.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 10296 components: - type: Transform pos: 37.5,3.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - proto: WindoorSecureArmoryLocked entities: - uid: 9364 @@ -227615,30 +225508,22 @@ entities: rot: 3.141592653589793 rad pos: 28.5,8.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9365 components: - type: Transform pos: 28.5,15.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 10677 components: - type: Transform pos: 17.5,15.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 10678 components: - type: Transform rot: 3.141592653589793 rad pos: 16.5,13.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - type: Airlock autoClose: False - uid: 10679 @@ -227647,8 +225532,6 @@ entities: rot: 3.141592653589793 rad pos: 17.5,13.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - type: Airlock autoClose: False - uid: 10680 @@ -227657,8 +225540,6 @@ entities: rot: 3.141592653589793 rad pos: 18.5,13.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - type: Airlock autoClose: False - uid: 10681 @@ -227667,8 +225548,6 @@ entities: rot: 3.141592653589793 rad pos: 19.5,13.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - type: Airlock autoClose: False - uid: 10683 @@ -227676,8 +225555,6 @@ entities: - type: Transform pos: 17.5,11.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - type: Airlock autoClose: False - uid: 10684 @@ -227685,8 +225562,6 @@ entities: - type: Transform pos: 16.5,11.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - type: Airlock autoClose: False - uid: 10685 @@ -227695,8 +225570,6 @@ entities: rot: -1.5707963267948966 rad pos: 16.5,12.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - type: Airlock autoClose: False - uid: 10686 @@ -227704,8 +225577,6 @@ entities: - type: Transform pos: 19.5,11.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - type: Airlock autoClose: False - uid: 10687 @@ -227713,8 +225584,6 @@ entities: - type: Transform pos: 18.5,11.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - type: Airlock autoClose: False - uid: 26338 @@ -227723,8 +225592,6 @@ entities: rot: 1.5707963267948966 rad pos: 19.5,12.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - type: Airlock autoClose: False - uid: 35969 @@ -227733,16 +225600,12 @@ entities: rot: 3.141592653589793 rad pos: 19.5,9.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 35970 components: - type: Transform rot: 3.141592653589793 rad pos: 20.5,9.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - proto: WindoorSecureAtmosphericsLocked entities: - uid: 14804 @@ -227751,8 +225614,6 @@ entities: rot: 3.141592653589793 rad pos: 64.5,-13.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - proto: WindoorSecureBrigLocked entities: - uid: 9455 @@ -227762,16 +225623,12 @@ entities: - type: Transform pos: 38.5,8.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 29451 components: - type: Transform rot: -1.5707963267948966 rad pos: 65.5,26.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - proto: WindoorSecureCargoLocked entities: - uid: 11831 @@ -227780,16 +225637,12 @@ entities: rot: 3.141592653589793 rad pos: 18.5,-9.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 11839 components: - type: Transform rot: 1.5707963267948966 rad pos: 22.5,-10.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - proto: WindoorSecureChapelLocked entities: - uid: 6646 @@ -227798,8 +225651,6 @@ entities: rot: 1.5707963267948966 rad pos: -12.5,69.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - proto: WindoorSecureChemistryLocked entities: - uid: 11718 @@ -227807,8 +225658,6 @@ entities: - type: Transform pos: 22.5,42.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -227825,8 +225674,6 @@ entities: rot: 1.5707963267948966 rad pos: 16.5,37.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -227839,8 +225686,6 @@ entities: - type: Transform pos: 21.5,42.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - type: DeviceLinkSink invokeCounter: 2 - type: DeviceLinkSource @@ -227858,98 +225703,72 @@ entities: - type: Transform pos: 123.5,48.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 30211 components: - type: Transform rot: 3.141592653589793 rad pos: 123.5,50.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 30248 components: - type: Transform rot: 3.141592653589793 rad pos: 108.5,46.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 30249 components: - type: Transform pos: 108.5,52.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 30694 components: - type: Transform rot: -1.5707963267948966 rad pos: 82.5,50.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31273 components: - type: Transform pos: 72.5,57.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31274 components: - type: Transform pos: 73.5,57.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 35714 components: - type: Transform rot: 3.141592653589793 rad pos: 109.5,46.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 35717 components: - type: Transform rot: 3.141592653589793 rad pos: 108.5,48.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 35718 components: - type: Transform pos: 107.5,52.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 35719 components: - type: Transform pos: 109.5,52.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 35720 components: - type: Transform rot: 3.141592653589793 rad pos: 107.5,46.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 35721 components: - type: Transform pos: 108.5,50.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - proto: WindoorSecureEngineeringLocked entities: - uid: 11007 @@ -227958,8 +225777,6 @@ entities: rot: 3.141592653589793 rad pos: 19.5,-20.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - proto: WindoorSecureHeadOfPersonnelLocked entities: - uid: 31548 @@ -227968,31 +225785,23 @@ entities: rot: 3.141592653589793 rad pos: 58.5,43.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 33561 components: - type: Transform rot: 3.141592653589793 rad pos: 51.5,42.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 33562 components: - type: Transform rot: 3.141592653589793 rad pos: 52.5,42.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 34644 components: - type: Transform pos: 60.5,49.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - proto: WindoorSecureMedicalLocked entities: - uid: 9337 @@ -228001,8 +225810,6 @@ entities: rot: 3.141592653589793 rad pos: 22.5,42.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - type: DeviceLinkSink invokeCounter: 2 - type: DeviceLinkSource @@ -228019,8 +225826,6 @@ entities: rot: 3.141592653589793 rad pos: 21.5,42.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - type: DeviceLinkSink invokeCounter: 2 - type: DeviceLinkSource @@ -228034,24 +225839,18 @@ entities: rot: 1.5707963267948966 rad pos: 4.5,66.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18842 components: - type: Transform rot: 1.5707963267948966 rad pos: 4.5,67.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18843 components: - type: Transform rot: 1.5707963267948966 rad pos: 4.5,68.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - proto: WindoorSecureScienceLocked entities: - uid: 13997 @@ -228060,23 +225859,17 @@ entities: rot: 3.141592653589793 rad pos: 43.5,-36.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15257 components: - type: Transform pos: 38.5,-18.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15258 components: - type: Transform rot: 1.5707963267948966 rad pos: 49.5,-15.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -228090,8 +225883,6 @@ entities: rot: 1.5707963267948966 rad pos: 49.5,-17.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -228105,15 +225896,11 @@ entities: rot: 3.141592653589793 rad pos: 50.5,-21.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15325 components: - type: Transform pos: 53.5,-13.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -228127,40 +225914,30 @@ entities: rot: 1.5707963267948966 rad pos: 53.5,-30.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 19991 components: - type: Transform rot: 1.5707963267948966 rad pos: 44.5,-39.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 19992 components: - type: Transform rot: 1.5707963267948966 rad pos: 44.5,-38.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 19993 components: - type: Transform rot: 1.5707963267948966 rad pos: 44.5,-37.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20047 components: - type: Transform rot: 3.141592653589793 rad pos: 37.5,-24.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - proto: WindoorSecureSecurityLocked entities: - uid: 2197 @@ -228169,38 +225946,28 @@ entities: rot: -1.5707963267948966 rad pos: -12.5,-9.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 4606 components: - type: Transform rot: 1.5707963267948966 rad pos: -34.5,48.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9361 components: - type: Transform pos: 16.5,15.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9423 components: - type: Transform rot: 1.5707963267948966 rad pos: 22.5,2.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9651 components: - type: Transform pos: -10.5,-7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -228214,16 +225981,12 @@ entities: rot: -1.5707963267948966 rad pos: 26.5,29.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18683 components: - type: Transform rot: 1.5707963267948966 rad pos: 25.5,54.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - proto: WindoorServiceLocked entities: - uid: 4762 @@ -228232,15 +225995,11 @@ entities: rot: 3.141592653589793 rad pos: -24.5,29.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 6356 components: - type: Transform pos: -22.5,56.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - proto: WindoorTheatreLocked entities: - uid: 907 @@ -228249,8 +226008,6 @@ entities: rot: 3.141592653589793 rad pos: -17.5,13.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - proto: Window entities: - uid: 60 @@ -228258,449 +226015,321 @@ entities: - type: Transform pos: -7.5,0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 310 components: - type: Transform pos: -7.5,12.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 311 components: - type: Transform pos: -4.5,12.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 312 components: - type: Transform pos: -2.5,12.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 313 components: - type: Transform pos: -2.5,15.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 1631 components: - type: Transform pos: -2.5,3.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 1632 components: - type: Transform pos: -1.5,3.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 1633 components: - type: Transform pos: 0.5,3.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 1634 components: - type: Transform pos: 1.5,3.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 1829 components: - type: Transform pos: -19.5,-3.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 1830 components: - type: Transform pos: -16.5,-3.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2638 components: - type: Transform pos: 14.5,-16.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2639 components: - type: Transform pos: 14.5,-17.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3100 components: - type: Transform pos: -18.5,-23.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3101 components: - type: Transform pos: -20.5,-21.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3972 components: - type: Transform pos: -24.5,47.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 3973 components: - type: Transform pos: -29.5,49.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 4976 components: - type: Transform pos: -29.5,56.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 4979 components: - type: Transform pos: -29.5,55.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 4980 components: - type: Transform pos: -29.5,54.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 5003 components: - type: Transform pos: -7.5,57.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 5004 components: - type: Transform pos: -8.5,57.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 5005 components: - type: Transform pos: -9.5,57.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 5007 components: - type: Transform pos: -15.5,57.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 5008 components: - type: Transform pos: -16.5,57.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 5009 components: - type: Transform pos: -17.5,57.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 5048 components: - type: Transform pos: -12.5,57.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 5070 components: - type: Transform pos: -6.5,59.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 5071 components: - type: Transform pos: -6.5,60.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 5072 components: - type: Transform pos: -6.5,62.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 5073 components: - type: Transform pos: -6.5,63.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7096 components: - type: Transform pos: 19.5,-3.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7097 components: - type: Transform pos: 20.5,-3.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9563 components: - type: Transform pos: 21.5,-3.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9771 components: - type: Transform pos: 10.5,-17.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9772 components: - type: Transform pos: 7.5,-19.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13793 components: - type: Transform pos: 39.5,-24.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16345 components: - type: Transform pos: 79.5,42.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17555 components: - type: Transform pos: 2.5,60.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 17556 components: - type: Transform pos: 4.5,60.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18331 components: - type: Transform pos: 15.5,64.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18332 components: - type: Transform pos: 13.5,64.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18333 components: - type: Transform pos: 11.5,64.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18334 components: - type: Transform pos: 16.5,68.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18951 components: - type: Transform pos: 35.5,39.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18952 components: - type: Transform pos: 34.5,39.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20114 components: - type: Transform pos: 57.5,-12.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 20115 components: - type: Transform pos: 62.5,-12.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21097 components: - type: Transform pos: 57.5,29.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21098 components: - type: Transform pos: 57.5,31.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21099 components: - type: Transform pos: 57.5,36.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21291 components: - type: Transform pos: 58.5,7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21292 components: - type: Transform pos: 57.5,11.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21399 components: - type: Transform pos: 75.5,12.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21400 components: - type: Transform pos: 75.5,16.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 23629 components: - type: Transform pos: -7.5,1.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 28818 components: - type: Transform pos: 88.5,12.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 28819 components: - type: Transform pos: 88.5,16.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 28820 components: - type: Transform pos: 90.5,17.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 28821 components: - type: Transform pos: 93.5,17.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 28905 components: - type: Transform pos: 73.5,18.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 28906 components: - type: Transform pos: 73.5,19.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31704 components: - type: Transform pos: 9.5,21.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31705 components: - type: Transform pos: 11.5,19.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - proto: WindowDirectional entities: - uid: 29369 @@ -228708,15 +226337,11 @@ entities: - type: Transform pos: 70.5,17.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 29370 components: - type: Transform pos: 72.5,17.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - proto: WindowFrostedDirectional entities: - uid: 1620 @@ -228724,30 +226349,22 @@ entities: - type: Transform pos: -8.5,0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 1621 components: - type: Transform pos: -9.5,0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 1625 components: - type: Transform pos: -11.5,0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18854 components: - type: Transform rot: 3.141592653589793 rad pos: -15.5,27.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - proto: WindowReinforcedDirectional entities: - uid: 304 @@ -228755,2160 +226372,1600 @@ entities: - type: Transform pos: -8.5,15.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 305 components: - type: Transform pos: -7.5,15.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 306 components: - type: Transform pos: -3.5,15.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 307 components: - type: Transform pos: -4.5,15.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 308 components: - type: Transform pos: -5.5,15.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 904 components: - type: Transform rot: 3.141592653589793 rad pos: -19.5,13.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 905 components: - type: Transform rot: 3.141592653589793 rad pos: -18.5,13.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 906 components: - type: Transform rot: 3.141592653589793 rad pos: -16.5,13.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 946 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,17.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 947 components: - type: Transform rot: 1.5707963267948966 rad pos: -2.5,17.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 1436 components: - type: Transform rot: -1.5707963267948966 rad pos: -13.5,33.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 1870 components: - type: Transform pos: -2.5,-2.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 1871 components: - type: Transform pos: 1.5,-2.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 1872 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 1873 components: - type: Transform rot: -1.5707963267948966 rad pos: -3.5,0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 1874 components: - type: Transform rot: -1.5707963267948966 rad pos: -3.5,-1.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 1875 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,-1.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2677 components: - type: Transform rot: -1.5707963267948966 rad pos: 2.5,-7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2678 components: - type: Transform rot: -1.5707963267948966 rad pos: 6.5,-7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2679 components: - type: Transform rot: -1.5707963267948966 rad pos: 9.5,-7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2680 components: - type: Transform rot: 3.141592653589793 rad pos: 9.5,-7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2681 components: - type: Transform rot: 3.141592653589793 rad pos: 10.5,-7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2682 components: - type: Transform rot: 3.141592653589793 rad pos: 2.5,-7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2683 components: - type: Transform rot: 3.141592653589793 rad pos: 3.5,-7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2684 components: - type: Transform rot: 3.141592653589793 rad pos: 6.5,-7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2685 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,-7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 2686 components: - type: Transform rot: 1.5707963267948966 rad pos: 3.5,-7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 4732 components: - type: Transform rot: 3.141592653589793 rad pos: -34.5,33.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 4733 components: - type: Transform rot: 3.141592653589793 rad pos: -33.5,33.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 4734 components: - type: Transform rot: 3.141592653589793 rad pos: -31.5,33.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 4735 components: - type: Transform rot: 3.141592653589793 rad pos: -30.5,33.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 4736 components: - type: Transform pos: -30.5,33.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 4737 components: - type: Transform pos: -31.5,33.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 4738 components: - type: Transform pos: -33.5,33.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 4739 components: - type: Transform pos: -34.5,33.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 4740 components: - type: Transform pos: -34.5,37.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 4741 components: - type: Transform pos: -33.5,37.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 4742 components: - type: Transform pos: -31.5,37.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 4743 components: - type: Transform pos: -30.5,37.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 4744 components: - type: Transform rot: 3.141592653589793 rad pos: -30.5,37.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 4745 components: - type: Transform rot: 3.141592653589793 rad pos: -31.5,37.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 4746 components: - type: Transform rot: 3.141592653589793 rad pos: -33.5,37.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 4747 components: - type: Transform rot: 3.141592653589793 rad pos: -34.5,37.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 4908 components: - type: Transform rot: 3.141592653589793 rad pos: -9.5,47.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 4909 components: - type: Transform rot: 3.141592653589793 rad pos: -8.5,47.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 4910 components: - type: Transform pos: -8.5,47.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 4911 components: - type: Transform pos: -9.5,47.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 6357 components: - type: Transform rot: -1.5707963267948966 rad pos: -21.5,56.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 6644 components: - type: Transform rot: 1.5707963267948966 rad pos: -12.5,70.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 6645 components: - type: Transform rot: 1.5707963267948966 rad pos: -12.5,68.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 6811 components: - type: Transform rot: -1.5707963267948966 rad pos: -10.5,56.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 6812 components: - type: Transform rot: 1.5707963267948966 rad pos: -7.5,56.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7100 components: - type: Transform pos: 18.5,-0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7101 components: - type: Transform rot: -1.5707963267948966 rad pos: 18.5,-0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7102 components: - type: Transform rot: 1.5707963267948966 rad pos: 18.5,-0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7154 components: - type: Transform pos: 51.5,7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7278 components: - type: Transform rot: 1.5707963267948966 rad pos: 22.5,1.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 7279 components: - type: Transform rot: 1.5707963267948966 rad pos: 22.5,3.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 8081 components: - type: Transform pos: 39.5,3.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 8668 components: - type: Transform rot: -1.5707963267948966 rad pos: 17.5,12.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 8670 components: - type: Transform rot: 1.5707963267948966 rad pos: 17.5,11.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 8671 components: - type: Transform rot: -1.5707963267948966 rad pos: 18.5,11.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 8672 components: - type: Transform rot: -1.5707963267948966 rad pos: 17.5,13.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 8673 components: - type: Transform rot: -1.5707963267948966 rad pos: 18.5,13.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 8675 components: - type: Transform rot: 1.5707963267948966 rad pos: 19.5,11.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 8676 components: - type: Transform rot: -1.5707963267948966 rad pos: 16.5,11.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 8677 components: - type: Transform rot: -1.5707963267948966 rad pos: 16.5,13.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 8939 components: - type: Transform rot: -1.5707963267948966 rad pos: 16.5,15.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9377 components: - type: Transform rot: 1.5707963267948966 rad pos: 16.5,15.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9382 components: - type: Transform rot: 1.5707963267948966 rad pos: 19.5,13.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9467 components: - type: Transform rot: 1.5707963267948966 rad pos: 49.5,7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9468 components: - type: Transform pos: 49.5,7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9469 components: - type: Transform rot: 3.141592653589793 rad pos: 50.5,2.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9470 components: - type: Transform rot: 3.141592653589793 rad pos: 51.5,2.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 9474 components: - type: Transform rot: 1.5707963267948966 rad pos: 14.5,9.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 10154 components: - type: Transform rot: -1.5707963267948966 rad pos: 36.5,3.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 10243 components: - type: Transform rot: -1.5707963267948966 rad pos: 26.5,30.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 10295 components: - type: Transform rot: 1.5707963267948966 rad pos: 37.5,3.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 10411 components: - type: Transform rot: -1.5707963267948966 rad pos: 49.5,19.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 10412 components: - type: Transform rot: -1.5707963267948966 rad pos: 49.5,18.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 10413 components: - type: Transform rot: -1.5707963267948966 rad pos: 49.5,20.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 10414 components: - type: Transform rot: -1.5707963267948966 rad pos: 49.5,21.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 10619 components: - type: Transform rot: -1.5707963267948966 rad pos: 17.5,15.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 10620 components: - type: Transform rot: 1.5707963267948966 rad pos: 17.5,15.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 10635 components: - type: Transform rot: 1.5707963267948966 rad pos: 14.5,10.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 11489 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,-14.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 11546 components: - type: Transform pos: 9.5,-37.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 11547 components: - type: Transform pos: 8.5,-37.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 11548 components: - type: Transform pos: 7.5,-37.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 11549 components: - type: Transform rot: -1.5707963267948966 rad pos: 6.5,-34.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 11776 components: - type: Transform rot: 3.141592653589793 rad pos: 3.5,-13.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 11832 components: - type: Transform rot: 1.5707963267948966 rad pos: 17.5,-8.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 11833 components: - type: Transform rot: 3.141592653589793 rad pos: 19.5,-9.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 11834 components: - type: Transform rot: 3.141592653589793 rad pos: 20.5,-9.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 11836 components: - type: Transform rot: 3.141592653589793 rad pos: 21.5,-9.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 11852 components: - type: Transform pos: 21.5,-15.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 11888 components: - type: Transform rot: 3.141592653589793 rad pos: 17.5,0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13404 components: - type: Transform rot: -1.5707963267948966 rad pos: 51.5,7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 13818 components: - type: Transform rot: 1.5707963267948966 rad pos: 53.5,-31.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15266 components: - type: Transform rot: -1.5707963267948966 rad pos: 43.5,-18.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15267 components: - type: Transform rot: 3.141592653589793 rad pos: 43.5,-18.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15268 components: - type: Transform rot: 1.5707963267948966 rad pos: 41.5,-18.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15269 components: - type: Transform rot: 3.141592653589793 rad pos: 41.5,-18.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15270 components: - type: Transform rot: 1.5707963267948966 rad pos: 51.5,-23.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15271 components: - type: Transform rot: 1.5707963267948966 rad pos: 51.5,-24.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15272 components: - type: Transform rot: 1.5707963267948966 rad pos: 51.5,-25.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15273 components: - type: Transform rot: -1.5707963267948966 rad pos: 51.5,-25.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15274 components: - type: Transform rot: -1.5707963267948966 rad pos: 51.5,-24.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15275 components: - type: Transform rot: -1.5707963267948966 rad pos: 51.5,-23.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15276 components: - type: Transform rot: 3.141592653589793 rad pos: 51.5,-23.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15277 components: - type: Transform pos: 51.5,-25.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15326 components: - type: Transform pos: 53.5,-31.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15327 components: - type: Transform pos: 52.5,-31.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15328 components: - type: Transform pos: 51.5,-31.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 15365 components: - type: Transform rot: 1.5707963267948966 rad pos: 53.5,-29.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16261 components: - type: Transform pos: 57.5,41.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16262 components: - type: Transform rot: -1.5707963267948966 rad pos: 57.5,41.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16633 components: - type: Transform rot: -1.5707963267948966 rad pos: 51.5,42.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 16634 components: - type: Transform rot: -1.5707963267948966 rad pos: 52.5,42.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18344 components: - type: Transform rot: 1.5707963267948966 rad pos: 19.5,36.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18345 components: - type: Transform rot: 1.5707963267948966 rad pos: 19.5,38.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18511 components: - type: Transform rot: 3.141592653589793 rad pos: 15.5,35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18512 components: - type: Transform rot: 3.141592653589793 rad pos: 11.5,35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18513 components: - type: Transform rot: 3.141592653589793 rad pos: 10.5,35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18514 components: - type: Transform rot: 3.141592653589793 rad pos: 10.5,42.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18515 components: - type: Transform rot: 3.141592653589793 rad pos: 15.5,42.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18516 components: - type: Transform rot: 3.141592653589793 rad pos: 16.5,42.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18517 components: - type: Transform rot: 3.141592653589793 rad pos: 17.5,42.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18518 components: - type: Transform pos: 17.5,42.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18519 components: - type: Transform pos: 16.5,42.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18520 components: - type: Transform pos: 15.5,42.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18521 components: - type: Transform pos: 10.5,42.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18522 components: - type: Transform pos: 11.5,35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18523 components: - type: Transform pos: 10.5,35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18524 components: - type: Transform pos: 15.5,35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18525 components: - type: Transform rot: -1.5707963267948966 rad pos: 15.5,35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18526 components: - type: Transform rot: -1.5707963267948966 rad pos: 15.5,42.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18527 components: - type: Transform rot: 1.5707963267948966 rad pos: 11.5,35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18528 components: - type: Transform rot: 1.5707963267948966 rad pos: 10.5,42.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18529 components: - type: Transform rot: 1.5707963267948966 rad pos: 17.5,42.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18840 components: - type: Transform rot: 3.141592653589793 rad pos: 4.5,65.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 18841 components: - type: Transform rot: 1.5707963267948966 rad pos: 4.5,65.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 19221 components: - type: Transform pos: 29.5,-45.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 19222 components: - type: Transform pos: 30.5,-45.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 19223 components: - type: Transform pos: 31.5,-45.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 19224 components: - type: Transform pos: 32.5,-45.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 19225 components: - type: Transform pos: 29.5,-53.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 19226 components: - type: Transform pos: 30.5,-53.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 19243 components: - type: Transform rot: 3.141592653589793 rad pos: 32.5,-51.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 19406 components: - type: Transform rot: -1.5707963267948966 rad pos: 26.5,-44.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 19407 components: - type: Transform rot: 3.141592653589793 rad pos: 26.5,-44.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 19408 components: - type: Transform rot: 3.141592653589793 rad pos: 27.5,-44.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 21276 components: - type: Transform rot: 3.141592653589793 rad pos: 70.5,27.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 25534 components: - type: Transform rot: 1.5707963267948966 rad pos: 57.5,5.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 25535 components: - type: Transform rot: 1.5707963267948966 rad pos: 57.5,6.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 25536 components: - type: Transform rot: -1.5707963267948966 rad pos: 57.5,6.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 25537 components: - type: Transform rot: -1.5707963267948966 rad pos: 57.5,5.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 26070 components: - type: Transform rot: 3.141592653589793 rad pos: 45.5,-7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 26071 components: - type: Transform rot: 3.141592653589793 rad pos: 46.5,-7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 26072 components: - type: Transform rot: 3.141592653589793 rad pos: 51.5,-7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 26073 components: - type: Transform rot: 3.141592653589793 rad pos: 52.5,-7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 26074 components: - type: Transform pos: 52.5,-4.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 26075 components: - type: Transform pos: 51.5,-4.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 26076 components: - type: Transform pos: 46.5,-4.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 26077 components: - type: Transform pos: 45.5,-4.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 26078 components: - type: Transform rot: 1.5707963267948966 rad pos: 46.5,-4.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 26079 components: - type: Transform rot: -1.5707963267948966 rad pos: 51.5,-4.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 26080 components: - type: Transform rot: -1.5707963267948966 rad pos: 51.5,-7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 26081 components: - type: Transform rot: 1.5707963267948966 rad pos: 46.5,-7.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 26139 components: - type: Transform rot: -1.5707963267948966 rad pos: 73.5,-33.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 26140 components: - type: Transform rot: -1.5707963267948966 rad pos: 73.5,-31.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 26233 components: - type: Transform rot: 3.141592653589793 rad pos: 57.5,41.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 26245 components: - type: Transform rot: 3.141592653589793 rad pos: 82.5,-14.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 26488 components: - type: Transform rot: -1.5707963267948966 rad pos: 78.5,-2.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 26489 components: - type: Transform rot: -1.5707963267948966 rad pos: 78.5,-0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 26490 components: - type: Transform rot: 1.5707963267948966 rad pos: 82.5,-2.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 26491 components: - type: Transform rot: 1.5707963267948966 rad pos: 82.5,-0.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 26504 components: - type: Transform rot: 3.141592653589793 rad pos: 58.5,41.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 26514 components: - type: Transform rot: 3.141592653589793 rad pos: 62.5,41.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 26515 components: - type: Transform rot: 3.141592653589793 rad pos: 63.5,41.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 26564 components: - type: Transform rot: 1.5707963267948966 rad pos: 63.5,41.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 26565 components: - type: Transform pos: 63.5,41.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 29336 components: - type: Transform rot: -1.5707963267948966 rad pos: 74.5,6.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 29337 components: - type: Transform rot: 1.5707963267948966 rad pos: 67.5,6.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 29404 components: - type: Transform pos: 65.5,35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 29405 components: - type: Transform pos: 64.5,35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 29406 components: - type: Transform pos: 63.5,35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 29407 components: - type: Transform pos: 62.5,35.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 29419 components: - type: Transform rot: 1.5707963267948966 rad pos: 63.5,34.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 29420 components: - type: Transform rot: 1.5707963267948966 rad pos: 63.5,32.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 29421 components: - type: Transform pos: 63.5,32.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 29422 components: - type: Transform pos: 62.5,32.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 29423 components: - type: Transform rot: 3.141592653589793 rad pos: 62.5,28.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 29424 components: - type: Transform rot: 3.141592653589793 rad pos: 63.5,28.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 29425 components: - type: Transform rot: 1.5707963267948966 rad pos: 63.5,28.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 29427 components: - type: Transform rot: 3.141592653589793 rad pos: 65.5,27.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 29428 components: - type: Transform rot: -1.5707963267948966 rad pos: 65.5,27.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 29468 components: - type: Transform rot: 3.141592653589793 rad pos: 66.5,27.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 29513 components: - type: Transform rot: 1.5707963267948966 rad pos: 63.5,26.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 30215 components: - type: Transform rot: -1.5707963267948966 rad pos: 107.5,46.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 30216 components: - type: Transform rot: 1.5707963267948966 rad pos: 109.5,46.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 30217 components: - type: Transform rot: 1.5707963267948966 rad pos: 109.5,52.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 30218 components: - type: Transform rot: -1.5707963267948966 rad pos: 107.5,52.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 30224 components: - type: Transform pos: 108.5,48.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 30225 components: - type: Transform rot: 3.141592653589793 rad pos: 108.5,50.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 30558 components: - type: Transform rot: -1.5707963267948966 rad pos: 109.5,48.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 30559 components: - type: Transform rot: 1.5707963267948966 rad pos: 107.5,50.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 30692 components: - type: Transform rot: -1.5707963267948966 rad pos: 82.5,49.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 30693 components: - type: Transform rot: -1.5707963267948966 rad pos: 82.5,51.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 30731 components: - type: Transform rot: -1.5707963267948966 rad pos: 109.5,50.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31080 components: - type: Transform rot: 3.141592653589793 rad pos: 67.5,55.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31081 components: - type: Transform rot: 3.141592653589793 rad pos: 68.5,55.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31082 components: - type: Transform rot: 3.141592653589793 rad pos: 69.5,55.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31083 components: - type: Transform rot: 3.141592653589793 rad pos: 70.5,55.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31084 components: - type: Transform rot: 3.141592653589793 rad pos: 71.5,55.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31085 components: - type: Transform rot: 3.141592653589793 rad pos: 71.5,52.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31086 components: - type: Transform rot: 3.141592653589793 rad pos: 70.5,52.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31087 components: - type: Transform rot: 3.141592653589793 rad pos: 69.5,52.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31088 components: - type: Transform rot: 3.141592653589793 rad pos: 68.5,52.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31089 components: - type: Transform rot: 3.141592653589793 rad pos: 67.5,52.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31090 components: - type: Transform rot: 3.141592653589793 rad pos: 67.5,49.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31091 components: - type: Transform rot: 3.141592653589793 rad pos: 68.5,49.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31092 components: - type: Transform rot: 3.141592653589793 rad pos: 69.5,49.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31093 components: - type: Transform rot: 3.141592653589793 rad pos: 70.5,49.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31094 components: - type: Transform rot: 3.141592653589793 rad pos: 71.5,49.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31095 components: - type: Transform pos: 71.5,49.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31096 components: - type: Transform pos: 70.5,49.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31097 components: - type: Transform pos: 69.5,49.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31098 components: - type: Transform pos: 68.5,49.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31099 components: - type: Transform pos: 67.5,49.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31100 components: - type: Transform pos: 67.5,52.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31101 components: - type: Transform pos: 68.5,52.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31102 components: - type: Transform pos: 69.5,52.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31103 components: - type: Transform pos: 70.5,52.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31104 components: - type: Transform pos: 71.5,52.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31105 components: - type: Transform pos: 68.5,55.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31106 components: - type: Transform pos: 67.5,55.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31107 components: - type: Transform pos: 69.5,55.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31108 components: - type: Transform pos: 70.5,55.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31109 components: - type: Transform pos: 71.5,55.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31110 components: - type: Transform rot: 1.5707963267948966 rad pos: 71.5,55.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31111 components: - type: Transform rot: 1.5707963267948966 rad pos: 71.5,52.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31112 components: - type: Transform rot: 1.5707963267948966 rad pos: 71.5,49.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31113 components: - type: Transform pos: 67.5,57.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31114 components: - type: Transform pos: 68.5,57.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31115 components: - type: Transform pos: 69.5,57.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31116 components: - type: Transform pos: 70.5,57.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31117 components: - type: Transform pos: 71.5,57.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31118 components: - type: Transform rot: -1.5707963267948966 rad pos: 74.5,57.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31119 components: - type: Transform rot: -1.5707963267948966 rad pos: 78.5,57.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31120 components: - type: Transform rot: 1.5707963267948966 rad pos: 81.5,57.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31121 components: - type: Transform rot: -1.5707963267948966 rad pos: 84.5,57.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31122 components: - type: Transform rot: 1.5707963267948966 rad pos: 71.5,51.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31123 components: - type: Transform rot: 1.5707963267948966 rad pos: 71.5,54.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31124 components: - type: Transform rot: 1.5707963267948966 rad pos: 71.5,48.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31125 components: - type: Transform rot: 3.141592653589793 rad pos: 71.5,46.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31126 components: - type: Transform rot: 3.141592653589793 rad pos: 70.5,46.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31127 components: - type: Transform rot: 3.141592653589793 rad pos: 69.5,46.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31128 components: - type: Transform rot: 3.141592653589793 rad pos: 68.5,46.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31129 components: - type: Transform rot: 3.141592653589793 rad pos: 67.5,46.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31496 components: - type: Transform pos: 59.5,49.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 31497 components: - type: Transform pos: 61.5,49.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 32550 components: - type: Transform rot: -1.5707963267948966 rad pos: 108.5,16.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 32551 components: - type: Transform rot: -1.5707963267948966 rad pos: 108.5,14.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 32751 components: - type: Transform rot: -1.5707963267948966 rad pos: 108.5,36.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 32752 components: - type: Transform rot: 1.5707963267948966 rad pos: 104.5,36.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 33965 components: - type: Transform rot: -1.5707963267948966 rad pos: 39.5,56.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 33966 components: - type: Transform rot: 1.5707963267948966 rad pos: 35.5,56.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 35338 components: - type: Transform rot: 1.5707963267948966 rad pos: 18.5,12.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 35941 components: - type: Transform pos: 17.5,13.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 35942 components: - type: Transform pos: 18.5,13.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 35943 components: - type: Transform pos: 19.5,13.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 35944 components: - type: Transform pos: 16.5,13.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 35945 components: - type: Transform rot: 3.141592653589793 rad pos: 16.5,11.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 35946 components: - type: Transform rot: 3.141592653589793 rad pos: 17.5,11.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 35947 components: - type: Transform rot: 3.141592653589793 rad pos: 18.5,11.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 35948 components: - type: Transform rot: 3.141592653589793 rad pos: 19.5,11.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 35967 components: - type: Transform rot: -1.5707963267948966 rad pos: 19.5,9.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 35968 components: - type: Transform rot: 1.5707963267948966 rad pos: 20.5,9.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - uid: 36069 components: - type: Transform rot: 1.5707963267948966 rad pos: 107.5,48.5 parent: 13329 - - type: DeltaPressure - gridUid: 13329 - proto: Wirecutter entities: - uid: 32412 From 5ad45034faa98f8be3da9434a1b3d40c25c371bb Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Tue, 4 Nov 2025 13:12:40 -0700 Subject: [PATCH 103/121] marathon update (#41292) --- Resources/Maps/marathon.yml | 2363 +---------------------------------- 1 file changed, 18 insertions(+), 2345 deletions(-) diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml index 82a4d668c3..b2d20a2df1 100644 --- a/Resources/Maps/marathon.yml +++ b/Resources/Maps/marathon.yml @@ -1,11 +1,11 @@ meta: format: 7 category: Map - engineVersion: 267.2.0 + engineVersion: 267.3.0 forkId: "" forkVersion: "" - time: 10/07/2025 01:59:23 - entityCount: 23873 + time: 11/04/2025 19:49:34 + entityCount: 23872 maps: - 5350 grids: @@ -11783,7 +11783,7 @@ entities: pos: 34.5,45.5 parent: 30 - type: Door - secondsUntilStateChange: -47726.9 + secondsUntilStateChange: -47753.46 state: Opening - type: DeviceLinkSource lastSignals: @@ -104581,15 +104581,11 @@ entities: - type: Transform pos: -10.5,-18.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 10024 components: - type: Transform pos: -7.5,-18.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - proto: InflatableWallStack entities: - uid: 21276 @@ -107629,18 +107625,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: MagazinePistolSubMachineGunTopMounted - entities: - - uid: 1999 - components: - - type: Transform - pos: -22.54349,53.796127 - parent: 30 - - uid: 2001 - components: - - type: Transform - pos: -22.54349,53.796127 - parent: 30 - proto: MagazineRifle entities: - uid: 21283 @@ -109435,62 +109419,46 @@ entities: rot: 3.141592653589793 rad pos: -40.5,53.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 2091 components: - type: Transform pos: -40.5,54.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 2532 components: - type: Transform pos: -39.5,54.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 2592 components: - type: Transform rot: 1.5707963267948966 rad pos: -39.5,54.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 4595 components: - type: Transform rot: 1.5707963267948966 rad pos: -39.5,53.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 4600 components: - type: Transform rot: 3.141592653589793 rad pos: -39.5,53.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 4781 components: - type: Transform rot: -1.5707963267948966 rad pos: -40.5,54.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21013 components: - type: Transform rot: -1.5707963267948966 rad pos: -40.5,53.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - proto: PlasmaTank entities: - uid: 23385 @@ -109510,31 +109478,23 @@ entities: - type: Transform pos: -39.5,53.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1986 components: - type: Transform pos: -40.5,53.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 2407 components: - type: Transform rot: 3.141592653589793 rad pos: -39.5,54.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 4788 components: - type: Transform rot: 3.141592653589793 rad pos: -40.5,54.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - proto: PlasmaWindowDirectional entities: - uid: 7039 @@ -109543,16 +109503,12 @@ entities: rot: 3.141592653589793 rad pos: 48.5,40.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 19695 components: - type: Transform rot: 1.5707963267948966 rad pos: 48.5,41.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - proto: PlasticFlapsAirtightClear entities: - uid: 11228 @@ -116299,246 +116255,176 @@ entities: - type: Transform pos: 2.5,-57.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 4454 components: - type: Transform pos: 0.5,-58.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5792 components: - type: Transform pos: 1.5,-57.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8682 components: - type: Transform pos: 24.5,-34.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8683 components: - type: Transform pos: 24.5,-32.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8684 components: - type: Transform pos: 24.5,-30.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8685 components: - type: Transform pos: 24.5,-28.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8686 components: - type: Transform pos: 24.5,-26.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8687 components: - type: Transform pos: 24.5,-24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8688 components: - type: Transform pos: 24.5,-22.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 12898 components: - type: Transform pos: 38.5,11.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 12900 components: - type: Transform pos: 37.5,11.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 12901 components: - type: Transform pos: 35.5,11.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 12920 components: - type: Transform pos: 36.5,11.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 12928 components: - type: Transform pos: 38.5,14.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 12931 components: - type: Transform pos: 35.5,14.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 15073 components: - type: Transform pos: 12.5,-38.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 15180 components: - type: Transform pos: 12.5,-42.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 15188 components: - type: Transform pos: 10.5,-40.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 15190 components: - type: Transform pos: 13.5,-38.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 16404 components: - type: Transform pos: -40.5,50.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17012 components: - type: Transform pos: -60.5,56.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17013 components: - type: Transform pos: -61.5,57.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17014 components: - type: Transform pos: -60.5,58.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17015 components: - type: Transform pos: -59.5,57.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18190 components: - type: Transform pos: -39.5,50.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20467 components: - type: Transform pos: 11.5,-38.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20538 components: - type: Transform pos: 3.5,-57.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20539 components: - type: Transform pos: 1.5,-61.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20569 components: - type: Transform pos: 4.5,-58.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20591 components: - type: Transform pos: 3.5,-61.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20613 components: - type: Transform pos: 2.5,-61.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20644 components: - type: Transform pos: 0.5,-60.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20651 components: - type: Transform pos: 0.5,-59.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20652 components: - type: Transform pos: 4.5,-60.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - proto: ReinforcedWindow entities: - uid: 66 @@ -116546,4985 +116432,3561 @@ entities: - type: Transform pos: -17.5,4.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 67 components: - type: Transform pos: -16.5,4.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 68 components: - type: Transform pos: -15.5,4.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 69 components: - type: Transform pos: -13.5,4.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 70 components: - type: Transform pos: -14.5,4.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 71 components: - type: Transform pos: -11.5,5.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 72 components: - type: Transform pos: -19.5,8.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 73 components: - type: Transform pos: -21.5,8.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 152 components: - type: Transform pos: 44.5,50.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 301 components: - type: Transform pos: 0.5,24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 302 components: - type: Transform pos: -1.5,24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 303 components: - type: Transform pos: -3.5,24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 304 components: - type: Transform pos: 3.5,24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 305 components: - type: Transform pos: 5.5,24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 319 components: - type: Transform pos: -22.5,5.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 327 components: - type: Transform pos: -22.5,7.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 379 components: - type: Transform pos: -56.5,5.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 445 components: - type: Transform pos: 44.5,49.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 479 components: - type: Transform pos: -64.5,12.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 843 components: - type: Transform pos: -46.5,-1.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 872 components: - type: Transform pos: -54.5,5.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 876 components: - type: Transform pos: -60.5,8.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 897 components: - type: Transform pos: -60.5,7.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 902 components: - type: Transform pos: -48.5,4.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 903 components: - type: Transform pos: -46.5,-5.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 911 components: - type: Transform pos: -58.5,9.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 912 components: - type: Transform pos: -58.5,10.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 913 components: - type: Transform pos: -46.5,-2.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 920 components: - type: Transform pos: -46.5,3.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 930 components: - type: Transform pos: -46.5,-4.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 932 components: - type: Transform pos: -59.5,9.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 949 components: - type: Transform pos: -46.5,2.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 952 components: - type: Transform pos: -46.5,-6.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 965 components: - type: Transform pos: -46.5,1.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1051 components: - type: Transform pos: -41.5,12.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1053 components: - type: Transform pos: -37.5,11.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1054 components: - type: Transform pos: -39.5,8.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1058 components: - type: Transform pos: -39.5,12.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1060 components: - type: Transform pos: -37.5,9.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1061 components: - type: Transform pos: -41.5,8.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1078 components: - type: Transform pos: -56.5,-7.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1080 components: - type: Transform pos: -50.5,-7.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1082 components: - type: Transform pos: -57.5,-10.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1111 components: - type: Transform pos: -58.5,16.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1112 components: - type: Transform pos: -58.5,17.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1113 components: - type: Transform pos: -58.5,18.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1114 components: - type: Transform pos: -58.5,19.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1116 components: - type: Transform pos: -59.5,20.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1117 components: - type: Transform pos: -60.5,20.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1118 components: - type: Transform pos: -61.5,20.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1119 components: - type: Transform pos: -62.5,20.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1120 components: - type: Transform pos: -59.5,16.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1121 components: - type: Transform pos: -61.5,16.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1122 components: - type: Transform pos: -62.5,16.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1123 components: - type: Transform pos: -58.5,12.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1124 components: - type: Transform pos: -59.5,12.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1125 components: - type: Transform pos: -60.5,12.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1126 components: - type: Transform pos: -61.5,12.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1127 components: - type: Transform pos: -62.5,12.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1128 components: - type: Transform pos: -58.5,14.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1129 components: - type: Transform pos: -59.5,14.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1130 components: - type: Transform pos: -61.5,14.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1131 components: - type: Transform pos: -62.5,14.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1132 components: - type: Transform pos: -58.5,24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1133 components: - type: Transform pos: -59.5,24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1134 components: - type: Transform pos: -61.5,24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1135 components: - type: Transform pos: -62.5,24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1136 components: - type: Transform pos: -62.5,22.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1137 components: - type: Transform pos: -61.5,22.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1138 components: - type: Transform pos: -59.5,22.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1139 components: - type: Transform pos: -58.5,22.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1145 components: - type: Transform pos: -64.5,14.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1148 components: - type: Transform pos: -64.5,22.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1206 components: - type: Transform pos: -58.5,20.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1291 components: - type: Transform pos: -60.5,5.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1305 components: - type: Transform pos: -54.5,-7.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1322 components: - type: Transform pos: -63.5,20.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1326 components: - type: Transform pos: -47.5,-13.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1327 components: - type: Transform pos: -47.5,-15.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1329 components: - type: Transform pos: -47.5,-11.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1374 components: - type: Transform pos: -40.5,32.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1375 components: - type: Transform pos: -40.5,31.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1377 components: - type: Transform pos: -40.5,30.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1430 components: - type: Transform pos: -42.5,34.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1489 components: - type: Transform pos: -52.5,34.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1491 components: - type: Transform pos: -50.5,34.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1492 components: - type: Transform pos: -48.5,34.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1549 components: - type: Transform pos: -57.5,34.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1550 components: - type: Transform pos: -56.5,34.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1551 components: - type: Transform pos: -55.5,34.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1553 components: - type: Transform pos: -59.5,28.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1554 components: - type: Transform pos: -60.5,28.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1555 components: - type: Transform pos: -61.5,28.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1559 components: - type: Transform pos: 12.5,36.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1565 components: - type: Transform pos: 11.5,37.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1667 components: - type: Transform pos: -40.5,38.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1668 components: - type: Transform pos: -43.5,38.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1669 components: - type: Transform pos: -42.5,38.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1670 components: - type: Transform pos: -44.5,38.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1671 components: - type: Transform pos: -39.5,38.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1672 components: - type: Transform pos: -38.5,38.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1693 components: - type: Transform pos: -35.5,38.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1694 components: - type: Transform pos: -35.5,41.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1729 components: - type: Transform pos: -29.5,42.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1730 components: - type: Transform pos: -29.5,44.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1758 components: - type: Transform pos: -46.5,-0.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1772 components: - type: Transform pos: 3.5,38.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1776 components: - type: Transform pos: -31.5,45.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1777 components: - type: Transform pos: -33.5,45.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1790 components: - type: Transform pos: -27.5,48.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1791 components: - type: Transform pos: -27.5,52.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1808 components: - type: Transform pos: -20.5,48.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1809 components: - type: Transform pos: -20.5,50.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1810 components: - type: Transform pos: -20.5,49.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1814 components: - type: Transform pos: -20.5,52.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1815 components: - type: Transform pos: -20.5,51.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1834 components: - type: Transform pos: -38.5,45.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1835 components: - type: Transform pos: -36.5,46.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1836 components: - type: Transform pos: -36.5,48.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1837 components: - type: Transform pos: -40.5,45.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1838 components: - type: Transform pos: -41.5,45.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1840 components: - type: Transform pos: -43.5,45.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1841 components: - type: Transform pos: -44.5,45.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1842 components: - type: Transform pos: -45.5,46.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1843 components: - type: Transform pos: -45.5,48.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1879 components: - type: Transform pos: -34.5,55.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1922 components: - type: Transform pos: -26.5,59.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1925 components: - type: Transform pos: -26.5,58.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1928 components: - type: Transform pos: -63.5,24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1931 components: - type: Transform pos: -63.5,16.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1941 components: - type: Transform pos: 6.5,37.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1954 components: - type: Transform pos: 6.5,36.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1964 components: - type: Transform pos: 35.5,36.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1967 components: - type: Transform pos: 36.5,36.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 2044 components: - type: Transform pos: -28.5,61.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 2045 components: - type: Transform pos: -29.5,61.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 2046 components: - type: Transform pos: -30.5,61.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 2049 components: - type: Transform pos: -34.5,61.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 2050 components: - type: Transform pos: -33.5,61.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 2051 components: - type: Transform pos: -32.5,61.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 2066 components: - type: Transform pos: -36.5,58.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 2201 components: - type: Transform pos: -49.5,47.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 2267 components: - type: Transform pos: -47.5,70.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 2269 components: - type: Transform pos: -45.5,70.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 2314 components: - type: Transform pos: -55.5,-10.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 2344 components: - type: Transform pos: -45.5,42.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 2588 components: - type: Transform pos: -26.5,57.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 2724 components: - type: Transform pos: -45.5,44.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 3168 components: - type: Transform pos: -63.5,12.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 3186 components: - type: Transform pos: -48.5,-10.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 3199 components: - type: Transform pos: -47.5,4.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 3513 components: - type: Transform pos: -50.5,4.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 3514 components: - type: Transform pos: -49.5,4.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 4406 components: - type: Transform pos: -6.5,-49.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 4410 components: - type: Transform pos: -34.5,-24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 4491 components: - type: Transform pos: -49.5,70.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 4695 components: - type: Transform pos: -47.5,45.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 4824 components: - type: Transform pos: 41.5,22.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 4847 components: - type: Transform pos: -11.5,28.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 4848 components: - type: Transform pos: -10.5,28.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 4849 components: - type: Transform pos: -9.5,28.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 4850 components: - type: Transform pos: -8.5,28.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 4851 components: - type: Transform pos: -7.5,28.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5071 components: - type: Transform pos: -18.5,45.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5072 components: - type: Transform pos: -19.5,45.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5073 components: - type: Transform pos: -20.5,45.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5080 components: - type: Transform pos: -21.5,45.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5248 components: - type: Transform pos: 2.5,-21.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5250 components: - type: Transform pos: -56.5,-10.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5277 components: - type: Transform pos: -6.5,30.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5283 components: - type: Transform pos: -6.5,37.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5295 components: - type: Transform pos: -11.5,37.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5303 components: - type: Transform pos: -7.5,37.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5304 components: - type: Transform pos: -12.5,37.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5307 components: - type: Transform pos: -8.5,38.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5308 components: - type: Transform pos: -11.5,38.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5310 components: - type: Transform pos: -10.5,38.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5312 components: - type: Transform pos: -7.5,38.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5326 components: - type: Transform pos: -12.5,30.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5372 components: - type: Transform pos: 3.5,30.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5373 components: - type: Transform pos: 0.5,30.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5375 components: - type: Transform pos: 0.5,28.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5376 components: - type: Transform pos: 1.5,28.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5377 components: - type: Transform pos: 2.5,28.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5378 components: - type: Transform pos: 3.5,28.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5395 components: - type: Transform pos: 0.5,38.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5423 components: - type: Transform pos: 12.5,29.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5424 components: - type: Transform pos: 12.5,30.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5425 components: - type: Transform pos: 12.5,33.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5426 components: - type: Transform pos: 12.5,34.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5430 components: - type: Transform pos: -57.5,-7.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5433 components: - type: Transform pos: -49.5,-7.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5434 components: - type: Transform pos: -55.5,-7.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5436 components: - type: Transform pos: -61.5,-9.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5437 components: - type: Transform pos: -61.5,-8.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5438 components: - type: Transform pos: 13.5,39.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5439 components: - type: Transform pos: 3.5,39.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5440 components: - type: Transform pos: 12.5,37.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5442 components: - type: Transform pos: 5.5,37.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5466 components: - type: Transform pos: 11.5,46.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5476 components: - type: Transform pos: 9.5,46.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5488 components: - type: Transform pos: 7.5,37.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5491 components: - type: Transform pos: -54.5,-10.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5758 components: - type: Transform pos: -15.5,43.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5759 components: - type: Transform pos: -14.5,44.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5760 components: - type: Transform pos: -13.5,46.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5761 components: - type: Transform pos: -13.5,47.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5762 components: - type: Transform pos: -12.5,47.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5763 components: - type: Transform pos: -10.5,47.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5764 components: - type: Transform pos: -9.5,47.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5765 components: - type: Transform pos: -8.5,47.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5766 components: - type: Transform pos: -6.5,47.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5767 components: - type: Transform pos: -5.5,47.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5768 components: - type: Transform pos: -5.5,46.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5769 components: - type: Transform pos: -4.5,44.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5770 components: - type: Transform pos: -3.5,43.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5853 components: - type: Transform pos: -36.5,60.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6290 components: - type: Transform pos: 13.5,28.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6291 components: - type: Transform pos: 14.5,28.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6306 components: - type: Transform pos: 15.5,33.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6307 components: - type: Transform pos: 15.5,34.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6308 components: - type: Transform pos: 15.5,36.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6309 components: - type: Transform pos: 15.5,37.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6310 components: - type: Transform pos: 15.5,39.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6311 components: - type: Transform pos: 15.5,40.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6360 components: - type: Transform pos: 24.5,43.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6363 components: - type: Transform pos: 26.5,43.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6523 components: - type: Transform pos: 17.5,24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6525 components: - type: Transform pos: 19.5,24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6553 components: - type: Transform pos: 11.5,21.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6554 components: - type: Transform pos: 11.5,22.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6555 components: - type: Transform pos: 12.5,19.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6556 components: - type: Transform pos: 14.5,19.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6557 components: - type: Transform pos: 15.5,20.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6558 components: - type: Transform pos: 15.5,22.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6577 components: - type: Transform pos: 11.5,18.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6578 components: - type: Transform pos: 11.5,14.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6627 components: - type: Transform pos: -32.5,-24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6641 components: - type: Transform pos: -10.5,-6.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6643 components: - type: Transform pos: -9.5,-5.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6644 components: - type: Transform pos: -5.5,-5.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6645 components: - type: Transform pos: -7.5,-5.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6741 components: - type: Transform pos: -17.5,-3.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6742 components: - type: Transform pos: -19.5,-3.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6743 components: - type: Transform pos: -15.5,-2.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6744 components: - type: Transform pos: -15.5,-1.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6745 components: - type: Transform pos: -15.5,-0.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6774 components: - type: Transform pos: -14.5,-7.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6775 components: - type: Transform pos: -15.5,-7.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6776 components: - type: Transform pos: -13.5,-6.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6809 components: - type: Transform pos: -16.5,-11.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6810 components: - type: Transform pos: -26.5,-11.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6887 components: - type: Transform pos: -28.5,0.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6972 components: - type: Transform pos: -12.5,-17.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6981 components: - type: Transform pos: -33.5,-27.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6987 components: - type: Transform pos: -32.5,-27.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 7018 components: - type: Transform pos: -14.5,-17.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 7210 components: - type: Transform pos: -34.5,-27.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 7240 components: - type: Transform pos: -14.5,-3.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 7380 components: - type: Transform pos: -31.5,-18.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 7381 components: - type: Transform pos: -31.5,-16.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 7420 components: - type: Transform pos: -22.5,-13.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 7421 components: - type: Transform pos: -20.5,-13.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 7450 components: - type: Transform pos: -63.5,42.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 7529 components: - type: Transform pos: -30.5,-14.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 7537 components: - type: Transform pos: -28.5,-14.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 7822 components: - type: Transform pos: -30.5,-8.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 7828 components: - type: Transform pos: -33.5,-24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 7889 components: - type: Transform pos: -14.5,-13.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 7912 components: - type: Transform pos: 15.5,12.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 7996 components: - type: Transform pos: -12.5,-13.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8044 components: - type: Transform pos: -24.5,-19.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8048 components: - type: Transform pos: -26.5,-19.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8062 components: - type: Transform pos: -25.5,-19.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8064 components: - type: Transform pos: -28.5,-8.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8193 components: - type: Transform pos: 38.5,16.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8273 components: - type: Transform pos: -48.5,-7.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8314 components: - type: Transform pos: -65.5,42.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8377 components: - type: Transform pos: -0.5,-24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8378 components: - type: Transform pos: 4.5,-23.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8381 components: - type: Transform pos: -0.5,-23.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8382 components: - type: Transform pos: 4.5,-24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8385 components: - type: Transform pos: 4.5,-25.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8390 components: - type: Transform pos: 0.5,-21.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8391 components: - type: Transform pos: -0.5,-22.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8395 components: - type: Transform pos: -0.5,-25.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8398 components: - type: Transform pos: 3.5,-26.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8401 components: - type: Transform pos: 2.5,-26.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8409 components: - type: Transform pos: 15.5,-16.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8410 components: - type: Transform pos: 15.5,-14.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8411 components: - type: Transform pos: 16.5,-12.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8420 components: - type: Transform pos: 17.5,-16.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8421 components: - type: Transform pos: 17.5,-14.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8436 components: - type: Transform pos: 5.5,-22.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8437 components: - type: Transform pos: 7.5,-22.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8457 components: - type: Transform pos: 15.5,-0.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8462 components: - type: Transform pos: 18.5,-7.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8463 components: - type: Transform pos: 18.5,-5.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8488 components: - type: Transform pos: 22.5,1.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8491 components: - type: Transform pos: 19.5,-0.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8492 components: - type: Transform pos: 21.5,-0.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8516 components: - type: Transform pos: 5.5,-30.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8517 components: - type: Transform pos: 7.5,-30.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8545 components: - type: Transform pos: 18.5,-37.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8546 components: - type: Transform pos: 22.5,-36.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8548 components: - type: Transform pos: 20.5,-37.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8549 components: - type: Transform pos: 22.5,-37.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8550 components: - type: Transform pos: 21.5,-37.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8551 components: - type: Transform pos: 22.5,-35.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8552 components: - type: Transform pos: 22.5,-34.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8553 components: - type: Transform pos: 22.5,-33.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8554 components: - type: Transform pos: 22.5,-32.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8555 components: - type: Transform pos: 22.5,-31.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8556 components: - type: Transform pos: 22.5,-30.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8557 components: - type: Transform pos: 22.5,-29.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8558 components: - type: Transform pos: 22.5,-28.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8559 components: - type: Transform pos: 22.5,-27.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8560 components: - type: Transform pos: 22.5,-26.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8561 components: - type: Transform pos: 22.5,-25.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8562 components: - type: Transform pos: 22.5,-24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8563 components: - type: Transform pos: 22.5,-23.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8564 components: - type: Transform pos: 22.5,-22.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8565 components: - type: Transform pos: 22.5,-21.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8567 components: - type: Transform pos: 8.5,-36.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8601 components: - type: Transform pos: 5.5,-37.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8605 components: - type: Transform pos: 1.5,-26.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8829 components: - type: Transform pos: -63.5,22.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8838 components: - type: Transform pos: -27.5,-21.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8933 components: - type: Transform pos: 15.5,-35.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8980 components: - type: Transform pos: 14.5,-35.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8982 components: - type: Transform pos: 7.5,-37.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8996 components: - type: Transform pos: 17.5,-37.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9004 components: - type: Transform pos: -3.5,-55.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9005 components: - type: Transform pos: -4.5,-55.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9012 components: - type: Transform pos: 6.5,-37.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9042 components: - type: Transform pos: -55.5,5.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9043 components: - type: Transform pos: -50.5,-10.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9092 components: - type: Transform pos: 23.5,-14.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9104 components: - type: Transform pos: 5.5,-49.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9120 components: - type: Transform pos: -64.5,42.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9234 components: - type: Transform pos: 1.5,-55.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9277 components: - type: Transform pos: -1.5,-36.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9279 components: - type: Transform pos: -3.5,-36.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9280 components: - type: Transform pos: -0.5,-34.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9281 components: - type: Transform pos: -0.5,-32.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9289 components: - type: Transform pos: 3.5,-55.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9316 components: - type: Transform pos: 13.5,-35.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9320 components: - type: Transform pos: 16.5,-36.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9321 components: - type: Transform pos: -6.5,-37.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9322 components: - type: Transform pos: -8.5,-37.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9361 components: - type: Transform pos: -49.5,-10.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9495 components: - type: Transform pos: -16.5,-45.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9513 components: - type: Transform pos: 5.5,-51.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9577 components: - type: Transform pos: -6.5,-51.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9597 components: - type: Transform pos: -37.5,-36.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9598 components: - type: Transform pos: -38.5,-36.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9664 components: - type: Transform pos: 4.5,37.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9681 components: - type: Transform pos: -0.5,-55.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9691 components: - type: Transform pos: 5.5,-50.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9702 components: - type: Transform pos: -18.5,-45.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9706 components: - type: Transform pos: 13.5,37.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9718 components: - type: Transform pos: 13.5,38.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9723 components: - type: Transform pos: -63.5,14.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9801 components: - type: Transform pos: -57.5,5.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9815 components: - type: Transform pos: -1.5,-42.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9820 components: - type: Transform pos: 2.5,-42.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9848 components: - type: Transform pos: -27.5,-17.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9857 components: - type: Transform pos: -32.5,-5.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9858 components: - type: Transform pos: -32.5,-7.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9966 components: - type: Transform pos: -2.5,-55.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 10044 components: - type: Transform pos: 2.5,-55.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 10053 components: - type: Transform pos: -15.5,-57.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 10054 components: - type: Transform pos: -17.5,-57.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 10058 components: - type: Transform pos: -16.5,-57.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 10059 components: - type: Transform pos: -19.5,-57.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 10088 components: - type: Transform pos: -14.5,-57.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 10089 components: - type: Transform pos: 0.5,-26.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 10094 components: - type: Transform pos: -18.5,-57.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 10098 components: - type: Transform pos: 4.5,-40.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 10099 components: - type: Transform pos: 4.5,-38.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 10124 components: - type: Transform pos: -14.5,-31.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 10139 components: - type: Transform pos: -20.5,-57.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 10150 components: - type: Transform pos: -49.5,49.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 10152 components: - type: Transform pos: -14.5,-39.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 10185 components: - type: Transform pos: -14.5,-28.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 10395 components: - type: Transform pos: 23.5,-16.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 10558 components: - type: Transform pos: 10.5,-35.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 10559 components: - type: Transform pos: 12.5,-35.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 10623 components: - type: Transform pos: -14.5,-29.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 10654 components: - type: Transform pos: -35.5,-25.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 10656 components: - type: Transform pos: 16.5,-19.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 10743 components: - type: Transform pos: 3.5,-21.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 11073 components: - type: Transform pos: -9.5,-45.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 11076 components: - type: Transform pos: -16.5,-49.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 11091 components: - type: Transform pos: -9.5,-43.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 11106 components: - type: Transform pos: -12.5,-32.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 11125 components: - type: Transform pos: -18.5,-49.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 11139 components: - type: Transform pos: -7.5,-42.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 11140 components: - type: Transform pos: -5.5,-42.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 11164 components: - type: Transform pos: 16.5,-17.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 11256 components: - type: Transform pos: -3.5,-31.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 11270 components: - type: Transform pos: -11.5,-32.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 11288 components: - type: Transform pos: -6.5,-50.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 11308 components: - type: Transform pos: -14.5,-44.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 11438 components: - type: Transform pos: -64.5,16.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 11448 components: - type: Transform pos: -53.5,37.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 11450 components: - type: Transform pos: -53.5,35.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 11602 components: - type: Transform pos: 24.5,-0.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 11603 components: - type: Transform pos: 25.5,-0.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 11604 components: - type: Transform pos: 26.5,-0.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 11653 components: - type: Transform pos: -39.5,-34.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 11657 components: - type: Transform pos: 26.5,-12.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 11671 components: - type: Transform pos: 30.5,-12.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 11679 components: - type: Transform pos: 33.5,-15.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 11692 components: - type: Transform pos: 25.5,-8.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 11700 components: - type: Transform pos: 18.5,-2.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 11760 components: - type: Transform pos: 1.5,-21.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 11782 components: - type: Transform pos: 33.5,-12.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 11867 components: - type: Transform pos: 36.5,-4.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 12019 components: - type: Transform pos: 37.5,-4.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 12030 components: - type: Transform pos: 38.5,-4.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 12104 components: - type: Transform pos: 28.5,-12.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 12656 components: - type: Transform pos: 15.5,10.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 12695 components: - type: Transform pos: 30.5,15.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 12711 components: - type: Transform pos: 33.5,13.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 12712 components: - type: Transform pos: 31.5,13.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 12729 components: - type: Transform pos: -64.5,24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 12730 components: - type: Transform pos: -64.5,20.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 12803 components: - type: Transform pos: -39.5,-32.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 12804 components: - type: Transform pos: -39.5,-33.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 12807 components: - type: Transform pos: 27.5,17.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 12837 components: - type: Transform pos: -64.5,-66.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 12857 components: - type: Transform pos: 47.5,27.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 12975 components: - type: Transform pos: 30.5,14.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13361 components: - type: Transform pos: 29.5,17.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13379 components: - type: Transform pos: 24.5,15.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13420 components: - type: Transform pos: 11.5,62.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13421 components: - type: Transform pos: 10.5,53.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13422 components: - type: Transform pos: 10.5,59.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13451 components: - type: Transform pos: 22.5,52.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13452 components: - type: Transform pos: 22.5,54.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13454 components: - type: Transform pos: 21.5,47.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13455 components: - type: Transform pos: 21.5,48.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13456 components: - type: Transform pos: 21.5,49.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13474 components: - type: Transform pos: 10.5,57.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13475 components: - type: Transform pos: 10.5,61.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13479 components: - type: Transform pos: 28.5,52.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13481 components: - type: Transform pos: 20.5,60.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13482 components: - type: Transform pos: 28.5,54.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13483 components: - type: Transform pos: 30.5,54.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13484 components: - type: Transform pos: 29.5,50.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13485 components: - type: Transform pos: 29.5,48.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13486 components: - type: Transform pos: 29.5,49.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13488 components: - type: Transform pos: 31.5,48.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13489 components: - type: Transform pos: 31.5,49.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13490 components: - type: Transform pos: 31.5,50.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13510 components: - type: Transform pos: 36.5,46.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13511 components: - type: Transform pos: 35.5,46.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13512 components: - type: Transform pos: 39.5,46.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13513 components: - type: Transform pos: 38.5,46.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13541 components: - type: Transform pos: 48.5,43.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13550 components: - type: Transform pos: 47.5,38.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13551 components: - type: Transform pos: 47.5,37.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13552 components: - type: Transform pos: 47.5,36.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13553 components: - type: Transform pos: 47.5,35.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13554 components: - type: Transform pos: 44.5,39.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13555 components: - type: Transform pos: 44.5,37.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13581 components: - type: Transform pos: 34.5,37.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13582 components: - type: Transform pos: 34.5,39.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13612 components: - type: Transform pos: 45.5,11.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13615 components: - type: Transform pos: 51.5,25.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13616 components: - type: Transform pos: 52.5,25.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13619 components: - type: Transform pos: 54.5,23.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13622 components: - type: Transform pos: 54.5,21.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13652 components: - type: Transform pos: 36.5,24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13653 components: - type: Transform pos: 36.5,22.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13654 components: - type: Transform pos: 36.5,23.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13661 components: - type: Transform pos: 41.5,23.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13664 components: - type: Transform pos: 14.5,63.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13669 components: - type: Transform pos: 41.5,24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13712 components: - type: Transform pos: 20.5,59.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13713 components: - type: Transform pos: 10.5,55.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13984 components: - type: Transform pos: -6.5,-42.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 14338 components: - type: Transform pos: 28.5,12.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 14339 components: - type: Transform pos: 26.5,12.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 14354 components: - type: Transform pos: 27.5,12.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 14515 components: - type: Transform pos: 49.5,24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 14723 components: - type: Transform pos: 17.5,63.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 14729 components: - type: Transform pos: 40.5,49.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 14735 components: - type: Transform pos: 15.5,63.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 14798 components: - type: Transform pos: 16.5,63.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 14849 components: - type: Transform pos: 30.5,40.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 14915 components: - type: Transform pos: -22.5,-45.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 15160 components: - type: Transform pos: 40.5,50.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 15241 components: - type: Transform pos: 43.5,50.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 15243 components: - type: Transform pos: 40.5,47.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 15245 components: - type: Transform pos: 41.5,50.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 15328 components: - type: Transform pos: 52.5,29.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 15329 components: - type: Transform pos: 52.5,31.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 15330 components: - type: Transform pos: 54.5,29.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 15331 components: - type: Transform pos: 54.5,31.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 15332 components: - type: Transform pos: 53.5,29.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 15333 components: - type: Transform pos: 53.5,31.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 15759 components: - type: Transform pos: 45.5,5.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 15820 components: - type: Transform pos: 45.5,8.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 16095 components: - type: Transform pos: 24.5,-12.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 16123 components: - type: Transform pos: 23.5,-8.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 16252 components: - type: Transform pos: -68.5,42.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 16254 components: - type: Transform pos: -67.5,42.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 16256 components: - type: Transform pos: -66.5,42.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 16257 components: - type: Transform pos: -66.5,44.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 16258 components: - type: Transform pos: -68.5,44.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 16736 components: - type: Transform pos: -58.5,36.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 16789 components: - type: Transform pos: -56.5,48.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 16803 components: - type: Transform pos: -62.5,-66.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17039 components: - type: Transform pos: -58.5,48.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17040 components: - type: Transform pos: -56.5,47.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17057 components: - type: Transform pos: -58.5,47.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17075 components: - type: Transform pos: 11.5,-35.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17076 components: - type: Transform pos: 9.5,-35.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17098 components: - type: Transform pos: -57.5,53.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17102 components: - type: Transform pos: -55.5,53.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17120 components: - type: Transform pos: -47.5,-17.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17122 components: - type: Transform pos: -47.5,-19.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17125 components: - type: Transform pos: -49.5,-21.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17128 components: - type: Transform pos: -56.5,-20.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17129 components: - type: Transform pos: -57.5,-20.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17130 components: - type: Transform pos: -58.5,-20.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17131 components: - type: Transform pos: -60.5,-19.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17132 components: - type: Transform pos: -61.5,-19.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17133 components: - type: Transform pos: -62.5,-19.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17134 components: - type: Transform pos: -64.5,-20.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17135 components: - type: Transform pos: -64.5,-18.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17136 components: - type: Transform pos: -62.5,-20.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17137 components: - type: Transform pos: -62.5,-18.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17144 components: - type: Transform pos: -48.5,-21.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17160 components: - type: Transform pos: -65.5,-24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17161 components: - type: Transform pos: -66.5,-24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17162 components: - type: Transform pos: -66.5,-25.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17163 components: - type: Transform pos: -67.5,-25.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17164 components: - type: Transform pos: -67.5,-26.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17165 components: - type: Transform pos: -67.5,-27.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17166 components: - type: Transform pos: -67.5,-28.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17167 components: - type: Transform pos: -67.5,-29.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17168 components: - type: Transform pos: -68.5,-29.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17169 components: - type: Transform pos: -68.5,-30.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17170 components: - type: Transform pos: -69.5,-30.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17171 components: - type: Transform pos: -69.5,-31.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17172 components: - type: Transform pos: -69.5,-32.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17173 components: - type: Transform pos: -70.5,-32.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17174 components: - type: Transform pos: -70.5,-33.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17175 components: - type: Transform pos: -71.5,-33.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17176 components: - type: Transform pos: -71.5,-34.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17177 components: - type: Transform pos: -73.5,-35.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17178 components: - type: Transform pos: -73.5,-34.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17179 components: - type: Transform pos: -72.5,-34.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17180 components: - type: Transform pos: -74.5,-34.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17181 components: - type: Transform pos: -75.5,-34.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17182 components: - type: Transform pos: -48.5,-48.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17183 components: - type: Transform pos: -48.5,-47.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17184 components: - type: Transform pos: -48.5,-46.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17185 components: - type: Transform pos: -48.5,-45.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17186 components: - type: Transform pos: -48.5,-44.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17187 components: - type: Transform pos: -48.5,-43.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17188 components: - type: Transform pos: -48.5,-42.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17189 components: - type: Transform pos: -48.5,-41.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17190 components: - type: Transform pos: -48.5,-40.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17191 components: - type: Transform pos: -49.5,-40.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17192 components: - type: Transform pos: -50.5,-40.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17193 components: - type: Transform pos: -52.5,-40.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17194 components: - type: Transform pos: -50.5,-38.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17195 components: - type: Transform pos: -51.5,-38.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17196 components: - type: Transform pos: -51.5,-37.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17197 components: - type: Transform pos: -51.5,-36.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17198 components: - type: Transform pos: -51.5,-35.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17199 components: - type: Transform pos: -52.5,-35.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17200 components: - type: Transform pos: -52.5,-34.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17201 components: - type: Transform pos: -52.5,-33.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17202 components: - type: Transform pos: -53.5,-33.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17203 components: - type: Transform pos: -53.5,-32.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17204 components: - type: Transform pos: -54.5,-32.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17205 components: - type: Transform pos: -54.5,-31.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17206 components: - type: Transform pos: -54.5,-30.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17207 components: - type: Transform pos: -55.5,-30.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17208 components: - type: Transform pos: -55.5,-29.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17209 components: - type: Transform pos: -56.5,-29.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17210 components: - type: Transform pos: -56.5,-28.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17211 components: - type: Transform pos: -56.5,-27.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17212 components: - type: Transform pos: -56.5,-26.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17213 components: - type: Transform pos: -50.5,-21.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17214 components: - type: Transform pos: -51.5,-21.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17215 components: - type: Transform pos: -52.5,-21.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17216 components: - type: Transform pos: -53.5,-21.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17217 components: - type: Transform pos: -54.5,-21.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17218 components: - type: Transform pos: -54.5,-25.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17219 components: - type: Transform pos: -53.5,-25.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17220 components: - type: Transform pos: -52.5,-25.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17221 components: - type: Transform pos: -51.5,-25.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17222 components: - type: Transform pos: -50.5,-25.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17223 components: - type: Transform pos: -49.5,-25.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17224 components: - type: Transform pos: -48.5,-25.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17344 components: - type: Transform pos: -48.5,-49.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17354 components: - type: Transform pos: -52.5,-45.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17375 components: - type: Transform pos: -70.5,-46.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17376 components: - type: Transform pos: -71.5,-46.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17377 components: - type: Transform pos: -72.5,-46.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17378 components: - type: Transform pos: -73.5,-46.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17379 components: - type: Transform pos: -73.5,-44.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17380 components: - type: Transform pos: -71.5,-44.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17381 components: - type: Transform pos: -70.5,-44.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17382 components: - type: Transform pos: -72.5,-44.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17574 components: - type: Transform pos: -83.5,-42.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17575 components: - type: Transform pos: -85.5,-45.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17576 components: - type: Transform pos: -83.5,-48.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17577 components: - type: Transform pos: -79.5,-37.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17593 components: - type: Transform pos: -3.5,-44.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18006 components: - type: Transform pos: -35.5,-38.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18007 components: - type: Transform pos: -36.5,-38.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18013 components: - type: Transform pos: -37.5,-38.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18014 components: - type: Transform pos: -35.5,-40.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18015 components: - type: Transform pos: -37.5,-40.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18017 components: - type: Transform pos: -36.5,-40.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18068 components: - type: Transform pos: -36.5,-36.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18137 components: - type: Transform pos: -82.5,-61.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18138 components: - type: Transform pos: -83.5,-61.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18139 components: - type: Transform pos: -84.5,-61.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18140 components: - type: Transform pos: -85.5,-61.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18141 components: - type: Transform pos: -85.5,-59.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18142 components: - type: Transform pos: -76.5,-67.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18143 components: - type: Transform pos: -76.5,-66.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18144 components: - type: Transform pos: -77.5,-66.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18145 components: - type: Transform pos: -78.5,-66.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18146 components: - type: Transform pos: -78.5,-65.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18147 components: - type: Transform pos: -73.5,-67.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18148 components: - type: Transform pos: -73.5,-66.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18149 components: - type: Transform pos: -72.5,-66.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18150 components: - type: Transform pos: -71.5,-66.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18151 components: - type: Transform pos: -71.5,-65.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18152 components: - type: Transform pos: -75.5,-67.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18153 components: - type: Transform pos: -74.5,-67.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18343 components: - type: Transform pos: -52.5,-38.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18372 components: - type: Transform pos: -63.5,-66.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18763 components: - type: Transform pos: -85.5,-46.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18764 components: - type: Transform pos: -85.5,-44.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 19066 components: - type: Transform pos: -51.5,-40.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 19373 components: - type: Transform pos: -24.5,-45.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 19632 components: - type: Transform pos: -23.5,-34.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 19633 components: - type: Transform pos: -22.5,-34.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 19634 components: - type: Transform pos: -26.5,-34.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 19635 components: - type: Transform pos: -25.5,-34.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 19877 components: - type: Transform pos: 4.5,69.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 19878 components: - type: Transform pos: 4.5,70.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 19879 components: - type: Transform pos: 4.5,71.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 19903 components: - type: Transform pos: -5.5,69.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 19904 components: - type: Transform pos: -5.5,70.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 19905 components: - type: Transform pos: -5.5,71.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 19906 components: - type: Transform pos: -4.5,62.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 19907 components: - type: Transform pos: 3.5,62.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 19932 components: - type: Transform pos: -1.5,69.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 19933 components: - type: Transform pos: -1.5,70.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 19934 components: - type: Transform pos: -1.5,71.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 19935 components: - type: Transform pos: 0.5,69.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 19936 components: - type: Transform pos: 0.5,70.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 19937 components: - type: Transform pos: 0.5,71.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 19972 components: - type: Transform pos: -2.5,76.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 19973 components: - type: Transform pos: -1.5,76.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 19974 components: - type: Transform pos: 0.5,76.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 19975 components: - type: Transform pos: 1.5,76.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20098 components: - type: Transform pos: -35.5,-26.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20276 components: - type: Transform pos: -31.5,-26.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20376 components: - type: Transform pos: -37.5,61.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20443 components: - type: Transform pos: -45.5,-28.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20712 components: - type: Transform pos: 0.5,37.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20971 components: - type: Transform pos: 7.5,22.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20976 components: - type: Transform pos: 7.5,21.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21052 components: - type: Transform pos: -33.5,-45.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21055 components: - type: Transform pos: -38.5,-47.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21056 components: - type: Transform pos: -38.5,-48.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21057 components: - type: Transform pos: -37.5,-48.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21058 components: - type: Transform pos: -36.5,-48.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21059 components: - type: Transform pos: -35.5,-48.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21063 components: - type: Transform pos: -37.5,-44.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21064 components: - type: Transform pos: -36.5,-44.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21065 components: - type: Transform pos: -35.5,-44.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21068 components: - type: Transform pos: -33.5,-47.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21075 components: - type: Transform pos: -31.5,-48.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21120 components: - type: Transform pos: -58.5,53.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21121 components: - type: Transform pos: -59.5,53.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21122 components: - type: Transform pos: -59.5,52.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21123 components: - type: Transform pos: -59.5,51.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21209 components: - type: Transform pos: -31.5,-25.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21509 components: - type: Transform pos: 37.5,36.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21510 components: - type: Transform pos: 38.5,36.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21512 components: - type: Transform pos: 40.5,36.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21513 components: - type: Transform pos: 41.5,36.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21514 components: - type: Transform pos: 42.5,36.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21515 components: - type: Transform pos: 43.5,36.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21591 components: - type: Transform pos: -43.5,-28.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21593 components: - type: Transform pos: -41.5,-28.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 22136 components: - type: Transform pos: 32.5,40.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 22366 components: - type: Transform pos: 18.5,-40.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 22367 components: - type: Transform pos: 19.5,-40.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 22368 components: - type: Transform pos: 20.5,-40.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 22369 components: - type: Transform pos: 20.5,-38.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 22370 components: - type: Transform pos: 18.5,-38.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 22878 components: - type: Transform pos: -6.5,-48.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 22886 components: - type: Transform pos: -4.5,-46.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 22887 components: - type: Transform pos: -5.5,-46.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 22976 components: - type: Transform pos: -6.5,-46.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 22977 components: - type: Transform pos: -7.5,-46.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 22978 components: - type: Transform pos: -8.5,-46.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 23198 components: - type: Transform pos: 44.5,47.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - proto: ResearchAndDevelopmentServer entities: - uid: 12746 @@ -122191,85 +120653,61 @@ entities: - type: Transform pos: -33.5,8.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 543 components: - type: Transform pos: -33.5,7.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13728 components: - type: Transform pos: 23.5,52.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13729 components: - type: Transform pos: 24.5,52.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13730 components: - type: Transform pos: 25.5,52.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13731 components: - type: Transform pos: 26.5,52.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13732 components: - type: Transform pos: 27.5,52.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13733 components: - type: Transform pos: 27.5,54.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13734 components: - type: Transform pos: 26.5,54.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13735 components: - type: Transform pos: 25.5,54.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13736 components: - type: Transform pos: 24.5,54.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13737 components: - type: Transform pos: 23.5,54.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - proto: ShuttersNormalOpen entities: - uid: 390 @@ -122278,503 +120716,365 @@ entities: rot: 1.5707963267948966 rad pos: -10.5,11.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 391 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,9.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 392 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,10.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 393 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,7.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 394 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,8.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 395 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,6.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 899 components: - type: Transform pos: 29.5,17.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 3176 components: - type: Transform pos: -42.5,38.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 3177 components: - type: Transform pos: -40.5,38.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 3184 components: - type: Transform pos: -44.5,38.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 3185 components: - type: Transform pos: -43.5,38.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 4438 components: - type: Transform pos: 27.5,17.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5698 components: - type: Transform pos: -39.5,38.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5700 components: - type: Transform pos: -38.5,38.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5738 components: - type: Transform pos: -14.5,36.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5741 components: - type: Transform pos: -15.5,36.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6785 components: - type: Transform pos: -8.5,-5.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6797 components: - type: Transform pos: -9.5,-5.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6871 components: - type: Transform pos: -23.5,-17.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6882 components: - type: Transform pos: -28.5,0.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 7164 components: - type: Transform pos: -27.5,-21.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 7829 components: - type: Transform pos: -23.5,-21.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 7876 components: - type: Transform pos: -27.5,-17.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 7971 components: - type: Transform pos: -7.5,-5.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 7972 components: - type: Transform pos: -5.5,-5.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 7991 components: - type: Transform pos: -6.5,-5.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 7992 components: - type: Transform pos: -10.5,-6.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9238 components: - type: Transform pos: -4.5,12.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9239 components: - type: Transform pos: -3.5,12.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 11002 components: - type: Transform rot: 1.5707963267948966 rad pos: -40.5,32.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 11006 components: - type: Transform pos: -42.5,34.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 11010 components: - type: Transform rot: 1.5707963267948966 rad pos: -40.5,31.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 11716 components: - type: Transform pos: 26.5,-0.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 11822 components: - type: Transform pos: 24.5,-0.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 11823 components: - type: Transform pos: 25.5,-0.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 12625 components: - type: Transform pos: -5.5,12.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 12810 components: - type: Transform pos: 24.5,15.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 14340 components: - type: Transform pos: 27.5,12.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 14352 components: - type: Transform pos: 28.5,12.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 14355 components: - type: Transform pos: 26.5,12.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 14530 components: - type: Transform rot: -1.5707963267948966 rad pos: 15.5,39.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 14844 components: - type: Transform rot: -1.5707963267948966 rad pos: 15.5,34.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 15075 components: - type: Transform rot: -1.5707963267948966 rad pos: 15.5,40.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 15213 components: - type: Transform rot: -1.5707963267948966 rad pos: 15.5,36.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 15986 components: - type: Transform rot: -1.5707963267948966 rad pos: 15.5,33.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 15987 components: - type: Transform rot: -1.5707963267948966 rad pos: 15.5,37.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 19418 components: - type: Transform pos: 4.5,5.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 19419 components: - type: Transform pos: 5.5,5.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 19795 components: - type: Transform rot: 1.5707963267948966 rad pos: 7.5,8.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20051 components: - type: Transform pos: -1.5,5.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20052 components: - type: Transform pos: 1.5,5.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20053 components: - type: Transform pos: 0.5,5.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20054 components: - type: Transform rot: 1.5707963267948966 rad pos: 7.5,7.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20061 components: - type: Transform pos: -9.5,5.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20062 components: - type: Transform pos: -3.5,5.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20063 components: - type: Transform pos: -5.5,5.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20064 components: - type: Transform pos: -2.5,5.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20065 components: - type: Transform rot: -1.5707963267948966 rad pos: 16.5,16.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20066 components: - type: Transform rot: -1.5707963267948966 rad pos: 16.5,14.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20394 components: - type: Transform pos: -3.5,36.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20395 components: - type: Transform pos: -4.5,36.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20445 components: - type: Transform pos: -2.5,12.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20447 components: - type: Transform pos: 0.5,12.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20448 components: - type: Transform pos: -0.5,12.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20449 components: - type: Transform pos: -1.5,12.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21333 components: - type: Transform rot: 1.5707963267948966 rad pos: -40.5,30.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21722 components: - type: Transform pos: -0.5,28.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21758 components: - type: Transform rot: -1.5707963267948966 rad pos: 16.5,15.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 22424 components: - type: Transform pos: 4.5,28.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - proto: ShuttersRadiationOpen entities: - uid: 9408 @@ -122782,78 +121082,56 @@ entities: - type: Transform pos: -16.5,-49.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9410 components: - type: Transform pos: -18.5,-45.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9411 components: - type: Transform pos: -16.5,-45.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9415 components: - type: Transform pos: -18.5,-49.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 23813 components: - type: Transform pos: -20.5,-57.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 23814 components: - type: Transform pos: -19.5,-57.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 23815 components: - type: Transform pos: -18.5,-57.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 23816 components: - type: Transform pos: -17.5,-57.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 23817 components: - type: Transform pos: -16.5,-57.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 23818 components: - type: Transform pos: -15.5,-57.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 23819 components: - type: Transform pos: -14.5,-57.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - proto: SignAi entities: - uid: 20306 @@ -127354,6 +125632,13 @@ entities: - type: Transform pos: -22.5,50.5 parent: 30 +- proto: SpawnPointHeadOfSecurityWeapon + entities: + - uid: 1999 + components: + - type: Transform + pos: -22.5,53.5 + parent: 30 - proto: SpawnPointJanitor entities: - uid: 1388 @@ -127785,6 +126070,13 @@ entities: - type: Transform pos: -43.5,47.5 parent: 30 +- proto: SpawnPointWardenWeapon + entities: + - uid: 2000 + components: + - type: Transform + pos: -37.5,48.5 + parent: 30 - proto: SpawnVendingMachineRestockFood entities: - uid: 22423 @@ -133444,134 +131736,96 @@ entities: - type: Transform pos: -30.5,24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 290 components: - type: Transform pos: -32.5,24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 291 components: - type: Transform pos: -33.5,23.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 292 components: - type: Transform pos: -33.5,21.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 7235 components: - type: Transform pos: -19.5,-14.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 7590 components: - type: Transform pos: -15.5,-16.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 7597 components: - type: Transform pos: -19.5,-16.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 7877 components: - type: Transform pos: -15.5,-14.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17391 components: - type: Transform pos: -67.5,-41.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18697 components: - type: Transform pos: -47.5,-24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18698 components: - type: Transform pos: -55.5,-22.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18699 components: - type: Transform pos: -55.5,-24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18700 components: - type: Transform pos: -47.5,-22.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 19566 components: - type: Transform pos: 9.5,-12.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 19567 components: - type: Transform pos: 8.5,-12.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21470 components: - type: Transform pos: 7.5,-12.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21471 components: - type: Transform pos: 10.5,-15.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21472 components: - type: Transform pos: 10.5,-14.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 22704 components: - type: Transform pos: -10.5,15.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - proto: ToiletDirtyWater entities: - uid: 754 @@ -149855,13 +148109,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: WeaponSubMachineGunWt550 - entities: - - uid: 2000 - components: - - type: Transform - pos: -22.590364,53.546127 - parent: 30 - proto: Welder entities: - uid: 1633 @@ -149971,78 +148218,58 @@ entities: - type: Transform pos: -20.5,8.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1918 components: - type: Transform rot: 3.141592653589793 rad pos: -50.5,61.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 2598 components: - type: Transform rot: 3.141592653589793 rad pos: -40.5,41.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 4813 components: - type: Transform rot: 3.141592653589793 rad pos: -42.5,41.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5066 components: - type: Transform rot: -1.5707963267948966 rad pos: -19.5,34.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5410 components: - type: Transform pos: 4.5,30.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 11038 components: - type: Transform pos: 4.5,-4.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20484 components: - type: Transform rot: 1.5707963267948966 rad pos: -35.5,-35.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20959 components: - type: Transform rot: 3.141592653589793 rad pos: 18.5,24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 22199 components: - type: Transform rot: -1.5707963267948966 rad pos: -74.5,-55.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - proto: WindoorCargoLocked entities: - uid: 402 @@ -150051,16 +148278,12 @@ entities: rot: -1.5707963267948966 rad pos: 19.5,-3.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21788 components: - type: Transform rot: 3.141592653589793 rad pos: 31.5,-8.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - proto: WindoorHydroponicsLocked entities: - uid: 322 @@ -150069,8 +148292,6 @@ entities: rot: 3.141592653589793 rad pos: -20.5,8.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - proto: WindoorKitchenHydroponicsLocked entities: - uid: 20701 @@ -150079,8 +148300,6 @@ entities: rot: 1.5707963267948966 rad pos: -18.5,10.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - proto: WindoorSecure entities: - uid: 15983 @@ -150089,16 +148308,12 @@ entities: rot: 3.141592653589793 rad pos: 52.5,20.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 15984 components: - type: Transform rot: 3.141592653589793 rad pos: 51.5,20.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - proto: WindoorSecureArmoryLocked entities: - uid: 1753 @@ -150106,37 +148321,27 @@ entities: - type: Transform pos: -40.5,56.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 2006 components: - type: Transform pos: -38.5,56.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 2216 components: - type: Transform pos: -39.5,56.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 3180 components: - type: Transform pos: -41.5,56.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 4450 components: - type: Transform rot: 3.141592653589793 rad pos: -42.5,45.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - proto: WindoorSecureAtmosphericsLocked entities: - uid: 8394 @@ -150145,24 +148350,18 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,-27.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 11232 components: - type: Transform rot: 1.5707963267948966 rad pos: 3.5,-29.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 12003 components: - type: Transform rot: -1.5707963267948966 rad pos: 4.5,-28.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - proto: WindoorSecureBrigLocked entities: - uid: 2013 @@ -150170,8 +148369,6 @@ entities: - type: Transform pos: -42.5,45.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - proto: WindoorSecureCargoLocked entities: - uid: 8464 @@ -150180,24 +148377,18 @@ entities: rot: 1.5707963267948966 rad pos: 18.5,-1.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8471 components: - type: Transform rot: 3.141592653589793 rad pos: 16.5,-0.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8472 components: - type: Transform rot: 3.141592653589793 rad pos: 17.5,-0.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - proto: WindoorSecureChemistryLocked entities: - uid: 6674 @@ -150205,31 +148396,23 @@ entities: - type: Transform pos: -6.5,-5.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6677 components: - type: Transform pos: -8.5,-5.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9054 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,-9.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9672 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,-8.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - proto: WindoorSecureCommandLocked entities: - uid: 20088 @@ -150238,64 +148421,48 @@ entities: rot: 3.141592653589793 rad pos: 10.5,42.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20649 components: - type: Transform rot: 3.141592653589793 rad pos: -13.5,16.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21680 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,62.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21681 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,63.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21682 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,64.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21750 components: - type: Transform rot: 3.141592653589793 rad pos: 4.5,20.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 22223 components: - type: Transform rot: -1.5707963267948966 rad pos: 1.5,75.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 22232 components: - type: Transform rot: 1.5707963267948966 rad pos: -2.5,75.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - proto: WindoorSecureEngineeringLocked entities: - uid: 6455 @@ -150303,22 +148470,16 @@ entities: - type: Transform pos: -1.5,-31.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9162 components: - type: Transform pos: -2.5,-31.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21294 components: - type: Transform pos: -24.5,42.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - proto: WindoorSecureHeadOfPersonnelLocked entities: - uid: 5409 @@ -150327,8 +148488,6 @@ entities: rot: 3.141592653589793 rad pos: 4.5,30.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - proto: WindoorSecureMedicalLocked entities: - uid: 7093 @@ -150337,16 +148496,12 @@ entities: rot: -1.5707963267948966 rad pos: -13.5,-5.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8047 components: - type: Transform rot: -1.5707963267948966 rad pos: -13.5,-4.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - proto: WindoorSecureScienceLocked entities: - uid: 6488 @@ -150354,53 +148509,39 @@ entities: - type: Transform pos: 18.5,24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20067 components: - type: Transform rot: -1.5707963267948966 rad pos: 16.5,16.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20069 components: - type: Transform rot: -1.5707963267948966 rad pos: 16.5,14.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21708 components: - type: Transform pos: 31.5,18.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21711 components: - type: Transform pos: 33.5,18.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21759 components: - type: Transform rot: -1.5707963267948966 rad pos: 16.5,15.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 22235 components: - type: Transform pos: 32.5,18.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - proto: WindoorSecureSecurityLocked entities: - uid: 1052 @@ -150408,56 +148549,42 @@ entities: - type: Transform pos: -40.5,12.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1059 components: - type: Transform rot: 3.141592653589793 rad pos: -40.5,8.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1746 components: - type: Transform rot: 1.5707963267948966 rad pos: -33.5,40.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1747 components: - type: Transform rot: 1.5707963267948966 rad pos: -33.5,39.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1748 components: - type: Transform rot: 3.141592653589793 rad pos: -32.5,38.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1749 components: - type: Transform rot: 3.141592653589793 rad pos: -31.5,38.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1750 components: - type: Transform rot: 3.141592653589793 rad pos: -30.5,38.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - proto: WindoorSecureServiceLocked entities: - uid: 11458 @@ -150466,8 +148593,6 @@ entities: rot: 1.5707963267948966 rad pos: -65.5,-62.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - proto: Window entities: - uid: 5 @@ -150475,575 +148600,411 @@ entities: - type: Transform pos: -0.5,-1.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6 components: - type: Transform pos: -0.5,-4.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 7 components: - type: Transform pos: -4.5,-4.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8 components: - type: Transform pos: -4.5,-1.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 57 components: - type: Transform pos: 1.5,-0.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 58 components: - type: Transform pos: 0.5,-0.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 59 components: - type: Transform pos: -5.5,-0.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 60 components: - type: Transform pos: -6.5,-0.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 61 components: - type: Transform pos: -7.5,0.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 62 components: - type: Transform pos: -11.5,0.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 63 components: - type: Transform pos: -5.5,5.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 65 components: - type: Transform pos: -9.5,5.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 80 components: - type: Transform pos: 2.5,0.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 81 components: - type: Transform pos: 6.5,0.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 84 components: - type: Transform pos: 0.5,5.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 85 components: - type: Transform pos: 1.5,5.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 293 components: - type: Transform pos: -28.5,24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 294 components: - type: Transform pos: -27.5,24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 296 components: - type: Transform pos: -7.5,24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 297 components: - type: Transform pos: -8.5,24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 298 components: - type: Transform pos: -9.5,24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 299 components: - type: Transform pos: -10.5,24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 300 components: - type: Transform pos: -11.5,24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1000 components: - type: Transform pos: -43.5,0.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1001 components: - type: Transform pos: -43.5,3.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1002 components: - type: Transform pos: -37.5,0.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1003 components: - type: Transform pos: -37.5,3.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1004 components: - type: Transform pos: -39.5,4.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1005 components: - type: Transform pos: -41.5,4.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1267 components: - type: Transform pos: -54.5,22.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1271 components: - type: Transform pos: -52.5,22.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1272 components: - type: Transform pos: -52.5,14.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1273 components: - type: Transform pos: -54.5,14.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1354 components: - type: Transform pos: -32.5,28.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1365 components: - type: Transform pos: -38.5,34.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1367 components: - type: Transform pos: -37.5,32.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1368 components: - type: Transform pos: -37.5,31.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1369 components: - type: Transform pos: -37.5,30.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1595 components: - type: Transform pos: -30.5,28.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1596 components: - type: Transform pos: -26.5,28.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1597 components: - type: Transform pos: -24.5,28.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 2239 components: - type: Transform pos: -50.5,57.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 2348 components: - type: Transform pos: -50.5,51.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 2366 components: - type: Transform pos: -50.5,55.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 4576 components: - type: Transform pos: -50.5,53.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5017 components: - type: Transform pos: -23.5,36.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6542 components: - type: Transform pos: 28.5,34.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6543 components: - type: Transform pos: 28.5,35.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6544 components: - type: Transform pos: 28.5,39.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6545 components: - type: Transform pos: 28.5,38.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6625 components: - type: Transform pos: 8.5,0.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 6628 components: - type: Transform pos: -13.5,0.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8329 components: - type: Transform pos: 10.5,-1.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8334 components: - type: Transform pos: 10.5,-6.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9837 components: - type: Transform pos: -39.5,34.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13579 components: - type: Transform pos: 44.5,35.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17716 components: - type: Transform pos: -69.5,-52.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17721 components: - type: Transform pos: -65.5,-58.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17722 components: - type: Transform pos: -64.5,-58.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17727 components: - type: Transform pos: -66.5,-57.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17733 components: - type: Transform pos: -69.5,-56.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17735 components: - type: Transform pos: -66.5,-56.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17739 components: - type: Transform pos: -66.5,-52.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17758 components: - type: Transform pos: -66.5,-51.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17759 components: - type: Transform pos: -65.5,-50.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17760 components: - type: Transform pos: -64.5,-50.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17761 components: - type: Transform pos: -62.5,-50.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17762 components: - type: Transform pos: -61.5,-50.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17763 components: - type: Transform pos: -59.5,-50.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17764 components: - type: Transform pos: -58.5,-50.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17765 components: - type: Transform pos: -57.5,-51.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17766 components: - type: Transform pos: -57.5,-52.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17767 components: - type: Transform pos: -57.5,-56.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17768 components: - type: Transform pos: -57.5,-57.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17769 components: - type: Transform pos: -58.5,-58.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17770 components: - type: Transform pos: -59.5,-58.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17771 components: - type: Transform pos: -61.5,-58.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17772 components: - type: Transform pos: -62.5,-58.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20964 components: - type: Transform pos: 44.5,33.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21473 components: - type: Transform pos: 9.5,-17.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21474 components: - type: Transform pos: 7.5,-17.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21511 components: - type: Transform pos: 34.5,34.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - proto: WindowDirectional entities: - uid: 7523 @@ -151052,92 +149013,68 @@ entities: rot: -1.5707963267948966 rad pos: 6.5,-6.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 7524 components: - type: Transform pos: 3.5,-4.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8307 components: - type: Transform pos: 5.5,-4.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 10093 components: - type: Transform rot: -1.5707963267948966 rad pos: 6.5,-7.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 11346 components: - type: Transform rot: -1.5707963267948966 rad pos: 6.5,-11.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 11411 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,-8.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 11413 components: - type: Transform pos: 2.5,-8.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13610 components: - type: Transform rot: 3.141592653589793 rad pos: 44.5,11.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13633 components: - type: Transform pos: 44.5,15.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 22190 components: - type: Transform rot: -1.5707963267948966 rad pos: 34.5,30.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 22191 components: - type: Transform rot: 1.5707963267948966 rad pos: 33.5,30.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 22200 components: - type: Transform rot: 3.141592653589793 rad pos: -74.5,-55.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - proto: WindowFrostedDirectional entities: - uid: 207 @@ -151146,40 +149083,30 @@ entities: rot: -1.5707963267948966 rad pos: -5.5,23.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 4609 components: - type: Transform rot: -1.5707963267948966 rad pos: -49.5,61.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 4610 components: - type: Transform rot: -1.5707963267948966 rad pos: -49.5,60.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 4611 components: - type: Transform rot: -1.5707963267948966 rad pos: -49.5,59.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 4671 components: - type: Transform rot: -1.5707963267948966 rad pos: -49.5,58.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - proto: WindowReinforcedDirectional entities: - uid: 74 @@ -151187,532 +149114,396 @@ entities: - type: Transform pos: -26.5,4.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 75 components: - type: Transform pos: -28.5,4.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 76 components: - type: Transform pos: -27.5,4.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 519 components: - type: Transform pos: -54.5,17.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1226 components: - type: Transform rot: 1.5707963267948966 rad pos: -52.5,19.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1227 components: - type: Transform rot: 1.5707963267948966 rad pos: -52.5,18.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1229 components: - type: Transform rot: 1.5707963267948966 rad pos: -52.5,17.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1230 components: - type: Transform rot: -1.5707963267948966 rad pos: -54.5,19.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1231 components: - type: Transform rot: -1.5707963267948966 rad pos: -54.5,18.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1232 components: - type: Transform rot: -1.5707963267948966 rad pos: -54.5,17.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1234 components: - type: Transform pos: -53.5,17.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1235 components: - type: Transform pos: -52.5,17.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1236 components: - type: Transform rot: 3.141592653589793 rad pos: -54.5,19.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1237 components: - type: Transform rot: 3.141592653589793 rad pos: -53.5,19.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1274 components: - type: Transform rot: 3.141592653589793 rad pos: -52.5,19.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1911 components: - type: Transform rot: -1.5707963267948966 rad pos: -38.5,58.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1953 components: - type: Transform rot: 1.5707963267948966 rad pos: -38.5,56.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1977 components: - type: Transform rot: 3.141592653589793 rad pos: 43.5,40.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 1987 components: - type: Transform rot: -1.5707963267948966 rad pos: -41.5,56.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 2063 components: - type: Transform rot: -1.5707963267948966 rad pos: -38.5,60.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 2271 components: - type: Transform rot: 3.141592653589793 rad pos: -38.5,41.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 2672 components: - type: Transform rot: 3.141592653589793 rad pos: -41.5,41.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 2679 components: - type: Transform rot: 3.141592653589793 rad pos: -44.5,39.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 3525 components: - type: Transform rot: 3.141592653589793 rad pos: -44.5,41.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 4526 components: - type: Transform rot: 3.141592653589793 rad pos: -43.5,41.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 4612 components: - type: Transform rot: 3.141592653589793 rad pos: -50.5,67.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 4675 components: - type: Transform rot: 3.141592653589793 rad pos: -45.5,67.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 4688 components: - type: Transform rot: 3.141592653589793 rad pos: -49.5,67.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 4700 components: - type: Transform rot: 3.141592653589793 rad pos: -44.5,67.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 4814 components: - type: Transform rot: 3.141592653589793 rad pos: -39.5,41.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5641 components: - type: Transform rot: -1.5707963267948966 rad pos: -17.5,43.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5644 components: - type: Transform rot: -1.5707963267948966 rad pos: -17.5,42.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5827 components: - type: Transform pos: -8.5,41.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5828 components: - type: Transform pos: -9.5,41.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5829 components: - type: Transform pos: -10.5,41.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5834 components: - type: Transform rot: -1.5707963267948966 rad pos: -10.5,41.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5835 components: - type: Transform rot: 3.141592653589793 rad pos: -10.5,41.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5836 components: - type: Transform rot: 3.141592653589793 rad pos: -9.5,41.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5837 components: - type: Transform rot: 3.141592653589793 rad pos: -8.5,41.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 5838 components: - type: Transform rot: 1.5707963267948966 rad pos: -8.5,41.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 7352 components: - type: Transform rot: 1.5707963267948966 rad pos: -19.5,-21.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 7476 components: - type: Transform rot: 1.5707963267948966 rad pos: -19.5,-22.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 7483 components: - type: Transform rot: -1.5707963267948966 rad pos: -19.5,-19.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 7558 components: - type: Transform rot: -1.5707963267948966 rad pos: -19.5,-21.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 7823 components: - type: Transform rot: 1.5707963267948966 rad pos: -19.5,-18.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 7980 components: - type: Transform rot: -1.5707963267948966 rad pos: -19.5,-18.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 7981 components: - type: Transform rot: 1.5707963267948966 rad pos: -19.5,-19.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 7982 components: - type: Transform rot: 3.141592653589793 rad pos: -19.5,-21.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 7990 components: - type: Transform rot: -1.5707963267948966 rad pos: -19.5,-22.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 7994 components: - type: Transform pos: -19.5,-19.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8614 components: - type: Transform pos: -25.5,4.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 8615 components: - type: Transform pos: -24.5,4.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 9960 components: - type: Transform pos: -23.5,4.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 12728 components: - type: Transform rot: 3.141592653589793 rad pos: 20.5,19.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 12774 components: - type: Transform rot: -1.5707963267948966 rad pos: 24.5,9.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 12780 components: - type: Transform rot: -1.5707963267948966 rad pos: 24.5,11.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 12788 components: - type: Transform rot: 1.5707963267948966 rad pos: 20.5,18.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 12792 components: - type: Transform rot: 3.141592653589793 rad pos: 17.5,19.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 12795 components: - type: Transform rot: -1.5707963267948966 rad pos: 24.5,10.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 12881 components: - type: Transform rot: 1.5707963267948966 rad pos: 20.5,19.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 13577 components: - type: Transform rot: 1.5707963267948966 rad pos: 42.5,41.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 14356 components: - type: Transform rot: 3.141592653589793 rad pos: 52.5,23.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 15152 components: - type: Transform rot: -1.5707963267948966 rad pos: 14.5,8.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 15153 components: - type: Transform rot: 1.5707963267948966 rad pos: 16.5,8.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 15981 components: - type: Transform rot: 3.141592653589793 rad pos: 50.5,20.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 15982 components: - type: Transform rot: 3.141592653589793 rad pos: 53.5,20.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 16892 components: - type: Transform rot: 3.141592653589793 rad pos: -44.5,24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 17675 components: - type: Transform rot: 1.5707963267948966 rad pos: -78.5,-38.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18300 components: - type: Transform @@ -151811,459 +149602,341 @@ entities: - type: Transform pos: -69.5,-29.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18312 components: - type: Transform rot: 1.5707963267948966 rad pos: -69.5,-29.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18313 components: - type: Transform pos: -68.5,-28.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18314 components: - type: Transform rot: 1.5707963267948966 rad pos: -68.5,-28.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18315 components: - type: Transform rot: 1.5707963267948966 rad pos: -68.5,-27.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18316 components: - type: Transform rot: 1.5707963267948966 rad pos: -68.5,-26.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18317 components: - type: Transform rot: 1.5707963267948966 rad pos: -68.5,-25.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18318 components: - type: Transform pos: -67.5,-24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18319 components: - type: Transform rot: 1.5707963267948966 rad pos: -67.5,-24.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18320 components: - type: Transform pos: -66.5,-23.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18321 components: - type: Transform pos: -65.5,-23.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18322 components: - type: Transform rot: -1.5707963267948966 rad pos: -55.5,-26.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18323 components: - type: Transform rot: -1.5707963267948966 rad pos: -55.5,-27.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18324 components: - type: Transform rot: -1.5707963267948966 rad pos: -55.5,-28.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18325 components: - type: Transform pos: -55.5,-28.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18326 components: - type: Transform rot: -1.5707963267948966 rad pos: -54.5,-29.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18327 components: - type: Transform pos: -54.5,-29.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18328 components: - type: Transform pos: -53.5,-31.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18329 components: - type: Transform rot: -1.5707963267948966 rad pos: -53.5,-31.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18330 components: - type: Transform rot: -1.5707963267948966 rad pos: -53.5,-30.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18331 components: - type: Transform rot: -1.5707963267948966 rad pos: -52.5,-32.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18332 components: - type: Transform rot: -1.5707963267948966 rad pos: -51.5,-34.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18333 components: - type: Transform rot: -1.5707963267948966 rad pos: -51.5,-33.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18334 components: - type: Transform rot: -1.5707963267948966 rad pos: -50.5,-37.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18335 components: - type: Transform rot: -1.5707963267948966 rad pos: -50.5,-36.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18336 components: - type: Transform rot: -1.5707963267948966 rad pos: -50.5,-35.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18337 components: - type: Transform pos: -51.5,-34.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18338 components: - type: Transform pos: -52.5,-32.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18339 components: - type: Transform pos: -50.5,-37.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18341 components: - type: Transform rot: -1.5707963267948966 rad pos: -49.5,-38.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18344 components: - type: Transform rot: -1.5707963267948966 rad pos: -47.5,-40.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18345 components: - type: Transform rot: -1.5707963267948966 rad pos: -47.5,-49.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18346 components: - type: Transform rot: -1.5707963267948966 rad pos: -47.5,-48.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18347 components: - type: Transform rot: -1.5707963267948966 rad pos: -47.5,-47.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18348 components: - type: Transform rot: -1.5707963267948966 rad pos: -47.5,-46.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18349 components: - type: Transform rot: -1.5707963267948966 rad pos: -47.5,-45.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18350 components: - type: Transform rot: -1.5707963267948966 rad pos: -47.5,-44.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18351 components: - type: Transform rot: -1.5707963267948966 rad pos: -47.5,-43.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18352 components: - type: Transform rot: -1.5707963267948966 rad pos: -47.5,-42.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 18353 components: - type: Transform rot: -1.5707963267948966 rad pos: -47.5,-41.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20093 components: - type: Transform pos: 1.5,75.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20138 components: - type: Transform rot: 3.141592653589793 rad pos: 9.5,42.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20272 components: - type: Transform rot: 3.141592653589793 rad pos: 11.5,42.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20278 components: - type: Transform rot: -1.5707963267948966 rad pos: 4.5,20.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20477 components: - type: Transform rot: 3.141592653589793 rad pos: -38.5,-32.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20478 components: - type: Transform rot: 3.141592653589793 rad pos: -37.5,-32.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20479 components: - type: Transform rot: 3.141592653589793 rad pos: -36.5,-32.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20480 components: - type: Transform rot: 3.141592653589793 rad pos: -35.5,-32.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20481 components: - type: Transform rot: 1.5707963267948966 rad pos: -35.5,-32.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20482 components: - type: Transform rot: 1.5707963267948966 rad pos: -35.5,-33.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20483 components: - type: Transform rot: 1.5707963267948966 rad pos: -35.5,-34.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20615 components: - type: Transform rot: -1.5707963267948966 rad pos: -23.5,41.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20748 components: - type: Transform rot: -1.5707963267948966 rad pos: -17.5,44.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 20750 components: - type: Transform rot: 1.5707963267948966 rad pos: -18.5,44.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21239 components: - type: Transform pos: -2.5,75.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21745 components: - type: Transform rot: 1.5707963267948966 rad pos: 4.5,20.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 21746 components: - type: Transform pos: 4.5,20.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 22458 components: - type: Transform rot: 1.5707963267948966 rad pos: -18.5,43.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - uid: 22459 components: - type: Transform rot: 1.5707963267948966 rad pos: -18.5,42.5 parent: 30 - - type: DeltaPressure - gridUid: 30 - proto: Wirecutter entities: - uid: 21096 From 0eef03dd17e63a961b13ec565bc3918f80506e93 Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Tue, 4 Nov 2025 13:13:49 -0700 Subject: [PATCH 104/121] oasis update (#41293) --- Resources/Maps/oasis.yml | 2236 +------------------------------------- 1 file changed, 24 insertions(+), 2212 deletions(-) diff --git a/Resources/Maps/oasis.yml b/Resources/Maps/oasis.yml index d44554e980..cb3c7a4b28 100644 --- a/Resources/Maps/oasis.yml +++ b/Resources/Maps/oasis.yml @@ -1,10 +1,10 @@ meta: format: 7 category: Map - engineVersion: 267.1.0 + engineVersion: 267.3.0 forkId: "" forkVersion: "" - time: 09/30/2025 17:56:42 + time: 11/04/2025 19:50:52 entityCount: 31151 maps: - 1 @@ -15511,7 +15511,7 @@ entities: pos: -22.5,26.5 parent: 2 - type: Door - secondsUntilStateChange: -245166.06 + secondsUntilStateChange: -245202.89 state: Opening - type: DeviceLinkSource lastSignals: @@ -16367,7 +16367,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -343994.7 + secondsUntilStateChange: -344031.53 state: Opening - uid: 6934 components: @@ -16379,7 +16379,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -343997.3 + secondsUntilStateChange: -344034.16 state: Opening - uid: 6935 components: @@ -16391,7 +16391,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -343996.16 + secondsUntilStateChange: -344033 state: Opening - uid: 6936 components: @@ -16402,7 +16402,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -343995.38 + secondsUntilStateChange: -344032.22 state: Opening - proto: AirlockTheatreLocked entities: @@ -100261,7 +100261,7 @@ entities: pos: -13.5,-1.5 parent: 2 - type: Door - secondsUntilStateChange: -335318.7 + secondsUntilStateChange: -335355.53 - type: DeviceNetwork deviceLists: - 18275 @@ -147216,7 +147216,7 @@ entities: pos: 36.5,-35.5 parent: 2 - type: Door - secondsUntilStateChange: -372150.47 + secondsUntilStateChange: -372187.3 state: Opening - uid: 5211 components: @@ -147647,32 +147647,24 @@ entities: rot: 3.141592653589793 rad pos: 39.5,-3.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 28298 components: - type: Transform rot: 3.141592653589793 rad pos: 43.5,14.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 28299 components: - type: Transform rot: 3.141592653589793 rad pos: 53.5,13.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 28300 components: - type: Transform rot: 3.141592653589793 rad pos: 62.5,5.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - proto: IngotGold entities: - uid: 11454 @@ -150006,14 +149998,6 @@ entities: rot: 1.5707963267948966 rad pos: 50.480404,-15.486731 parent: 2 -- proto: MagazinePistolSubMachineGunTopMounted - entities: - - uid: 14233 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 42.740047,-41.364567 - parent: 2 - proto: MagicDiceBag entities: - uid: 7963 @@ -150693,44 +150677,32 @@ entities: - type: Transform pos: 19.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 551 components: - type: Transform pos: 19.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 552 components: - type: Transform pos: 14.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 554 components: - type: Transform pos: 13.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 821 components: - type: Transform pos: 6.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1007 components: - type: Transform rot: 3.141592653589793 rad pos: 2.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: Mirror entities: - uid: 2654 @@ -153569,64 +153541,48 @@ entities: rot: 1.5707963267948966 rad pos: 37.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14238 components: - type: Transform rot: -1.5707963267948966 rad pos: 38.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17222 components: - type: Transform rot: -1.5707963267948966 rad pos: 38.5,-10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17223 components: - type: Transform rot: 1.5707963267948966 rad pos: 37.5,-10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21130 components: - type: Transform rot: 1.5707963267948966 rad pos: 5.5,-9.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 21131 components: - type: Transform rot: 1.5707963267948966 rad pos: 5.5,-11.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 21134 components: - type: Transform rot: 1.5707963267948966 rad pos: 5.5,-10.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 28517 components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,-9.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - proto: PlasmaWindowDirectional entities: - uid: 1302 @@ -153635,86 +153591,64 @@ entities: rot: 3.141592653589793 rad pos: -26.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1303 components: - type: Transform rot: 3.141592653589793 rad pos: -27.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1304 components: - type: Transform rot: 3.141592653589793 rad pos: -28.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1305 components: - type: Transform rot: 3.141592653589793 rad pos: -30.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1306 components: - type: Transform rot: 3.141592653589793 rad pos: -31.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1307 components: - type: Transform pos: -26.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1308 components: - type: Transform pos: -27.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1309 components: - type: Transform rot: 1.5707963267948966 rad pos: -28.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1310 components: - type: Transform rot: 1.5707963267948966 rad pos: -28.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1311 components: - type: Transform rot: 1.5707963267948966 rad pos: -28.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1312 components: - type: Transform rot: 1.5707963267948966 rad pos: -28.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: PlasticFlapsAirtightClear entities: - uid: 345 @@ -162926,703 +162860,517 @@ entities: - type: Transform pos: -23.5,53.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1061 components: - type: Transform rot: -1.5707963267948966 rad pos: 37.5,32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1524 components: - type: Transform rot: -1.5707963267948966 rad pos: 32.5,29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2607 components: - type: Transform rot: -1.5707963267948966 rad pos: 27.5,21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3052 components: - type: Transform pos: 11.5,40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3156 components: - type: Transform rot: 1.5707963267948966 rad pos: 16.5,36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3244 components: - type: Transform rot: 3.141592653589793 rad pos: 35.5,34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3380 components: - type: Transform rot: 3.141592653589793 rad pos: 49.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3536 components: - type: Transform rot: 3.141592653589793 rad pos: 49.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3714 components: - type: Transform pos: 47.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3743 components: - type: Transform pos: 46.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4934 components: - type: Transform pos: -4.5,48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5355 components: - type: Transform rot: 3.141592653589793 rad pos: -1.5,48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5358 components: - type: Transform rot: 3.141592653589793 rad pos: -3.5,48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5373 components: - type: Transform pos: 22.5,24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5439 components: - type: Transform rot: -1.5707963267948966 rad pos: 23.5,24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5502 components: - type: Transform rot: -1.5707963267948966 rad pos: 31.5,34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5503 components: - type: Transform rot: -1.5707963267948966 rad pos: 33.5,34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6476 components: - type: Transform rot: 3.141592653589793 rad pos: 30.5,36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6477 components: - type: Transform rot: 3.141592653589793 rad pos: 30.5,38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6478 components: - type: Transform rot: 3.141592653589793 rad pos: 30.5,40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6488 components: - type: Transform pos: -41.5,38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6539 components: - type: Transform pos: -40.5,38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6540 components: - type: Transform pos: -39.5,38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7164 components: - type: Transform rot: 3.141592653589793 rad pos: 13.5,69.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7223 components: - type: Transform rot: 3.141592653589793 rad pos: 12.5,69.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7225 components: - type: Transform rot: 3.141592653589793 rad pos: 14.5,69.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7560 components: - type: Transform rot: 1.5707963267948966 rad pos: -39.5,42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7632 components: - type: Transform rot: 1.5707963267948966 rad pos: 14.5,44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7633 components: - type: Transform rot: 1.5707963267948966 rad pos: 13.5,44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7634 components: - type: Transform rot: 1.5707963267948966 rad pos: 12.5,44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7635 components: - type: Transform rot: 1.5707963267948966 rad pos: 11.5,43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7637 components: - type: Transform rot: 1.5707963267948966 rad pos: 11.5,42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7644 components: - type: Transform rot: 1.5707963267948966 rad pos: 11.5,41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7688 components: - type: Transform rot: 1.5707963267948966 rad pos: 17.5,38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7694 components: - type: Transform rot: 1.5707963267948966 rad pos: 17.5,34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7759 components: - type: Transform pos: -38.5,39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7827 components: - type: Transform pos: -19.5,53.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8133 components: - type: Transform rot: 1.5707963267948966 rad pos: 18.5,34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8214 components: - type: Transform pos: -17.5,53.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8221 components: - type: Transform pos: -21.5,53.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8360 components: - type: Transform pos: -39.5,25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8508 components: - type: Transform pos: -39.5,23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8509 components: - type: Transform pos: -39.5,21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8510 components: - type: Transform pos: -39.5,19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8511 components: - type: Transform pos: -39.5,17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8512 components: - type: Transform pos: -39.5,13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8513 components: - type: Transform pos: -39.5,11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8843 components: - type: Transform pos: -24.5,55.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9184 components: - type: Transform pos: -20.5,53.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9192 components: - type: Transform pos: -24.5,53.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9206 components: - type: Transform pos: -18.5,53.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9207 components: - type: Transform pos: -22.5,55.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9225 components: - type: Transform pos: -15.5,53.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9361 components: - type: Transform rot: 1.5707963267948966 rad pos: 19.5,38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9364 components: - type: Transform pos: -6.5,48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9407 components: - type: Transform rot: 1.5707963267948966 rad pos: 19.5,34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9586 components: - type: Transform pos: -38.5,40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9587 components: - type: Transform pos: -38.5,41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9592 components: - type: Transform rot: 1.5707963267948966 rad pos: -40.5,42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9593 components: - type: Transform rot: 1.5707963267948966 rad pos: -41.5,42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9868 components: - type: Transform pos: 20.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9872 components: - type: Transform pos: 18.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11542 components: - type: Transform rot: 1.5707963267948966 rad pos: 16.5,42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12757 components: - type: Transform rot: 3.141592653589793 rad pos: 52.5,17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12881 components: - type: Transform rot: 3.141592653589793 rad pos: 58.5,19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13025 components: - type: Transform rot: 3.141592653589793 rad pos: 50.5,17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16673 components: - type: Transform rot: 3.141592653589793 rad pos: 16.5,43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16681 components: - type: Transform rot: 1.5707963267948966 rad pos: 16.5,35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17304 components: - type: Transform pos: 45.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18395 components: - type: Transform rot: 3.141592653589793 rad pos: 49.5,17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18409 components: - type: Transform pos: 58.5,17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18411 components: - type: Transform rot: 3.141592653589793 rad pos: 59.5,17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18633 components: - type: Transform pos: 44.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23599 components: - type: Transform rot: 1.5707963267948966 rad pos: 15.5,44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23647 components: - type: Transform rot: 1.5707963267948966 rad pos: 16.5,37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 28512 components: - type: Transform pos: 6.5,1.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 28513 components: - type: Transform pos: 7.5,1.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 28514 components: - type: Transform pos: 7.5,-2.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 28515 components: - type: Transform pos: 6.5,-2.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 29154 components: - type: Transform rot: 3.141592653589793 rad pos: 52.5,19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 29158 components: - type: Transform rot: 3.141592653589793 rad pos: 58.5,18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 29323 components: - type: Transform pos: 56.5,19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 29325 components: - type: Transform pos: 55.5,19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 29362 components: - type: Transform rot: 3.141592653589793 rad pos: 61.5,17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 29425 components: - type: Transform pos: 54.5,19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 29434 components: - type: Transform rot: 3.141592653589793 rad pos: 52.5,18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 29437 components: - type: Transform rot: 3.141592653589793 rad pos: 51.5,17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 29439 components: - type: Transform rot: 3.141592653589793 rad pos: 60.5,17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 29594 components: - type: Transform pos: 48.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 30627 components: - type: Transform rot: -1.5707963267948966 rad pos: 48.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 30628 components: - type: Transform rot: -1.5707963267948966 rad pos: 48.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 30629 components: - type: Transform rot: -1.5707963267948966 rad pos: 48.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: ReinforcedUraniumWindow entities: - uid: 13028 @@ -163631,48 +163379,36 @@ entities: rot: 3.141592653589793 rad pos: 60.5,22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13038 components: - type: Transform rot: 3.141592653589793 rad pos: 58.5,22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13039 components: - type: Transform rot: 3.141592653589793 rad pos: 52.5,22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13040 components: - type: Transform rot: 3.141592653589793 rad pos: 61.5,22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13060 components: - type: Transform rot: 3.141592653589793 rad pos: 49.5,22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24380 components: - type: Transform rot: 3.141592653589793 rad pos: 50.5,22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: ReinforcedWindow entities: - uid: 127 @@ -163680,4307 +163416,3179 @@ entities: - type: Transform pos: 18.5,7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 128 components: - type: Transform pos: 18.5,8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 246 components: - type: Transform pos: 18.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 247 components: - type: Transform pos: 18.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 248 components: - type: Transform pos: 18.5,5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 249 components: - type: Transform pos: 18.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 263 components: - type: Transform pos: -6.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 264 components: - type: Transform pos: -7.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 265 components: - type: Transform pos: -8.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 266 components: - type: Transform pos: -9.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 267 components: - type: Transform pos: -11.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 268 components: - type: Transform pos: -12.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 269 components: - type: Transform pos: -17.5,-6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 272 components: - type: Transform pos: -17.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 273 components: - type: Transform pos: -17.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 274 components: - type: Transform pos: -17.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 280 components: - type: Transform pos: -2.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 281 components: - type: Transform pos: -3.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 282 components: - type: Transform pos: -4.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 283 components: - type: Transform pos: -13.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 284 components: - type: Transform pos: -16.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 285 components: - type: Transform pos: -14.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 288 components: - type: Transform rot: 3.141592653589793 rad pos: -17.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 289 components: - type: Transform rot: 3.141592653589793 rad pos: -17.5,-2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 290 components: - type: Transform rot: 3.141592653589793 rad pos: -17.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 352 components: - type: Transform rot: 3.141592653589793 rad pos: 38.5,-2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 743 components: - type: Transform rot: 3.141592653589793 rad pos: -27.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1206 components: - type: Transform rot: 3.141592653589793 rad pos: -27.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1207 components: - type: Transform rot: 3.141592653589793 rad pos: -27.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1208 components: - type: Transform rot: 3.141592653589793 rad pos: -27.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1213 components: - type: Transform rot: 3.141592653589793 rad pos: -27.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1214 components: - type: Transform rot: 3.141592653589793 rad pos: -27.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1215 components: - type: Transform rot: 3.141592653589793 rad pos: -27.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1216 components: - type: Transform rot: 3.141592653589793 rad pos: -26.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1217 components: - type: Transform rot: 3.141592653589793 rad pos: -27.5,-10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1218 components: - type: Transform rot: 3.141592653589793 rad pos: -26.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1228 components: - type: Transform rot: 3.141592653589793 rad pos: -30.5,-10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1230 components: - type: Transform rot: 3.141592653589793 rad pos: -30.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1231 components: - type: Transform rot: 3.141592653589793 rad pos: -30.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1232 components: - type: Transform rot: 3.141592653589793 rad pos: -30.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1272 components: - type: Transform rot: 3.141592653589793 rad pos: -31.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1273 components: - type: Transform rot: 3.141592653589793 rad pos: -28.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1386 components: - type: Transform rot: 3.141592653589793 rad pos: -10.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1471 components: - type: Transform rot: -1.5707963267948966 rad pos: -23.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1494 components: - type: Transform rot: -1.5707963267948966 rad pos: -25.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1526 components: - type: Transform rot: -1.5707963267948966 rad pos: -24.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1532 components: - type: Transform rot: -1.5707963267948966 rad pos: -26.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1539 components: - type: Transform rot: -1.5707963267948966 rad pos: -29.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1559 components: - type: Transform rot: -1.5707963267948966 rad pos: -31.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1602 components: - type: Transform rot: 1.5707963267948966 rad pos: 60.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1610 components: - type: Transform pos: -17.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1633 components: - type: Transform rot: -1.5707963267948966 rad pos: -16.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1644 components: - type: Transform rot: 3.141592653589793 rad pos: -18.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1647 components: - type: Transform rot: 3.141592653589793 rad pos: -13.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1668 components: - type: Transform pos: -18.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1881 components: - type: Transform pos: -23.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1882 components: - type: Transform pos: -24.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1883 components: - type: Transform pos: -25.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1884 components: - type: Transform pos: -26.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1885 components: - type: Transform pos: -27.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2263 components: - type: Transform pos: 40.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2348 components: - type: Transform pos: 23.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2351 components: - type: Transform pos: 25.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2425 components: - type: Transform pos: 25.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2426 components: - type: Transform pos: 21.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2427 components: - type: Transform pos: 23.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2429 components: - type: Transform pos: 21.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2460 components: - type: Transform pos: 27.5,12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2461 components: - type: Transform pos: 27.5,15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2465 components: - type: Transform pos: 29.5,17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2466 components: - type: Transform pos: 32.5,17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2592 components: - type: Transform rot: 1.5707963267948966 rad pos: 34.5,15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2593 components: - type: Transform rot: 1.5707963267948966 rad pos: 34.5,12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2610 components: - type: Transform rot: 1.5707963267948966 rad pos: 61.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2611 components: - type: Transform rot: 1.5707963267948966 rad pos: 61.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3088 components: - type: Transform pos: 46.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3204 components: - type: Transform rot: 3.141592653589793 rad pos: 42.5,22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3222 components: - type: Transform rot: 1.5707963267948966 rad pos: 30.5,25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3250 components: - type: Transform rot: 1.5707963267948966 rad pos: 32.5,27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3259 components: - type: Transform rot: 1.5707963267948966 rad pos: 34.5,25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3372 components: - type: Transform rot: 3.141592653589793 rad pos: 46.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3387 components: - type: Transform rot: 3.141592653589793 rad pos: 47.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3878 components: - type: Transform rot: 3.141592653589793 rad pos: 59.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3879 components: - type: Transform rot: 3.141592653589793 rad pos: 60.5,-31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3883 components: - type: Transform rot: 3.141592653589793 rad pos: 59.5,-31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3885 components: - type: Transform rot: 3.141592653589793 rad pos: 59.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3886 components: - type: Transform rot: 3.141592653589793 rad pos: 50.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3889 components: - type: Transform rot: 3.141592653589793 rad pos: 48.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3899 components: - type: Transform rot: 1.5707963267948966 rad pos: 62.5,-2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3903 components: - type: Transform rot: 3.141592653589793 rad pos: 59.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3909 components: - type: Transform rot: 3.141592653589793 rad pos: 47.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3911 components: - type: Transform rot: 3.141592653589793 rad pos: 52.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3912 components: - type: Transform rot: 3.141592653589793 rad pos: 53.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3918 components: - type: Transform rot: 3.141592653589793 rad pos: 60.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3929 components: - type: Transform rot: 1.5707963267948966 rad pos: 43.5,-24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3932 components: - type: Transform rot: 1.5707963267948966 rad pos: 43.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3942 components: - type: Transform rot: 3.141592653589793 rad pos: 38.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3979 components: - type: Transform rot: 1.5707963267948966 rad pos: 29.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3987 components: - type: Transform rot: 1.5707963267948966 rad pos: 40.5,24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4062 components: - type: Transform rot: 1.5707963267948966 rad pos: 32.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4085 components: - type: Transform rot: 1.5707963267948966 rad pos: 34.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4086 components: - type: Transform rot: 1.5707963267948966 rad pos: 36.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4088 components: - type: Transform rot: 1.5707963267948966 rad pos: 37.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4090 components: - type: Transform rot: 1.5707963267948966 rad pos: 32.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4091 components: - type: Transform rot: 1.5707963267948966 rad pos: 31.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4093 components: - type: Transform rot: -1.5707963267948966 rad pos: 58.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4094 components: - type: Transform rot: -1.5707963267948966 rad pos: 59.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4098 components: - type: Transform rot: -1.5707963267948966 rad pos: 61.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4099 components: - type: Transform rot: -1.5707963267948966 rad pos: 61.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4110 components: - type: Transform rot: -1.5707963267948966 rad pos: 57.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4111 components: - type: Transform rot: -1.5707963267948966 rad pos: 56.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4112 components: - type: Transform rot: -1.5707963267948966 rad pos: 55.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4113 components: - type: Transform rot: -1.5707963267948966 rad pos: 54.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4114 components: - type: Transform rot: -1.5707963267948966 rad pos: 53.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4115 components: - type: Transform rot: -1.5707963267948966 rad pos: 52.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4116 components: - type: Transform rot: -1.5707963267948966 rad pos: 51.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4244 components: - type: Transform rot: 1.5707963267948966 rad pos: 39.5,-32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4307 components: - type: Transform rot: 1.5707963267948966 rad pos: 43.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4308 components: - type: Transform rot: 1.5707963267948966 rad pos: 42.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4309 components: - type: Transform rot: 1.5707963267948966 rad pos: 40.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4313 components: - type: Transform rot: 1.5707963267948966 rad pos: 39.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4502 components: - type: Transform rot: 3.141592653589793 rad pos: 38.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4801 components: - type: Transform rot: 1.5707963267948966 rad pos: 31.5,-54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4824 components: - type: Transform rot: 1.5707963267948966 rad pos: 43.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4826 components: - type: Transform pos: 33.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5230 components: - type: Transform rot: 1.5707963267948966 rad pos: 31.5,-55.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5232 components: - type: Transform rot: 1.5707963267948966 rad pos: 38.5,-54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5235 components: - type: Transform rot: 1.5707963267948966 rad pos: 30.5,-56.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5236 components: - type: Transform rot: 1.5707963267948966 rad pos: 30.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5238 components: - type: Transform rot: 1.5707963267948966 rad pos: 31.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5239 components: - type: Transform rot: 1.5707963267948966 rad pos: 31.5,-59.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5241 components: - type: Transform rot: 1.5707963267948966 rad pos: 33.5,-60.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5242 components: - type: Transform rot: 1.5707963267948966 rad pos: 32.5,-60.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5244 components: - type: Transform rot: 1.5707963267948966 rad pos: 34.5,-61.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5245 components: - type: Transform rot: 1.5707963267948966 rad pos: 35.5,-61.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5255 components: - type: Transform rot: 1.5707963267948966 rad pos: 36.5,-60.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5256 components: - type: Transform rot: 1.5707963267948966 rad pos: 37.5,-60.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5258 components: - type: Transform rot: 1.5707963267948966 rad pos: 38.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5259 components: - type: Transform rot: 1.5707963267948966 rad pos: 38.5,-59.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5262 components: - type: Transform rot: 1.5707963267948966 rad pos: 39.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5264 components: - type: Transform rot: 1.5707963267948966 rad pos: 39.5,-56.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5266 components: - type: Transform rot: 1.5707963267948966 rad pos: 38.5,-55.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5317 components: - type: Transform rot: 1.5707963267948966 rad pos: 32.5,-52.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5318 components: - type: Transform rot: 1.5707963267948966 rad pos: 32.5,-50.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5319 components: - type: Transform rot: 1.5707963267948966 rad pos: 32.5,-48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5320 components: - type: Transform rot: 1.5707963267948966 rad pos: 37.5,-48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5321 components: - type: Transform rot: 1.5707963267948966 rad pos: 37.5,-50.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5322 components: - type: Transform rot: 1.5707963267948966 rad pos: 37.5,-52.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5380 components: - type: Transform rot: 1.5707963267948966 rad pos: 39.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6103 components: - type: Transform pos: 44.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6104 components: - type: Transform pos: 50.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6105 components: - type: Transform pos: 48.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6106 components: - type: Transform pos: 47.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6107 components: - type: Transform pos: 46.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6354 components: - type: Transform rot: -1.5707963267948966 rad pos: -3.5,30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6355 components: - type: Transform rot: -1.5707963267948966 rad pos: -4.5,30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6356 components: - type: Transform rot: -1.5707963267948966 rad pos: -5.5,30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6357 components: - type: Transform rot: -1.5707963267948966 rad pos: -7.5,30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6358 components: - type: Transform rot: -1.5707963267948966 rad pos: -8.5,30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6359 components: - type: Transform rot: -1.5707963267948966 rad pos: -9.5,30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6360 components: - type: Transform rot: -1.5707963267948966 rad pos: -11.5,30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6361 components: - type: Transform rot: -1.5707963267948966 rad pos: -12.5,30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6362 components: - type: Transform rot: -1.5707963267948966 rad pos: -13.5,30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6364 components: - type: Transform pos: -14.5,28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6589 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6590 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6591 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6592 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6593 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6594 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6595 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6821 components: - type: Transform pos: 33.5,51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6822 components: - type: Transform pos: 34.5,51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6823 components: - type: Transform pos: 35.5,51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6824 components: - type: Transform pos: 36.5,51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6826 components: - type: Transform pos: 40.5,51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6827 components: - type: Transform pos: 40.5,47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6848 components: - type: Transform pos: 31.5,54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6850 components: - type: Transform pos: 27.5,54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6851 components: - type: Transform pos: 25.5,54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6854 components: - type: Transform pos: 29.5,54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6859 components: - type: Transform rot: 3.141592653589793 rad pos: 31.5,51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6860 components: - type: Transform rot: 3.141592653589793 rad pos: 28.5,51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7047 components: - type: Transform rot: 1.5707963267948966 rad pos: 16.5,54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7048 components: - type: Transform rot: 1.5707963267948966 rad pos: 10.5,54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7049 components: - type: Transform rot: 1.5707963267948966 rad pos: 16.5,53.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7053 components: - type: Transform rot: 1.5707963267948966 rad pos: 11.5,54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7054 components: - type: Transform rot: 1.5707963267948966 rad pos: 10.5,53.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7061 components: - type: Transform rot: 1.5707963267948966 rad pos: 12.5,54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7065 components: - type: Transform rot: 1.5707963267948966 rad pos: 13.5,54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7066 components: - type: Transform rot: 1.5707963267948966 rad pos: 14.5,54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7067 components: - type: Transform rot: 1.5707963267948966 rad pos: 15.5,54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7073 components: - type: Transform rot: 1.5707963267948966 rad pos: 9.5,54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7074 components: - type: Transform rot: 1.5707963267948966 rad pos: 8.5,54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7075 components: - type: Transform rot: 1.5707963267948966 rad pos: 7.5,54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7076 components: - type: Transform rot: 1.5707963267948966 rad pos: 17.5,54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7077 components: - type: Transform rot: 1.5707963267948966 rad pos: 18.5,54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7078 components: - type: Transform rot: 1.5707963267948966 rad pos: 19.5,54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7731 components: - type: Transform rot: 3.141592653589793 rad pos: -1.5,54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7733 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7734 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7737 components: - type: Transform rot: 3.141592653589793 rad pos: -7.5,52.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7738 components: - type: Transform rot: 3.141592653589793 rad pos: -8.5,54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7739 components: - type: Transform rot: 3.141592653589793 rad pos: -9.5,54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7740 components: - type: Transform rot: 3.141592653589793 rad pos: -10.5,54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7744 components: - type: Transform rot: 3.141592653589793 rad pos: -7.5,53.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7750 components: - type: Transform rot: 3.141592653589793 rad pos: -3.5,53.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7751 components: - type: Transform rot: 3.141592653589793 rad pos: -3.5,52.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7825 components: - type: Transform rot: -1.5707963267948966 rad pos: -13.5,50.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7831 components: - type: Transform rot: -1.5707963267948966 rad pos: -24.5,51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8037 components: - type: Transform rot: -1.5707963267948966 rad pos: -9.5,47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8059 components: - type: Transform rot: -1.5707963267948966 rad pos: -13.5,45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8065 components: - type: Transform rot: 3.141592653589793 rad pos: -25.5,47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8077 components: - type: Transform pos: -25.5,48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8080 components: - type: Transform rot: -1.5707963267948966 rad pos: -12.5,47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8084 components: - type: Transform rot: -1.5707963267948966 rad pos: -25.5,46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8097 components: - type: Transform rot: -1.5707963267948966 rad pos: -19.5,51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8102 components: - type: Transform rot: -1.5707963267948966 rad pos: -20.5,51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8109 components: - type: Transform rot: -1.5707963267948966 rad pos: -11.5,44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8121 components: - type: Transform rot: -1.5707963267948966 rad pos: -8.5,44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8150 components: - type: Transform rot: -1.5707963267948966 rad pos: -23.5,51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8210 components: - type: Transform rot: -1.5707963267948966 rad pos: -8.5,47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8215 components: - type: Transform rot: -1.5707963267948966 rad pos: -15.5,51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8228 components: - type: Transform rot: 3.141592653589793 rad pos: -27.5,44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8229 components: - type: Transform rot: 3.141592653589793 rad pos: -28.5,44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8230 components: - type: Transform rot: 3.141592653589793 rad pos: -31.5,44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8231 components: - type: Transform rot: 3.141592653589793 rad pos: -32.5,44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8323 components: - type: Transform rot: 3.141592653589793 rad pos: -37.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8324 components: - type: Transform rot: 3.141592653589793 rad pos: -37.5,10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8325 components: - type: Transform rot: 3.141592653589793 rad pos: -37.5,11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8326 components: - type: Transform rot: 3.141592653589793 rad pos: -37.5,12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8327 components: - type: Transform rot: 3.141592653589793 rad pos: -37.5,13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8328 components: - type: Transform rot: 3.141592653589793 rad pos: -37.5,14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8330 components: - type: Transform rot: 3.141592653589793 rad pos: -37.5,16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8331 components: - type: Transform rot: 3.141592653589793 rad pos: -37.5,17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8332 components: - type: Transform rot: 3.141592653589793 rad pos: -37.5,18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8333 components: - type: Transform rot: 3.141592653589793 rad pos: -37.5,19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8334 components: - type: Transform rot: 3.141592653589793 rad pos: -37.5,20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8335 components: - type: Transform rot: 3.141592653589793 rad pos: -37.5,21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8336 components: - type: Transform rot: 3.141592653589793 rad pos: -37.5,22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8337 components: - type: Transform rot: 3.141592653589793 rad pos: -37.5,23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8338 components: - type: Transform rot: 3.141592653589793 rad pos: -37.5,24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8339 components: - type: Transform rot: 3.141592653589793 rad pos: -37.5,25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8340 components: - type: Transform rot: 3.141592653589793 rad pos: -37.5,26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8341 components: - type: Transform rot: 3.141592653589793 rad pos: -37.5,27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8342 components: - type: Transform rot: 3.141592653589793 rad pos: -37.5,28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8343 components: - type: Transform rot: 3.141592653589793 rad pos: -37.5,29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8344 components: - type: Transform rot: 3.141592653589793 rad pos: -37.5,30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8345 components: - type: Transform rot: 3.141592653589793 rad pos: -37.5,31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8346 components: - type: Transform rot: 3.141592653589793 rad pos: -37.5,32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8347 components: - type: Transform rot: 3.141592653589793 rad pos: -37.5,33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8362 components: - type: Transform rot: 3.141592653589793 rad pos: -34.5,41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8363 components: - type: Transform rot: 3.141592653589793 rad pos: -34.5,42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8466 components: - type: Transform pos: -38.5,-48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8467 components: - type: Transform pos: -40.5,-48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8468 components: - type: Transform pos: -39.5,-48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8471 components: - type: Transform pos: -43.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8472 components: - type: Transform pos: -43.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8473 components: - type: Transform pos: -43.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8503 components: - type: Transform rot: 1.5707963267948966 rad pos: 10.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8528 components: - type: Transform pos: 5.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8677 components: - type: Transform pos: 9.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8680 components: - type: Transform rot: 1.5707963267948966 rad pos: 4.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8799 components: - type: Transform rot: -1.5707963267948966 rad pos: -7.5,46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8800 components: - type: Transform rot: -1.5707963267948966 rad pos: -9.5,44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8801 components: - type: Transform rot: -1.5707963267948966 rad pos: -11.5,47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8820 components: - type: Transform rot: 3.141592653589793 rad pos: -35.5,34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8848 components: - type: Transform rot: -1.5707963267948966 rad pos: -10.5,47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8849 components: - type: Transform rot: -1.5707963267948966 rad pos: -7.5,45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8875 components: - type: Transform pos: -17.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8876 components: - type: Transform pos: -18.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8877 components: - type: Transform pos: -18.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8878 components: - type: Transform pos: -18.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8968 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9000 components: - type: Transform rot: -1.5707963267948966 rad pos: -17.5,51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9024 components: - type: Transform rot: -1.5707963267948966 rad pos: -12.5,44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9025 components: - type: Transform rot: -1.5707963267948966 rad pos: -18.5,51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9188 components: - type: Transform rot: -1.5707963267948966 rad pos: -21.5,51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9195 components: - type: Transform rot: -1.5707963267948966 rad pos: -15.5,49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9197 components: - type: Transform rot: -1.5707963267948966 rad pos: -13.5,46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9200 components: - type: Transform rot: -1.5707963267948966 rad pos: -37.5,15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9208 components: - type: Transform rot: -1.5707963267948966 rad pos: -25.5,45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9256 components: - type: Transform rot: 3.141592653589793 rad pos: -36.5,34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9333 components: - type: Transform rot: 1.5707963267948966 rad pos: 41.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9526 components: - type: Transform pos: -38.5,-50.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9528 components: - type: Transform pos: -40.5,-50.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9529 components: - type: Transform pos: -39.5,-50.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9530 components: - type: Transform pos: -45.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9531 components: - type: Transform pos: -45.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9532 components: - type: Transform pos: -45.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9615 components: - type: Transform rot: -1.5707963267948966 rad pos: -22.5,24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9679 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,-31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9680 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9703 components: - type: Transform pos: 12.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9704 components: - type: Transform pos: 12.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9705 components: - type: Transform pos: 12.5,-31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9706 components: - type: Transform pos: 8.5,-32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9708 components: - type: Transform pos: 6.5,-32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9714 components: - type: Transform pos: 10.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9716 components: - type: Transform rot: -1.5707963267948966 rad pos: 9.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9717 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9719 components: - type: Transform pos: 4.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9720 components: - type: Transform pos: 4.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9721 components: - type: Transform pos: 4.5,-31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9722 components: - type: Transform pos: 10.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9723 components: - type: Transform pos: 10.5,-31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9744 components: - type: Transform rot: 1.5707963267948966 rad pos: 44.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9800 components: - type: Transform rot: 1.5707963267948966 rad pos: 45.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9890 components: - type: Transform rot: 3.141592653589793 rad pos: 14.5,-32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9924 components: - type: Transform pos: 40.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10216 components: - type: Transform rot: -1.5707963267948966 rad pos: 46.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10237 components: - type: Transform rot: -1.5707963267948966 rad pos: -14.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10238 components: - type: Transform rot: -1.5707963267948966 rad pos: -14.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10239 components: - type: Transform rot: -1.5707963267948966 rad pos: -14.5,-48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10240 components: - type: Transform rot: -1.5707963267948966 rad pos: -14.5,-49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10241 components: - type: Transform rot: -1.5707963267948966 rad pos: -14.5,-50.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10242 components: - type: Transform pos: 42.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10300 components: - type: Transform rot: -1.5707963267948966 rad pos: 22.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10302 components: - type: Transform rot: -1.5707963267948966 rad pos: 23.5,-52.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10303 components: - type: Transform rot: -1.5707963267948966 rad pos: 24.5,-52.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10304 components: - type: Transform rot: -1.5707963267948966 rad pos: 25.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10305 components: - type: Transform rot: -1.5707963267948966 rad pos: 25.5,-49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10310 components: - type: Transform rot: -1.5707963267948966 rad pos: 22.5,-50.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10311 components: - type: Transform rot: -1.5707963267948966 rad pos: 22.5,-48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10313 components: - type: Transform pos: 19.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10314 components: - type: Transform pos: 19.5,-50.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10315 components: - type: Transform pos: 19.5,-49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10316 components: - type: Transform pos: 19.5,-48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10669 components: - type: Transform pos: 5.5,-60.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10671 components: - type: Transform pos: 5.5,-59.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10674 components: - type: Transform pos: 5.5,-61.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10675 components: - type: Transform pos: 5.5,-62.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10687 components: - type: Transform pos: -6.5,-63.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10689 components: - type: Transform pos: -5.5,-63.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10693 components: - type: Transform pos: -4.5,-63.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10694 components: - type: Transform pos: -3.5,-63.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10696 components: - type: Transform pos: -1.5,-63.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10697 components: - type: Transform pos: -0.5,-63.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10698 components: - type: Transform pos: 0.5,-63.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10699 components: - type: Transform pos: 1.5,-63.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10700 components: - type: Transform pos: -7.5,-64.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10701 components: - type: Transform pos: -7.5,-65.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10702 components: - type: Transform pos: -7.5,-66.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10703 components: - type: Transform pos: 2.5,-64.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10704 components: - type: Transform pos: 2.5,-65.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10705 components: - type: Transform pos: 2.5,-66.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10706 components: - type: Transform pos: 2.5,-70.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10707 components: - type: Transform pos: 2.5,-71.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10708 components: - type: Transform pos: 2.5,-72.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10709 components: - type: Transform pos: 2.5,-73.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10710 components: - type: Transform pos: -7.5,-70.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10711 components: - type: Transform pos: -7.5,-71.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10712 components: - type: Transform pos: -7.5,-72.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10713 components: - type: Transform pos: -7.5,-73.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10714 components: - type: Transform pos: -7.5,-77.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10715 components: - type: Transform pos: -7.5,-78.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10717 components: - type: Transform pos: 2.5,-77.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10718 components: - type: Transform pos: 2.5,-78.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10732 components: - type: Transform rot: 1.5707963267948966 rad pos: -9.5,-83.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10733 components: - type: Transform rot: 1.5707963267948966 rad pos: -8.5,-83.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10734 components: - type: Transform rot: 1.5707963267948966 rad pos: -7.5,-82.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10735 components: - type: Transform rot: 1.5707963267948966 rad pos: -7.5,-81.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10736 components: - type: Transform rot: 1.5707963267948966 rad pos: -7.5,-80.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10737 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,-80.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10738 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,-81.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10739 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,-82.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10740 components: - type: Transform rot: 1.5707963267948966 rad pos: 3.5,-83.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10741 components: - type: Transform rot: 1.5707963267948966 rad pos: 4.5,-83.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10764 components: - type: Transform rot: 1.5707963267948966 rad pos: -11.5,-67.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10765 components: - type: Transform rot: 1.5707963267948966 rad pos: -11.5,-68.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10766 components: - type: Transform rot: 1.5707963267948966 rad pos: -11.5,-69.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10767 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,-64.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10768 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,-65.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10769 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,-71.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10770 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,-72.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10771 components: - type: Transform rot: 1.5707963267948966 rad pos: -11.5,-74.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10772 components: - type: Transform rot: 1.5707963267948966 rad pos: -11.5,-75.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10773 components: - type: Transform rot: 1.5707963267948966 rad pos: -11.5,-76.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10774 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,-76.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10775 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,-75.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10776 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,-74.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10777 components: - type: Transform rot: 1.5707963267948966 rad pos: 5.5,-78.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10778 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,-78.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10779 components: - type: Transform rot: 1.5707963267948966 rad pos: 5.5,-72.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10780 components: - type: Transform rot: 1.5707963267948966 rad pos: 5.5,-71.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10781 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,-69.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10782 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,-68.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10783 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,-67.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10784 components: - type: Transform rot: 1.5707963267948966 rad pos: 5.5,-65.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10785 components: - type: Transform rot: 1.5707963267948966 rad pos: 5.5,-64.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10793 components: - type: Transform rot: -1.5707963267948966 rad pos: -46.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10794 components: - type: Transform rot: -1.5707963267948966 rad pos: -45.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10802 components: - type: Transform pos: -57.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10809 components: - type: Transform pos: -57.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10810 components: - type: Transform pos: -54.5,13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10811 components: - type: Transform pos: -53.5,13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10818 components: - type: Transform pos: -52.5,13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10821 components: - type: Transform pos: -49.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10826 components: - type: Transform rot: 1.5707963267948966 rad pos: -58.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10827 components: - type: Transform rot: 1.5707963267948966 rad pos: -58.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10834 components: - type: Transform pos: -60.5,-0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10842 components: - type: Transform rot: 1.5707963267948966 rad pos: -58.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10847 components: - type: Transform rot: 1.5707963267948966 rad pos: -58.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10854 components: - type: Transform pos: -58.5,-25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10856 components: - type: Transform pos: -58.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10858 components: - type: Transform pos: -58.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10863 components: - type: Transform rot: 1.5707963267948966 rad pos: -57.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10865 components: - type: Transform rot: 1.5707963267948966 rad pos: -57.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10868 components: - type: Transform rot: 1.5707963267948966 rad pos: -57.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10869 components: - type: Transform rot: 1.5707963267948966 rad pos: -57.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10902 components: - type: Transform rot: -1.5707963267948966 rad pos: -40.5,-55.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10903 components: - type: Transform rot: -1.5707963267948966 rad pos: -38.5,-55.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10904 components: - type: Transform rot: -1.5707963267948966 rad pos: -39.5,-55.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10916 components: - type: Transform rot: -1.5707963267948966 rad pos: -24.5,-55.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10917 components: - type: Transform rot: -1.5707963267948966 rad pos: -26.5,-55.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10918 components: - type: Transform rot: -1.5707963267948966 rad pos: -25.5,-55.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11033 components: - type: Transform rot: 3.141592653589793 rad pos: 34.5,-10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11323 components: - type: Transform pos: -59.5,-0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11326 components: - type: Transform pos: -59.5,-6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11329 components: - type: Transform pos: -59.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11342 components: - type: Transform rot: 1.5707963267948966 rad pos: -58.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11373 components: - type: Transform rot: -1.5707963267948966 rad pos: -59.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11469 components: - type: Transform rot: -1.5707963267948966 rad pos: -43.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11470 components: - type: Transform rot: -1.5707963267948966 rad pos: -45.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11473 components: - type: Transform rot: -1.5707963267948966 rad pos: -44.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11474 components: - type: Transform rot: -1.5707963267948966 rad pos: -44.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11475 components: - type: Transform rot: -1.5707963267948966 rad pos: -43.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11476 components: - type: Transform rot: -1.5707963267948966 rad pos: -45.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11515 components: - type: Transform pos: -4.5,27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11517 components: - type: Transform pos: -5.5,27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11518 components: - type: Transform pos: -7.5,27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11976 components: - type: Transform pos: -8.5,27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11977 components: - type: Transform pos: -10.5,27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12269 components: - type: Transform pos: -11.5,27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12521 components: - type: Transform rot: -1.5707963267948966 rad pos: -17.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12531 components: - type: Transform rot: -1.5707963267948966 rad pos: -19.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12744 components: - type: Transform rot: 1.5707963267948966 rad pos: 54.5,30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12752 components: - type: Transform rot: 1.5707963267948966 rad pos: 54.5,29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12845 components: - type: Transform rot: 1.5707963267948966 rad pos: -12.5,-83.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12846 components: - type: Transform rot: 1.5707963267948966 rad pos: 7.5,-83.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12988 components: - type: Transform rot: 1.5707963267948966 rad pos: 65.5,-2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13074 components: - type: Transform rot: 1.5707963267948966 rad pos: 66.5,5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13075 components: - type: Transform rot: 1.5707963267948966 rad pos: 65.5,5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13079 components: - type: Transform rot: -1.5707963267948966 rad pos: 64.5,-6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13087 components: - type: Transform rot: -1.5707963267948966 rad pos: 66.5,-6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13088 components: - type: Transform rot: 1.5707963267948966 rad pos: 63.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13089 components: - type: Transform rot: -1.5707963267948966 rad pos: 65.5,-6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13090 components: - type: Transform rot: 1.5707963267948966 rad pos: 65.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13092 components: - type: Transform rot: 1.5707963267948966 rad pos: 62.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13093 components: - type: Transform rot: 1.5707963267948966 rad pos: 63.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13094 components: - type: Transform rot: 1.5707963267948966 rad pos: 64.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13095 components: - type: Transform rot: 1.5707963267948966 rad pos: 65.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13096 components: - type: Transform rot: 1.5707963267948966 rad pos: 66.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13097 components: - type: Transform rot: 1.5707963267948966 rad pos: 63.5,0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13098 components: - type: Transform rot: 1.5707963267948966 rad pos: 63.5,-0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13099 components: - type: Transform rot: 1.5707963267948966 rad pos: 65.5,0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13100 components: - type: Transform rot: 1.5707963267948966 rad pos: 65.5,-0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14240 components: - type: Transform rot: 3.141592653589793 rad pos: 39.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14256 components: - type: Transform rot: 1.5707963267948966 rad pos: 40.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14301 components: - type: Transform pos: 33.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14309 components: - type: Transform rot: 3.141592653589793 rad pos: 34.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14395 components: - type: Transform rot: 3.141592653589793 rad pos: 42.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14994 components: - type: Transform rot: 1.5707963267948966 rad pos: -52.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15004 components: - type: Transform rot: 1.5707963267948966 rad pos: -54.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15455 components: - type: Transform rot: 1.5707963267948966 rad pos: 41.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15464 components: - type: Transform pos: 42.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15468 components: - type: Transform pos: 47.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15498 components: - type: Transform rot: -1.5707963267948966 rad pos: 63.5,-6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15499 components: - type: Transform rot: 1.5707963267948966 rad pos: 63.5,-2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15500 components: - type: Transform rot: 1.5707963267948966 rad pos: 64.5,-2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15501 components: - type: Transform rot: 1.5707963267948966 rad pos: 66.5,-2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16102 components: - type: Transform rot: 1.5707963267948966 rad pos: 7.5,-79.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16513 components: - type: Transform rot: 1.5707963267948966 rad pos: -11.5,-79.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17296 components: - type: Transform rot: 3.141592653589793 rad pos: 38.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17853 components: - type: Transform rot: 3.141592653589793 rad pos: -54.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18148 components: - type: Transform pos: 43.5,-2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18360 components: - type: Transform pos: 45.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19189 components: - type: Transform rot: -1.5707963267948966 rad pos: 43.5,-48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19483 components: - type: Transform pos: -50.5,-53.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19485 components: - type: Transform pos: -50.5,-52.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19537 components: - type: Transform pos: -47.5,-56.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19958 components: - type: Transform rot: -1.5707963267948966 rad pos: 41.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19967 components: - type: Transform rot: -1.5707963267948966 rad pos: 43.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19968 components: - type: Transform rot: -1.5707963267948966 rad pos: 45.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19972 components: - type: Transform rot: -1.5707963267948966 rad pos: 45.5,-48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19989 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,-83.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19990 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,-79.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19991 components: - type: Transform rot: 1.5707963267948966 rad pos: -11.5,-83.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19992 components: - type: Transform rot: 1.5707963267948966 rad pos: -12.5,-79.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20257 components: - type: Transform rot: 1.5707963267948966 rad pos: 49.5,31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20263 components: - type: Transform rot: 1.5707963267948966 rad pos: 51.5,31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20268 components: - type: Transform rot: 1.5707963267948966 rad pos: 48.5,31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20387 components: - type: Transform rot: 1.5707963267948966 rad pos: 50.5,31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20662 components: - type: Transform pos: -47.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21013 components: - type: Transform pos: -2.5,-2.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 21014 components: - type: Transform pos: -2.5,1.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 21040 components: - type: Transform rot: -1.5707963267948966 rad pos: 0.5,-2.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 21041 components: - type: Transform rot: -1.5707963267948966 rad pos: 0.5,-0.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 21042 components: - type: Transform rot: -1.5707963267948966 rad pos: 0.5,1.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 21046 components: - type: Transform pos: 0.5,4.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 21065 components: - type: Transform rot: -1.5707963267948966 rad pos: 6.5,-0.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 21066 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,-0.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 21187 components: - type: Transform pos: 0.5,5.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 21188 components: - type: Transform pos: 0.5,6.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 21189 components: - type: Transform pos: 0.5,7.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 21190 components: - type: Transform pos: 0.5,8.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 21191 components: - type: Transform pos: 0.5,9.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 21192 components: - type: Transform pos: 1.5,9.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 21193 components: - type: Transform pos: 2.5,9.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 21194 components: - type: Transform pos: 3.5,9.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 21195 components: - type: Transform pos: 3.5,10.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 21196 components: - type: Transform pos: 4.5,10.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 21197 components: - type: Transform pos: 5.5,10.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 21198 components: - type: Transform pos: 6.5,10.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 21236 components: - type: Transform pos: 19.5,-10.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 21237 components: - type: Transform pos: 18.5,-10.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 21238 components: - type: Transform pos: 17.5,-10.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 21239 components: - type: Transform pos: 17.5,-11.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 21240 components: - type: Transform pos: 16.5,-11.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 21241 components: - type: Transform pos: 15.5,-11.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 21242 components: - type: Transform pos: 14.5,-11.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 21243 components: - type: Transform pos: 13.5,-11.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 21244 components: - type: Transform pos: 13.5,-12.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 21245 components: - type: Transform pos: 12.5,-12.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 21246 components: - type: Transform pos: 11.5,-12.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 21247 components: - type: Transform pos: 10.5,-12.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 21346 components: - type: Transform pos: 24.5,0.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 21508 components: - type: Transform pos: 26.5,-0.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 22876 components: - type: Transform rot: -1.5707963267948966 rad pos: 20.5,-10.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 23238 components: - type: Transform rot: 1.5707963267948966 rad pos: -58.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23436 components: - type: Transform rot: 3.141592653589793 rad pos: 38.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23639 components: - type: Transform rot: -1.5707963267948966 rad pos: -22.5,28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24137 components: - type: Transform rot: 3.141592653589793 rad pos: -52.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24156 components: - type: Transform pos: -18.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24269 components: - type: Transform pos: -34.5,37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24270 components: - type: Transform pos: -34.5,35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24271 components: - type: Transform rot: -1.5707963267948966 rad pos: 17.5,-52.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24272 components: - type: Transform rot: -1.5707963267948966 rad pos: 18.5,-52.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24580 components: - type: Transform pos: 16.5,-43.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 24581 components: - type: Transform pos: 16.5,-44.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 24582 components: - type: Transform pos: 16.5,-45.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 24583 components: - type: Transform pos: 18.5,-41.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 24584 components: - type: Transform pos: 19.5,-41.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 24585 components: - type: Transform pos: 19.5,-47.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 24586 components: - type: Transform pos: 18.5,-47.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 24587 components: - type: Transform pos: -7.5,14.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 24588 components: - type: Transform pos: -6.5,14.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 24589 components: - type: Transform pos: -5.5,14.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 24590 components: - type: Transform pos: -3.5,16.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 24591 components: - type: Transform pos: -3.5,17.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 24592 components: - type: Transform pos: -9.5,16.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 24593 components: - type: Transform pos: -9.5,17.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 26708 components: - type: Transform pos: 24.5,4.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 26718 components: - type: Transform pos: 26.5,5.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 28360 components: - type: Transform pos: 41.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 28440 components: - type: Transform rot: -1.5707963267948966 rad pos: -22.5,23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 28496 components: - type: Transform rot: -1.5707963267948966 rad pos: -22.5,29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 28523 components: - type: Transform rot: -1.5707963267948966 rad pos: 39.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 28614 components: - type: Transform pos: 46.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 28663 components: - type: Transform pos: -4.5,44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 28664 components: - type: Transform pos: -5.5,44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 28665 components: - type: Transform pos: -3.5,44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 29299 components: - type: Transform pos: 37.5,51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 29597 components: - type: Transform rot: 1.5707963267948966 rad pos: 42.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: ReinforcedWindowDiagonal entities: - uid: 3360 @@ -167989,8 +166597,6 @@ entities: rot: 3.141592653589793 rad pos: 46.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: RemoteSignaller entities: - uid: 1858 @@ -168909,99 +167515,73 @@ entities: rot: 1.5707963267948966 rad pos: -1.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7794 components: - type: Transform rot: 1.5707963267948966 rad pos: -1.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10164 components: - type: Transform rot: 1.5707963267948966 rad pos: -1.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11982 components: - type: Transform pos: 20.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12261 components: - type: Transform rot: -1.5707963267948966 rad pos: 34.5,15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12830 components: - type: Transform rot: -1.5707963267948966 rad pos: 34.5,12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16922 components: - type: Transform pos: -10.5,-24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17256 components: - type: Transform pos: -11.5,-24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18581 components: - type: Transform pos: 21.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20831 components: - type: Transform pos: 19.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 28326 components: - type: Transform rot: -1.5707963267948966 rad pos: -28.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 28407 components: - type: Transform rot: -1.5707963267948966 rad pos: -28.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 29923 components: - type: Transform rot: -1.5707963267948966 rad pos: -28.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: ShuttersNormalOpen entities: - uid: 920 @@ -169010,8 +167590,6 @@ entities: rot: -1.5707963267948966 rad pos: 18.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 921 @@ -169020,8 +167598,6 @@ entities: rot: -1.5707963267948966 rad pos: 18.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 922 @@ -169030,8 +167606,6 @@ entities: rot: -1.5707963267948966 rad pos: 18.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 923 @@ -169040,8 +167614,6 @@ entities: rot: -1.5707963267948966 rad pos: 18.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 924 @@ -169050,503 +167622,371 @@ entities: rot: 3.141592653589793 rad pos: 15.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 925 components: - type: Transform rot: 3.141592653589793 rad pos: 14.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 926 components: - type: Transform rot: 3.141592653589793 rad pos: 13.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 927 components: - type: Transform rot: 3.141592653589793 rad pos: 12.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1125 components: - type: Transform pos: -24.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2365 components: - type: Transform rot: -1.5707963267948966 rad pos: 18.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2366 components: - type: Transform rot: -1.5707963267948966 rad pos: 18.5,5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2367 components: - type: Transform rot: -1.5707963267948966 rad pos: 18.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2368 components: - type: Transform rot: -1.5707963267948966 rad pos: 18.5,7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2369 components: - type: Transform rot: -1.5707963267948966 rad pos: 18.5,8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2370 components: - type: Transform rot: -1.5707963267948966 rad pos: 18.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2600 components: - type: Transform pos: 29.5,17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2601 components: - type: Transform pos: 32.5,17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2602 components: - type: Transform rot: 1.5707963267948966 rad pos: 27.5,15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2603 components: - type: Transform rot: 1.5707963267948966 rad pos: 27.5,12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3293 components: - type: Transform pos: 40.5,24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3529 components: - type: Transform pos: 21.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3530 components: - type: Transform pos: 23.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3531 components: - type: Transform pos: 25.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3799 components: - type: Transform rot: 1.5707963267948966 rad pos: 42.5,22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4035 components: - type: Transform rot: 1.5707963267948966 rad pos: -47.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4178 components: - type: Transform pos: 45.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5217 components: - type: Transform pos: 40.5,24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5584 components: - type: Transform pos: -31.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5585 components: - type: Transform pos: -30.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5586 components: - type: Transform pos: -29.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5742 components: - type: Transform rot: -1.5707963267948966 rad pos: 27.5,21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6226 components: - type: Transform pos: -26.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6394 components: - type: Transform pos: 31.5,34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6395 components: - type: Transform pos: 33.5,34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6480 components: - type: Transform pos: 35.5,34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6576 components: - type: Transform pos: -25.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6606 components: - type: Transform rot: -1.5707963267948966 rad pos: 2.5,40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6607 components: - type: Transform rot: -1.5707963267948966 rad pos: 2.5,41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6608 components: - type: Transform rot: -1.5707963267948966 rad pos: 2.5,42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6609 components: - type: Transform rot: -1.5707963267948966 rad pos: 2.5,43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6610 components: - type: Transform rot: -1.5707963267948966 rad pos: 2.5,44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6614 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6615 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7860 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7861 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7862 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8941 components: - type: Transform pos: -23.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11301 components: - type: Transform rot: -1.5707963267948966 rad pos: -57.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11302 components: - type: Transform rot: -1.5707963267948966 rad pos: -57.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11303 components: - type: Transform rot: 3.141592653589793 rad pos: -54.5,13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11304 components: - type: Transform rot: 3.141592653589793 rad pos: -53.5,13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11305 components: - type: Transform rot: 3.141592653589793 rad pos: -52.5,13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11306 components: - type: Transform rot: 1.5707963267948966 rad pos: -49.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11554 components: - type: Transform rot: 1.5707963267948966 rad pos: -51.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11555 components: - type: Transform rot: 1.5707963267948966 rad pos: -51.5,-2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14251 components: - type: Transform pos: 44.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14308 components: - type: Transform pos: 44.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14391 components: - type: Transform pos: 47.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17900 components: - type: Transform rot: 1.5707963267948966 rad pos: -51.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23782 components: - type: Transform pos: 42.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24134 components: - type: Transform rot: 1.5707963267948966 rad pos: -47.5,0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24135 components: - type: Transform rot: 1.5707963267948966 rad pos: -47.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24136 components: - type: Transform rot: 1.5707963267948966 rad pos: -47.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24140 components: - type: Transform pos: -54.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24142 components: - type: Transform pos: -52.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24145 components: - type: Transform rot: 1.5707963267948966 rad pos: -47.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24147 components: - type: Transform rot: 1.5707963267948966 rad pos: -47.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 28308 components: - type: Transform pos: 46.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 28362 components: - type: Transform rot: 1.5707963267948966 rad pos: -47.5,-0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 28363 components: - type: Transform rot: 1.5707963267948966 rad pos: -47.5,-0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: ShuttersRadiation entities: - uid: 7999 @@ -169555,16 +167995,12 @@ entities: rot: -1.5707963267948966 rad pos: 10.5,49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8000 components: - type: Transform rot: 1.5707963267948966 rad pos: 16.5,49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: ShuttersRadiationOpen entities: - uid: 9766 @@ -169573,80 +168009,60 @@ entities: rot: 1.5707963267948966 rad pos: 12.5,-31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9767 components: - type: Transform rot: 1.5707963267948966 rad pos: 12.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9768 components: - type: Transform rot: 1.5707963267948966 rad pos: 12.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9769 components: - type: Transform rot: -1.5707963267948966 rad pos: 2.5,-31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9770 components: - type: Transform rot: -1.5707963267948966 rad pos: 2.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9771 components: - type: Transform rot: -1.5707963267948966 rad pos: 2.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9772 components: - type: Transform rot: 3.141592653589793 rad pos: 9.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9773 components: - type: Transform rot: 3.141592653589793 rad pos: 5.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9854 components: - type: Transform rot: 3.141592653589793 rad pos: 10.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9855 components: - type: Transform rot: 3.141592653589793 rad pos: 4.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: ShuttersWindow entities: - uid: 10589 @@ -169655,71 +168071,53 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,-52.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10590 components: - type: Transform rot: -1.5707963267948966 rad pos: 2.5,-53.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10591 components: - type: Transform rot: -1.5707963267948966 rad pos: 2.5,-54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12955 components: - type: Transform rot: -1.5707963267948966 rad pos: 62.5,8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12956 components: - type: Transform rot: -1.5707963267948966 rad pos: 62.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20213 components: - type: Transform rot: -1.5707963267948966 rad pos: 62.5,10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 29469 components: - type: Transform rot: -1.5707963267948966 rad pos: 62.5,7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 29484 components: - type: Transform rot: -1.5707963267948966 rad pos: 62.5,11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 29526 components: - type: Transform pos: -60.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSource linkedPorts: 29522: @@ -169730,8 +168128,6 @@ entities: - type: Transform pos: -59.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSource linkedPorts: 29522: @@ -169745,90 +168141,66 @@ entities: rot: 1.5707963267948966 rad pos: -17.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1501 components: - type: Transform rot: 1.5707963267948966 rad pos: -17.5,5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1502 components: - type: Transform rot: 1.5707963267948966 rad pos: -17.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1619 components: - type: Transform rot: 1.5707963267948966 rad pos: -17.5,7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1620 components: - type: Transform rot: 1.5707963267948966 rad pos: -17.5,8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1621 components: - type: Transform rot: 1.5707963267948966 rad pos: -17.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1622 components: - type: Transform pos: -8.5,18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1623 components: - type: Transform pos: -7.5,18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1624 components: - type: Transform pos: -6.5,18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1625 components: - type: Transform pos: -5.5,18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1626 components: - type: Transform pos: -4.5,18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1627 components: - type: Transform pos: -3.5,18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: ShuttleConsoleCircuitboard entities: - uid: 9463 @@ -176050,6 +174422,13 @@ entities: - type: Transform pos: 25.5,14.5 parent: 2 +- proto: SpawnPointHeadOfSecurityWeapon + entities: + - uid: 4430 + components: + - type: Transform + pos: 42.5,-41.5 + parent: 2 - proto: SpawnPointJanitor entities: - uid: 20798 @@ -176620,6 +174999,13 @@ entities: - type: Transform pos: -16.5,7.5 parent: 2 +- proto: SpawnPointWardenWeapon + entities: + - uid: 14233 + components: + - type: Transform + pos: 47.5,-15.5 + parent: 2 - proto: SpawnPointZookeeper entities: - uid: 20864 @@ -204242,14 +202628,6 @@ entities: rot: -1.5707963267948966 rad pos: 53.450184,-12.639363 parent: 2 -- proto: WeaponSubMachineGunWt550 - entities: - - uid: 4430 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 42.421173,-41.240723 - parent: 2 - proto: WeldingFuelTankFull entities: - uid: 4298 @@ -204328,48 +202706,36 @@ entities: rot: 3.141592653589793 rad pos: -18.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1464 components: - type: Transform rot: 3.141592653589793 rad pos: -21.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1465 components: - type: Transform rot: 3.141592653589793 rad pos: -15.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19248 components: - type: Transform rot: 1.5707963267948966 rad pos: 10.5,-55.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 30246 components: - type: Transform rot: -1.5707963267948966 rad pos: 49.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 30247 components: - type: Transform rot: -1.5707963267948966 rad pos: 49.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorHydroponicsLocked entities: - uid: 3318 @@ -204378,24 +202744,18 @@ entities: rot: 1.5707963267948966 rad pos: 2.5,21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3319 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3320 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecure entities: - uid: 15448 @@ -204404,8 +202764,6 @@ entities: rot: 3.141592653589793 rad pos: 44.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureArmoryLocked entities: - uid: 3116 @@ -204414,80 +202772,60 @@ entities: rot: 3.141592653589793 rad pos: 40.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3117 components: - type: Transform rot: 3.141592653589793 rad pos: 44.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3858 components: - type: Transform rot: 3.141592653589793 rad pos: 45.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23434 components: - type: Transform rot: 3.141592653589793 rad pos: 41.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 30455 components: - type: Transform rot: -1.5707963267948966 rad pos: 53.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 30474 components: - type: Transform rot: 1.5707963267948966 rad pos: 50.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 30481 components: - type: Transform rot: 1.5707963267948966 rad pos: 50.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 30482 components: - type: Transform rot: -1.5707963267948966 rad pos: 53.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 30485 components: - type: Transform rot: 1.5707963267948966 rad pos: 50.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 30486 components: - type: Transform rot: 1.5707963267948966 rad pos: 50.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureAtmosphericsLocked entities: - uid: 9016 @@ -204496,16 +202834,12 @@ entities: rot: 3.141592653589793 rad pos: -38.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9017 components: - type: Transform rot: 3.141592653589793 rad pos: -39.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureBrigLocked entities: - uid: 3512 @@ -204514,44 +202848,32 @@ entities: rot: -1.5707963267948966 rad pos: 33.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4269 components: - type: Transform pos: 31.5,-2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10742 components: - type: Transform rot: -1.5707963267948966 rad pos: 33.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14159 components: - type: Transform pos: 32.5,-2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23432 components: - type: Transform pos: 41.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23450 components: - type: Transform pos: 40.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureCargoLocked entities: - uid: 11541 @@ -204560,16 +202882,12 @@ entities: rot: -1.5707963267948966 rad pos: -47.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23513 components: - type: Transform rot: -1.5707963267948966 rad pos: -47.5,0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureChemistryLocked entities: - uid: 1632 @@ -204578,22 +202896,16 @@ entities: rot: -1.5707963267948966 rad pos: -10.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1649 components: - type: Transform pos: -15.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 28359 components: - type: Transform pos: -14.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureCommandLocked entities: - uid: 30289 @@ -204602,32 +202914,24 @@ entities: rot: 1.5707963267948966 rad pos: 46.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 30291 components: - type: Transform rot: -1.5707963267948966 rad pos: 48.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 30292 components: - type: Transform rot: 1.5707963267948966 rad pos: 46.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 30293 components: - type: Transform rot: -1.5707963267948966 rad pos: 48.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureEngineeringLocked entities: - uid: 6236 @@ -204636,32 +202940,24 @@ entities: rot: 1.5707963267948966 rad pos: 3.5,32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6237 components: - type: Transform rot: 1.5707963267948966 rad pos: 3.5,33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9477 components: - type: Transform rot: 3.141592653589793 rad pos: 33.5,49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 26097 components: - type: Transform rot: -1.5707963267948966 rad pos: 43.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureHeadOfPersonnelLocked entities: - uid: 4026 @@ -204670,31 +202966,23 @@ entities: rot: -1.5707963267948966 rad pos: 43.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4492 components: - type: Transform rot: -1.5707963267948966 rad pos: 43.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17214 components: - type: Transform pos: 44.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17297 components: - type: Transform rot: -1.5707963267948966 rad pos: 43.5,-6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureMedicalLocked entities: - uid: 1395 @@ -204702,15 +202990,11 @@ entities: - type: Transform pos: -8.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1396 components: - type: Transform pos: -5.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureSalvageLocked entities: - uid: 9234 @@ -204719,8 +203003,6 @@ entities: rot: 3.141592653589793 rad pos: -57.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureScienceLocked entities: - uid: 9918 @@ -204729,24 +203011,18 @@ entities: rot: -1.5707963267948966 rad pos: 18.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9937 components: - type: Transform rot: 1.5707963267948966 rad pos: 4.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9939 components: - type: Transform rot: 1.5707963267948966 rad pos: 4.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureSecurityLocked entities: - uid: 17319 @@ -204755,24 +203031,18 @@ entities: rot: -1.5707963267948966 rad pos: 43.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21069 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,0.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 21070 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,-1.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - proto: WindoorServiceLocked entities: - uid: 633 @@ -204781,31 +203051,23 @@ entities: rot: -1.5707963267948966 rad pos: -8.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 651 components: - type: Transform pos: -11.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 655 components: - type: Transform rot: 1.5707963267948966 rad pos: -11.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20858 components: - type: Transform rot: 3.141592653589793 rad pos: 12.5,34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: Window entities: - uid: 13 @@ -204813,783 +203075,563 @@ entities: - type: Transform pos: -22.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 305 components: - type: Transform pos: -2.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 306 components: - type: Transform pos: -3.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 314 components: - type: Transform pos: -3.5,-2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 315 components: - type: Transform pos: 4.5,-2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 316 components: - type: Transform pos: 6.5,18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 317 components: - type: Transform pos: 5.5,18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 330 components: - type: Transform pos: 8.5,18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 331 components: - type: Transform pos: 7.5,18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 332 components: - type: Transform pos: -1.5,20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 333 components: - type: Transform pos: -31.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 397 components: - type: Transform pos: -32.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 398 components: - type: Transform pos: -3.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 399 components: - type: Transform pos: -3.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 425 components: - type: Transform pos: -3.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 436 components: - type: Transform pos: -3.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 459 components: - type: Transform pos: -3.5,-32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 515 components: - type: Transform pos: -28.5,-24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 516 components: - type: Transform pos: -29.5,-24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 524 components: - type: Transform pos: -22.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 525 components: - type: Transform pos: -14.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 526 components: - type: Transform pos: -22.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 527 components: - type: Transform pos: -21.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 529 components: - type: Transform pos: -24.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 535 components: - type: Transform pos: -25.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 536 components: - type: Transform pos: -26.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 537 components: - type: Transform pos: -15.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 539 components: - type: Transform pos: -32.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 543 components: - type: Transform pos: -28.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 545 components: - type: Transform pos: -28.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 558 components: - type: Transform pos: -28.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 559 components: - type: Transform pos: -28.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 562 components: - type: Transform pos: 39.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 563 components: - type: Transform pos: 41.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 566 components: - type: Transform pos: -31.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 578 components: - type: Transform pos: -40.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 579 components: - type: Transform pos: -37.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 581 components: - type: Transform pos: -33.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 718 components: - type: Transform pos: 3.5,31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 719 components: - type: Transform pos: 3.5,34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 720 components: - type: Transform pos: -2.5,34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 724 components: - type: Transform pos: -2.5,32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 746 components: - type: Transform pos: 2.5,51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 748 components: - type: Transform pos: 2.5,50.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 749 components: - type: Transform pos: 2.5,49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 750 components: - type: Transform pos: 3.5,37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 751 components: - type: Transform pos: 3.5,38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 811 components: - type: Transform pos: -10.5,31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 812 components: - type: Transform pos: -10.5,32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 814 components: - type: Transform pos: -10.5,33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 815 components: - type: Transform pos: -7.5,40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 816 components: - type: Transform pos: -7.5,43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 823 components: - type: Transform pos: -25.5,43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 824 components: - type: Transform pos: -25.5,41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 825 components: - type: Transform pos: -25.5,39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 828 components: - type: Transform pos: -31.5,35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 830 components: - type: Transform pos: -31.5,37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 831 components: - type: Transform pos: -30.5,38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 832 components: - type: Transform pos: -28.5,38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 833 components: - type: Transform pos: -26.5,38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 834 components: - type: Transform pos: -30.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 837 components: - type: Transform pos: -28.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 838 components: - type: Transform pos: 2.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 839 components: - type: Transform pos: 2.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 840 components: - type: Transform pos: 2.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 841 components: - type: Transform pos: 2.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 939 components: - type: Transform pos: 12.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 940 components: - type: Transform pos: 12.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 941 components: - type: Transform pos: 4.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 943 components: - type: Transform pos: 4.5,-41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 944 components: - type: Transform pos: 12.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 945 components: - type: Transform pos: 12.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 946 components: - type: Transform pos: -1.5,-49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 947 components: - type: Transform pos: -3.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 948 components: - type: Transform pos: -1.5,-53.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 993 components: - type: Transform pos: -9.5,-50.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 994 components: - type: Transform pos: -9.5,-49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 995 components: - type: Transform pos: -9.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 996 components: - type: Transform pos: -9.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 998 components: - type: Transform pos: -5.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 999 components: - type: Transform pos: -5.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1002 components: - type: Transform pos: -1.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1003 components: - type: Transform pos: -51.5,-2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1004 components: - type: Transform pos: -51.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1005 components: - type: Transform pos: -53.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1064 components: - type: Transform pos: -56.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1065 components: - type: Transform pos: -47.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1066 components: - type: Transform pos: -51.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1067 components: - type: Transform pos: -47.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1068 components: - type: Transform pos: -1.5,39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1070 components: - type: Transform pos: -47.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1077 components: - type: Transform pos: 4.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1078 components: - type: Transform pos: 3.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1079 components: - type: Transform pos: 3.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1084 components: - type: Transform pos: -2.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1443 components: - type: Transform rot: 3.141592653589793 rad pos: -20.5,-24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1444 components: - type: Transform rot: 3.141592653589793 rad pos: -16.5,-25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1445 components: - type: Transform rot: 3.141592653589793 rad pos: -20.5,-25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1446 components: - type: Transform rot: 3.141592653589793 rad pos: -16.5,-24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3090 components: - type: Transform rot: 3.141592653589793 rad pos: 31.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3948 components: - type: Transform rot: 3.141592653589793 rad pos: 32.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4819 components: - type: Transform rot: 3.141592653589793 rad pos: 30.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9617 components: - type: Transform rot: 3.141592653589793 rad pos: -24.5,38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11328 components: - type: Transform rot: 1.5707963267948966 rad pos: -58.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11375 components: - type: Transform rot: 1.5707963267948966 rad pos: -58.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17271 components: - type: Transform rot: 3.141592653589793 rad pos: 37.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18937 components: - type: Transform pos: -10.5,19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23168 components: - type: Transform pos: -3.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 26713 components: - type: Transform rot: 3.141592653589793 rad pos: 34.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 28753 components: - type: Transform pos: -24.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindowDiagonal entities: - uid: 279 @@ -205598,93 +203640,69 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 286 components: - type: Transform rot: -1.5707963267948966 rad pos: 4.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 303 components: - type: Transform rot: 3.141592653589793 rad pos: 3.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 304 components: - type: Transform rot: 1.5707963267948966 rad pos: -2.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1072 components: - type: Transform pos: -2.5,5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1073 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1074 components: - type: Transform rot: 3.141592653589793 rad pos: 5.5,-2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1075 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1076 components: - type: Transform rot: 1.5707963267948966 rad pos: -4.5,-2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1080 components: - type: Transform pos: -4.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1081 components: - type: Transform pos: -3.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1083 components: - type: Transform rot: 3.141592653589793 rad pos: 4.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindowDirectional entities: - uid: 1352 @@ -205692,227 +203710,169 @@ entities: - type: Transform pos: -4.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1353 components: - type: Transform pos: -6.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1355 components: - type: Transform pos: -9.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1451 components: - type: Transform rot: 3.141592653589793 rad pos: -20.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1452 components: - type: Transform rot: 3.141592653589793 rad pos: -16.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1453 components: - type: Transform rot: 3.141592653589793 rad pos: -17.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1455 components: - type: Transform rot: 3.141592653589793 rad pos: -22.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1456 components: - type: Transform rot: 3.141592653589793 rad pos: -14.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11458 components: - type: Transform pos: -49.5,-10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11459 components: - type: Transform rot: -1.5707963267948966 rad pos: -48.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11460 components: - type: Transform rot: 3.141592653589793 rad pos: -49.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11461 components: - type: Transform rot: 1.5707963267948966 rad pos: -49.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15511 components: - type: Transform rot: 3.141592653589793 rad pos: 58.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15547 components: - type: Transform rot: -1.5707963267948966 rad pos: 59.5,-2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18861 components: - type: Transform rot: 1.5707963267948966 rad pos: 57.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18862 components: - type: Transform rot: 1.5707963267948966 rad pos: 57.5,-0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18863 components: - type: Transform rot: 1.5707963267948966 rad pos: 57.5,0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18864 components: - type: Transform rot: 1.5707963267948966 rad pos: 57.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18865 components: - type: Transform pos: 58.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18866 components: - type: Transform rot: -1.5707963267948966 rad pos: 59.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18867 components: - type: Transform rot: -1.5707963267948966 rad pos: 59.5,0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18868 components: - type: Transform rot: -1.5707963267948966 rad pos: 59.5,-0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18869 components: - type: Transform rot: -1.5707963267948966 rad pos: 59.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18876 components: - type: Transform rot: 1.5707963267948966 rad pos: 57.5,-2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23167 components: - type: Transform rot: 3.141592653589793 rad pos: -19.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 28616 components: - type: Transform rot: -1.5707963267948966 rad pos: -56.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 28617 components: - type: Transform rot: -1.5707963267948966 rad pos: -56.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 28618 components: - type: Transform rot: -1.5707963267948966 rad pos: -56.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 30248 components: - type: Transform pos: -7.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindowFrostedDirectional entities: - uid: 3489 @@ -205921,24 +203881,18 @@ entities: rot: 3.141592653589793 rad pos: 30.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3506 components: - type: Transform rot: 3.141592653589793 rad pos: 31.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15490 components: - type: Transform rot: 3.141592653589793 rad pos: 32.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindowReinforcedDirectional entities: - uid: 625 @@ -205947,548 +203901,406 @@ entities: rot: 3.141592653589793 rad pos: -12.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 626 components: - type: Transform rot: 3.141592653589793 rad pos: -11.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 627 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 628 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,-6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 629 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 630 components: - type: Transform rot: -1.5707963267948966 rad pos: -13.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 631 components: - type: Transform rot: -1.5707963267948966 rad pos: -13.5,-6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 632 components: - type: Transform rot: -1.5707963267948966 rad pos: -13.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 634 components: - type: Transform rot: -1.5707963267948966 rad pos: -8.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 642 components: - type: Transform rot: 3.141592653589793 rad pos: -7.5,-10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 643 components: - type: Transform rot: 3.141592653589793 rad pos: -6.5,-10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 644 components: - type: Transform rot: 3.141592653589793 rad pos: -5.5,-10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 645 components: - type: Transform rot: 3.141592653589793 rad pos: -5.5,-10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 646 components: - type: Transform rot: 1.5707963267948966 rad pos: -4.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 647 components: - type: Transform rot: 1.5707963267948966 rad pos: -4.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 648 components: - type: Transform pos: -5.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 649 components: - type: Transform pos: -6.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 650 components: - type: Transform pos: -7.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 652 components: - type: Transform pos: -12.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 653 components: - type: Transform rot: 3.141592653589793 rad pos: -13.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 654 components: - type: Transform rot: 3.141592653589793 rad pos: -12.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 656 components: - type: Transform rot: 1.5707963267948966 rad pos: -11.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 657 components: - type: Transform pos: -12.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 658 components: - type: Transform pos: -13.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 659 components: - type: Transform rot: -1.5707963267948966 rad pos: -14.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 660 components: - type: Transform rot: -1.5707963267948966 rad pos: -14.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2329 components: - type: Transform rot: -1.5707963267948966 rad pos: 19.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2330 components: - type: Transform rot: -1.5707963267948966 rad pos: 19.5,8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2331 components: - type: Transform rot: -1.5707963267948966 rad pos: 19.5,7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2332 components: - type: Transform rot: -1.5707963267948966 rad pos: 19.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2333 components: - type: Transform rot: -1.5707963267948966 rad pos: 19.5,5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2334 components: - type: Transform rot: -1.5707963267948966 rad pos: 19.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3769 components: - type: Transform rot: 3.141592653589793 rad pos: 44.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3770 components: - type: Transform pos: 43.5,-6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3925 components: - type: Transform pos: 15.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3949 components: - type: Transform rot: 3.141592653589793 rad pos: 15.5,-41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4039 components: - type: Transform rot: -1.5707963267948966 rad pos: 43.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4045 components: - type: Transform rot: 3.141592653589793 rad pos: 43.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4132 components: - type: Transform rot: -1.5707963267948966 rad pos: 49.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4563 components: - type: Transform pos: 50.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6128 components: - type: Transform rot: 3.141592653589793 rad pos: 47.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6164 components: - type: Transform rot: 3.141592653589793 rad pos: 47.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6165 components: - type: Transform rot: -1.5707963267948966 rad pos: 46.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6166 components: - type: Transform rot: 1.5707963267948966 rad pos: 48.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6852 components: - type: Transform rot: -1.5707963267948966 rad pos: 49.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9476 components: - type: Transform rot: -1.5707963267948966 rad pos: 34.5,50.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9910 components: - type: Transform rot: -1.5707963267948966 rad pos: 18.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9911 components: - type: Transform rot: -1.5707963267948966 rad pos: 18.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9912 components: - type: Transform rot: -1.5707963267948966 rad pos: 18.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9913 components: - type: Transform pos: 21.5,-41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9914 components: - type: Transform pos: 20.5,-41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9915 components: - type: Transform pos: 19.5,-41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9916 components: - type: Transform pos: 18.5,-41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9917 components: - type: Transform rot: -1.5707963267948966 rad pos: 18.5,-41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16803 components: - type: Transform rot: -1.5707963267948966 rad pos: 43.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17298 components: - type: Transform pos: 44.5,-6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20823 components: - type: Transform rot: 3.141592653589793 rad pos: -12.5,19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21056 components: - type: Transform rot: 3.141592653589793 rad pos: 6.5,-3.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 21057 components: - type: Transform rot: 3.141592653589793 rad pos: 7.5,-3.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 21058 components: - type: Transform pos: 6.5,2.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 21059 components: - type: Transform pos: 7.5,2.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 22277 components: - type: Transform rot: 3.141592653589793 rad pos: -13.5,19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 22734 components: - type: Transform pos: 4.5,4.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 22735 components: - type: Transform pos: 8.5,2.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 22736 components: - type: Transform rot: -1.5707963267948966 rad pos: 9.5,-0.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 22737 components: - type: Transform rot: 3.141592653589793 rad pos: 8.5,-3.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 25887 components: - type: Transform rot: 1.5707963267948966 rad pos: 23.5,-0.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 26611 components: - type: Transform rot: 1.5707963267948966 rad pos: 23.5,5.5 parent: 21002 - - type: DeltaPressure - gridUid: 21002 - uid: 30456 components: - type: Transform pos: 53.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 30473 components: - type: Transform rot: 3.141592653589793 rad pos: 50.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 30484 components: - type: Transform pos: 50.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: Wirecutter entities: - uid: 23787 @@ -206564,7 +204376,7 @@ entities: pos: 24.5,2.5 parent: 21002 - type: Door - secondsUntilStateChange: -717355.06 + secondsUntilStateChange: -717391.9 state: Opening - uid: 28863 components: From 9db007f1839b4ea5018da80a48e5055992ad98c7 Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Tue, 4 Nov 2025 13:16:14 -0700 Subject: [PATCH 105/121] box update (#41294) --- Resources/Maps/box.yml | 2747 +--------------------------------------- 1 file changed, 17 insertions(+), 2730 deletions(-) diff --git a/Resources/Maps/box.yml b/Resources/Maps/box.yml index 7fbf46f2bf..4f2ac605a0 100644 --- a/Resources/Maps/box.yml +++ b/Resources/Maps/box.yml @@ -1,11 +1,11 @@ meta: format: 7 category: Map - engineVersion: 267.2.0 + engineVersion: 267.3.0 forkId: "" forkVersion: "" - time: 10/08/2025 20:15:18 - entityCount: 28790 + time: 11/04/2025 19:45:51 + entityCount: 28789 maps: - 780 grids: @@ -132534,18 +132534,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: MagazinePistolSubMachineGunTopMounted - entities: - - uid: 965 - components: - - type: Transform - pos: -1.4836051,53.52623 - parent: 8364 - - uid: 5087 - components: - - type: Transform - pos: -1.3689646,53.71386 - parent: 8364 - proto: MagazineRifle entities: - uid: 26298 @@ -134982,38 +134970,28 @@ entities: - type: Transform pos: 14.5,-54.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3749 components: - type: Transform pos: 15.5,-54.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3752 components: - type: Transform rot: 1.5707963267948966 rad pos: 16.5,-54.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 23194 components: - type: Transform rot: -1.5707963267948966 rad pos: 14.5,-54.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 23239 components: - type: Transform pos: 16.5,-54.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - proto: PlasmaTankFilled entities: - uid: 4055 @@ -135029,8 +135007,6 @@ entities: rot: 3.141592653589793 rad pos: -13.5,44.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -135045,8 +135021,6 @@ entities: - type: Transform pos: -13.5,44.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -142813,540 +142787,386 @@ entities: - type: Transform pos: 25.5,-50.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2389 components: - type: Transform pos: 13.5,-94.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2832 components: - type: Transform pos: 14.5,-94.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3494 components: - type: Transform pos: 47.5,-54.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3495 components: - type: Transform pos: 46.5,-54.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3496 components: - type: Transform pos: 43.5,-54.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3497 components: - type: Transform pos: 44.5,-54.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4041 components: - type: Transform pos: 16.5,-91.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4427 components: - type: Transform pos: 15.5,-90.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4468 components: - type: Transform pos: 13.5,-84.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4469 components: - type: Transform pos: 15.5,-88.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4470 components: - type: Transform pos: 13.5,-88.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4493 components: - type: Transform pos: 16.5,-85.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4623 components: - type: Transform pos: 16.5,-87.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4947 components: - type: Transform pos: -17.5,46.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 5197 components: - type: Transform pos: 14.5,-88.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 5200 components: - type: Transform pos: 12.5,-87.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 5799 components: - type: Transform pos: 14.5,-49.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7305 components: - type: Transform pos: -17.5,43.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7394 components: - type: Transform pos: -17.5,44.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7656 components: - type: Transform pos: -15.5,46.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7705 components: - type: Transform pos: -15.5,41.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7833 components: - type: Transform pos: -17.5,45.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7841 components: - type: Transform pos: -17.5,42.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8385 components: - type: Transform pos: -15.5,45.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8398 components: - type: Transform pos: -7.5,45.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8813 components: - type: Transform pos: -17.5,41.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 10854 components: - type: Transform pos: 14.5,-90.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 11752 components: - type: Transform pos: 12.5,-92.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 12258 components: - type: Transform pos: 12.5,-91.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 12458 components: - type: Transform pos: 12.5,-85.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 12459 components: - type: Transform pos: 12.5,-86.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 13818 components: - type: Transform pos: -15.5,43.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 14918 components: - type: Transform pos: 15.5,-84.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 15138 components: - type: Transform pos: 17.5,-51.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 17697 components: - type: Transform pos: 10.5,-81.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 17718 components: - type: Transform pos: 17.5,-52.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 17763 components: - type: Transform pos: 16.5,-53.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 19159 components: - type: Transform pos: 13.5,-50.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20151 components: - type: Transform pos: 17.5,-50.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 21936 components: - type: Transform pos: 10.5,-80.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22830 components: - type: Transform pos: 13.5,-51.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22839 components: - type: Transform pos: 13.5,-52.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22881 components: - type: Transform pos: 25.5,-44.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22882 components: - type: Transform pos: 25.5,-43.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22883 components: - type: Transform pos: 25.5,-42.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22884 components: - type: Transform pos: 25.5,-48.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22885 components: - type: Transform pos: 25.5,-47.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22886 components: - type: Transform pos: 25.5,-46.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22887 components: - type: Transform pos: 25.5,-52.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22888 components: - type: Transform pos: 25.5,-51.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22890 components: - type: Transform pos: 25.5,-56.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22891 components: - type: Transform pos: 25.5,-55.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22892 components: - type: Transform pos: 25.5,-54.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22893 components: - type: Transform pos: 12.5,-63.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22894 components: - type: Transform pos: 13.5,-63.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22895 components: - type: Transform pos: 14.5,-63.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22896 components: - type: Transform pos: 16.5,-63.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22897 components: - type: Transform pos: 17.5,-63.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22898 components: - type: Transform pos: 18.5,-63.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22899 components: - type: Transform pos: 20.5,-63.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22900 components: - type: Transform pos: 21.5,-63.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22901 components: - type: Transform pos: 22.5,-63.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 23149 components: - type: Transform pos: 14.5,-84.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 23181 components: - type: Transform pos: 16.5,-49.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 23236 components: - type: Transform pos: 14.5,-53.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 26289 components: - type: Transform pos: -14.5,44.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 26314 components: - type: Transform pos: -7.5,40.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 27126 components: - type: Transform pos: 13.5,-90.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 27127 components: - type: Transform pos: 16.5,-93.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 27139 components: - type: Transform pos: 15.5,-94.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 27193 components: - type: Transform pos: 12.5,-93.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 28688 components: - type: Transform pos: -15.5,42.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 28737 components: - type: Transform pos: -7.5,42.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 28740 components: - type: Transform pos: -10.5,40.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 28742 components: - type: Transform pos: -10.5,42.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 28743 components: - type: Transform pos: -7.5,46.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - proto: ReinforcedWindow entities: - uid: 22 @@ -143354,5937 +143174,4241 @@ entities: - type: Transform pos: 47.5,4.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 99 components: - type: Transform pos: -7.5,6.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 108 components: - type: Transform pos: -5.5,2.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 109 components: - type: Transform pos: -6.5,2.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 112 components: - type: Transform pos: -7.5,7.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 136 components: - type: Transform pos: -75.5,-6.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 145 components: - type: Transform pos: 47.5,3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 207 components: - type: Transform pos: -28.5,9.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 208 components: - type: Transform pos: -30.5,9.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 209 components: - type: Transform pos: -32.5,9.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 210 components: - type: Transform pos: -34.5,9.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 260 components: - type: Transform pos: -27.5,9.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 261 components: - type: Transform pos: -29.5,9.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 262 components: - type: Transform pos: -31.5,9.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 263 components: - type: Transform pos: -33.5,9.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 264 components: - type: Transform pos: -35.5,9.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 276 components: - type: Transform pos: -29.5,19.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 293 components: - type: Transform pos: 1.5,26.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 315 components: - type: Transform pos: -28.5,11.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 316 components: - type: Transform pos: -29.5,11.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 323 components: - type: Transform pos: -27.5,11.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 324 components: - type: Transform pos: -30.5,12.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 325 components: - type: Transform pos: -30.5,13.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 326 components: - type: Transform pos: -30.5,14.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 327 components: - type: Transform pos: -30.5,15.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 328 components: - type: Transform pos: -30.5,16.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 329 components: - type: Transform pos: -32.5,25.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 330 components: - type: Transform pos: -32.5,13.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 331 components: - type: Transform pos: -32.5,14.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 332 components: - type: Transform pos: -32.5,15.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 333 components: - type: Transform pos: -32.5,16.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 334 components: - type: Transform pos: -29.5,23.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 344 components: - type: Transform pos: -29.5,20.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 347 components: - type: Transform pos: -42.5,19.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 348 components: - type: Transform pos: -43.5,19.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 349 components: - type: Transform pos: -48.5,26.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 350 components: - type: Transform pos: -50.5,26.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 351 components: - type: Transform pos: -50.5,25.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 352 components: - type: Transform pos: -50.5,24.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 353 components: - type: Transform pos: -51.5,24.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 366 components: - type: Transform pos: -33.5,25.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 367 components: - type: Transform pos: -29.5,24.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 396 components: - type: Transform pos: -29.5,22.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 404 components: - type: Transform pos: -29.5,18.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 416 components: - type: Transform pos: -35.5,25.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 417 components: - type: Transform pos: -34.5,25.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 528 components: - type: Transform pos: -59.5,2.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 529 components: - type: Transform pos: -57.5,2.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 539 components: - type: Transform pos: 10.5,-54.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 544 components: - type: Transform pos: -65.5,20.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 545 components: - type: Transform pos: -68.5,13.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 547 components: - type: Transform pos: -67.5,21.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 550 components: - type: Transform pos: -65.5,21.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 553 components: - type: Transform pos: -68.5,14.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 559 components: - type: Transform pos: -68.5,12.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 574 components: - type: Transform pos: -67.5,19.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 580 components: - type: Transform pos: -67.5,20.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 581 components: - type: Transform pos: -68.5,18.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 591 components: - type: Transform pos: -11.5,34.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 595 components: - type: Transform pos: 27.5,-81.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 596 components: - type: Transform pos: -67.5,7.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 609 components: - type: Transform pos: -68.5,-2.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 637 components: - type: Transform pos: -68.5,7.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 658 components: - type: Transform pos: -72.5,-2.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 660 components: - type: Transform pos: -73.5,-2.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 678 components: - type: Transform pos: -74.5,7.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 679 components: - type: Transform pos: -73.5,7.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 683 components: - type: Transform pos: -72.5,7.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 731 components: - type: Transform pos: -65.5,4.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 732 components: - type: Transform pos: -65.5,3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 733 components: - type: Transform pos: -65.5,2.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 734 components: - type: Transform pos: -65.5,1.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 736 components: - type: Transform pos: -65.5,0.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 749 components: - type: Transform pos: -11.5,31.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 772 components: - type: Transform pos: -15.5,36.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 795 components: - type: Transform pos: 27.5,1.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 822 components: - type: Transform pos: 7.5,-28.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 960 components: - type: Transform pos: 60.5,20.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 998 components: - type: Transform pos: 62.5,20.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1047 components: - type: Transform pos: 45.5,21.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1048 components: - type: Transform pos: 46.5,21.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1049 components: - type: Transform pos: 46.5,22.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1051 components: - type: Transform pos: 65.5,24.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1053 components: - type: Transform pos: 56.5,21.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1054 components: - type: Transform pos: 57.5,21.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1056 components: - type: Transform pos: 46.5,23.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1057 components: - type: Transform pos: 55.5,21.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1062 components: - type: Transform pos: 49.5,4.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1063 components: - type: Transform pos: 49.5,3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1066 components: - type: Transform pos: 48.5,23.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1077 components: - type: Transform pos: -74.5,-6.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1078 components: - type: Transform pos: -73.5,-6.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1079 components: - type: Transform pos: -72.5,-6.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1080 components: - type: Transform pos: -71.5,-6.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1081 components: - type: Transform pos: -70.5,-6.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1082 components: - type: Transform pos: -69.5,-6.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1083 components: - type: Transform pos: -68.5,-6.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1099 components: - type: Transform pos: -75.5,-12.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1100 components: - type: Transform pos: -74.5,-12.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1101 components: - type: Transform pos: -73.5,-12.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1102 components: - type: Transform pos: -72.5,-12.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1103 components: - type: Transform pos: -71.5,-12.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1104 components: - type: Transform pos: -70.5,-12.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1105 components: - type: Transform pos: -69.5,-12.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1106 components: - type: Transform pos: -68.5,-12.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1108 components: - type: Transform pos: -76.5,-17.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1112 components: - type: Transform pos: -73.5,-17.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1113 components: - type: Transform pos: -72.5,-17.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1114 components: - type: Transform pos: -71.5,-17.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1115 components: - type: Transform pos: -70.5,-17.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1116 components: - type: Transform pos: -67.5,-17.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1117 components: - type: Transform pos: -67.5,-16.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1118 components: - type: Transform pos: -66.5,-16.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1122 components: - type: Transform pos: -67.5,-15.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1137 components: - type: Transform pos: -66.5,-11.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1138 components: - type: Transform pos: -66.5,-10.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1139 components: - type: Transform pos: -67.5,-10.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1140 components: - type: Transform pos: -65.5,-10.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1145 components: - type: Transform pos: -33.5,-35.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1179 components: - type: Transform pos: -75.5,-2.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1288 components: - type: Transform pos: -53.5,-19.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1289 components: - type: Transform pos: -54.5,-19.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1290 components: - type: Transform pos: -58.5,-21.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1291 components: - type: Transform pos: -59.5,-21.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1292 components: - type: Transform pos: -60.5,-21.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1293 components: - type: Transform pos: -60.5,-20.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1294 components: - type: Transform pos: -60.5,-18.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1456 components: - type: Transform pos: -24.5,-20.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1457 components: - type: Transform pos: -23.5,-21.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1458 components: - type: Transform pos: -23.5,-23.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1459 components: - type: Transform pos: -23.5,-25.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1460 components: - type: Transform pos: -22.5,-28.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1461 components: - type: Transform pos: -21.5,-28.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1462 components: - type: Transform pos: -20.5,-28.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1463 components: - type: Transform pos: -19.5,-28.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1507 components: - type: Transform pos: -75.5,7.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1509 components: - type: Transform pos: -67.5,-2.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1554 components: - type: Transform pos: -32.5,-35.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1555 components: - type: Transform pos: -32.5,-32.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1561 components: - type: Transform pos: 33.5,4.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1571 components: - type: Transform pos: -26.5,-39.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1572 components: - type: Transform pos: -27.5,-39.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1574 components: - type: Transform pos: -32.5,-39.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1575 components: - type: Transform pos: -31.5,-39.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1576 components: - type: Transform pos: -31.5,-32.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1580 components: - type: Transform pos: -33.5,-39.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1594 components: - type: Transform pos: -23.5,-31.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1595 components: - type: Transform pos: -23.5,-29.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1596 components: - type: Transform pos: -29.5,-29.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1598 components: - type: Transform pos: -33.5,-32.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1653 components: - type: Transform pos: -16.5,-35.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1654 components: - type: Transform pos: -16.5,-36.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1655 components: - type: Transform pos: -16.5,-37.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1656 components: - type: Transform pos: -16.5,-39.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1657 components: - type: Transform pos: -16.5,-40.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1658 components: - type: Transform pos: -16.5,-41.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1659 components: - type: Transform pos: -16.5,-42.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1660 components: - type: Transform pos: -16.5,-43.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1661 components: - type: Transform pos: -16.5,-44.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1662 components: - type: Transform pos: 48.5,2.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1668 components: - type: Transform pos: -18.5,-44.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1669 components: - type: Transform pos: -18.5,-45.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1677 components: - type: Transform pos: 2.5,-55.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1678 components: - type: Transform pos: 2.5,-57.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1709 components: - type: Transform pos: 21.5,-31.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1710 components: - type: Transform pos: 20.5,-31.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1711 components: - type: Transform pos: 19.5,-31.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1729 components: - type: Transform pos: 18.5,-31.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1731 components: - type: Transform pos: 93.5,-27.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1732 components: - type: Transform pos: 93.5,-28.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1733 components: - type: Transform pos: 92.5,-28.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1734 components: - type: Transform pos: 91.5,-28.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1735 components: - type: Transform pos: 91.5,-27.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1736 components: - type: Transform pos: 91.5,-30.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1737 components: - type: Transform pos: 93.5,-30.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1741 components: - type: Transform pos: 87.5,-36.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1742 components: - type: Transform pos: 87.5,-35.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1743 components: - type: Transform pos: 87.5,-34.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1801 components: - type: Transform pos: 39.5,-20.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1819 components: - type: Transform pos: 22.5,-31.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1900 components: - type: Transform pos: 42.5,-44.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1901 components: - type: Transform pos: 42.5,-46.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2053 components: - type: Transform pos: 53.5,-28.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2061 components: - type: Transform pos: 53.5,-32.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2176 components: - type: Transform pos: 77.5,-48.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2177 components: - type: Transform pos: 75.5,-48.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2180 components: - type: Transform pos: 72.5,-48.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2181 components: - type: Transform pos: 71.5,-48.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2182 components: - type: Transform pos: 70.5,-48.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2209 components: - type: Transform pos: 23.5,-18.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2493 components: - type: Transform pos: 37.5,-20.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2528 components: - type: Transform pos: 62.5,-71.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2550 components: - type: Transform pos: 38.5,-38.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2551 components: - type: Transform pos: 38.5,-40.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2594 components: - type: Transform pos: 69.5,-44.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2595 components: - type: Transform pos: 69.5,-46.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2596 components: - type: Transform pos: 68.5,-41.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2597 components: - type: Transform pos: 68.5,-40.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2598 components: - type: Transform pos: 68.5,-39.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2599 components: - type: Transform pos: 68.5,-35.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2600 components: - type: Transform pos: 68.5,-34.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2601 components: - type: Transform pos: 68.5,-33.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2602 components: - type: Transform pos: 64.5,-31.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2603 components: - type: Transform pos: 64.5,-30.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2604 components: - type: Transform pos: 64.5,-29.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2605 components: - type: Transform pos: 64.5,-28.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2606 components: - type: Transform pos: 63.5,-28.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2607 components: - type: Transform pos: 62.5,-28.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2608 components: - type: Transform pos: 63.5,-16.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2609 components: - type: Transform pos: 61.5,-16.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2617 components: - type: Transform pos: 54.5,-31.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2618 components: - type: Transform pos: 54.5,-29.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2619 components: - type: Transform pos: 71.5,-16.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2620 components: - type: Transform pos: 75.5,-24.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2621 components: - type: Transform pos: 76.5,-27.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2622 components: - type: Transform pos: 77.5,-27.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2623 components: - type: Transform pos: 79.5,-27.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2624 components: - type: Transform pos: 80.5,-27.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2625 components: - type: Transform pos: 88.5,-22.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2626 components: - type: Transform pos: 89.5,-22.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2627 components: - type: Transform pos: 90.5,-22.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2628 components: - type: Transform pos: 91.5,-22.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2629 components: - type: Transform pos: 92.5,-22.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2630 components: - type: Transform pos: 92.5,-23.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2642 components: - type: Transform pos: 78.5,-16.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2643 components: - type: Transform pos: 79.5,-16.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2644 components: - type: Transform pos: 80.5,-16.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2645 components: - type: Transform pos: 80.5,-15.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2646 components: - type: Transform pos: 80.5,-14.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2647 components: - type: Transform pos: 81.5,-14.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2648 components: - type: Transform pos: 82.5,-14.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2649 components: - type: Transform pos: 83.5,-14.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2650 components: - type: Transform pos: 84.5,-14.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2651 components: - type: Transform pos: 85.5,-14.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2652 components: - type: Transform pos: 85.5,-10.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2653 components: - type: Transform pos: 84.5,-10.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2654 components: - type: Transform pos: 83.5,-10.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2655 components: - type: Transform pos: 83.5,-9.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2656 components: - type: Transform pos: 83.5,-8.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2657 components: - type: Transform pos: 83.5,-7.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2658 components: - type: Transform pos: 83.5,-6.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2659 components: - type: Transform pos: 84.5,-6.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2660 components: - type: Transform pos: 85.5,-6.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2661 components: - type: Transform pos: 85.5,-2.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2662 components: - type: Transform pos: 84.5,-2.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2663 components: - type: Transform pos: 83.5,-2.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2664 components: - type: Transform pos: 83.5,-1.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2665 components: - type: Transform pos: 83.5,-0.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2666 components: - type: Transform pos: 82.5,-0.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2667 components: - type: Transform pos: 81.5,-0.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2668 components: - type: Transform pos: 80.5,-0.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2669 components: - type: Transform pos: 79.5,-0.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2670 components: - type: Transform pos: 78.5,-0.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2671 components: - type: Transform pos: 75.5,0.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2672 components: - type: Transform pos: 75.5,1.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2673 components: - type: Transform pos: 75.5,2.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2674 components: - type: Transform pos: 75.5,3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2723 components: - type: Transform pos: 31.5,4.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2727 components: - type: Transform pos: 82.5,-4.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2728 components: - type: Transform pos: 80.5,-4.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2729 components: - type: Transform pos: 81.5,-4.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2731 components: - type: Transform pos: 78.5,-4.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2732 components: - type: Transform pos: 76.5,-4.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2733 components: - type: Transform pos: 79.5,-7.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2734 components: - type: Transform pos: 79.5,-9.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2786 components: - type: Transform pos: 67.5,1.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2857 components: - type: Transform pos: 49.5,-10.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2858 components: - type: Transform pos: 46.5,-10.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2859 components: - type: Transform pos: 45.5,-10.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2860 components: - type: Transform pos: 45.5,-11.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2861 components: - type: Transform pos: 42.5,-11.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2882 components: - type: Transform pos: -41.5,-32.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2895 components: - type: Transform pos: -37.5,-32.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2908 components: - type: Transform pos: 87.5,-40.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2909 components: - type: Transform pos: 87.5,-41.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2910 components: - type: Transform pos: 87.5,-42.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2911 components: - type: Transform pos: 87.5,-51.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2912 components: - type: Transform pos: 87.5,-52.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2913 components: - type: Transform pos: 87.5,-53.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2930 components: - type: Transform pos: -43.5,-26.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2957 components: - type: Transform pos: 82.5,-67.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2960 components: - type: Transform pos: 82.5,-66.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2963 components: - type: Transform pos: 83.5,-66.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2966 components: - type: Transform pos: 82.5,-68.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3003 components: - type: Transform pos: -44.5,-26.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3029 components: - type: Transform pos: -38.5,-32.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3030 components: - type: Transform pos: -43.5,-32.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3050 components: - type: Transform pos: -28.5,-39.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3068 components: - type: Transform pos: 19.5,-15.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3074 components: - type: Transform pos: 77.5,-65.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3075 components: - type: Transform pos: 76.5,-65.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3076 components: - type: Transform pos: 70.5,-69.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3077 components: - type: Transform pos: 69.5,-69.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3078 components: - type: Transform pos: 65.5,-73.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3079 components: - type: Transform pos: 64.5,-73.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3080 components: - type: Transform pos: 63.5,-73.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3081 components: - type: Transform pos: 62.5,-73.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3082 components: - type: Transform pos: 62.5,-72.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3084 components: - type: Transform pos: 60.5,-72.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3085 components: - type: Transform pos: 60.5,-71.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3086 components: - type: Transform pos: 60.5,-70.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3088 components: - type: Transform pos: 63.5,-63.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3089 components: - type: Transform pos: 62.5,-63.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3090 components: - type: Transform pos: 61.5,-63.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3091 components: - type: Transform pos: 58.5,-63.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3092 components: - type: Transform pos: 57.5,-63.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3093 components: - type: Transform pos: 56.5,-63.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3094 components: - type: Transform pos: 53.5,-63.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3095 components: - type: Transform pos: 52.5,-63.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3096 components: - type: Transform pos: 51.5,-63.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3097 components: - type: Transform pos: 50.5,-63.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3098 components: - type: Transform pos: 50.5,-64.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3099 components: - type: Transform pos: 50.5,-65.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3100 components: - type: Transform pos: 50.5,-66.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3101 components: - type: Transform pos: 44.5,-74.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3102 components: - type: Transform pos: 43.5,-74.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3103 components: - type: Transform pos: 42.5,-74.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3107 components: - type: Transform pos: 31.5,-60.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3108 components: - type: Transform pos: 31.5,-59.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3109 components: - type: Transform pos: 31.5,-58.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3110 components: - type: Transform pos: 31.5,-55.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3111 components: - type: Transform pos: 31.5,-54.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3112 components: - type: Transform pos: 31.5,-53.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3113 components: - type: Transform pos: 31.5,-50.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3114 components: - type: Transform pos: 31.5,-49.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3115 components: - type: Transform pos: 31.5,-48.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3116 components: - type: Transform pos: 31.5,-45.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3117 components: - type: Transform pos: 31.5,-44.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3118 components: - type: Transform pos: 31.5,-43.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3175 components: - type: Transform pos: 74.5,-61.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3176 components: - type: Transform pos: 73.5,-61.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3177 components: - type: Transform pos: 73.5,-63.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3178 components: - type: Transform pos: 74.5,-63.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3179 components: - type: Transform pos: 15.5,-44.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3241 components: - type: Transform pos: 31.5,-22.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3242 components: - type: Transform pos: 28.5,-22.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3252 components: - type: Transform pos: 29.5,-22.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3344 components: - type: Transform pos: -12.5,-43.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3345 components: - type: Transform pos: -13.5,-43.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3346 components: - type: Transform pos: -13.5,-44.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3347 components: - type: Transform pos: -11.5,-38.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3348 components: - type: Transform pos: -12.5,-38.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3349 components: - type: Transform pos: -13.5,-38.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3350 components: - type: Transform pos: -14.5,-38.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3351 components: - type: Transform pos: -14.5,-37.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3352 components: - type: Transform pos: -14.5,-36.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3353 components: - type: Transform pos: -14.5,-35.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3354 components: - type: Transform pos: -14.5,-34.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3355 components: - type: Transform pos: -13.5,-34.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3356 components: - type: Transform pos: -11.5,-34.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3357 components: - type: Transform pos: -12.5,-34.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3380 components: - type: Transform pos: -9.5,-57.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3381 components: - type: Transform pos: -9.5,-56.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3382 components: - type: Transform pos: -9.5,-55.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3383 components: - type: Transform pos: -9.5,-54.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3384 components: - type: Transform pos: -10.5,-54.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3385 components: - type: Transform pos: -7.5,-52.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3386 components: - type: Transform pos: -5.5,-52.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3387 components: - type: Transform pos: -9.5,-49.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3388 components: - type: Transform pos: -9.5,-50.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3389 components: - type: Transform pos: -9.5,-51.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3390 components: - type: Transform pos: -9.5,-52.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3391 components: - type: Transform pos: -10.5,-52.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3468 components: - type: Transform pos: -21.5,-61.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3469 components: - type: Transform pos: -22.5,-61.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3470 components: - type: Transform pos: -23.5,-61.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3471 components: - type: Transform pos: -24.5,-61.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3472 components: - type: Transform pos: -25.5,-61.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3473 components: - type: Transform pos: -27.5,-61.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3474 components: - type: Transform pos: -26.5,-61.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3475 components: - type: Transform pos: -28.5,-61.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3476 components: - type: Transform pos: -29.5,-61.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3486 components: - type: Transform pos: 15.5,-42.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3491 components: - type: Transform pos: 32.5,-22.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3507 components: - type: Transform pos: 42.5,-60.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3513 components: - type: Transform pos: 42.5,-59.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3517 components: - type: Transform pos: 42.5,-58.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3524 components: - type: Transform pos: 15.5,-40.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3531 components: - type: Transform pos: 42.5,-57.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3559 components: - type: Transform pos: -39.5,-62.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3561 components: - type: Transform pos: -39.5,-63.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3562 components: - type: Transform pos: -40.5,-62.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3564 components: - type: Transform pos: -41.5,-62.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3565 components: - type: Transform pos: -36.5,-51.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3566 components: - type: Transform pos: -37.5,-51.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3580 components: - type: Transform pos: 86.5,-2.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3581 components: - type: Transform pos: 87.5,-10.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3621 components: - type: Transform pos: -28.5,-63.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3622 components: - type: Transform pos: -30.5,-67.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3623 components: - type: Transform pos: -30.5,-68.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3624 components: - type: Transform pos: -30.5,-69.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3625 components: - type: Transform pos: -30.5,-70.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3626 components: - type: Transform pos: -32.5,-67.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3627 components: - type: Transform pos: -32.5,-68.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3628 components: - type: Transform pos: -32.5,-69.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3629 components: - type: Transform pos: -32.5,-70.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3674 components: - type: Transform pos: -33.5,-73.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3675 components: - type: Transform pos: -33.5,-74.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3676 components: - type: Transform pos: -33.5,-75.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3677 components: - type: Transform pos: -32.5,-75.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3678 components: - type: Transform pos: -31.5,-75.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3679 components: - type: Transform pos: -30.5,-75.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3684 components: - type: Transform pos: -11.5,-77.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3704 components: - type: Transform pos: 25.5,-62.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3721 components: - type: Transform pos: 38.5,-48.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3737 components: - type: Transform pos: 5.5,-50.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3744 components: - type: Transform pos: 7.5,-50.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3829 components: - type: Transform pos: 5.5,-78.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3893 components: - type: Transform pos: 0.5,-63.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3894 components: - type: Transform pos: 0.5,-62.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3899 components: - type: Transform pos: -3.5,45.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3901 components: - type: Transform pos: 0.5,-61.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3963 components: - type: Transform pos: -39.5,-45.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3965 components: - type: Transform pos: -26.5,-42.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3966 components: - type: Transform pos: -27.5,-42.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3967 components: - type: Transform pos: -28.5,-42.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3968 components: - type: Transform pos: -22.5,-40.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3972 components: - type: Transform pos: -21.5,-44.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3973 components: - type: Transform pos: -22.5,-44.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3974 components: - type: Transform pos: -22.5,-46.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3975 components: - type: Transform pos: -21.5,-46.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3976 components: - type: Transform pos: -20.5,-46.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3977 components: - type: Transform pos: -35.5,-42.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3979 components: - type: Transform pos: -37.5,-42.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4000 components: - type: Transform pos: 23.5,-40.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4006 components: - type: Transform pos: 23.5,-46.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4007 components: - type: Transform pos: 23.5,-47.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4008 components: - type: Transform pos: 23.5,-48.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4009 components: - type: Transform pos: 23.5,-49.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4010 components: - type: Transform pos: 23.5,-50.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4011 components: - type: Transform pos: 23.5,-51.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4012 components: - type: Transform pos: 23.5,-52.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4013 components: - type: Transform pos: 23.5,-53.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4014 components: - type: Transform pos: 23.5,-54.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4015 components: - type: Transform pos: 23.5,-55.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4016 components: - type: Transform pos: 23.5,-56.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4017 components: - type: Transform pos: 23.5,-57.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4018 components: - type: Transform pos: 21.5,-61.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4019 components: - type: Transform pos: 20.5,-61.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4020 components: - type: Transform pos: 19.5,-61.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4021 components: - type: Transform pos: 18.5,-61.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4022 components: - type: Transform pos: 17.5,-61.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4023 components: - type: Transform pos: 16.5,-61.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4024 components: - type: Transform pos: 15.5,-61.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4025 components: - type: Transform pos: 14.5,-61.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4026 components: - type: Transform pos: 13.5,-61.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4027 components: - type: Transform pos: 23.5,-58.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4034 components: - type: Transform pos: 12.5,-61.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4035 components: - type: Transform pos: 11.5,-61.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4036 components: - type: Transform pos: 22.5,-61.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4059 components: - type: Transform pos: 15.5,-45.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4060 components: - type: Transform pos: 15.5,-43.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4063 components: - type: Transform pos: 15.5,-41.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4072 components: - type: Transform pos: 86.5,-14.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4136 components: - type: Transform pos: -4.5,-24.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4137 components: - type: Transform pos: -34.5,-29.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4201 components: - type: Transform pos: -21.5,-77.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4202 components: - type: Transform pos: -21.5,-74.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4300 components: - type: Transform pos: -21.5,-75.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4523 components: - type: Transform pos: -21.5,-68.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4646 components: - type: Transform pos: -18.5,-74.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4679 components: - type: Transform pos: -5.5,-78.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4681 components: - type: Transform pos: 2.5,-78.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4686 components: - type: Transform pos: 0.5,-72.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4687 components: - type: Transform pos: -4.5,-78.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4689 components: - type: Transform pos: 3.5,-78.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4690 components: - type: Transform pos: -2.5,-72.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4691 components: - type: Transform pos: -1.5,-72.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4695 components: - type: Transform pos: -3.5,-78.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4697 components: - type: Transform pos: 4.5,-78.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4705 components: - type: Transform pos: -3.5,-79.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4836 components: - type: Transform pos: 1.5,-79.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4837 components: - type: Transform pos: 25.5,-63.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 5068 components: - type: Transform pos: -22.5,42.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 5076 components: - type: Transform pos: -17.5,36.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 5077 components: - type: Transform pos: 6.5,55.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 5084 components: - type: Transform pos: 4.5,50.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 5099 components: - type: Transform pos: 0.5,53.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 5100 components: - type: Transform pos: 0.5,55.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 5109 components: - type: Transform pos: 16.5,46.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 5111 components: - type: Transform pos: 12.5,41.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 5112 components: - type: Transform pos: 12.5,43.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 5233 components: - type: Transform pos: 50.5,-68.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 5234 components: - type: Transform pos: 50.5,-67.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 5255 components: - type: Transform pos: 12.5,42.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 5263 components: - type: Transform pos: 23.5,-34.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 5344 components: - type: Transform pos: 12.5,44.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 5596 components: - type: Transform pos: -24.5,46.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 5791 components: - type: Transform pos: -15.5,25.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 5826 components: - type: Transform pos: -3.5,-77.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 6334 components: - type: Transform pos: -2.5,21.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 6408 components: - type: Transform pos: 15.5,52.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 6419 components: - type: Transform pos: 14.5,52.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 6458 components: - type: Transform pos: 14.5,46.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 6524 components: - type: Transform pos: 0.5,40.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 6533 components: - type: Transform pos: 25.5,16.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 6606 components: - type: Transform pos: 1.5,45.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 6620 components: - type: Transform pos: 6.5,36.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 6652 components: - type: Transform pos: -16.5,36.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 6949 components: - type: Transform pos: 0.5,-3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 6953 components: - type: Transform pos: -1.5,-3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 6955 components: - type: Transform pos: 1.5,-3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 6956 components: - type: Transform pos: -4.5,-3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 6959 components: - type: Transform pos: -5.5,-3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7047 components: - type: Transform pos: -33.5,-36.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7147 components: - type: Transform pos: -33.5,-38.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7215 components: - type: Transform pos: 76.5,-48.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7266 components: - type: Transform pos: 10.5,-28.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7273 components: - type: Transform pos: 3.5,-3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7283 components: - type: Transform pos: 4.5,35.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7295 components: - type: Transform pos: -23.5,46.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7296 components: - type: Transform pos: -20.5,39.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7316 components: - type: Transform pos: -22.5,41.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7317 components: - type: Transform pos: -26.5,46.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7331 components: - type: Transform pos: 16.5,52.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7334 components: - type: Transform pos: 17.5,46.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7361 components: - type: Transform pos: 5.5,-26.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7397 components: - type: Transform pos: 38.5,11.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7398 components: - type: Transform pos: 38.5,12.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7399 components: - type: Transform pos: 38.5,15.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7400 components: - type: Transform pos: 38.5,16.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7401 components: - type: Transform pos: 38.5,17.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7420 components: - type: Transform pos: 37.5,17.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7421 components: - type: Transform pos: 36.5,17.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7422 components: - type: Transform pos: 35.5,17.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7423 components: - type: Transform pos: 34.5,17.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7424 components: - type: Transform pos: 33.5,17.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7425 components: - type: Transform pos: 32.5,17.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7426 components: - type: Transform pos: 31.5,17.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7427 components: - type: Transform pos: 30.5,17.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7428 components: - type: Transform pos: 29.5,17.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7429 components: - type: Transform pos: 28.5,17.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7430 components: - type: Transform pos: 28.5,16.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7431 components: - type: Transform pos: 28.5,15.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7432 components: - type: Transform pos: 28.5,14.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7433 components: - type: Transform pos: 37.5,6.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7434 components: - type: Transform pos: 36.5,6.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7435 components: - type: Transform pos: 35.5,6.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7436 components: - type: Transform pos: 34.5,6.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7437 components: - type: Transform pos: 33.5,6.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7438 components: - type: Transform pos: 32.5,6.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7439 components: - type: Transform pos: 31.5,6.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7440 components: - type: Transform pos: 30.5,6.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7441 components: - type: Transform pos: 28.5,6.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7442 components: - type: Transform pos: 28.5,7.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7443 components: - type: Transform pos: 28.5,8.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7444 components: - type: Transform pos: 28.5,9.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7449 components: - type: Transform pos: 28.5,12.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7450 components: - type: Transform pos: 28.5,11.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7459 components: - type: Transform pos: 29.5,6.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7624 components: - type: Transform pos: 15.5,46.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7652 components: - type: Transform pos: 10.5,22.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7677 components: - type: Transform pos: -13.5,25.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7689 components: - type: Transform pos: 12.5,22.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7697 components: - type: Transform pos: -7.5,50.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7699 components: - type: Transform pos: -7.5,52.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7709 components: - type: Transform pos: -27.5,46.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7769 components: - type: Transform pos: 1.5,27.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7794 components: - type: Transform pos: 17.5,52.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7837 components: - type: Transform pos: -28.5,44.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7848 components: - type: Transform pos: 8.5,46.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7873 components: - type: Transform pos: -2.5,14.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7887 components: - type: Transform pos: -2.5,6.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7888 components: - type: Transform pos: -2.5,7.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7908 components: - type: Transform pos: 1.5,47.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8005 components: - type: Transform pos: -14.5,-32.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8011 components: - type: Transform pos: -13.5,-32.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8021 components: - type: Transform pos: -12.5,-32.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8029 components: - type: Transform pos: 35.5,4.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8049 components: - type: Transform pos: -10.5,0.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8050 components: - type: Transform pos: -12.5,0.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8067 components: - type: Transform pos: -18.5,-17.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8068 components: - type: Transform pos: -18.5,-19.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8079 components: - type: Transform pos: 27.5,-72.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8088 components: - type: Transform pos: -12.5,-23.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8089 components: - type: Transform pos: -12.5,-24.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8108 components: - type: Transform pos: -14.5,-14.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8109 components: - type: Transform pos: -14.5,-13.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8111 components: - type: Transform pos: 27.5,-74.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8131 components: - type: Transform pos: -5.5,-28.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8132 components: - type: Transform pos: -4.5,-28.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8133 components: - type: Transform pos: -3.5,-28.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8152 components: - type: Transform pos: 2.5,-20.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8167 components: - type: Transform pos: -3.5,-20.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8207 components: - type: Transform pos: 2.5,-28.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8208 components: - type: Transform pos: 3.5,-28.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8209 components: - type: Transform pos: 4.5,-28.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8264 components: - type: Transform pos: -18.5,-29.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8283 components: - type: Transform pos: 10.5,-9.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8290 components: - type: Transform pos: -11.5,-7.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8291 components: - type: Transform pos: -11.5,-9.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8305 components: - type: Transform pos: -7.5,-3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8306 components: - type: Transform pos: 6.5,-3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8319 components: - type: Transform pos: 12.5,-6.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8320 components: - type: Transform pos: 13.5,-5.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8321 components: - type: Transform pos: 13.5,-3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8345 components: - type: Transform pos: -14.5,-4.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8346 components: - type: Transform pos: -14.5,-5.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8347 components: - type: Transform pos: -14.5,-6.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8348 components: - type: Transform pos: -14.5,-3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8349 components: - type: Transform pos: -13.5,-3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8350 components: - type: Transform pos: -12.5,-3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8351 components: - type: Transform pos: -11.5,-3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8352 components: - type: Transform pos: -10.5,-3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8353 components: - type: Transform pos: -9.5,-3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8354 components: - type: Transform pos: -8.5,-3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8355 components: - type: Transform pos: 10.5,-7.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8356 components: - type: Transform pos: 13.5,-6.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8357 components: - type: Transform pos: 13.5,-4.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8358 components: - type: Transform pos: 12.5,-3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8359 components: - type: Transform pos: 11.5,-3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8360 components: - type: Transform pos: 10.5,-3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8361 components: - type: Transform pos: 9.5,-3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8362 components: - type: Transform pos: 8.5,-3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8365 components: - type: Transform pos: 3.5,0.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8366 components: - type: Transform pos: -6.5,0.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8367 components: - type: Transform pos: -5.5,0.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8368 components: - type: Transform pos: 3.5,1.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8369 components: - type: Transform pos: -4.5,0.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8370 components: - type: Transform pos: 5.5,0.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8373 components: - type: Transform pos: -4.5,1.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8376 components: - type: Transform pos: 7.5,-3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8377 components: - type: Transform pos: 4.5,0.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8378 components: - type: Transform pos: -13.5,-6.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8380 components: - type: Transform pos: 4.5,-3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8381 components: - type: Transform pos: -2.5,-3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8382 components: - type: Transform pos: -0.5,-3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8428 components: - type: Transform pos: -3.5,46.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8458 components: - type: Transform pos: -15.5,18.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8459 components: - type: Transform pos: -14.5,18.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8461 components: - type: Transform pos: -13.5,18.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8463 components: - type: Transform pos: -12.5,16.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8480 components: - type: Transform pos: -0.5,-79.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8503 components: - type: Transform pos: 1.5,46.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8552 components: - type: Transform pos: 6.5,53.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8561 components: - type: Transform pos: 7.5,46.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8641 components: - type: Transform pos: 6.5,54.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8646 components: - type: Transform pos: -22.5,43.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8684 components: - type: Transform pos: -4.5,35.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8686 components: - type: Transform pos: 11.5,20.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8701 components: - type: Transform pos: -16.5,28.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8743 components: - type: Transform pos: -3.5,47.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8765 components: - type: Transform pos: -6.5,26.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8791 components: - type: Transform pos: 2.5,50.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8829 components: - type: Transform pos: 4.5,39.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8855 components: - type: Transform pos: -6.5,28.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8893 components: - type: Transform pos: -33.5,36.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8906 components: - type: Transform pos: -0.5,30.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8911 components: - type: Transform pos: -33.5,35.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8933 components: - type: Transform pos: 11.5,21.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8935 components: - type: Transform pos: -0.5,34.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8968 components: - type: Transform pos: -2.5,16.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8970 components: - type: Transform pos: -10.5,32.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8985 components: - type: Transform pos: -22.5,44.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8989 components: - type: Transform pos: -8.5,35.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8990 components: - type: Transform pos: -9.5,35.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 9107 components: - type: Transform pos: -7.5,30.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 9172 components: - type: Transform pos: 11.5,19.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 9173 components: - type: Transform pos: 13.5,21.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 9174 components: - type: Transform pos: 13.5,20.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 9175 components: - type: Transform pos: 13.5,19.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 9188 components: - type: Transform pos: 16.5,37.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 9195 components: - type: Transform pos: 17.5,33.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 9402 components: - type: Transform pos: 25.5,29.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 9601 components: - type: Transform pos: 17.5,32.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 9837 components: - type: Transform pos: -42.5,-32.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 9838 components: - type: Transform pos: -42.5,-26.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 10616 components: - type: Transform pos: 12.5,-28.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 10648 components: - type: Transform pos: 86.5,-6.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 10653 components: - type: Transform pos: 87.5,-2.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 10654 components: - type: Transform pos: 87.5,-14.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 10840 components: - type: Transform pos: -1.5,-79.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 10868 components: - type: Transform pos: 0.5,-79.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 11152 components: - type: Transform pos: 67.5,3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 11590 components: - type: Transform pos: -9.5,2.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 11646 components: - type: Transform pos: 57.5,9.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 11905 components: - type: Transform pos: -65.5,19.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 11907 components: - type: Transform pos: -68.5,16.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 11983 components: - type: Transform pos: -9.5,3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 11985 components: - type: Transform pos: 21.5,-15.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 11991 components: - type: Transform pos: 27.5,-62.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 11995 components: - type: Transform pos: 27.5,-63.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 11996 components: - type: Transform pos: 27.5,-64.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 12004 components: - type: Transform pos: 27.5,-65.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 12010 components: - type: Transform pos: 27.5,-66.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 12035 components: - type: Transform pos: -10.5,5.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 12260 components: - type: Transform pos: -12.5,5.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 12427 components: - type: Transform pos: -68.5,17.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 12485 components: - type: Transform pos: -74.5,-2.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 12495 components: - type: Transform pos: -66.5,7.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 12675 components: - type: Transform pos: 27.5,-67.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 12681 components: - type: Transform pos: 51.5,-60.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 12788 components: - type: Transform pos: 53.5,-56.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 13065 components: - type: Transform pos: 52.5,-56.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 13081 components: - type: Transform pos: 56.5,-56.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 13149 components: - type: Transform pos: -51.5,13.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 13210 components: - type: Transform pos: -36.5,17.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 13222 components: - type: Transform pos: -37.5,17.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 13223 components: - type: Transform pos: -38.5,17.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 13241 components: - type: Transform pos: -35.5,13.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 13242 components: - type: Transform pos: -36.5,13.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 13243 components: - type: Transform pos: -37.5,13.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 13244 components: - type: Transform pos: -38.5,13.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 13433 components: - type: Transform pos: -51.5,15.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 14137 components: - type: Transform pos: -42.5,-25.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 14138 components: - type: Transform pos: -42.5,-24.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 14139 components: - type: Transform pos: -39.5,-32.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 14140 components: - type: Transform pos: -44.5,-32.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 14698 components: - type: Transform pos: -8.5,-62.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 14770 components: - type: Transform pos: -29.5,-25.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 14945 components: - type: Transform pos: -29.5,-26.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 14969 components: - type: Transform pos: -34.5,-25.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 15004 components: - type: Transform pos: -30.5,-36.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 15005 components: - type: Transform pos: -30.5,-38.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 15574 components: - type: Transform pos: -36.5,-42.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 15747 components: - type: Transform pos: 8.5,-28.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 15749 components: - type: Transform pos: 6.5,-28.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 15882 components: - type: Transform pos: 27.5,-68.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 15969 components: - type: Transform pos: 3.5,-24.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 16354 components: - type: Transform pos: 23.5,16.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 16400 components: - type: Transform pos: 6.5,-58.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 16530 components: - type: Transform pos: 9.5,-58.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 16727 components: - type: Transform pos: 2.5,-77.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 16837 components: - type: Transform pos: 2.5,-79.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 16841 components: - type: Transform pos: -12.5,-71.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 16848 components: - type: Transform pos: -14.5,-71.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 16849 components: - type: Transform pos: -15.5,-77.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 16850 components: - type: Transform pos: -13.5,-71.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 16883 components: - type: Transform pos: -2.5,-79.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 16956 components: - type: Transform pos: 2.5,-41.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 17093 components: - type: Transform pos: 5.5,-45.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 17101 components: - type: Transform pos: 7.5,-45.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 17205 components: - type: Transform pos: 8.5,-44.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 17206 components: - type: Transform pos: 8.5,-43.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 17455 components: - type: Transform pos: 4.5,-49.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 17584 components: - type: Transform pos: 4.5,-46.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 17787 components: - type: Transform pos: 10.5,-75.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 18621 components: - type: Transform pos: -14.5,-15.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 18742 components: - type: Transform pos: -1.5,-65.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 18759 components: - type: Transform pos: -2.5,-65.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 19163 components: - type: Transform pos: -13.5,-77.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 19233 components: - type: Transform pos: 38.5,-45.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 19357 components: - type: Transform pos: 53.5,-60.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 19358 components: - type: Transform pos: 52.5,-60.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 19359 components: - type: Transform pos: 58.5,-60.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 19360 components: - type: Transform pos: 57.5,-60.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 19361 components: - type: Transform pos: 56.5,-60.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 19362 components: - type: Transform pos: 63.5,-60.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 19363 components: - type: Transform pos: 62.5,-60.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 19364 components: - type: Transform pos: 61.5,-60.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 19918 components: - type: Transform pos: 75.5,5.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 19943 components: - type: Transform pos: 57.5,-56.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 19945 components: - type: Transform pos: 63.5,-56.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 19955 components: - type: Transform pos: 3.5,-58.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 19975 components: - type: Transform pos: 58.5,-56.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 19978 components: - type: Transform pos: 61.5,-56.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20055 components: - type: Transform pos: 5.5,-58.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20065 components: - type: Transform pos: 2.5,-64.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20139 components: - type: Transform pos: -0.5,-65.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20181 components: - type: Transform pos: 92.5,-30.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20196 components: - type: Transform pos: 69.5,-16.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20370 components: - type: Transform pos: 51.5,-56.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20382 components: - type: Transform pos: 62.5,-56.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20872 components: - type: Transform pos: 64.5,-39.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 21186 components: - type: Transform pos: 71.5,-42.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 21188 components: - type: Transform pos: 72.5,-42.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 21372 components: - type: Transform pos: 64.5,-41.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 21450 components: - type: Transform pos: -22.5,-45.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 21461 components: - type: Transform pos: 2.5,-44.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 21471 components: - type: Transform pos: -34.5,-26.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 21482 components: - type: Transform pos: 11.5,-28.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 21623 components: - type: Transform pos: -34.5,-27.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 21994 components: - type: Transform pos: 13.5,-26.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22013 components: - type: Transform pos: 87.5,-6.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22023 components: - type: Transform pos: 45.5,-60.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22024 components: - type: Transform pos: 45.5,-59.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22025 components: - type: Transform pos: 45.5,-58.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22026 components: - type: Transform pos: 45.5,-57.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22027 components: - type: Transform pos: 44.5,-57.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22028 components: - type: Transform pos: 46.5,-57.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22246 components: - type: Transform pos: -7.5,9.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22257 components: - type: Transform pos: 67.5,0.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22271 components: - type: Transform pos: 86.5,-10.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22574 components: - type: Transform pos: 25.5,-65.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22696 components: - type: Transform pos: 27.5,-71.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22697 components: - type: Transform pos: 27.5,-73.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22700 components: - type: Transform pos: 27.5,-69.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22745 components: - type: Transform pos: -6.5,-78.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22755 components: - type: Transform pos: 1.5,-72.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22814 components: - type: Transform pos: 23.5,-45.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22848 components: - type: Transform pos: -18.5,-70.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22859 components: - type: Transform pos: 23.5,-44.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22860 components: - type: Transform pos: 23.5,-43.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22861 components: - type: Transform pos: 23.5,-42.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22862 components: - type: Transform pos: 23.5,-41.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22920 components: - type: Transform pos: 10.5,-72.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22966 components: - type: Transform pos: -14.5,-77.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22967 components: - type: Transform pos: -15.5,-71.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22968 components: - type: Transform pos: -11.5,-71.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22989 components: - type: Transform pos: -5.5,-66.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 23101 components: - type: Transform pos: -21.5,-70.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 23102 components: - type: Transform pos: -18.5,-68.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 23172 components: - type: Transform pos: 25.5,-67.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 23190 components: - type: Transform pos: -7.5,-66.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 23220 components: - type: Transform pos: 25.5,-69.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 23224 components: - type: Transform pos: 10.5,-51.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 23225 components: - type: Transform pos: 10.5,-52.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 23226 components: - type: Transform pos: 10.5,-53.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 23230 components: - type: Transform pos: -12.5,-77.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 23233 components: - type: Transform pos: 9.5,-64.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 23917 components: - type: Transform pos: -21.5,-82.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 24774 components: - type: Transform pos: 38.5,-49.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 25183 components: - type: Transform pos: -21.5,-73.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 25260 components: - type: Transform pos: 16.5,-82.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 25866 components: - type: Transform pos: -14.5,25.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 26008 components: - type: Transform pos: -19.5,-84.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 26064 components: - type: Transform pos: 25.5,-68.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 26066 components: - type: Transform pos: 25.5,-66.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 26080 components: - type: Transform pos: 8.5,-23.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 26087 components: - type: Transform pos: 25.5,-64.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 26275 components: - type: Transform pos: 2.5,39.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 26601 components: - type: Transform pos: 10.5,-32.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 26602 components: - type: Transform pos: 7.5,-23.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 26641 components: - type: Transform pos: 7.5,-58.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 26647 components: - type: Transform pos: 6.5,-23.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 26735 components: - type: Transform pos: 38.5,-46.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 26737 components: - type: Transform pos: -8.5,-64.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 26950 components: - type: Transform pos: 18.5,-82.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 26995 components: - type: Transform pos: 19.5,-82.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 26997 components: - type: Transform pos: 27.5,-78.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 27066 components: - type: Transform pos: 27.5,-79.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 27473 components: - type: Transform pos: 14.5,-82.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 27474 components: - type: Transform pos: 15.5,-82.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 27851 components: - type: Transform pos: 20.5,-82.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 27853 components: - type: Transform pos: 21.5,-82.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 27858 components: - type: Transform pos: 27.5,-80.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 27925 components: - type: Transform pos: 60.5,-69.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 28311 components: - type: Transform pos: -13.5,3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 28316 components: - type: Transform pos: -13.5,2.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 28359 components: - type: Transform pos: 13.5,-82.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 28655 components: - type: Transform pos: -35.5,0.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 28656 components: - type: Transform pos: -34.5,0.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 28657 components: - type: Transform pos: -33.5,0.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 28658 components: - type: Transform pos: -32.5,0.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 28659 components: - type: Transform pos: -30.5,0.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 28660 components: - type: Transform pos: -29.5,0.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 28661 components: - type: Transform pos: -28.5,0.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 28662 components: - type: Transform pos: -27.5,0.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - proto: RemoteSignaller entities: - uid: 5286 @@ -150084,144 +148208,106 @@ entities: - type: Transform pos: -31.5,-17.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 9150 components: - type: Transform rot: 1.5707963267948966 rad pos: -2.5,33.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 9164 components: - type: Transform rot: 1.5707963267948966 rad pos: -2.5,32.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 9165 components: - type: Transform rot: 1.5707963267948966 rad pos: -2.5,31.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 9243 components: - type: Transform pos: -30.5,-17.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 9698 components: - type: Transform pos: -4.5,29.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 11334 components: - type: Transform pos: 43.5,1.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20192 components: - type: Transform pos: 52.5,-15.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20193 components: - type: Transform pos: 53.5,-15.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20194 components: - type: Transform pos: 54.5,-15.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 28642 components: - type: Transform pos: -5.5,29.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 28706 components: - type: Transform rot: -1.5707963267948966 rad pos: -10.5,33.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 28707 components: - type: Transform rot: -1.5707963267948966 rad pos: -10.5,32.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 28708 components: - type: Transform pos: -7.5,30.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 28709 components: - type: Transform rot: 3.141592653589793 rad pos: -4.5,35.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 28710 components: - type: Transform rot: 3.141592653589793 rad pos: -9.5,35.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 28711 components: - type: Transform rot: 3.141592653589793 rad pos: -8.5,35.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 28712 components: - type: Transform rot: 1.5707963267948966 rad pos: -7.5,46.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 28713 components: - type: Transform rot: 1.5707963267948966 rad pos: -7.5,45.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - proto: ShuttersNormalOpen entities: - uid: 1454 @@ -150230,368 +148316,268 @@ entities: rot: -1.5707963267948966 rad pos: -34.5,-25.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1455 components: - type: Transform rot: -1.5707963267948966 rad pos: -34.5,-29.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1918 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,-61.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1923 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,-62.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1924 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,-63.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2941 components: - type: Transform pos: 20.5,-15.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3001 components: - type: Transform pos: 19.5,-15.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 5223 components: - type: Transform pos: -7.5,-66.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 5241 components: - type: Transform pos: -5.5,-66.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 5336 components: - type: Transform rot: -1.5707963267948966 rad pos: -14.5,-13.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 5338 components: - type: Transform rot: -1.5707963267948966 rad pos: -14.5,-14.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 5590 components: - type: Transform pos: -12.5,-24.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 5591 components: - type: Transform pos: -12.5,-23.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 5592 components: - type: Transform pos: -12.5,-22.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8158 components: - type: Transform pos: 6.5,-23.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 9923 components: - type: Transform pos: 10.5,-32.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 14148 components: - type: Transform pos: 21.5,-15.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 14850 components: - type: Transform rot: 1.5707963267948966 rad pos: -29.5,-26.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 15377 components: - type: Transform rot: -1.5707963267948966 rad pos: -34.5,-26.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 15391 components: - type: Transform pos: -31.5,-32.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 15422 components: - type: Transform rot: 1.5707963267948966 rad pos: -29.5,-29.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 15426 components: - type: Transform pos: -32.5,-32.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 15428 components: - type: Transform rot: 1.5707963267948966 rad pos: -29.5,-25.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 17669 components: - type: Transform rot: -1.5707963267948966 rad pos: -34.5,-27.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 17684 components: - type: Transform pos: -33.5,-32.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 17901 components: - type: Transform pos: -0.5,-65.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 18406 components: - type: Transform pos: -2.5,-65.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 19022 components: - type: Transform pos: 23.5,-17.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 19023 components: - type: Transform pos: 23.5,-18.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 19024 components: - type: Transform pos: 23.5,-19.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 19949 components: - type: Transform pos: 2.5,50.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 19959 components: - type: Transform pos: 4.5,50.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 19968 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,53.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 19983 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,54.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 19997 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,55.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20056 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,55.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20152 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,53.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22014 components: - type: Transform rot: -1.5707963267948966 rad pos: -14.5,-15.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22990 components: - type: Transform pos: -1.5,-65.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 26786 components: - type: Transform pos: -5.5,-3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 26787 components: - type: Transform pos: -4.5,-3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 26788 components: - type: Transform pos: -2.5,-3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 26789 components: - type: Transform pos: -1.5,-3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 26790 components: - type: Transform pos: -0.5,-3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 26791 components: - type: Transform pos: 0.5,-3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 26792 components: - type: Transform pos: 1.5,-3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 26793 components: - type: Transform pos: 4.5,-3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 26794 components: - type: Transform pos: 3.5,-3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 27220 components: - type: Transform pos: 7.5,-23.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 27221 components: - type: Transform pos: 8.5,-23.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - proto: ShuttersRadiationOpen entities: - uid: 3788 @@ -150599,29 +148585,21 @@ entities: - type: Transform pos: 0.5,-72.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3789 components: - type: Transform pos: 1.5,-72.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3868 components: - type: Transform pos: -2.5,-72.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3875 components: - type: Transform pos: -1.5,-72.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - proto: ShuttersWindowOpen entities: - uid: 10454 @@ -150629,8 +148607,6 @@ entities: - type: Transform pos: 35.5,-10.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - type: DeviceLinkSink invokeCounter: 2 - uid: 10455 @@ -150638,8 +148614,6 @@ entities: - type: Transform pos: 36.5,-10.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - type: DeviceLinkSink invokeCounter: 2 - uid: 10456 @@ -150647,8 +148621,6 @@ entities: - type: Transform pos: 37.5,-10.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - type: DeviceLinkSink invokeCounter: 2 - uid: 10457 @@ -150656,8 +148628,6 @@ entities: - type: Transform pos: 38.5,-10.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - type: DeviceLinkSink invokeCounter: 2 - uid: 20837 @@ -150665,120 +148635,86 @@ entities: - type: Transform pos: 61.5,-16.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20838 components: - type: Transform pos: 62.5,-16.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20839 components: - type: Transform pos: 63.5,-16.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20840 components: - type: Transform pos: 69.5,-16.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20841 components: - type: Transform pos: 70.5,-16.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20842 components: - type: Transform pos: 71.5,-16.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20843 components: - type: Transform pos: 68.5,-22.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20844 components: - type: Transform pos: 68.5,-23.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20845 components: - type: Transform pos: 68.5,-24.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20846 components: - type: Transform pos: 68.5,-28.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20847 components: - type: Transform pos: 68.5,-29.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20848 components: - type: Transform pos: 68.5,-30.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20849 components: - type: Transform pos: 64.5,-22.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20850 components: - type: Transform pos: 64.5,-23.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20851 components: - type: Transform pos: 68.5,-33.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20852 components: - type: Transform pos: 68.5,-34.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20853 components: - type: Transform pos: 68.5,-35.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - proto: ShuttleConsoleCircuitboard entities: - uid: 12454 @@ -150793,8 +148729,6 @@ entities: - type: Transform pos: 67.5,-75.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - proto: SignAi entities: - uid: 26944 @@ -155420,6 +153354,13 @@ entities: - type: Transform pos: -1.5,54.5 parent: 8364 +- proto: SpawnPointHeadOfSecurityWeapon + entities: + - uid: 965 + components: + - type: Transform + pos: -1.5,53.5 + parent: 8364 - proto: SpawnPointJanitor entities: - uid: 5858 @@ -155858,6 +153799,13 @@ entities: - type: Transform pos: -7.5,33.5 parent: 8364 +- proto: SpawnPointWardenWeapon + entities: + - uid: 5087 + components: + - type: Transform + pos: -7.5,34.5 + parent: 8364 - proto: SpawnVendingMachineRestockFoodDrink entities: - uid: 11918 @@ -162542,57 +160490,41 @@ entities: - type: Transform pos: 4.5,-32.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3460 components: - type: Transform pos: 29.5,-26.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3462 components: - type: Transform pos: 33.5,-26.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3537 components: - type: Transform pos: 31.5,-26.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 9179 components: - type: Transform pos: 43.5,-32.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 10766 components: - type: Transform pos: 74.5,-2.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 11031 components: - type: Transform pos: 43.5,-33.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 11575 components: - type: Transform pos: 43.5,-34.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - proto: ToiletDirtyWater entities: - uid: 6254 @@ -182980,13 +180912,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: WeaponSubMachineGunWt550 - entities: - - uid: 5089 - components: - - type: Transform - pos: -2.2235553,53.672165 - parent: 8364 - proto: WeedSpray entities: - uid: 8983 @@ -183162,22 +181087,16 @@ entities: - type: Transform pos: -31.5,41.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 12 components: - type: Transform pos: -29.5,41.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2030 components: - type: Transform pos: 58.5,-49.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 6249 components: - type: MetaData @@ -183186,8 +181105,6 @@ entities: rot: -1.5707963267948966 rad pos: -12.5,-22.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7107 components: - type: MetaData @@ -183196,8 +181113,6 @@ entities: rot: 1.5707963267948966 rad pos: 24.5,-2.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7119 components: - type: MetaData @@ -183206,8 +181121,6 @@ entities: rot: -1.5707963267948966 rad pos: 21.5,13.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7152 components: - type: MetaData @@ -183216,8 +181129,6 @@ entities: rot: 1.5707963267948966 rad pos: 24.5,10.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7170 components: - type: MetaData @@ -183226,31 +181137,23 @@ entities: rot: -1.5707963267948966 rad pos: 19.5,-2.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7303 components: - type: Transform rot: 3.141592653589793 rad pos: -24.5,39.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7793 components: - type: Transform rot: 1.5707963267948966 rad pos: 10.5,51.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 9108 components: - type: Transform pos: -4.5,29.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - type: DeviceLinkSource linkedPorts: 9095: @@ -183264,8 +181167,6 @@ entities: - type: Transform pos: -5.5,29.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - type: DeviceLinkSource linkedPorts: 9095: @@ -183280,16 +181181,12 @@ entities: rot: 3.141592653589793 rad pos: 20.5,27.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 9969 components: - type: Transform rot: 1.5707963267948966 rad pos: -53.5,12.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 10755 components: - type: MetaData @@ -183298,16 +181195,12 @@ entities: rot: -1.5707963267948966 rad pos: 60.5,-5.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 13452 components: - type: Transform rot: -1.5707963267948966 rad pos: -57.5,16.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 13541 components: - type: MetaData @@ -183315,8 +181208,6 @@ entities: - type: Transform pos: -22.5,3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 13542 components: - type: MetaData @@ -183324,8 +181215,6 @@ entities: - type: Transform pos: -19.5,3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20373 components: - type: MetaData @@ -183334,8 +181223,6 @@ entities: rot: 3.141592653589793 rad pos: 62.5,-16.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20374 components: - type: MetaData @@ -183344,8 +181231,6 @@ entities: rot: 3.141592653589793 rad pos: 70.5,-16.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20375 components: - type: MetaData @@ -183354,24 +181239,18 @@ entities: rot: 1.5707963267948966 rad pos: 64.5,-23.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 25650 components: - type: Transform rot: 3.141592653589793 rad pos: -23.5,39.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 28702 components: - type: Transform rot: 1.5707963267948966 rad pos: -2.5,31.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -183391,8 +181270,6 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,32.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -183412,8 +181289,6 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,33.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -183444,8 +181319,6 @@ entities: - type: Transform pos: 30.5,-8.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - proto: WindoorCargoLocked entities: - uid: 8182 @@ -183454,31 +181327,23 @@ entities: rot: 1.5707963267948966 rad pos: -24.5,-17.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 14511 components: - type: Transform pos: -24.5,-28.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 14957 components: - type: Transform rot: -1.5707963267948966 rad pos: -25.5,-17.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 14958 components: - type: Transform rot: -1.5707963267948966 rad pos: -25.5,-15.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 14983 components: - type: MetaData @@ -183487,8 +181352,6 @@ entities: rot: -1.5707963267948966 rad pos: -18.5,-18.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 14984 components: - type: MetaData @@ -183497,16 +181360,12 @@ entities: rot: -1.5707963267948966 rad pos: -23.5,-22.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22422 components: - type: Transform rot: 1.5707963267948966 rad pos: -24.5,-15.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - proto: WindoorHydroponicsLocked entities: - uid: 10633 @@ -183517,8 +181376,6 @@ entities: rot: 3.141592653589793 rad pos: 47.5,-10.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 10634 components: - type: MetaData @@ -183527,8 +181384,6 @@ entities: rot: 3.141592653589793 rad pos: 48.5,-10.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - proto: WindoorKitchenHydroponicsLocked entities: - uid: 9856 @@ -183537,8 +181392,6 @@ entities: rot: 1.5707963267948966 rad pos: 41.5,-6.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - proto: WindoorKitchenLocked entities: - uid: 10451 @@ -183549,8 +181402,6 @@ entities: rot: 1.5707963267948966 rad pos: 32.5,-7.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - proto: WindoorSecure entities: - uid: 13914 @@ -183559,8 +181410,6 @@ entities: rot: 3.141592653589793 rad pos: -57.5,-17.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - proto: WindoorSecureArmoryLocked entities: - uid: 9091 @@ -183569,16 +181418,12 @@ entities: rot: 1.5707963267948966 rad pos: -10.5,33.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 9092 components: - type: Transform rot: -1.5707963267948966 rad pos: -2.5,33.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -183598,8 +181443,6 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,32.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -183619,8 +181462,6 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,31.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -183640,8 +181481,6 @@ entities: rot: 3.141592653589793 rad pos: -4.5,29.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - type: DeviceLinkSink invokeCounter: 1 - uid: 9096 @@ -183650,8 +181489,6 @@ entities: rot: 3.141592653589793 rad pos: -5.5,29.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - type: DeviceLinkSink invokeCounter: 1 - proto: WindoorSecureBrigLocked @@ -183661,31 +181498,23 @@ entities: - type: Transform pos: -14.5,36.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8929 components: - type: Transform pos: -7.5,18.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 9056 components: - type: Transform rot: 3.141592653589793 rad pos: -10.5,22.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 9103 components: - type: Transform rot: -1.5707963267948966 rad pos: -10.5,33.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - proto: WindoorSecureChemistryLocked entities: - uid: 1758 @@ -183696,8 +181525,6 @@ entities: rot: -1.5707963267948966 rad pos: 23.5,-17.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2560 components: - type: MetaData @@ -183706,8 +181533,6 @@ entities: rot: 3.141592653589793 rad pos: 21.5,-23.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2563 components: - type: MetaData @@ -183716,23 +181541,17 @@ entities: rot: -1.5707963267948966 rad pos: 23.5,-19.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3002 components: - type: Transform pos: 20.5,-15.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 11570 components: - type: Transform rot: 3.141592653589793 rad pos: 20.5,-23.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - proto: WindoorSecureCommandLocked entities: - uid: 6394 @@ -183740,30 +181559,22 @@ entities: - type: Transform pos: 0.5,-20.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 15490 components: - type: Transform rot: 1.5707963267948966 rad pos: 8.5,-18.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 24941 components: - type: Transform pos: -1.5,-20.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 27823 components: - type: Transform pos: -0.5,-15.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - proto: WindoorSecureEngineeringLocked entities: - uid: 111 @@ -183772,24 +181583,18 @@ entities: rot: 3.141592653589793 rad pos: -5.5,5.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3730 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,-43.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 17660 components: - type: Transform rot: -1.5707963267948966 rad pos: 3.5,-42.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - proto: WindoorSecureHeadOfPersonnelLocked entities: - uid: 6248 @@ -183798,8 +181603,6 @@ entities: rot: 1.5707963267948966 rad pos: -12.5,-22.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - proto: WindoorSecureMedicalLocked entities: - uid: 2215 @@ -183808,32 +181611,24 @@ entities: rot: 1.5707963267948966 rad pos: 40.5,-19.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 25888 components: - type: Transform rot: 3.141592653589793 rad pos: 28.5,-19.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 25889 components: - type: Transform rot: 3.141592653589793 rad pos: 30.5,-19.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 25890 components: - type: Transform rot: 3.141592653589793 rad pos: 32.5,-19.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - proto: WindoorSecureScienceLocked entities: - uid: 2317 @@ -183842,8 +181637,6 @@ entities: rot: 3.141592653589793 rad pos: 73.5,-55.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20183 components: - type: MetaData @@ -183852,8 +181645,6 @@ entities: rot: -1.5707963267948966 rad pos: 75.5,-21.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20359 components: - type: MetaData @@ -183861,8 +181652,6 @@ entities: - type: Transform pos: 62.5,-16.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20360 components: - type: MetaData @@ -183871,8 +181660,6 @@ entities: rot: -1.5707963267948966 rad pos: 64.5,-23.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20361 components: - type: MetaData @@ -183880,24 +181667,18 @@ entities: - type: Transform pos: 70.5,-16.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20519 components: - type: Transform rot: 3.141592653589793 rad pos: 84.5,-37.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 21258 components: - type: Transform rot: 1.5707963267948966 rad pos: 55.5,-23.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - proto: WindoorSecureSecurityLocked entities: - uid: 12330 @@ -183908,15 +181689,11 @@ entities: rot: 3.141592653589793 rad pos: -58.5,2.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 25968 components: - type: Transform pos: 79.5,-4.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - proto: Window entities: - uid: 526 @@ -183924,666 +181701,476 @@ entities: - type: Transform pos: -62.5,-0.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 527 components: - type: Transform pos: -62.5,-1.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 558 components: - type: Transform pos: -67.5,11.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 668 components: - type: Transform pos: -62.5,-3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 685 components: - type: Transform pos: -62.5,-2.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 707 components: - type: Transform pos: -46.5,0.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 709 components: - type: Transform pos: -44.5,0.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 713 components: - type: Transform pos: -37.5,0.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 728 components: - type: Transform pos: -39.5,0.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1052 components: - type: Transform pos: 64.5,8.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1061 components: - type: Transform pos: 61.5,8.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1452 components: - type: Transform pos: -32.5,-3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1453 components: - type: Transform pos: -34.5,-3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1471 components: - type: Transform pos: -29.5,-19.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1475 components: - type: Transform pos: -29.5,-22.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1739 components: - type: Transform pos: 86.5,-37.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1740 components: - type: Transform pos: 85.5,-37.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1750 components: - type: Transform pos: 37.5,-27.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 1781 components: - type: Transform pos: 31.5,-15.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2224 components: - type: Transform pos: 29.5,-15.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2250 components: - type: Transform pos: 52.5,-38.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2490 components: - type: Transform pos: 24.5,-26.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2491 components: - type: Transform pos: 26.5,-31.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2530 components: - type: Transform pos: 64.5,-22.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2531 components: - type: Transform pos: 63.5,-25.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2532 components: - type: Transform pos: 61.5,-25.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2533 components: - type: Transform pos: 68.5,-28.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2534 components: - type: Transform pos: 68.5,-29.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2535 components: - type: Transform pos: 68.5,-30.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2538 components: - type: Transform pos: 67.5,-49.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2539 components: - type: Transform pos: 65.5,-49.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2546 components: - type: Transform pos: 27.5,-26.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2547 components: - type: Transform pos: 24.5,-31.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2558 components: - type: Transform pos: 30.5,-15.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2749 components: - type: Transform pos: 57.5,-11.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2750 components: - type: Transform pos: 59.5,-11.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2751 components: - type: Transform pos: 61.5,-11.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2752 components: - type: Transform pos: 66.5,-11.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2753 components: - type: Transform pos: 67.5,-11.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2754 components: - type: Transform pos: 68.5,-11.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2755 components: - type: Transform pos: 69.5,-11.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2756 components: - type: Transform pos: 70.5,-11.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2757 components: - type: Transform pos: 71.5,-11.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2758 components: - type: Transform pos: 72.5,-11.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2881 components: - type: Transform pos: 74.5,-7.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3181 components: - type: Transform pos: 78.5,-61.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3182 components: - type: Transform pos: 35.5,-61.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3183 components: - type: Transform pos: 34.5,-61.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3662 components: - type: Transform pos: 49.5,-1.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3663 components: - type: Transform pos: 27.5,-3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4245 components: - type: Transform pos: 59.5,-53.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4269 components: - type: Transform pos: 61.5,-53.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 5237 components: - type: Transform pos: 57.5,-53.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7236 components: - type: Transform pos: 23.5,-11.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7563 components: - type: Transform pos: 18.5,12.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7565 components: - type: Transform pos: 18.5,9.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7956 components: - type: Transform pos: 17.5,-9.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7958 components: - type: Transform pos: -18.5,-21.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7959 components: - type: Transform pos: -18.5,-22.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7960 components: - type: Transform pos: -18.5,-25.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7961 components: - type: Transform pos: -18.5,-26.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8030 components: - type: Transform pos: 17.5,-6.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 10533 components: - type: Transform pos: 47.5,-1.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 10788 components: - type: Transform pos: 70.5,-0.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 10789 components: - type: Transform pos: 68.5,-0.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 13741 components: - type: Transform pos: -20.5,8.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 13742 components: - type: Transform pos: -21.5,8.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 14197 components: - type: Transform pos: -40.5,-11.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 14488 components: - type: Transform pos: -19.5,-12.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 16152 components: - type: Transform pos: -43.5,-10.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 16156 components: - type: Transform pos: -42.5,-10.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 16170 components: - type: Transform pos: -40.5,-12.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 17852 components: - type: Transform pos: 40.5,-30.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 17858 components: - type: Transform pos: 41.5,-30.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 17867 components: - type: Transform pos: 39.5,-30.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 18566 components: - type: Transform pos: 38.5,-25.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 18711 components: - type: Transform pos: 38.5,-35.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 18721 components: - type: Transform pos: 38.5,-34.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 18743 components: - type: Transform pos: 38.5,-36.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 18957 components: - type: Transform pos: 42.5,-26.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 18978 components: - type: Transform pos: 42.5,-29.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 19025 components: - type: Transform pos: 27.5,-32.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 19049 components: - type: Transform pos: 34.5,-32.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 19050 components: - type: Transform pos: 37.5,-33.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 19187 components: - type: Transform pos: 43.5,-24.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 19190 components: - type: Transform pos: 43.5,-22.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20058 components: - type: Transform pos: 37.5,-28.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20692 components: - type: Transform pos: 56.5,-38.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 21355 components: - type: Transform pos: 57.5,-38.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 21369 components: - type: Transform pos: 51.5,-38.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22007 components: - type: Transform pos: 17.5,-3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 25919 components: - type: Transform pos: 41.5,-25.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 26617 components: - type: Transform pos: 15.5,-37.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 27606 components: - type: Transform pos: 44.5,-1.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 27607 components: - type: Transform pos: 42.5,-1.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - proto: WindowDirectional entities: - uid: 6916 @@ -184592,251 +182179,185 @@ entities: rot: 1.5707963267948966 rad pos: 24.5,-1.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7026 components: - type: Transform rot: 1.5707963267948966 rad pos: 24.5,0.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7044 components: - type: Transform rot: -1.5707963267948966 rad pos: 19.5,-0.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7052 components: - type: Transform rot: 1.5707963267948966 rad pos: 24.5,-0.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7070 components: - type: Transform rot: -1.5707963267948966 rad pos: 19.5,-1.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7085 components: - type: Transform pos: 23.5,-2.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7100 components: - type: Transform pos: 24.5,-2.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7126 components: - type: Transform pos: 21.5,-2.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7145 components: - type: Transform pos: 20.5,-2.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7212 components: - type: Transform pos: 22.5,-2.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7220 components: - type: Transform pos: 19.5,-2.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 9219 components: - type: Transform rot: 1.5707963267948966 rad pos: 18.5,28.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 9225 components: - type: Transform rot: 3.141592653589793 rad pos: 19.5,27.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 9262 components: - type: Transform rot: 3.141592653589793 rad pos: 21.5,27.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 9432 components: - type: Transform rot: 1.5707963267948966 rad pos: 21.5,27.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 9433 components: - type: Transform rot: 1.5707963267948966 rad pos: 21.5,26.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 9435 components: - type: Transform rot: 3.141592653589793 rad pos: 22.5,25.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 11383 components: - type: Transform rot: -1.5707963267948966 rad pos: 69.5,19.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 11384 components: - type: Transform rot: -1.5707963267948966 rad pos: 69.5,16.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 13855 components: - type: Transform rot: -1.5707963267948966 rad pos: -42.5,1.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 14928 components: - type: Transform rot: 1.5707963267948966 rad pos: -42.5,1.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 16365 components: - type: Transform pos: 59.5,-49.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 16366 components: - type: Transform pos: 57.5,-49.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 17715 components: - type: Transform pos: 60.5,-49.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 17843 components: - type: Transform rot: 3.141592653589793 rad pos: -42.5,1.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 18309 components: - type: Transform pos: -43.5,-17.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 20864 components: - type: Transform rot: -1.5707963267948966 rad pos: -43.5,-17.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 21256 components: - type: Transform rot: 1.5707963267948966 rad pos: 55.5,-22.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 21257 components: - type: Transform rot: 1.5707963267948966 rad pos: 55.5,-24.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 24877 components: - type: Transform pos: -41.5,-17.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 25896 components: - type: Transform pos: -42.5,-17.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 25946 components: - type: Transform rot: 3.141592653589793 rad pos: -43.5,-17.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 25948 components: - type: Transform pos: -42.5,1.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - proto: WindowFrostedDirectional entities: - uid: 6989 @@ -184844,67 +182365,49 @@ entities: - type: Transform pos: 19.5,-4.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 13476 components: - type: Transform pos: 20.5,-7.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 15731 components: - type: Transform rot: -1.5707963267948966 rad pos: 30.5,-36.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 15907 components: - type: Transform pos: 18.5,-7.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 17391 components: - type: Transform pos: 19.5,-7.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 17393 components: - type: Transform pos: 20.5,-4.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 18656 components: - type: Transform rot: -1.5707963267948966 rad pos: 33.5,-36.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 19332 components: - type: Transform pos: 18.5,-4.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 26598 components: - type: Transform rot: -1.5707963267948966 rad pos: 35.5,-36.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - proto: WindowReinforcedDirectional entities: - uid: 146 @@ -184913,832 +182416,616 @@ entities: rot: 1.5707963267948966 rad pos: -53.5,13.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 147 components: - type: Transform rot: 1.5707963267948966 rad pos: -53.5,14.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 149 components: - type: Transform rot: 1.5707963267948966 rad pos: -53.5,16.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 294 components: - type: Transform pos: -10.5,18.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 387 components: - type: Transform rot: -1.5707963267948966 rad pos: -9.5,23.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 388 components: - type: Transform rot: -1.5707963267948966 rad pos: -9.5,24.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 473 components: - type: Transform rot: 3.141592653589793 rad pos: -53.5,16.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 480 components: - type: Transform rot: -1.5707963267948966 rad pos: -57.5,13.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 492 components: - type: Transform rot: -1.5707963267948966 rad pos: -57.5,12.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 687 components: - type: Transform rot: 3.141592653589793 rad pos: -54.5,16.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 958 components: - type: Transform rot: 3.141592653589793 rad pos: -20.5,22.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2171 components: - type: Transform rot: 3.141592653589793 rad pos: 72.5,-55.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2345 components: - type: Transform rot: 1.5707963267948966 rad pos: 40.5,-18.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 2582 components: - type: Transform rot: 3.141592653589793 rad pos: 74.5,-55.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 3018 components: - type: Transform pos: 35.5,-68.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4374 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,-20.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4375 components: - type: Transform rot: 3.141592653589793 rad pos: 0.5,-20.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 4841 components: - type: Transform pos: 1.5,-46.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 5104 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,40.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 5448 components: - type: Transform pos: -3.5,18.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 5461 components: - type: Transform pos: -6.5,18.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 5698 components: - type: Transform pos: 7.5,-24.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 5702 components: - type: Transform rot: 1.5707963267948966 rad pos: 8.5,-24.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 5703 components: - type: Transform pos: 8.5,-24.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 5714 components: - type: Transform pos: 6.5,-24.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 5866 components: - type: Transform pos: -8.5,18.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7034 components: - type: Transform rot: 3.141592653589793 rad pos: 23.5,13.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7060 components: - type: Transform rot: 3.141592653589793 rad pos: 21.5,13.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7061 components: - type: Transform rot: -1.5707963267948966 rad pos: 21.5,12.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7063 components: - type: Transform pos: 23.5,10.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7075 components: - type: Transform pos: 24.5,10.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7117 components: - type: Transform rot: -1.5707963267948966 rad pos: 21.5,10.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7131 components: - type: Transform rot: -1.5707963267948966 rad pos: 21.5,11.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7139 components: - type: Transform rot: 3.141592653589793 rad pos: 24.5,13.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7157 components: - type: Transform rot: 3.141592653589793 rad pos: 22.5,13.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7211 components: - type: Transform pos: 21.5,10.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7218 components: - type: Transform rot: 1.5707963267948966 rad pos: 24.5,13.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7222 components: - type: Transform rot: 1.5707963267948966 rad pos: 24.5,12.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7230 components: - type: Transform pos: 22.5,10.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7240 components: - type: Transform rot: 1.5707963267948966 rad pos: 24.5,11.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7336 components: - type: Transform rot: 3.141592653589793 rad pos: 10.5,50.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 7792 components: - type: Transform rot: 1.5707963267948966 rad pos: 9.5,40.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8630 components: - type: Transform pos: -4.5,18.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8643 components: - type: Transform pos: 10.5,47.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8730 components: - type: Transform pos: -5.5,18.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8775 components: - type: Transform pos: -9.5,18.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8807 components: - type: Transform pos: -11.5,18.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8839 components: - type: Transform rot: 3.141592653589793 rad pos: -17.5,22.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8875 components: - type: Transform pos: -20.5,22.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8975 components: - type: Transform pos: -17.5,22.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 8976 components: - type: Transform rot: 1.5707963267948966 rad pos: -20.5,22.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 9131 components: - type: Transform rot: 3.141592653589793 rad pos: -11.5,22.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 9824 components: - type: Transform pos: -14.5,-26.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 11540 components: - type: Transform pos: -8.5,3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 11708 components: - type: Transform pos: 50.5,17.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 12223 components: - type: Transform pos: -54.5,12.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 12386 components: - type: Transform rot: 3.141592653589793 rad pos: -57.5,16.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 12387 components: - type: Transform pos: -53.5,12.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 13453 components: - type: Transform rot: 3.141592653589793 rad pos: -56.5,16.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 13454 components: - type: Transform rot: -1.5707963267948966 rad pos: -57.5,15.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 13534 components: - type: Transform rot: -1.5707963267948966 rad pos: -14.5,-23.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 13535 components: - type: Transform rot: -1.5707963267948966 rad pos: -14.5,-24.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 13536 components: - type: Transform rot: -1.5707963267948966 rad pos: -14.5,-25.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 13537 components: - type: Transform rot: -1.5707963267948966 rad pos: -14.5,-26.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 13538 components: - type: Transform rot: 1.5707963267948966 rad pos: -14.5,-26.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 13544 components: - type: Transform rot: 1.5707963267948966 rad pos: -14.5,-25.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 13589 components: - type: Transform pos: -55.5,12.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 13619 components: - type: Transform rot: 1.5707963267948966 rad pos: -14.5,-24.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 13620 components: - type: Transform rot: 1.5707963267948966 rad pos: -14.5,-23.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 13660 components: - type: Transform rot: 3.141592653589793 rad pos: -14.5,-23.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 13695 components: - type: Transform pos: -56.5,12.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 13830 components: - type: Transform rot: 3.141592653589793 rad pos: -40.5,9.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 13912 components: - type: Transform rot: 3.141592653589793 rad pos: -59.5,-17.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 13913 components: - type: Transform rot: 3.141592653589793 rad pos: -58.5,-17.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 13915 components: - type: Transform rot: -1.5707963267948966 rad pos: -37.5,-13.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 13919 components: - type: Transform rot: -1.5707963267948966 rad pos: -37.5,-11.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 14086 components: - type: Transform rot: -1.5707963267948966 rad pos: -37.5,-12.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 14155 components: - type: Transform rot: -1.5707963267948966 rad pos: -37.5,-10.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 15606 components: - type: Transform rot: -1.5707963267948966 rad pos: 21.5,-23.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 15934 components: - type: Transform rot: 3.141592653589793 rad pos: -18.5,-62.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 18920 components: - type: Transform pos: 22.5,-20.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 21305 components: - type: Transform rot: 1.5707963267948966 rad pos: 71.5,-33.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 21306 components: - type: Transform rot: 1.5707963267948966 rad pos: 71.5,-34.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 21307 components: - type: Transform rot: 1.5707963267948966 rad pos: 71.5,-35.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 21433 components: - type: Transform pos: 71.5,-59.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22607 components: - type: Transform rot: 1.5707963267948966 rad pos: 33.5,-20.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22608 components: - type: Transform rot: 1.5707963267948966 rad pos: 33.5,-19.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22609 components: - type: Transform rot: 3.141592653589793 rad pos: 27.5,-19.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22610 components: - type: Transform rot: -1.5707963267948966 rad pos: 27.5,-20.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 22611 components: - type: Transform rot: -1.5707963267948966 rad pos: 27.5,-19.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 23913 components: - type: Transform rot: -1.5707963267948966 rad pos: 0.5,-20.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 25651 components: - type: Transform pos: -18.5,22.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 25652 components: - type: Transform rot: 3.141592653589793 rad pos: -18.5,22.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 25653 components: - type: Transform rot: -1.5707963267948966 rad pos: -18.5,22.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 25885 components: - type: Transform rot: 3.141592653589793 rad pos: 33.5,-19.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 25886 components: - type: Transform rot: 3.141592653589793 rad pos: 31.5,-19.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 25887 components: - type: Transform rot: 3.141592653589793 rad pos: 29.5,-19.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 26260 components: - type: Transform pos: 21.5,-20.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 26856 components: - type: Transform rot: 1.5707963267948966 rad pos: 60.5,-29.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 26857 components: - type: Transform rot: 1.5707963267948966 rad pos: 60.5,-31.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 27435 components: - type: Transform rot: -1.5707963267948966 rad pos: 1.5,-66.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 27436 components: - type: Transform rot: -1.5707963267948966 rad pos: 1.5,-65.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 27604 components: - type: Transform rot: -1.5707963267948966 rad pos: -33.5,-19.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 27605 components: - type: Transform rot: -1.5707963267948966 rad pos: -33.5,-18.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 28122 components: - type: Transform rot: 3.141592653589793 rad pos: -1.5,-20.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 28123 components: - type: Transform rot: 1.5707963267948966 rad pos: -1.5,-20.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 28124 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,-20.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - uid: 28315 components: - type: Transform pos: -14.5,3.5 parent: 8364 - - type: DeltaPressure - gridUid: 8364 - proto: Wirecutter entities: - uid: 11686 From c272ea4d2e56c63cb45350100d1d173c75bf2bf8 Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Tue, 4 Nov 2025 13:20:30 -0700 Subject: [PATCH 106/121] elkridge update (#41295) --- Resources/Maps/elkridge.yml | 44 ++++++++++++++----------------------- 1 file changed, 16 insertions(+), 28 deletions(-) diff --git a/Resources/Maps/elkridge.yml b/Resources/Maps/elkridge.yml index 9929e25111..27bc203981 100644 --- a/Resources/Maps/elkridge.yml +++ b/Resources/Maps/elkridge.yml @@ -4,8 +4,8 @@ meta: engineVersion: 267.3.0 forkId: "" forkVersion: "" - time: 11/01/2025 07:57:27 - entityCount: 18699 + time: 11/04/2025 19:47:26 + entityCount: 18697 maps: - 1 grids: @@ -91608,18 +91608,6 @@ entities: - type: Transform pos: -18.5,15.5 parent: 2 -- proto: MagazinePistolSubMachineGunTopMounted - entities: - - uid: 17542 - components: - - type: Transform - pos: -2.0215707,-37.446384 - parent: 2 - - uid: 17543 - components: - - type: Transform - pos: -1.9121957,-37.30576 - parent: 2 - proto: MailingUnit entities: - uid: 11816 @@ -104364,6 +104352,13 @@ entities: - type: Transform pos: -32.5,-11.5 parent: 2 +- proto: SpawnPointHeadOfSecurityWeapon + entities: + - uid: 17541 + components: + - type: Transform + pos: -2.5,-37.5 + parent: 2 - proto: SpawnPointJanitor entities: - uid: 987 @@ -104677,6 +104672,13 @@ entities: - type: Transform pos: -4.5,-29.5 parent: 2 +- proto: SpawnPointWardenWeapon + entities: + - uid: 15170 + components: + - type: Transform + pos: -5.5,-32.5 + parent: 2 - proto: SpawnVendingMachineRestockFoodDrink entities: - uid: 1625 @@ -124298,20 +124300,6 @@ entities: - type: Transform pos: 15.412306,-25.452839 parent: 2 -- proto: WeaponShotgunEnforcerRubber - entities: - - uid: 15170 - components: - - type: Transform - pos: -5.520319,-32.186012 - parent: 2 -- proto: WeaponSubMachineGunWt550 - entities: - - uid: 17541 - components: - - type: Transform - pos: -2.6153207,-37.27451 - parent: 2 - proto: Welder entities: - uid: 6643 From 9ba2f9b9f7bbea241286a09b2235c44d5a54f367 Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Tue, 4 Nov 2025 13:21:46 -0700 Subject: [PATCH 107/121] plasma update (#41296) --- Resources/Maps/plasma.yml | 1711 +------------------------------------ 1 file changed, 19 insertions(+), 1692 deletions(-) diff --git a/Resources/Maps/plasma.yml b/Resources/Maps/plasma.yml index 31c56aee2e..f24982f120 100644 --- a/Resources/Maps/plasma.yml +++ b/Resources/Maps/plasma.yml @@ -1,11 +1,11 @@ meta: format: 7 category: Map - engineVersion: 267.2.0 + engineVersion: 267.3.0 forkId: "" forkVersion: "" - time: 10/12/2025 22:58:09 - entityCount: 26498 + time: 11/04/2025 19:56:01 + entityCount: 26497 maps: - 1 grids: @@ -14621,7 +14621,7 @@ entities: pos: -131.5,-45.5 parent: 2 - type: Door - secondsUntilStateChange: -62401.16 + secondsUntilStateChange: -62428.875 state: Opening - type: DeviceLinkSource lastSignals: @@ -129169,18 +129169,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: MagazinePistolSubMachineGunTopMounted - entities: - - uid: 8276 - components: - - type: Transform - pos: -77.744835,-33.616684 - parent: 2 - - uid: 24471 - components: - - type: Transform - pos: -77.369835,-33.429184 - parent: 2 - proto: MagazineRifle entities: - uid: 11228 @@ -131181,174 +131169,130 @@ entities: - type: Transform pos: -26.5,-65.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6025 components: - type: Transform rot: 1.5707963267948966 rad pos: -27.5,-66.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6031 components: - type: Transform rot: 1.5707963267948966 rad pos: -27.5,-67.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9355 components: - type: Transform rot: 3.141592653589793 rad pos: -26.5,-68.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12207 components: - type: Transform pos: -25.5,-65.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15446 components: - type: Transform rot: 3.141592653589793 rad pos: -25.5,-68.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16456 components: - type: Transform rot: -1.5707963267948966 rad pos: -24.5,-67.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23312 components: - type: Transform rot: 1.5707963267948966 rad pos: -121.5,-62.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23373 components: - type: Transform rot: -1.5707963267948966 rad pos: -119.5,-63.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23392 components: - type: Transform rot: -1.5707963267948966 rad pos: -119.5,-60.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23441 components: - type: Transform rot: 1.5707963267948966 rad pos: -121.5,-61.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23448 components: - type: Transform rot: -1.5707963267948966 rad pos: -119.5,-61.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23450 components: - type: Transform rot: -1.5707963267948966 rad pos: -119.5,-62.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23451 components: - type: Transform rot: 1.5707963267948966 rad pos: -121.5,-59.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23452 components: - type: Transform rot: 1.5707963267948966 rad pos: -121.5,-60.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23453 components: - type: Transform rot: 1.5707963267948966 rad pos: -121.5,-63.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23454 components: - type: Transform rot: -1.5707963267948966 rad pos: -119.5,-59.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23845 components: - type: Transform rot: -1.5707963267948966 rad pos: -118.5,-74.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24260 components: - type: Transform rot: -1.5707963267948966 rad pos: -118.5,-70.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24872 components: - type: Transform rot: 3.141592653589793 rad pos: -122.5,-73.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24925 components: - type: Transform pos: -122.5,-71.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24926 components: - type: Transform rot: 1.5707963267948966 rad pos: -123.5,-72.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: PlasmaTank entities: - uid: 2843 @@ -131384,54 +131328,40 @@ entities: rot: 3.141592653589793 rad pos: -117.5,-74.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24896 components: - type: Transform rot: 3.141592653589793 rad pos: -118.5,-74.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24897 components: - type: Transform pos: -118.5,-70.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24903 components: - type: Transform pos: -117.5,-70.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24932 components: - type: Transform rot: -1.5707963267948966 rad pos: -121.5,-72.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24937 components: - type: Transform rot: -1.5707963267948966 rad pos: -121.5,-82.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24938 components: - type: Transform rot: 1.5707963267948966 rad pos: -119.5,-82.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: PlasmaWindowDirectional entities: - uid: 6607 @@ -131440,22 +131370,16 @@ entities: rot: 1.5707963267948966 rad pos: -78.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21053 components: - type: Transform pos: -39.5,-72.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21054 components: - type: Transform pos: -37.5,-72.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: PlasticFlapsAirtightClear entities: - uid: 964 @@ -136812,827 +136736,591 @@ entities: - type: Transform pos: -110.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 667 components: - type: Transform pos: -112.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 670 components: - type: Transform pos: -110.5,0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 673 components: - type: Transform pos: -109.5,0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 675 components: - type: Transform pos: -111.5,0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 807 components: - type: Transform pos: -124.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1870 components: - type: Transform pos: -111.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1984 components: - type: Transform pos: -109.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2453 components: - type: Transform pos: -148.5,-50.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5278 components: - type: Transform pos: -112.5,7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5279 components: - type: Transform pos: -112.5,8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5280 components: - type: Transform pos: -108.5,7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5281 components: - type: Transform pos: -108.5,8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5282 components: - type: Transform pos: -108.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5283 components: - type: Transform pos: -112.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5284 components: - type: Transform pos: -112.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5285 components: - type: Transform pos: -112.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5286 components: - type: Transform pos: -108.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5287 components: - type: Transform pos: -108.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5288 components: - type: Transform pos: -108.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5289 components: - type: Transform pos: -114.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5290 components: - type: Transform pos: -114.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5291 components: - type: Transform pos: -114.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5292 components: - type: Transform pos: -106.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5293 components: - type: Transform pos: -106.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5294 components: - type: Transform pos: -106.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5295 components: - type: Transform pos: -114.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5296 components: - type: Transform pos: -114.5,8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5297 components: - type: Transform pos: -114.5,7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5298 components: - type: Transform pos: -106.5,7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5299 components: - type: Transform pos: -106.5,8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5300 components: - type: Transform pos: -106.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5342 components: - type: Transform pos: -126.5,7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5345 components: - type: Transform pos: -124.5,13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5359 components: - type: Transform pos: -124.5,7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5360 components: - type: Transform pos: -124.5,10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5361 components: - type: Transform pos: -126.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5378 components: - type: Transform pos: -124.5,5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5380 components: - type: Transform pos: -124.5,12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5418 components: - type: Transform pos: -126.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5419 components: - type: Transform pos: -126.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5434 components: - type: Transform pos: -124.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5443 components: - type: Transform pos: -124.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5450 components: - type: Transform pos: -124.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5470 components: - type: Transform pos: -124.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5479 components: - type: Transform pos: -124.5,11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5480 components: - type: Transform pos: -124.5,8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5505 components: - type: Transform pos: -142.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5506 components: - type: Transform pos: -142.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5941 components: - type: Transform pos: -146.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5942 components: - type: Transform pos: -148.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5943 components: - type: Transform pos: -147.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5944 components: - type: Transform pos: -148.5,0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5945 components: - type: Transform pos: -146.5,0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5946 components: - type: Transform pos: -147.5,0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5981 components: - type: Transform pos: -142.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5990 components: - type: Transform pos: -152.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5999 components: - type: Transform pos: -148.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6005 components: - type: Transform pos: -142.5,-6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6082 components: - type: Transform pos: -148.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6083 components: - type: Transform pos: -146.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6084 components: - type: Transform pos: -147.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6091 components: - type: Transform pos: -146.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6092 components: - type: Transform pos: -148.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6096 components: - type: Transform pos: -153.5,-48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6101 components: - type: Transform pos: -146.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6103 components: - type: Transform pos: -146.5,-41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6245 components: - type: Transform pos: -68.5,-71.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6924 components: - type: Transform pos: -126.5,13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7167 components: - type: Transform pos: -146.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7192 components: - type: Transform pos: -148.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7211 components: - type: Transform pos: -148.5,-41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7247 components: - type: Transform pos: -148.5,-49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7307 components: - type: Transform pos: -155.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7317 components: - type: Transform pos: -155.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7839 components: - type: Transform pos: -143.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7840 components: - type: Transform pos: -151.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7842 components: - type: Transform pos: -146.5,-50.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7856 components: - type: Transform pos: -155.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7890 components: - type: Transform pos: -69.5,-71.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9817 components: - type: Transform pos: -126.5,5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9912 components: - type: Transform pos: -126.5,11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13497 components: - type: Transform pos: -109.5,10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13498 components: - type: Transform pos: -110.5,10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13499 components: - type: Transform pos: -111.5,10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13661 components: - type: Transform pos: -146.5,-49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13662 components: - type: Transform pos: -151.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13664 components: - type: Transform pos: -151.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13670 components: - type: Transform pos: -151.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13718 components: - type: Transform pos: -143.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14110 components: - type: Transform pos: -67.5,-71.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14756 components: - type: Transform pos: -67.5,-70.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16466 components: - type: Transform pos: -153.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20368 components: - type: Transform pos: -124.5,-72.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20411 components: - type: Transform pos: -122.5,-78.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23079 components: - type: Transform pos: -124.5,-73.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23103 components: - type: Transform pos: -114.5,-73.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23104 components: - type: Transform pos: -114.5,-71.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23108 components: - type: Transform pos: -114.5,-72.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23396 components: - type: Transform pos: -116.5,-71.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23401 components: - type: Transform pos: -120.5,-81.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23498 components: - type: Transform pos: -116.5,-72.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23716 components: - type: Transform pos: -69.5,-70.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24847 components: - type: Transform pos: -116.5,-65.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24880 components: - type: Transform pos: -118.5,-64.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24887 components: - type: Transform pos: -116.5,-73.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24888 components: - type: Transform pos: -126.5,-73.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24889 components: - type: Transform pos: -126.5,-72.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24890 components: - type: Transform pos: -126.5,-71.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24891 components: - type: Transform pos: -124.5,-71.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24894 components: - type: Transform pos: -122.5,-64.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24901 components: - type: Transform pos: -124.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24921 components: - type: Transform pos: -123.5,-78.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24933 components: - type: Transform pos: -121.5,-78.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24934 components: - type: Transform pos: -119.5,-78.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24935 components: - type: Transform pos: -118.5,-78.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24936 components: - type: Transform pos: -117.5,-78.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 25187 components: - type: Transform pos: -124.5,-65.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: ReinforcedPlasmaWindowDiagonal entities: - uid: 7308 @@ -137640,47 +137328,35 @@ entities: - type: Transform pos: -155.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7324 components: - type: Transform pos: -154.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7332 components: - type: Transform rot: 3.141592653589793 rad pos: -154.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7333 components: - type: Transform rot: 1.5707963267948966 rad pos: -154.5,-48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7334 components: - type: Transform rot: -1.5707963267948966 rad pos: -154.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7342 components: - type: Transform rot: 1.5707963267948966 rad pos: -155.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: ReinforcedWindow entities: - uid: 4 @@ -137688,2626 +137364,1876 @@ entities: - type: Transform pos: -114.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10 components: - type: Transform pos: -69.5,5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18 components: - type: Transform pos: -69.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 31 components: - type: Transform pos: -69.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 46 components: - type: Transform pos: -66.5,8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 47 components: - type: Transform pos: -64.5,8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 48 components: - type: Transform pos: -65.5,8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 49 components: - type: Transform pos: -64.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 50 components: - type: Transform pos: -62.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 51 components: - type: Transform pos: -61.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 52 components: - type: Transform pos: -60.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 54 components: - type: Transform pos: -58.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 56 components: - type: Transform pos: -58.5,8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 57 components: - type: Transform pos: -57.5,8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 58 components: - type: Transform pos: -56.5,8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 59 components: - type: Transform pos: -53.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 60 components: - type: Transform pos: -53.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 61 components: - type: Transform pos: -53.5,5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 71 components: - type: Transform pos: -59.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 73 components: - type: Transform pos: -101.5,31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 107 components: - type: Transform pos: -65.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 109 components: - type: Transform pos: -65.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 110 components: - type: Transform pos: -64.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 111 components: - type: Transform pos: -63.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 112 components: - type: Transform pos: -62.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 113 components: - type: Transform pos: -60.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 114 components: - type: Transform pos: -59.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 116 components: - type: Transform pos: -58.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 117 components: - type: Transform pos: -57.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 118 components: - type: Transform pos: -57.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 141 components: - type: Transform pos: -63.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 167 components: - type: Transform pos: -52.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 171 components: - type: Transform pos: -51.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 178 components: - type: Transform pos: -31.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 249 components: - type: Transform pos: -31.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 285 components: - type: Transform pos: -82.5,-6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 287 components: - type: Transform pos: -85.5,-6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 291 components: - type: Transform pos: -84.5,-6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 316 components: - type: Transform pos: -35.5,-25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 320 components: - type: Transform pos: -34.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 322 components: - type: Transform pos: -32.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 351 components: - type: Transform pos: -93.5,13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 398 components: - type: Transform pos: -48.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 420 components: - type: Transform pos: -92.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 474 components: - type: Transform pos: -66.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 504 components: - type: Transform pos: -116.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 751 components: - type: Transform pos: -83.5,14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 787 components: - type: Transform pos: -138.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 953 components: - type: Transform pos: -83.5,15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1014 components: - type: Transform pos: -53.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1015 components: - type: Transform pos: -54.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1170 components: - type: Transform pos: -35.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1174 components: - type: Transform pos: -35.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1176 components: - type: Transform pos: -35.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1252 components: - type: Transform pos: -20.5,-48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1253 components: - type: Transform pos: -20.5,-52.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1254 components: - type: Transform pos: -20.5,-54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1312 components: - type: Transform pos: -31.5,-2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1313 components: - type: Transform pos: -31.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1314 components: - type: Transform pos: -31.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1331 components: - type: Transform pos: -117.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1534 components: - type: Transform pos: -20.5,-50.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1676 components: - type: Transform pos: -93.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1712 components: - type: Transform pos: -24.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1713 components: - type: Transform pos: -27.5,7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1714 components: - type: Transform pos: -27.5,5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1738 components: - type: Transform pos: -101.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1809 components: - type: Transform pos: -56.5,-79.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1810 components: - type: Transform pos: -55.5,-79.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1864 components: - type: Transform pos: -117.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1873 components: - type: Transform pos: -106.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1888 components: - type: Transform pos: -34.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1892 components: - type: Transform pos: -106.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1950 components: - type: Transform pos: -106.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1978 components: - type: Transform pos: -32.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2053 components: - type: Transform pos: -95.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2054 components: - type: Transform pos: -95.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2129 components: - type: Transform pos: -33.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2196 components: - type: Transform pos: -119.5,-54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2221 components: - type: Transform pos: -123.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2222 components: - type: Transform pos: -123.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2223 components: - type: Transform pos: -123.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2238 components: - type: Transform pos: -123.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2363 components: - type: Transform pos: -89.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2365 components: - type: Transform pos: -89.5,-25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2367 components: - type: Transform pos: -93.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2533 components: - type: Transform pos: -121.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2648 components: - type: Transform pos: -89.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2682 components: - type: Transform pos: -63.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2695 components: - type: Transform pos: -59.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2852 components: - type: Transform pos: -51.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2853 components: - type: Transform pos: -50.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2854 components: - type: Transform pos: -49.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2855 components: - type: Transform pos: -45.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2856 components: - type: Transform pos: -43.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2857 components: - type: Transform pos: -44.5,3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2906 components: - type: Transform pos: -47.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2939 components: - type: Transform pos: -50.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2947 components: - type: Transform pos: -52.5,-10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2948 components: - type: Transform pos: -51.5,-10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2949 components: - type: Transform pos: -50.5,-10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3313 components: - type: Transform pos: -8.5,7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3415 components: - type: Transform pos: -48.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3751 components: - type: Transform pos: -7.5,5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3775 components: - type: Transform pos: -9.5,7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3785 components: - type: Transform pos: -7.5,7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3809 components: - type: Transform pos: -67.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3828 components: - type: Transform pos: -48.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3829 components: - type: Transform pos: -48.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3960 components: - type: Transform pos: -31.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3963 components: - type: Transform pos: -31.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3970 components: - type: Transform pos: -29.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4017 components: - type: Transform pos: -89.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4129 components: - type: Transform pos: -101.5,-24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4229 components: - type: Transform pos: -83.5,24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4230 components: - type: Transform pos: -83.5,23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4231 components: - type: Transform pos: -83.5,25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4287 components: - type: Transform pos: -31.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4526 components: - type: Transform pos: -84.5,-0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4541 components: - type: Transform pos: -97.5,9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4548 components: - type: Transform pos: -97.5,14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4583 components: - type: Transform pos: -80.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4629 components: - type: Transform pos: -97.5,10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4630 components: - type: Transform pos: -9.5,5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4674 components: - type: Transform pos: -8.5,5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4693 components: - type: Transform pos: -85.5,33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4698 components: - type: Transform pos: -85.5,35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4710 components: - type: Transform pos: -83.5,29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4711 components: - type: Transform pos: -83.5,30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4712 components: - type: Transform pos: -83.5,28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4725 components: - type: Transform pos: -87.5,26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4726 components: - type: Transform pos: -85.5,26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4745 components: - type: Transform pos: -85.5,34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4747 components: - type: Transform pos: -140.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4756 components: - type: Transform pos: -83.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4762 components: - type: Transform pos: -84.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4825 components: - type: Transform pos: -93.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4833 components: - type: Transform pos: -127.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4906 components: - type: Transform pos: -126.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4907 components: - type: Transform pos: -125.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5675 components: - type: Transform pos: -107.5,-63.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5676 components: - type: Transform pos: -108.5,-63.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5693 components: - type: Transform pos: -140.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5700 components: - type: Transform pos: -120.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5701 components: - type: Transform pos: -118.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5715 components: - type: Transform pos: -106.5,-63.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5762 components: - type: Transform pos: -115.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5774 components: - type: Transform pos: -117.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5777 components: - type: Transform pos: -114.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5778 components: - type: Transform pos: -117.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5813 components: - type: Transform pos: -116.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5814 components: - type: Transform pos: -113.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5815 components: - type: Transform pos: -113.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5816 components: - type: Transform pos: -116.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5867 components: - type: Transform pos: -106.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5868 components: - type: Transform pos: -106.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5869 components: - type: Transform pos: -106.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6125 components: - type: Transform pos: -155.5,-10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6198 components: - type: Transform pos: -126.5,-24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6201 components: - type: Transform pos: -126.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6202 components: - type: Transform pos: -126.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6203 components: - type: Transform pos: -126.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6267 components: - type: Transform pos: -125.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6269 components: - type: Transform pos: -121.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6270 components: - type: Transform pos: -121.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6311 components: - type: Transform pos: -126.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6682 components: - type: Transform pos: -81.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6755 components: - type: Transform pos: -95.5,37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6756 components: - type: Transform pos: -95.5,36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6897 components: - type: Transform pos: -86.5,-6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6972 components: - type: Transform pos: -140.5,12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7145 components: - type: Transform pos: -1.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7159 components: - type: Transform pos: -2.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7165 components: - type: Transform pos: -1.5,-6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7171 components: - type: Transform pos: -1.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7175 components: - type: Transform pos: -2.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7183 components: - type: Transform pos: -1.5,-14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7187 components: - type: Transform pos: -3.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7203 components: - type: Transform pos: -1.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7209 components: - type: Transform pos: -1.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7219 components: - type: Transform pos: -1.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7220 components: - type: Transform pos: -3.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7249 components: - type: Transform pos: -93.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7257 components: - type: Transform pos: -141.5,12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7280 components: - type: Transform pos: -117.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7281 components: - type: Transform pos: -117.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7284 components: - type: Transform pos: -117.5,-50.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7285 components: - type: Transform pos: -117.5,-52.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7318 components: - type: Transform pos: -131.5,-59.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7389 components: - type: Transform pos: -131.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7390 components: - type: Transform pos: -131.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7391 components: - type: Transform pos: -131.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7392 components: - type: Transform pos: -131.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7529 components: - type: Transform pos: -137.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7568 components: - type: Transform pos: -141.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7876 components: - type: Transform pos: -121.5,-54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7898 components: - type: Transform pos: -81.5,19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8052 components: - type: Transform pos: -130.5,-59.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8075 components: - type: Transform pos: -140.5,-41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8164 components: - type: Transform pos: -83.5,19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8195 components: - type: Transform pos: -0.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8196 components: - type: Transform pos: 1.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8197 components: - type: Transform pos: 0.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8198 components: - type: Transform pos: 1.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8199 components: - type: Transform pos: 0.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8200 components: - type: Transform pos: -0.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8201 components: - type: Transform pos: -0.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8202 components: - type: Transform pos: -0.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8203 components: - type: Transform pos: 0.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8204 components: - type: Transform pos: 1.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8205 components: - type: Transform pos: 0.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8206 components: - type: Transform pos: 1.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8213 components: - type: Transform pos: 1.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8214 components: - type: Transform pos: 0.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8215 components: - type: Transform pos: -0.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8216 components: - type: Transform pos: -0.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8217 components: - type: Transform pos: 0.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8218 components: - type: Transform pos: 1.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8228 components: - type: Transform pos: -9.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8229 components: - type: Transform pos: -10.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8230 components: - type: Transform pos: -11.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8236 components: - type: Transform pos: -5.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8238 components: - type: Transform pos: -7.5,-6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8239 components: - type: Transform pos: -7.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8244 components: - type: Transform pos: -3.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8253 components: - type: Transform pos: -16.5,-64.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8260 components: - type: Transform pos: -11.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8261 components: - type: Transform pos: -9.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8262 components: - type: Transform pos: -5.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8263 components: - type: Transform pos: -3.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8296 components: - type: Transform pos: -6.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8297 components: - type: Transform pos: -7.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8299 components: - type: Transform pos: -8.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8343 components: - type: Transform pos: -29.5,26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8363 components: - type: Transform pos: -38.5,17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8364 components: - type: Transform pos: -38.5,16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8365 components: - type: Transform pos: -38.5,14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8366 components: - type: Transform pos: -38.5,15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8367 components: - type: Transform pos: -36.5,14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8368 components: - type: Transform pos: -36.5,15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8369 components: - type: Transform pos: -36.5,16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8370 components: - type: Transform pos: -36.5,17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8377 components: - type: Transform pos: -82.5,19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8522 components: - type: Transform pos: -34.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8529 components: - type: Transform pos: -32.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8708 components: - type: Transform pos: -5.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8709 components: - type: Transform pos: -3.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8710 components: - type: Transform pos: -4.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8711 components: - type: Transform pos: -3.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8714 components: - type: Transform pos: -4.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8715 components: - type: Transform pos: -3.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8716 components: - type: Transform pos: -5.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8729 components: - type: Transform pos: -7.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8737 components: - type: Transform pos: -7.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8738 components: - type: Transform pos: -7.5,-31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8739 components: - type: Transform pos: -7.5,-32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8740 components: - type: Transform pos: -7.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8920 components: - type: Transform pos: -14.5,-69.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8938 components: - type: Transform pos: -14.5,-68.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9034 components: - type: Transform pos: -90.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9098 components: - type: Transform pos: -106.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9324 components: - type: Transform pos: -30.5,22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9539 components: - type: Transform pos: -97.5,11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9549 components: - type: Transform pos: -95.5,13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9788 components: - type: Transform pos: -32.5,-75.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9838 components: - type: Transform pos: -136.5,15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9958 components: - type: Transform pos: -16.5,-69.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9964 components: - type: Transform pos: -16.5,-70.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9980 components: - type: Transform pos: -95.5,38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9981 components: - type: Transform pos: -93.5,36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9982 components: - type: Transform pos: -93.5,37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9983 components: - type: Transform pos: -93.5,38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9986 components: - type: Transform pos: -95.5,39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9987 components: - type: Transform pos: -93.5,39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10035 components: - type: Transform pos: -140.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10084 components: - type: Transform pos: -34.5,-77.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10087 components: - type: Transform pos: -32.5,-77.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10488 components: - type: Transform pos: -16.5,-68.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 10528 components: - type: Transform pos: -83.5,-6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11035 components: - type: Transform pos: -28.5,22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11047 components: - type: Transform pos: -34.5,-75.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11048 components: - type: Transform pos: -34.5,-76.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11059 components: - type: Transform pos: -108.5,-61.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11076 components: - type: Transform pos: -32.5,-76.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11080 components: - type: Transform pos: -28.5,-69.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11092 components: - type: Transform pos: -30.5,-61.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11358 components: - type: Transform pos: -22.5,11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11359 components: - type: Transform pos: -22.5,13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11710 components: - type: Transform pos: -99.5,34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11716 components: - type: Transform pos: -99.5,33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12425 components: - type: Transform pos: -28.5,-61.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12450 components: - type: Transform pos: -101.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12546 components: - type: Transform pos: -31.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12588 components: - type: Transform pos: -126.5,-59.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12748 components: - type: Transform pos: -133.5,-57.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12840 components: - type: Transform pos: -13.5,-64.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 12855 components: - type: Transform pos: -101.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13241 components: - type: Transform pos: -138.5,15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13248 components: - type: Transform pos: -31.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13523 components: - type: Transform pos: -140.5,14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13879 components: - type: Transform pos: -138.5,12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14003 components: - type: Transform pos: -137.5,21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14499 components: - type: Transform pos: -13.5,-66.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15407 components: - type: Transform pos: -125.5,-59.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16087 components: - type: Transform pos: -106.5,-61.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16091 components: - type: Transform pos: -123.5,-50.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16141 components: - type: Transform pos: -93.5,-24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16488 components: - type: Transform pos: -137.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16505 components: - type: Transform pos: -138.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16695 components: - type: Transform pos: -129.5,-59.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16716 components: - type: Transform pos: -33.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16836 components: - type: Transform pos: -107.5,-61.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16906 components: - type: Transform pos: -22.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17005 components: - type: Transform pos: -115.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17075 components: - type: Transform pos: -86.5,-0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17161 components: - type: Transform pos: -31.5,-75.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17164 components: - type: Transform pos: -35.5,-75.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17359 components: - type: Transform pos: -127.5,-59.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17513 components: - type: Transform pos: -136.5,12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17538 components: - type: Transform pos: -140.5,-54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17651 components: - type: Transform pos: -14.5,-70.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18193 components: - type: Transform pos: -95.5,-49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18686 components: - type: Transform pos: -95.5,-50.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18726 components: - type: Transform pos: -138.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18833 components: - type: Transform pos: -97.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18937 components: - type: Transform pos: -95.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18941 components: - type: Transform pos: -95.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19623 components: - type: Transform pos: -114.5,-54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19629 components: - type: Transform pos: -115.5,-54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19750 components: - type: Transform pos: -113.5,-54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19752 components: - type: Transform pos: -69.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19864 components: - type: Transform pos: -67.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19914 components: - type: Transform pos: -101.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20160 components: - type: Transform pos: -139.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20167 components: - type: Transform pos: -123.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20277 components: - type: Transform pos: -139.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20319 components: - type: Transform pos: -57.5,-79.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20329 components: - type: Transform pos: -128.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20445 components: - type: Transform pos: -119.5,37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20449 components: - type: Transform pos: -122.5,36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20450 components: - type: Transform pos: -122.5,37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20456 components: - type: Transform pos: -121.5,37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20466 components: - type: Transform pos: -120.5,37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20503 components: - type: Transform pos: -92.5,-50.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20563 components: - type: Transform pos: -101.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20564 components: - type: Transform pos: -92.5,-48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20734 components: - type: Transform pos: -92.5,-49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20736 components: - type: Transform pos: -92.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20780 components: - type: Transform pos: -97.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20844 components: - type: Transform pos: -36.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20936 components: - type: Transform pos: -93.5,31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21002 components: - type: Transform pos: -104.5,37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21491 components: - type: Transform pos: -18.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21492 components: - type: Transform pos: -20.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21493 components: - type: Transform pos: -19.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21873 components: - type: Transform pos: -36.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21874 components: - type: Transform pos: -33.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 21879 components: - type: Transform pos: -141.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 22701 components: - type: Transform pos: -39.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 22904 components: - type: Transform pos: -141.5,14.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 22936 components: - type: Transform pos: -43.5,-65.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 22962 components: - type: Transform pos: -44.5,-65.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 22963 components: - type: Transform pos: -42.5,-65.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23053 components: - type: Transform pos: -91.5,26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23504 components: - type: Transform pos: -95.5,31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23751 components: - type: Transform pos: -21.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23752 components: - type: Transform pos: -20.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24036 components: - type: Transform pos: -93.5,26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24115 components: - type: Transform pos: -16.5,-66.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24214 components: - type: Transform pos: -32.5,-78.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24215 components: - type: Transform pos: -34.5,-78.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24333 components: - type: Transform pos: -19.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24334 components: - type: Transform pos: -18.5,-51.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 25403 components: - type: Transform pos: -113.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 25986 components: - type: Transform pos: -110.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: RemoteSignaller entities: - uid: 3377 @@ -140962,166 +139888,120 @@ entities: - type: Transform pos: -24.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 138 components: - type: Transform pos: -26.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7272 components: - type: Transform pos: -115.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7273 components: - type: Transform pos: -113.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7274 components: - type: Transform pos: -114.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7275 components: - type: Transform pos: -113.5,-48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7276 components: - type: Transform pos: -114.5,-48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7277 components: - type: Transform pos: -115.5,-48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8820 components: - type: Transform pos: -13.5,-41.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8821 components: - type: Transform pos: -13.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8822 components: - type: Transform pos: -13.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9078 components: - type: Transform pos: -35.5,-68.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9414 components: - type: Transform pos: -34.5,-68.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9769 components: - type: Transform pos: -33.5,-68.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11133 components: - type: Transform rot: -1.5707963267948966 rad pos: -95.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11176 components: - type: Transform rot: -1.5707963267948966 rad pos: -95.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11330 components: - type: Transform rot: -1.5707963267948966 rad pos: -95.5,-50.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11783 components: - type: Transform rot: -1.5707963267948966 rad pos: -95.5,-49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15252 components: - type: Transform pos: -33.5,-61.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15282 components: - type: Transform pos: -34.5,-61.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15283 components: - type: Transform pos: -35.5,-61.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19536 components: - type: Transform pos: -89.5,13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19537 components: - type: Transform pos: -88.5,13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: ShuttersNormalOpen entities: - uid: 399 @@ -141129,37 +140009,27 @@ entities: - type: Transform pos: -50.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1716 components: - type: Transform pos: -18.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1763 components: - type: Transform rot: -1.5707963267948966 rad pos: -101.5,-24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2958 components: - type: Transform pos: -47.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2959 components: - type: Transform pos: -49.5,-10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 2 - uid: 2960 @@ -141167,36 +140037,26 @@ entities: - type: Transform pos: -49.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2962 components: - type: Transform pos: -52.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2963 components: - type: Transform pos: -51.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2964 components: - type: Transform pos: -48.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2998 components: - type: Transform pos: -53.5,-10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 3344 @@ -141205,8 +140065,6 @@ entities: rot: -1.5707963267948966 rad pos: -20.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 3382 @@ -141215,8 +140073,6 @@ entities: rot: -1.5707963267948966 rad pos: -20.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 3830 @@ -141225,8 +140081,6 @@ entities: rot: -1.5707963267948966 rad pos: -56.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 3831 @@ -141235,8 +140089,6 @@ entities: rot: -1.5707963267948966 rad pos: -56.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 3832 @@ -141245,8 +140097,6 @@ entities: rot: -1.5707963267948966 rad pos: -56.5,-31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 3833 @@ -141255,8 +140105,6 @@ entities: rot: -1.5707963267948966 rad pos: -56.5,-32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 3997 @@ -141265,8 +140113,6 @@ entities: rot: -1.5707963267948966 rad pos: -56.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 3998 @@ -141275,8 +140121,6 @@ entities: rot: -1.5707963267948966 rad pos: -56.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 3999 @@ -141285,8 +140129,6 @@ entities: rot: -1.5707963267948966 rad pos: -56.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 4456 @@ -141295,8 +140137,6 @@ entities: rot: 1.5707963267948966 rad pos: -121.5,-82.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 4457 @@ -141304,8 +140144,6 @@ entities: - type: Transform pos: -120.5,-81.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 4459 @@ -141314,8 +140152,6 @@ entities: rot: -1.5707963267948966 rad pos: -126.5,-73.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 4466 @@ -141324,8 +140160,6 @@ entities: rot: -1.5707963267948966 rad pos: -124.5,-73.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 4467 @@ -141334,8 +140168,6 @@ entities: rot: -1.5707963267948966 rad pos: -124.5,-72.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 4468 @@ -141344,8 +140176,6 @@ entities: rot: -1.5707963267948966 rad pos: -119.5,-82.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 4469 @@ -141354,8 +140184,6 @@ entities: rot: -1.5707963267948966 rad pos: -124.5,-71.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 5039 @@ -141363,65 +140191,47 @@ entities: - type: Transform pos: -19.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6265 components: - type: Transform pos: -125.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6306 components: - type: Transform pos: -121.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6307 components: - type: Transform pos: -121.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6308 components: - type: Transform pos: -121.5,-15.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6310 components: - type: Transform pos: -126.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7778 components: - type: Transform pos: -20.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8901 components: - type: Transform rot: -1.5707963267948966 rad pos: -101.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11616 components: - type: Transform pos: -30.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 11619 @@ -141429,8 +140239,6 @@ entities: - type: Transform pos: -28.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 11620 @@ -141438,8 +140246,6 @@ entities: - type: Transform pos: -28.5,8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 11621 @@ -141447,8 +140253,6 @@ entities: - type: Transform pos: -30.5,8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 11622 @@ -141457,8 +140261,6 @@ entities: rot: -1.5707963267948966 rad pos: -27.5,7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 11623 @@ -141467,8 +140269,6 @@ entities: rot: -1.5707963267948966 rad pos: -27.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 11624 @@ -141477,8 +140277,6 @@ entities: rot: -1.5707963267948966 rad pos: -27.5,5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 13038 @@ -141487,24 +140285,18 @@ entities: rot: -1.5707963267948966 rad pos: -101.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13042 components: - type: Transform rot: -1.5707963267948966 rad pos: -101.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14139 components: - type: Transform rot: 1.5707963267948966 rad pos: -131.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 14140 @@ -141513,8 +140305,6 @@ entities: rot: 1.5707963267948966 rad pos: -131.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 14141 @@ -141523,8 +140313,6 @@ entities: rot: 1.5707963267948966 rad pos: -131.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 14142 @@ -141533,8 +140321,6 @@ entities: rot: 1.5707963267948966 rad pos: -131.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 17815 @@ -141543,8 +140329,6 @@ entities: rot: -1.5707963267948966 rad pos: -93.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 17819 @@ -141553,8 +140337,6 @@ entities: rot: -1.5707963267948966 rad pos: -93.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 17820 @@ -141563,8 +140345,6 @@ entities: rot: -1.5707963267948966 rad pos: -93.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 19528 @@ -141573,94 +140353,70 @@ entities: rot: 1.5707963267948966 rad pos: -85.5,33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19529 components: - type: Transform rot: 1.5707963267948966 rad pos: -85.5,34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19530 components: - type: Transform rot: 1.5707963267948966 rad pos: -85.5,35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19531 components: - type: Transform rot: 1.5707963267948966 rad pos: -83.5,30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19532 components: - type: Transform rot: 1.5707963267948966 rad pos: -83.5,29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19533 components: - type: Transform rot: 1.5707963267948966 rad pos: -83.5,28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19534 components: - type: Transform pos: -85.5,26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19535 components: - type: Transform pos: -87.5,26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 22373 components: - type: Transform rot: -1.5707963267948966 rad pos: -22.5,18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 22374 components: - type: Transform rot: -1.5707963267948966 rad pos: -22.5,17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 22375 components: - type: Transform rot: -1.5707963267948966 rad pos: -22.5,16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 25385 components: - type: Transform rot: -1.5707963267948966 rad pos: -126.5,-72.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 25386 @@ -141669,8 +140425,6 @@ entities: rot: -1.5707963267948966 rad pos: -126.5,-71.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 25387 @@ -141679,8 +140433,6 @@ entities: rot: 1.5707963267948966 rad pos: -116.5,-71.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 25388 @@ -141689,8 +140441,6 @@ entities: rot: 1.5707963267948966 rad pos: -116.5,-72.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 25389 @@ -141699,8 +140449,6 @@ entities: rot: 1.5707963267948966 rad pos: -116.5,-73.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 25390 @@ -141709,8 +140457,6 @@ entities: rot: 1.5707963267948966 rad pos: -114.5,-73.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 25391 @@ -141719,8 +140465,6 @@ entities: rot: 1.5707963267948966 rad pos: -114.5,-72.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 25392 @@ -141729,8 +140473,6 @@ entities: rot: 1.5707963267948966 rad pos: -114.5,-71.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 25623 @@ -141739,32 +140481,24 @@ entities: rot: 1.5707963267948966 rad pos: -66.5,-29.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 25624 components: - type: Transform rot: 1.5707963267948966 rad pos: -66.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 25625 components: - type: Transform rot: 1.5707963267948966 rad pos: -66.5,-31.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 25626 components: - type: Transform rot: 1.5707963267948966 rad pos: -66.5,-32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: ShuttersWindow entities: - uid: 3976 @@ -141772,8 +140506,6 @@ entities: - type: Transform pos: -25.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: ShuttersWindowOpen entities: - uid: 11617 @@ -141781,8 +140513,6 @@ entities: - type: Transform pos: -29.5,4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - uid: 11618 @@ -141790,8 +140520,6 @@ entities: - type: Transform pos: -29.5,8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - proto: ShuttleConsoleCircuitboard @@ -141808,8 +140536,6 @@ entities: - type: Transform pos: -42.5,-73.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: SignAi entities: - uid: 21670 @@ -147544,6 +146270,13 @@ entities: - type: Transform pos: -82.5,-34.5 parent: 2 +- proto: SpawnPointHeadOfSecurityWeapon + entities: + - uid: 8276 + components: + - type: Transform + pos: -77.5,-33.5 + parent: 2 - proto: SpawnPointJanitor entities: - uid: 25669 @@ -147987,6 +146720,13 @@ entities: - type: Transform pos: -92.5,-18.5 parent: 2 +- proto: SpawnPointWardenWeapon + entities: + - uid: 14639 + components: + - type: Transform + pos: -88.5,-20.5 + parent: 2 - proto: SprayBottleSpaceCleaner entities: - uid: 6994 @@ -153599,183 +152339,131 @@ entities: - type: Transform pos: -55.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1474 components: - type: Transform pos: -51.5,-49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2392 components: - type: Transform pos: -124.5,-52.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3552 components: - type: Transform pos: -55.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4059 components: - type: Transform pos: -20.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4060 components: - type: Transform pos: -20.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4061 components: - type: Transform pos: -20.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4063 components: - type: Transform pos: -20.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4375 components: - type: Transform pos: -114.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4376 components: - type: Transform pos: -114.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6707 components: - type: Transform pos: -19.5,-28.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6842 components: - type: Transform pos: -89.5,-32.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6967 components: - type: Transform pos: -89.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9233 components: - type: Transform pos: -43.5,-44.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9249 components: - type: Transform pos: -43.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9257 components: - type: Transform pos: -43.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9329 components: - type: Transform pos: -22.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11000 components: - type: Transform pos: -22.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11797 components: - type: Transform pos: -27.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 13229 components: - type: Transform pos: -19.5,-33.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16048 components: - type: Transform pos: -87.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17298 components: - type: Transform pos: -126.5,-52.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19403 components: - type: Transform pos: -56.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 26064 components: - type: Transform pos: -120.5,23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 26065 components: - type: Transform pos: -118.5,23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 26110 components: - type: Transform pos: -27.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: ToiletDirtyWater entities: - uid: 356 @@ -171906,13 +170594,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: WeaponSubMachineGunWt550 - entities: - - uid: 14639 - components: - - type: Transform - pos: -77.588585,-33.179184 - parent: 2 - proto: WeaponTurretSyndicateBroken entities: - uid: 2407 @@ -172039,23 +170720,17 @@ entities: rot: -1.5707963267948966 rad pos: -53.5,-71.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2059 components: - type: Transform rot: -1.5707963267948966 rad pos: -53.5,-72.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2967 components: - type: Transform pos: -49.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -172069,8 +170744,6 @@ entities: rot: -1.5707963267948966 rad pos: -93.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -172084,8 +170757,6 @@ entities: rot: -1.5707963267948966 rad pos: -50.5,-60.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorHydroponicsLocked entities: - uid: 6138 @@ -172094,13 +170765,11 @@ entities: rot: 3.141592653589793 rad pos: -54.5,-25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSource lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -262507.9 + secondsUntilStateChange: -262535.62 state: Opening - type: Airlock autoClose: False @@ -172110,24 +170779,18 @@ entities: rot: 1.5707963267948966 rad pos: -56.5,-23.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23313 components: - type: Transform rot: 1.5707963267948966 rad pos: -56.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23429 components: - type: Transform rot: 1.5707963267948966 rad pos: -56.5,-22.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorKitchenLocked entities: - uid: 6506 @@ -172135,8 +170798,6 @@ entities: - type: Transform pos: -54.5,-25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecure entities: - uid: 1715 @@ -172145,8 +170806,6 @@ entities: rot: -1.5707963267948966 rad pos: -27.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -172162,8 +170821,6 @@ entities: rot: 1.5707963267948966 rad pos: -93.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -172177,24 +170834,18 @@ entities: rot: 3.141592653589793 rad pos: -91.5,-24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9624 components: - type: Transform rot: 3.141592653589793 rad pos: -90.5,-24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 26478 components: - type: Transform rot: 3.141592653589793 rad pos: -92.5,-24.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureAtmosphericsLocked entities: - uid: 2090 @@ -172203,16 +170854,12 @@ entities: rot: 3.141592653589793 rad pos: -110.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5730 components: - type: Transform rot: 3.141592653589793 rad pos: -108.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureCargoLocked entities: - uid: 11109 @@ -172221,24 +170868,18 @@ entities: rot: 3.141592653589793 rad pos: -102.5,12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 25555 components: - type: Transform rot: -1.5707963267948966 rad pos: -97.5,16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 25849 components: - type: Transform rot: 3.141592653589793 rad pos: -100.5,12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureChemistryLocked entities: - uid: 3922 @@ -172246,31 +170887,23 @@ entities: - type: Transform pos: -38.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3923 components: - type: Transform rot: 3.141592653589793 rad pos: -38.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 22702 components: - type: Transform rot: 3.141592653589793 rad pos: -37.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23992 components: - type: Transform pos: -37.5,-16.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureEngineeringLocked entities: - uid: 5724 @@ -172278,23 +170911,17 @@ entities: - type: Transform pos: -110.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5729 components: - type: Transform pos: -108.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 25601 components: - type: Transform rot: 3.141592653589793 rad pos: -120.5,-25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureHeadOfPersonnelLocked entities: - uid: 2966 @@ -172303,8 +170930,6 @@ entities: rot: 3.141592653589793 rad pos: -49.5,-8.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 2 - type: DeviceLinkSource @@ -172320,16 +170945,12 @@ entities: rot: 1.5707963267948966 rad pos: -20.5,-5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 19617 components: - type: Transform rot: 1.5707963267948966 rad pos: -20.5,-4.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureMedicalLocked entities: - uid: 3975 @@ -172338,16 +170959,12 @@ entities: rot: 1.5707963267948966 rad pos: -27.5,-25.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24545 components: - type: Transform rot: 1.5707963267948966 rad pos: -31.5,-19.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecurePlasma entities: - uid: 21052 @@ -172355,8 +170972,6 @@ entities: - type: Transform pos: -38.5,-72.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSource linkedPorts: 21056: @@ -172370,8 +170985,6 @@ entities: rot: 3.141592653589793 rad pos: -95.5,26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureScienceLocked entities: - uid: 7302 @@ -172379,16 +170992,12 @@ entities: - type: Transform pos: -120.5,-48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7303 components: - type: Transform rot: 3.141592653589793 rad pos: -120.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorSecureSecurityLocked entities: - uid: 24033 @@ -172397,8 +171006,6 @@ entities: rot: 1.5707963267948966 rad pos: -27.5,6.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - type: DeviceLinkSink invokeCounter: 1 - type: DeviceLinkSource @@ -172414,32 +171021,24 @@ entities: rot: 1.5707963267948966 rad pos: -19.5,10.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20026 components: - type: Transform rot: 3.141592653589793 rad pos: -49.5,-54.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 26077 components: - type: Transform rot: 3.141592653589793 rad pos: -50.5,-56.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 26078 components: - type: Transform rot: 3.141592653589793 rad pos: -49.5,-56.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorServiceLocked entities: - uid: 14529 @@ -172448,16 +171047,12 @@ entities: rot: 1.5707963267948966 rad pos: -96.5,-0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14531 components: - type: Transform rot: 1.5707963267948966 rad pos: -96.5,2.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindoorTheatreLocked entities: - uid: 3372 @@ -172466,8 +171061,6 @@ entities: rot: 1.5707963267948966 rad pos: -62.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: Window entities: - uid: 162 @@ -172475,316 +171068,226 @@ entities: - type: Transform pos: -34.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 169 components: - type: Transform pos: -33.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 170 components: - type: Transform pos: -32.5,-26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 292 components: - type: Transform pos: -31.5,-30.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 497 components: - type: Transform pos: -31.5,-49.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 809 components: - type: Transform pos: -104.5,-0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1265 components: - type: Transform pos: -24.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1272 components: - type: Transform pos: -24.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1273 components: - type: Transform pos: -24.5,-35.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1279 components: - type: Transform pos: -24.5,-34.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1286 components: - type: Transform pos: -24.5,-39.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1288 components: - type: Transform pos: -24.5,-40.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1409 components: - type: Transform pos: -27.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1425 components: - type: Transform pos: -27.5,-45.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1566 components: - type: Transform pos: -31.5,-47.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1568 components: - type: Transform pos: -27.5,-46.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1624 components: - type: Transform pos: -27.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1631 components: - type: Transform pos: -27.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1635 components: - type: Transform pos: -27.5,-3.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1636 components: - type: Transform pos: -27.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 4109 components: - type: Transform pos: -27.5,-43.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 6960 components: - type: Transform pos: -102.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9225 components: - type: Transform pos: -31.5,18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9297 components: - type: Transform pos: -30.5,18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11011 components: - type: Transform pos: -28.5,18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11017 components: - type: Transform pos: -27.5,18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11018 components: - type: Transform pos: -29.5,13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11024 components: - type: Transform pos: -30.5,13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11025 components: - type: Transform pos: -29.5,18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11028 components: - type: Transform pos: -28.5,13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11029 components: - type: Transform pos: -27.5,13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11030 components: - type: Transform pos: -31.5,13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11784 components: - type: Transform pos: -105.5,-21.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14570 components: - type: Transform pos: -64.5,-50.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14595 components: - type: Transform pos: -64.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15921 components: - type: Transform pos: -105.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 17183 components: - type: Transform pos: -61.5,-17.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 18600 components: - type: Transform pos: -72.5,-56.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20548 components: - type: Transform pos: -101.5,-0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23215 components: - type: Transform pos: -102.5,-36.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23418 components: - type: Transform pos: -101.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23419 components: - type: Transform pos: -99.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 23446 components: - type: Transform pos: -100.5,-11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24342 components: - type: Transform pos: -25.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24343 components: - type: Transform pos: -23.5,-27.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindowDirectional entities: - uid: 886 @@ -172793,178 +171296,132 @@ entities: rot: 1.5707963267948966 rad pos: -48.5,-70.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 887 components: - type: Transform rot: 1.5707963267948966 rad pos: -48.5,-73.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 893 components: - type: Transform rot: 1.5707963267948966 rad pos: -48.5,-72.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 894 components: - type: Transform rot: 1.5707963267948966 rad pos: -48.5,-71.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 1805 components: - type: Transform pos: -50.5,-74.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2361 components: - type: Transform pos: -53.5,-70.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2563 components: - type: Transform rot: 3.141592653589793 rad pos: -53.5,-73.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7751 components: - type: Transform rot: -1.5707963267948966 rad pos: -53.5,-74.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9113 components: - type: Transform rot: -1.5707963267948966 rad pos: -50.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9114 components: - type: Transform rot: -1.5707963267948966 rad pos: -50.5,-59.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9115 components: - type: Transform rot: -1.5707963267948966 rad pos: -50.5,-61.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14855 components: - type: Transform rot: 3.141592653589793 rad pos: -53.5,-69.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15245 components: - type: Transform rot: -1.5707963267948966 rad pos: -53.5,-70.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 15622 components: - type: Transform rot: 3.141592653589793 rad pos: -51.5,-69.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16396 components: - type: Transform pos: -53.5,-74.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16409 components: - type: Transform pos: -52.5,-74.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16412 components: - type: Transform pos: -51.5,-74.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16751 components: - type: Transform rot: -1.5707963267948966 rad pos: -53.5,-73.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16753 components: - type: Transform rot: 3.141592653589793 rad pos: -49.5,-69.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16754 components: - type: Transform rot: -1.5707963267948966 rad pos: -53.5,-69.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16771 components: - type: Transform rot: 3.141592653589793 rad pos: -50.5,-69.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 16772 components: - type: Transform rot: 3.141592653589793 rad pos: -52.5,-69.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 20804 components: - type: Transform pos: -49.5,-74.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindowFrostedDirectional entities: - uid: 2847 @@ -172973,62 +171430,46 @@ entities: rot: 1.5707963267948966 rad pos: -43.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3893 components: - type: Transform rot: -1.5707963267948966 rad pos: -41.5,-38.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3902 components: - type: Transform rot: -1.5707963267948966 rad pos: -41.5,-37.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5643 components: - type: Transform rot: 1.5707963267948966 rad pos: -96.5,-1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14204 components: - type: Transform rot: 1.5707963267948966 rad pos: -96.5,1.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 14205 components: - type: Transform rot: 1.5707963267948966 rad pos: -96.5,0.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 22301 components: - type: Transform pos: -44.5,-50.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 22302 components: - type: Transform pos: -46.5,-50.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: WindowReinforcedDirectional entities: - uid: 2069 @@ -173037,432 +171478,318 @@ entities: rot: 3.141592653589793 rad pos: -109.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2086 components: - type: Transform rot: 3.141592653589793 rad pos: -111.5,-7.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2255 components: - type: Transform rot: 1.5707963267948966 rad pos: -121.5,-56.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2258 components: - type: Transform rot: -1.5707963267948966 rad pos: -119.5,-56.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2308 components: - type: Transform rot: -1.5707963267948966 rad pos: -119.5,-55.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2830 components: - type: Transform rot: 3.141592653589793 rad pos: -64.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2831 components: - type: Transform rot: 3.141592653589793 rad pos: -63.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2832 components: - type: Transform rot: -1.5707963267948966 rad pos: -62.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2833 components: - type: Transform rot: 1.5707963267948966 rad pos: -60.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2834 components: - type: Transform pos: -58.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2835 components: - type: Transform pos: -59.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2836 components: - type: Transform rot: 3.141592653589793 rad pos: -58.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2837 components: - type: Transform rot: 1.5707963267948966 rad pos: -60.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2838 components: - type: Transform pos: -63.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2839 components: - type: Transform rot: 3.141592653589793 rad pos: -59.5,-12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2840 components: - type: Transform pos: -64.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 2841 components: - type: Transform rot: -1.5707963267948966 rad pos: -62.5,-9.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3015 components: - type: Transform pos: -63.5,5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3026 components: - type: Transform pos: -61.5,5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3027 components: - type: Transform pos: -60.5,5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3028 components: - type: Transform pos: -59.5,5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 3029 components: - type: Transform pos: -62.5,5.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5727 components: - type: Transform pos: -109.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 5728 components: - type: Transform pos: -111.5,-13.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7298 components: - type: Transform rot: 3.141592653589793 rad pos: -121.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7299 components: - type: Transform rot: 3.141592653589793 rad pos: -119.5,-42.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7300 components: - type: Transform pos: -119.5,-48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7301 components: - type: Transform pos: -121.5,-48.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7530 components: - type: Transform rot: 1.5707963267948966 rad pos: -121.5,-55.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7534 components: - type: Transform rot: 3.141592653589793 rad pos: -117.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7535 components: - type: Transform rot: 3.141592653589793 rad pos: -116.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7545 components: - type: Transform rot: 3.141592653589793 rad pos: -115.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7547 components: - type: Transform rot: 3.141592653589793 rad pos: -114.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7571 components: - type: Transform pos: -114.5,-56.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7580 components: - type: Transform pos: -115.5,-56.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7581 components: - type: Transform rot: 3.141592653589793 rad pos: -112.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7585 components: - type: Transform rot: 3.141592653589793 rad pos: -111.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7587 components: - type: Transform pos: -116.5,-56.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7588 components: - type: Transform pos: -117.5,-56.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7589 components: - type: Transform pos: -111.5,-56.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7590 components: - type: Transform pos: -112.5,-56.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7591 components: - type: Transform pos: -118.5,-56.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7592 components: - type: Transform pos: -121.5,-56.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7593 components: - type: Transform pos: -113.5,-56.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7594 components: - type: Transform pos: -122.5,-56.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7616 components: - type: Transform rot: 3.141592653589793 rad pos: -118.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7644 components: - type: Transform rot: 3.141592653589793 rad pos: -122.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7645 components: - type: Transform rot: 3.141592653589793 rad pos: -113.5,-58.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 7648 components: - type: Transform pos: -119.5,-56.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8153 components: - type: Transform rot: 3.141592653589793 rad pos: -101.5,12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 8553 components: - type: Transform rot: 1.5707963267948966 rad pos: -95.5,26.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 9515 components: - type: Transform rot: 1.5707963267948966 rad pos: -31.5,-18.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 11135 components: - type: Transform rot: 3.141592653589793 rad pos: -99.5,12.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24314 components: - type: Transform rot: 1.5707963267948966 rad pos: -31.5,-20.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 24644 components: - type: Transform rot: 1.5707963267948966 rad pos: -19.5,11.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 26076 components: - type: Transform rot: -1.5707963267948966 rad pos: -50.5,-56.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - uid: 26084 components: - type: Transform rot: 1.5707963267948966 rad pos: -49.5,-56.5 parent: 2 - - type: DeltaPressure - gridUid: 2 - proto: Wirecutter entities: - uid: 8868 From 2734593e587ab54cbee00f534c6ba7e0ec5368a1 Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Tue, 4 Nov 2025 13:22:58 -0700 Subject: [PATCH 108/121] packed update (#41297) --- Resources/Maps/packed.yml | 1393 +++++++++++++++++++++++++++++-------- 1 file changed, 1118 insertions(+), 275 deletions(-) diff --git a/Resources/Maps/packed.yml b/Resources/Maps/packed.yml index 96f372c677..d902024a62 100644 --- a/Resources/Maps/packed.yml +++ b/Resources/Maps/packed.yml @@ -1,11 +1,11 @@ meta: format: 7 category: Map - engineVersion: 265.0.0 + engineVersion: 267.3.0 forkId: "" forkVersion: "" - time: 08/17/2025 18:39:31 - entityCount: 15905 + time: 11/04/2025 19:54:18 + entityCount: 15917 maps: - 126 grids: @@ -1928,108 +1928,31 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 21.824879 - - 82.10312 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 21.824879 + Nitrogen: 82.10312 - volume: 2500 immutable: True - moles: - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + moles: {} - volume: 2500 temperature: 235 moles: - - 27.225372 - - 102.419266 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 27.225372 + Nitrogen: 102.419266 + - volume: 2500 + temperature: 293.15 + moles: {} - volume: 2500 temperature: 293.15 moles: - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Plasma: 6666.982 - volume: 2500 temperature: 293.15 moles: - - 0 - - 0 - - 0 - - 6666.982 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 6666.982 - volume: 2500 temperature: 293.15 moles: - - 6666.982 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - volume: 2500 - temperature: 293.15 - moles: - - 0 - - 6666.982 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Nitrogen: 6666.982 chunkSize: 4 - type: DecalGrid chunkCollection: @@ -7102,6 +7025,8 @@ entities: - 14736 - 429 - 8203 + - type: Fixtures + fixtures: {} - uid: 138 components: - type: Transform @@ -7112,6 +7037,8 @@ entities: devices: - 4027 - 4092 + - type: Fixtures + fixtures: {} - uid: 170 components: - type: Transform @@ -7122,6 +7049,8 @@ entities: devices: - 4460 - 4447 + - type: Fixtures + fixtures: {} - uid: 195 components: - type: Transform @@ -7132,6 +7061,8 @@ entities: devices: - 6949 - 4035 + - type: Fixtures + fixtures: {} - uid: 360 components: - type: Transform @@ -7158,6 +7089,8 @@ entities: - 6638 - 6622 - 6609 + - type: Fixtures + fixtures: {} - uid: 1017 components: - type: Transform @@ -7183,6 +7116,8 @@ entities: - 5690 - 1024 - 5657 + - type: Fixtures + fixtures: {} - uid: 1520 components: - type: MetaData @@ -7195,6 +7130,8 @@ entities: devices: - 6881 - 5820 + - type: Fixtures + fixtures: {} - uid: 2124 components: - type: Transform @@ -7211,12 +7148,16 @@ entities: - 241 - 14065 - 14064 + - type: Fixtures + fixtures: {} - uid: 2132 components: - type: Transform rot: 3.141592653589793 rad pos: 82.5,28.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 2602 components: - type: Transform @@ -7230,18 +7171,24 @@ entities: - 14433 - 14432 - 14549 + - type: Fixtures + fixtures: {} - uid: 2614 components: - type: Transform rot: -1.5707963267948966 rad pos: 50.5,40.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 3090 components: - type: Transform rot: 1.5707963267948966 rad pos: 41.5,42.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 5020 components: - type: Transform @@ -7271,6 +7218,8 @@ entities: - 7011 - 6621 - 6620 + - type: Fixtures + fixtures: {} - uid: 5101 components: - type: Transform @@ -7286,6 +7235,8 @@ entities: - 13435 - 10324 - 3481 + - type: Fixtures + fixtures: {} - uid: 5242 components: - type: MetaData @@ -7299,6 +7250,8 @@ entities: - 9454 - 12563 - 4280 + - type: Fixtures + fixtures: {} - uid: 5398 components: - type: MetaData @@ -7313,6 +7266,8 @@ entities: - 15368 - 5450 - 15524 + - type: Fixtures + fixtures: {} - uid: 6126 components: - type: Transform @@ -7324,6 +7279,8 @@ entities: - 5678 - 5679 - 202 + - type: Fixtures + fixtures: {} - uid: 6158 components: - type: Transform @@ -7333,6 +7290,8 @@ entities: devices: - 5968 - 5964 + - type: Fixtures + fixtures: {} - uid: 6632 components: - type: Transform @@ -7349,6 +7308,8 @@ entities: - 6610 - 6593 - 6595 + - type: Fixtures + fixtures: {} - uid: 6682 components: - type: Transform @@ -7365,6 +7326,8 @@ entities: - 6684 - 6570 - 6571 + - type: Fixtures + fixtures: {} - uid: 7962 components: - type: Transform @@ -7378,6 +7341,8 @@ entities: - 12833 - 6911 - 14960 + - type: Fixtures + fixtures: {} - uid: 8011 components: - type: Transform @@ -7406,6 +7371,8 @@ entities: - 8009 - 6778 - 7708 + - type: Fixtures + fixtures: {} - uid: 8571 components: - type: Transform @@ -7429,6 +7396,8 @@ entities: - 73 - 248 - 15375 + - type: Fixtures + fixtures: {} - uid: 8922 components: - type: Transform @@ -7448,6 +7417,8 @@ entities: - 6804 - 10206 - 10205 + - type: Fixtures + fixtures: {} - uid: 9637 components: - type: Transform @@ -7457,6 +7428,8 @@ entities: devices: - 9636 - 9635 + - type: Fixtures + fixtures: {} - uid: 10135 components: - type: MetaData @@ -7469,6 +7442,8 @@ entities: devices: - 5426 - 13644 + - type: Fixtures + fixtures: {} - uid: 10201 components: - type: Transform @@ -7480,6 +7455,8 @@ entities: - 12459 - 10172 - 10180 + - type: Fixtures + fixtures: {} - uid: 10202 components: - type: Transform @@ -7489,6 +7466,8 @@ entities: devices: - 10181 - 10178 + - type: Fixtures + fixtures: {} - uid: 10203 components: - type: Transform @@ -7499,6 +7478,8 @@ entities: devices: - 10182 - 10171 + - type: Fixtures + fixtures: {} - uid: 10204 components: - type: Transform @@ -7509,6 +7490,8 @@ entities: devices: - 8017 - 8016 + - type: Fixtures + fixtures: {} - uid: 10207 components: - type: Transform @@ -7521,6 +7504,8 @@ entities: - 10206 - 10215 - 10214 + - type: Fixtures + fixtures: {} - uid: 10250 components: - type: Transform @@ -7531,6 +7516,8 @@ entities: devices: - 10249 - 10248 + - type: Fixtures + fixtures: {} - uid: 10409 components: - type: MetaData @@ -7544,6 +7531,8 @@ entities: - 10080 - 3 - 15898 + - type: Fixtures + fixtures: {} - uid: 10419 components: - type: MetaData @@ -7559,6 +7548,8 @@ entities: - 15476 - 15492 - 15535 + - type: Fixtures + fixtures: {} - uid: 10469 components: - type: MetaData @@ -7578,6 +7569,8 @@ entities: - 10662 - 5478 - 12485 + - type: Fixtures + fixtures: {} - uid: 10524 components: - type: MetaData @@ -7600,6 +7593,8 @@ entities: - 5390 - 12516 - 12518 + - type: Fixtures + fixtures: {} - uid: 10576 components: - type: MetaData @@ -7622,6 +7617,8 @@ entities: - 12087 - 7267 - 12485 + - type: Fixtures + fixtures: {} - uid: 10653 components: - type: Transform @@ -7631,6 +7628,8 @@ entities: devices: - 10652 - 10643 + - type: Fixtures + fixtures: {} - uid: 10930 components: - type: Transform @@ -7646,6 +7645,8 @@ entities: - 5774 - 5775 - 5776 + - type: Fixtures + fixtures: {} - uid: 11165 components: - type: Transform @@ -7668,6 +7669,8 @@ entities: - 11249 - 11248 - 12518 + - type: Fixtures + fixtures: {} - uid: 11289 components: - type: MetaData @@ -7678,6 +7681,8 @@ entities: - type: DeviceList devices: - 8980 + - type: Fixtures + fixtures: {} - uid: 11508 components: - type: Transform @@ -7714,6 +7719,8 @@ entities: - 14994 - 14992 - 12161 + - type: Fixtures + fixtures: {} - uid: 11680 components: - type: Transform @@ -7726,6 +7733,8 @@ entities: - 14547 - 14384 - 14377 + - type: Fixtures + fixtures: {} - uid: 11730 components: - type: Transform @@ -7736,6 +7745,8 @@ entities: devices: - 11515 - 11719 + - type: Fixtures + fixtures: {} - uid: 11731 components: - type: Transform @@ -7745,6 +7756,8 @@ entities: devices: - 5189 - 10128 + - type: Fixtures + fixtures: {} - uid: 12152 components: - type: Transform @@ -7771,6 +7784,8 @@ entities: - 9896 - 9897 - 9858 + - type: Fixtures + fixtures: {} - uid: 12163 components: - type: Transform @@ -7782,12 +7797,16 @@ entities: - 11367 - 9896 - 9897 + - type: Fixtures + fixtures: {} - uid: 12416 components: - type: Transform rot: 1.5707963267948966 rad pos: 24.5,-14.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 12447 components: - type: Transform @@ -7806,6 +7825,8 @@ entities: - 11246 - 6951 - 6950 + - type: Fixtures + fixtures: {} - uid: 12473 components: - type: Transform @@ -7824,6 +7845,8 @@ entities: - 6931 - 6927 - 4183 + - type: Fixtures + fixtures: {} - uid: 12476 components: - type: Transform @@ -7847,6 +7870,8 @@ entities: - 9352 - 2690 - 3224 + - type: Fixtures + fixtures: {} - uid: 12480 components: - type: Transform @@ -7855,6 +7880,8 @@ entities: - type: DeviceList devices: - 12481 + - type: Fixtures + fixtures: {} - uid: 12484 components: - type: Transform @@ -7878,6 +7905,8 @@ entities: - 9362 - 3693 - 3692 + - type: Fixtures + fixtures: {} - uid: 12486 components: - type: Transform @@ -7903,6 +7932,8 @@ entities: - 15492 - 5478 - 15898 + - type: Fixtures + fixtures: {} - uid: 12488 components: - type: Transform @@ -7917,6 +7948,8 @@ entities: - 12076 - 11744 - 11743 + - type: Fixtures + fixtures: {} - uid: 12503 components: - type: Transform @@ -7927,6 +7960,8 @@ entities: - 12502 - 11709 - 11729 + - type: Fixtures + fixtures: {} - uid: 12504 components: - type: Transform @@ -7935,6 +7970,8 @@ entities: - type: DeviceList devices: - 11365 + - type: Fixtures + fixtures: {} - uid: 12506 components: - type: Transform @@ -7944,6 +7981,8 @@ entities: devices: - 11957 - 11956 + - type: Fixtures + fixtures: {} - uid: 12537 components: - type: Transform @@ -7954,6 +7993,8 @@ entities: - 12538 - 8296 - 9546 + - type: Fixtures + fixtures: {} - uid: 12539 components: - type: Transform @@ -7965,6 +8006,8 @@ entities: - 12540 - 9558 - 9557 + - type: Fixtures + fixtures: {} - uid: 13984 components: - type: Transform @@ -7991,6 +8034,8 @@ entities: - 14031 - 14030 - 14032 + - type: Fixtures + fixtures: {} - uid: 14067 components: - type: Transform @@ -8013,6 +8058,8 @@ entities: - 7895 - 6854 - 7663 + - type: Fixtures + fixtures: {} - uid: 14171 components: - type: Transform @@ -8024,6 +8071,8 @@ entities: - 2145 - 8485 - 8498 + - type: Fixtures + fixtures: {} - uid: 14521 components: - type: MetaData @@ -8038,6 +8087,8 @@ entities: - 14850 - 14852 - 15465 + - type: Fixtures + fixtures: {} - uid: 14615 components: - type: Transform @@ -8049,6 +8100,8 @@ entities: - 14614 - 14613 - 14616 + - type: Fixtures + fixtures: {} - uid: 14653 components: - type: Transform @@ -8060,6 +8113,8 @@ entities: - 7269 - 5866 - 5821 + - type: Fixtures + fixtures: {} - uid: 14670 components: - type: Transform @@ -8072,6 +8127,8 @@ entities: - 14669 - 14667 - 14672 + - type: Fixtures + fixtures: {} - uid: 14754 components: - type: Transform @@ -8086,6 +8143,8 @@ entities: - 12086 - 8236 - 8235 + - type: Fixtures + fixtures: {} - uid: 15297 components: - type: Transform @@ -8095,6 +8154,8 @@ entities: devices: - 15296 - 15298 + - type: Fixtures + fixtures: {} - uid: 15466 components: - type: MetaData @@ -8129,6 +8190,8 @@ entities: - 5390 - 15554 - 12518 + - type: Fixtures + fixtures: {} - uid: 15520 components: - type: MetaData @@ -8140,6 +8203,8 @@ entities: - type: DeviceList devices: - 12770 + - type: Fixtures + fixtures: {} - uid: 15578 components: - type: MetaData @@ -8157,6 +8222,8 @@ entities: - 2421 - 10585 - 5392 + - type: Fixtures + fixtures: {} - proto: AirCanister entities: - uid: 2078 @@ -10926,6 +10993,8 @@ entities: - type: Transform pos: 9.5,11.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 64 components: - type: MetaData @@ -10934,6 +11003,8 @@ entities: rot: 1.5707963267948966 rad pos: 59.5,10.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 340 components: - type: MetaData @@ -10942,6 +11013,8 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,-3.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 342 components: - type: MetaData @@ -10950,6 +11023,8 @@ entities: rot: -1.5707963267948966 rad pos: -0.5,-11.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 376 components: - type: MetaData @@ -10958,6 +11033,8 @@ entities: rot: 3.141592653589793 rad pos: 16.5,-6.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 598 components: - type: MetaData @@ -10966,6 +11043,8 @@ entities: rot: 3.141592653589793 rad pos: 49.5,-14.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 681 components: - type: MetaData @@ -10974,6 +11053,8 @@ entities: rot: -1.5707963267948966 rad pos: 11.5,-15.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 751 components: - type: MetaData @@ -10982,6 +11063,8 @@ entities: rot: 1.5707963267948966 rad pos: 8.5,-26.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 947 components: - type: MetaData @@ -10990,6 +11073,8 @@ entities: rot: 1.5707963267948966 rad pos: 9.5,-35.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 1177 components: - type: MetaData @@ -10998,6 +11083,8 @@ entities: rot: 1.5707963267948966 rad pos: 14.5,-39.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 1316 components: - type: MetaData @@ -11006,6 +11093,8 @@ entities: rot: 3.141592653589793 rad pos: -4.5,-2.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 1539 components: - type: MetaData @@ -11016,6 +11105,8 @@ entities: - type: PowerNetworkBattery loadingNetworkDemand: 5 supplyRampPosition: 2.4463015 + - type: Fixtures + fixtures: {} - uid: 1688 components: - type: MetaData @@ -11024,6 +11115,8 @@ entities: rot: -1.5707963267948966 rad pos: 34.5,-15.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 2378 components: - type: MetaData @@ -11032,6 +11125,8 @@ entities: rot: 1.5707963267948966 rad pos: 43.5,3.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 2464 components: - type: MetaData @@ -11039,6 +11134,8 @@ entities: - type: Transform pos: 44.5,37.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 2603 components: - type: MetaData @@ -11046,6 +11143,8 @@ entities: - type: Transform pos: 9.5,17.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 2612 components: - type: MetaData @@ -11053,6 +11152,8 @@ entities: - type: Transform pos: 47.5,43.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 2721 components: - type: MetaData @@ -11061,6 +11162,8 @@ entities: rot: -1.5707963267948966 rad pos: 68.5,-15.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 3333 components: - type: MetaData @@ -11069,6 +11172,8 @@ entities: rot: 1.5707963267948966 rad pos: -25.5,-18.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 3407 components: - type: MetaData @@ -11077,6 +11182,8 @@ entities: rot: 1.5707963267948966 rad pos: 0.5,-8.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 3687 components: - type: MetaData @@ -11084,6 +11191,8 @@ entities: - type: Transform pos: 52.5,22.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 4186 components: - type: MetaData @@ -11092,6 +11201,8 @@ entities: rot: -1.5707963267948966 rad pos: 28.5,7.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 4351 components: - type: MetaData @@ -11099,6 +11210,8 @@ entities: - type: Transform pos: 70.5,47.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 4367 components: - type: MetaData @@ -11106,6 +11219,8 @@ entities: - type: Transform pos: 61.5,37.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 4647 components: - type: MetaData @@ -11114,6 +11229,8 @@ entities: rot: 3.141592653589793 rad pos: 25.5,-37.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 4703 components: - type: MetaData @@ -11122,6 +11239,8 @@ entities: rot: 3.141592653589793 rad pos: 40.5,-1.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 4772 components: - type: MetaData @@ -11129,6 +11248,8 @@ entities: - type: Transform pos: 41.5,-37.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 4877 components: - type: MetaData @@ -11137,6 +11258,8 @@ entities: rot: -1.5707963267948966 rad pos: 5.5,-35.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 4883 components: - type: MetaData @@ -11144,6 +11267,8 @@ entities: - type: Transform pos: 15.5,34.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 4886 components: - type: MetaData @@ -11152,6 +11277,8 @@ entities: rot: 3.141592653589793 rad pos: 25.5,43.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 4918 components: - type: MetaData @@ -11160,6 +11287,8 @@ entities: rot: -1.5707963267948966 rad pos: 20.5,40.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 5015 components: - type: MetaData @@ -11167,6 +11296,8 @@ entities: - type: Transform pos: 66.5,-0.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 5088 components: - type: MetaData @@ -11175,6 +11306,8 @@ entities: rot: -1.5707963267948966 rad pos: 75.5,-2.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 5129 components: - type: MetaData @@ -11183,6 +11316,8 @@ entities: rot: 1.5707963267948966 rad pos: 75.5,-4.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 5130 components: - type: MetaData @@ -11191,6 +11326,8 @@ entities: rot: -1.5707963267948966 rad pos: 73.5,-7.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 5131 components: - type: MetaData @@ -11198,6 +11335,8 @@ entities: - type: Transform pos: 58.5,-8.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 5155 components: - type: MetaData @@ -11205,6 +11344,8 @@ entities: - type: Transform pos: 74.5,9.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 5271 components: - type: MetaData @@ -11212,6 +11353,8 @@ entities: - type: Transform pos: 33.5,44.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 5299 components: - type: MetaData @@ -11222,6 +11365,8 @@ entities: - type: PowerNetworkBattery loadingNetworkDemand: 5 supplyRampPosition: 2.4463015 + - type: Fixtures + fixtures: {} - uid: 5333 components: - type: MetaData @@ -11229,6 +11374,8 @@ entities: - type: Transform pos: 51.5,25.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 5427 components: - type: MetaData @@ -11237,6 +11384,8 @@ entities: rot: 1.5707963267948966 rad pos: 2.5,-4.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 5689 components: - type: MetaData @@ -11245,6 +11394,8 @@ entities: rot: 3.141592653589793 rad pos: 69.5,9.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 6005 components: - type: MetaData @@ -11252,6 +11403,8 @@ entities: - type: Transform pos: 78.5,-14.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 6012 components: - type: MetaData @@ -11260,6 +11413,8 @@ entities: rot: 3.141592653589793 rad pos: 52.5,-9.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 6015 components: - type: MetaData @@ -11267,6 +11422,8 @@ entities: - type: Transform pos: 6.5,-10.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 6025 components: - type: MetaData @@ -11275,6 +11432,8 @@ entities: rot: -1.5707963267948966 rad pos: 28.5,-19.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 6099 components: - type: MetaData @@ -11283,6 +11442,8 @@ entities: rot: 3.141592653589793 rad pos: 43.5,12.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 6342 components: - type: MetaData @@ -11290,6 +11451,8 @@ entities: - type: Transform pos: 54.5,4.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 6522 components: - type: MetaData @@ -11299,6 +11462,8 @@ entities: parent: 2 - type: Battery startingCharge: 12000 + - type: Fixtures + fixtures: {} - uid: 6685 components: - type: MetaData @@ -11307,6 +11472,8 @@ entities: rot: 3.141592653589793 rad pos: 45.5,-8.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 6686 components: - type: MetaData @@ -11315,6 +11482,8 @@ entities: rot: 1.5707963267948966 rad pos: 32.5,-11.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 6717 components: - type: MetaData @@ -11323,6 +11492,8 @@ entities: rot: -1.5707963267948966 rad pos: 7.5,3.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 6960 components: - type: MetaData @@ -11330,6 +11501,8 @@ entities: - type: Transform pos: 22.5,-22.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 6965 components: - type: MetaData @@ -11338,6 +11511,8 @@ entities: rot: 3.141592653589793 rad pos: 21.5,11.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 6968 components: - type: MetaData @@ -11345,6 +11520,8 @@ entities: - type: Transform pos: 15.5,8.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 6990 components: - type: MetaData @@ -11353,12 +11530,16 @@ entities: rot: 3.141592653589793 rad pos: 50.5,7.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 8043 components: - type: Transform rot: 1.5707963267948966 rad pos: 55.5,11.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 8062 components: - type: MetaData @@ -11366,6 +11547,8 @@ entities: - type: Transform pos: 94.5,34.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 8228 components: - type: MetaData @@ -11374,11 +11557,15 @@ entities: rot: 3.141592653589793 rad pos: 18.5,19.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 9020 components: - type: Transform pos: 110.5,-14.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 9743 components: - type: MetaData @@ -11386,6 +11573,8 @@ entities: - type: Transform pos: 21.5,-8.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 9744 components: - type: MetaData @@ -11394,6 +11583,8 @@ entities: rot: -1.5707963267948966 rad pos: 13.5,-7.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 9775 components: - type: MetaData @@ -11401,6 +11592,8 @@ entities: - type: Transform pos: 23.5,2.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 10129 components: - type: MetaData @@ -11409,6 +11602,8 @@ entities: rot: -1.5707963267948966 rad pos: 63.5,-7.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 10319 components: - type: MetaData @@ -11417,6 +11612,8 @@ entities: rot: 3.141592653589793 rad pos: 42.5,44.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 10924 components: - type: MetaData @@ -11425,6 +11622,8 @@ entities: rot: -1.5707963267948966 rad pos: 43.5,6.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 12522 components: - type: MetaData @@ -11433,6 +11632,8 @@ entities: rot: 1.5707963267948966 rad pos: 12.5,36.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 12751 components: - type: MetaData @@ -11440,6 +11641,8 @@ entities: - type: Transform pos: 42.5,26.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 12934 components: - type: MetaData @@ -11447,6 +11650,8 @@ entities: - type: Transform pos: 37.5,-41.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 12937 components: - type: MetaData @@ -11455,6 +11660,8 @@ entities: rot: -1.5707963267948966 rad pos: -21.5,-3.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 13117 components: - type: MetaData @@ -11463,6 +11670,8 @@ entities: rot: 3.141592653589793 rad pos: 52.5,29.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 13173 components: - type: MetaData @@ -11471,6 +11680,8 @@ entities: rot: 3.141592653589793 rad pos: 18.5,-20.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 13549 components: - type: MetaData @@ -11478,6 +11689,8 @@ entities: - type: Transform pos: 38.5,32.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 14084 components: - type: MetaData @@ -11486,6 +11699,8 @@ entities: rot: -1.5707963267948966 rad pos: 30.5,36.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 14150 components: - type: MetaData @@ -11493,6 +11708,8 @@ entities: - type: Transform pos: 72.5,24.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 14405 components: - type: MetaData @@ -11500,6 +11717,8 @@ entities: - type: Transform pos: 80.5,32.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 14569 components: - type: MetaData @@ -11508,6 +11727,8 @@ entities: rot: 1.5707963267948966 rad pos: 52.5,36.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 14691 components: - type: MetaData @@ -11516,6 +11737,8 @@ entities: rot: 3.141592653589793 rad pos: 6.5,17.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 15562 components: - type: MetaData @@ -11524,6 +11747,8 @@ entities: rot: 3.141592653589793 rad pos: 34.5,22.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 15579 components: - type: MetaData @@ -11532,6 +11757,8 @@ entities: rot: -1.5707963267948966 rad pos: 65.5,22.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 15806 components: - type: MetaData @@ -11540,6 +11767,8 @@ entities: rot: 1.5707963267948966 rad pos: 39.5,-14.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: APCElectronics entities: - uid: 6656 @@ -11556,6 +11785,8 @@ entities: - type: Transform pos: 3.5,-27.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 4669 components: - type: MetaData @@ -11563,6 +11794,8 @@ entities: - type: Transform pos: 22.5,-29.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 4676 components: - type: MetaData @@ -11570,6 +11803,8 @@ entities: - type: Transform pos: 29.5,-37.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 15878 components: - type: MetaData @@ -11578,6 +11813,8 @@ entities: rot: -1.5707963267948966 rad pos: 33.5,8.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: APCHyperCapacity entities: - uid: 8254 @@ -11588,6 +11825,8 @@ entities: rot: -1.5707963267948966 rad pos: 10.5,33.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 15818 components: - type: MetaData @@ -11596,6 +11835,8 @@ entities: rot: 3.141592653589793 rad pos: 10.5,20.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: APCSuperCapacity entities: - uid: 4928 @@ -11605,6 +11846,8 @@ entities: - type: Transform pos: 36.5,-21.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: ArrivalsShuttleTimer entities: - uid: 13576 @@ -11612,11 +11855,15 @@ entities: - type: Transform pos: -21.5,-17.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 13578 components: - type: Transform pos: -7.5,-17.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: ArtifactAnalyzerMachineCircuitboard entities: - uid: 15428 @@ -12212,6 +12459,8 @@ entities: - type: AccessReader access: - - Maintenance + - type: Fixtures + fixtures: {} - proto: BarSignMaidCafe entities: - uid: 6528 @@ -12219,6 +12468,8 @@ entities: - type: Transform pos: 30.5,-1.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: BarSignTheSingulo entities: - uid: 12307 @@ -12229,6 +12480,8 @@ entities: - type: AccessReader access: - - Maintenance + - type: Fixtures + fixtures: {} - proto: BaseGasCondenser entities: - uid: 585 @@ -40096,6 +40349,8 @@ entities: rot: -1.5707963267948966 rad pos: 7.5,-4.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: ClosetBombFilled entities: - uid: 15521 @@ -40394,18 +40649,8 @@ entities: immutable: False temperature: 293.14673 moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 1.7459903 + Nitrogen: 6.568249 - uid: 3854 components: - type: Transform @@ -40522,6 +40767,8 @@ entities: - type: Transform pos: 59.5,28.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: ClosetWallEmergencyN2FilledRandom entities: - uid: 10396 @@ -40529,6 +40776,8 @@ entities: - type: Transform pos: 60.5,28.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: ClothingBackpackClown entities: - uid: 9611 @@ -42260,18 +42509,8 @@ entities: immutable: False temperature: 293.14673 moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 1.7459903 + Nitrogen: 6.568249 - type: ContainerContainer containers: entity_storage: !type:Container @@ -42337,18 +42576,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 1.7459903 + Nitrogen: 6.568249 - type: ContainerContainer containers: entity_storage: !type:Container @@ -42634,18 +42863,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 1.7459903 + Nitrogen: 6.568249 - proto: CrewMonitoringServer entities: - uid: 15498 @@ -42794,7 +43013,7 @@ entities: pos: 59.5,39.5 parent: 2 - type: Door - secondsUntilStateChange: -7927.499 + secondsUntilStateChange: -7963.466 state: Closing - proto: d6Dice entities: @@ -43246,27 +43465,37 @@ entities: rot: -1.5707963267948966 rad pos: 45.5,28.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 9627 components: - type: Transform pos: 45.5,5.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 12817 components: - type: Transform pos: 74.5,3.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 12818 components: - type: Transform pos: 63.5,5.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 13108 components: - type: Transform rot: 1.5707963267948966 rad pos: 59.5,-10.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: DeployableBarrier entities: - uid: 2208 @@ -46963,72 +47192,100 @@ entities: rot: 3.141592653589793 rad pos: 7.5,4.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 582 components: - type: Transform pos: 21.5,-4.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 783 components: - type: Transform pos: 20.5,-22.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 1947 components: - type: Transform pos: 32.5,-29.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 4177 components: - type: Transform rot: -1.5707963267948966 rad pos: 6.5,36.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 5111 components: - type: Transform pos: 52.5,12.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 5658 components: - type: Transform pos: 29.5,-33.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 5659 components: - type: Transform pos: 23.5,-33.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 6026 components: - type: Transform pos: 8.5,-13.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 6069 components: - type: Transform pos: 14.5,2.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 6635 components: - type: Transform pos: 40.5,-5.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 9399 components: - type: Transform pos: 33.5,47.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 9628 components: - type: Transform pos: 47.5,5.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 11066 components: - type: Transform pos: 14.5,11.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: FaxMachineBase entities: - uid: 1649 @@ -47236,6 +47493,8 @@ entities: - 6930 - 11247 - 11246 + - type: Fixtures + fixtures: {} - uid: 1016 components: - type: Transform @@ -47254,6 +47513,8 @@ entities: - 802 - 5621 - 5622 + - type: Fixtures + fixtures: {} - uid: 1657 components: - type: Transform @@ -47276,6 +47537,8 @@ entities: - 1515 - 1513 - 12834 + - type: Fixtures + fixtures: {} - uid: 2045 components: - type: Transform @@ -47291,6 +47554,8 @@ entities: - 14330 - 5395 - 15368 + - type: Fixtures + fixtures: {} - uid: 2123 components: - type: Transform @@ -47303,6 +47568,8 @@ entities: - 241 - 14065 - 14064 + - type: Fixtures + fixtures: {} - uid: 2248 components: - type: Transform @@ -47313,6 +47580,8 @@ entities: devices: - 15375 - 15368 + - type: Fixtures + fixtures: {} - uid: 2296 components: - type: Transform @@ -47326,6 +47595,8 @@ entities: - 12485 - 5392 - 13435 + - type: Fixtures + fixtures: {} - uid: 4049 components: - type: Transform @@ -47338,6 +47609,8 @@ entities: - 1018 - 169 - 1024 + - type: Fixtures + fixtures: {} - uid: 5077 components: - type: Transform @@ -47367,6 +47640,8 @@ entities: - 7011 - 6620 - 5144 + - type: Fixtures + fixtures: {} - uid: 6633 components: - type: Transform @@ -47380,6 +47655,8 @@ entities: - 1513 - 6645 - 6637 + - type: Fixtures + fixtures: {} - uid: 6634 components: - type: Transform @@ -47396,6 +47673,8 @@ entities: - 6638 - 6523 - 1510 + - type: Fixtures + fixtures: {} - uid: 6683 components: - type: Transform @@ -47410,6 +47689,8 @@ entities: - 6568 - 12077 - 6684 + - type: Fixtures + fixtures: {} - uid: 7013 components: - type: Transform @@ -47422,6 +47703,8 @@ entities: - 8238 - 29 - 12086 + - type: Fixtures + fixtures: {} - uid: 7662 components: - type: Transform @@ -47444,6 +47727,8 @@ entities: - 14066 - 192 - 1317 + - type: Fixtures + fixtures: {} - uid: 7720 components: - type: Transform @@ -47470,6 +47755,8 @@ entities: - 5390 - 15554 - 12518 + - type: Fixtures + fixtures: {} - uid: 8005 components: - type: Transform @@ -47494,6 +47781,8 @@ entities: - 6952 - 11244 - 11245 + - type: Fixtures + fixtures: {} - uid: 8006 components: - type: Transform @@ -47519,6 +47808,8 @@ entities: - 6952 - 11244 - 11245 + - type: Fixtures + fixtures: {} - uid: 8007 components: - type: Transform @@ -47544,6 +47835,8 @@ entities: - 6952 - 11244 - 11245 + - type: Fixtures + fixtures: {} - uid: 8316 components: - type: Transform @@ -47573,6 +47866,8 @@ entities: - 7011 - 6620 - 5144 + - type: Fixtures + fixtures: {} - uid: 8570 components: - type: Transform @@ -47588,6 +47883,8 @@ entities: - 10662 - 5478 - 12485 + - type: Fixtures + fixtures: {} - uid: 8920 components: - type: Transform @@ -47606,6 +47903,8 @@ entities: - 10206 - 10205 - 5093 + - type: Fixtures + fixtures: {} - uid: 10078 components: - type: Transform @@ -47624,6 +47923,8 @@ entities: - 12087 - 7267 - 12485 + - type: Fixtures + fixtures: {} - uid: 10208 components: - type: Transform @@ -47634,6 +47935,8 @@ entities: - 10216 - 10205 - 10206 + - type: Fixtures + fixtures: {} - uid: 10956 components: - type: Transform @@ -47642,6 +47945,8 @@ entities: - type: DeviceList devices: - 8659 + - type: Fixtures + fixtures: {} - uid: 11507 components: - type: Transform @@ -47676,6 +47981,8 @@ entities: - 14994 - 14992 - 12161 + - type: Fixtures + fixtures: {} - uid: 12153 components: - type: Transform @@ -47697,6 +48004,8 @@ entities: - 11332 - 11355 - 12162 + - type: Fixtures + fixtures: {} - uid: 12154 components: - type: Transform @@ -47721,6 +48030,8 @@ entities: - 9896 - 9897 - 9858 + - type: Fixtures + fixtures: {} - uid: 12474 components: - type: Transform @@ -47737,6 +48048,8 @@ entities: - 6929 - 6930 - 6931 + - type: Fixtures + fixtures: {} - uid: 12477 components: - type: Transform @@ -47757,6 +48070,8 @@ entities: - 9352 - 9353 - 2690 + - type: Fixtures + fixtures: {} - uid: 12483 components: - type: Transform @@ -47778,6 +48093,8 @@ entities: - 9364 - 9363 - 9362 + - type: Fixtures + fixtures: {} - uid: 12487 components: - type: Transform @@ -47800,6 +48117,8 @@ entities: - 15492 - 5478 - 15898 + - type: Fixtures + fixtures: {} - uid: 12489 components: - type: Transform @@ -47813,6 +48132,8 @@ entities: - 12075 - 12490 - 12076 + - type: Fixtures + fixtures: {} - uid: 12517 components: - type: Transform @@ -47828,6 +48149,8 @@ entities: - 11249 - 11248 - 12516 + - type: Fixtures + fixtures: {} - uid: 14041 components: - type: Transform @@ -47848,6 +48171,8 @@ entities: - 13983 - 13982 - 13981 + - type: Fixtures + fixtures: {} - uid: 14737 components: - type: Transform @@ -47861,6 +48186,8 @@ entities: - 29 - 8238 - 371 + - type: Fixtures + fixtures: {} - uid: 15172 components: - type: Transform @@ -47879,6 +48206,8 @@ entities: - 9589 - 5395 - 15554 + - type: Fixtures + fixtures: {} - uid: 15585 components: - type: Transform @@ -47891,6 +48220,8 @@ entities: - 10671 - 15476 - 15492 + - type: Fixtures + fixtures: {} - uid: 15897 components: - type: Transform @@ -47905,6 +48236,8 @@ entities: - 15882 - 15898 - 5392 + - type: Fixtures + fixtures: {} - proto: FireAxeCabinetFilled entities: - uid: 1571 @@ -47912,12 +48245,16 @@ entities: - type: Transform pos: 31.5,-22.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 7167 components: - type: Transform rot: 3.141592653589793 rad pos: 34.5,44.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: FireExtinguisher entities: - uid: 5722 @@ -48469,7 +48806,7 @@ entities: pos: 26.5,37.5 parent: 2 - type: Door - secondsUntilStateChange: -55221.285 + secondsUntilStateChange: -55257.25 state: Closing - uid: 9362 components: @@ -70367,18 +70704,8 @@ entities: immutable: False temperature: 293.14673 moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 1.7459903 + Nitrogen: 6.568249 - type: ContainerContainer containers: entity_storage: !type:Container @@ -70471,18 +70798,8 @@ entities: immutable: False temperature: 293.14673 moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 1.7459903 + Nitrogen: 6.568249 - type: Physics bodyType: Static - type: Label @@ -70517,18 +70834,8 @@ entities: immutable: False temperature: 293.14673 moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 1.7459903 + Nitrogen: 6.568249 - type: Label currentLabel: 2 - type: NameModifier @@ -71400,12 +71707,16 @@ entities: - type: Transform pos: 94.5,31.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 14561 components: - type: Transform rot: 3.141592653589793 rad pos: 94.5,29.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: IntercomCommand entities: - uid: 4587 @@ -71413,29 +71724,39 @@ entities: - type: Transform pos: 12.5,-34.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 8471 components: - type: Transform rot: -1.5707963267948966 rad pos: 34.5,40.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 9436 components: - type: Transform rot: 1.5707963267948966 rad pos: 25.5,42.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 9460 components: - type: Transform rot: -1.5707963267948966 rad pos: 41.5,26.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 11408 components: - type: Transform pos: 17.5,-2.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: IntercomCommon entities: - uid: 4989 @@ -71443,12 +71764,16 @@ entities: - type: Transform pos: 16.5,11.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 11222 components: - type: Transform rot: 3.141592653589793 rad pos: 35.5,12.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: IntercomEngineering entities: - uid: 4692 @@ -71456,24 +71781,32 @@ entities: - type: Transform pos: 30.5,-29.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 4769 components: - type: Transform rot: 1.5707963267948966 rad pos: 24.5,-25.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 15421 components: - type: Transform rot: 1.5707963267948966 rad pos: 33.5,-46.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 15422 components: - type: Transform rot: 3.141592653589793 rad pos: 15.5,-29.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: IntercomMedical entities: - uid: 11407 @@ -71481,6 +71814,8 @@ entities: - type: Transform pos: 48.5,1.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: IntercomScience entities: - uid: 7582 @@ -71489,6 +71824,8 @@ entities: rot: -1.5707963267948966 rad pos: 48.5,16.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: IntercomSecurity entities: - uid: 14552 @@ -71497,6 +71834,8 @@ entities: rot: 3.141592653589793 rad pos: 36.5,18.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: IntercomSupply entities: - uid: 7743 @@ -71505,12 +71844,16 @@ entities: rot: 1.5707963267948966 rad pos: 21.5,25.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 12092 components: - type: Transform rot: 3.141592653589793 rad pos: 9.5,20.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: JanitorialTrolley entities: - uid: 12234 @@ -71787,6 +72130,8 @@ entities: 12891: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 8692 components: - type: Transform @@ -71798,6 +72143,8 @@ entities: 55: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 12355 components: - type: Transform @@ -71809,6 +72156,8 @@ entities: 4257: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 15242 components: - type: Transform @@ -71822,6 +72171,8 @@ entities: 12890: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - proto: LockableButtonCommand entities: - uid: 15104 @@ -71877,6 +72228,8 @@ entities: 15102: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - proto: LockableButtonEngineering entities: - uid: 15398 @@ -71893,6 +72246,8 @@ entities: 803: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 15399 components: - type: Transform @@ -71907,6 +72262,8 @@ entities: 924: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 15400 components: - type: Transform @@ -71918,6 +72275,8 @@ entities: 779: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - proto: LockableButtonMedical entities: - uid: 15129 @@ -71934,6 +72293,8 @@ entities: 600: - - Pressed - Open + - type: Fixtures + fixtures: {} - proto: LockableButtonResearch entities: - uid: 1557 @@ -71956,6 +72317,8 @@ entities: currentLabel: Blast Doors - type: NameModifier baseName: lockable button + - type: Fixtures + fixtures: {} - proto: LockableButtonSalvage entities: - uid: 12839 @@ -71977,6 +72340,8 @@ entities: currentLabel: Blast Doors - type: NameModifier baseName: lockable button + - type: Fixtures + fixtures: {} - proto: LockableButtonService entities: - uid: 15276 @@ -71993,6 +72358,8 @@ entities: 13443: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - proto: LockerAtmosphericsFilledHardsuit entities: - uid: 1458 @@ -72256,18 +72623,8 @@ entities: immutable: False temperature: 293.14673 moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 1.7459903 + Nitrogen: 6.568249 - type: ContainerContainer containers: entity_storage: !type:Container @@ -72353,6 +72710,8 @@ entities: - type: Transform pos: 46.5,5.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: LockerWardenFilled entities: - uid: 3171 @@ -72571,18 +72930,6 @@ entities: - type: Transform pos: 19.434057,-38.4118 parent: 2 -- proto: MagazinePistolSubMachineGunTopMounted - entities: - - uid: 15785 - components: - - type: Transform - pos: 44.521404,43.346592 - parent: 2 - - uid: 15786 - components: - - type: Transform - pos: 44.53703,43.440342 - parent: 2 - proto: MaintenanceFluffSpawner entities: - uid: 7459 @@ -72942,16 +73289,22 @@ entities: - type: Transform pos: 10.5,14.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 1532 components: - type: Transform pos: 11.5,14.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 11907 components: - type: Transform pos: 76.5,8.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: MonkeyCubeWrapped entities: - uid: 5407 @@ -73394,6 +73747,8 @@ entities: - type: Transform pos: 37.485016,-2.1577168 parent: 2 + - type: Fixtures + fixtures: {} - proto: PaintingMoony entities: - uid: 12334 @@ -73401,6 +73756,8 @@ entities: - type: Transform pos: 28.5,6.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PaintingOlympia entities: - uid: 13178 @@ -73408,6 +73765,8 @@ entities: - type: Transform pos: 32.5,38.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PaintingSadClown entities: - uid: 12832 @@ -73415,6 +73774,8 @@ entities: - type: Transform pos: 28.5,8.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PaladinCircuitBoard entities: - uid: 14283 @@ -74192,6 +74553,8 @@ entities: - type: Transform pos: 30.5,-22.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterContrabandClown entities: - uid: 11021 @@ -74199,6 +74562,8 @@ entities: - type: Transform pos: 27.5,4.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterContrabandDonk entities: - uid: 13090 @@ -74206,6 +74571,8 @@ entities: - type: Transform pos: 58.5,-16.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterContrabandEAT entities: - uid: 6763 @@ -74213,6 +74580,8 @@ entities: - type: Transform pos: 30.5,-8.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterContrabandFunPolice entities: - uid: 8525 @@ -74220,6 +74589,8 @@ entities: - type: Transform pos: 43.5,20.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterContrabandGreyTide entities: - uid: 739 @@ -74227,6 +74598,8 @@ entities: - type: Transform pos: 30.5,-18.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterContrabandHackingGuide entities: - uid: 8671 @@ -74234,6 +74607,8 @@ entities: - type: Transform pos: 31.5,-13.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterContrabandHaveaPuff entities: - uid: 13100 @@ -74241,6 +74616,8 @@ entities: - type: Transform pos: 44.5,-8.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterContrabandMissingGloves entities: - uid: 11068 @@ -74248,6 +74625,8 @@ entities: - type: Transform pos: 34.5,-18.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterContrabandMoth entities: - uid: 13102 @@ -74255,6 +74634,8 @@ entities: - type: Transform pos: 77.5,-14.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterContrabandRedRum entities: - uid: 7286 @@ -74262,6 +74643,8 @@ entities: - type: Transform pos: 40.5,-2.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegit12Gauge entities: - uid: 4398 @@ -74270,6 +74653,8 @@ entities: rot: -1.5707963267948966 rad pos: 43.5,37.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegit50thAnniversaryVintageReprint entities: - uid: 13087 @@ -74277,6 +74662,8 @@ entities: - type: Transform pos: 61.5,17.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitAnatomyPoster entities: - uid: 12830 @@ -74284,6 +74671,8 @@ entities: - type: Transform pos: 60.5,5.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitCarpMount entities: - uid: 7 @@ -74291,6 +74680,8 @@ entities: - type: Transform pos: 18.5,25.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitCleanliness entities: - uid: 11818 @@ -74299,6 +74690,8 @@ entities: rot: 3.141592653589793 rad pos: 5.5,-2.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitCohibaRobustoAd entities: - uid: 7287 @@ -74306,6 +74699,8 @@ entities: - type: Transform pos: 28.5,-7.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitDickGumshue entities: - uid: 13089 @@ -74313,6 +74708,8 @@ entities: - type: Transform pos: 68.5,-14.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitFruitBowl entities: - uid: 13101 @@ -74320,6 +74717,8 @@ entities: - type: Transform pos: 41.5,-9.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitHelpOthers entities: - uid: 8464 @@ -74327,6 +74726,8 @@ entities: - type: Transform pos: 35.5,35.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitHereForYourSafety entities: - uid: 2303 @@ -74335,6 +74736,8 @@ entities: rot: -1.5707963267948966 rad pos: 30.5,26.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitHighClassMartini entities: - uid: 13099 @@ -74342,6 +74745,8 @@ entities: - type: Transform pos: 38.5,-1.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitIan entities: - uid: 10251 @@ -74349,6 +74754,8 @@ entities: - type: Transform pos: 17.5,-6.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitIonRifle entities: - uid: 8483 @@ -74356,6 +74763,8 @@ entities: - type: Transform pos: 38.5,36.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitLoveIan entities: - uid: 10252 @@ -74363,6 +74772,8 @@ entities: - type: Transform pos: 21.5,-3.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitMime entities: - uid: 12831 @@ -74370,6 +74781,8 @@ entities: - type: Transform pos: 24.5,5.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitNanomichiAd entities: - uid: 12320 @@ -74377,6 +74790,8 @@ entities: - type: Transform pos: 13.5,-4.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitNanotrasenLogo entities: - uid: 7464 @@ -74384,27 +74799,37 @@ entities: - type: Transform pos: 17.5,-1.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 11092 components: - type: Transform pos: 17.5,38.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 11854 components: - type: Transform rot: 1.5707963267948966 rad pos: 24.5,-1.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 12318 components: - type: Transform pos: 29.5,43.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 12319 components: - type: Transform pos: 20.5,47.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitNTTGC entities: - uid: 13097 @@ -74412,6 +74837,8 @@ entities: - type: Transform pos: 13.5,8.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitObey entities: - uid: 2305 @@ -74420,6 +74847,8 @@ entities: rot: 3.141592653589793 rad pos: 46.5,33.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitPeriodicTable entities: - uid: 13093 @@ -74427,11 +74856,15 @@ entities: - type: Transform pos: 59.5,11.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 13094 components: - type: Transform pos: 54.5,-7.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitRenault entities: - uid: 249 @@ -74439,6 +74872,8 @@ entities: - type: Transform pos: 34.5,41.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitReportCrimes entities: - uid: 8553 @@ -74446,6 +74881,8 @@ entities: - type: Transform pos: 50.5,29.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitSafetyEyeProtection entities: - uid: 3668 @@ -74453,11 +74890,15 @@ entities: - type: Transform pos: 50.5,12.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 13083 components: - type: Transform pos: 40.5,-41.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitSafetyInternals entities: - uid: 13084 @@ -74465,11 +74906,15 @@ entities: - type: Transform pos: 42.5,-41.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 13088 components: - type: Transform pos: 54.5,16.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitSafetyMothDelam entities: - uid: 13081 @@ -74477,12 +74922,16 @@ entities: - type: Transform pos: 32.5,-33.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 14648 components: - type: Transform rot: -1.5707963267948966 rad pos: 70.5,22.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitSafetyMothEpi entities: - uid: 13085 @@ -74490,11 +74939,15 @@ entities: - type: Transform pos: 53.5,-2.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 13111 components: - type: Transform pos: 79.5,4.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitSafetyMothHardhat entities: - uid: 13080 @@ -74502,6 +74955,8 @@ entities: - type: Transform pos: 23.5,-29.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitSafetyMothMeth entities: - uid: 3413 @@ -74509,11 +74964,15 @@ entities: - type: Transform pos: 41.5,28.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 13086 components: - type: Transform pos: 49.5,-9.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitSafetyMothPiping entities: - uid: 3782 @@ -74521,11 +74980,15 @@ entities: - type: Transform pos: 37.5,-21.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 13082 components: - type: Transform pos: 38.5,-41.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitSafetyReport entities: - uid: 13095 @@ -74533,6 +74996,8 @@ entities: - type: Transform pos: 22.5,34.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitSecWatch entities: - uid: 7732 @@ -74540,11 +75005,15 @@ entities: - type: Transform pos: -2.5,-6.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 8400 components: - type: Transform pos: 35.5,22.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitSpaceCops entities: - uid: 8556 @@ -74552,6 +75021,8 @@ entities: - type: Transform pos: 52.5,34.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitStateLaws entities: - uid: 7731 @@ -74559,6 +75030,8 @@ entities: - type: Transform pos: -4.5,-10.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitTheOwl entities: - uid: 8579 @@ -74566,6 +75039,8 @@ entities: - type: Transform pos: 48.5,43.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitUeNo entities: - uid: 11093 @@ -74573,6 +75048,8 @@ entities: - type: Transform pos: 23.5,26.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterLegitVacation entities: - uid: 13098 @@ -74580,11 +75057,15 @@ entities: - type: Transform pos: 22.5,2.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 15688 components: - type: Transform pos: 48.5,48.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PosterMapPacked entities: - uid: 12314 @@ -74592,26 +75073,36 @@ entities: - type: Transform pos: 15.5,2.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 12315 components: - type: Transform pos: 37.5,2.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 12317 components: - type: Transform pos: 34.5,47.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 12335 components: - type: Transform pos: 30.5,-13.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 13572 components: - type: Transform pos: 30.5,12.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: PottedPlant17 entities: - uid: 2449 @@ -80627,78 +81118,108 @@ entities: - type: Transform pos: 24.5,-20.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 13233 components: - type: Transform pos: 24.5,-2.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 13234 components: - type: Transform pos: 32.5,-1.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 13235 components: - type: Transform pos: 21.5,-1.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 13236 components: - type: Transform pos: 2.5,-2.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 13237 components: - type: Transform pos: 2.5,9.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 13238 components: - type: Transform pos: 17.5,11.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 13239 components: - type: Transform pos: 38.5,16.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 13240 components: - type: Transform pos: 39.5,10.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 13241 components: - type: Transform pos: 29.5,38.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 13242 components: - type: Transform pos: 20.5,43.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 13243 components: - type: Transform pos: 23.5,19.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 13579 components: - type: Transform pos: -7.5,1.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 14563 components: - type: Transform rot: 1.5707963267948966 rad pos: 88.5,32.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 15658 components: - type: Transform rot: 1.5707963267948966 rad pos: 59.5,50.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: ScreenTimer entities: - uid: 15631 @@ -80717,6 +81238,8 @@ entities: - - Timer - Trigger - type: ActiveSignalTimer + - type: Fixtures + fixtures: {} - uid: 15632 components: - type: Transform @@ -80743,6 +81266,8 @@ entities: - - Start - Reverse - type: ActiveSignalTimer + - type: Fixtures + fixtures: {} - proto: Screwdriver entities: - uid: 11132 @@ -81342,12 +81867,16 @@ entities: rot: -1.5707963267948966 rad pos: 68.5,22.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 14570 components: - type: Transform rot: -1.5707963267948966 rad pos: 87.5,31.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignAiUpload entities: - uid: 14250 @@ -81355,6 +81884,8 @@ entities: - type: Transform pos: 83.5,29.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignalButton entities: - uid: 1471 @@ -81375,6 +81906,8 @@ entities: 270: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 2443 components: - type: MetaData @@ -81395,6 +81928,8 @@ entities: currentLabel: Inner Doors - type: NameModifier baseName: signal button + - type: Fixtures + fixtures: {} - uid: 11020 components: - type: MetaData @@ -81415,6 +81950,8 @@ entities: currentLabel: Outer Doors - type: NameModifier baseName: signal button + - type: Fixtures + fixtures: {} - uid: 14932 components: - type: Transform @@ -81426,6 +81963,8 @@ entities: 15632: - - Pressed - Trigger + - type: Fixtures + fixtures: {} - proto: SignalButtonDirectional entities: - uid: 543 @@ -81453,6 +81992,8 @@ entities: 1154: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 10538 components: - type: MetaData @@ -81472,6 +82013,8 @@ entities: currentLabel: Inner Doors - type: NameModifier baseName: signal button + - type: Fixtures + fixtures: {} - uid: 14742 components: - type: MetaData @@ -81491,6 +82034,8 @@ entities: currentLabel: Outer Doors - type: NameModifier baseName: signal button + - type: Fixtures + fixtures: {} - uid: 15124 components: - type: Transform @@ -81514,6 +82059,8 @@ entities: 15121: - - Pressed - Toggle + - type: Fixtures + fixtures: {} - uid: 15804 components: - type: MetaData @@ -81534,6 +82081,8 @@ entities: currentLabel: Front Doors - type: NameModifier baseName: signal button + - type: Fixtures + fixtures: {} - proto: SignalSwitch entities: - uid: 5331 @@ -81559,6 +82108,8 @@ entities: currentLabel: Shutters - type: NameModifier baseName: signal switch + - type: Fixtures + fixtures: {} - uid: 10605 components: - type: MetaData @@ -81588,6 +82139,8 @@ entities: currentLabel: Blast Doors - type: NameModifier baseName: signal switch + - type: Fixtures + fixtures: {} - proto: SignalSwitchDirectional entities: - uid: 2053 @@ -81613,6 +82166,8 @@ entities: - Open - - Off - Close + - type: Fixtures + fixtures: {} - uid: 2059 components: - type: MetaData @@ -81641,6 +82196,8 @@ entities: currentLabel: Storage Bay - type: NameModifier baseName: signal switch + - type: Fixtures + fixtures: {} - uid: 7856 components: - type: MetaData @@ -81685,6 +82242,8 @@ entities: currentLabel: Brig Shutters - type: NameModifier baseName: signal switch + - type: Fixtures + fixtures: {} - uid: 10979 components: - type: MetaData @@ -81748,6 +82307,8 @@ entities: currentLabel: Window Shutters - type: NameModifier baseName: signal switch + - type: Fixtures + fixtures: {} - uid: 11164 components: - type: MetaData @@ -81786,6 +82347,8 @@ entities: currentLabel: Bay Conveyor Belts - type: NameModifier baseName: signal switch + - type: Fixtures + fixtures: {} - uid: 12384 components: - type: MetaData @@ -81805,6 +82368,8 @@ entities: currentLabel: Shutters - type: NameModifier baseName: signal switch + - type: Fixtures + fixtures: {} - uid: 13484 components: - type: MetaData @@ -81839,6 +82404,8 @@ entities: currentLabel: Radiation Shutters - type: NameModifier baseName: signal switch + - type: Fixtures + fixtures: {} - uid: 13584 components: - type: MetaData @@ -81923,6 +82490,8 @@ entities: currentLabel: Loading Dock Belts - type: NameModifier baseName: signal switch + - type: Fixtures + fixtures: {} - uid: 13706 components: - type: MetaData @@ -81972,6 +82541,8 @@ entities: currentLabel: Control Room Shutters - type: NameModifier baseName: signal switch + - type: Fixtures + fixtures: {} - uid: 14657 components: - type: MetaData @@ -81990,6 +82561,8 @@ entities: currentLabel: Janitorial Service - type: NameModifier baseName: signal switch + - type: Fixtures + fixtures: {} - proto: SignAnomaly entities: - uid: 15513 @@ -81997,6 +82570,8 @@ entities: - type: Transform pos: 58.5,22.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignAnomaly2 entities: - uid: 6475 @@ -82004,6 +82579,8 @@ entities: - type: Transform pos: 65.5,13.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignArmory entities: - uid: 671 @@ -82011,6 +82588,8 @@ entities: - type: Transform pos: 39.5,32.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignAtmos entities: - uid: 4574 @@ -82018,11 +82597,15 @@ entities: - type: Transform pos: 37.5,-38.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 4575 components: - type: Transform pos: 28.5,-26.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignBar entities: - uid: 11198 @@ -82030,6 +82613,8 @@ entities: - type: Transform pos: 36.515213,-1.5077809 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignBiohazardMed entities: - uid: 12243 @@ -82038,6 +82623,8 @@ entities: rot: 3.141592653589793 rad pos: 76.5,0.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignBridge entities: - uid: 10322 @@ -82046,6 +82633,8 @@ entities: rot: 3.141592653589793 rad pos: 25.5,38.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignCans entities: - uid: 4569 @@ -82053,6 +82642,8 @@ entities: - type: Transform pos: 41.5,-36.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignCansScience entities: - uid: 11522 @@ -82061,6 +82652,8 @@ entities: rot: 3.141592653589793 rad pos: 59.5,12.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignCargo entities: - uid: 11211 @@ -82068,6 +82661,8 @@ entities: - type: Transform pos: 22.44822,19.533756 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignCargoDock entities: - uid: 6853 @@ -82076,6 +82671,8 @@ entities: rot: -1.5707963267948966 rad pos: 5.5,25.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignChapel entities: - uid: 11193 @@ -82083,6 +82680,8 @@ entities: - type: Transform pos: 39.519363,4.4919653 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignChem entities: - uid: 6817 @@ -82090,6 +82689,8 @@ entities: - type: Transform pos: 51.5,-2.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignConference entities: - uid: 48 @@ -82098,6 +82699,8 @@ entities: rot: 3.141592653589793 rad pos: 25.5,40.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignCryo entities: - uid: 8564 @@ -82106,6 +82709,8 @@ entities: rot: 3.141592653589793 rad pos: 19.5,17.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignCryogenicsMed entities: - uid: 7365 @@ -82113,11 +82718,15 @@ entities: - type: Transform pos: 48.5,24.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 11804 components: - type: Transform pos: 63.5,-0.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignDangerMed entities: - uid: 15523 @@ -82126,6 +82735,8 @@ entities: rot: 1.5707963267948966 rad pos: 60.5,26.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignDetective entities: - uid: 9252 @@ -82133,6 +82744,8 @@ entities: - type: Transform pos: 54.5,34.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignDirectionalBridge entities: - uid: 7329 @@ -82141,18 +82754,24 @@ entities: rot: 3.141592653589793 rad pos: 24.503027,16.714216 parent: 2 + - type: Fixtures + fixtures: {} - uid: 8119 components: - type: Transform rot: 3.141592653589793 rad pos: 7.4992805,2.707316 parent: 2 + - type: Fixtures + fixtures: {} - uid: 11181 components: - type: Transform rot: 3.141592653589793 rad pos: 28.54057,12.41816 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignDirectionalDorms entities: - uid: 40 @@ -82161,12 +82780,16 @@ entities: rot: 1.5707963267948966 rad pos: 7.5,11.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 13540 components: - type: Transform rot: -1.5707963267948966 rad pos: 17.5,14.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignDirectionalEng entities: - uid: 11817 @@ -82174,6 +82797,8 @@ entities: - type: Transform pos: 28.5037,2.3089128 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignDirectionalEscapePod entities: - uid: 10722 @@ -82181,12 +82806,16 @@ entities: - type: Transform pos: 60.521824,46.423424 parent: 2 + - type: Fixtures + fixtures: {} - uid: 15684 components: - type: Transform rot: 1.5707963267948966 rad pos: 30.52563,35.58913 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignDirectionalEvac entities: - uid: 7894 @@ -82195,24 +82824,32 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,1.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 8120 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.4992805,2.2952788 parent: 2 + - type: Fixtures + fixtures: {} - uid: 11806 components: - type: Transform rot: -1.5707963267948966 rad pos: 24.498083,2.3033948 parent: 2 + - type: Fixtures + fixtures: {} - uid: 15357 components: - type: Transform rot: 1.5707963267948966 rad pos: -20.5,-2.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignDirectionalHop entities: - uid: 11809 @@ -82221,6 +82858,8 @@ entities: rot: -1.5707963267948966 rad pos: 24.5,2.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignDirectionalLibrary entities: - uid: 11816 @@ -82229,6 +82868,8 @@ entities: rot: -1.5707963267948966 rad pos: 24.498083,2.6830244 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignDirectionalMed entities: - uid: 8118 @@ -82237,23 +82878,31 @@ entities: rot: 1.5707963267948966 rad pos: 7.5,2.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 11184 components: - type: Transform pos: 39.55419,12.695712 parent: 2 + - type: Fixtures + fixtures: {} - uid: 11813 components: - type: Transform rot: 1.5707963267948966 rad pos: 28.5,2.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 11853 components: - type: Transform rot: 1.5707963267948966 rad pos: 39.50202,2.3010597 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignDirectionalSci entities: - uid: 11182 @@ -82262,24 +82911,32 @@ entities: rot: 1.5707963267948966 rad pos: 28.5195,12.147359 parent: 2 + - type: Fixtures + fixtures: {} - uid: 11188 components: - type: Transform rot: 1.5707963267948966 rad pos: 39.557316,12.409777 parent: 2 + - type: Fixtures + fixtures: {} - uid: 11812 components: - type: Transform rot: 1.5707963267948966 rad pos: 28.505745,2.6978016 parent: 2 + - type: Fixtures + fixtures: {} - uid: 11851 components: - type: Transform rot: 3.141592653589793 rad pos: 39.5,2.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignDirectionalSec entities: - uid: 5416 @@ -82288,24 +82945,32 @@ entities: rot: 1.5707963267948966 rad pos: 7.4984922,11.283884 parent: 2 + - type: Fixtures + fixtures: {} - uid: 7327 components: - type: Transform rot: 3.141592653589793 rad pos: 24.5,16.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 11180 components: - type: Transform rot: 3.141592653589793 rad pos: 28.54057,12.66816 parent: 2 + - type: Fixtures + fixtures: {} - uid: 11852 components: - type: Transform rot: 3.141592653589793 rad pos: 39.50202,2.708467 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignDirectionalSolar entities: - uid: 8569 @@ -82314,34 +82979,46 @@ entities: rot: 1.5707963267948966 rad pos: 68.5,43.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 8984 components: - type: Transform pos: 3.5,-33.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 9903 components: - type: Transform pos: 60.521824,46.62134 parent: 2 + - type: Fixtures + fixtures: {} - uid: 12296 components: - type: Transform rot: 1.5707963267948966 rad pos: 30.52563,35.412045 parent: 2 + - type: Fixtures + fixtures: {} - uid: 12297 components: - type: Transform rot: -1.5707963267948966 rad pos: 9.5,-24.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 12298 components: - type: Transform rot: 3.141592653589793 rad pos: 68.5,19.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignDirectionalSupply entities: - uid: 5418 @@ -82350,12 +83027,16 @@ entities: rot: 1.5707963267948966 rad pos: 7.4984922,11.714439 parent: 2 + - type: Fixtures + fixtures: {} - uid: 7328 components: - type: Transform rot: 3.141592653589793 rad pos: 24.503027,16.29755 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignDirectionalWash entities: - uid: 11815 @@ -82364,6 +83045,8 @@ entities: rot: 3.141592653589793 rad pos: 12.5,11.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignDoors entities: - uid: 12754 @@ -82372,6 +83055,8 @@ entities: rot: 3.141592653589793 rad pos: 56.5,52.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignElectricalMed entities: - uid: 12351 @@ -82379,34 +83064,46 @@ entities: - type: Transform pos: 3.5,-8.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 13003 components: - type: Transform pos: 36.5,-41.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 13004 components: - type: Transform pos: 31.5,-49.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 14949 components: - type: Transform rot: -1.5707963267948966 rad pos: 16.5,42.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 14950 components: - type: Transform rot: -1.5707963267948966 rad pos: 33.5,49.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 15359 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,-33.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignEngine entities: - uid: 5157 @@ -82414,11 +83111,15 @@ entities: - type: Transform pos: 30.5,-37.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 5301 components: - type: Transform pos: 33.5,-40.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignEngineering entities: - uid: 5156 @@ -82426,6 +83127,8 @@ entities: - type: Transform pos: 24.5,-26.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignEscapePods entities: - uid: 12434 @@ -82434,17 +83137,23 @@ entities: rot: -1.5707963267948966 rad pos: 65.5,45.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 14770 components: - type: Transform rot: 1.5707963267948966 rad pos: 86.5,3.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 15458 components: - type: Transform pos: 75.5,-17.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignEVA entities: - uid: 5204 @@ -82452,6 +83161,8 @@ entities: - type: Transform pos: 10.5,-2.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignExamroom entities: - uid: 12239 @@ -82460,12 +83171,16 @@ entities: rot: 3.141592653589793 rad pos: 67.5,5.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 12240 components: - type: Transform rot: 3.141592653589793 rad pos: 59.5,-8.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignFire entities: - uid: 12993 @@ -82473,12 +83188,16 @@ entities: - type: Transform pos: 45.5,-49.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 15123 components: - type: Transform rot: -1.5707963267948966 rad pos: 50.5,-45.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignFlammableMed entities: - uid: 1650 @@ -82486,6 +83205,8 @@ entities: - type: Transform pos: 33.5,-31.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignGenpop entities: - uid: 8573 @@ -82493,6 +83214,8 @@ entities: - type: Transform pos: 32.5,26.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignGravity entities: - uid: 11199 @@ -82500,6 +83223,8 @@ entities: - type: Transform pos: 16.482166,37.47681 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignHead entities: - uid: 11814 @@ -82508,6 +83233,8 @@ entities: rot: 3.141592653589793 rad pos: 13.5,-2.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignHydro1 entities: - uid: 6648 @@ -82515,11 +83242,15 @@ entities: - type: Transform pos: 47.5,-2.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 6651 components: - type: Transform pos: 41.5,-2.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignInterrogation entities: - uid: 8933 @@ -82527,6 +83258,8 @@ entities: - type: Transform pos: 55.5,31.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignJanitor entities: - uid: 13164 @@ -82534,6 +83267,8 @@ entities: - type: Transform pos: 6.5,-2.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignKiddiePlaque entities: - uid: 12282 @@ -82542,6 +83277,8 @@ entities: rot: 1.5707963267948966 rad pos: 12.5,2.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignLaserMed entities: - uid: 11001 @@ -82550,12 +83287,16 @@ entities: rot: 3.141592653589793 rad pos: 23.5,-37.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 12289 components: - type: Transform rot: 1.5707963267948966 rad pos: 14.5,-43.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignLawyer entities: - uid: 13165 @@ -82563,11 +83304,15 @@ entities: - type: Transform pos: -4.5,-6.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 13166 components: - type: Transform pos: 24.5,28.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignLibrary entities: - uid: 11201 @@ -82575,6 +83320,8 @@ entities: - type: Transform pos: 7.478853,8.535535 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignMagneticsMed entities: - uid: 12178 @@ -82583,12 +83330,16 @@ entities: rot: 3.141592653589793 rad pos: 3.5,40.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 14680 components: - type: Transform rot: -1.5707963267948966 rad pos: 10.5,32.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignMedical entities: - uid: 6788 @@ -82596,6 +83347,8 @@ entities: - type: Transform pos: 53.5,1.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignMorgue entities: - uid: 11196 @@ -82603,11 +83356,15 @@ entities: - type: Transform pos: 71.560074,0.5078441 parent: 2 + - type: Fixtures + fixtures: {} - uid: 11843 components: - type: Transform pos: 70.5,-6.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignNosmoking entities: - uid: 10074 @@ -82615,16 +83372,22 @@ entities: - type: Transform pos: 68.5,-4.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 11397 components: - type: Transform pos: 65.5,-7.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 12182 components: - type: Transform pos: 51.5,46.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignNTMine entities: - uid: 10969 @@ -82632,6 +83395,8 @@ entities: - type: Transform pos: 3.5,36.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignPlaque entities: - uid: 12281 @@ -82640,11 +83405,15 @@ entities: rot: 1.5707963267948966 rad pos: 19.5,-6.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 15379 components: - type: Transform pos: 16.5,40.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignRadiationMed entities: - uid: 747 @@ -82652,11 +83421,15 @@ entities: - type: Transform pos: 18.5,-40.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 15635 components: - type: Transform pos: 19.5,-37.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignRND entities: - uid: 11190 @@ -82664,12 +83437,16 @@ entities: - type: Transform pos: 57.499714,16.503765 parent: 2 + - type: Fixtures + fixtures: {} - uid: 15362 components: - type: Transform rot: -1.5707963267948966 rad pos: 48.5,20.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignRobo entities: - uid: 5277 @@ -82678,12 +83455,16 @@ entities: rot: 3.141592653589793 rad pos: 55.5,12.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 8612 components: - type: Transform rot: 3.141592653589793 rad pos: 48.5,12.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignSalvage entities: - uid: 14914 @@ -82691,6 +83472,8 @@ entities: - type: Transform pos: 9.5,29.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignScience entities: - uid: 10037 @@ -82699,6 +83482,8 @@ entities: rot: -1.5707963267948966 rad pos: 48.5,15.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignSecureMed entities: - uid: 1518 @@ -82706,97 +83491,131 @@ entities: - type: Transform pos: 28.5,-25.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 7963 components: - type: Transform rot: 1.5707963267948966 rad pos: 21.5,-59.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 8176 components: - type: Transform pos: 16.5,35.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 8288 components: - type: Transform rot: 1.5707963267948966 rad pos: 11.5,-51.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 8332 components: - type: Transform rot: 1.5707963267948966 rad pos: 30.5,-51.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 9958 components: - type: Transform rot: 3.141592653589793 rad pos: 94.5,24.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 10321 components: - type: Transform pos: 20.5,38.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 11690 components: - type: Transform pos: -21.5,14.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 14572 components: - type: Transform pos: 80.5,26.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 14573 components: - type: Transform pos: 87.5,32.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 14592 components: - type: Transform rot: -1.5707963267948966 rad pos: 68.5,24.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 14951 components: - type: Transform rot: -1.5707963267948966 rad pos: 21.5,49.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 14952 components: - type: Transform rot: -1.5707963267948966 rad pos: 12.5,42.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 14966 components: - type: Transform rot: 3.141592653589793 rad pos: 99.5,30.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 14972 components: - type: Transform rot: 3.141592653589793 rad pos: 94.5,36.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 14976 components: - type: Transform rot: 3.141592653589793 rad pos: 78.5,34.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 15401 components: - type: Transform rot: 1.5707963267948966 rad pos: 14.5,-29.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignSecureMedRed entities: - uid: 221 @@ -82805,6 +83624,8 @@ entities: rot: 1.5707963267948966 rad pos: 39.5,-15.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignSecurity entities: - uid: 9015 @@ -82812,6 +83633,8 @@ entities: - type: Transform pos: 28.5,29.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignServer entities: - uid: 5201 @@ -82819,6 +83642,8 @@ entities: - type: Transform pos: 52.5,25.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignShipDock entities: - uid: 15358 @@ -82826,11 +83651,15 @@ entities: - type: Transform pos: -3.5,1.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 15360 components: - type: Transform pos: -11.5,1.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignSmoking entities: - uid: 3432 @@ -82839,11 +83668,15 @@ entities: rot: 3.141592653589793 rad pos: 68.5,40.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 9721 components: - type: Transform pos: 54.5,-2.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignSpace entities: - uid: 5397 @@ -82851,36 +83684,50 @@ entities: - type: Transform pos: 34.5,-37.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 7562 components: - type: Transform pos: 2.4978352,-16.484226 parent: 2 + - type: Fixtures + fixtures: {} - uid: 7563 components: - type: Transform pos: 5.529085,-16.484226 parent: 2 + - type: Fixtures + fixtures: {} - uid: 12823 components: - type: Transform pos: 4.5,34.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 12992 components: - type: Transform pos: 33.5,-48.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 14157 components: - type: Transform pos: 73.5,21.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 14241 components: - type: Transform pos: 80.5,28.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignSurgery entities: - uid: 11202 @@ -82888,11 +83735,15 @@ entities: - type: Transform pos: 63.483078,-4.4704685 parent: 2 + - type: Fixtures + fixtures: {} - uid: 11203 components: - type: Transform pos: 54.505295,-16.448315 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignTelecomms entities: - uid: 11206 @@ -82900,6 +83751,8 @@ entities: - type: Transform pos: 24.48286,-16.522787 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignToolStorage entities: - uid: 11200 @@ -82907,12 +83760,16 @@ entities: - type: Transform pos: 28.472525,-18.512623 parent: 2 + - type: Fixtures + fixtures: {} - uid: 12302 components: - type: Transform rot: 1.5707963267948966 rad pos: 28.5,-13.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignVault entities: - uid: 10444 @@ -82920,6 +83777,8 @@ entities: - type: Transform pos: 19.5,38.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignVirology entities: - uid: 10909 @@ -82927,6 +83786,8 @@ entities: - type: Transform pos: 78.5,0.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SignXenobio entities: - uid: 13126 @@ -82934,6 +83795,8 @@ entities: - type: Transform pos: 68.5,28.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: SingularityGenerator entities: - uid: 750 @@ -84170,6 +85033,13 @@ entities: - type: Transform pos: 48.5,42.5 parent: 2 +- proto: SpawnPointHeadOfSecurityWeapon + entities: + - uid: 1999 + components: + - type: Transform + pos: 44.5,43.5 + parent: 2 - proto: SpawnPointJanitor entities: - uid: 8711 @@ -84459,6 +85329,13 @@ entities: - type: Transform pos: 43.5,25.5 parent: 2 +- proto: SpawnPointWardenWeapon + entities: + - uid: 5153 + components: + - type: Transform + pos: 44.5,25.5 + parent: 2 - proto: SprayBottle entities: - uid: 11736 @@ -84529,45 +85406,61 @@ entities: rot: 3.141592653589793 rad pos: -14.5,-2.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 2022 components: - type: Transform rot: 1.5707963267948966 rad pos: -25.5,-19.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 2024 components: - type: Transform rot: 1.5707963267948966 rad pos: -7.5,-8.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 8116 components: - type: Transform pos: 9.5,2.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 8230 components: - type: Transform pos: 61.5,16.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 11292 components: - type: Transform pos: 28.5,-1.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 15366 components: - type: Transform rot: 3.141592653589793 rad pos: 34.5,12.5 parent: 2 + - type: Fixtures + fixtures: {} - uid: 15681 components: - type: Transform rot: 1.5707963267948966 rad pos: 24.5,34.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: Stool entities: - uid: 172 @@ -84983,18 +85876,8 @@ entities: immutable: False temperature: 293.14673 moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 1.7459903 + Nitrogen: 6.568249 - type: ContainerContainer containers: entity_storage: !type:Container @@ -85021,18 +85904,8 @@ entities: immutable: False temperature: 293.14673 moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 1.7459903 + Nitrogen: 6.568249 - type: ContainerContainer containers: entity_storage: !type:Container @@ -89029,6 +89902,8 @@ entities: - type: Transform pos: 30.5,43.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: WallReinforced entities: - uid: 4 @@ -100382,18 +101257,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 1.7459903 + Nitrogen: 6.568249 - uid: 13063 components: - type: Transform @@ -100405,18 +101270,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 1.7459903 + Nitrogen: 6.568249 - proto: WardrobePrisonFilled entities: - uid: 2239 @@ -100439,18 +101294,8 @@ entities: immutable: False temperature: 293.14673 moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + Oxygen: 1.7459903 + Nitrogen: 6.568249 - type: Physics bodyType: Static - proto: WardrobeVirologyFilled @@ -100482,6 +101327,8 @@ entities: rot: 1.5707963267948966 rad pos: 47.5,-26.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: WarningN2 entities: - uid: 409 @@ -100490,6 +101337,8 @@ entities: rot: 1.5707963267948966 rad pos: 47.5,-22.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: WarningO2 entities: - uid: 415 @@ -100498,6 +101347,8 @@ entities: rot: 1.5707963267948966 rad pos: 47.5,-24.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: WarningPlasma entities: - uid: 417 @@ -100506,6 +101357,8 @@ entities: rot: 1.5707963267948966 rad pos: 47.5,-30.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: WarningTritium entities: - uid: 381 @@ -100514,6 +101367,8 @@ entities: rot: 1.5707963267948966 rad pos: 47.5,-32.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: WarningWaste entities: - uid: 351 @@ -100522,6 +101377,8 @@ entities: rot: 1.5707963267948966 rad pos: 47.5,-28.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: WaterCooler entities: - uid: 5643 @@ -100748,20 +101605,6 @@ entities: - type: Transform pos: 50.6435,34.509346 parent: 2 -- proto: WeaponShotgunEnforcerRubber - entities: - - uid: 5153 - components: - - type: Transform - pos: 44.511932,25.36125 - parent: 2 -- proto: WeaponSubMachineGunWt550 - entities: - - uid: 1999 - components: - - type: Transform - pos: 44.47453,43.768467 - parent: 2 - proto: WeedSpray entities: - uid: 4061 From c72c1c4f347c36619eab3430bd5b93ae6431c78f Mon Sep 17 00:00:00 2001 From: UpAndLeaves <92269094+Alpha-Two@users.noreply.github.com> Date: Tue, 4 Nov 2025 22:08:22 +0000 Subject: [PATCH 109/121] Move TileFireEvent to Shared (#41285) * Move to shared * cleanup --------- Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> --- Content.Server/Atmos/TileFireEvent.cs | 18 ------------------ Content.Shared/Atmos/TileFireEvent.cs | 10 ++++++++++ 2 files changed, 10 insertions(+), 18 deletions(-) delete mode 100644 Content.Server/Atmos/TileFireEvent.cs create mode 100644 Content.Shared/Atmos/TileFireEvent.cs diff --git a/Content.Server/Atmos/TileFireEvent.cs b/Content.Server/Atmos/TileFireEvent.cs deleted file mode 100644 index 5dad4e8fc0..0000000000 --- a/Content.Server/Atmos/TileFireEvent.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace Content.Server.Atmos -{ - /// - /// Event raised directed to an entity when it is standing on a tile that's on fire. - /// - [ByRefEvent] - public readonly struct TileFireEvent - { - public readonly float Temperature; - public readonly float Volume; - - public TileFireEvent(float temperature, float volume) - { - Temperature = temperature; - Volume = volume; - } - } -} diff --git a/Content.Shared/Atmos/TileFireEvent.cs b/Content.Shared/Atmos/TileFireEvent.cs new file mode 100644 index 0000000000..f0045f58fd --- /dev/null +++ b/Content.Shared/Atmos/TileFireEvent.cs @@ -0,0 +1,10 @@ +namespace Content.Shared.Atmos; + +/// +/// Event raised on an entity when it is standing on a tile that's on fire. +/// +/// Current temperature of the hotspot this entity is exposed to. +/// Current volume of the hotspot this entity is exposed to. +/// This is not the volume of the tile this entity is on. +[ByRefEvent] +public readonly record struct TileFireEvent(float Temperature, float Volume); From e65518ff02ec9f01a609be92f4c459292f8960c6 Mon Sep 17 00:00:00 2001 From: Centronias Date: Tue, 4 Nov 2025 15:09:59 -0800 Subject: [PATCH 110/121] Make bleach a better space cleaner (#41276) * make bleach a better space cleaner * imagine me cherry picking just the first bad commit and then totally forgetting there was a second commit lel --- Resources/Locale/en-US/reagents/meta/cleaning.ftl | 2 +- Resources/Prototypes/Reagents/cleaning.yml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/reagents/meta/cleaning.ftl b/Resources/Locale/en-US/reagents/meta/cleaning.ftl index 8603711b6e..c6d42b78e6 100644 --- a/Resources/Locale/en-US/reagents/meta/cleaning.ftl +++ b/Resources/Locale/en-US/reagents/meta/cleaning.ftl @@ -1,5 +1,5 @@ reagent-name-bleach = bleach -reagent-desc-bleach = Heavy duty cleaner that can clean tiles the same as Space Cleaner and also decontaminate clothes. Extremely toxic when ingested. +reagent-desc-bleach = Heavy duty cleaner that can clean tiles better than Space Cleaner. Extremely toxic when ingested. reagent-name-space-cleaner = space cleaner reagent-desc-space-cleaner = This is able to clean almost all surfaces of almost anything that may dirty them. The janitor is likely to appreciate refills. diff --git a/Resources/Prototypes/Reagents/cleaning.yml b/Resources/Prototypes/Reagents/cleaning.yml index c5fe0e4da9..c6eaade16d 100644 --- a/Resources/Prototypes/Reagents/cleaning.yml +++ b/Resources/Prototypes/Reagents/cleaning.yml @@ -26,6 +26,11 @@ - !type:Emote emote: Scream probability: 0.15 + tileReactions: + - !type:CleanTileReaction + cleanCost: 0.13 + - !type:CleanDecalsReaction + cleanCost: 0.13 - type: reagent id: SpaceCleaner From 0ed111d307bdee5a1b967c3490fa01c4b73d293f Mon Sep 17 00:00:00 2001 From: JesterX666 <32009105+JesterX666@users.noreply.github.com> Date: Tue, 4 Nov 2025 22:23:43 -0500 Subject: [PATCH 111/121] Log radial menu interractions for the RCD, Issue #40902 (#40986) * Log radial menu interractions, Issue #40902 * code review adjustement * Asked modifications from code review * Update Content.Shared/RCD/Systems/RCDSystem.cs Yeah, I'm old and using a very old C# syntax :D I need to update my brain Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Content.Shared/RCD/Systems/RCDSystem.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --- Content.Shared/RCD/Systems/RCDSystem.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Content.Shared/RCD/Systems/RCDSystem.cs b/Content.Shared/RCD/Systems/RCDSystem.cs index 6cce0b6204..504576216a 100644 --- a/Content.Shared/RCD/Systems/RCDSystem.cs +++ b/Content.Shared/RCD/Systems/RCDSystem.cs @@ -1,5 +1,4 @@ using Content.Shared.Administration.Logs; -using Content.Shared.Charges.Components; using Content.Shared.Charges.Systems; using Content.Shared.Construction; using Content.Shared.Database; @@ -89,11 +88,14 @@ public sealed class RCDSystem : EntitySystem if (!component.AvailablePrototypes.Contains(args.ProtoId)) return; - if (!_protoManager.HasIndex(args.ProtoId)) + if (!_protoManager.Resolve(args.ProtoId, out var prototype)) return; // Set the current RCD prototype to the one supplied component.ProtoId = args.ProtoId; + + _adminLogger.Add(LogType.RCD, LogImpact.Low, $"{args.Actor} set RCD mode to: {prototype.Mode} : {prototype.Prototype}"); + Dirty(uid, component); } From 5a5031750200fa349e1803fa51268df46b54043a Mon Sep 17 00:00:00 2001 From: Kittygyat <202250949+Kittygyat@users.noreply.github.com> Date: Wed, 5 Nov 2025 03:32:31 +0000 Subject: [PATCH 112/121] Fixed several unintended burn groupings with the untrained bible use & clumsy gun explosion (#41307) Fixed several unintended burn groupings --- Resources/Prototypes/Entities/Mobs/NPCs/animals.yml | 6 ++---- Resources/Prototypes/Entities/Mobs/Player/guardian.yml | 3 +-- .../Prototypes/Entities/Objects/Specific/Chapel/bibles.yml | 4 ++-- Resources/Prototypes/Roles/Jobs/Civilian/clown.yml | 3 +-- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 8b79eaeb5a..a240f0ed67 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -1471,8 +1471,7 @@ types: Blunt: 5 Piercing: 4 - groups: - Burn: 3 + Heat: 3 catchingFailDamage: types: Blunt: 1 @@ -1653,8 +1652,7 @@ types: Blunt: 2 Piercing: 7 - groups: - Burn: 3 + Heat: 3 catchingFailDamage: types: Blunt: 1 diff --git a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml index 1b81b0d099..10ef8311ea 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml @@ -237,8 +237,7 @@ types: Blunt: 5 Piercing: 4 - groups: - Burn: 3 + Heat: 3 catchingFailDamage: types: Blunt: 1 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml index 1545594b11..1bb9d10307 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml @@ -16,8 +16,8 @@ Brute: 15 Airloss: 15 damageOnUntrainedUse: ## What a non-chaplain takes when attempting to heal someone - groups: - Burn: 10 + types: + Heat: 10 - type: MeleeWeapon soundHit: collection: Punch diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml index c64d0550ce..31ab9640e7 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml @@ -17,8 +17,7 @@ types: #literally just picked semi random valus. i tested this once and tweaked it. Blunt: 5 Piercing: 4 - groups: - Burn: 3 + Heat: 3 catchingFailDamage: types: Blunt: 1 From 3c68d45ba5c854e2921410b3eaf515092ad53dac Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 5 Nov 2025 03:45:10 +0000 Subject: [PATCH 113/121] Automatic changelog update --- Resources/Changelog/Admin.yml | 20 ++- Resources/Changelog/Changelog.yml | 177 ++++++++++--------- Resources/Changelog/Maps.yml | 18 +- Resources/Changelog/Parts/pr-40065-Main.yml | 7 - Resources/Changelog/Parts/pr-40257-RULES.yml | 12 -- Resources/Changelog/Parts/pr-41134-Main.yml | 7 - Resources/Changelog/Parts/pr-41136-Main.yml | 7 - Resources/Changelog/Rules.yml | 15 +- 8 files changed, 135 insertions(+), 128 deletions(-) delete mode 100644 Resources/Changelog/Parts/pr-40065-Main.yml delete mode 100644 Resources/Changelog/Parts/pr-40257-RULES.yml delete mode 100644 Resources/Changelog/Parts/pr-41134-Main.yml delete mode 100644 Resources/Changelog/Parts/pr-41136-Main.yml diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml index 0a763682cc..2a80134c15 100644 --- a/Resources/Changelog/Admin.yml +++ b/Resources/Changelog/Admin.yml @@ -1,6 +1,4 @@ -AdminOnly: true -Name: Admin -Order: 3 +AdminOnly: true Entries: - author: DrSmugleaf changes: @@ -1493,3 +1491,19 @@ Entries: id: 181 time: '2025-10-27T02:51:40.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/40472 +- author: slarticodefast + changes: + - message: Added a new admin item, the DNA injector! + type: Add + id: 182 + time: '2025-11-03T12:14:21.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/41271 +- author: ScarKy0 + changes: + - message: Clone toolshed command for VERY limited entity cloning purposes. + type: Add + id: 183 + time: '2025-11-03T13:16:43.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/41261 +Name: Admin +Order: 3 diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index f5f24d99bf..e3bc7ff685 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,92 +1,4 @@ Entries: -- author: Nikitosych - changes: - - message: Fixed the ability for holoparasite to kill the host through the mech - type: Fix - id: 8674 - time: '2025-06-14T17:22:45.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/36659 -- author: ScarKy0 - changes: - - message: Using glue on an unremoveable item will no longer make it removeable. - type: Fix - id: 8675 - time: '2025-06-14T18:29:06.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/38150 -- author: FungiFellow - changes: - - message: Syndie-Cats now have Syndicate ID access. - type: Fix - id: 8676 - time: '2025-06-15T08:27:32.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/38318 -- author: SlamBamActionman - changes: - - message: Crates on conveyor belts can now go around tight corners again! - type: Fix - id: 8677 - time: '2025-06-15T09:36:18.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/37466 -- author: SlamBamActionman - changes: - - message: A new station, Exo, has been added to the map pool. - type: Add - id: 8678 - time: '2025-06-15T19:10:22.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/33144 -- author: widgetbeck - changes: - - message: Randomized characters will now roll markings. - type: Add - id: 8679 - time: '2025-06-15T21:11:52.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/34765 -- author: qrwas - changes: - - message: Grouping for Loadouts - type: Add - - message: '3 new pin to loadout: aroace pin, plural pin and genderfluid pin' - type: Add - - message: smoking, pins, towels and jumpsuit for HoS are now grouped in loadouts - menu - type: Tweak - id: 8680 - time: '2025-06-16T09:36:06.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/36951 -- author: Sparlight - changes: - - message: Smart corgis are now targeted by hostile mobs like the rest of the crew. - type: Tweak - id: 8681 - time: '2025-06-16T15:39:47.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/38349 -- author: ArtisticRoomba - changes: - - message: Thieves now have an innate stealth steal ability (thieving gloves) that - can be toggled on/off. - type: Add - - message: The Thief no longer spawns with thieving gloves. - type: Remove - - message: Thieving gloves have been removed from the Traitor store. - type: Remove - id: 8682 - time: '2025-06-16T22:47:31.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/38123 -- author: kosticia - changes: - - message: Hyposprays are now predicted. - type: Tweak - id: 8683 - time: '2025-06-17T00:08:09.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/38046 -- author: august-sun - changes: - - message: Added the Estoc DMR, a burst-fire marksman rifle with an optic. Available - for syndicate operatives at 18 TC. - type: Add - id: 8684 - time: '2025-06-17T00:20:08.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/38122 - author: Citrea-Lingua changes: - message: Handheld artifact containers can now properly store handheld artifacts. @@ -3921,3 +3833,92 @@ id: 9175 time: '2025-10-30T20:04:05.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/40991 +- author: SuperGDPWYL + changes: + - message: Certain thief objectives can no longer be rolled by jobs which have trivial + access to the objective item. + type: Tweak + id: 9176 + time: '2025-10-31T09:37:48.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40065 +- author: aada + changes: + - message: Several lathe recipes capable of duplicating materials have been made + more expensive. + type: Fix + id: 9177 + time: '2025-10-31T00:20:53.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/41134 +- author: NoreUhh + changes: + - message: Added two new fun reagents, Felinase and Caninase, which change how you + talk! + type: Add + id: 9178 + time: '2025-10-31T01:14:29.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/41136 +- author: Errant + changes: + - message: Tesla generators will no longer occasionally spawn an additional tesla. + type: Fix + id: 9179 + time: '2025-10-31T20:35:32.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/41199 +- author: Jrpl + changes: + - message: Chameleon clothing made of Cloth can now be eaten by Moths. + type: Tweak + id: 9180 + time: '2025-11-01T13:37:05.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/41232 +- author: SlamBamActionman + changes: + - message: Fixed the G.O.R.I.L.L.A gauntlet being able to unanchor walls, doors + etc. + type: Fix + id: 9181 + time: '2025-11-01T15:28:19.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/41219 +- author: Hitlinemoss + changes: + - message: Towels in the trinkets loadout menu are now sorted by hue. + type: Tweak + - message: White towels no longer have a playtime requirement. + type: Tweak + - message: Dark green towels are now actually darker than green towels. + type: Fix + id: 9182 + time: '2025-11-01T16:01:07.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/39831 +- author: SlamBamActionman + changes: + - message: Added new signs, spawners and consoles to Exo, along with some minor + balance tweaks and improvements. + type: Tweak + id: 9183 + time: '2025-11-01T21:00:08.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/41234 +- author: PickelSilly + changes: + - message: Added a new voice sensor item craftable at an autolathe, record a key + phrase, and speak it to trigger linked devices. + type: Add + id: 9184 + time: '2025-11-03T22:43:55.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/41098 +- author: Centronias + changes: + - message: Bleach now actually does what its description says and can be used for + cleaning as a better alternative to Space Cleaner! + type: Add + id: 9185 + time: '2025-11-04T23:20:49.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/41276 +- author: Kittygyat + changes: + - message: Fixed several unintended burn groupings with the clumsy gun explosions + & bible misuse. + type: Fix + id: 9186 + time: '2025-11-05T03:43:50.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/41307 diff --git a/Resources/Changelog/Maps.yml b/Resources/Changelog/Maps.yml index 7deeb078d8..80ff2191eb 100644 --- a/Resources/Changelog/Maps.yml +++ b/Resources/Changelog/Maps.yml @@ -1,5 +1,4 @@ -Order: 2 -Entries: +Entries: - author: ArtisticRoomba changes: - message: The mapping changelog has been added! This primarily serves as a way @@ -806,3 +805,18 @@ Entries: id: 97 time: '2025-10-13T21:06:19.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/40717 +- author: F1restar4 + changes: + - message: On Oasis, reworked the TEG + type: Tweak + id: 98 + time: '2025-11-02T23:14:46.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40623 +- author: Hitlinemoss + changes: + - message: On Reach, Clown and Mime are now playable jobs. + type: Add + id: 99 + time: '2025-11-03T09:45:56.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/41072 +Order: 2 diff --git a/Resources/Changelog/Parts/pr-40065-Main.yml b/Resources/Changelog/Parts/pr-40065-Main.yml deleted file mode 100644 index 522cf81d0d..0000000000 --- a/Resources/Changelog/Parts/pr-40065-Main.yml +++ /dev/null @@ -1,7 +0,0 @@ -author: "SuperGDPWYL" -time: "2025-10-31T09:37:48.0000000+00:00" -url: "https://github.com/space-wizards/space-station-14/pull/40065" -changes: -- type: "Tweak" - message: "Certain thief objectives can no longer be rolled by jobs which have trivial access to the objective item." -... diff --git a/Resources/Changelog/Parts/pr-40257-RULES.yml b/Resources/Changelog/Parts/pr-40257-RULES.yml deleted file mode 100644 index 5baa53ff86..0000000000 --- a/Resources/Changelog/Parts/pr-40257-RULES.yml +++ /dev/null @@ -1,12 +0,0 @@ -author: "Errant" -time: "2025-10-30T21:42:03.0000000+00:00" -url: "https://github.com/space-wizards/space-station-14/pull/40257" -changes: -- type: "Add" - message: "Changes to Rules can now be tracked here." -- type: "Add" - message: "Rule changes are now tracked, on a new tab in the changelog window." -- type: "Tweak" - message: "Automation test. You like reading rules, don't you, you are a Rulesreader." -category: Rules -... diff --git a/Resources/Changelog/Parts/pr-41134-Main.yml b/Resources/Changelog/Parts/pr-41134-Main.yml deleted file mode 100644 index 42a14688d1..0000000000 --- a/Resources/Changelog/Parts/pr-41134-Main.yml +++ /dev/null @@ -1,7 +0,0 @@ -author: "aada" -time: "2025-10-31T00:20:53.0000000+00:00" -url: "https://github.com/space-wizards/space-station-14/pull/41134" -changes: -- type: "Fix" - message: "Several lathe recipes capable of duplicating materials have been made more expensive." -... diff --git a/Resources/Changelog/Parts/pr-41136-Main.yml b/Resources/Changelog/Parts/pr-41136-Main.yml deleted file mode 100644 index 1ba1b21618..0000000000 --- a/Resources/Changelog/Parts/pr-41136-Main.yml +++ /dev/null @@ -1,7 +0,0 @@ -author: "NoreUhh" -time: "2025-10-31T01:14:29.0000000+00:00" -url: "https://github.com/space-wizards/space-station-14/pull/41136" -changes: -- type: "Add" - message: "Added two new fun reagents, Felinase and Caninase, which change how you talk!" -... diff --git a/Resources/Changelog/Rules.yml b/Resources/Changelog/Rules.yml index fbabc4eebb..6fd5f130ca 100644 --- a/Resources/Changelog/Rules.yml +++ b/Resources/Changelog/Rules.yml @@ -1,8 +1,19 @@ -Order: 1 -Entries: +Entries: - author: Errant changes: - message: Tab created. type: Add id: 1 time: '2025-10-30' +- author: Errant + changes: + - message: Changes to Rules can now be tracked here. + type: Add + - message: Rule changes are now tracked, on a new tab in the changelog window. + type: Add + - message: Automation test. You like reading rules, don't you, you are a Rulesreader. + type: Tweak + id: 2 + time: '2025-10-30T21:42:03.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/40257 +Order: 1 From 7b1583085a3a4f0cb630295bcbdd71dab985d418 Mon Sep 17 00:00:00 2001 From: eoineoineoin Date: Wed, 5 Nov 2025 09:29:07 +0000 Subject: [PATCH 114/121] Fix changelog button always indicating new changes. (#41277) * Refresh changelog button when ServerId is changed * Listen to specific cvar being changed --- Content.Client/Changelog/ChangelogManager.cs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Content.Client/Changelog/ChangelogManager.cs b/Content.Client/Changelog/ChangelogManager.cs index 657d0cb3ac..545d001aab 100644 --- a/Content.Client/Changelog/ChangelogManager.cs +++ b/Content.Client/Changelog/ChangelogManager.cs @@ -52,6 +52,7 @@ namespace Content.Client.Changelog // Open changelog purely to compare to the last viewed date. var changelogs = await LoadChangelog(); UpdateChangelogs(changelogs); + _configManager.OnValueChanged(CCVars.ServerId, OnServerIdCVarChanged); } private void UpdateChangelogs(List changelogs) @@ -81,6 +82,11 @@ namespace Content.Client.Changelog MaxId = changelog.Entries.Max(c => c.Id); + CheckLastSeenEntry(); + } + + private void CheckLastSeenEntry() + { var path = new ResPath($"/changelog_last_seen_{_configManager.GetCVar(CCVars.ServerId)}"); if (_resource.UserData.TryReadAllText(path, out var lastReadIdText)) { @@ -92,6 +98,11 @@ namespace Content.Client.Changelog NewChangelogEntriesChanged?.Invoke(); } + private void OnServerIdCVarChanged(string newValue) + { + CheckLastSeenEntry(); + } + public Task> LoadChangelog() { return Task.Run(() => From 53083ef771634e97dfed25467e7cd2a3eb6896b0 Mon Sep 17 00:00:00 2001 From: chromiumboy <50505512+chromiumboy@users.noreply.github.com> Date: Thu, 6 Nov 2025 00:20:37 -0600 Subject: [PATCH 115/121] Gas analyzer fix for gas pipe manifolds (#41325) Initial commit --- .../Atmos/Piping/EntitySystems/GasPipeManifoldSystem.cs | 5 +++-- .../Entities/Structures/Piping/Atmospherics/pipes.yml | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Content.Server/Atmos/Piping/EntitySystems/GasPipeManifoldSystem.cs b/Content.Server/Atmos/Piping/EntitySystems/GasPipeManifoldSystem.cs index bb7678d28d..6dfb1afa86 100644 --- a/Content.Server/Atmos/Piping/EntitySystems/GasPipeManifoldSystem.cs +++ b/Content.Server/Atmos/Piping/EntitySystems/GasPipeManifoldSystem.cs @@ -51,6 +51,7 @@ public sealed partial class GasPipeManifoldSystem : EntitySystem return; var pipeNames = ent.Comp.InletNames.Union(ent.Comp.OutletNames); + var pipeCount = pipeNames.Count(); foreach (var pipeName in pipeNames) { @@ -58,8 +59,8 @@ public sealed partial class GasPipeManifoldSystem : EntitySystem continue; var pipeLocal = pipe.Air.Clone(); - pipeLocal.Multiply(pipe.Volume / pipe.Air.Volume); - pipeLocal.Volume = pipe.Volume; + pipeLocal.Multiply(pipe.Volume * pipeCount / pipe.Air.Volume); + pipeLocal.Volume = pipe.Volume * pipeCount; args.GasMixtures.Add((Name(ent), pipeLocal)); break; diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml index 6d9d596760..0e7db8d02b 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml @@ -366,31 +366,37 @@ nodeGroupID: Pipe pipeDirection: South pipeLayer: 0 + volume: 50 south1: !type:PipeNode nodeGroupID: Pipe pipeDirection: South pipeLayer: 1 + volume: 50 south2: !type:PipeNode nodeGroupID: Pipe pipeDirection: South pipeLayer: 2 + volume: 50 north0: !type:PipeNode nodeGroupID: Pipe pipeDirection: North pipeLayer: 0 + volume: 50 north1: !type:PipeNode nodeGroupID: Pipe pipeDirection: North pipeLayer: 1 + volume: 50 north2: !type:PipeNode nodeGroupID: Pipe pipeDirection: North pipeLayer: 2 + volume: 50 - type: GasPipeManifold - type: AtmosMonitoringConsoleDevice navMapBlip: GasPipeManifold From 2b196257c1c4896c57045bec370bad9e30271c52 Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 6 Nov 2025 06:32:28 +0000 Subject: [PATCH 116/121] Automatic changelog update --- Resources/Changelog/Changelog.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index e3bc7ff685..c8627e0344 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Citrea-Lingua - changes: - - message: Handheld artifact containers can now properly store handheld artifacts. - type: Fix - id: 8685 - time: '2025-06-17T08:53:28.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/38383 - author: hoshizora-sayo changes: - message: Fixed oddities with the memory cell, APC, and black curtains crafting @@ -3922,3 +3915,14 @@ id: 9186 time: '2025-11-05T03:43:50.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/41307 +- author: chromiumboy + changes: + - message: Gas analyzers now correctly report the total volume and the number of + moles of gas contained in gas pipe manifolds. + type: Fix + - message: The total volume of gas that gas pipe manifolds can contain has been + reduced from 1200L to 300L. + type: Tweak + id: 9187 + time: '2025-11-06T06:31:18.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/41325 From e5b6e4bf04cb506d155a75657452ad41da017af6 Mon Sep 17 00:00:00 2001 From: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com> Date: Thu, 6 Nov 2025 13:34:53 -0800 Subject: [PATCH 117/121] Fix Entity Effect Scaling (Hopefully) for good and some other misc fixes (#41163) * Fix the last of the entity effects bugs * aaa * losing it --------- Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> --- .../ReagentEntityConditionSystem.cs | 2 +- .../BaseSpawnEntityEntityEffect.cs | 3 -- .../Solution/AreaReactionEntityEffect.cs | 2 - .../Transform/EmpEntityEffectSystem.cs | 2 - .../Transform/ExplosionEntityEffect.cs | 2 - .../Transform/FlashEntityEffectSystem.cs | 2 - Content.Shared/EntityEffects/EntityEffect.cs | 2 +- .../SharedEntityEffectsSystem.cs | 38 +++++++++---------- .../Entities/Mobs/NPCs/miscellaneous.yml | 4 -- .../Prototypes/Entities/Mobs/NPCs/slimes.yml | 1 - .../Prototypes/Entities/Mobs/NPCs/space.yml | 1 - .../Entities/Mobs/Species/diona.yml | 2 - .../Entities/Mobs/Species/skeleton.yml | 1 - .../Entities/Mobs/Species/slime.yml | 1 - .../Entities/Objects/Misc/kudzu.yml | 1 - .../Reagents/Consumable/Drink/drinks.yml | 1 - Resources/Prototypes/Reagents/botany.yml | 1 - Resources/Prototypes/Reagents/fun.yml | 2 - Resources/Prototypes/Reagents/gases.yml | 19 ---------- Resources/Prototypes/Reagents/medicine.yml | 1 - Resources/Prototypes/Reagents/toxins.yml | 4 -- 21 files changed, 21 insertions(+), 71 deletions(-) diff --git a/Content.Shared/EntityConditions/Conditions/ReagentEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/ReagentEntityConditionSystem.cs index dbe585e631..c1da05ae30 100644 --- a/Content.Shared/EntityConditions/Conditions/ReagentEntityConditionSystem.cs +++ b/Content.Shared/EntityConditions/Conditions/ReagentEntityConditionSystem.cs @@ -9,7 +9,7 @@ namespace Content.Shared.EntityConditions.Conditions; /// Returns true if this solution entity has an amount of reagent in it within a specified minimum and maximum. ///
/// -public sealed partial class ReagentThresholdEntityConditionSystem : EntityConditionSystem +public sealed partial class ReagentEntityConditionSystem : EntityConditionSystem { protected override void Condition(Entity entity, ref EntityConditionEvent args) { diff --git a/Content.Shared/EntityEffects/Effects/EntitySpawning/BaseSpawnEntityEntityEffect.cs b/Content.Shared/EntityEffects/Effects/EntitySpawning/BaseSpawnEntityEntityEffect.cs index bd8d68813e..3f5d5b3b57 100644 --- a/Content.Shared/EntityEffects/Effects/EntitySpawning/BaseSpawnEntityEntityEffect.cs +++ b/Content.Shared/EntityEffects/Effects/EntitySpawning/BaseSpawnEntityEntityEffect.cs @@ -28,9 +28,6 @@ public abstract partial class BaseSpawnEntityEntityEffect : EntityEffectBase< [DataField] public bool Predicted = true; - /// - public override bool Scaling => true; - public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("entity-effect-guidebook-spawn-entity", ("chance", Probability), diff --git a/Content.Shared/EntityEffects/Effects/Solution/AreaReactionEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Solution/AreaReactionEntityEffect.cs index 9d3dc38222..13175cfed1 100644 --- a/Content.Shared/EntityEffects/Effects/Solution/AreaReactionEntityEffect.cs +++ b/Content.Shared/EntityEffects/Effects/Solution/AreaReactionEntityEffect.cs @@ -28,8 +28,6 @@ public sealed partial class AreaReactionEffect : EntityEffectBase [DataField(required: true)] public SoundSpecifier Sound = default!; - public override bool Scaling => true; - public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("entity-effect-guidebook-area-reaction", ("duration", Duration) diff --git a/Content.Shared/EntityEffects/Effects/Transform/EmpEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Transform/EmpEntityEffectSystem.cs index 334223686b..2cbb6d6dad 100644 --- a/Content.Shared/EntityEffects/Effects/Transform/EmpEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/Transform/EmpEntityEffectSystem.cs @@ -49,8 +49,6 @@ public sealed partial class Emp : EntityEffectBase [DataField] public TimeSpan Duration = TimeSpan.FromSeconds(15); - public override bool Scaling => true; - public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("entity-effect-guidebook-emp-reaction-effect", ("chance", Probability)); diff --git a/Content.Shared/EntityEffects/Effects/Transform/ExplosionEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Transform/ExplosionEntityEffect.cs index 2e32c434a3..907c4e321f 100644 --- a/Content.Shared/EntityEffects/Effects/Transform/ExplosionEntityEffect.cs +++ b/Content.Shared/EntityEffects/Effects/Transform/ExplosionEntityEffect.cs @@ -50,8 +50,6 @@ public sealed partial class Explosion : EntityEffectBase [DataField] public float TileBreakScale = 1f; - public override bool Scaling => true; - public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("entity-effect-guidebook-explosion", ("chance", Probability)); diff --git a/Content.Shared/EntityEffects/Effects/Transform/FlashEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Transform/FlashEntityEffectSystem.cs index 66d30945aa..df788e94d6 100644 --- a/Content.Shared/EntityEffects/Effects/Transform/FlashEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/Transform/FlashEntityEffectSystem.cs @@ -76,8 +76,6 @@ public sealed partial class Flash : EntityEffectBase [DataField] public SoundSpecifier? Sound = new SoundPathSpecifier("/Audio/Weapons/flash.ogg"); - public override bool Scaling => true; - public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("entity-effect-guidebook-flash-reaction-effect", ("chance", Probability)); } diff --git a/Content.Shared/EntityEffects/EntityEffect.cs b/Content.Shared/EntityEffects/EntityEffect.cs index 072ff8a61a..e34dbe63f3 100644 --- a/Content.Shared/EntityEffects/EntityEffect.cs +++ b/Content.Shared/EntityEffects/EntityEffect.cs @@ -25,7 +25,7 @@ public abstract partial class EntityEffect /// If true, then it allows the scale multiplier to go above 1. /// [DataField] - public virtual bool Scaling { get; private set; } + public virtual bool Scaling { get; private set; } = true; // TODO: This should be an entity condition but guidebook relies on it heavily for formatting... /// diff --git a/Content.Shared/EntityEffects/SharedEntityEffectsSystem.cs b/Content.Shared/EntityEffects/SharedEntityEffectsSystem.cs index 7eed94a099..8270f8bf7c 100644 --- a/Content.Shared/EntityEffects/SharedEntityEffectsSystem.cs +++ b/Content.Shared/EntityEffects/SharedEntityEffectsSystem.cs @@ -26,35 +26,35 @@ public sealed partial class SharedEntityEffectsSystem : EntitySystem, IEntityEff private void OnReactive(Entity entity, ref ReactionEntityEvent args) { - if (args.Reagent.ReactiveEffects == null || entity.Comp.ReactiveGroups == null) - return; - var scale = args.ReagentQuantity.Quantity.Float(); - foreach (var (key, val) in args.Reagent.ReactiveEffects) + if (args.Reagent.ReactiveEffects != null && entity.Comp.ReactiveGroups != null) { - if (!val.Methods.Contains(args.Method)) - continue; + foreach (var (key, val) in args.Reagent.ReactiveEffects) + { + if (!val.Methods.Contains(args.Method)) + continue; - if (!entity.Comp.ReactiveGroups.TryGetValue(key, out var group)) - continue; + if (!entity.Comp.ReactiveGroups.TryGetValue(key, out var group)) + continue; - if (!group.Contains(args.Method)) - continue; + if (!group.Contains(args.Method)) + continue; - ApplyEffects(entity, val.Effects, scale); + ApplyEffects(entity, val.Effects, scale); + } } - if (entity.Comp.Reactions == null) - return; - - foreach (var entry in entity.Comp.Reactions) + if (entity.Comp.Reactions != null) { - if (!entry.Methods.Contains(args.Method)) - continue; + foreach (var entry in entity.Comp.Reactions) + { + if (!entry.Methods.Contains(args.Method)) + continue; - if (entry.Reagents == null || entry.Reagents.Contains(args.Reagent.ID)) - ApplyEffects(entity, entry.Effects, scale); + if (entry.Reagents == null || entry.Reagents.Contains(args.Reagent.ID)) + ApplyEffects(entity, entry.Effects, scale); + } } } diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml index dd3fd5d430..64fa4e2292 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml @@ -104,7 +104,6 @@ methods: [ Touch ] effects: - !type:HealthChange - scaling: true damage: groups: Brute: -0.15 @@ -112,7 +111,6 @@ methods: [ Touch ] effects: - !type:HealthChange - scaling: true damage: groups: Brute: -0.25 @@ -121,7 +119,6 @@ methods: [ Touch ] effects: - !type:HealthChange - scaling: true damage: groups: Brute: -1 @@ -130,7 +127,6 @@ methods: [ Touch ] effects: - !type:HealthChange - scaling: true damage: types: Heat: 1 diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml index a239ede7b0..95cf95bcbc 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml @@ -79,7 +79,6 @@ methods: [ Touch ] effects: - !type:HealthChange - scaling: true damage: types: Heat: 0.05 #Same as slime species diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml index 69a1b93245..4dc0778efb 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml @@ -512,7 +512,6 @@ methods: [Touch, Ingestion, Injection] effects: - !type:HealthChange - scaling: true damage: types: Caustic: 1 diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml index fa992ded0b..6cad3bdfc5 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/diona.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/diona.yml @@ -48,7 +48,6 @@ methods: [ Touch ] effects: - !type:HealthChange - scaling: true damage: types: Blunt: 0.05 @@ -63,7 +62,6 @@ methods: [ Touch ] effects: - !type:HealthChange - scaling: true damage: types: Poison: 0.125 diff --git a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml index ca6301b0a4..fb4dd0cdd6 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml @@ -81,7 +81,6 @@ methods: [ Touch ] effects: # TODO: when magic is around - make a milk transformation to a skeleton monster - !type:HealthChange - scaling: true damage: groups: Burn: -1 # healing obviously up to discussion diff --git a/Resources/Prototypes/Entities/Mobs/Species/slime.yml b/Resources/Prototypes/Entities/Mobs/Species/slime.yml index 9526b490e3..1ca590d496 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/slime.yml @@ -87,7 +87,6 @@ methods: [ Touch ] effects: - !type:HealthChange - scaling: true damage: types: Heat: 0.05 diff --git a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml index 3b8196c30b..157a9616ab 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml @@ -75,7 +75,6 @@ methods: [Touch] effects: - !type:HealthChange - scaling: true damage: types: Heat: 0.5 diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml index d21de70031..d80dc5f8b3 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml @@ -453,7 +453,6 @@ Gas: effects: - !type:HealthChange - scaling: true ignoreResistances: true conditions: - !type:MetabolizerTypeCondition diff --git a/Resources/Prototypes/Reagents/botany.yml b/Resources/Prototypes/Reagents/botany.yml index eb5ceba470..c2698b2b29 100644 --- a/Resources/Prototypes/Reagents/botany.yml +++ b/Resources/Prototypes/Reagents/botany.yml @@ -258,7 +258,6 @@ - !type:ReagentCondition reagent: Ammonia min: 1 - scaling: true ignoreResistances: true damage: groups: diff --git a/Resources/Prototypes/Reagents/fun.yml b/Resources/Prototypes/Reagents/fun.yml index f6bddeee2d..781e816ac4 100644 --- a/Resources/Prototypes/Reagents/fun.yml +++ b/Resources/Prototypes/Reagents/fun.yml @@ -183,7 +183,6 @@ methods: [ Touch ] effects: - !type:HealthChange - scaling: true ignoreResistances: false damage: types: @@ -233,7 +232,6 @@ methods: [ Touch ] effects: - !type:HealthChange - scaling: true ignoreResistances: false damage: types: diff --git a/Resources/Prototypes/Reagents/gases.yml b/Resources/Prototypes/Reagents/gases.yml index 6a0b257877..b7e82d0960 100644 --- a/Resources/Prototypes/Reagents/gases.yml +++ b/Resources/Prototypes/Reagents/gases.yml @@ -11,13 +11,11 @@ Poison: effects: - !type:Oxygenate - scaling: true conditions: - !type:MetabolizerTypeCondition type: [ Human, Animal, Rat, Plant ] # Convert Oxygen into CO2. - !type:ModifyLungGas - scaling: true conditions: - !type:MetabolizerTypeCondition type: [ Vox ] @@ -29,7 +27,6 @@ conditions: - !type:MetabolizerTypeCondition type: [ Vox ] - scaling: true ignoreResistances: true damage: types: @@ -45,13 +42,11 @@ Gas: effects: - !type:Oxygenate - scaling: true conditions: - !type:MetabolizerTypeCondition type: [ Human, Animal, Rat, Plant ] # Convert Oxygen into CO2. - !type:ModifyLungGas - scaling: true conditions: - !type:MetabolizerTypeCondition type: [ Vox ] @@ -63,7 +58,6 @@ conditions: - !type:MetabolizerTypeCondition type: [ Vox ] - scaling: true ignoreResistances: true damage: types: @@ -103,7 +97,6 @@ Gas: effects: - !type:HealthChange - scaling: true ignoreResistances: true damage: types: @@ -149,7 +142,6 @@ Gas: effects: - !type:HealthChange - scaling: true ignoreResistances: true damage: types: @@ -173,7 +165,6 @@ Poison: effects: - !type:Oxygenate - scaling: true conditions: - !type:MetabolizerTypeCondition type: [ Plant ] @@ -182,14 +173,12 @@ - !type:MetabolizerTypeCondition type: [ Plant, Vox ] inverted: true - scaling: true ignoreResistances: true damage: types: Poison: 0.4 - !type:Oxygenate - scaling: true conditions: - !type:MetabolizerTypeCondition type: [ Plant ] @@ -198,7 +187,6 @@ Gas: effects: - !type:Oxygenate - scaling: true conditions: - !type:MetabolizerTypeCondition type: [ Plant ] @@ -210,14 +198,12 @@ inverted: true # Don't want people to get toxin damage from the gas they just # exhaled, right? - scaling: true ignoreResistances: true damage: types: Poison: 0.8 - !type:Oxygenate # carbon dioxide displaces oxygen from the bloodstream, causing asphyxiation - scaling: true conditions: - !type:MetabolizerTypeCondition type: [ Plant ] @@ -246,13 +232,11 @@ Gas: effects: - !type:Oxygenate - scaling: true conditions: - !type:MetabolizerTypeCondition type: [ Vox, Slime ] # Converts Nitrogen into Ammonia - !type:ModifyLungGas - scaling: true conditions: - !type:MetabolizerTypeCondition type: [ Vox ] @@ -260,7 +244,6 @@ Ammonia: 1.0 Nitrogen: -1.0 - !type:ModifyLungGas - scaling: true conditions: - !type:MetabolizerTypeCondition type: [ Slime ] @@ -359,7 +342,6 @@ Narcotic: effects: - !type:HealthChange - scaling: true ignoreResistances: true damage: types: @@ -386,7 +368,6 @@ effects: - !type:HealthChange minScale: 1 - scaling: true ignoreResistances: true damage: types: diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index 9569faf01d..84b5535802 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -1176,7 +1176,6 @@ methods: [ Touch ] effects: - !type:HealthChange - scaling: true ignoreResistances: false damage: types: diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml index ea7437aa7b..4a75270325 100644 --- a/Resources/Prototypes/Reagents/toxins.yml +++ b/Resources/Prototypes/Reagents/toxins.yml @@ -145,7 +145,6 @@ methods: [ Touch ] effects: - !type:HealthChange - scaling: true ignoreResistances: false damage: types: @@ -184,7 +183,6 @@ - !type:SatiateThirst factor: -1.5 - !type:HealthChange - scaling: true ignoreResistances: true damage: types: @@ -207,7 +205,6 @@ methods: [ Touch ] effects: - !type:HealthChange - scaling: true ignoreResistances: false damage: types: @@ -257,7 +254,6 @@ methods: [ Touch ] effects: - !type:HealthChange - scaling: true ignoreResistances: false damage: types: From 78c915df00f4dd7cc4cc292b8fb2312bd63b4d90 Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 6 Nov 2025 21:47:25 +0000 Subject: [PATCH 118/121] 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 c8627e0344..bb2ca3a948 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: hoshizora-sayo - changes: - - message: Fixed oddities with the memory cell, APC, and black curtains crafting - menu entries. - type: Fix - id: 8686 - time: '2025-06-17T09:22:14.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/38372 - author: KamTheSythe changes: - message: Explosive payloads no longer explode. Modular grenades with explosive @@ -3926,3 +3918,10 @@ id: 9187 time: '2025-11-06T06:31:18.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/41325 +- author: Princess-Cheeseballs + changes: + - message: Phalanx now removes the death gene again. + type: Fix + id: 9188 + time: '2025-11-06T21:46:17.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/41163 From 919a2175a586ef673bebf1013aa18a783a636878 Mon Sep 17 00:00:00 2001 From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Date: Fri, 7 Nov 2025 22:43:54 +0100 Subject: [PATCH 119/121] Fix pets attacking initial infected (#41338) * Fix station pets attacking Initial Infected * I was wrong, this code is correct * push --------- Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> --- Resources/Prototypes/ai_factions.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/ai_factions.yml b/Resources/Prototypes/ai_factions.yml index eff8ae2423..b78143b143 100644 --- a/Resources/Prototypes/ai_factions.yml +++ b/Resources/Prototypes/ai_factions.yml @@ -35,13 +35,14 @@ - type: npcFaction id: PetsNT + friendly: + - NanoTrasen hostile: - Mouse - SimpleHostile - Zombie - Xeno - AllHostile - - Wizard - Dragon - type: npcFaction @@ -162,5 +163,5 @@ - Xeno # rivalry # cause they are hostile to them - - SimpleHostile + - SimpleHostile - AllHostile From bf1e8ec72bba00bc75d938d0f28c7f7e7fc7d778 Mon Sep 17 00:00:00 2001 From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Date: Sun, 9 Nov 2025 20:18:58 +0100 Subject: [PATCH 120/121] HOTFIX: Reword Wizard objective text to be more hostile (#41371) Initial commit --- .../Locale/en-US/game-ticking/game-presets/preset-wizard.ftl | 4 ++-- Resources/Prototypes/Objectives/wizard.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Locale/en-US/game-ticking/game-presets/preset-wizard.ftl b/Resources/Locale/en-US/game-ticking/game-presets/preset-wizard.ftl index 3b4f43bc8d..a84d3b4e69 100644 --- a/Resources/Locale/en-US/game-ticking/game-presets/preset-wizard.ftl +++ b/Resources/Locale/en-US/game-ticking/game-presets/preset-wizard.ftl @@ -42,8 +42,8 @@ roles-antag-wizard-objective = Teach them a lesson they'll never forget. wizard-role-greeting = It's wizard time, fireball! - There's been tensions between the Space Wizards Federation and NanoTrasen. You've been selected by the Space Wizards Federation to pay a visit to the station and give them a good "demonstration" of your powers. - What you do is up to you, but remember that the Space Wizards want you to make it out alive. + There's been tensions between the Space Wizards Federation and NanoTrasen. You've been selected by the Space Wizards Federation to pay a visit to the station and "remind them" why spellcasters are not to be trifled with. + Cause mayhem and destruction! What you do is up to you, but remember that the Space Wizards want you to make it out alive. wizard-round-end-name = wizard diff --git a/Resources/Prototypes/Objectives/wizard.yml b/Resources/Prototypes/Objectives/wizard.yml index 52ac7e365a..91ebc0bf1f 100644 --- a/Resources/Prototypes/Objectives/wizard.yml +++ b/Resources/Prototypes/Objectives/wizard.yml @@ -25,8 +25,8 @@ - type: entity parent: [BaseWizardObjective, BaseFreeObjective] id: WizardDemonstrateObjective - name: Show off - description: Give the station a good demonstration of your powers! + name: Cause chaos + description: Teach those station welps to never disrespect a Wizard again! components: - type: Objective icon: From 589b9eddc7c8630aa8905d3cd65e419a037d76e0 Mon Sep 17 00:00:00 2001 From: Errant <35878406+Errant-4@users.noreply.github.com> Date: Sun, 9 Nov 2025 22:43:55 +0100 Subject: [PATCH 121/121] HOTFIX: automatically reset fallback gamemode to default (#41367) automatically reset fallback gamemode to default after the round --- Content.Server/GameTicking/GameTicker.GamePreset.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Content.Server/GameTicking/GameTicker.GamePreset.cs b/Content.Server/GameTicking/GameTicker.GamePreset.cs index 40608e45cb..69cc1c4165 100644 --- a/Content.Server/GameTicking/GameTicker.GamePreset.cs +++ b/Content.Server/GameTicking/GameTicker.GamePreset.cs @@ -59,7 +59,7 @@ public sealed partial class GameTicker foreach (var preset in fallbackPresets) { ClearGameRules(); - SetGamePreset(preset); + SetGamePreset(preset, resetDelay: 1); AddGamePresetRules(); StartGamePresetRules(); @@ -129,11 +129,11 @@ public sealed partial class GameTicker } } - public void SetGamePreset(string preset, bool force = false) + public void SetGamePreset(string preset, bool force = false, int? resetDelay = null) { var proto = FindGamePreset(preset); if (proto != null) - SetGamePreset(proto, force); + SetGamePreset(proto, force, null, resetDelay); } public GamePresetPrototype? FindGamePreset(string preset)