From 6989795e2adb4d2287cffdfe833946deae7d8131 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Fri, 6 Dec 2024 15:19:53 +0200 Subject: [PATCH 01/52] Fix pilot mask base (#2511) * Update masks.yml * grammar fixes, MOUTH blockers for half-masks * vox pilot mask --------- Co-authored-by: Whatstone --- .../_NF/Entities/Clothing/Masks/masks.yml | 21 ++++++++++-------- .../Mask/pilot.rsi/equipped-MASK-vox.png | Bin 0 -> 443 bytes .../_NF/Clothing/Mask/pilot.rsi/meta.json | 4 ++++ 3 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 Resources/Textures/_NF/Clothing/Mask/pilot.rsi/equipped-MASK-vox.png diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml index be59ecdfbb7..2c0baa1d376 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml @@ -2,7 +2,7 @@ id: ClothingMaskArcadia name: arcadia battle mask parent: [ ClothingMaskGasExplorer, BaseC3ContrabandNoValue, ContrabandClothing ] - description: A close-fitting high tech mask designed by Arcadia Industries for space faring battlers. + description: A close-fitting high tech mask designed by Arcadia Industries for spacefaring operators. components: - type: Sprite sprite: _NF/Clothing/Mask/arcadia.rsi @@ -30,22 +30,23 @@ replacement: mumble - type: entity - parent: ClothingMaskPullableBase + parent: ClothingMaskGas id: ClothingMaskPilot - name: pilot breathing mask - description: A close-fitting breathing mask designed for, it would seems, minimal comfort of wearer. + name: pilot breath mask + description: A close-fitting breath mask designed for, it would seem, minimal comfort for the wearer. components: - type: Sprite sprite: _NF/Clothing/Mask/pilot.rsi - type: Clothing sprite: _NF/Clothing/Mask/pilot.rsi - - type: BreathMask + - type: IdentityBlocker + coverage: MOUTH - type: entity parent: [ BaseC2ContrabandUnredeemable, ClothingMaskGasSecurity ] id: ClothingMaskGasNfsd name: nfsd gas mask - description: A standard issue nfsd gas mask. + description: A standard issue NFSD gas mask. components: - type: Sprite sprite: _NF/Clothing/Mask/nfsd.rsi @@ -68,7 +69,7 @@ parent: [ BaseC3CultContrabandUnredeemable, ContrabandClothing, ClothingMaskGasExplorer ] id: ClothingMaskCultJanitor name: cult janitor mask - description: A close-fitting imposing breathing mask designed for acursed custodians who value style. + description: A close-fitting, imposing breath mask designed for accursed custodians who value style. components: - type: Sprite sprite: _NF/Clothing/Mask/cult_janitor_mask.rsi @@ -82,7 +83,7 @@ id: ClothingMaskPunkHalf parent: [ ClothingMaskGasExplorer, RecyclableItemClothDevice ] name: punk halfmask - description: A close-fitting breathing mask with gamer lights! + description: A close-fitting breath mask with gamer lights! suffix: Random visuals components: - type: Sprite @@ -111,4 +112,6 @@ - mask_main: equipped-MASK: CyberpunkDark mask_decor: - decor-equipped-MASK: CyberpunkNeon \ No newline at end of file + decor-equipped-MASK: CyberpunkNeon + - type: IdentityBlocker + coverage: MOUTH diff --git a/Resources/Textures/_NF/Clothing/Mask/pilot.rsi/equipped-MASK-vox.png b/Resources/Textures/_NF/Clothing/Mask/pilot.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..7ffbacba6143ded3aabdfcdcd0daedd821798998 GIT binary patch literal 443 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU~KYqaSW-L^Y)f~-XQ}Kwh#KD z%R<(O-Bn`azj-V835PAqCr$}VN56~86%Tkyk}HIzCtc_ApLk~>FPF)dBA*b&+Wm%{ zb@c_CY?xhKTuj;w)&7+8t&~fWyB0N{%j{UoCY|%M0z$7Y;eB~rzPR4QOs#R(x`k7m z0!2RDJ8ap0Hm!MEuA)+4_OWC2m49|r)mP7PJ$^n}PHf_vsOih~_I2~GJscoY`}9}5 zn`+GU(hE_}nyk-dTv)E%^6Z}Pb;W!^^4ha5PuxGg{`%{kU6<$oTSYs0KL3`>xeCn4V?D$#nxSSKkt2~@|-{K9>as|n!L5F6UzEB j&a8F@1{MT-neD$QWqmTIc$Ob9QW!j4{an^LB{Ts5`oqE$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Mask/pilot.rsi/meta.json b/Resources/Textures/_NF/Clothing/Mask/pilot.rsi/meta.json index d360e296adb..add51f3babd 100644 --- a/Resources/Textures/_NF/Clothing/Mask/pilot.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Mask/pilot.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-MASK", "directions": 4 }, + { + "name": "equipped-MASK-vox", + "directions": 4 + }, { "name": "equipped-MASK-vulpkanin", "directions": 4 From 128c0a27fe974fe122643aa97a5b228e7f317e36 Mon Sep 17 00:00:00 2001 From: Whatstone <166147148+whatston3@users.noreply.github.com> Date: Fri, 6 Dec 2024 11:29:13 -0500 Subject: [PATCH 02/52] Fix market console range; add computer screens (#2506) * Market console distance to 8, computer screens * Fix tabletop console screens * Rotate north-facing contraband sprite * Rotate station atm sprite * Credits in _NF/.../computers.rsi/meta.json * fell into a comma * yet another station ATM rotation issue --- .../Components/MarketConsoleComponent.cs | 2 +- .../Machines/Computers/computers.yml | 14 +- .../Computers/computers_shuttle_records.yml | 2 +- .../Machines/Computers/computers_tabletop.yml | 72 ++------- .../_NF/Entities/Structures/atm.yml | 3 +- .../Machines/computers.rsi/cargo_market.png | Bin 0 -> 1106 bytes .../Machines/computers.rsi/cargo_sale.png | Bin 0 -> 920 bytes .../Machines/computers.rsi/contraband.png | Bin 793 -> 1536 bytes .../Machines/computers.rsi/meta.json | 143 +++++++++++++++++- .../computers.rsi/shuttle_records.png | Bin 0 -> 1464 bytes .../Machines/computers.rsi/station_atm.png | Bin 0 -> 1045 bytes 11 files changed, 170 insertions(+), 66 deletions(-) create mode 100644 Resources/Textures/_NF/Structures/Machines/computers.rsi/cargo_market.png create mode 100644 Resources/Textures/_NF/Structures/Machines/computers.rsi/cargo_sale.png create mode 100644 Resources/Textures/_NF/Structures/Machines/computers.rsi/shuttle_records.png create mode 100644 Resources/Textures/_NF/Structures/Machines/computers.rsi/station_atm.png diff --git a/Content.Server/_NF/Market/Components/MarketConsoleComponent.cs b/Content.Server/_NF/Market/Components/MarketConsoleComponent.cs index 8931fa2fb7a..ec70cc3540a 100644 --- a/Content.Server/_NF/Market/Components/MarketConsoleComponent.cs +++ b/Content.Server/_NF/Market/Components/MarketConsoleComponent.cs @@ -13,7 +13,7 @@ namespace Content.Server._NF.Market.Components; public sealed partial class MarketConsoleComponent : Component { [DataField] - public int MaxCrateMachineDistance = 16; + public int MaxCrateMachineDistance = 8; public List CartDataList = []; diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers.yml index 3333ba006aa..78ca426d39d 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers.yml @@ -35,7 +35,8 @@ - map: ["computerLayerKeyboard"] state: generic_keyboard - map: ["computerLayerScreen"] - state: request + sprite: _NF/Structures/Machines/computers.rsi + state: cargo_sale - map: ["computerLayerKeys"] state: tech_key - type: PointLight @@ -175,6 +176,17 @@ placement: mode: SnapgridCenter components: + - type: Sprite + layers: + - map: ["computerLayerBody"] + state: computer + - map: ["computerLayerKeyboard"] + state: generic_keyboard + - map: ["computerLayerScreen"] + sprite: _NF/Structures/Machines/computers.rsi + state: cargo_market + - map: ["computerLayerKeys"] + state: tech_key - type: MarketConsole - type: ActivatableUI key: enum.MarketConsoleUiKey.Default diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_shuttle_records.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_shuttle_records.yml index fa9d18b6da2..b372ff77543 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_shuttle_records.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_shuttle_records.yml @@ -13,7 +13,7 @@ - map: ["computerLayerKeyboard"] state: generic_keyboard - map: ["computerLayerScreen"] - state: shipyard + state: shuttle_records - map: ["computerLayerKeys"] state: telesci_key - type: ShuttleRecordsConsole diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_tabletop.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_tabletop.yml index 4620a4a8756..412e13c3392 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_tabletop.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_tabletop.yml @@ -528,7 +528,7 @@ components: - type: Sprite drawdepth: SmallObjects - layers: + layers: &cargoMarketSprite - map: ["computerLayerBody"] sprite: _NF/Structures/Machines/computer_tabletop.rsi state: computer_tabletop @@ -536,8 +536,8 @@ sprite: _NF/Structures/Machines/computer_tabletop.rsi state: generic_keyboard_tabletop - map: ["computerLayerScreen"] - sprite: Structures/Machines/computers.rsi - state: request + sprite: _NF/Structures/Machines/computers.rsi + state: cargo_market - map: ["computerLayerKeys"] sprite: Structures/Machines/computers.rsi state: tech_key @@ -549,19 +549,7 @@ components: - type: Sprite drawdepth: SmallObjects - layers: - - map: ["computerLayerBody"] - sprite: _NF/Structures/Machines/computer_tabletop.rsi - state: computer_tabletop - - map: ["computerLayerKeyboard"] - sprite: _NF/Structures/Machines/computer_tabletop.rsi - state: generic_keyboard_tabletop - - map: ["computerLayerScreen"] - sprite: Structures/Machines/computers.rsi - state: request - - map: ["computerLayerKeys"] - sprite: Structures/Machines/computers.rsi - state: tech_key + layers: *cargoMarketSprite - type: entity parent: [BaseStructureIndestructible, BaseStructureComputerTabletop, ComputerPalletConsoleNFHighMarket] @@ -570,7 +558,7 @@ components: - type: Sprite drawdepth: SmallObjects - layers: + layers: &cargoPalletSprite - map: ["computerLayerBody"] sprite: _NF/Structures/Machines/computer_tabletop.rsi state: computer_tabletop @@ -578,8 +566,8 @@ sprite: _NF/Structures/Machines/computer_tabletop.rsi state: generic_keyboard_tabletop - map: ["computerLayerScreen"] - sprite: Structures/Machines/computers.rsi - state: request + sprite: _NF/Structures/Machines/computers.rsi + state: cargo_sale - map: ["computerLayerKeys"] sprite: Structures/Machines/computers.rsi state: tech_key @@ -591,19 +579,7 @@ components: - type: Sprite drawdepth: SmallObjects - layers: - - map: ["computerLayerBody"] - sprite: _NF/Structures/Machines/computer_tabletop.rsi - state: computer_tabletop - - map: ["computerLayerKeyboard"] - sprite: _NF/Structures/Machines/computer_tabletop.rsi - state: generic_keyboard_tabletop - - map: ["computerLayerScreen"] - sprite: Structures/Machines/computers.rsi - state: request - - map: ["computerLayerKeys"] - sprite: Structures/Machines/computers.rsi - state: tech_key + layers: *cargoPalletSprite - type: entity parent: [BaseStructureIndestructible, BaseStructureComputerTabletop, ComputerPalletConsoleNFLowMarket] @@ -612,19 +588,7 @@ components: - type: Sprite drawdepth: SmallObjects - layers: - - map: ["computerLayerBody"] - sprite: _NF/Structures/Machines/computer_tabletop.rsi - state: computer_tabletop - - map: ["computerLayerKeyboard"] - sprite: _NF/Structures/Machines/computer_tabletop.rsi - state: generic_keyboard_tabletop - - map: ["computerLayerScreen"] - sprite: Structures/Machines/computers.rsi - state: request - - map: ["computerLayerKeys"] - sprite: Structures/Machines/computers.rsi - state: tech_key + layers: *cargoPalletSprite - type: entity parent: [BaseStructureComputerTabletop, ComputerPalletConsoleNFVeryLowMarket] @@ -633,19 +597,7 @@ components: - type: Sprite drawdepth: SmallObjects - layers: - - map: ["computerLayerBody"] - sprite: _NF/Structures/Machines/computer_tabletop.rsi - state: computer_tabletop - - map: ["computerLayerKeyboard"] - sprite: _NF/Structures/Machines/computer_tabletop.rsi - state: generic_keyboard_tabletop - - map: ["computerLayerScreen"] - sprite: Structures/Machines/computers.rsi - state: request - - map: ["computerLayerKeys"] - sprite: Structures/Machines/computers.rsi - state: tech_key + layers: *cargoPalletSprite - type: entity parent: [BaseStructureIndestructible, BaseStructureComputerTabletop, BaseStationAdminBankATM] @@ -661,8 +613,8 @@ sprite: _NF/Structures/Machines/computer_tabletop.rsi state: generic_keyboard_tabletop - map: ["computerLayerScreen"] - sprite: Structures/Machines/computers.rsi - state: id + sprite: _NF/Structures/Machines/computers.rsi + state: station_atm - map: ["computerLayerKeys"] sprite: Structures/Machines/computers.rsi state: id_key diff --git a/Resources/Prototypes/_NF/Entities/Structures/atm.yml b/Resources/Prototypes/_NF/Entities/Structures/atm.yml index 7452d3de394..cdc07f36138 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/atm.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/atm.yml @@ -181,7 +181,8 @@ - map: ["computerLayerKeyboard"] state: generic_keyboard - map: ["computerLayerScreen"] - state: id + sprite: _NF/Structures/Machines/computers.rsi + state: station_atm - map: ["computerLayerKeys"] state: id_key - type: StationBankATM diff --git a/Resources/Textures/_NF/Structures/Machines/computers.rsi/cargo_market.png b/Resources/Textures/_NF/Structures/Machines/computers.rsi/cargo_market.png new file mode 100644 index 0000000000000000000000000000000000000000..4d9ed76c4e7ee6905118097510091b604a217181 GIT binary patch literal 1106 zcmV-Y1g-mtP)+kZ=S{yaUFBIRhq!xr2!ufyf!$j0+DSvY;2v1tzIk zw2j!)f9R^}ejwjZVpPEXRY7&p2=!V700000033@T@4_gG%=JZF_(!+*kz}vWyDWQs z9LKqNsW<>#-mZIZ8%|E(w@-B7P@HecJ9 zi-4j=r=ZHha3y{JaOi_Cc}9FWXk#0oYdm zYs~=JjkUc8ROS2RE8ph~*hK$p9RpwW4XfwY`Wr>)wpYuw@WILO!YqKkx{A`u3eaO%Iz0Lfp{#VWb*^#%)2+ZEr<_@sQ z&z7azmwX#-^}o7AOe!5g^Ps#$Nx?|7E|Efh>-hix0000000000001~foiJ?Vv+Lv^ zM!rl&VkRR|YXtdz@(Vu{x{Ki;X^3kh4mE!~H3#2+rvcFG8yODtrlVfp$ard0r^BP| ze-uS#TicC@qR6~Fh%v^Pmj@x=GT(XzxW0(x<|^=dzTmp~vw8Bf&y!Zy&Cgp5(`LSi zTmPMp0n$4`!*C#~gD~yC79agDTpG5k)03{8Um6kl>$<6f&F^-*D%okiOaHBBfbHeR zk9X~_I3eFpzSA*)=JZFtpM0ldfbrDG>uT-Z3i8$Rod&>i5y)^La(-E_`h_p#E9Q5? zaPt~eOFu0{xOk(lvRckq$#mTx@(I$>yr1HFZzCFq@a3>%M8^yX89#fY;SpG+zh5uGXs0!CxWYx<=6XWu#IX zWjlYpelLzt^VIOZ@*nTwq(YZczFPk~VW?UoZy)kCYb5&Yzx52z>l;}v0-4Q|wd%Ip zamg1EwR{oT>VNiJ@6A)~f4T=~y$O=;0pu&a38lRroqXkb07w1)H~9bn000000D!~t Y4_8tRD)B5;YybcN07*qoM6N<$g6|w9E&u=k literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/computers.rsi/cargo_sale.png b/Resources/Textures/_NF/Structures/Machines/computers.rsi/cargo_sale.png new file mode 100644 index 0000000000000000000000000000000000000000..65549ac0d378d233dcb0c15a6bf12cdf581f6f38 GIT binary patch literal 920 zcmV;J184k+P))z(C~Fh!Ee-4>~GhDaO%q}&07lr7_wAVt|btQ3xb!Wp*N6seXbBt=}1 zP3o0q3$SCrHl7)qFA47_AtM{}Cgb7nd?o-95fSYwCvBzYd8*eAGk3bY_OQA=ZQbhj zFbq@kB=f(f-MH5d(Q4*3F>U+ieZK$5+b)y;CF|ygCn{b>m*jc?xVt^V-R)88zBNCH zmnLlTb)=2}0GN)QrRC~+0Qh!vyS87=58~UrP6FeGnda*%JOWm)1L;TLbrLL%08^&< zy0k{X>e0wL0?83j^8=%iV3V&SvjYxK6sBWm?I?q) z3i0*DoPAb-L>Vg{;O1``QDEa7jp!yw%HKMHi z%r8ZYXf@{zv2BE8zEua*`~a<{>~Ivz_dHK2rPSX)fl^ATZ8yU6JavDA_+px$IWe+H zuN`90bv8^#Rj1buF&x1<-}*UVII^1pD^E?HssQ}6y(^J?;}MXYZvORi z`!gQ#S~MKr(ex=Jaf?r$LS zKA^08;}P&Yn>mB7-0u-c=g0aTnGx__@&U|;qhtf5^W#SBay}6e5fKp)(XNsHEH0Y= z(dz`Pz83Fypw6yjJKr|nxC830t6I(VUwhsb(frl#uebe-IDcB^Ka zZ`A>16evjN8+SmX(ZIoe!!F%IS^35tkerj(JvF`zW#wBx2MkB~=lWO8Hs7iP9v+`W zp99LsH|~JrQxB~sjQ@#>tteka^g1k6BUpFcQfdSNixCk0G{&Io;CVI^o2Va-u>Jh# u2uOVhlFk>OkC)Eh?a%*2L_|bHpTmD1B5ghrPr|1F00000xMt3o-Gilvg z)O{zk6fIJ!C5|X@D?vp2lSno@yMJ{5*f;aOpEvV9^R9XCn`~=?k(Gu?0{|dvdC}~e z2#J5Il!WMgW9a%G0QPoUnwi|d=d4cBtyR2KB-Xw1{jB2M?u^2883m#K8_rfH-Vi^^ z2US>4VboIHvjev@)t|H}Np;Gaauo5}U$s6AS;I|x%MQ_}pTKO^qnIDNCsOoq=j<4-0jb)%%zq$9l2f7a*SeOtlC1<^h_>`>!TU zG+u+QQ?aO70@Hx7xs^z65ZW{5yG!9O&F6~;E8139*EuD85#KPi*GFI6u|;rt-Fr0g z7qSC^dWffBNV`7Gv996yd$sU&IzM&b@^KkQqp59vYvyD8Q3aRQrDs(e&_ad>a=V^> zi_Kc=J1bN${_<3Z5pe=SBhU>b_92tY3E$)kV%gD*7m!^_w_~7c*moxMD0eZ@qS5SXgF=)AB z6wbZmLepwsO!Y@+`>-2VJFEx6s^jewpY#MdLiI!`x+{vjU$OS!$<(&A@1p@;k7udy z@nJpqg{)lU6ppjLVL1-3hajcTwxYJ+McOtl8Ofz7ETe`eNlj>ic0g?L`{vHMq|8kb zL+7R=&0w3OW9E^~cWxAUgF@x?MKJ<+Ne!${8+rN4YjaMwF>4KJ$#7Ui|8y0p2r~{c z=W-`s3(}*NxN!C!(v>v-phscgbZg8=`Y^%2qZn6fG_ud#@ZY2O0k}=L-ANcHDw`}| z*Ne?^B0gETPz|udVmVRrHCpS_y)89_qZ?ptW0$YtpoxXm$z!eJ555B&QTg6-XtK^D!U9M;&y9#6vKhb zY=oSzqDgMZo`C{L!ovKwclkp_cd40mFP3KbT32_?54+syx=`M_EIh?=&Mrf1A`R;J zGph_Gxez%}M_6CWiS4 z;aT7kr;7lMRGRPk7EHy*Ni8rTy&7gu5%epQVw+$q3gk>Z57;;Fl}0Xuph>Jrbj(7X z(7xV*nI5fc_ZhpTAu1Gl>R_bsL4e5MvQfjEVkINkEOIkMhnZuR|M+_L5ueSv`9d8$f9+T}>I0GN2ertQ35QBCyni zm1b=t89i(sVi|C7aPY3PzspWIjn$e8RLS55W(qxL)fT4+dOzIeP9I_B0$p*{lVU6S P*#S#)8?y>imwSH!8@e3I literal 793 zcmV+!1LpjRP)5BtpnK>6Y!(Ae+PRFoV00902&c7qxnMKtJl*sQw9eyY!J zqkOxlL$q|10S_N5j=G+yB9#m|+UuDr0ASZ<%cXx{7eKV+$EK?=j~E}jj8rlNJyS(F ztYG=sO#tYYymmaganAC`;eV_hmY#oglqa0puGJ1&!sB>P)(EDM>r3V{wFwwX_~I*0q1ERLJ$N&5ClOG1VIo4K@k56gL-dw7Gz@i<7@HL z&@|0+5oBYK57)_9G=g{ACaTuoBrA z>TiOos%#~)AzTjY1t|fFvG$UbSEQ05;R=#lqyzwfT)HCb;!I>$6DUO$u$h{aA87%+ z%7D4W_Ik7Oc3jGjv;ba_T}|}GPhSM+S1`R`Wq>SF0>p|8xpW2LvNuzKT)N_VD~|~2 z3`iwIuJ`Hmn^ZD{!hBuIhqM5Crs~+VG)(kN72!{JJsBH7dp7pq!ya3o%Clilgx06> zEE0(@PoD)0!%#M7Z_BulqSb1_FbwZ^eQ26C^bGhLo>qp1e&^hK&$;K^`^Wd)``tX{iP$ZtE(ZX> zZdVsaA92O~6*5xd{KEDE1pszlcXf0)bERT+#?<|TKTK*ZA6kur#qYc282|lXScHM{ zS+$7F#b4@pk_)$T#&Am0DfNzk@huT>ACHJnl1@gHbestj#V=w$6a+q+^4xS zefr@PH)oJ0yfX2qInXF;HejTyl5H3q7${GqZ^(zx(5Wr+>zf%osmHDvuf*HuYQF5K z(oE?`uyz7ZrF$<4!7&y-p@Ex^79}NPrxb7t)C!Hyze?edb+NPE4pBZAI4FwSl@L;Y zw_@iyIb|21N_3C-7UII86+T1(B|`62k!QZw2RB^YYTI4!;*BRWd97pTCi_p$ty}7s zAmidAZ3RtCmeuAM_Ud8UqiG~+)Kd03w7!gOIKudCvGV}%(OU)l1`JN?a?lB;^%9t@ zB`sG`QlXY5u#$IN^4jGHnx->|vc?#L9t`N-|HEkBJMX+|lc|ZeQSZZ9{69eJ2Yb0i z*Kfr}tt{v33|m>$bw~M+)(1=bGZWzU$PQ#o|SZ(Pdg279m5(IgOu|A#$JLS+bWqHWz#Za&VbM>C zaT+(8Q$25+(~&6eqe?%#6D3Vu?qL}093RGN{}<}24g8WgCJ)gwrj>Eq$vK9%u5pn_ z#$MwiApjsgO=s&=eln*-8uvPHX=2+yp=l9xf&eC0_as7_UUF7LHAR<%FL=@HT!yis zVK&$gAuFNo6?{g#%=*G`J#c>@42$uB7qY1u1-6gRn**OhgOrSBse_~Zr;|ZL(%h3B z0g=F44OF(6?)KBotBB@+@fW6ZD|X>W!tYeNEbC|7K}HpgeCLV%fTj1v-ciU0wYHX2W_5z zhU>;xl?8vx&Jy_bNY*m_UK?zQ&=}niVk~=AMn4!d2oWWo;^9(LfO=c9XUh{HXq+ww3+1HrrNj z_+vtq8Oe9|D%BtEn_Ezb?dcHplVl2g8wz9e(@Ptb!mYII!B?w0Yyxx@B7B$BiSDXR zZxc`#igg+2vN{nEWQLEfYu}7pOp>Q3hZ~Yk z9nI#5rC#VI$?_4<{A8=(ZPSiv6WcO^i(TV)#X`eK-_*pUHOCr`)b I??P_;2`Spu^#A|> literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/computers.rsi/station_atm.png b/Resources/Textures/_NF/Structures/Machines/computers.rsi/station_atm.png new file mode 100644 index 0000000000000000000000000000000000000000..5ec824b9cded21e88b86c827a664ab5bc48954f9 GIT binary patch literal 1045 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrV7}w&;uumf=k48%ezzTDj(@Zd zl~;CDSfbRHx2Cp{N1-%z^(ups*V7gXJ8v^64R>cklmfKYh}jNEVLMK?~?ZI~@Qar5pbWsLxVpHrXCmQGk%d@*)+{WfVVs ze&wI8ZoGP(eUQriDmH=0GfitGKa~BQ^YeS(@%~Ewx4JX)rMx=~bAsxPtY=1kGd!`% z{?uI+`|msn!AE({oc2$@p3ByD;=3jD?DGuz!V?eI{aN|(zP+XebG+KM#v7kDi_B`2 z`|0}H{M-Sd*XEJ4|4RP6xu0FbdE$Te$?K={gZ++5+(=u)n^Rf$?H|M5x;iSdmcTbUZ`TbcZLpL5=_G$9=%gHOW?5+3$(?Y+xCwqA5aehB(UjF3$_noDal_pjc5j)8Vrs70 z#I1%dOL~4yKCYPZ_nK}}PIS)=GxZsKao5uun1kzJip<-LUYS2_UvYn*bH`z`l#}cF z^ZeP@=UJz;+-Y08=#SeK6#pzJJyrGI>gUvFyW`E?E!bZ1dz09w<|oy$<^k{8cd<9t zysz004DXnyQJ+gZ_J!}OXYM$0`0dhHjtci}?LC-73gCI*f|FT@! zS+}1}qhRi@Af3-w=QXfhd4HY3TwN*XpOo#V)2F{@H*DTrA)s~Q`?>E~4SOHfDf2b0 zR=e{4uX93;fQja_>wD|ovvpiMv_16h>+<}D!1DB8f8$(^R4cPwuc@3BI)C*VvyeUibi?BB(_W+d;U0a5$Af2DE^{H9!cYPz)U|I>%FUOxhQ0_a8!n_9`st0u^++~3QXwMS{% zAO3T^3-;>s{Y?DSoFlZm&hkTwLw7;172=foKh&2IM7frc8 z<=0&42Ni!bKA8k-&--KW^PN4j&$<%p`87xXNbUdUYX|kvg4BP^j*{p5m(Ke40VL$< L>gTe~DWM4f%x?aE literal 0 HcmV?d00001 From 99b9c13618f192e9b217b8cdcf171a9f2c2c5eb9 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Fri, 6 Dec 2024 16:29:40 +0000 Subject: [PATCH 03/52] Automatic Changelog (#2506) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 964a437c5a6..9f87a912ec6 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -5675,3 +5675,9 @@ Entries: message: Added blue and pink kimonos to civilian loadouts. id: 5552 time: '2024-12-05T17:11:32.0000000+00:00' +- author: whatston3 + changes: + - type: Fix + message: In the Trade Mall, Cargo Bay 2's market computer now works properly. + id: 5553 + time: '2024-12-06T16:29:14.0000000+00:00' From cecaf809faa50733412e9283a135a3eaa796a45b Mon Sep 17 00:00:00 2001 From: Whatstone <166147148+whatston3@users.noreply.github.com> Date: Fri, 6 Dec 2024 11:32:34 -0500 Subject: [PATCH 04/52] Carpet graphs (#2507) --- .../Graphs/furniture/curtains.yml | 157 ++++++++++-------- .../Construction/Graphs/furniture/seats.yml | 63 ++----- .../Construction/Graphs/furniture/tables.yml | 152 +++++++++-------- 3 files changed, 195 insertions(+), 177 deletions(-) diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/curtains.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/curtains.yml index 90e77d6720f..79e9dd759bd 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/curtains.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/curtains.yml @@ -17,93 +17,120 @@ completed: - !type:SnapToGrid { } steps: - - tag: CarpetBlack - doAfter: 1 - name: black carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-black + - material: FloorCarpetBlack # Frontier + amount: 1 # Frontier + doAfter: 1 # Frontier + # - tag: CarpetBlack # Frontier + # doAfter: 1 # Frontier + # name: black carpet # Frontier + # icon: # Frontier + # sprite: Objects/Tiles/tile.rsi # Frontier + # state: carpet-black # Frontier - to: CurtainsBlue completed: - !type:SnapToGrid { } steps: - - tag: CarpetBlue - doAfter: 1 - name: blue carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-blue + - material: FloorCarpetBlue # Frontier + amount: 1 # Frontier + doAfter: 1 # Frontier + # - tag: CarpetBlue # Frontier + # doAfter: 1 # Frontier + # name: blue carpet # Frontier + # icon: # Frontier + # sprite: Objects/Tiles/tile.rsi # Frontier + # state: carpet-blue # Frontier - to: CurtainsCyan completed: - !type:SnapToGrid { } steps: - - tag: CarpetCyan - doAfter: 1 - name: cyan carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-cyan + - material: FloorCarpetCyan # Frontier + amount: 1 # Frontier + doAfter: 1 # Frontier + # - tag: CarpetCyan # Frontier + # doAfter: 1 # Frontier + # name: cyan carpet # Frontier + # icon: # Frontier + # sprite: Objects/Tiles/tile.rsi # Frontier + # state: carpet-cyan # Frontier - to: CurtainsGreen completed: - !type:SnapToGrid { } steps: - - tag: CarpetGreen - doAfter: 1 - name: green carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-green + - material: FloorCarpetGreen # Frontier + amount: 1 # Frontier + doAfter: 1 # Frontier + # - tag: CarpetGreen # Frontier + # doAfter: 1 # Frontier + # name: green carpet # Frontier + # icon: # Frontier + # sprite: Objects/Tiles/tile.rsi # Frontier + # state: carpet-green # Frontier - to: CurtainsOrange completed: - !type:SnapToGrid { } steps: - - tag: CarpetOrange - doAfter: 1 - name: orange carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-orange + - material: FloorCarpetOrange # Frontier + amount: 1 # Frontier + doAfter: 1 # Frontier + # - tag: CarpetOrange # Frontier + # doAfter: 1 # Frontier + # name: orange carpet # Frontier + # icon: # Frontier + # sprite: Objects/Tiles/tile.rsi # Frontier + # state: carpet-orange # Frontier - to: CurtainsPink completed: - !type:SnapToGrid { } steps: - - tag: CarpetPink - doAfter: 1 - name: pink carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-pink + - material: FloorCarpetPink # Frontier + amount: 1 # Frontier + doAfter: 1 # Frontier + # - tag: CarpetPink # Frontier + # doAfter: 1 # Frontier + # name: pink carpet # Frontier + # icon: # Frontier + # sprite: Objects/Tiles/tile.rsi # Frontier + # state: carpet-pink # Frontier - to: CurtainsPurple completed: - !type:SnapToGrid { } steps: - - tag: CarpetPurple - doAfter: 1 - name: purple carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-purple + - material: FloorCarpetPurple # Frontier + amount: 1 # Frontier + doAfter: 1 # Frontier + # - tag: CarpetPurple # Frontier + # doAfter: 1 # Frontier + # name: purple carpet # Frontier + # icon: # Frontier + # sprite: Objects/Tiles/tile.rsi # Frontier + # state: carpet-purple # Frontier - to: CurtainsRed completed: - !type:SnapToGrid { } steps: - - tag: CarpetRed - doAfter: 1 - name: red carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-red + - material: FloorCarpetRed # Frontier + amount: 1 # Frontier + doAfter: 1 # Frontier + # - tag: CarpetRed # Frontier + # doAfter: 1 # Frontier + # name: red carpet # Frontier + # icon: # Frontier + # sprite: Objects/Tiles/tile.rsi # Frontier + # state: carpet-red # Frontier - to: CurtainsWhite completed: - !type:SnapToGrid { } steps: - - tag: CarpetWhite - doAfter: 1 - name: white carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-white - + - material: FloorCarpetWhite # Frontier + amount: 1 # Frontier + doAfter: 1 # Frontier + # - tag: CarpetWhite # Frontier + # doAfter: 1 # Frontier + # name: white carpet # Frontier + # icon: # Frontier + # sprite: Objects/Tiles/tile.rsi # Frontier + # state: carpet-white # Frontier + - node: Curtains entity: HospitalCurtains edges: @@ -126,7 +153,7 @@ steps: - tool: Cutting doAfter: 1 - + - node: CurtainsBlack entity: CurtainsBlack edges: @@ -148,8 +175,8 @@ amount: 1 steps: - tool: Cutting - doAfter: 1 - + doAfter: 1 + - node: CurtainsBlue entity: CurtainsBlue edges: @@ -172,7 +199,7 @@ steps: - tool: Cutting doAfter: 1 - + - node: CurtainsCyan entity: CurtainsCyan edges: @@ -195,7 +222,7 @@ steps: - tool: Cutting doAfter: 1 - + - node: CurtainsGreen entity: CurtainsGreen edges: @@ -218,7 +245,7 @@ steps: - tool: Cutting doAfter: 1 - + - node: CurtainsOrange entity: CurtainsOrange edges: @@ -241,7 +268,7 @@ steps: - tool: Cutting doAfter: 1 - + - node: CurtainsPink entity: CurtainsPink edges: @@ -264,7 +291,7 @@ steps: - tool: Cutting doAfter: 1 - + - node: CurtainsPurple entity: CurtainsPurple edges: @@ -287,7 +314,7 @@ steps: - tool: Cutting doAfter: 1 - + - node: CurtainsRed entity: CurtainsRed edges: @@ -310,7 +337,7 @@ steps: - tool: Cutting doAfter: 1 - + - node: CurtainsWhite entity: CurtainsWhite edges: diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml index ec34bfd512d..18dcaf04031 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml @@ -195,75 +195,48 @@ #Frontier: fancy wooden chairs - to: chairWoodFancyBlack steps: - - tag: CarpetBlack - name: black carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-black + - material: FloorCarpetBlack + amount: 1 - to: chairWoodFancyBlue steps: - - tag: CarpetBlue - name: blue carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-blue + - material: FloorCarpetBlue + amount: 1 - to: chairWoodFancyCyan steps: - - tag: CarpetCyan - name: cyan carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-cyan + - material: FloorCarpetCyan + amount: 1 - to: chairWoodFancyGreen steps: - - tag: CarpetGreen - name: green carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-green + - material: FloorCarpetGreen + amount: 1 - to: chairWoodFancyOrange steps: - - tag: CarpetOrange - name: orange carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-orange + - material: FloorCarpetOrange + amount: 1 - to: chairWoodFancyPurple steps: - - tag: CarpetPurple - name: purple carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-purple + - material: FloorCarpetPurple + amount: 1 - to: chairWoodFancyPink steps: - - tag: CarpetPink - name: pink carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-pink + - material: FloorCarpetPink + amount: 1 - to: chairWoodFancyRed steps: - - tag: CarpetRed - name: red carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-red + - material: FloorCarpetRed + amount: 1 - to: chairWoodFancyWhite steps: - - tag: CarpetWhite - name: white carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-white + - material: FloorCarpetWhite + amount: 1 #End Frontier - node: chairMeat diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml index 1c828b05ac5..d8963c0c5f7 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml @@ -73,7 +73,7 @@ - material: PlasmaGlass amount: 1 doAfter: 1 - + - to: TableBrass steps: - material: Brass @@ -211,78 +211,96 @@ - material: Cloth amount: 1 doAfter: 1 - + - to: TableFancyBlack - steps: - - tag: CarpetBlack - name: black carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-black - + steps: + - material: FloorCarpetBlack # Frontier + amount: 1 # Frontier + # - tag: CarpetBlack # Frontier + # name: black carpet # Frontier + # icon: # Frontier + # sprite: Objects/Tiles/tile.rsi # Frontier + # state: carpet-black # Frontier + - to: TableFancyBlue - steps: - - tag: CarpetBlue - name: blue carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-blue - + steps: + - material: FloorCarpetBlue # Frontier + amount: 1 # Frontier + # - tag: CarpetBlue # Frontier + # name: blue carpet # Frontier + # icon: # Frontier + # sprite: Objects/Tiles/tile.rsi # Frontier + # state: carpet-blue # Frontier + - to: TableFancyCyan - steps: - - tag: CarpetCyan - name: cyan carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-cyan - + steps: + - material: FloorCarpetCyan # Frontier + amount: 1 # Frontier + # - tag: CarpetCyan # Frontier + # name: cyan carpet # Frontier + # icon: # Frontier + # sprite: Objects/Tiles/tile.rsi # Frontier + # state: carpet-cyan # Frontier + - to: TableFancyGreen - steps: - - tag: CarpetGreen - name: green carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-green - + steps: + - material: FloorCarpetGreen # Frontier + amount: 1 # Frontier + # - tag: CarpetGreen # Frontier + # name: green carpet # Frontier + # icon: # Frontier + # sprite: Objects/Tiles/tile.rsi # Frontier + # state: carpet-green # Frontier + - to: TableFancyOrange - steps: - - tag: CarpetOrange - name: orange carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-orange - + steps: + - material: FloorCarpetOrange # Frontier + amount: 1 # Frontier + # - tag: CarpetOrange # Frontier + # name: orange carpet # Frontier + # icon: # Frontier + # sprite: Objects/Tiles/tile.rsi # Frontier + # state: carpet-orange # Frontier + - to: TableFancyPurple - steps: - - tag: CarpetPurple - name: purple carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-purple - + steps: + - material: FloorCarpetPurple # Frontier + amount: 1 # Frontier + # - tag: CarpetPurple # Frontier + # name: purple carpet # Frontier + # icon: # Frontier + # sprite: Objects/Tiles/tile.rsi # Frontier + # state: carpet-purple # Frontier + - to: TableFancyPink - steps: - - tag: CarpetPink - name: pink carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-pink - + steps: + - material: FloorCarpetPink # Frontier + amount: 1 # Frontier + # - tag: CarpetPink # Frontier + # name: pink carpet # Frontier + # icon: # Frontier + # sprite: Objects/Tiles/tile.rsi # Frontier + # state: carpet-pink # Frontier + - to: TableFancyRed - steps: - - tag: CarpetRed - name: red carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-red - + steps: + - material: FloorCarpetRed # Frontier + amount: 1 # Frontier + # - tag: CarpetRed # Frontier + # name: red carpet # Frontier + # icon: # Frontier + # sprite: Objects/Tiles/tile.rsi # Frontier + # state: carpet-red # Frontier + - to: TableFancyWhite - steps: - - tag: CarpetWhite - name: white carpet - icon: - sprite: Objects/Tiles/tile.rsi - state: carpet-white + steps: + - material: FloorCarpetWhite # Frontier + amount: 1 # Frontier + # - tag: CarpetWhite # Frontier + # name: white carpet # Frontier + # icon: # Frontier + # sprite: Objects/Tiles/tile.rsi # Frontier + # state: carpet-white # Frontier - node: TableCarpet entity: TableCarpet @@ -295,7 +313,7 @@ steps: - tool: Prying doAfter: 1 - + - node: TableFancyBlack entity: TableFancyBlack edges: @@ -307,7 +325,7 @@ steps: - tool: Prying doAfter: 1 - + - node: TableFancyBlue entity: TableFancyBlue edges: @@ -319,7 +337,7 @@ steps: - tool: Prying doAfter: 1 - + - node: TableFancyCyan entity: TableFancyCyan edges: From 50857f8b2f5d776035b239222aec37890903e22d Mon Sep 17 00:00:00 2001 From: Dmitri Date: Fri, 6 Dec 2024 11:33:03 -0500 Subject: [PATCH 05/52] Cleared contraband from Emotional support RPG (#2510) * Cleared contraband from Emotional support RPG Added BaseClearContraband to remove C3 contraband marker from emotional support RPG * Update toys.yml --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml index 19d8c61d82e..736130a76b5 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml @@ -534,7 +534,7 @@ - type: entity name: Emotional support RPG - parent: WeaponLauncherRocket + parent: [BaseClearContraband, WeaponLauncherRocket] id: WeaponLauncherRocketToy suffix: Toy description: A deactived RPG modified to only allow foam RPG warheads. "When in times of trouble and stressed out as can be, DON'T worry now because S.E.S.W.C has what you need!" From 5bb610877f72e413fd29f6795047c733667929bf Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Fri, 6 Dec 2024 16:34:26 +0000 Subject: [PATCH 06/52] Automatic Changelog (#2507) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 9f87a912ec6..901a7af378d 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -5681,3 +5681,9 @@ Entries: message: In the Trade Mall, Cargo Bay 2's market computer now works properly. id: 5553 time: '2024-12-06T16:29:14.0000000+00:00' +- author: whatston3 + changes: + - type: Fix + message: Fancy tables, chairs and curtains now respect carpet stacks. + id: 5554 + time: '2024-12-06T16:32:34.0000000+00:00' From 9dd656027fececc9234e751aa53254593abad480 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Fri, 6 Dec 2024 16:38:15 +0000 Subject: [PATCH 07/52] Automatic Changelog (#2510) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 901a7af378d..9940037e0a5 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -5687,3 +5687,9 @@ Entries: message: Fancy tables, chairs and curtains now respect carpet stacks. id: 5554 time: '2024-12-06T16:32:34.0000000+00:00' +- author: DmitriTheDemon + changes: + - type: Tweak + message: Removed contraband type from Emotional support RPG + id: 5555 + time: '2024-12-06T16:33:03.0000000+00:00' From a7e54b875f0df8b9ed4b8b14fba2c9b724928562 Mon Sep 17 00:00:00 2001 From: dustylens <54123313+dustylens@users.noreply.github.com> Date: Fri, 6 Dec 2024 16:39:24 +0000 Subject: [PATCH 08/52] Medipens II (#2452) * Medipens II Update * Sprite and visual update. * Sprite correction. Recipe fix. Remove "clean pen" recipe. * Dex PLUUUUUS * Plus once more. * TranexamicAcid buff * Update Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Apply suggestions from code review Oh boy Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Pen goodening * Crafting recipe correction * Whoops. Duplicates added to the wrong file. * Whatstone requested changes. * add Hypospray for transfer amount --------- Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> Co-authored-by: Whatstone --- .../Objects/Specific/Medical/hypospray.yml | 2 +- .../Objects/Specific/Medical/hypospray.yml | 160 +++++++++++++++++ .../_NF/Recipes/Cooking/medical_recipes.yml | 163 +++++++++++------- .../_NF/Recipes/Lathes/chemistry.yml | 2 +- .../Specific/Medical/medipen.rsi/bruizpen.png | Bin 0 -> 329 bytes .../Medical/medipen.rsi/bruizpen_empty.png | Bin 0 -> 384 bytes .../Medical/medipen.rsi/crisispen.png | Bin 0 -> 327 bytes .../Medical/medipen.rsi/crisispen_empty.png | Bin 0 -> 386 bytes .../Medical/medipen.rsi/hemostasispen.png | Bin 0 -> 329 bytes .../medipen.rsi/hemostasispen_empty.png | Bin 0 -> 389 bytes .../Specific/Medical/medipen.rsi/lacerpen.png | Bin 0 -> 322 bytes .../Medical/medipen.rsi/lacerpen_empty.png | Bin 0 -> 385 bytes .../Specific/Medical/medipen.rsi/meta.json | 32 +++- .../Medical/medipen.rsi/stimulantpen.png | Bin 0 -> 350 bytes .../medipen.rsi/stimulantpen_empty.png | Bin 0 -> 422 bytes 15 files changed, 294 insertions(+), 65 deletions(-) create mode 100644 Resources/Textures/_NF/Objects/Specific/Medical/medipen.rsi/bruizpen.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Medical/medipen.rsi/bruizpen_empty.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Medical/medipen.rsi/crisispen.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Medical/medipen.rsi/crisispen_empty.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Medical/medipen.rsi/hemostasispen.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Medical/medipen.rsi/hemostasispen_empty.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Medical/medipen.rsi/lacerpen.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Medical/medipen.rsi/lacerpen_empty.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Medical/medipen.rsi/stimulantpen.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Medical/medipen.rsi/stimulantpen_empty.png diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml index d21c7e54a27..63db04b3161 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml @@ -549,4 +549,4 @@ items: - id: Hypopen sound: - path: /Audio/Effects/unwrap.ogg \ No newline at end of file + path: /Audio/Effects/unwrap.ogg diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Medical/hypospray.yml index b847e945a7b..8b04af2f389 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/Medical/hypospray.yml @@ -61,3 +61,163 @@ state: medipen - type: Item sprite: _NF/Objects/Specific/Medical/medipen.rsi + +- type: entity + name: hemostasis auto-injector + parent: ChemicalMedipen + id: HemostasisAutoInjector + description: A rapid dose of coagulants and circulatory fluids. Contains tranexamic acid and saline. + components: + - type: Sprite + sprite: _NF/Objects/Specific/Medical/medipen.rsi + layers: + - state: hemostasispen + map: ["enum.SolutionContainerLayers.Fill"] + - type: SolutionContainerVisuals + maxFillLevels: 1 + changeColor: false + emptySpriteName: hemostasispen_empty + - type: Hypospray + solutionName: pen + transferAmount: 20 + onlyAffectsMobs: false + injectOnly: true + - type: SolutionContainerManager + solutions: + pen: + maxVol: 20 + reagents: + - ReagentId: TranexamicAcid + Quantity: 5 + - ReagentId: Saline + Quantity: 15 + - type: Tag + tags: [] + +- type: entity + name: stimulant auto-injector + parent: ChemicalMedipen + id: StimulantAutoInjector + description: A rapid dose of potent stimulants and governing agents. Contains desoxyephedrine and dylovene. Use with extreme caution. + components: + - type: Sprite + sprite: _NF/Objects/Specific/Medical/medipen.rsi + layers: + - state: stimulantpen + map: ["enum.SolutionContainerLayers.Fill"] + - type: SolutionContainerVisuals + maxFillLevels: 1 + changeColor: false + emptySpriteName: stimulantpen_empty + - type: Hypospray + solutionName: pen + transferAmount: 20 + onlyAffectsMobs: false + injectOnly: true + - type: SolutionContainerManager + solutions: + pen: + maxVol: 20 + reagents: + - ReagentId: Desoxyephedrine + Quantity: 10 + - ReagentId: Dylovene + Quantity: 10 + - type: Tag + tags: [] + +- type: entity + name: crisis auto-injector + parent: ChemicalMedipen + id: CrisisAutoInjector + description: A rapid dose of stabilizers and vasodialaters for use on critically injured patients. Contains inaprovaline and dexalin plus. + components: + - type: Sprite + sprite: _NF/Objects/Specific/Medical/medipen.rsi + layers: + - state: crisispen + map: ["enum.SolutionContainerLayers.Fill"] + - type: SolutionContainerVisuals + maxFillLevels: 1 + changeColor: false + emptySpriteName: crisispen_empty + - type: Hypospray + solutionName: pen + transferAmount: 20 + onlyAffectsMobs: false + injectOnly: true + - type: SolutionContainerManager + solutions: + pen: + maxVol: 20 + reagents: + - ReagentId: Inaprovaline + Quantity: 10 + - ReagentId: DexalinPlus + Quantity: 10 + - type: Tag + tags: [] + +- type: entity + name: lacerinol auto-injector + parent: ChemicalMedipen + id: LacerAutoInjector + description: A rapid dose of lacerinol and tranexamic acid, intended for combat applications. + components: + - type: Sprite + sprite: _NF/Objects/Specific/Medical/medipen.rsi + layers: + - state: lacerpen + map: ["enum.SolutionContainerLayers.Fill"] + - type: SolutionContainerVisuals + maxFillLevels: 1 + changeColor: false + emptySpriteName: lacerpen_empty + - type: Hypospray + solutionName: pen + transferAmount: 15 + onlyAffectsMobs: false + injectOnly: true + - type: SolutionContainerManager + solutions: + pen: + maxVol: 15 + reagents: + - ReagentId: Lacerinol + Quantity: 10 + - ReagentId: TranexamicAcid + Quantity: 5 + - type: Tag + tags: [] + +- type: entity + name: bruizine auto-injector + parent: ChemicalMedipen + id: BruizAutoInjector + description: A rapid dose of bruizine and tranexamic acid, intended for combat applications. + components: + - type: Sprite + sprite: _NF/Objects/Specific/Medical/medipen.rsi + layers: + - state: bruizpen + map: ["enum.SolutionContainerLayers.Fill"] + - type: SolutionContainerVisuals + maxFillLevels: 1 + changeColor: false + emptySpriteName: bruizpen_empty + - type: Hypospray + solutionName: pen + transferAmount: 15 + onlyAffectsMobs: false + injectOnly: true + - type: SolutionContainerManager + solutions: + pen: + maxVol: 15 + reagents: + - ReagentId: Bruizine + Quantity: 10 + - ReagentId: TranexamicAcid + Quantity: 5 + - type: Tag + tags: [] diff --git a/Resources/Prototypes/_NF/Recipes/Cooking/medical_recipes.yml b/Resources/Prototypes/_NF/Recipes/Cooking/medical_recipes.yml index e64754b855e..b51a0a79d5a 100644 --- a/Resources/Prototypes/_NF/Recipes/Cooking/medical_recipes.yml +++ b/Resources/Prototypes/_NF/Recipes/Cooking/medical_recipes.yml @@ -1,60 +1,3 @@ - #pen recycling recipes - -- type: microwaveMealRecipe - id: RecipeCleanEmergencyMedipen - name: sterilize and reset pen - result: BlankMediPen - time: 10 - solids: - EmergencyMedipen: 1 - reagents: - SpaceCleaner: 1 - recipeType: MedicalAssembler # Frontier - -- type: microwaveMealRecipe - id: RecipeCleanAntiPoisonMedipen - name: sterilize and reset pen - result: BlankMediPen - time: 10 - solids: - AntiPoisonMedipen: 1 - reagents: - SpaceCleaner: 5 - recipeType: MedicalAssembler # Frontier - -- type: microwaveMealRecipe - id: RecipeCleanBruteAutoInjector - name: sterilize and reset pen - result: BlankMediPen - time: 10 - solids: - BruteAutoInjector: 1 - reagents: - SpaceCleaner: 5 - recipeType: MedicalAssembler # Frontier - -- type: microwaveMealRecipe - id: RecipeCleanBurnAutoInjector - name: sterilize and reset pen - result: BlankMediPen - time: 10 - solids: - BurnAutoInjector: 1 - reagents: - SpaceCleaner: 5 - recipeType: MedicalAssembler # Frontier - -- type: microwaveMealRecipe - id: RecipeCleanRadAutoInjector - name: sterilize and reset pen - result: BlankMediPen - time: 10 - solids: - RadAutoInjector: 1 - reagents: - SpaceCleaner: 5 - recipeType: MedicalAssembler # Frontier - #pen recipes #Upstream recipes @@ -62,7 +5,7 @@ id: RecipeEmergencyMedipen name: emergency medipen result: EmergencyMedipen - time: 10 + time: 5 solids: BlankMediPen: 1 reagents: @@ -74,7 +17,7 @@ id: RecipeAntiPoisonMedipen name: poison auto-injector result: AntiPoisonMedipen - time: 10 + time: 5 solids: BlankMediPen: 1 reagents: @@ -86,7 +29,7 @@ id: RecipeBruteAutoInjector name: brute auto-injector result: BruteAutoInjector - time: 10 + time: 5 solids: BlankMediPen: 1 reagents: @@ -98,7 +41,7 @@ id: RecipeBurnAutoInjector name: burn auto-injector result: BurnAutoInjector - time: 10 + time: 5 solids: BlankMediPen: 1 reagents: @@ -110,7 +53,7 @@ id: RecipeRadAutoInjector name: rad auto-injector result: RadAutoInjector - time: 10 + time: 5 solids: BlankMediPen: 1 reagents: @@ -118,4 +61,100 @@ Bicaridine: 5 recipeType: MedicalAssembler # Frontier +- type: microwaveMealRecipe + id: RecipePunctAutoInjector + name: puncturase auto-injector + result: PunctAutoInjector + time: 5 + solids: + BlankMediPen: 1 + reagents: + Puncturase: 10 + TranexamicAcid: 5 + recipeType: MedicalAssembler # Frontier + +- type: microwaveMealRecipe + id: RecipePyraAutoInjector + name: pyrazine auto-injector + result: PyraAutoInjector + time: 5 + solids: + BlankMediPen: 1 + reagents: + Pyrazine: 10 + Dermaline: 10 + recipeType: MedicalAssembler # Frontier + +- type: microwaveMealRecipe + id: RecipeAirlossAutoInjector + name: airloss auto-injector + result: AirlossAutoInjector + time: 5 + solids: + BlankMediPen: 1 + reagents: + Saline: 20 + DexalinPlus: 20 + recipeType: MedicalAssembler # Frontier + #Frontier pen recipes + +- type: microwaveMealRecipe + id: RecipePenHemostasis + name: hemostasis auto-injector + result: HemostasisAutoInjector + time: 5 + solids: + BlankMediPen: 1 + reagents: + TranexamicAcid: 5 + Saline: 15 + recipeType: MedicalAssembler # Frontier + +- type: microwaveMealRecipe + id: RecipePenStimulant + name: stimulant auto-injector + result: StimulantAutoInjector + time: 5 + solids: + BlankMediPen: 1 + reagents: + Desoxyephedrine: 10 + Dylovene: 10 + recipeType: MedicalAssembler # Frontier + +- type: microwaveMealRecipe + id: RecipePenCrisisAutoInjector + name: crisis auto-injector + result: CrisisAutoInjector + time: 5 + solids: + BlankMediPen: 1 + reagents: + Inaprovaline: 10 + DexalinPlus: 10 + recipeType: MedicalAssembler # Frontier + +- type: microwaveMealRecipe + id: RecipePenLacerAutoInjector + name: lacerinol auto-injector + result: LacerAutoInjector + time: 5 + solids: + BlankMediPen: 1 + reagents: + Lacerinol: 10 + TranexamicAcid: 5 + recipeType: MedicalAssembler # Frontier + +- type: microwaveMealRecipe + id: RecipePenBruizAutoInjector + name: bruizine auto-injector + result: BruizAutoInjector + time: 5 + solids: + BlankMediPen: 1 + reagents: + Bruizine: 10 + TranexamicAcid: 5 + recipeType: MedicalAssembler # Frontier diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/chemistry.yml b/Resources/Prototypes/_NF/Recipes/Lathes/chemistry.yml index afd1f18c1a2..5b1f918ae0b 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/chemistry.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/chemistry.yml @@ -21,5 +21,5 @@ result: BlankMediPen completetime: 2 materials: - Plastic: 50 + Plastic: 25 Steel: 25 diff --git a/Resources/Textures/_NF/Objects/Specific/Medical/medipen.rsi/bruizpen.png b/Resources/Textures/_NF/Objects/Specific/Medical/medipen.rsi/bruizpen.png new file mode 100644 index 0000000000000000000000000000000000000000..2cf301ef818de278ecd82caa0969539b2499b49f GIT binary patch literal 329 zcmV-P0k-~$P)Px$14%?dR9J=WlCf$6K@>%=qKzVkAo~GUiv)`$SXcxU*=j4n+A2TbhxiYHbhb+h zkt76BrrAQp(q@=$P{*K65=^l&vO0>T;5*HO^Jci0VE}?42!gnEVy6}ZINL)vdu_q8 zEPORw?VdW_i^E*kJ<3a*3b#}D5!X)kkdqRg=i%|ErhU9r!t}0c3@j|);iMlBtS9h& z9|JhsGJ;46V}ZA9fQ2eXWi}j~b9`^+T4y*%X8d9-z&Qu(a7rnWH=HpR=qsR=vLbG{ zn?eZu;aB^W5XNwg9o|t&8P~=FpFpg>=^g!nic(;V;RB<+W9)2xlRbkWJahQ`1VIo4 baTWXnrC3lm0O;@a00000NkvXXu0mjfLEeX~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Medical/medipen.rsi/bruizpen_empty.png b/Resources/Textures/_NF/Objects/Specific/Medical/medipen.rsi/bruizpen_empty.png new file mode 100644 index 0000000000000000000000000000000000000000..7b1768ef8aa7123b5d534f7e35e8f1237b2c62e2 GIT binary patch literal 384 zcmV-`0e}99P)Px$I!Q!9R9J=Wld(#}P!xv02B(1BCG;sI&_!BsXdx*=x;u2~GdMVPbSU&S?BL#j zgP?;TnF@V{%UvW?u0oe8*TFU@Nt2>jm-{W}!hg>Fe-0e5SS%LHKU3Q##Q0|Oj+k%l z`z=nH*mCQ%-1@gLdu1pv3pX$eH!yz{qH?uEfjM6VJT9MjzPiBkJRZ(YGyUZH2FEE~ zWJb5!&G{Wv4P9z#h+BgIFHPz7dK|BUOm~`1`u%?4>|`=QG#cpHjOlb**pmwoMNw|m zvvmytDJ8GVMW!7}$!Ihx{9HKD|-^BQ)4f{RCHv2K(dWK(3?{_#? ei^XEG{FDzmg>3`UGLLxx0000ZtTAP%6`|4)h{D?l9G~mZXf#eFez@eno#b{*|VkFYISz# zJm0@t)HP@GDuw0~vklnf<>lG_MIV3g=v7V+4=>lW2;H2Df;k5}qT3(dxvtFWpmQP{3%9Za2zU literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Medical/medipen.rsi/crisispen_empty.png b/Resources/Textures/_NF/Objects/Specific/Medical/medipen.rsi/crisispen_empty.png new file mode 100644 index 0000000000000000000000000000000000000000..369c246f7aeaff35f36a86d4326a1c5c0a1dad03 GIT binary patch literal 386 zcmV-|0e$|7P)Px$JV``BR9J=Wlf6pBKoo^fg4hm$Vc$S(RM;nQx7ZL!wii;kuVAB1ngxq=K7(Mu z2S~t1bQ@tB1KPReFii-Ac>sxpn?cFX2F2LS*W7_~@0`Ph3urVNjpm;*+Jpp0W%YLP z(%Sc1%r22;E6{B9EzF<<1SQLgl4V8tS0T2pHXtbH>jL@c7{$#wD5bbNIa9iGdj-?% zT%^Lb?V8`twxLT21AA5p0?<5%=XtQ+o|L}7YryyY#@Q%}K*nRpG({Z8jXkvhuItuT zoo?z30OuU)wImo8wdEPHTk|eb?1q7d=W-|yOU}g786VI&iDn?)bBpl{1#-H?>?jP`zNP4S&}9SUuK)Q(VmzVSG{~p`WZNJs%V3ws!hQpVdKR*Oln}o5~>?xaZ zG5EBYDX-1`(;q%ARyurgvbyBH{neb}c9ox0;(kB&UuHBXrD265|38p74{Ct?9KgU3 Y_b>R!kKgY!fnmeo>FVdQ&MBb@01oVo7ytkO literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Medical/medipen.rsi/hemostasispen_empty.png b/Resources/Textures/_NF/Objects/Specific/Medical/medipen.rsi/hemostasispen_empty.png new file mode 100644 index 0000000000000000000000000000000000000000..8548ab7f691894c8483128ac3ad773736957d767 GIT binary patch literal 389 zcmV;00eb$4P)Px$KS@MER9J;$U>F6XU=)mkQ82)O5toE)UCVzM`*BkZPIWW`vUM&0k1-hiKgMA6 zAK5W<1rjzPGVSJ%;eQAcl4|1qKlj5r*)hR=E7izG?<0CMKdRb8~aU zu#bh1rWZ%nFb3I#{AbvAf#Ho14}*`74}uu&TjufVa0dmZ1I)XFY!WnBn2}BM3f^FhfU22Uf!$KYq->52fF{c|)87wr<^u z5lj*`A^#Z|7#Lg`7#N;Deai5A-vzkbQ!5j!2E%|3RL{qcABl4SHp|x?xyRtC#m(^X z<41;*Cr>hbfAy!uZjBrq@#P=nWUST5k#vZZfU`0rLn2z= zPEzDPL! z=SfrK;Rgv-!iyjL5AUn~e|+!p`OF+m3LKB_U;Mw%r@+n7i3{H%dm^Ok?N(v z{bqZ0$STpNixVXtNyQs~FD#$)+SS%}vWlbc!$2_sbH>%lsaw1&7#RxA2_Btz#q#;7 z0#Dno9EwwtQyVj6Gr4u{{c8|l>M@+dr@nHd(eD}e)8!z~JfX=d#Wzp$PzP-F=q; literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Medical/medipen.rsi/lacerpen_empty.png b/Resources/Textures/_NF/Objects/Specific/Medical/medipen.rsi/lacerpen_empty.png new file mode 100644 index 0000000000000000000000000000000000000000..41682f3f87467416094a26a4e1cf57dc8df988b3 GIT binary patch literal 385 zcmV-{0e=38P)Px$J4r-AR9J=WlP_-qF&Kv*$n+2gSHDaV3=VYyaRw3;3WHrj_y`kIrwPeE0Se1G zR9zLx9BNA%#9i*heFA2n*>Zm%8Dyr9X`A2s_Wkv33l@vTV)-CsSCWX1H)rv;9OSapw*=!19as~#2LH@o! zPvbLatx4n5NLp)xASm2iYfa-cCP{LgfiMhnZSrQGF?Bc`h~kK!>nb{@m@Lb#Gf-4q zxB|JAWUUOP6#I|8(N#-T=Bw!xRC&zBUm#oofZR$V8QuIBls;eKiMtnviVg@*n0voh faf`)bu>gDno&j(_HEURQ00000NkvXXu0mjfIUA%* literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Medical/medipen.rsi/meta.json b/Resources/Textures/_NF/Objects/Specific/Medical/medipen.rsi/meta.json index b1b80617201..9309bc775ca 100644 --- a/Resources/Textures/_NF/Objects/Specific/Medical/medipen.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Specific/Medical/medipen.rsi/meta.json @@ -10,7 +10,37 @@ { "name": "medipen" }, - { + { + "name": "hemostasispen" + }, + { + "name": "hemostasispen_empty" + }, + { + "name": "stimulantpen" + }, + { + "name": "stimulantpen_empty" + }, + { + "name": "crisispen" + }, + { + "name": "crisispen_empty" + }, + { + "name": "bruizpen" + }, + { + "name": "bruizpen_empty" + }, + { + "name": "lacerpen" + }, + { + "name": "lacerpen_empty" + }, + { "name": "medipen-inhand-left" }, { diff --git a/Resources/Textures/_NF/Objects/Specific/Medical/medipen.rsi/stimulantpen.png b/Resources/Textures/_NF/Objects/Specific/Medical/medipen.rsi/stimulantpen.png new file mode 100644 index 0000000000000000000000000000000000000000..39170424145587150ec24c4bd473279d93cd288b GIT binary patch literal 350 zcmV-k0iphhP)Px$7)eAyR9J=W(!ENc6=UCsn}g>!p7-NTkauu;TuQ&s zRw`$hrb(-{O~WqGyPVSPUi>=Dw(YsR#k}zSy-8*^7?ruYi*OtVHBP8n25OuTzie>w zIMIE>;cAKcQjOvBJwXs~O+DRYm?@zxP%%>mqq6o>r4+R-gWh?8s%6mcE1KGyppqxB zW^bY>VqJ4bTj1t)%I?lXX7*7i3`0D(NTd0R=N1XWFem<gv wJODbKqt6{^x4oYWeBt|kZk`ZA2=Qm$0EkdmC#|%SiU0rr07*qoM6N<$g4Uy&5dZ)H literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Medical/medipen.rsi/stimulantpen_empty.png b/Resources/Textures/_NF/Objects/Specific/Medical/medipen.rsi/stimulantpen_empty.png new file mode 100644 index 0000000000000000000000000000000000000000..32bcda4b29b10fc3bc3dfaa42c6a8f464268bea5 GIT binary patch literal 422 zcmV;X0a^ZuP)Px$U`a$lR9J=Wl)pw1kV=APo@& zx`j(oE&hmx_BXk@U+(76LvzUNHk1(f{IO_5_p_V}_nhqbiH*mz7BkWymX_F@K{#1Ho0D3${Zv9T#bA@tl2p;#m8Gv$Ol%tiiLb&CE_!mpjZw7aC-K-`kzpv(P;h+Ul%iw!mYRR Q7ytkO07*qoM6N<$f*>lyh5!Hn literal 0 HcmV?d00001 From cd3484e8f9202ed460a58c34f43ab5dee08eb5c0 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Fri, 6 Dec 2024 16:42:00 +0000 Subject: [PATCH 09/52] Automatic Changelog (#2452) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 9940037e0a5..1122a074cad 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -5693,3 +5693,9 @@ Entries: message: Removed contraband type from Emotional support RPG id: 5555 time: '2024-12-06T16:33:03.0000000+00:00' +- author: dustylens + changes: + - type: Add + message: additional medical pen recipes. + id: 5556 + time: '2024-12-06T16:39:24.0000000+00:00' From d34d374083a6dc6ea7deadb9a3423b7f5ef5890a Mon Sep 17 00:00:00 2001 From: Whatstone <166147148+whatston3@users.noreply.github.com> Date: Fri, 6 Dec 2024 12:07:55 -0500 Subject: [PATCH 10/52] Guidebook open depth to 1 (#2519) --- .../UserInterface/Systems/Guidebook/GuidebookUIController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs b/Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs index 702b0a52ac4..0c38696f628 100644 --- a/Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs +++ b/Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs @@ -210,7 +210,7 @@ public void OpenGuidebook( // Expand up to depth-2. _guideWindow.Tree.SetAllExpanded(false); - _guideWindow.Tree.SetAllExpanded(true, 1); + _guideWindow.Tree.SetAllExpanded(true, 0); // Frontier: 1->0 (too many entries at depth 2) _guideWindow.OpenCenteredRight(); } From c3e2beb3c9573048c00663426a74e3dbe4589226 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Fri, 6 Dec 2024 19:17:40 +0200 Subject: [PATCH 11/52] Update lockers.yml (#2517) * Update lockers.yml * Update Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml --------- Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> --- .../Storage/Closets/Lockers/lockers.yml | 214 ++---------------- 1 file changed, 25 insertions(+), 189 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml index ca031c10abf..80c4fd64ad8 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -1,89 +1,53 @@ +# Basic +- type: entity + id: NFLockerBaseSecure + parent: LockerBaseSecure + abstract: true + components: + - type: Sprite + sprite: _NF/Structures/Storage/closet.rsi + # Mail - type: entity id: LockerMailCarrier - parent: LockerBaseSecure - name: mail's locker + parent: NFLockerBaseSecure + name: mail carrier's locker components: - - type: Appearance - type: EntityStorageVisuals stateBaseClosed: mail stateDoorOpen: mail_open stateDoorClosed: mail_door - - type: Sprite - sprite: _NF/Structures/Storage/closet.rsi - noRot: true - layers: - - state: generic - map: ["enum.StorageVisualLayers.Base"] - - state: generic_door - map: ["enum.StorageVisualLayers.Door"] - - state: locked - map: ["enum.LockVisualLayers.Lock"] - shader: unshaded - - state: welded - visible: false - map: ["enum.WeldableLayers.BaseWelded"] - type: AccessReader access: [["Mail"]] # Mercenary - type: entity id: LockerMercenary - parent: LockerBaseSecure + parent: NFLockerBaseSecure name: mercenary locker components: - - type: Appearance - type: EntityStorageVisuals stateBaseClosed: mercenary stateDoorOpen: mercenary_open stateDoorClosed: mercenary_door - - type: Sprite - sprite: _NF/Structures/Storage/closet.rsi - noRot: true - layers: - - state: generic - map: ["enum.StorageVisualLayers.Base"] - - state: generic_door - map: ["enum.StorageVisualLayers.Door"] - - state: locked - map: ["enum.LockVisualLayers.Lock"] - shader: unshaded - - state: welded - visible: false - map: ["enum.WeldableLayers.BaseWelded"] - type: AccessReader access: [["Captain"], ["Mercenary"]] # Janitor - type: entity id: LockerJanitor - parent: LockerBaseSecure + parent: NFLockerBaseSecure name: janitor locker components: - - type: Appearance - type: EntityStorageVisuals stateBaseClosed: janitor stateDoorOpen: janitor_open stateDoorClosed: janitor_door - - type: Sprite - sprite: _NF/Structures/Storage/closet.rsi - noRot: true - layers: - - state: generic - map: ["enum.StorageVisualLayers.Base"] - - state: generic_door - map: ["enum.StorageVisualLayers.Door"] - - state: locked - map: ["enum.LockVisualLayers.Lock"] - shader: unshaded - - state: welded - visible: false - map: ["enum.WeldableLayers.BaseWelded"] # Pilot - type: entity id: LockerPilot - parent: LockerBaseSecure + parent: NFLockerBaseSecure name: pilot's locker components: - type: Appearance @@ -91,21 +55,6 @@ stateBaseClosed: pilot stateDoorOpen: pilot_open stateDoorClosed: pilot_door - - type: Sprite - sprite: _NF/Structures/Storage/closet.rsi - noRot: true - layers: - - state: generic - map: ["enum.StorageVisualLayers.Base"] - - state: generic_door - map: ["enum.StorageVisualLayers.Door"] - - state: locked - map: ["enum.LockVisualLayers.Lock"] - shader: unshaded - - state: welded - visible: false - map: ["enum.WeldableLayers.BaseWelded"] - - type: AccessReader # Wooden Cabinet - type: entity @@ -117,153 +66,69 @@ - type: Construction graph: StorageFurnitureGraph node: LockerWoodenGenericNode - - type: AccessReader - type: StaticPrice price: 75 # Frontier: 75 # NFSD - Evidence - type: entity id: LockerNfsdEvidence - parent: LockerBaseSecure + parent: [NFLockerBaseSecure, LockerSecurity] name: nfsd evidence locker components: - - type: Appearance - type: EntityStorageVisuals stateBaseClosed: nfsd stateDoorOpen: nfsd_open stateDoorClosed: nfsd_door - - type: Sprite - sprite: _NF/Structures/Storage/closet.rsi - noRot: true - layers: - - state: generic - map: ["enum.StorageVisualLayers.Base"] - - state: generic_door - map: ["enum.StorageVisualLayers.Door"] - - state: locked - map: ["enum.LockVisualLayers.Lock"] - shader: unshaded - - state: welded - visible: false - map: ["enum.WeldableLayers.BaseWelded"] - - type: AccessReader - access: [["Security"]] # NFSD Copper - type: entity id: LockerNfsdCopper - parent: LockerBaseSecure + parent: [NFLockerBaseSecure, LockerSecurity] name: nfsd locker suffix: Copper components: - - type: Appearance - type: EntityStorageVisuals stateBaseClosed: nfsd_copper stateDoorOpen: nfsd_copper_open stateDoorClosed: nfsd_copper_door - - type: Sprite - sprite: _NF/Structures/Storage/closet.rsi - noRot: true - layers: - - state: generic - map: ["enum.StorageVisualLayers.Base"] - - state: generic_door - map: ["enum.StorageVisualLayers.Door"] - - state: locked - map: ["enum.LockVisualLayers.Lock"] - shader: unshaded - - state: welded - visible: false - map: ["enum.WeldableLayers.BaseWelded"] - - type: AccessReader - access: [["Security"]] # NFSD Silver - type: entity id: LockerNfsdSilver - parent: LockerBaseSecure + parent: [NFLockerBaseSecure, LockerSecurity] name: nfsd locker suffix: Silver components: - - type: Appearance - type: EntityStorageVisuals stateBaseClosed: nfsd_silver stateDoorOpen: nfsd_silver_open stateDoorClosed: nfsd_silver_door - - type: Sprite - sprite: _NF/Structures/Storage/closet.rsi - noRot: true - layers: - - state: generic - map: ["enum.StorageVisualLayers.Base"] - - state: generic_door - map: ["enum.StorageVisualLayers.Door"] - - state: locked - map: ["enum.LockVisualLayers.Lock"] - shader: unshaded - - state: welded - visible: false - map: ["enum.WeldableLayers.BaseWelded"] - - type: AccessReader - access: [["Security"]] # NFSD Brigmedic - type: entity id: LockerNfsdBrigmedic - parent: LockerBaseSecure + parent: [NFLockerBaseSecure, LockerSecurity] name: nfsd locker suffix: Brigmedic components: - - type: Appearance - type: EntityStorageVisuals stateBaseClosed: nfsd_brigmed stateDoorOpen: nfsd_brigmed_open stateDoorClosed: nfsd_brigmed_door - - type: Sprite - sprite: _NF/Structures/Storage/closet.rsi - noRot: true - layers: - - state: generic - map: ["enum.StorageVisualLayers.Base"] - - state: generic_door - map: ["enum.StorageVisualLayers.Door"] - - state: locked - map: ["enum.LockVisualLayers.Lock"] - shader: unshaded - - state: welded - visible: false - map: ["enum.WeldableLayers.BaseWelded"] - - type: AccessReader - access: [["Security"]] # NFSD Gold - Sergeant - type: entity id: LockerNfsdSergeant - parent: LockerBaseSecure + parent: NFLockerBaseSecure name: nfsd locker suffix: Sergeant components: - - type: Appearance - type: EntityStorageVisuals stateBaseClosed: nfsd_gold stateDoorOpen: nfsd_gold_open stateDoorClosed: nfsd_gold_door - - type: Sprite - sprite: _NF/Structures/Storage/closet.rsi - noRot: true - layers: - - state: generic - map: ["enum.StorageVisualLayers.Base"] - - state: generic_door - map: ["enum.StorageVisualLayers.Door"] - - state: locked - map: ["enum.LockVisualLayers.Lock"] - shader: unshaded - - state: welded - visible: false - map: ["enum.WeldableLayers.BaseWelded"] - type: AccessReader - access: [["Security"]] + access: [["Sergeant"]] # NFSD Gold - Bailiff - type: entity @@ -271,61 +136,32 @@ parent: LockerNfsdSergeant name: nfsd locker suffix: Bailiff + components: + - type: AccessReader + access: [["Bailiff"]] # NFSD Sheriff - type: entity id: LockerNfsdSheriff - parent: LockerBaseSecure + parent: [NFLockerBaseSecure, LockerHeadOfSecurity] name: nfsd locker suffix: Sheriff components: - - type: Appearance - type: EntityStorageVisuals stateBaseClosed: nfsd_sheriff stateDoorOpen: nfsd_sheriff_open stateDoorClosed: nfsd_sheriff_door - - type: Sprite - sprite: _NF/Structures/Storage/closet.rsi - noRot: true - layers: - - state: generic - map: ["enum.StorageVisualLayers.Base"] - - state: generic_door - map: ["enum.StorageVisualLayers.Door"] - - state: locked - map: ["enum.LockVisualLayers.Lock"] - shader: unshaded - - state: welded - visible: false - map: ["enum.WeldableLayers.BaseWelded"] - type: AccessReader access: [["HeadOfSecurity"]] # SR - type: entity id: LockerStationRepresentative - parent: [BaseStructureIndestructible, BaseStructureLockImmuneToEmag, BaseStructureAccessReaderImmuneToEmag, LockerBaseSecure] # Frontier + parent: [BaseStructureIndestructible, BaseStructureLockImmuneToEmag, BaseStructureAccessReaderImmuneToEmag, NFLockerBaseSecure, LockerHeadOfPersonnel] name: station representative's locker components: - - type: Appearance - type: EntityStorageVisuals stateBaseClosed: sr stateDoorOpen: sr_open stateDoorClosed: sr_door - - type: Sprite - sprite: _NF/Structures/Storage/closet.rsi - noRot: true - layers: - - state: generic - map: ["enum.StorageVisualLayers.Base"] - - state: generic_door - map: ["enum.StorageVisualLayers.Door"] - - state: locked - map: ["enum.LockVisualLayers.Lock"] - shader: unshaded - - state: welded - visible: false - map: ["enum.WeldableLayers.BaseWelded"] - - type: AccessReader - access: [["HeadOfPersonnel"]] From c60ca6958aa9566cb5e98eb55f5769ab2d62d936 Mon Sep 17 00:00:00 2001 From: Whatstone <166147148+whatston3@users.noreply.github.com> Date: Fri, 6 Dec 2024 13:01:17 -0500 Subject: [PATCH 12/52] Fix wristwatch mail, better mailto command (#2496) * Fix gold wristwatch, no matching station teleport * MailCommand: works with any entity, not containers * Add Frontier comments to MailtoCommand --- .../DeltaV/Mail/EntitySystems/MailSystem.cs | 10 ++-- Content.Server/DeltaV/Mail/MailCommands.cs | 56 +++++++++++++++---- Resources/Locale/en-US/nyanotrasen/mail.ftl | 20 ++++--- Resources/Prototypes/_NF/Mail/mail.yml | 2 +- 4 files changed, 63 insertions(+), 25 deletions(-) diff --git a/Content.Server/DeltaV/Mail/EntitySystems/MailSystem.cs b/Content.Server/DeltaV/Mail/EntitySystems/MailSystem.cs index 681a69141d8..28a8a5e9ded 100644 --- a/Content.Server/DeltaV/Mail/EntitySystems/MailSystem.cs +++ b/Content.Server/DeltaV/Mail/EntitySystems/MailSystem.cs @@ -576,13 +576,15 @@ private uint GetUndeliveredParcelCount(EntityUid uid) public bool TryGetMailTeleporterForReceiver(EntityUid receiverUid, [NotNullWhen(true)] out MailTeleporterComponent? teleporterComponent, [NotNullWhen(true)] out EntityUid? teleporterUid) { var query = EntityQueryEnumerator(); - var receiverStation = _stationSystem.GetOwningStation(receiverUid); + //var receiverStation = _stationSystem.GetOwningStation(receiverUid); // Frontier: skip station checks while (query.MoveNext(out var uid, out var mailTeleporter)) { - var teleporterStation = _stationSystem.GetOwningStation(uid); - if (receiverStation != teleporterStation) - continue; + // Frontier: skip station checks + // var teleporterStation = _stationSystem.GetOwningStation(uid); + // if (receiverStation != teleporterStation) + // continue; + // End Frontier teleporterComponent = mailTeleporter; teleporterUid = uid; return true; diff --git a/Content.Server/DeltaV/Mail/MailCommands.cs b/Content.Server/DeltaV/Mail/MailCommands.cs index 3d2365cd3cb..84bced4776b 100644 --- a/Content.Server/DeltaV/Mail/MailCommands.cs +++ b/Content.Server/DeltaV/Mail/MailCommands.cs @@ -10,11 +10,11 @@ namespace Content.Server.DeltaV.Mail; [AdminCommand(AdminFlags.Fun)] -public sealed class MailToCommand : IConsoleCommand +public sealed class MailToCommand : LocalizedCommands // Frontier: IConsoleCommand < LocalizedCommands { - public string Command => "mailto"; - public string Description => Loc.GetString("command-mailto-description", ("requiredComponent", nameof(MailReceiverComponent))); - public string Help => Loc.GetString("command-mailto-help", ("command", Command)); + public override string Command => "mailto"; // Frontier: add override + public override string Description => Loc.GetString("command-mailto-description", ("requiredComponent", nameof(MailReceiverComponent))); // Frontier: add override + public override string Help => Loc.GetString("command-mailto-help", ("command", Command)); // Frontier: add override [Dependency] private readonly IEntityManager _entityManager = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!; @@ -26,7 +26,7 @@ public sealed class MailToCommand : IConsoleCommand private const string MailContainer = "contents"; - public async void Execute(IConsoleShell shell, string argStr, string[] args) + public override void Execute(IConsoleShell shell, string argStr, string[] args) // Frontier: async < override { if (args.Length < 4) { @@ -84,11 +84,13 @@ public async void Execute(IConsoleShell shell, string argStr, string[] args) return; } - if (!containerSystem.TryGetContainer(containerUid, Container, out var targetContainer)) - { - shell.WriteLine(Loc.GetString("command-mailto-invalid-container", ("requiredContainer", Container))); - return; - } + // Frontier: box optional + // if (!containerSystem.TryGetContainer(containerUid, Container, out var targetContainer)) + // { + // shell.WriteLine(Loc.GetString("command-mailto-invalid-container", ("requiredContainer", Container))); + // return; + // } + // End Frontier if (!mailSystem.TryGetMailRecipientForReceiver(recipientUid, out var recipient)) { @@ -111,10 +113,19 @@ public async void Execute(IConsoleShell shell, string argStr, string[] args) return; } - foreach (var entity in targetContainer.ContainedEntities.ToArray()) + // Frontier: box optional + if (containerSystem.TryGetContainer(containerUid, Container, out var targetContainer)) + { + foreach (var entity in targetContainer.ContainedEntities.ToArray()) + { + containerSystem.Insert(entity, mailContents); + } + } + else { - containerSystem.Insert(entity, mailContents); + containerSystem.Insert(containerUid, mailContents); } + // End Frontier mailComponent.IsFragile = isFragile; mailComponent.IsPriority = isPriority; @@ -126,6 +137,27 @@ public async void Execute(IConsoleShell shell, string argStr, string[] args) containerSystem.Insert(mailUid, teleporterQueue); shell.WriteLine(Loc.GetString("command-mailto-success", ("timeToTeleport", teleporterComponent.TeleportInterval.TotalSeconds - teleporterComponent.Accumulator))); } + + // Frontier: completion + public override CompletionResult GetCompletion(IConsoleShell shell, string[] args) + { + switch (args.Length) + { + case 1: + return CompletionResult.FromHint(Loc.GetString("command-mailto-completion-recipient")); + case 2: + return CompletionResult.FromHint(Loc.GetString("command-mailto-completion-container")); + case 3: + return CompletionResult.FromHint(Loc.GetString("command-mailto-completion-fragile")); + case 4: + return CompletionResult.FromHint(Loc.GetString("command-mailto-completion-priority")); + case 5: + return CompletionResult.FromHint(Loc.GetString("command-mailto-completion-large")); + default: + return CompletionResult.Empty; + } + } + // End Frontier } [AdminCommand(AdminFlags.Fun)] diff --git a/Resources/Locale/en-US/nyanotrasen/mail.ftl b/Resources/Locale/en-US/nyanotrasen/mail.ftl index 7c9d99946c0..1bd4cd066ae 100644 --- a/Resources/Locale/en-US/nyanotrasen/mail.ftl +++ b/Resources/Locale/en-US/nyanotrasen/mail.ftl @@ -16,9 +16,10 @@ mail-penalty-expired = DELIVERY PAST DUE. STATION BANK ACCOUNT PENALIZED BY {$cr mail-item-name-unaddressed = mail mail-item-name-addressed = mail ({$recipient}) -command-mailto-description = Queue a parcel to be delivered to an entity. Example usage: `mailto 1234 5678 false false`. The target container's contents will be transferred to an actual mail parcel. -# Frontier: add is-large description -command-mailto-help = Usage: {$command} [is-fragile: true or false] [is-priority: true or false] [is-large: true or false, optional] +# Frontier: reworded description, does not need to be a container. +command-mailto-description = Queue an item to be delivered to a recipient. Example usage: `mailto 1234 5678 false false`. If the target entity is a container, its contents will be transferred to an actual mail parcel. +# Frontier: add is-large description, container [is-fragile: true|false] [is-priority: true|false] [is-large: true|false] command-mailto-no-mailreceiver = Target recipient entity does not have a {$requiredComponent}. command-mailto-no-blankmail = The {$blankMail} prototype doesn't exist. Something is very wrong. Contact a programmer. command-mailto-bogus-mail = {$blankMail} did not have {$requiredMailComponent}. Something is very wrong. Contact a programmer. @@ -27,11 +28,14 @@ command-mailto-unable-to-receive = Target recipient entity was unable to be setu command-mailto-no-teleporter-found = Target recipient entity was unable to be matched to any station's mail teleporter. Recipient may be off-station. command-mailto-success = Success! Mail parcel has been queued for next teleport in {$timeToTeleport} seconds. +# Frontier: mailto command completions +command-mailto-completion-recipient = +command-mailto-completion-container = +command-mailto-completion-fragile = [is-fragile: true|false] +command-mailto-completion-priority = [is-priority: true|false] +command-mailto-completion-large = [is-large: true|false] +# End Frontier + command-mailnow = Force all mail teleporters to deliver another round of mail as soon as possible. This will not bypass the undelivered mail limit. command-mailnow-help = Usage: {$command} command-mailnow-success = Success! All mail teleporters will be delivering another round of mail soon. - -# Frontier: mailtestbulk -command-mailtestbulk = Sends one of each type of parcel to a given mail teleporter. Implicitly calls mailnow. -command-mailtestbulk-help = Usage: {$command} -command-mailtestbulk-success = Success! All mail teleporters will be delivering another round of mail soon. \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Mail/mail.yml b/Resources/Prototypes/_NF/Mail/mail.yml index 4ed48ed75c0..d3f70d67fe7 100644 --- a/Resources/Prototypes/_NF/Mail/mail.yml +++ b/Resources/Prototypes/_NF/Mail/mail.yml @@ -1827,7 +1827,7 @@ - type: Mail isFragile: true contents: - - id: MailCommandNFWristwatchGold + - id: WristwatchGold - type: entity categories: [ HideSpawnMenu ] From f1255fb64dd0f27b00fe44210ae2e79aede6d12d Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Fri, 6 Dec 2024 18:01:43 +0000 Subject: [PATCH 13/52] Automatic Changelog (#2496) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 1122a074cad..1ae10fc1833 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -5699,3 +5699,9 @@ Entries: message: additional medical pen recipes. id: 5556 time: '2024-12-06T16:39:24.0000000+00:00' +- author: whatston3 + changes: + - type: Fix + message: Fixed a bug with wristwatch mail packages. + id: 5557 + time: '2024-12-06T18:01:18.0000000+00:00' From 9f33e7a802ebede4d4ace4463146dcf6874a29bd Mon Sep 17 00:00:00 2001 From: Long YM <40413261+Mygnol@users.noreply.github.com> Date: Sat, 7 Dec 2024 02:08:02 +0800 Subject: [PATCH 14/52] Change event announcement text "station" --> "shuttle" (#2465) * Update event announcements * Change "we advise" to "affected personnel" * Tweaked solar flare event text * Spacing * Pluralize shuttles * Migrate files Migrated changed files from ``Resources\Locale\en-US\station-events\events`` to ``Resources\Locale\en-US\_NF\events`` to be with the other frontier specific events. * Frontier-specific event descriptions * Update Resources/Locale/en-US/_NF/events/gas-leak.ftl * Update Resources/Locale/en-US/station-events/events/ion-storm.ftl --------- Co-authored-by: Checkraze <71046427+Cheackraze@users.noreply.github.com> Co-authored-by: Whatstone Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> --- .../Locale/en-US/_NF/events/bluespace-cargo.ftl | 2 +- .../en-US/_NF/events/bluespace-syndicate-crate.ftl | 2 +- Resources/Locale/en-US/_NF/events/gas-leak.ftl | 2 ++ Resources/Locale/en-US/_NF/events/ion-storm.ftl | 1 + .../Locale/en-US/_NF/events/power-grid-check.ftl | 2 ++ Resources/Locale/en-US/_NF/events/solar-flare.ftl | 2 ++ Resources/Locale/en-US/_NF/events/vent-clog.ftl | 1 + .../Locale/en-US/_NF/events/vent-critters.ftl | 1 + .../en-US/station-events/events/gas-leak.ftl | 2 +- .../en-US/station-events/events/ion-storm.ftl | 9 ++++++--- .../station-events/events/power-grid-check.ftl | 2 +- .../station-events/events/random-sentience.ftl | 14 +++++++++----- .../en-US/station-events/events/vent-clog.ftl | 2 +- .../en-US/station-events/events/vent-critters.ftl | 2 +- Resources/Prototypes/GameRules/pests.yml | 12 ++++++------ Resources/Prototypes/_NF/Events/events.yml | 14 +++++++------- 16 files changed, 43 insertions(+), 27 deletions(-) create mode 100644 Resources/Locale/en-US/_NF/events/gas-leak.ftl create mode 100644 Resources/Locale/en-US/_NF/events/ion-storm.ftl create mode 100644 Resources/Locale/en-US/_NF/events/power-grid-check.ftl create mode 100644 Resources/Locale/en-US/_NF/events/solar-flare.ftl create mode 100644 Resources/Locale/en-US/_NF/events/vent-clog.ftl create mode 100644 Resources/Locale/en-US/_NF/events/vent-critters.ftl diff --git a/Resources/Locale/en-US/_NF/events/bluespace-cargo.ftl b/Resources/Locale/en-US/_NF/events/bluespace-cargo.ftl index a191bcbedc7..b396dd8bf23 100644 --- a/Resources/Locale/en-US/_NF/events/bluespace-cargo.ftl +++ b/Resources/Locale/en-US/_NF/events/bluespace-cargo.ftl @@ -1 +1 @@ -bluespace-cargo-event-announcement = An error in bluespace telemetry has caused a random crate to teleport to an unknown location. +bluespace-cargo-event-announcement = An error in bluespace shipping telemetry has caused random crates to teleport into the sector. diff --git a/Resources/Locale/en-US/_NF/events/bluespace-syndicate-crate.ftl b/Resources/Locale/en-US/_NF/events/bluespace-syndicate-crate.ftl index 784349f9d60..61216f72666 100644 --- a/Resources/Locale/en-US/_NF/events/bluespace-syndicate-crate.ftl +++ b/Resources/Locale/en-US/_NF/events/bluespace-syndicate-crate.ftl @@ -1 +1 @@ -bluespace-syndicate-crate-event-announcement = We received a report that a crate containing syndicate items has shown up in some area, please notify the security team if you found said crate. +bluespace-syndicate-crate-event-announcement = We have received reports of crates containing syndicate items arriving through bluespace. Please notify the NFSD immediately if finding such a crate. diff --git a/Resources/Locale/en-US/_NF/events/gas-leak.ftl b/Resources/Locale/en-US/_NF/events/gas-leak.ftl new file mode 100644 index 00000000000..554c50ab730 --- /dev/null +++ b/Resources/Locale/en-US/_NF/events/gas-leak.ftl @@ -0,0 +1,2 @@ +station-event-gas-leak-nf-start-announcement = Attention. Gas leaks have been detected on shuttles. Affected crew are advised to avoid affected areas and wear suit internals in the meantime. +station-event-gas-leak-nf-end-announcement = The source of the gas leaks has been fixed. Please be cautious around areas with gas remaining. diff --git a/Resources/Locale/en-US/_NF/events/ion-storm.ftl b/Resources/Locale/en-US/_NF/events/ion-storm.ftl new file mode 100644 index 00000000000..b354e3cd9e9 --- /dev/null +++ b/Resources/Locale/en-US/_NF/events/ion-storm.ftl @@ -0,0 +1 @@ +station-event-ion-storm-nf-start-announcement = Ion storm detected in the sector. Please check all AI-controlled equipment for errors. diff --git a/Resources/Locale/en-US/_NF/events/power-grid-check.ftl b/Resources/Locale/en-US/_NF/events/power-grid-check.ftl new file mode 100644 index 00000000000..36c578f39a3 --- /dev/null +++ b/Resources/Locale/en-US/_NF/events/power-grid-check.ftl @@ -0,0 +1,2 @@ +station-event-power-grid-check-nf-start-announcement = Abnormal activity detected in shuttle powernets. As a precautionary measure, the affected shuttles' power will be shut down for an indeterminate duration. +station-event-power-grid-check-nf-end-announcement = Power has been restored to the affected shuttles. We apologize for the inconvenience. diff --git a/Resources/Locale/en-US/_NF/events/solar-flare.ftl b/Resources/Locale/en-US/_NF/events/solar-flare.ftl new file mode 100644 index 00000000000..1f5c37379a5 --- /dev/null +++ b/Resources/Locale/en-US/_NF/events/solar-flare.ftl @@ -0,0 +1,2 @@ +station-event-solar-flare-nf-start-announcement = Attention. A solar flare has been detected in the sector. Some communication channels may not function. +station-event-solar-flare-nf-end-announcement = The solar flare has ended. Communication channels are no longer affected. diff --git a/Resources/Locale/en-US/_NF/events/vent-clog.ftl b/Resources/Locale/en-US/_NF/events/vent-clog.ftl new file mode 100644 index 00000000000..867e6e66c2e --- /dev/null +++ b/Resources/Locale/en-US/_NF/events/vent-clog.ftl @@ -0,0 +1 @@ +station-event-vent-clog-nf-start-announcement = Attention. Shuttle scrubber networks are experiencing a backpressure surge. Some ejection of contents may occur. diff --git a/Resources/Locale/en-US/_NF/events/vent-critters.ftl b/Resources/Locale/en-US/_NF/events/vent-critters.ftl new file mode 100644 index 00000000000..e849889238f --- /dev/null +++ b/Resources/Locale/en-US/_NF/events/vent-critters.ftl @@ -0,0 +1 @@ +station-event-vent-creatures-nf-start-announcement = Attention. A large influx of unknown life forms have been detected residing within shuttle ventilation systems. Please be rid of these creatures before it begins to affect productivity. diff --git a/Resources/Locale/en-US/station-events/events/gas-leak.ftl b/Resources/Locale/en-US/station-events/events/gas-leak.ftl index 18429fa58d8..1358ff9c76a 100644 --- a/Resources/Locale/en-US/station-events/events/gas-leak.ftl +++ b/Resources/Locale/en-US/station-events/events/gas-leak.ftl @@ -1,2 +1,2 @@ -station-event-gas-leak-start-announcement = Attention crew, there is a gas leak on the station. We advise you to avoid the area and wear suit internals in the meantime. +station-event-gas-leak-start-announcement = Attention crew, there is a gas leak on the station. We advise you to avoid the area and wear suit internals in the meantime. station-event-gas-leak-end-announcement = The source of the gas leak has been fixed. Please be cautious around areas with gas remaining. diff --git a/Resources/Locale/en-US/station-events/events/ion-storm.ftl b/Resources/Locale/en-US/station-events/events/ion-storm.ftl index 1819f16f61f..d95c9b97e47 100644 --- a/Resources/Locale/en-US/station-events/events/ion-storm.ftl +++ b/Resources/Locale/en-US/station-events/events/ion-storm.ftl @@ -3,11 +3,13 @@ station-event-ion-storm-start-announcement = Ion storm detected near the station ion-storm-law-scrambled-number = [font="Monospace"][scramble rate=250 length={$length} chars="@@###$$&%!01"/][/font] ion-storm-you = YOU -ion-storm-the-station = THE STATION +# Frontier: the station < the sector +ion-storm-the-station = THE SECTOR ion-storm-the-crew = THE CREW ion-storm-the-job = THE {$job} ion-storm-clowns = CLOWNS -ion-storm-heads = HEADS OF STAFF +# Frontier: heads of staff < sector command +ion-storm-heads = SECTOR COMMAND ion-storm-crew = CREW ion-storm-people = PEOPLE @@ -17,7 +19,8 @@ ion-storm-x-and-y = {$x} AND {$y} # joined is short for {$number} {$adjective} # subjects can generally be threats or jobs or objects # thing is specified above it -ion-storm-law-on-station = THERE ARE {$joined} {$subjects} ON THE STATION +# Frontier: "on the station" < "in the sector" +ion-storm-law-on-station = THERE ARE {$joined} {$subjects} IN THE SECTOR ion-storm-law-no-shuttle = THE SHIFT END CANNOT BE CALLED BECAUSE OF {$joined} {$subjects} ON FRONTIER ion-storm-law-crew-are = THE {$who} ARE NOW {$joined} {$subjects} diff --git a/Resources/Locale/en-US/station-events/events/power-grid-check.ftl b/Resources/Locale/en-US/station-events/events/power-grid-check.ftl index b42dbd19db3..b1baca19685 100644 --- a/Resources/Locale/en-US/station-events/events/power-grid-check.ftl +++ b/Resources/Locale/en-US/station-events/events/power-grid-check.ftl @@ -1,4 +1,4 @@ ## PowerGridCheck station-event-power-grid-check-start-announcement = Abnormal activity detected in the station's powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration. -station-event-power-grid-check-end-announcement = Power has been restored to the station. We apologize for the inconvenience. \ No newline at end of file +station-event-power-grid-check-end-announcement = Power has been restored to the station. We apologize for the inconvenience. diff --git a/Resources/Locale/en-US/station-events/events/random-sentience.ftl b/Resources/Locale/en-US/station-events/events/random-sentience.ftl index f14a020d29e..e0486a1a643 100644 --- a/Resources/Locale/en-US/station-events/events/random-sentience.ftl +++ b/Resources/Locale/en-US/station-events/events/random-sentience.ftl @@ -2,7 +2,8 @@ random-sentience-event-data-1 = scans from our long-range sensors random-sentience-event-data-2 = our sophisticated probabilistic models random-sentience-event-data-3 = our omnipotence -random-sentience-event-data-4 = the communications traffic on your station +# Frontier: "from your station"<"within the sector" +random-sentience-event-data-4 = the communications traffic within the sector random-sentience-event-data-5 = energy emissions we detected random-sentience-event-data-6 = [REDACTED] @@ -10,15 +11,18 @@ random-sentience-event-data-6 = [REDACTED] random-sentience-event-strength-1 = human random-sentience-event-strength-2 = primate random-sentience-event-strength-3 = moderate -random-sentience-event-strength-4 = security -random-sentience-event-strength-5 = command +# Frontier: security < high (...) +random-sentience-event-strength-4 = high +# Frontier: command < genius (......) +random-sentience-event-strength-5 = genius random-sentience-event-strength-6 = clown random-sentience-event-strength-7 = low random-sentience-event-strength-8 = AI ## Announcement text -station-event-random-sentience-announcement = Based on { $data }, we believe that some of the station's { $amount -> +# Frontier: station [1] { $kind1 } [2] { $kind1 } and { $kind2 } [3] { $kind1 }, { $kind2 }, and { $kind3 } @@ -36,4 +40,4 @@ station-event-random-sentience-flavor-corgi = corgi station-event-random-sentience-flavor-primate = primate station-event-random-sentience-flavor-kobold = kobold station-event-random-sentience-flavor-slime = slime -station-event-random-sentience-flavor-inanimate = inanimate \ No newline at end of file +station-event-random-sentience-flavor-inanimate = inanimate diff --git a/Resources/Locale/en-US/station-events/events/vent-clog.ftl b/Resources/Locale/en-US/station-events/events/vent-clog.ftl index f87f9e241b2..5786993adce 100644 --- a/Resources/Locale/en-US/station-events/events/vent-clog.ftl +++ b/Resources/Locale/en-US/station-events/events/vent-clog.ftl @@ -1 +1 @@ -station-event-vent-clog-start-announcement = The scrubbers network is experiencing a backpressure surge. Some ejection of contents may occur. +station-event-vent-clog-start-announcement = The scrubbers network is experiencing a backpressure surge. Some ejection of contents may occur. diff --git a/Resources/Locale/en-US/station-events/events/vent-critters.ftl b/Resources/Locale/en-US/station-events/events/vent-critters.ftl index 426f0c0ca1a..d0da6d598d9 100644 --- a/Resources/Locale/en-US/station-events/events/vent-critters.ftl +++ b/Resources/Locale/en-US/station-events/events/vent-critters.ftl @@ -1 +1 @@ -station-event-vent-creatures-start-announcement = Attention. A large influx of unknown life forms have been detected residing within the station's ventilation systems. Please be rid of these creatures before it begins to affect productivity. +station-event-vent-creatures-start-announcement = Attention. A large influx of unknown life forms have been detected residing within the station's ventilation systems. Please be rid of these creatures before it begins to affect productivity. diff --git a/Resources/Prototypes/GameRules/pests.yml b/Resources/Prototypes/GameRules/pests.yml index 686f388838d..0631740ce71 100644 --- a/Resources/Prototypes/GameRules/pests.yml +++ b/Resources/Prototypes/GameRules/pests.yml @@ -22,7 +22,7 @@ parent: BaseStationEventShortDelay components: - type: StationEvent - startAnnouncement: station-event-vent-creatures-start-announcement + startAnnouncement: station-event-vent-creatures-nf-start-announcement # Frontier: add nf- startAudio: path: /Audio/Announcements/attention.ogg earliestStart: 15 @@ -45,7 +45,7 @@ parent: BaseStationEventShortDelay components: - type: StationEvent - startAnnouncement: station-event-vent-creatures-start-announcement + startAnnouncement: station-event-vent-creatures-nf-start-announcement # Frontier: add nf- startAudio: path: /Audio/Announcements/attention.ogg earliestStart: 15 @@ -71,7 +71,7 @@ parent: BaseStationEventShortDelay components: - type: StationEvent - startAnnouncement: station-event-vent-creatures-start-announcement + startAnnouncement: station-event-vent-creatures-nf-start-announcement # Frontier: add nf- startAudio: path: /Audio/Announcements/attention.ogg weight: 6 @@ -90,7 +90,7 @@ parent: BaseStationEventShortDelay components: - type: StationEvent - startAnnouncement: station-event-vent-creatures-start-announcement + startAnnouncement: station-event-vent-creatures-nf-start-announcement # Frontier: add nf- startAudio: path: /Audio/Announcements/attention.ogg weight: 6 @@ -109,7 +109,7 @@ parent: BaseStationEventShortDelay components: - type: StationEvent - startAnnouncement: station-event-vent-creatures-start-announcement + startAnnouncement: station-event-vent-creatures-nf-start-announcement # Frontier: add nf- startAudio: path: /Audio/Announcements/attention.ogg earliestStart: 15 @@ -125,4 +125,4 @@ - id: MobSnailMoth prob: 0.002 - id: MobSnailInstantDeath - prob: 0.00001 # ~ 1:2000 snails \ No newline at end of file + prob: 0.00001 # ~ 1:2000 snails diff --git a/Resources/Prototypes/_NF/Events/events.yml b/Resources/Prototypes/_NF/Events/events.yml index 8abbad0f5dd..1a422515a2a 100644 --- a/Resources/Prototypes/_NF/Events/events.yml +++ b/Resources/Prototypes/_NF/Events/events.yml @@ -266,10 +266,10 @@ parent: BaseStationEventShortDelay components: - type: StationEvent - startAnnouncement: station-event-gas-leak-start-announcement + startAnnouncement: station-event-gas-leak-nf-start-announcement # Frontier: add nf- startAudio: path: /Audio/Announcements/attention.ogg - endAnnouncement: station-event-gas-leak-end-announcement + endAnnouncement: station-event-gas-leak-nf-end-announcement # Frontier: add nf- weight: 8 earliestStart: 15 # Frontier - type: GasLeakRule @@ -292,8 +292,8 @@ - type: StationEvent weight: 5 earliestStart: 15 # Frontier - startAnnouncement: station-event-power-grid-check-start-announcement - endAnnouncement: station-event-power-grid-check-end-announcement + startAnnouncement: station-event-power-grid-check-nf-start-announcement # Frontier: add nf- + endAnnouncement: station-event-power-grid-check-nf-end-announcement # Frontier: add nf- startAudio: path: /Audio/Announcements/power_off.ogg params: @@ -310,8 +310,8 @@ weight: 4 earliestStart: 15 # Frontier reoccurrenceDelay: 45 # Frontier - startAnnouncement: station-event-solar-flare-start-announcement - endAnnouncement: station-event-solar-flare-end-announcement + startAnnouncement: station-event-solar-flare-nf-start-announcement # Frontier: add nf- + endAnnouncement: station-event-solar-flare-nf-end-announcement # Frontier: add nf- startAudio: path: /Audio/Announcements/attention.ogg duration: 120 @@ -339,7 +339,7 @@ parent: BaseStationEventLongDelay components: - type: StationEvent - startAnnouncement: station-event-vent-clog-start-announcement + startAnnouncement: station-event-vent-clog-nf-start-announcement # Frontier: add nf- startAudio: path: /Audio/Announcements/attention.ogg earliestStart: 15 From a265f3cd51fcb6ee441f1ba4ca99c96ececf49c3 Mon Sep 17 00:00:00 2001 From: Whatstone <166147148+whatston3@users.noreply.github.com> Date: Fri, 6 Dec 2024 13:23:03 -0500 Subject: [PATCH 15/52] Moth food for moths (#2488) * Moth digestion * Mark pyrotton material as MothFood * MothFood component, flavor "like cotton" * Update Content.Server/Body/Components/StomachComponent.cs --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- .../Body/Components/StomachComponent.cs | 6 ++++ .../Nutrition/EntitySystems/FoodSystem.cs | 2 ++ .../Kitchen/Components/MothFoodComponent.cs | 5 +++ .../Locale/en-US/flavors/flavor-profiles.ftl | 3 +- Resources/Prototypes/Body/Organs/moth.yml | 12 +++---- .../Objects/Consumable/Food/Baked/bread.yml | 2 ++ .../Objects/Consumable/Food/Baked/pizza.yml | 4 +++ .../Objects/Consumable/Food/ingredients.yml | 6 ++++ .../Objects/Consumable/Food/produce.yml | 5 +-- .../Objects/Consumable/Food/snacks.yml | 32 ++++++++---------- .../Entities/Objects/Materials/materials.yml | 3 +- .../Entities/Objects/Consumable/Food/moth.yml | 33 ++++++++++++++++--- .../Objects/Consumable/Food/ration.yml | 2 -- .../Recipes/Crafting/Cooking/moth_recipes.yml | 16 ++++++--- Resources/Prototypes/tags.yml | 6 ---- 15 files changed, 92 insertions(+), 45 deletions(-) create mode 100644 Content.Server/_NF/Kitchen/Components/MothFoodComponent.cs diff --git a/Content.Server/Body/Components/StomachComponent.cs b/Content.Server/Body/Components/StomachComponent.cs index d541ca4d7c4..d63210a473f 100644 --- a/Content.Server/Body/Components/StomachComponent.cs +++ b/Content.Server/Body/Components/StomachComponent.cs @@ -69,5 +69,11 @@ public ReagentDelta(ReagentQuantity reagentQuantity) public void Increment(TimeSpan delta) => Lifetime += delta; } + + /// + /// Frontier: If false, this entity can eat anything with FoodComponent.RequiresSpecialDigestion set to false. If true, it can only eat items matching its specialDigestion criteria. + /// + [DataField] + public bool SpecialDigestibleOnly = false; } } diff --git a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs index 214346463a0..7850f9cbe68 100644 --- a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs @@ -429,6 +429,8 @@ private bool IsDigestibleBy(EntityUid food, FoodComponent component, List Date: Fri, 6 Dec 2024 18:23:30 +0000 Subject: [PATCH 16/52] Automatic Changelog (#2488) --- Resources/Changelog/Frontier.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 1ae10fc1833..694af6c9c06 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -5705,3 +5705,11 @@ Entries: message: Fixed a bug with wristwatch mail packages. id: 5557 time: '2024-12-06T18:01:18.0000000+00:00' +- author: whatston3 + changes: + - type: Tweak + message: Moth food involving cloth, cotton, or pyrotton is only edible by moths. + - type: Tweak + message: Moth food recipes can be made in the oven. + id: 5558 + time: '2024-12-06T18:23:03.0000000+00:00' From 2a92cee928394cd4a51a229122d352624a3c784f Mon Sep 17 00:00:00 2001 From: Dmitri Date: Fri, 6 Dec 2024 13:23:50 -0500 Subject: [PATCH 17/52] Added rubber ammo to NFSD TechFab (#2518) * Added rubber ammo to SecurityTechFab Moved nonlethal recipes from dynamic to static for SecurityTechFab inherited by NfsdTechFab * Return and comment shotgun recipes * Moved to NFSD * Update lathe.yml * NFSD Stuff * Update arsenal.yml --------- Co-authored-by: Whatstone Co-authored-by: Dvir Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- .../Entities/Structures/Machines/lathe.yml | 13 +-- Resources/Prototypes/Recipes/Lathes/tools.yml | 11 -- .../_NF/Entities/Objects/Tools/tools.yml | 9 ++ .../Entities/Structures/Machines/lathe.yml | 109 ++++++++++++++++++ .../_NF/Recipes/Lathes/security.yml | 10 ++ Resources/Prototypes/_NF/Research/arsenal.yml | 1 - 6 files changed, 129 insertions(+), 24 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index e36a3a983e0..b0d48161595 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -791,8 +791,8 @@ id: SecurityTechFab parent: BaseLatheLube name: security techfab - categories: [ HideSpawnMenu ] # Frontier description: Prints equipment for use by security crew. + categories: [ HideSpawnMenu ] # Frontier components: - type: Sprite sprite: Structures/Machines/techfab.rsi @@ -845,8 +845,6 @@ - RiotShield - SpeedLoaderMagnum - SpeedLoaderMagnumEmpty - - SpeedLoaderRifleHeavy # Frontier - - SpeedLoaderRifleHeavyEmpty # Frontier - Stunbaton - TargetClown - TargetHuman @@ -855,8 +853,6 @@ - WeaponFlareGunSecurity - WeaponLaserCarbinePractice - Zipties - - ThrusterSecurityMachineCircuitboard # Frontier - - ClothingOuterHardsuitEVAPrisoner # Frontier dynamicRecipes: - BoxBeanbag - BoxShotgunIncendiary @@ -908,13 +904,6 @@ - WeaponLaserCannon - WeaponLaserCarbine - WeaponXrayCannon - - ContrabandAppraisalTool # Frontier - - SpeedLoaderRifleHeavyIncendiary # Frontier - - SpeedLoaderRifleHeavyUranium # Frontier - - MagazineBoxLightRifleRubber # Frontier - - MagazineBoxMagnumRubber # Frontier - - MagazineBoxPistolRubber # Frontier - - MagazineBoxRifleRubber # Frontier - type: MaterialStorage whitelist: tags: diff --git a/Resources/Prototypes/Recipes/Lathes/tools.yml b/Resources/Prototypes/Recipes/Lathes/tools.yml index 32b9e638c4c..d6c7c4c65df 100644 --- a/Resources/Prototypes/Recipes/Lathes/tools.yml +++ b/Resources/Prototypes/Recipes/Lathes/tools.yml @@ -165,17 +165,6 @@ Cloth: 100 Steel: 50 -# Frontier -- type: latheRecipe - parent: BaseToolRecipe - id: UtilityBeltChiefEngineer - result: ClothingBeltChiefEngineer - completetime: 6 - materials: - Silver: 400 - Gold: 100 -# End Frontier - - type: latheRecipe parent: BaseToolRecipe id: HolofanProjector diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/tools.yml index ce4683e7471..769db615e98 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/tools.yml @@ -1,3 +1,12 @@ +- type: latheRecipe + parent: BaseToolRecipe + id: UtilityBeltChiefEngineer + result: ClothingBeltChiefEngineer + completetime: 6 + materials: + Silver: 400 + Gold: 100 + - type: entity name: shipyard RCD parent: RCD diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml index 03c09ec39f2..ded393be509 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml @@ -571,6 +571,115 @@ map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: Machine board: NfsdTechFabCircuitboard + - type: Lathe + idleState: icon + runningState: icon + staticRecipes: + - BoxLethalshot + - BoxShotgunPractice + - BoxShotgunSlug + - ClothingEyesHudNfsd + - CombatKnife + - Flash + - ForensicPad + - Handcuffs + - MagazineBoxLightRifle + - MagazineBoxLightRiflePractice + - MagazineBoxMagnum + - MagazineBoxMagnumPractice + - MagazineBoxPistol + - MagazineBoxPistolPractice + - MagazineBoxRifle + - MagazineBoxRiflePractice + - MagazineLightRifle + - MagazineLightRifleEmpty + - MagazinePistol + - MagazinePistolEmpty + - MagazinePistolSubMachineGun + - MagazinePistolSubMachineGunEmpty + - MagazinePistolSubMachineGunTopMounted + - MagazinePistolSubMachineGunTopMountedEmpty + - MagazineRifle + - MagazineRifleEmpty + - MagazineShotgun + - MagazineShotgunEmpty + - MagazineShotgunSlug + - RiotShield + - SpeedLoaderMagnum + - SpeedLoaderMagnumEmpty + - SpeedLoaderRifleHeavy + - SpeedLoaderRifleHeavyEmpty + - Stunbaton + - TargetClown + - TargetHuman + - TargetSyndicate + - WeaponDisablerPractice +# - WeaponFlareGunSecurity + - WeaponLaserCarbinePractice + - Zipties + - ThrusterNfsdMachineCircuitboard + - SmallThrusterMachineCircuitboard + - GyroscopeNfsdMachineCircuitboard + - SmallGyroscopeNfsdMachineCircuitboard + - ClothingOuterHardsuitEVAPrisoner + - BoxBeanbag + - MagazineBoxLightRifleRubber + - MagazineBoxMagnumRubber + - MagazineBoxPistolRubber + - MagazineBoxRifleRubber + - MagazineShotgunBeanbag + - WeaponDisabler + - ContrabandAppraisalTool + - HoloprojectorNfsd + - ClothingBackpackElectropack + dynamicRecipes: + - BoxShotgunIncendiary + - BoxShotgunUranium + - BoxShellTranquilizer + - ExplosivePayload + - FlashPayload + - GrenadeBlast + - GrenadeEMP + - GrenadeFlash + - MagazineBoxLightRifleIncendiary + - MagazineBoxLightRifleUranium + - MagazineBoxMagnumIncendiary + - MagazineBoxMagnumUranium + - MagazineBoxPistolIncendiary + - MagazineBoxPistolUranium + - MagazineBoxRifleIncendiary + - MagazineBoxRifleUranium + - MagazineGrenadeEmpty + - MagazineLightRifleIncendiary + - MagazineLightRifleUranium + - MagazinePistolIncendiary + - MagazinePistolUranium + - MagazineRifleIncendiary + - MagazineRifleUranium + - MagazineShotgunIncendiary + - PortableRecharger + - PowerCageHigh + - PowerCageMedium + - PowerCageSmall + - ShuttleGunDusterCircuitboard + - ShuttleGunFriendshipCircuitboard + - ShuttleGunPerforatorCircuitboard + - ShuttleGunSvalinnMachineGunCircuitboard + - Signaller + - SignalTrigger + - SpeedLoaderMagnumIncendiary + - SpeedLoaderMagnumUranium + - TelescopicShield + - TimerTrigger + - Truncheon + - VoiceTrigger + - WeaponAdvancedLaser + - WeaponDisablerSMG + - WeaponLaserCannon + - WeaponLaserCarbine + - WeaponXrayCannon + - SpeedLoaderRifleHeavyIncendiary + - SpeedLoaderRifleHeavyUranium - type: entity id: MercenaryTechFab diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/security.yml b/Resources/Prototypes/_NF/Recipes/Lathes/security.yml index 6375216d624..e3d7fc24d4b 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/security.yml @@ -124,3 +124,13 @@ Glass: 5 Plasma: 10 Silver: 5 + +- type: latheRecipe + id: ClothingEyesHudNfsd + parent: ClothingEyesHudSecurity + result: ClothingEyesHudNfsd + +- type: latheRecipe + id: HoloprojectorNfsd + parent: ClothingEyesHudSecurity + result: HoloprojectorNfsdEmpty \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Research/arsenal.yml b/Resources/Prototypes/_NF/Research/arsenal.yml index 287333c35ed..a7ab184407a 100644 --- a/Resources/Prototypes/_NF/Research/arsenal.yml +++ b/Resources/Prototypes/_NF/Research/arsenal.yml @@ -15,7 +15,6 @@ - Handcuffs - ClothingOuterArmorBulletproofNF - ClothingOuterCoatBHTrench - - ContrabandAppraisalTool - PinpointerUniversalNF - ClothingEyesHudBountyHunter - WeaponShotgunKammererNF From 43e025403dcdc5c06281ff74032fa83b562eede8 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Fri, 6 Dec 2024 18:24:17 +0000 Subject: [PATCH 18/52] Automatic Changelog (#2518) --- Resources/Changelog/Frontier.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 694af6c9c06..53a1f0b160d 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -5713,3 +5713,11 @@ Entries: message: Moth food recipes can be made in the oven. id: 5558 time: '2024-12-06T18:23:03.0000000+00:00' +- author: DmitriTheDemon + changes: + - type: Tweak + message: >- + Added less-lethal ammunition to NFSD techfab by default, with additional + NFSD items. + id: 5559 + time: '2024-12-06T18:23:50.0000000+00:00' From 14916da1a6d5de6b28aac2725c96cbe500f904a2 Mon Sep 17 00:00:00 2001 From: Whatstone <166147148+whatston3@users.noreply.github.com> Date: Fri, 6 Dec 2024 13:53:37 -0500 Subject: [PATCH 19/52] EMP: examine UI on items with EMP effects (#2520) * EMP descriptions * Comment cleanup * Fix Frontier comments, EMP label consistency --- Content.Server/Emp/EmpSystem.cs | 49 ++++++++++++++++++- .../_NF/Emp/EmpDescriptionComponent.cs | 27 ++++++++++ Content.Server/_NF/M_Emp/M_EmpSystem.cs | 2 +- Resources/Locale/en-US/_NF/emp/emp.ftl | 7 +++ .../Objects/Misc/subdermal_implants.yml | 2 +- .../Weapons/Guns/Ammunition/explosives.yml | 4 ++ .../Guns/Ammunition/Cartridges/pistol.yml | 4 ++ .../Weapons/Guns/Ammunition/explosives.yml | 4 ++ .../Weapons/Guns/Battery/battery_guns.yml | 4 ++ .../Entities/Structures/Machines/m_emp.yml | 4 ++ 10 files changed, 104 insertions(+), 3 deletions(-) create mode 100644 Content.Server/_NF/Emp/EmpDescriptionComponent.cs create mode 100644 Resources/Locale/en-US/_NF/emp/emp.ftl diff --git a/Content.Server/Emp/EmpSystem.cs b/Content.Server/Emp/EmpSystem.cs index 538a9521561..7cee9fff035 100644 --- a/Content.Server/Emp/EmpSystem.cs +++ b/Content.Server/Emp/EmpSystem.cs @@ -14,6 +14,9 @@ using Robust.Server.GameStates; // Frontier: EMP Blast PVS using Robust.Shared.Configuration; // Frontier: EMP Blast PVS using Robust.Shared; // Frontier: EMP Blast PVS +using Content.Shared.Verbs; // Frontier: examine verb +using Robust.Shared.Utility; // Frontier: examine verb +using Content.Server.Examine; // Frontier: examine verb namespace Content.Server.Emp; @@ -23,6 +26,7 @@ public sealed class EmpSystem : SharedEmpSystem [Dependency] private readonly TransformSystem _transform = default!; [Dependency] private readonly PvsOverrideSystem _pvs = default!; // Frontier: EMP Blast PVS [Dependency] private readonly IConfigurationManager _cfg = default!; // Frontier: EMP Blast PVS + [Dependency] private readonly ExamineSystem _examine = default!; // Frontier: examine verb public const string EmpPulseEffectPrototype = "EffectEmpBlast"; // Frontier: EffectEmpPulse @@ -31,6 +35,8 @@ public override void Initialize() base.Initialize(); SubscribeLocalEvent(OnExamine); SubscribeLocalEvent(HandleEmpTrigger); + SubscribeLocalEvent>(OnEmpTriggerExamine); // Frontier + SubscribeLocalEvent>(OnEmpDescriptorExamine); // Frontier SubscribeLocalEvent(OnRadioSendAttempt); SubscribeLocalEvent(OnRadioReceiveAttempt); @@ -45,7 +51,7 @@ public override void Initialize() /// The range of the EMP pulse. /// The amount of energy consumed by the EMP pulse. /// The duration of the EMP effects. - /// Frontier: a list of the grids that should not be affected by the + /// Frontier: a list of the grids that should not be affected by the pulse. public void EmpPulse(MapCoordinates coordinates, float range, float energyConsumption, float duration, List? immuneGrids = null) { foreach (var uid in _lookup.GetEntitiesInRange(coordinates, range)) @@ -148,6 +154,47 @@ private void OnExamine(EntityUid uid, EmpDisabledComponent component, ExaminedEv args.PushMarkup(Loc.GetString("emp-disabled-comp-on-examine")); } + // Frontier: examine EMP trigger objects + private void OnEmpTriggerExamine(EntityUid uid, EmpOnTriggerComponent component, GetVerbsEvent args) + { + if (!args.CanInteract || !args.CanAccess) + return; + + var msg = GetEmpDescription(component.Range, component.EnergyConsumption, component.DisableDuration); + + _examine.AddDetailedExamineVerb(args, component, msg, + Loc.GetString("emp-examinable-verb-text"), "/Textures/Interface/VerbIcons/smite.svg.192dpi.png", + Loc.GetString("emp-examinable-verb-message")); + } + private void OnEmpDescriptorExamine(EntityUid uid, EmpDescriptionComponent component, GetVerbsEvent args) + { + if (!args.CanInteract || !args.CanAccess) + return; + + var msg = GetEmpDescription(component.Range, component.EnergyConsumption, component.DisableDuration); + + _examine.AddDetailedExamineVerb(args, component, msg, + Loc.GetString("emp-examinable-verb-text"), "/Textures/Interface/VerbIcons/smite.svg.192dpi.png", + Loc.GetString("emp-examinable-verb-message")); + } + + private FormattedMessage GetEmpDescription(float range, float energy, float time) + { + var msg = new FormattedMessage(); + msg.AddMarkupOrThrow(Loc.GetString("emp-examine")); + msg.PushNewline(); + msg.AddMarkupOrThrow(Loc.GetString("emp-range-value", + ("value", range))); + msg.PushNewline(); + msg.AddMarkupOrThrow(Loc.GetString("emp-energy-value", + ("value", energy))); + msg.PushNewline(); + msg.AddMarkupOrThrow(Loc.GetString("emp-time-value", + ("value", time))); + return msg; + } + // End Frontier + private void HandleEmpTrigger(EntityUid uid, EmpOnTriggerComponent comp, TriggerEvent args) { EmpPulse(_transform.GetMapCoordinates(uid), comp.Range, comp.EnergyConsumption, comp.DisableDuration); diff --git a/Content.Server/_NF/Emp/EmpDescriptionComponent.cs b/Content.Server/_NF/Emp/EmpDescriptionComponent.cs new file mode 100644 index 00000000000..0d8a1d8a9d2 --- /dev/null +++ b/Content.Server/_NF/Emp/EmpDescriptionComponent.cs @@ -0,0 +1,27 @@ +namespace Content.Server.Emp; + +/// +/// Generates an EMP description for an entity that won't otherwise get one. +/// +[RegisterComponent] +[Access(typeof(EmpSystem))] +public sealed partial class EmpDescriptionComponent : Component +{ + /// + /// The range of the EMP blast, in meters + /// + [DataField] + public float Range = 1.0f; + + /// + /// How much energy will be consumed per battery in range + /// + [DataField] + public float EnergyConsumption; + + /// + /// How long it disables targets in seconds + /// + [DataField] + public float DisableDuration = 10f; +} diff --git a/Content.Server/_NF/M_Emp/M_EmpSystem.cs b/Content.Server/_NF/M_Emp/M_EmpSystem.cs index 71189a06706..b10f58d3b6b 100644 --- a/Content.Server/_NF/M_Emp/M_EmpSystem.cs +++ b/Content.Server/_NF/M_Emp/M_EmpSystem.cs @@ -288,7 +288,7 @@ private bool SpawnM_Emp(EntityUid uid, M_EmpGeneratorComponent component) Report(uid, component.M_EmpChannel, "m_emp-system-announcement-active", ("timeLeft", component.EngagedTime.TotalSeconds), ("grid", stationName!)); var empRange = 100; - var empEnergyConsumption = 2700000; + var empEnergyConsumption = 2_700_000; var empDisabledDuration = 60; var xform = Transform(uid); diff --git a/Resources/Locale/en-US/_NF/emp/emp.ftl b/Resources/Locale/en-US/_NF/emp/emp.ftl new file mode 100644 index 00000000000..1a166966ae6 --- /dev/null +++ b/Resources/Locale/en-US/_NF/emp/emp.ftl @@ -0,0 +1,7 @@ +emp-examinable-verb-text = EMP +emp-examinable-verb-message = Examine the EMP values. + +emp-examine = It causes an EMP with: +emp-range-value = - [color=yellow]{$value} m[/color] of range. +emp-energy-value = - [color=yellow]{POWERJOULES($value)}[/color] of energy absorption from any battery in range. +emp-time-value = - [color=yellow]{$value} s[/color] of device deactivation. diff --git a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml index 50af662c925..b41dc189da8 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml @@ -167,7 +167,7 @@ parent: BaseSubdermalImplant id: EmpImplant name: EMP implant - description: This implant creates an electromagnetic pulse when activated. + description: This implant creates a 2.75 m, 10 s, 2.7 MJ electromagnetic pulse when activated. # Frontier: add units categories: [ HideSpawnMenu ] components: - type: SubdermalImplant diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml index 1bd10f39298..c93ab9c10a8 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml @@ -139,6 +139,10 @@ - type: SpentAmmoVisuals state: frag suffix: false + - type: EmpDescription # Frontier + range: 5 # Frontier + energyConsumption: 2700000 # Frontier + disableDuration: 10 # Frontier # Cannon Balls diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml index 0d5d65e42a7..1878e52cd33 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml @@ -22,3 +22,7 @@ components: - type: CartridgeAmmo proto: BulletPistolEmp + - type: EmpDescription + range: 0.3 + energyConsumption: 2700000 + disableDuration: 10 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml index 4ccf8468ccf..05db82c75ff 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml @@ -17,6 +17,10 @@ - type: Sprite sprite: _NF/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi state: rpg-emp + - type: EmpDescription + range: 2 + energyConsumption: 2700000 + disableDuration: 30 # Cannon Balls - type: entity diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 74cc2360fbd..a989bc3e524 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -35,6 +35,10 @@ steps: 5 zeroVisible: true - type: Appearance + - type: EmpDescription + range: 2 + energyConsumption: 2700000 + disableDuration: 30 - type: entity id: WeaponLaserTurboNF diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/m_emp.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/m_emp.yml index 19985a7f0bb..cc7923e3d76 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/m_emp.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/m_emp.yml @@ -76,3 +76,7 @@ - type: DeviceLinkSink ports: - On + - type: EmpDescription + range: 100 + energyConsumption: 2700000 + disableDuration: 60 From 26d7939d8af3b663393883b804ccc98bb925c533 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Fri, 6 Dec 2024 18:54:02 +0000 Subject: [PATCH 20/52] Automatic Changelog (#2520) --- Resources/Changelog/Frontier.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 53a1f0b160d..f2410f465f3 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -5721,3 +5721,11 @@ Entries: NFSD items. id: 5559 time: '2024-12-06T18:23:50.0000000+00:00' +- author: whatston3 + changes: + - type: Add + message: >- + Items with EMP effects can now be examined to get their effect's + duration and strength. + id: 5560 + time: '2024-12-06T18:53:38.0000000+00:00' From 36f60e012572c44259dcdbb68a8f73e1de8f2649 Mon Sep 17 00:00:00 2001 From: Southbridge <7013162+southbridge-fur@users.noreply.github.com> Date: Fri, 6 Dec 2024 13:54:15 -0500 Subject: [PATCH 21/52] Fixed disposals issue (#2505) --- Resources/Maps/_NF/Outpost/frontier.yml | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/Resources/Maps/_NF/Outpost/frontier.yml b/Resources/Maps/_NF/Outpost/frontier.yml index a3d549ebd3c..7cf56977535 100644 --- a/Resources/Maps/_NF/Outpost/frontier.yml +++ b/Resources/Maps/_NF/Outpost/frontier.yml @@ -26504,12 +26504,7 @@ entities: - uid: 661 components: - type: Transform - pos: 53.5,19.5 - parent: 2173 - - uid: 662 - components: - - type: Transform - pos: 52.5,19.5 + pos: 50.5,19.5 parent: 2173 - uid: 663 components: @@ -30216,12 +30211,7 @@ entities: - uid: 1233 components: - type: Transform - pos: 52.5,19.5 - parent: 2173 - - uid: 1234 - components: - - type: Transform - pos: 53.5,19.5 + pos: 50.5,19.5 parent: 2173 - uid: 1235 components: @@ -34573,6 +34563,11 @@ entities: - type: Transform pos: 38.5,19.5 parent: 2173 + - uid: 662 + components: + - type: Transform + pos: 53.5,19.5 + parent: 2173 - uid: 664 components: - type: Transform @@ -34586,7 +34581,7 @@ entities: - uid: 671 components: - type: Transform - pos: 50.5,19.5 + pos: 52.5,19.5 parent: 2173 - uid: 672 components: From 31d1aea82ff1e0e92f289d506d1a4e132f9eda50 Mon Sep 17 00:00:00 2001 From: Maxtone <124747282+MagnusCrowe@users.noreply.github.com> Date: Fri, 6 Dec 2024 13:08:24 -0600 Subject: [PATCH 22/52] Adds fuel and real shipyards to Trade Outpost (#2494) Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- Resources/Maps/_NF/POI/trade.yml | 357 ++++++++++++++++++------------- 1 file changed, 210 insertions(+), 147 deletions(-) diff --git a/Resources/Maps/_NF/POI/trade.yml b/Resources/Maps/_NF/POI/trade.yml index f70ae896966..1fab43e1778 100644 --- a/Resources/Maps/_NF/POI/trade.yml +++ b/Resources/Maps/_NF/POI/trade.yml @@ -45,7 +45,7 @@ entities: version: 6 -2,0: ind: -2,0 - tiles: BgAAAAAACAAAAAAACAAAAAAABgAAAAAAAQAAAAACAQAAAAACAQAAAAADAQAAAAACAQAAAAAAAQAAAAAAAQAAAAADAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABgAAAAAAAQAAAAABAQAAAAABBgAAAAAAAQAAAAADAQAAAAADAQAAAAABAQAAAAABAQAAAAACAQAAAAABAQAAAAACBgAAAAAAAQAAAAABAQAAAAACAQAAAAACAQAAAAABBgAAAAAAAQAAAAABAQAAAAADBgAAAAAAAQAAAAADAQAAAAADAQAAAAADAQAAAAADAQAAAAACAQAAAAAAAQAAAAAABgAAAAAAAQAAAAAAAQAAAAADAQAAAAABAQAAAAADBgAAAAAAAQAAAAAAAQAAAAAABgAAAAAAAQAAAAADAQAAAAADAQAAAAADAQAAAAACAQAAAAACAQAAAAACAQAAAAAABgAAAAAAAQAAAAAAAQAAAAACAQAAAAACAQAAAAADBgAAAAAACAAAAAAACAAAAAAABgAAAAAAAQAAAAABAQAAAAADAQAAAAADAQAAAAABAQAAAAABAQAAAAAAAQAAAAABAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAQAAAAAAAQAAAAAAAQAAAAABAQAAAAABAQAAAAABAQAAAAAAAQAAAAABAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAgAAAAAABQAAAAAABQAAAAADBQAAAAACBQAAAAADBQAAAAACAQAAAAAAAQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAgAAAAAABQAAAAACCAAAAAAABQAAAAABAgAAAAAABQAAAAABAQAAAAACAQAAAAABBQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAgAAAAAABQAAAAACCAAAAAAABQAAAAABBQAAAAABBQAAAAABAQAAAAAAAQAAAAACBQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAgAAAAAABQAAAAADCAAAAAAABQAAAAADAgAAAAAABQAAAAAAAQAAAAACAQAAAAABBQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAgAAAAAABQAAAAABBQAAAAABBQAAAAAABQAAAAABBQAAAAAAAQAAAAACAQAAAAABAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABQAAAAAAAgAAAAAAAgAAAAAABgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAgAAAAAABgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABgAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAABAAAAAAABAAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAGAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAA + tiles: BgAAAAAACAAAAAAACAAAAAAABgAAAAAAAQAAAAACAQAAAAACAQAAAAADAQAAAAACAQAAAAAAAQAAAAAAAQAAAAADAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABgAAAAAAAQAAAAABAQAAAAABBgAAAAAAAQAAAAADAQAAAAADAQAAAAABAQAAAAABAQAAAAACAQAAAAABAQAAAAACBgAAAAAAAQAAAAABAQAAAAACAQAAAAACAQAAAAABBgAAAAAAAQAAAAABAQAAAAADBgAAAAAAAQAAAAADAQAAAAADAQAAAAADAQAAAAADAQAAAAACAQAAAAAAAQAAAAAABgAAAAAAAQAAAAAAAQAAAAADAQAAAAABAQAAAAADBgAAAAAAAQAAAAAAAQAAAAAABgAAAAAAAQAAAAADAQAAAAADAQAAAAADAQAAAAACAQAAAAACAQAAAAACAQAAAAAABgAAAAAAAQAAAAAAAQAAAAACAQAAAAACAQAAAAADBgAAAAAACAAAAAAACAAAAAAABgAAAAAAAQAAAAABAQAAAAADAQAAAAADAQAAAAABAQAAAAABAQAAAAAAAQAAAAABAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAQAAAAAAAQAAAAAAAQAAAAABAQAAAAABAQAAAAABAQAAAAAAAQAAAAABAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAgAAAAAABQAAAAAABQAAAAADBQAAAAACBQAAAAADBQAAAAACAQAAAAAAAQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAgAAAAAABQAAAAACCAAAAAAABQAAAAABAgAAAAAABQAAAAABAQAAAAACAQAAAAABBQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAgAAAAAABQAAAAACCAAAAAAABQAAAAABBQAAAAABBQAAAAABAQAAAAAAAQAAAAACBQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAgAAAAAABQAAAAADCAAAAAAABQAAAAADAgAAAAAABQAAAAAAAQAAAAACAQAAAAABBQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAgAAAAAABQAAAAABBQAAAAABBQAAAAAABQAAAAABBQAAAAAAAQAAAAACAQAAAAABAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAACAAAAAAACAAAAAAAAgAAAAAABQAAAAAAAgAAAAAAAgAAAAAABgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAgAAAAAABgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABgAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAABAAAAAAABAAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAGAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAA version: 6 1,0: ind: 1,0 @@ -89,11 +89,11 @@ entities: version: 6 1,-2: ind: 1,-2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAgAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAACBQAAAAACBQAAAAAABQAAAAADBQAAAAACBQAAAAADAgAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAQAAAAABBQAAAAADAgAAAAAAAgAAAAAAAgAAAAAABQAAAAAAAgAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAACBQAAAAADAgAAAAAAAgAAAAAAAgAAAAAABQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAHAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAQAAAAADBQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABQAAAAACAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAABAQAAAAAABQAAAAAABQAAAAACBQAAAAABBQAAAAACBQAAAAADAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAQAAAAADAQAAAAAAAQAAAAABAQAAAAADAQAAAAAAAQAAAAABAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAgAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAACBQAAAAACBQAAAAAABQAAAAADBQAAAAACBQAAAAADAgAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAQAAAAABBQAAAAADAgAAAAAAAgAAAAAAAgAAAAAABQAAAAAAAgAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAACBQAAAAADAgAAAAAAAgAAAAAAAgAAAAAABQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAHAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAQAAAAADBQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABQAAAAACCAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAABAQAAAAAABQAAAAAABQAAAAACBQAAAAABBQAAAAACBQAAAAADCAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAQAAAAADAQAAAAAAAQAAAAABAQAAAAADAQAAAAAAAQAAAAABAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAA version: 6 2,1: ind: 2,1 - tiles: AwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAIAwAAAAAAAwAAAAAAAwAAAAAHAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAMAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAACAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAADAwAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAADAwAAAAAAAwAAAAAGAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAwAAAAAAAwAAAAAIAwAAAAAAAwAAAAALAwAAAAAEAwAAAAAAAwAAAAAAAwAAAAADAwAAAAAAAwAAAAAAAwAAAAAEAwAAAAAKAwAAAAAAAwAAAAABAwAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAADAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAABAwAAAAAAAwAAAAAAAwAAAAAMAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAALAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAIAwAAAAAAAwAAAAAAAwAAAAAHAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAMAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAACAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAADAwAAAAAAAwAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAADAwAAAAAAAwAAAAAGAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAACAAAAAAAAwAAAAAIAwAAAAAAAwAAAAALAwAAAAAEAwAAAAAAAwAAAAAAAwAAAAADAwAAAAAAAwAAAAAAAwAAAAAEAwAAAAAKAwAAAAAAAwAAAAABAwAAAAAAAgAAAAAACAAAAAAAAwAAAAAAAwAAAAAAAwAAAAADAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAABAwAAAAAAAwAAAAAAAwAAAAAMAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAALAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 3,1: ind: 3,1 @@ -105,7 +105,7 @@ entities: version: 6 5,-1: ind: 5,-1 - tiles: AwAAAAAAAwAAAAAAAwAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAEAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAABAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAgAAAAAABAAAAAAABAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAABBQAAAAAABQAAAAABBQAAAAADBQAAAAACAgAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAADAgAAAAAABQAAAAADCAAAAAAABQAAAAACAgAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAACBQAAAAABBQAAAAAACAAAAAAABQAAAAACAgAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAgAAAAAABQAAAAAACAAAAAAABQAAAAADAgAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAACBQAAAAABBQAAAAABBQAAAAACBQAAAAACAgAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAADAQAAAAADAQAAAAACAQAAAAADAQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAADAQAAAAAAAQAAAAACAQAAAAAAAQAAAAACBgAAAAAACAAAAAAACAAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAADAQAAAAADAQAAAAABAQAAAAABBgAAAAAAAQAAAAABAQAAAAADBgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAABAQAAAAACAQAAAAABAQAAAAABBgAAAAAAAQAAAAABAQAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AwAAAAAAAwAAAAAAAwAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAEAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAABAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAgAAAAAABAAAAAAABAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAABBQAAAAAABQAAAAABBQAAAAADBQAAAAACAgAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAADAgAAAAAABQAAAAADCAAAAAAABQAAAAACAgAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAACBQAAAAABBQAAAAAACAAAAAAABQAAAAACAgAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAgAAAAAABQAAAAAACAAAAAAABQAAAAADAgAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAACBQAAAAABBQAAAAABBQAAAAACBQAAAAACAgAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAADAQAAAAADAQAAAAACAQAAAAADAQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAADAQAAAAAAAQAAAAACAQAAAAAAAQAAAAACBgAAAAAACAAAAAAACAAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAADAQAAAAADAQAAAAABAQAAAAABBgAAAAAAAQAAAAABAQAAAAADBgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAABAQAAAAACAQAAAAABAQAAAAABBgAAAAAAAQAAAAABAQAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 3,0: ind: 3,0 @@ -113,7 +113,7 @@ entities: version: 6 4,0: ind: 4,0 - tiles: AQAAAAAABgAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAABgAAAAAAAQAAAAABAQAAAAACAgAAAAAAAgAAAAAAAgAAAAAACAAAAAAACAAAAAAAAwAAAAAFAwAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAQAAAAABAQAAAAABAQAAAAABAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAQAAAAADAQAAAAAAAQAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAHAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAQAAAAAAAQAAAAADAQAAAAACAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABQAAAAAAAQAAAAADAQAAAAABAQAAAAACAgAAAAAAAwAAAAAAAwAAAAAJAwAAAAAAAwAAAAABAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABQAAAAAAAQAAAAABAQAAAAADAQAAAAACAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABQAAAAAAAQAAAAACAQAAAAACAQAAAAADAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAQAAAAADAQAAAAADBgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAABAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAABQAAAAAABQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABgAAAAAABQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAACAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAGAwAAAAAAAwAAAAAAAwAAAAAGAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAFAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAABAwAAAAAAAwAAAAAAAwAAAAABAgAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAJAwAAAAAAAwAAAAAAAwAAAAAIAwAAAAAAAwAAAAADAwAAAAAAAwAAAAAAAwAAAAAFAwAAAAAA + tiles: AQAAAAAABgAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAABgAAAAAAAQAAAAABAQAAAAACAgAAAAAAAgAAAAAAAgAAAAAACAAAAAAACAAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAQAAAAABAQAAAAABAQAAAAABAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAQAAAAADAQAAAAAAAQAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAHAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAQAAAAAAAQAAAAADAQAAAAACAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABQAAAAAAAQAAAAADAQAAAAABAQAAAAACAgAAAAAAAwAAAAAAAwAAAAAJAwAAAAAAAwAAAAABAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABQAAAAAAAQAAAAABAQAAAAADAQAAAAACAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABQAAAAAAAQAAAAACAQAAAAACAQAAAAADAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAQAAAAADAQAAAAADBgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAABAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAABQAAAAAABQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABgAAAAAABQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAACAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAGAwAAAAAAAwAAAAAAAwAAAAAGAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAFAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAABAwAAAAAAAwAAAAAAAwAAAAABAgAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAJAwAAAAAAAwAAAAAAAwAAAAAIAwAAAAAAAwAAAAADAwAAAAAAAwAAAAAAAwAAAAAFAwAAAAAA version: 6 3,-1: ind: 3,-1 @@ -121,7 +121,7 @@ entities: version: 6 4,-1: ind: 4,-1 - tiles: AwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAKAwAAAAAAAgAAAAAAAwAAAAAAAQAAAAACAQAAAAAAAQAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAALAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAwAAAAAAAQAAAAACAQAAAAAAAQAAAAADAgAAAAAAAwAAAAABAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAQAAAAABAQAAAAADAQAAAAACAgAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAwAAAAAAAwAAAAAGAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAQAAAAAAAQAAAAABAQAAAAACCAAAAAAAAgAAAAAAAwAAAAAAAQAAAAADAQAAAAAAAQAAAAACAQAAAAABAQAAAAACAQAAAAACAQAAAAADAQAAAAAAAQAAAAABAQAAAAAAAQAAAAAAAQAAAAABAQAAAAAACAAAAAAAAgAAAAAAAwAAAAAAAQAAAAADAQAAAAAAAQAAAAABAQAAAAACAQAAAAABAQAAAAAAAQAAAAABAQAAAAACAQAAAAACAQAAAAABAQAAAAADAQAAAAADAQAAAAAACAAAAAAAAgAAAAAAAgAAAAAAAQAAAAAAAQAAAAADAQAAAAAAAQAAAAADAQAAAAADAQAAAAAAAQAAAAABAQAAAAAAAQAAAAACAQAAAAADAQAAAAABAQAAAAAAAQAAAAADAgAAAAAAAwAAAAAAAwAAAAAAAgAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAQAAAAACAQAAAAABAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABQAAAAAAAQAAAAAAAQAAAAADAQAAAAACAwAAAAAGAgAAAAAAAwAAAAAAAwAAAAAHAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAABQAAAAAAAQAAAAABAQAAAAACAQAAAAACAwAAAAAJAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAEAwAAAAAAAgAAAAAABQAAAAAAAQAAAAADAQAAAAADAQAAAAACAwAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAKAwAAAAAAAwAAAAAAAgAAAAAACAAAAAAAAQAAAAACAQAAAAACAQAAAAABAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAACAAAAAAAAQAAAAABAQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAwAAAAAAAwAAAAADAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAQAAAAABAQAAAAACAQAAAAAABgAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAABgAAAAAAAQAAAAAAAQAAAAABAQAAAAAABgAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAABgAAAAAAAQAAAAADAQAAAAAB + tiles: AwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAKAwAAAAAAAgAAAAAAAwAAAAAAAQAAAAACAQAAAAAAAQAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAALAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAwAAAAAAAQAAAAACAQAAAAAAAQAAAAADAgAAAAAAAwAAAAABAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAQAAAAABAQAAAAADAQAAAAACAgAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAwAAAAAAAwAAAAAGAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAQAAAAAAAQAAAAABAQAAAAACCAAAAAAAAgAAAAAAAwAAAAAAAQAAAAADAQAAAAAAAQAAAAACAQAAAAABAQAAAAACAQAAAAACAQAAAAADAQAAAAAAAQAAAAABAQAAAAAAAQAAAAAAAQAAAAABAQAAAAAACAAAAAAAAgAAAAAAAwAAAAAAAQAAAAADAQAAAAAAAQAAAAABAQAAAAACAQAAAAABAQAAAAAAAQAAAAABAQAAAAACAQAAAAACAQAAAAABAQAAAAADAQAAAAADAQAAAAAACAAAAAAAAgAAAAAAAgAAAAAAAQAAAAAAAQAAAAADAQAAAAAAAQAAAAADAQAAAAADAQAAAAAAAQAAAAABAQAAAAAAAQAAAAACAQAAAAADAQAAAAABAQAAAAAAAQAAAAADAgAAAAAAAgAAAAAACAAAAAAAAgAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAQAAAAACAQAAAAABAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABQAAAAAAAQAAAAAAAQAAAAADAQAAAAACAwAAAAAGAgAAAAAAAwAAAAAAAwAAAAAHAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAABQAAAAAAAQAAAAABAQAAAAACAQAAAAACAwAAAAAJAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAEAwAAAAAAAgAAAAAABQAAAAAAAQAAAAADAQAAAAADAQAAAAACAwAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAKAwAAAAAAAwAAAAAAAgAAAAAACAAAAAAAAQAAAAACAQAAAAACAQAAAAABAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAACAAAAAAAAQAAAAABAQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAwAAAAAAAwAAAAADAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAQAAAAABAQAAAAACAQAAAAAABgAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAABgAAAAAAAQAAAAAAAQAAAAABAQAAAAAABgAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAABgAAAAAAAQAAAAADAQAAAAAB version: 6 2,0: ind: 2,0 @@ -3156,6 +3156,12 @@ entities: - type: Transform pos: 27.5,0.5 parent: 1 + - type: Door + secondsUntilStateChange: -168.75337 + state: Opening + - type: DeviceLinkSource + lastSignals: + DoorStatus: True - proto: AirlockGlass entities: - uid: 88 @@ -10804,6 +10810,31 @@ entities: - type: Transform pos: 25.5,-4.5 parent: 1 +- proto: ComputerShipyard + entities: + - uid: 175 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 52.5,18.5 + parent: 1 + - uid: 489 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 77.5,-4.5 + parent: 1 + - uid: 534 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -20.5,-1.5 + parent: 1 + - uid: 551 + components: + - type: Transform + pos: 10.5,-14.5 + parent: 1 - proto: ComputerTabletopCargoOrders entities: - uid: 238 @@ -23561,12 +23592,6 @@ entities: rot: -1.5707963267948966 rad pos: 48.5,20.5 parent: 1 - - uid: 102 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 48.5,19.5 - parent: 1 - uid: 295 components: - type: Transform @@ -23641,11 +23666,6 @@ entities: - type: Transform pos: 75.5,9.5 parent: 1 - - uid: 534 - components: - - type: Transform - pos: 78.5,-8.5 - parent: 1 - uid: 535 components: - type: Transform @@ -23901,6 +23921,18 @@ entities: rot: 1.5707963267948966 rad pos: 64.5,-6.5 parent: 1 + - uid: 1227 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 22.5,-18.5 + parent: 1 + - uid: 1228 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 22.5,-17.5 + parent: 1 - uid: 1382 components: - type: Transform @@ -24377,6 +24409,18 @@ entities: rot: -1.5707963267948966 rad pos: 55.5,6.5 parent: 1 + - uid: 6425 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -24.5,10.5 + parent: 1 + - uid: 6426 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -23.5,10.5 + parent: 1 - proto: RailingCornerSmall entities: - uid: 101 @@ -24385,6 +24429,24 @@ entities: rot: 1.5707963267948966 rad pos: 48.5,22.5 parent: 1 + - uid: 108 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 78.5,-8.5 + parent: 1 + - uid: 109 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 22.5,-16.5 + parent: 1 + - uid: 110 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-19.5 + parent: 1 - uid: 300 components: - type: Transform @@ -24562,6 +24624,11 @@ entities: rot: 3.141592653589793 rad pos: 64.5,-3.5 parent: 1 + - uid: 1230 + components: + - type: Transform + pos: 48.5,19.5 + parent: 1 - uid: 1510 components: - type: Transform @@ -24729,6 +24796,17 @@ entities: - type: Transform pos: 55.5,3.5 parent: 1 + - uid: 6427 + components: + - type: Transform + pos: -22.5,10.5 + parent: 1 + - uid: 6428 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -25.5,10.5 + parent: 1 - proto: RandomPosterAny entities: - uid: 3349 @@ -24944,16 +25022,6 @@ entities: - type: Transform pos: 5.5,-18.5 parent: 1 - - uid: 6299 - components: - - type: Transform - pos: 23.5,-17.5 - parent: 1 - - uid: 6300 - components: - - type: Transform - pos: 23.5,-18.5 - parent: 1 - uid: 6301 components: - type: Transform @@ -25726,31 +25794,6 @@ entities: - type: Transform pos: 24.684456,2.3707576 parent: 1 -- proto: SellOnlyMothershipComputer - entities: - - uid: 1225 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 52.5,18.5 - parent: 1 - - uid: 1226 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 77.5,-4.5 - parent: 1 - - uid: 1227 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -20.5,-1.5 - parent: 1 - - uid: 1228 - components: - - type: Transform - pos: 10.5,-14.5 - parent: 1 - proto: ShuttersNormalOpen entities: - uid: 1207 @@ -26428,6 +26471,13 @@ entities: - Pressed: Toggle 6075: - Pressed: Toggle +- proto: SignArmory + entities: + - uid: 592 + components: + - type: Transform + pos: 50.5,-1.5 + parent: 1 - proto: SignAtmos entities: - uid: 1938 @@ -26762,18 +26812,6 @@ entities: - type: Transform pos: 30.5,3.5 parent: 1 -- proto: SignSec - entities: - - uid: 1231 - components: - - type: Transform - pos: 54.5,-2.5 - parent: 1 - - uid: 1254 - components: - - type: Transform - pos: 51.5,-0.5 - parent: 1 - proto: SignSecurearea entities: - uid: 1901 @@ -26821,12 +26859,17 @@ entities: - type: Transform pos: -19.5,11.5 parent: 1 -- proto: SignSecureMedRed +- proto: SignSecurity entities: - - uid: 1230 + - uid: 552 components: - type: Transform - pos: 50.5,-1.5 + pos: 54.5,-2.5 + parent: 1 + - uid: 593 + components: + - type: Transform + pos: 51.5,-0.5 parent: 1 - proto: SignShock entities: @@ -27848,6 +27891,28 @@ entities: - type: Transform pos: 59.5,-13.5 parent: 1 +- proto: VendingMachineCigs + entities: + - uid: 1225 + components: + - type: Transform + pos: -23.5,11.5 + parent: 1 + - uid: 1254 + components: + - type: Transform + pos: 47.5,21.5 + parent: 1 + - uid: 3244 + components: + - type: Transform + pos: 80.5,-9.5 + parent: 1 + - uid: 6424 + components: + - type: Transform + pos: 23.5,-18.5 + parent: 1 - proto: VendingMachineClothing entities: - uid: 6158 @@ -27890,6 +27955,36 @@ entities: - type: Transform pos: 34.5,3.5 parent: 1 +- proto: VendingMachineFuelVend + entities: + - uid: 1226 + components: + - type: Transform + pos: -24.5,11.5 + parent: 1 + missingComponents: + - Anchorable + - uid: 1231 + components: + - type: Transform + pos: 47.5,20.5 + parent: 1 + missingComponents: + - Anchorable + - uid: 2666 + components: + - type: Transform + pos: 79.5,-9.5 + parent: 1 + missingComponents: + - Anchorable + - uid: 6423 + components: + - type: Transform + pos: 23.5,-17.5 + parent: 1 + missingComponents: + - Anchorable - proto: VendingMachineHydrobe entities: - uid: 3263 @@ -28209,6 +28304,12 @@ entities: - type: Transform pos: 50.5,23.5 parent: 1 + - uid: 102 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 47.5,19.5 + parent: 1 - uid: 105 components: - type: Transform @@ -28424,11 +28525,6 @@ entities: - type: Transform pos: 46.5,22.5 parent: 1 - - uid: 175 - components: - - type: Transform - pos: 46.5,18.5 - parent: 1 - uid: 176 components: - type: Transform @@ -28829,16 +28925,6 @@ entities: - type: Transform pos: 71.5,2.5 parent: 1 - - uid: 551 - components: - - type: Transform - pos: 70.5,2.5 - parent: 1 - - uid: 552 - components: - - type: Transform - pos: 69.5,2.5 - parent: 1 - uid: 553 components: - type: Transform @@ -31777,15 +31863,11 @@ entities: - type: Transform pos: -25.5,11.5 parent: 1 - - uid: 2539 - components: - - type: Transform - pos: -24.5,11.5 - parent: 1 - uid: 2540 components: - type: Transform - pos: -23.5,11.5 + rot: -1.5707963267948966 rad + pos: 69.5,2.5 parent: 1 - uid: 2541 components: @@ -32296,12 +32378,8 @@ entities: - uid: 2665 components: - type: Transform - pos: 23.5,-18.5 - parent: 1 - - uid: 2666 - components: - - type: Transform - pos: 23.5,-17.5 + rot: -1.5707963267948966 rad + pos: 70.5,2.5 parent: 1 - uid: 2667 components: @@ -32756,6 +32834,12 @@ entities: - type: Transform pos: -14.5,5.5 parent: 1 + - uid: 3247 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 78.5,-9.5 + parent: 1 - uid: 3264 components: - type: Transform @@ -32989,6 +33073,18 @@ entities: - type: Transform pos: 3.5,-9.5 parent: 1 + - uid: 3573 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -23.5,12.5 + parent: 1 + - uid: 3574 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -24.5,12.5 + parent: 1 - uid: 3723 components: - type: Transform @@ -33331,6 +33427,18 @@ entities: rot: 3.141592653589793 rad pos: 65.5,-19.5 parent: 1 + - uid: 6299 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 24.5,-18.5 + parent: 1 + - uid: 6300 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 24.5,-17.5 + parent: 1 - uid: 6317 components: - type: Transform @@ -33603,21 +33711,6 @@ entities: - type: Transform pos: 82.5,11.5 parent: 1 - - uid: 108 - components: - - type: Transform - pos: 47.5,21.5 - parent: 1 - - uid: 109 - components: - - type: Transform - pos: 47.5,20.5 - parent: 1 - - uid: 110 - components: - - type: Transform - pos: 47.5,19.5 - parent: 1 - uid: 146 components: - type: Transform @@ -34363,11 +34456,6 @@ entities: - type: Transform pos: 44.5,21.5 parent: 1 - - uid: 489 - components: - - type: Transform - pos: 44.5,20.5 - parent: 1 - uid: 490 components: - type: Transform @@ -34443,16 +34531,6 @@ entities: - type: Transform pos: 43.5,15.5 parent: 1 - - uid: 592 - components: - - type: Transform - pos: 70.5,1.5 - parent: 1 - - uid: 593 - components: - - type: Transform - pos: 69.5,1.5 - parent: 1 - uid: 596 components: - type: Transform @@ -34571,17 +34649,17 @@ entities: - uid: 706 components: - type: Transform - pos: 80.5,-9.5 + pos: 46.5,18.5 parent: 1 - uid: 707 components: - type: Transform - pos: 79.5,-9.5 + pos: 69.5,1.5 parent: 1 - uid: 708 components: - type: Transform - pos: 78.5,-9.5 + pos: 70.5,1.5 parent: 1 - uid: 977 components: @@ -35628,6 +35706,11 @@ entities: - type: Transform pos: 69.5,3.5 parent: 1 + - uid: 2539 + components: + - type: Transform + pos: 44.5,20.5 + parent: 1 - uid: 2603 components: - type: Transform @@ -37873,11 +37956,6 @@ entities: - type: Transform pos: -23.5,15.5 parent: 1 - - uid: 3244 - components: - - type: Transform - pos: -23.5,12.5 - parent: 1 - uid: 3245 components: - type: Transform @@ -37888,11 +37966,6 @@ entities: - type: Transform pos: -23.5,14.5 parent: 1 - - uid: 3247 - components: - - type: Transform - pos: -24.5,12.5 - parent: 1 - uid: 3248 components: - type: Transform @@ -38903,16 +38976,6 @@ entities: - type: Transform pos: 31.5,-9.5 parent: 1 - - uid: 3573 - components: - - type: Transform - pos: 24.5,-17.5 - parent: 1 - - uid: 3574 - components: - - type: Transform - pos: 24.5,-18.5 - parent: 1 - uid: 3575 components: - type: Transform From 6cafb022c082171b887f80372a11d2ed9a93d299 Mon Sep 17 00:00:00 2001 From: Dmitri Date: Fri, 6 Dec 2024 18:59:32 -0500 Subject: [PATCH 23/52] Added Empess cryosleep (#2476) * Added Empess cryosleep Added cryosleep chamber to empress in place of morgue slab * Update empress.yml --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir --- Resources/Maps/_NF/Shuttles/Nfsd/empress.yml | 30 ++++++-------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml b/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml index ec49623df92..0e55998c6c1 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml @@ -150,7 +150,6 @@ entities: color: '#5C7D4DFF' id: BoxGreyscale decals: - 78: -20,-3 79: -20,-4 80: -20,-5 - node: @@ -11545,6 +11544,13 @@ entities: - type: Transform pos: -1.5,6.5 parent: 1 +- proto: MachineCryoSleepPod + entities: + - uid: 545 + components: + - type: Transform + pos: -18.5,-2.5 + parent: 1 - proto: MachineElectrolysisUnit entities: - uid: 824 @@ -11629,12 +11635,6 @@ entities: parent: 1 - proto: Morgue entities: - - uid: 545 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -18.5,-2.5 - parent: 1 - uid: 640 components: - type: Transform @@ -11676,20 +11676,6 @@ entities: - type: Transform pos: 20.5,4.5 parent: 1 - - type: ContainerContainer - containers: - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - blueprint: !type:Container - showEnts: False - occludes: True - ents: [] - proto: NitrogenCanister entities: - uid: 744 @@ -16870,7 +16856,7 @@ entities: - type: Transform pos: -10.5,1.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 2563 components: From e7a688e4e1039a82a6ab4b5cb126676032e39a10 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Fri, 6 Dec 2024 23:59:57 +0000 Subject: [PATCH 24/52] Automatic Changelog (#2476) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index f2410f465f3..a9249b2ec15 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -5729,3 +5729,9 @@ Entries: duration and strength. id: 5560 time: '2024-12-06T18:53:38.0000000+00:00' +- author: DmitriTheDemon + changes: + - type: Tweak + message: Added cryosleep pod to Empress + id: 5561 + time: '2024-12-06T23:59:32.0000000+00:00' From fcf38e65c18d51513c9cc47924c9200294aacf1e Mon Sep 17 00:00:00 2001 From: dustylens <54123313+dustylens@users.noreply.github.com> Date: Sat, 7 Dec 2024 10:39:41 +0000 Subject: [PATCH 25/52] Adds fryer to piecrust (#2495) Adds fryer to piecrust in addition to a button to feather the thrusters --- Resources/Maps/_NF/Shuttles/piecrust.yml | 101 +++++++++++------------ 1 file changed, 46 insertions(+), 55 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/piecrust.yml b/Resources/Maps/_NF/Shuttles/piecrust.yml index 748b3894263..991c1366cb1 100644 --- a/Resources/Maps/_NF/Shuttles/piecrust.yml +++ b/Resources/Maps/_NF/Shuttles/piecrust.yml @@ -609,6 +609,14 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,8.5 parent: 8756 +- proto: ButtonFrameCautionSecurity + entities: + - uid: 357 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,5.5 + parent: 8756 - proto: ButtonFrameGrey entities: - uid: 333 @@ -913,29 +921,11 @@ entities: parent: 8756 - proto: ClosetChefFilled entities: - - uid: 151 + - uid: 355 components: - type: Transform - pos: -1.5,2.5 - parent: 8756 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14923 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 + pos: -1.7735012,2.4642923 + parent: 8756 - proto: ClosetWallO2N2FilledRandom entities: - uid: 35 @@ -966,19 +956,6 @@ entities: - type: Transform pos: -1.5,1.5 parent: 8756 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - proto: CrateFreezer entities: - uid: 321 @@ -1779,6 +1756,13 @@ entities: - type: Transform pos: 0.5,4.5 parent: 8756 +- proto: KitchenDeepFryer + entities: + - uid: 151 + components: + - type: Transform + pos: 2.5,4.5 + parent: 8756 - proto: KitchenElectricRange entities: - uid: 262 @@ -1848,10 +1832,10 @@ entities: parent: 8756 - proto: LockerFreezerBase entities: - - uid: 261 + - uid: 356 components: - type: Transform - pos: 2.5,4.5 + pos: -1.2630844,2.4642923 parent: 8756 - proto: LockerWallMaterialsBasic10Filled entities: @@ -1923,10 +1907,6 @@ entities: - type: Transform pos: 6.5,6.5 parent: 8756 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PosterContrabandEAT entities: - uid: 265 @@ -2066,20 +2046,13 @@ entities: - type: Transform pos: 4.5,1.5 parent: 8756 - - type: ContainerContainer - containers: - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - blueprint: !type:Container - showEnts: False - occludes: True - ents: [] +- proto: ShelfKitchen + entities: + - uid: 261 + components: + - type: Transform + pos: -1.5,5.5 + parent: 8756 - proto: ShuttersNormalOpen entities: - uid: 229 @@ -2194,6 +2167,24 @@ entities: - Pressed: Toggle 350: - Pressed: Toggle + - uid: 358 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,5.5 + parent: 8756 + - type: DeviceLinkSource + linkedPorts: + 243: + - Pressed: Toggle + 7: + - Pressed: Toggle + 17: + - Pressed: Toggle + 147: + - Pressed: Toggle + 118: + - Pressed: Toggle - proto: SignalButtonDirectional entities: - uid: 239 @@ -2803,7 +2794,7 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,9.5 parent: 8756 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 305 components: From 7fbbcb8437e3144f204255a2c5876f011e455114 Mon Sep 17 00:00:00 2001 From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Date: Sun, 8 Dec 2024 23:37:38 +0300 Subject: [PATCH 26/52] Nerf scrapbot on asteroids (#2535) * Scrapbot spawn animation * less speed for laser bot * Update Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/salvage.yml Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Update Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/salvage.yml Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * jittering --------- Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> --- .../_NF/Entities/Effects/mobspawn.yml | 53 ++++++++++++++- .../Markers/Spawners/Random/salvage.yml | 10 +-- .../Mobs/NPCs/mob_hostile_rogue_ai.yml | 3 + .../_NF/Effects/mobspawn.rsi/meta.json | 62 +++++++++++++++++- .../_NF/Effects/mobspawn.rsi/scrapbot.png | Bin 0 -> 5449 bytes .../Effects/mobspawn.rsi/scrapbot_laser.png | Bin 0 -> 5430 bytes .../Effects/mobspawn.rsi/scrapbot_threads.png | Bin 0 -> 5234 bytes .../mobspawn.rsi/scrapbot_thrusters.png | Bin 0 -> 5250 bytes 8 files changed, 120 insertions(+), 8 deletions(-) create mode 100644 Resources/Textures/_NF/Effects/mobspawn.rsi/scrapbot.png create mode 100644 Resources/Textures/_NF/Effects/mobspawn.rsi/scrapbot_laser.png create mode 100644 Resources/Textures/_NF/Effects/mobspawn.rsi/scrapbot_threads.png create mode 100644 Resources/Textures/_NF/Effects/mobspawn.rsi/scrapbot_thrusters.png diff --git a/Resources/Prototypes/_NF/Entities/Effects/mobspawn.yml b/Resources/Prototypes/_NF/Entities/Effects/mobspawn.yml index 932434e5b8a..4c74c78f44a 100644 --- a/Resources/Prototypes/_NF/Entities/Effects/mobspawn.yml +++ b/Resources/Prototypes/_NF/Entities/Effects/mobspawn.yml @@ -193,7 +193,7 @@ state: golem - type: SpawnOnDespawn prototype: MobCoalGolem - + - type: entity id: MobSpawnGoldGolem parent: MobSpawnCrabNFQuartz @@ -269,4 +269,53 @@ sprite: /Textures/_NF/Effects/mobspawn.rsi state: golem - type: SpawnOnDespawn - prototype: MobUraniumGolem \ No newline at end of file + prototype: MobUraniumGolem + +# Scrapbots +- type: entity + id: MobSpawnScrapbot + parent: MobSpawnCrabNFQuartz + name: mobspawner scrapbot + components: + - type: Jittering + - type: Sprite + sprite: /Textures/_NF/Effects/mobspawn.rsi + state: scrapbot + - type: SpawnOnDespawn + prototype: MobRogueSiliconScrapAsteroid + +- type: entity + id: MobSpawnScrapbotThreads + parent: MobSpawnCrabNFQuartz + name: mobspawner scrapbot + components: + - type: Jittering + - type: Sprite + sprite: /Textures/_NF/Effects/mobspawn.rsi + state: scrapbot_threads + - type: SpawnOnDespawn + prototype: MobRogueSiliconScrapThreadsAsteroid + +- type: entity + id: MobSpawnScrapbotThrusters + parent: MobSpawnCrabNFQuartz + name: mobspawner scrapbot + components: + - type: Jittering + - type: Sprite + sprite: /Textures/_NF/Effects/mobspawn.rsi + state: scrapbot_thrusters + - type: SpawnOnDespawn + prototype: MobRogueSiliconScrapThrustersAsteroid + +- type: entity + id: MobSpawnScrapbotLaser + parent: MobSpawnCrabNFQuartz + name: mobspawner scrapbot + components: + - type: Jittering + - type: Sprite + sprite: /Textures/_NF/Effects/mobspawn.rsi + state: scrapbot_laser + - type: SpawnOnDespawn + prototype: MobRogueSiliconScrapThrustersRangedAsteroid diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/salvage.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/salvage.yml index da716e6abc3..bbc9a81a0d7 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/salvage.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/salvage.yml @@ -274,12 +274,12 @@ color: "#990000" - type: RandomSpawner rarePrototypes: - - MobRogueSiliconScrapThrustersRangedAsteroid - rareChance: 0.1 + - MobSpawnScrapbotLaser + rareChance: 0.05 prototypes: - - MobRogueSiliconScrapAsteroid - - MobRogueSiliconScrapThreadsAsteroid - - MobRogueSiliconScrapThrustersAsteroid + - MobSpawnScrapbot + - MobSpawnScrapbotThreads + - MobSpawnScrapbotThrusters chance: 0.45 offset: 0.2 diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_rogue_ai.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_rogue_ai.yml index 913781fe434..4e6a99b2001 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_rogue_ai.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_rogue_ai.yml @@ -1282,6 +1282,9 @@ id: MobRogueSiliconScrapThrustersRangedAsteroid categories: [ HideSpawnMenu ] components: + - type: MovementSpeedModifier + baseWalkSpeed : 2.6 + baseSprintSpeed : 2.6 - type: Loadout prototypes: - MobRogueSiliconLootT1 diff --git a/Resources/Textures/_NF/Effects/mobspawn.rsi/meta.json b/Resources/Textures/_NF/Effects/mobspawn.rsi/meta.json index 9fbf9debce5..cfbb7d273cb 100644 --- a/Resources/Textures/_NF/Effects/mobspawn.rsi/meta.json +++ b/Resources/Textures/_NF/Effects/mobspawn.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by belay5 (discord)", + "copyright": "Made by belay5 (discord), scrap bot sprite made by erhardsteinhauer (discord/github) using robot sprites taken from goonstation https://github.com/goonstation/goonstation/blob/master/icons/mob/robots.dmi", "size": { "x": 32, "y": 32 @@ -95,6 +95,66 @@ 0.3 ] ] + }, + { + + "name": "scrapbot", + "directions": 1, + "delays": [ + [ + 0.6, + 0.3, + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] + }, + { + + "name": "scrapbot_laser", + "directions": 1, + "delays": [ + [ + 0.6, + 0.3, + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] + }, + { + + "name": "scrapbot_threads", + "directions": 1, + "delays": [ + [ + 0.6, + 0.3, + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] + }, + { + + "name": "scrapbot_thrusters", + "directions": 1, + "delays": [ + [ + 0.6, + 0.3, + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] } ] } diff --git a/Resources/Textures/_NF/Effects/mobspawn.rsi/scrapbot.png b/Resources/Textures/_NF/Effects/mobspawn.rsi/scrapbot.png new file mode 100644 index 0000000000000000000000000000000000000000..3c4e78e61eb3f3bb3b04a412781c896a9970713a GIT binary patch literal 5449 zcmV-P6}IY$P)uJ@VVD_U zC<6{NG_fI~0ue<-1QkJoA_k0xBC#Thg@9ne9*`iQ#9$OrQF$}6R&?d%y_c8YA7_1Q zpS|}zXYYO1x&V;8{kgn!SPFnNo`4_X z6{c}T{8k*B#$jdxfFg<9uYy1K45IaYvHg`_dOZM)Sy63ve6hvv1)yUy0P^?0*fb9UASvow z`@mQCp^4`uNg&9uGcn1|&Nk+9SjOUl{-OWr@Hh0;_l(8q{wNRKos+;6rV8ldy0Owz z(}jF`W(JeRp&R{qi2rfmU!TJ;gp(Kmm5I1s5m_f-n#TRsj}B0%?E` zvOzxB2#P=n*a3EfYETOrKoe*ICqM@{4K9Go;5xVgZi5G41dM~{UdP z6d+Yd3o?MrAqM0Kc|iV92owdyL5UC#5<>aVCa44|hpM4Es0sQWIt5*Tu0n&*J!lk~ zf_{hI!w5`*sjxDv4V%CW*ah~3!{C*0BD@;TgA3v9a1~q+AA{TB3-ERLHar49hi4Ih z5D^-ph8Q6X#0?2VqLBoIkE}zAkxHZUgRb+f=natP#6>iMMoK->`~sRLq)(kHo*Vn{;LcG6+e zdD1=7D>9j^O?D{Qg|tCDK{ym)H7&wDr6*;uGTJg8GHjVb znL{!cWyUB7MT6o-VNo_w8Yq`2<5Ub)hw4L3rj}5@qxMs0WMyP6Wy582WNT#4$d1qu znl{acmP#w5ouJ*Jy_Zv#bCKi7ZIf$}8dZdVy&)LYdbX%I9R8VMQ|8r>Q*nyQ)sn)#Z|n)kKvS`4iutvy=3T65Yu+7a4Yv^%sX zb>ww?bn(=Yu(!=O6^iuTp>)p_Y^{w=i^lS773}6Fm1Fpe-gF!>I zp{*g$u-szvGhed; zvo5pW&GpS$<~8QGEXWp~7V9lKEnZq0SaK{6Sl+dwSOr*ZvFf(^Xl-N7w{EeXveC4O zv)N}e%%C!Y7^RFWwrE>d+x51mZQt2h+X?JW*!^a2WS?Sx)P8cQ&Qi|OhNWW;>JChY zI)@QQx?`Nj^#uJBl~d&PK+RZLOLos~K(b5>qmrMN0})tOkySZ3_WICNY@+|jrX%s^&6b2i>5 zeqa0y%Z;^%^_=a@u3%4b9605ii3Ep)@`TAmhs0fpQ%O!ql}XcFH*PieWwLj2ZSq`7 zV9Mc?h17`D)-+sNT-qs~3@?S(ldh7UlRlVXkWrK|vf6I-?$tAVKYn8-l({mqQ$Q8{ zO!WzMg`0(=S&msXS#Pt$vrpzo=kRj+a`kh!z=6$;cwT88(J6|n-WB%w`m$h~4 zpmp)YIh_3ETV2tjiAU!0h1dxU-n=E9e!)6|Z;4?!H=SSy{V>ut&IOq{_dlbFb#!9eY1iCsp6Bajj|H zr?hX|zPbJE{X++w546-O*Ot`2Kgd0Jx6Z4syTu9enWavU5N9)I?I-1m1* z_?_rJ$vD~agVqoG+9++s?NEDe`%Fht$4F;X=in*dQ{7$mU2Q)a|9JSc+Uc4zvS-T9 z63!N$T{xF_ZuWe}`RNOZ7sk3{yB}PPym+f8xTpV;-=!;;JuhGEb?H5K#o@~7t9DmU zU1MD9xNd#Dz0azz?I)|B+WM{g+Xrk0I&awC=o(x)cy`EX=)z6+o0o6-+`4{y+3mqQ z%kSJBju{@g%f35#FZJHb`&swrA8dGtepviS>QUumrN{L@>;2q1Vm)$Z)P1z?N$8UY zW2~{~zhwUMVZ87u`Dx{Z>O|9|`Q+&->FRy-Sjp7DHsy69KwU-!MxeeuI@&cF4| zM9z%A#H)hgxPQzoxo`=GQpM!XLkc+q6p4~WEQy}!HoX@) z_GMZX`hrp^8?XmQIbOE5&_4Ia><-(PZMVBKP`v#n&Fs!RGoNRk-#pJg&okerkW^Ah zC6!cCNhOt3Qny`Fv;%Ipd&oY!-9GT-Qb}M2_bT_0>kLUNMMde#uX=m0SpTcl(%r&O z8B?x8Dl9A%g@uLUz_SM^`L=}OnqpC0Q!D`9uc;9)zWAaz;xviPOYRl%Tt5+hqoPpt z_Fi$sX%fqyUOVpjqt<}PNEQ|r3V?aJxwM@+#m$>H*|cdBE9+JwHo%dZRHjaYD_!9K z#{>!<@8cd5rKkl0;OxBz`?5ZscsafR z#LEx%q*3WyKco=iL-#iiR>=WyuCpE#CG$QNiC# zuHfs_r)hcUGps)FS%K4PP0&-Z@XPM0V287cO6PitmfI6%HZ>_c_w4g{yjzJAs|Z7i2A6f4>KxRZX8aHzn>SC|-W&#Xj;a z78(^r+s0D^BKbDI4X@Wr{hO(}^P|^*0AzYH0r+*vCGzH`VE^<6>&y;(ib8t2nrv-W z1()x=48WO=4gjn^I6xn?^ik%K!Z$Lu5=ej#3}^C{PqeOVvDV31%iNN;a1y}i8zgF))*>seG-h`p$YtJkhECp#MehZV%1Mcg+Z zFTe9*A4SXUtct{?r65;P~R%r#G2fwa%1NPGGtaIqkk7*n*wdIdox%Lvia|-ivbLsy6 zdz!xZg8qIFDJe3?jvpV8-ed8wWXTc{2n1+uZjQSa#LKUAuBYK}eWF+ZX1(<|=l`SL zf=|((KWYH%b~|mf@f+Vvva+D4^$B*R?9z@~Ly>+bpblH*3o;LWEC@_p5K{(p=OeSj zSp`7aq+mkqrY41^-)~Uc=?}I8`txI&jC*0`3%oY-HP-g8MX~z0di5&({T>yJ3SMV+ zAYYL2Sk(Q^EiFu*+!D*>b?4vg@o}czuM28OOG6|a%UVlBlF6emTAE?>S%2m$*7{VWQHgwIJH3OyumMvXM zeM1A+u3aOrG@xa|rzjl$orebx!MPQX_2j@FP`tB|cbZ>ZtWGnV&F0(6M+h( z*(ZcRmSrK!vT(cIuoMygi#%_*mm5ibQb{G1R8mPLl~htmCH4QRgoo-OMUGbWy5@Lf z>dx0Ao5c4G0xJ0E-@76s`e=DrZ(R)z$B6 zyqsChhBJ-g>(K;p{``3WI@|Z$w!&ES=%NAJ+bzBLQC~^M?2rHV@aGFLutw_W&zB@g z5_PpOGv|5DH0yS&FF*8JA25QX#iiSa@Cp40m#wG}A04WW88#+!ZdhTP_<>gsuzUAz zyais^iT3KQY()h}oF=jB%V#r2p^U$&w` zTLbWB^?!jk0m#lNAm3uqj)j8|OE6-3DId)rzjf$(acGSC>kFa z#-CpzDxLcB0TwQ_h}6^xG%5-&U%gDx8=E!jNnLIb=W^8t`rOKOnkN(xvG7M-A7HdU ze!TL-TDZ_6!u(&pRL>_5oaN{@>AaPGAC=Da>~L0b>F0SYK9!~gd@#SG-5(V``T~ue zV6)k7`Qzt?{Q04qhFkvl&rGU6zEM%Abgl=W;cz{NKim~}0PYk&GAm(zc1{5RpFD7u z?{?H`37$Gs#q@)%0Gcf^l0Q;26txKouTH@M_|=b5{rPQbjRAR$B$=zG<|faT541jaeY!XlY1%#wDFaj*tLl#rD^Y)bB!A<+d{$pCACbRcemSyo zYq?M&{K1lCS*$KEAMoUx&V9o5N!8l-)#c?vmSruCF6#q~_Q#Kfzu@7AN92c(>%|AP z7c`ikol_w4Ef!vV`$yXMX#A0SKrqVsfZO4ZkCnfzyb+hn#YB?{ug}N6ni?jWOw`ra zlQ(Z3Yu2p6<#Or9hg)4x0FTEbxm+%`Y}q1;9$UcqvtQ5?=-{Dr2Stx9V9S;*A|8I! z01WZRzj8zK=XZB^)7{-YqCY+?yWJj_M}IiJ)ndWra?#q>rXBNmJhZg7a`4~>+5k-t zex$cX+r<>f3c-Hy%HKvR=~EE~t~X!lDEhwDXVW@c1AAnkBgY2${`7^Btz zqy6z?;dfr_qjt`5Cf<`p!#|suK5ZJ8x^6AUmt|x5;UC**d_rS|j&{EkOW{Kd0WjJh zKNkMY9v_X0LZhNEKX(SrE&Iqeo7K^B1b^Zrt0DZ3cE1$nceMMZz5Dh_M~@zrNMMjR zVgSN(><4Q0V>X*fNtvx3J9+XXKC4;-BK`5wPSqdp^@<^L@?(|T?Uu}DGk^bE!vKE1 z#WI8sX#8V;^6SC}G(Hi9tVa)PRNZNR{BZp2oC1-ZQy_-p+iW&rv_C)0AMRM>tJxo{ z%2rfFEdW3)Txc=05biX8Txg^MsH@#zcp>P`*X5=B?Nq+SGF%}HFiPD`{J7o;-zk-? zs1OnV1WCl&)%&6F@2JA(6FqZ00000NkvXXu0mjf?RT)M literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Effects/mobspawn.rsi/scrapbot_laser.png b/Resources/Textures/_NF/Effects/mobspawn.rsi/scrapbot_laser.png new file mode 100644 index 0000000000000000000000000000000000000000..d4ef8b1fc6d003a23c3161e8de8954a78d2588a8 GIT binary patch literal 5430 zcmV-670K#}P)uJ@VVD_U zC<6{NG_fI~0ue<-1QkJoA_k0xBC#Thg@9ne9*`iQ#9$OrQF$}6R&?d%y_c8YA7_1Q zpS|}zXYYO1x&V;8{kgn!SPFnNo`4_X z6{c}T{8k*B#$jdxfFg<9uYy1K45IaYvHg`_dOZM)Sy63ve6hvv1)yUy0P^?0*fb9UASvow z`@mQCp^4`uNg&9uGcn1|&Nk+9SjOUl{-OWr@Hh0;_l(8q{wNRKos+;6rV8ldy0Owz z(}jF`W(JeRp&R{qi2rfmU!TJ;gp(Kmm5I1s5m_f-n#TRsj}B0%?E` zvOzxB2#P=n*a3EfYETOrKoe*ICqM@{4K9Go;5xVgZi5G41dM~{UdP z6d+Yd3o?MrAqM0Kc|iV92owdyL5UC#5<>aVCa44|hpM4Es0sQWIt5*Tu0n&*J!lk~ zf_{hI!w5`*sjxDv4V%CW*ah~3!{C*0BD@;TgA3v9a1~q+AA{TB3-ERLHar49hi4Ih z5D^-ph8Q6X#0?2VqLBoIkE}zAkxHZUgRb+f=natP#6>iMMoK->`~sRLq)(kHo*Vn{;LcG6+e zdD1=7D>9j^O?D{Qg|tCDK{ym)H7&wDr6*;uGTJg8GHjVb znL{!cWyUB7MT6o-VNo_w8Yq`2<5Ub)hw4L3rj}5@qxMs0WMyP6Wy582WNT#4$d1qu znl{acmP#w5ouJ*Jy_Zv#bCKi7ZIf$}8dZdVy&)LYdbX%I9R8VMQ|8r>Q*nyQ)sn)#Z|n)kKvS`4iutvy=3T65Yu+7a4Yv^%sX zb>ww?bn(=Yu(!=O6^iuTp>)p_Y^{w=i^lS773}6Fm1Fpe-gF!>I zp{*g$u-szvGhed; zvo5pW&GpS$<~8QGEXWp~7V9lKEnZq0SaK{6Sl+dwSOr*ZvFf(^Xl-N7w{EeXveC4O zv)N}e%%C!Y7^RFWwrE>d+x51mZQt2h+X?JW*!^a2WS?Sx)P8cQ&Qi|OhNWW;>JChY zI)@QQx?`Nj^#uJBl~d&PK+RZLOLos~K(b5>qmrMN0})tOkySZ3_WICNY@+|jrX%s^&6b2i>5 zeqa0y%Z;^%^_=a@u3%4b9605ii3Ep)@`TAmhs0fpQ%O!ql}XcFH*PieWwLj2ZSq`7 zV9Mc?h17`D)-+sNT-qs~3@?S(ldh7UlRlVXkWrK|vf6I-?$tAVKYn8-l({mqQ$Q8{ zO!WzMg`0(=S&msXS#Pt$vrpzo=kRj+a`kh!z=6$;cwT88(J6|n-WB%w`m$h~4 zpmp)YIh_3ETV2tjiAU!0h1dxU-n=E9e!)6|Z;4?!H=SSy{V>ut&IOq{_dlbFb#!9eY1iCsp6Bajj|H zr?hX|zPbJE{X++w546-O*Ot`2Kgd0Jx6Z4syTu9enWavU5N9)I?I-1m1* z_?_rJ$vD~agVqoG+9++s?NEDe`%Fht$4F;X=in*dQ{7$mU2Q)a|9JSc+Uc4zvS-T9 z63!N$T{xF_ZuWe}`RNOZ7sk3{yB}PPym+f8xTpV;-=!;;JuhGEb?H5K#o@~7t9DmU zU1MD9xNd#Dz0azz?I)|B+WM{g+Xrk0I&awC=o(x)cy`EX=)z6+o0o6-+`4{y+3mqQ z%kSJBju{@g%f35#FZJHb`&swrA8dGtepviS>QUumrN{L@>;2q1Vm)$Z)P1z?N$8UY zW2~{~zhwUMVZ87u`Dx{Z>O|9|`Q+&->FRy-Sjp7DHsy69KwU-!MxeeuI@&cF4| zM9z%AEKd-e#s{E2zx}=tr9~OVn zF1xS6lB-*C)C(ZwXzs4)sb|2oUJ!+ga)~i6x!fiAgDNJ6{3zrMv1lv_B3$51x8XwN z=-WQ(4_aEg*s|xAg0?_iq`&6=c)QQtmTkA&UCQ0PZ?c))xAW#RZ|2RsnR(v_;uN^t0ky{y znZK})M;zS}M1Kd4l;1dWHvy~cfgsi`vE9(&7mQ`0X*R7z7^ZDJ|22Lx(bMv z@4J@5I>-7!g%B-2`(I|>FMp5oXZNsZ=@v@t_L%Z-8A+ycqz}k4X}#8&PN=ETz|FU< z=4-c`hMAvYae>PMxV4rLOGUz8e(P$sI!amRSWo^6+o+j!bt+Fj@f3=p@cLtkWSREF zlpp@KuoKdMz5YWYvYenp%UpA?<>&LRX9w~HS&!G>UxUk{#m}0Z5Oo(6E&u$*K61=v zPN}LMM$-a<`PN!1ilR{UR#MFQ;ah+Q?yR{JfR_rtCu?>Bwxd0iq}y?+DibDX(bkw& z(>cBqfR@%)04y%pM;|owvAjkKT*$~uU=(~Hq#KZyN@6s8X28diu0;GdWRrys>5m&EX<>JMQ0E`36@yrJe7xXrXhJQz|%IFrw>^mfyM< z_=k4BWo{OyR2Ap$(eY>0&WIa7Yz0`(g9~_lN+Q!{OH_T5$VT%Eq%27xIXRi+4@FVp#t&NoiXtRM z5t4Pyr&7~tfo)kIKA#Vt&qsH6H{IRc_?41LjU2N%TC~pZ?bU{$K-~CYyP&G7D*b!s4}!}b50{D|fO6C3`@<*v23zE!z<&K$1( z_#<_ne@=gY4G9S{Cr+LWiC<%`Ve#U{!sGE!Utb?}D~OiA&as|j2dYMk1t9J1g?PWy zF2SY7oWNOUX@%n}aZo91^lH_B~@4e=t;Z$vi)y_xv?%HOAW)uRA$;SakS`uO9Ihb##! zTe5_zW5?*~>cX?cqi4dUsvP)J4b%6-w=2Q)aOemq+SSOh<`)!b%gpKN={J;*5F+H` zbUFte6G9-%vXEt2IGs*df(U$q&%55s4TEpUkRd~c3>h+H$dIA`SB-kA?pN?^HCAcf zjLewxW07(3)#)$vANSq+K&;Ze*_d(RM`cYMAjzKr0LsdCLg?KQYl+H38#wXV2>?!f zc7n=78{*BpnfQZcwOR!r%F1>Me@5b30RhgyFpkW)@kiYP{Dlv|f(I7_T0mTtnO09( z*-o98nN}ZnX1w^Z=z{Qiy#Sm)yXS@##)1bIgoHO*vEqk)B^j|lzWw^=3lZ8PW9ZM9 zBuNsLhhSRfQ@Ux^>C|3+#A<)Q5Rw)x-7<)e{~^45zFON+cD7jr_`h3Q#gWu=9B!V#+Y=_U&as}Yj#9q=bry@7QuGQR$ZtJc8x}tN z28|tHwOW7j$Itfr^ZgeMKl$T7P1gMJr&N`7j`aW>J5a@eid|7xz*zBvvl8HEWX=cR zNa{J-wjRVY{Hf?iB1mt@bsnKfh6{c^R2g7d2mepovD? z4U9EEI4k(a_^oGarR6JEi-%QM*KkIUaL0#d$T6D(1uaIxk7$2DJpJ)EEq|~ifWX5w z_>Z8%zb?P^Y;D*?BibJjPk;Py{G#uQ0GK$Xj^Y*f(AfNUX05rM_U0}+XZ@4*<}OTE ze|BB|{_WcUaQ-h2rh^i1y|#Qf5_i_^YF&&eHNxx&NGA`2PN01oMYd z*t^1FLAa**{qbkaESvl#SIy6nl9IxtNs|D$bmU&t7!COinm@kj;vkE5 zLBa3^ke8PyOePblsi^?8x3^=pTG_dCCuwPEtUdkze*DJEKvqO%XOeR!Sg{S8M(CI%O z2m|p`Q&U+8Je-|PU0og7{_wcl9nk||Ecg-a4~VBf{(3rc#Nd#vdQ7z(cUDt&Nvoep!U$f5r*@q65u85cc%+gz)R@BQN}5eqLUlsIIOK z;kTZxm5v>#(ubhe<5yQ#OIsbK`n+K{=CCaw-v0Q3@_N0v-EOI^t&N#8XX^Z-q9UDd zHk(OHOJincCM_*3%)9@7L|-30Jw0*dgEkKs$gi%hmbPu%CRJBgOQ02eB!xeu{L8@t z5XGw=6@ZvNU5FC9UCf<3R}>Z&3X26%Vz&$IS}4o15DEf2!eT)LJBnk$&&$gbMMXs- zFE4LMen#f}QSI<(+*s$uSo`D0ns3OEAwz}? g88T$Z(EqUh1MH2fz*-FvSO5S307*qoM6N<$f*(tv*Z=?k literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Effects/mobspawn.rsi/scrapbot_threads.png b/Resources/Textures/_NF/Effects/mobspawn.rsi/scrapbot_threads.png new file mode 100644 index 0000000000000000000000000000000000000000..e194cdeaf8bf65db4121d3d5a7a59294b8c54534 GIT binary patch literal 5234 zcmV-&6pibNP)uJ@VVD_U zC<6{NG_fI~0ue<-1QkJoA_k0xBC#Thg@9ne9*`iQ#9$OrQF$}6R&?d%y_c8YA7_1Q zpS|}zXYYO1x&V;8{kgn!SPFnNo`4_X z6{c}T{8k*B#$jdxfFg<9uYy1K45IaYvHg`_dOZM)Sy63ve6hvv1)yUy0P^?0*fb9UASvow z`@mQCp^4`uNg&9uGcn1|&Nk+9SjOUl{-OWr@Hh0;_l(8q{wNRKos+;6rV8ldy0Owz z(}jF`W(JeRp&R{qi2rfmU!TJ;gp(Kmm5I1s5m_f-n#TRsj}B0%?E` zvOzxB2#P=n*a3EfYETOrKoe*ICqM@{4K9Go;5xVgZi5G41dM~{UdP z6d+Yd3o?MrAqM0Kc|iV92owdyL5UC#5<>aVCa44|hpM4Es0sQWIt5*Tu0n&*J!lk~ zf_{hI!w5`*sjxDv4V%CW*ah~3!{C*0BD@;TgA3v9a1~q+AA{TB3-ERLHar49hi4Ih z5D^-ph8Q6X#0?2VqLBoIkE}zAkxHZUgRb+f=natP#6>iMMoK->`~sRLq)(kHo*Vn{;LcG6+e zdD1=7D>9j^O?D{Qg|tCDK{ym)H7&wDr6*;uGTJg8GHjVb znL{!cWyUB7MT6o-VNo_w8Yq`2<5Ub)hw4L3rj}5@qxMs0WMyP6Wy582WNT#4$d1qu znl{acmP#w5ouJ*Jy_Zv#bCKi7ZIf$}8dZdVy&)LYdbX%I9R8VMQ|8r>Q*nyQ)sn)#Z|n)kKvS`4iutvy=3T65Yu+7a4Yv^%sX zb>ww?bn(=Yu(!=O6^iuTp>)p_Y^{w=i^lS773}6Fm1Fpe-gF!>I zp{*g$u-szvGhed; zvo5pW&GpS$<~8QGEXWp~7V9lKEnZq0SaK{6Sl+dwSOr*ZvFf(^Xl-N7w{EeXveC4O zv)N}e%%C!Y7^RFWwrE>d+x51mZQt2h+X?JW*!^a2WS?Sx)P8cQ&Qi|OhNWW;>JChY zI)@QQx?`Nj^#uJBl~d&PK+RZLOLos~K(b5>qmrMN0})tOkySZ3_WICNY@+|jrX%s^&6b2i>5 zeqa0y%Z;^%^_=a@u3%4b9605ii3Ep)@`TAmhs0fpQ%O!ql}XcFH*PieWwLj2ZSq`7 zV9Mc?h17`D)-+sNT-qs~3@?S(ldh7UlRlVXkWrK|vf6I-?$tAVKYn8-l({mqQ$Q8{ zO!WzMg`0(=S&msXS#Pt$vrpzo=kRj+a`kh!z=6$;cwT88(J6|n-WB%w`m$h~4 zpmp)YIh_3ETV2tjiAU!0h1dxU-n=E9e!)6|Z;4?!H=SSy{V>ut&IOq{_dlbFb#!9eY1iCsp6Bajj|H zr?hX|zPbJE{X++w546-O*Ot`2Kgd0Jx6Z4syTu9enWavU5N9)I?I-1m1* z_?_rJ$vD~agVqoG+9++s?NEDe`%Fht$4F;X=in*dQ{7$mU2Q)a|9JSc+Uc4zvS-T9 z63!N$T{xF_ZuWe}`RNOZ7sk3{yB}PPym+f8xTpV;-=!;;JuhGEb?H5K#o@~7t9DmU zU1MD9xNd#Dz0azz?I)|B+WM{g+Xrk0I&awC=o(x)cy`EX=)z6+o0o6-+`4{y+3mqQ z%kSJBju{@g%f35#FZJHb`&swrA8dGtepviS>QUumrN{L@>;2q1Vm)$Z)P1z?N$8UY zW2~{~zhwUMVZ87u`Dx{Z>O|9|`Q+&->FRy-Sjp7DHsy69KwU-!MxeeuI@&cF4| zM9z%AKPC0&{-s3C0A zXdLIFA|zv1YLMEJXhCBwtaK=q8zdG;8O#1bb2VvFX=$KHQwenuqiOW+eLkn|=8qKl$GvyYd+&Si>+k!%pErOs-)n_o%S z3qLENT!mCoQ6VZSDn#oOtyF$piKE3K94!t3@ODd!cC;S1Owica$i|M1i0yEsC5OdJ;PMc3 z{Vkia2PS#gH7ov+cYD4abLNSa?-S|)OGvhn-<$g*rIKWeUo zA0ah|-aA2RhQ~)9W6{kwlarG};iY}Zau%0|;N+K60JsCi^w@f!A6(-%V&5>ygU=YN z0HgfiSRVDRh8cxml)vil77n%ih4Z~{ux9-p>YPqf`8OnzsZ!}}O7hiS>*OWy`Bd;% z3v2oE%o%#_{upZj0#@LR+7irEJp8H~YuW2+qTbbjt=gV6^Z0RvEl)g&-|uJFFUBUyZbYaDI7LIexz%@5?!+^P{(bez?PT2LQjT{Em{9S=f(WrLMq9Kv7t{{2UmpP00JJg*J(E=VB<)5LD}f~VKtwknt(QbHd{)5wf5=G*f6gxG!p|=N za4R>kcnMGd0Y%{#k37QY=qQ7Og8(d8uz<0#G5zVc2GsKdR`u1h$s;*FbR=~DM)`ef zfxoKfTkkEQTT$>FNRGdvYemZVQ7gcD9s)k?(jiBc%Gj*MubV6m`E$xBU+a4T-aPPfQ3S1tVML-Kf)41ceyNiP61_#N%rv9I4lozr}NT;qVnJ%8r%$kPPQDcnKWQIIaws&PQgi zs|kR-1;M1)$B!!<|I>E0pMG}_U_L*t$+&GxxADT#7uY(r6~!80czBqpDW3{P1=kfg zkuS*jEb8|sdU{y6uqU3&o6esY3vjl#%M^a|!Eaf!UM>7o@MBiM^5x5gWx&EM&)>q1 z0jK``?YCE|V4Qj;K%KWaw?U%Z3cGh33qjL~-`aABjhh|=NC`jYZ0P3AnB2odq;@pxu@ zCxk$jWg*M5@OV714x#;ppEuj$MuwkJMj2(4QAQbMlu)&f$hqPtGucE7Ik zitaj*a%QUdW^_Re3=9BpzW0rJD~#3mua0<~Z<)o9x+EF5KmOmdpD#pYi!{-nFG-Rl zI@)1r(UZDq*5gqZKg`-6Fo&cy>-Wsy6Z#RZs;L$4A9lwLOURt7NwbN!KG({D0|)Sz z`Jowo>8`4#mLslQvH$ZYXnSwJ>CuTS%ORG^!wHTShwyCjNUA>{G3>3xY<^Wut-c4~ zW%qx8mjNg&Dx=h5(T{1B5Km>qwJ0CWAHQ?wP8u59)8UI0jc)Krz>C6 zs#O-D@qhiamyhoJh7Z45#4C$#rQX%RURM*}JzBz=(|LM@Pv`gbc14B9-k{M8<>lo+ z_~TcG{Q04qh9CU#ALpw6_-;j^-qip=XPcL{_x2mEfNRAM&x*z`EGh%wqdULh+r902 zf`<<`aoam50d!kpIDf8gC~6m^?M}f7bg6Hn`twhzH7_I6J*fKPwI*t`8@Sf|@T?Gu z@%wtaq^g=)@sI-bJty@9x4m2cvO(`)H;PryigCEIyWfAo$lg)uNrO!uk2j@1vbh`DJzejC56PlK^xNDol(8 zQo`5be_OR3TeV#P?0)kt0qTfX>z?8%cug@YK=a49wj5%|fRie=0jfX#;>Dx7KfVst zJ1?9dAyFPM*Pq|oa!8LXV#d}Btfub|NQ7TlR3_rBgqZsSu9ZK2I$xWIiC5ZxDKW|q zlOcZ66)=54#q0IX8ck?x124Y#qU6}+&`%QWY6WP~jKh)GNL1smxZ5hCg>>5gV~BR_ z?3sXMl&?vP`Hk?C`VC0niIG6RLH(p;SD>`>t7>X#Xxuhynk^gaq8@A7`I;%KV5Js| zVg6imK$;A#h|RYGVKa}39J?O)XF sVNIXx(lpnCMuJ@VVD_U zC<6{NG_fI~0ue<-1QkJoA_k0xBC#Thg@9ne9*`iQ#9$OrQF$}6R&?d%y_c8YA7_1Q zpS|}zXYYO1x&V;8{kgn!SPFnNo`4_X z6{c}T{8k*B#$jdxfFg<9uYy1K45IaYvHg`_dOZM)Sy63ve6hvv1)yUy0P^?0*fb9UASvow z`@mQCp^4`uNg&9uGcn1|&Nk+9SjOUl{-OWr@Hh0;_l(8q{wNRKos+;6rV8ldy0Owz z(}jF`W(JeRp&R{qi2rfmU!TJ;gp(Kmm5I1s5m_f-n#TRsj}B0%?E` zvOzxB2#P=n*a3EfYETOrKoe*ICqM@{4K9Go;5xVgZi5G41dM~{UdP z6d+Yd3o?MrAqM0Kc|iV92owdyL5UC#5<>aVCa44|hpM4Es0sQWIt5*Tu0n&*J!lk~ zf_{hI!w5`*sjxDv4V%CW*ah~3!{C*0BD@;TgA3v9a1~q+AA{TB3-ERLHar49hi4Ih z5D^-ph8Q6X#0?2VqLBoIkE}zAkxHZUgRb+f=natP#6>iMMoK->`~sRLq)(kHo*Vn{;LcG6+e zdD1=7D>9j^O?D{Qg|tCDK{ym)H7&wDr6*;uGTJg8GHjVb znL{!cWyUB7MT6o-VNo_w8Yq`2<5Ub)hw4L3rj}5@qxMs0WMyP6Wy582WNT#4$d1qu znl{acmP#w5ouJ*Jy_Zv#bCKi7ZIf$}8dZdVy&)LYdbX%I9R8VMQ|8r>Q*nyQ)sn)#Z|n)kKvS`4iutvy=3T65Yu+7a4Yv^%sX zb>ww?bn(=Yu(!=O6^iuTp>)p_Y^{w=i^lS773}6Fm1Fpe-gF!>I zp{*g$u-szvGhed; zvo5pW&GpS$<~8QGEXWp~7V9lKEnZq0SaK{6Sl+dwSOr*ZvFf(^Xl-N7w{EeXveC4O zv)N}e%%C!Y7^RFWwrE>d+x51mZQt2h+X?JW*!^a2WS?Sx)P8cQ&Qi|OhNWW;>JChY zI)@QQx?`Nj^#uJBl~d&PK+RZLOLos~K(b5>qmrMN0})tOkySZ3_WICNY@+|jrX%s^&6b2i>5 zeqa0y%Z;^%^_=a@u3%4b9605ii3Ep)@`TAmhs0fpQ%O!ql}XcFH*PieWwLj2ZSq`7 zV9Mc?h17`D)-+sNT-qs~3@?S(ldh7UlRlVXkWrK|vf6I-?$tAVKYn8-l({mqQ$Q8{ zO!WzMg`0(=S&msXS#Pt$vrpzo=kRj+a`kh!z=6$;cwT88(J6|n-WB%w`m$h~4 zpmp)YIh_3ETV2tjiAU!0h1dxU-n=E9e!)6|Z;4?!H=SSy{V>ut&IOq{_dlbFb#!9eY1iCsp6Bajj|H zr?hX|zPbJE{X++w546-O*Ot`2Kgd0Jx6Z4syTu9enWavU5N9)I?I-1m1* z_?_rJ$vD~agVqoG+9++s?NEDe`%Fht$4F;X=in*dQ{7$mU2Q)a|9JSc+Uc4zvS-T9 z63!N$T{xF_ZuWe}`RNOZ7sk3{yB}PPym+f8xTpV;-=!;;JuhGEb?H5K#o@~7t9DmU zU1MD9xNd#Dz0azz?I)|B+WM{g+Xrk0I&awC=o(x)cy`EX=)z6+o0o6-+`4{y+3mqQ z%kSJBju{@g%f35#FZJHb`&swrA8dGtepviS>QUumrN{L@>;2q1Vm)$Z)P1z?N$8UY zW2~{~zhwUMVZ87u`Dx{Z>O|9|`Q+&->FRy-Sjp7DHsy69KwU-!MxeeuI@&cF4| zM9z%A5h+H$dDmJQ!Xje0hh})>NlIs7Jl+-Nni%oM%Sq8j7lp-MCr<}e*2Kv_S;R;e+xfp zQn?ydVPT;tEG!g9o;^az4P`{M_2c2UC<@hY z9}>qLCb90REi;}!VG9VY$-=@y0k9-Dm-e$~xpnInRaI4NXxxC<4#(seaLbW*SnzYyCDE-eYvz2wSpfU19xCsGsxpF#a02a z@&o;8R64eeDuh`1%l>ZR{kp$!`TRjvuHHk1-L5Nt)?_l3FMU8>wi>nCy20a7!Qam= z=eu*~Xno*wtUmBrfpcn0&{NUy*WOXiUPm>Rj%^gJv&GFkeOlqUXP?LG^|HGxnY`?S zy7D7G7Iwno*X|q1$a0bft@Y(%D=K22zXth=tfdGKvR#T|_3BjsQd3ju@9)>1eydMC-)B{~u8l6KxS@Db_a7_2V-@gM z^?d7td9)}Bt^@J$7d9_U7(ZeKSTBPQ*qxcoyu}jkOTY+uOAb~)DKp?=tzyJdS0|WvA8r^PI6c%DDDx#;imxVbw0NAY{-Vrh1e60M- zR|hFtXCvQYi50E!Z{1S6pg_X-5krvM?bi0YZwRh;N!+}7lRzLqT3Q+ajUj15b)lmJ z`$uZwj~tRmt9bZ(9o1R^=)rG1u^rp$Jyh8B=SMXTnA`eiuJ>-mcS&JMZZ3U4{lw`n zzhr30LsF8=$y2Ao(t9i(R;^kk{C+=Y&YX$46~xM~bZn!k-W@L%fcbAdM(4lOTkt9R z^CzqTo6SZ$?fl+1kL+wHYI~ghN&B_q*5R7o=U0cV@)eo;j|=>BmqwKV-TBDubyNe8 zmKunQefqS*=|62(q$Z{8d>C9tNn6n9e- zy}iBoOZ{3Ve2PN-A3fZE6fUiY>?gu|K(Wq7PB*`}Se<4zo6S?oM+g!2ak*TheiK3< z%d(JVS-4y-C`AN6q34bDa>L*oGGxe*Awz}?88T$(|5b4h)rS>2TGi{CGm)t~UyqE7 zZ@&FX`||ULexcWOXBsmh{FtnXBP0!H0D#)scOm@g&|9MM#CA@8aT0)&U!0`z#P&op zXA*z33JMAYAZlyh6~h@xXaxj0Bew};CX63<3m7hZ09HJ*BG>{Fszvk9P+R-1##=Q1 zOv0Io;_DHD=ufc0N&+Z zs6l&mw|0Fw#~dcH|Ep)I|9HRdy%SlMhgm8QI~3Oy3)e=Mr26v_J?;|p=C55}uB`!h zv-aP>n*ii2T28*jq8$rXLNt{T)l2zE{`g(Hc2QMT#b=G5AzDZJ7{i}m zA}SsF@&T4DvxtdgC?CdeWF1z_CvCfj+mPLi2jM()kDsah zpq4GOh#>zrTitwm-$fd}Pv@=lyQp+*W3Qu{YroE8<=Hf?!bkEu&NoMdPrN{*1_}xa zZu{dG5Bu|nZyIj<<3Bg4{`eL}q0+GpfTnsk^&jt#xdNt(ADWdQKWEW$06x9%B0ugu zp(S|oXf=0#*ao245<~gpg`tQcD7ZQWJJ77|M)c>mt2Hkp({fey#Rr>ctYKif`Jq{1 zxR2j)zFAtkzFa(^KxJ#2mf-FW+sLAzQJcz{qaG?>(3A6?>L;#rW8RwiUw*3#&*J|NNl_{s2>KJ?JI{NQoD_@MTJ zM)GqOEf@I~3$MKWGwpjM{&+ngm|%UtRQThg-30~kcs!ER>15~5oucT`rF35Wl74>&52V{EdUPo}ckUFi@FP~h zD1ZFRH#L8LUtb@6eSPElX@iPo2W2D72qF3!wFZ z_0ULuu#mH|vT!<`WMyS(X%o$FQ52ruS~({F>8+Jv1F>i|ZZBvm{PD5yyXJLscc!{< zEVyl;A>sUv^UYFIy<22uWsTxD)w{KLzt>T%jTh+H$dDmJhW>~3AJ7pIAu$A*$p8QV07*qo IM6N<$f(t-bp#T5? literal 0 HcmV?d00001 From 65337551397f146619ae2220eee76069cd5b734f Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sun, 8 Dec 2024 20:38:09 +0000 Subject: [PATCH 27/52] Automatic Changelog (#2535) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index a9249b2ec15..4ecaab97bbe 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -5735,3 +5735,9 @@ Entries: message: Added cryosleep pod to Empress id: 5561 time: '2024-12-06T23:59:32.0000000+00:00' +- author: erhardsteinhauer + changes: + - type: Tweak + message: Slightly nerfed asteroid scrapbots. + id: 5562 + time: '2024-12-08T20:37:38.0000000+00:00' From f9ae04f88162bb62cebb4c8dac32bf641b866dcc Mon Sep 17 00:00:00 2001 From: Qulibly <52052459+Qulibly@users.noreply.github.com> Date: Sun, 8 Dec 2024 23:35:30 +0100 Subject: [PATCH 28/52] NFSD Outpost Criminal Records Fix (#2440) * NFSD Outpost Criminal Records Fix * Fix comment issues in StationRecordsSystem.cs * Fix spacing in services.yml * Better sector-wide records, working crime db * SectorServiceSystem: teardown service entity * return shuttle records, bank services * Frontier comments * Minimize one changed block --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Whatstone Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> --- .../Systems/CriminalRecordsConsoleSystem.cs | 29 +++++++++---- .../Systems/CriminalRecordsHackerSystem.cs | 10 ++++- .../Systems/CriminalRecordsSystem.cs | 11 ++++- .../Systems/StationRecordsSystem.cs | 32 +++++++++++++- .../_NF/SectorServices/SectorServiceSystem.cs | 42 ++++++++++++------- .../StationSectorServiceHostComponent.cs | 3 ++ .../SpecialSectorRecordComponent.cs | 24 +++++++++++ .../_NF/Roles/Jobs/Pirates/pirate.yml | 2 + .../_NF/Roles/Jobs/Pirates/pirate_captain.yml | 2 + .../Roles/Jobs/Pirates/pirate_first_mate.yml | 2 + .../_NF/SectorServices/services.yml | 6 +++ 11 files changed, 134 insertions(+), 29 deletions(-) create mode 100644 Content.Server/_NF/StationRecords/SpecialSectorRecordComponent.cs diff --git a/Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs b/Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs index ca1d45e6449..9dc99e0d792 100644 --- a/Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs +++ b/Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs @@ -13,6 +13,7 @@ using System.Diagnostics.CodeAnalysis; using Content.Shared.IdentityManagement; using Content.Shared.Security.Components; +using Content.Server._NF.SectorServices; // Frontier namespace Content.Server.CriminalRecords.Systems; @@ -26,8 +27,9 @@ public sealed class CriminalRecordsConsoleSystem : SharedCriminalRecordsConsoleS [Dependency] private readonly PopupSystem _popup = default!; [Dependency] private readonly RadioSystem _radio = default!; [Dependency] private readonly StationRecordsSystem _records = default!; - [Dependency] private readonly StationSystem _station = default!; + // [Dependency] private readonly StationSystem _station = default!; // Frontier [Dependency] private readonly UserInterfaceSystem _ui = default!; + [Dependency] private readonly SectorServiceSystem _sectorService = default!; // Frontier public override void Initialize() { @@ -185,7 +187,7 @@ private void OnDeleteHistory(Entity ent, ref Cr private void UpdateUserInterface(Entity ent) { var (uid, console) = ent; - var owningStation = _station.GetOwningStation(uid); + var owningStation = _sectorService.GetServiceEntity(); // Frontier: _station.GetOwningStation < _sectorService.GetServiceEntity if (!TryComp(owningStation, out var stationRecords)) { @@ -193,13 +195,13 @@ private void UpdateUserInterface(Entity ent) return; } - var listing = _records.BuildListing((owningStation.Value, stationRecords), console.Filter); + var listing = _records.BuildListing((owningStation, stationRecords), console.Filter); // Frontier: owningStation.Value ent, EntityUi if (ent.Comp.ActiveKey is not { } id) return false; + // Frontier: sector-wide records // checking the console's station since the user might be off-grid using on-grid console - if (_station.GetOwningStation(ent) is not { } station) + // if (_station.GetOwningStation(ent) is not { } station) + // return false; + var station = _sectorService.GetServiceEntity(); + + if (!TryComp(station, out var stationRecords)) return false; + // End Frontier key = new StationRecordKey(id, station); mob = user; @@ -245,12 +253,17 @@ public void CheckNewIdentity(EntityUid uid) var name = Identity.Name(uid, EntityManager); var xform = Transform(uid); + // Frontier: sector-wide records // TODO use the entity's station? Not the station of the map that it happens to currently be on? - var station = _station.GetStationInMap(xform.MapID); + // var station = _station.GetStationInMap(xform.MapID); + // // var owningStation = _station.GetOwningStation(uid); + + var station = _sectorService.GetServiceEntity(); + // End Frontier - if (station != null && _records.GetRecordByName(station.Value, name) is { } id) + if (station.IsValid() && _records.GetRecordByName(station, name) is { } id) // Frontier: "station != null" < station.IsValid(), station.Value < station { - if (_records.TryGetRecord(new StationRecordKey(id, station.Value), + if (_records.TryGetRecord(new StationRecordKey(id, station), // Frontier: station.Value ent, ref CriminalR if (args.Cancelled || args.Handled || args.Target == null) return; - if (_station.GetOwningStation(ent) is not {} station) + // Frontier: sector-wide records + // if (_station.GetOwningStation(ent) is not {} station) + // return; + if (_sectorService.GetServiceEntity() is not { Valid: true} station) return; + // End Frontier: sector-wide records var reasons = _proto.Index(ent.Comp.Reasons); foreach (var (key, record) in _records.GetRecordsOfType(station)) diff --git a/Content.Server/CriminalRecords/Systems/CriminalRecordsSystem.cs b/Content.Server/CriminalRecords/Systems/CriminalRecordsSystem.cs index 7c65ce8c248..058c70e104b 100644 --- a/Content.Server/CriminalRecords/Systems/CriminalRecordsSystem.cs +++ b/Content.Server/CriminalRecords/Systems/CriminalRecordsSystem.cs @@ -10,6 +10,7 @@ using Content.Server.Station.Systems; using Content.Shared.CartridgeLoader; using Content.Shared.CartridgeLoader.Cartridges; +using Content.Server._NF.SectorServices; // Frontier namespace Content.Server.CriminalRecords.Systems; @@ -25,8 +26,9 @@ public sealed class CriminalRecordsSystem : SharedCriminalRecordsSystem { [Dependency] private readonly GameTicker _ticker = default!; [Dependency] private readonly StationRecordsSystem _records = default!; - [Dependency] private readonly StationSystem _station = default!; + // [Dependency] private readonly StationSystem _station = default!; // Frontier [Dependency] private readonly CartridgeLoaderSystem _cartridge = default!; + [Dependency] private readonly SectorServiceSystem _sectorService = default!; // Frontier public override void Initialize() { @@ -164,8 +166,13 @@ private void OnCartridgeUiReady(Entity ent, ref Ca private void UpdateReaderUi(Entity ent, EntityUid loaderUid) { - if (_station.GetOwningStation(ent) is not { } station) + // Frontier: sector-wide records + // if (_station.GetOwningStation(ent) is not { } station) + // return; + var station = _sectorService.GetServiceEntity(); + if (!station.IsValid()) return; + // End Frontier var records = _records.GetRecordsOfType(station) .Where(cr => cr.Item2.Status is not SecurityStatus.None || cr.Item2.History.Count > 0) diff --git a/Content.Server/StationRecords/Systems/StationRecordsSystem.cs b/Content.Server/StationRecords/Systems/StationRecordsSystem.cs index e941e65c415..e472a3fef3b 100644 --- a/Content.Server/StationRecords/Systems/StationRecordsSystem.cs +++ b/Content.Server/StationRecords/Systems/StationRecordsSystem.cs @@ -1,5 +1,4 @@ using System.Diagnostics.CodeAnalysis; -using System.IO; using Content.Server.Access.Systems; using Content.Server.Forensics; using Content.Server.GameTicking; @@ -11,6 +10,8 @@ using Content.Shared.StationRecords; using Robust.Shared.Enums; using Robust.Shared.Prototypes; +using Robust.Shared.Random; // Frontier +using Content.Server._NF.SectorServices; // Frontier namespace Content.Server.StationRecords.Systems; @@ -39,6 +40,11 @@ public sealed class StationRecordsSystem : SharedStationRecordsSystem [Dependency] private readonly StationRecordKeyStorageSystem _keyStorage = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IdCardSystem _idCard = default!; + [Dependency] private readonly IRobustRandom _robustRandom = default!; // Frontier + [Dependency] private readonly SectorServiceSystem _sectorService = default!; // Frontier + [Dependency] private readonly ForensicsSystem _forensics = default!; // Frontier + + static readonly ProtoId[] FakeJobIds = [ "Contractor", "Pilot", "Mercenary" ]; // Frontier public override void Initialize() { @@ -95,6 +101,30 @@ private void CreateGeneralRecord(EntityUid station, EntityUid player, HumanoidCh TryComp(player, out var dnaComponent); CreateGeneralRecord(station, idUid.Value, profile.Name, profile.Age, profile.Species, profile.Gender, jobId, fingerprintComponent?.Fingerprint, dnaComponent?.DNA, profile, records); + + /// Frontier: generate sector-wide station record + if (TryComp(player, out var specialRecord) && specialRecord.RecordGeneration == RecordGenerationType.NoRecord) + return; + + EntityUid serviceEnt = _sectorService.GetServiceEntity(); + + if (TryComp(serviceEnt, out StationRecordsComponent? stationRecords)) + { + //Checks if certain information should be faked, if so, fake it. + string playerJob = jobId; + string? fingerprint = fingerprintComponent?.Fingerprint; + string? dna = dnaComponent?.DNA; + if (specialRecord != null + && specialRecord.RecordGeneration == RecordGenerationType.FalseRecord) + { + playerJob = _robustRandom.Pick(FakeJobIds); + fingerprint = _forensics.GenerateFingerprint(); + dna = _forensics.GenerateDNA(); + } + + CreateGeneralRecord(serviceEnt, idUid.Value, profile.Name, profile.Age, profile.Species, profile.Gender, playerJob, fingerprint, dna, profile, stationRecords); + } + /// End Frontier } diff --git a/Content.Server/_NF/SectorServices/SectorServiceSystem.cs b/Content.Server/_NF/SectorServices/SectorServiceSystem.cs index 8f1df78d0c8..c7fd4148139 100644 --- a/Content.Server/_NF/SectorServices/SectorServiceSystem.cs +++ b/Content.Server/_NF/SectorServices/SectorServiceSystem.cs @@ -1,4 +1,5 @@ using Content.Shared._NF.SectorServices.Prototypes; +using Content.Shared.GameTicking; using JetBrains.Annotations; using Robust.Shared.Prototypes; @@ -12,8 +13,8 @@ namespace Content.Server._NF.SectorServices; [PublicAPI] public sealed class SectorServiceSystem : EntitySystem { - [Robust.Shared.IoC.Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Robust.Shared.IoC.Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private readonly IEntityManager _entityManager = default!; [ViewVariables(VVAccess.ReadOnly)] private EntityUid _entity = EntityUid.Invalid; // The station entity that's storing our services. @@ -22,16 +23,18 @@ public override void Initialize() { base.Initialize(); - SubscribeLocalEvent(OnComponentStartup); - SubscribeLocalEvent(OnComponentShutdown); + SubscribeLocalEvent(OnComponentInit); + SubscribeLocalEvent(OnComponentRemove); + SubscribeLocalEvent(OnCleanup); } - private void OnComponentStartup(EntityUid uid, StationSectorServiceHostComponent component, ComponentStartup args) + private void OnComponentInit(EntityUid uid, StationSectorServiceHostComponent component, ComponentInit args) { Log.Debug($"OnComponentStartup! Entity: {uid} internal: {_entity}"); if (_entity == EntityUid.Invalid) { - _entity = uid; + _entity = Spawn(); + component.SectorUid = _entity; foreach (var servicePrototype in _prototypeManager.EnumeratePrototypes()) { @@ -41,18 +44,25 @@ private void OnComponentStartup(EntityUid uid, StationSectorServiceHostComponent } } - private void OnComponentShutdown(EntityUid uid, StationSectorServiceHostComponent component, ComponentShutdown args) + private void OnComponentRemove(EntityUid uid, StationSectorServiceHostComponent component, ComponentRemove args) { - Log.Debug($"OnComponentShutdown! Entity: {_entity}"); - if (_entity != EntityUid.Invalid) + Log.Debug($"ComponentRemove called! Entity: {_entity}"); + DeleteServiceEntity(); + } + + public void OnCleanup(RoundRestartCleanupEvent _) + { + Log.Debug($"RoundRestartCleanup called! Entity: {_entity}"); + DeleteServiceEntity(); + } + + private void DeleteServiceEntity() + { + if (EntityManager.EntityExists(_entity) && !Terminating(_entity)) { - foreach (var servicePrototype in _prototypeManager.EnumeratePrototypes()) - { - Log.Debug($"Removing component for service {servicePrototype.ID}"); - _entityManager.RemoveComponents(_entity, servicePrototype.Components); - } - _entity = EntityUid.Invalid; + QueueDel(_entity); } + _entity = EntityUid.Invalid; } public EntityUid GetServiceEntity() @@ -132,4 +142,4 @@ public EntityUid GetServiceEntity() // { // return uid != null && HasComponent(uid.Value); // } -} \ No newline at end of file +} diff --git a/Content.Server/_NF/SectorServices/StationSectorServiceHostComponent.cs b/Content.Server/_NF/SectorServices/StationSectorServiceHostComponent.cs index 0c7f6fd2d1f..545aba58ef9 100644 --- a/Content.Server/_NF/SectorServices/StationSectorServiceHostComponent.cs +++ b/Content.Server/_NF/SectorServices/StationSectorServiceHostComponent.cs @@ -4,6 +4,9 @@ namespace Content.Server._NF.SectorServices; /// A station with this component will host all sector-wide services. /// [RegisterComponent] +[Access(typeof(SectorServiceSystem))] public sealed partial class StationSectorServiceHostComponent : Component { + [ViewVariables(VVAccess.ReadOnly)] + public EntityUid SectorUid = EntityUid.Invalid; } diff --git a/Content.Server/_NF/StationRecords/SpecialSectorRecordComponent.cs b/Content.Server/_NF/StationRecords/SpecialSectorRecordComponent.cs new file mode 100644 index 00000000000..b1dd5375e32 --- /dev/null +++ b/Content.Server/_NF/StationRecords/SpecialSectorRecordComponent.cs @@ -0,0 +1,24 @@ +using Content.Server.StationRecords.Systems; + +namespace Content.Server.StationRecords; + +// This component ensures the entity it is attached to does not have generic station records created for them. +// +[Access(typeof(StationRecordsSystem))] +[RegisterComponent] +public sealed partial class SpecialSectorStationRecordComponent : Component +{ + // Makes it so that a person with this won't create additional records in other places + // Mainly used for antags syndicates so that they aren't suddenly in NFSD records and outed the minute they exist + // Most commonly used on Syndicate + [DataField] + public RecordGenerationType RecordGeneration = RecordGenerationType.Normal; +} + +[Flags] +public enum RecordGenerationType +{ + Normal, // This entity will have a normal sector record. + FalseRecord, // This entity will have a sector record with falsified data (job, DNA, fingerprints) + NoRecord, // This entity will not have a sector record. +} diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate.yml b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate.yml index 6d1ce6357b8..97d7e984b74 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate.yml @@ -24,6 +24,8 @@ - !type:AddComponentSpecial components: - type: MailDisabled + - type: SpecialSectorStationRecord + recordGeneration: FalseRecord - !type:AddImplantSpecial implants: [ FreelanceTrackingImplant ] - !type:GiveItemOnHolidaySpecial # Even pirates get a piece of cake. diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_captain.yml b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_captain.yml index 4d3edd1f81a..4cb7019947c 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_captain.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_captain.yml @@ -25,6 +25,8 @@ - !type:AddComponentSpecial components: - type: MailDisabled + - type: SpecialSectorStationRecord + recordGeneration: FalseRecord - !type:AddImplantSpecial implants: [ FreelanceTrackingImplant ] - !type:GiveItemOnHolidaySpecial # Even pirates get a piece of cake. diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_first_mate.yml b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_first_mate.yml index 6139ef57c31..95c7ca8c305 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_first_mate.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_first_mate.yml @@ -25,6 +25,8 @@ - !type:AddComponentSpecial components: - type: MailDisabled + - type: SpecialSectorStationRecord + recordGeneration: FalseRecord - !type:AddImplantSpecial implants: [ FreelanceTrackingImplant ] - !type:GiveItemOnHolidaySpecial # Even pirates get a piece of cake. diff --git a/Resources/Prototypes/_NF/SectorServices/services.yml b/Resources/Prototypes/_NF/SectorServices/services.yml index a8d7a5a0827..eb1bac494e8 100644 --- a/Resources/Prototypes/_NF/SectorServices/services.yml +++ b/Resources/Prototypes/_NF/SectorServices/services.yml @@ -26,3 +26,9 @@ !type:SectorBankAccountInfo balance: 8000 increasePerSecond: 20 # 72K per hour, about enough for minimum wage for the default NFSD size + + # A global source of character records (DNA, fingerprints, criminal records, etc.) +- type: sectorService + id: SectorRecords + components: + - type: StationRecords From 40556b5e1c32a9aaf12cf953eddbec4e4d47c522 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sun, 8 Dec 2024 22:35:56 +0000 Subject: [PATCH 29/52] Automatic Changelog (#2440) --- Resources/Changelog/Frontier.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 4ecaab97bbe..8e1c89497cd 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -5741,3 +5741,11 @@ Entries: message: Slightly nerfed asteroid scrapbots. id: 5562 time: '2024-12-08T20:37:38.0000000+00:00' +- author: Qulibly + changes: + - type: Tweak + message: >- + Criminal records computers now work sector-wide, and contain information + for all employees. + id: 5563 + time: '2024-12-08T22:35:31.0000000+00:00' From bcbd6e6c3ab89d99943e0f0dfbe371d1935a1f6c Mon Sep 17 00:00:00 2001 From: Alkheemist Date: Mon, 9 Dec 2024 09:47:05 +1100 Subject: [PATCH 30/52] Allow linking defaults on conveyors (#2486) * Split alternative save device verb into sink and source variants to make linking conveyor defaults work * Added frontier comments, removed possibility of dupe verbs * NetworkConfiguratorSystem comments --------- Co-authored-by: Whatstone --- .../Systems/NetworkConfiguratorSystem.cs | 41 ++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs b/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs index 0dc4f45d9e0..49870d1a315 100644 --- a/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs +++ b/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs @@ -52,6 +52,8 @@ public override void Initialize() //Verbs SubscribeLocalEvent>(OnAddInteractVerb); SubscribeLocalEvent>(OnAddAlternativeSaveDeviceVerb); + SubscribeLocalEvent>(OnAddAlternativeSinkVerb); // Frontier + SubscribeLocalEvent>(OnAddAlternativeSourceVerb); // Frontier SubscribeLocalEvent>(OnAddSwitchModeVerb); //UI @@ -392,8 +394,44 @@ private void OnAddAlternativeSaveDeviceVerb(EntityUid uid, DeviceNetworkComponen return; } + // Frontier: removed check for DeviceSource/DeviceSink into separate verb functions. + } + + /// Frontier: DeviceSource/DeviceSink verbs + /// + /// Adds link default alt verb to devices with LinkSource components. + /// + + private void OnAddAlternativeSourceVerb(EntityUid uid, DeviceLinkSourceComponent component, GetVerbsEvent args) + { + if (!args.CanAccess || !args.CanInteract || !args.Using.HasValue + || !TryComp(args.Using.Value, out var configurator)) + return; + + if (configurator is { LinkModeActive: true, ActiveDeviceLink: { } } && HasComp(args.Target)) + { + AlternativeVerb verb = new() + { + Text = Loc.GetString("network-configurator-link-defaults"), + Icon = new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/VerbIcons/in.svg.192dpi.png")), + Act = () => TryLinkDefaults(args.Using.Value, configurator, args.Target, args.User), + Impact = LogImpact.Low + }; + args.Verbs.Add(verb); + } + } + + /// + /// Adds link default alt verb to devices with LinkSink components if they aren't a LinkSource (to prevent duplicates). + /// + private void OnAddAlternativeSinkVerb(EntityUid uid, DeviceLinkSinkComponent component, GetVerbsEvent args) + { + if (!args.CanAccess || !args.CanInteract || !args.Using.HasValue + || !TryComp(args.Using.Value, out var configurator)) + return; + if (configurator is { LinkModeActive: true, ActiveDeviceLink: { } } - && (HasComp(args.Target) || HasComp(args.Target))) + && HasComp(args.Target) && !HasComp(args.Target)) { AlternativeVerb verb = new() { @@ -405,6 +443,7 @@ private void OnAddAlternativeSaveDeviceVerb(EntityUid uid, DeviceNetworkComponen args.Verbs.Add(verb); } } + /// End Frontier: DeviceSource/DeviceSink verbs private void OnAddSwitchModeVerb(EntityUid uid, NetworkConfiguratorComponent configurator, GetVerbsEvent args) { From 9dac684b3f48cf8e093b4c5f39a34daa1fe07f00 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sun, 8 Dec 2024 22:47:35 +0000 Subject: [PATCH 31/52] Automatic Changelog (#2486) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 8e1c89497cd..e0fa8093904 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -5749,3 +5749,9 @@ Entries: for all employees. id: 5563 time: '2024-12-08T22:35:31.0000000+00:00' +- author: Alkheemist + changes: + - type: Tweak + message: Made conveyors mass linkable with alt-clicking + id: 5564 + time: '2024-12-08T22:47:05.0000000+00:00' From 704ad86d5b0f4fbcd257a2cf3affa565d0de03c4 Mon Sep 17 00:00:00 2001 From: Whatstone <166147148+whatston3@users.noreply.github.com> Date: Sun, 8 Dec 2024 18:27:38 -0500 Subject: [PATCH 32/52] Dehydratable Sharkminnow (#2529) * Dehydratable sharkminnow * Remove redundant tags * Sharkminnow plush/dehyd.: no unshaded * yaml linter fix --- .../_NF/Entities/Objects/Fun/toys.yml | 4 +--- .../Objects/Specific/rehydrateable.yml | 22 ++++++++++++++++++- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml index 736130a76b5..1471e58b0ba 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml @@ -62,7 +62,7 @@ - type: Sprite sprite: _NF/Objects/Fun/toys.rsi state: plushie_cmo - + - type: entity parent: PlushieCarp id: NFPlushieSharkMinnow @@ -77,10 +77,8 @@ inhandVisuals: left: - state: inhand-left - shader: unshaded right: - state: inhand-right - shader: unshaded - type: entity parent: BasePlushie diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/rehydrateable.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/rehydrateable.yml index 3b0811e1758..3041938ca2b 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/rehydrateable.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/rehydrateable.yml @@ -27,4 +27,24 @@ components: - type: Rehydratable possibleSpawns: - - MobPig \ No newline at end of file + - MobPig + +- type: entity + parent: DehydratedSpaceCarp + id: DehydratedSharkMinnow + name: dehydrated sharkminnow + description: Looks like a plush toy sharkminnow, but just add water and it becomes a real-life sharkminnow! + components: + - type: Rehydratable + possibleSpawns: + - MobShark + - type: Sprite + sprite: _NF/Objects/Fun/sharkminnow.rsi + state: sharkminnowplush + - type: Item + heldPrefix: sharkminnowplush + inhandVisuals: + left: + - state: inhand-left + right: + - state: inhand-right From 6149dd047954a9c73dc5068edf8445098eb8bde5 Mon Sep 17 00:00:00 2001 From: Whatstone <166147148+whatston3@users.noreply.github.com> Date: Sun, 8 Dec 2024 18:50:04 -0500 Subject: [PATCH 33/52] Makes coins stackable (#2534) --- .../Entities/Objects/Misc/treasure.yml | 25 ++++++++++++---- Resources/Prototypes/_NF/Stacks/coins.yml | 30 +++++++++++++++++++ 2 files changed, 50 insertions(+), 5 deletions(-) create mode 100644 Resources/Prototypes/_NF/Stacks/coins.yml diff --git a/Resources/Prototypes/Entities/Objects/Misc/treasure.yml b/Resources/Prototypes/Entities/Objects/Misc/treasure.yml index dfe33ab1112..4df6a70743f 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/treasure.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/treasure.yml @@ -158,8 +158,11 @@ - type: PhysicalComposition materialComposition: Steel: 300 - - type: StaticPrice + - type: StackPrice # Frontier: Static Date: Sun, 8 Dec 2024 18:50:21 -0500 Subject: [PATCH 34/52] More toy-like emotional support RPG sprites & sounds (#2532) * emotional support RPG sprites * Revert emotional RPG probability * Rename toy RPG to "toy RPG" * Remove double carriage return --- .../_NF/Entities/Objects/Fun/toys.yml | 47 ++++++++++++------ .../Objects/Weapons/Guns/Ammunition/toy.yml | 20 -------- Resources/Prototypes/_NF/Mail/mail.yml | 2 +- Resources/Prototypes/_NF/tags.yml | 3 ++ .../Fun/emotional_support_rocket.rsi/icon.png | Bin 0 -> 378 bytes .../inhand-left.png | Bin 0 -> 318 bytes .../inhand-right.png | Bin 0 -> 316 bytes .../emotional_support_rocket.rsi/meta.json | 22 ++++++++ .../Fun/emotional_support_rpg.rsi/base.png | Bin 0 -> 654 bytes .../equipped-BACKPACK.png | Bin 0 -> 1860 bytes .../emotional_support_rpg.rsi/inhand-left.png | Bin 0 -> 1031 bytes .../inhand-right.png | Bin 0 -> 1051 bytes .../Fun/emotional_support_rpg.rsi/mag-0.png | Bin 0 -> 237 bytes .../Fun/emotional_support_rpg.rsi/mag-1.png | Bin 0 -> 237 bytes .../Fun/emotional_support_rpg.rsi/meta.json | 40 +++++++++++++++ .../rocket0-inhand-left.png | Bin 0 -> 785 bytes .../rocket0-inhand-right.png | Bin 0 -> 777 bytes 17 files changed, 97 insertions(+), 37 deletions(-) delete mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/toy.yml create mode 100644 Resources/Textures/_NF/Objects/Fun/emotional_support_rocket.rsi/icon.png create mode 100644 Resources/Textures/_NF/Objects/Fun/emotional_support_rocket.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Objects/Fun/emotional_support_rocket.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Objects/Fun/emotional_support_rocket.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Fun/emotional_support_rpg.rsi/base.png create mode 100644 Resources/Textures/_NF/Objects/Fun/emotional_support_rpg.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/_NF/Objects/Fun/emotional_support_rpg.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Objects/Fun/emotional_support_rpg.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Objects/Fun/emotional_support_rpg.rsi/mag-0.png create mode 100644 Resources/Textures/_NF/Objects/Fun/emotional_support_rpg.rsi/mag-1.png create mode 100644 Resources/Textures/_NF/Objects/Fun/emotional_support_rpg.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Fun/emotional_support_rpg.rsi/rocket0-inhand-left.png create mode 100644 Resources/Textures/_NF/Objects/Fun/emotional_support_rpg.rsi/rocket0-inhand-right.png diff --git a/Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml index 1471e58b0ba..e35e2cb4e45 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml @@ -531,41 +531,56 @@ state: white - type: entity - name: Emotional support RPG + name: toy RPG parent: [BaseClearContraband, WeaponLauncherRocket] id: WeaponLauncherRocketToy suffix: Toy - description: A deactived RPG modified to only allow foam RPG warheads. "When in times of trouble and stressed out as can be, DON'T worry now because S.E.S.W.C has what you need!" + description: A plush toy, this launches foam "grenades". There are stitches on the side that spell out "SAM". components: - type: Sprite - sprite: Objects/Weapons/Guns/Launchers/rocket.rsi - layers: + sprite: _NF/Objects/Fun/emotional_support_rpg.rsi + layers: # explicit just in case the base changes. - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - type: Clothing - sprite: Objects/Weapons/Guns/Launchers/rocket.rsi + sprite: _NF/Objects/Fun/emotional_support_rpg.rsi - type: Gun - fireRate: 0.5 soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/rpgfire.ogg + path: /Audio/Effects/thunk.ogg + soundEmpty: + collection: ToySqueak - type: BallisticAmmoProvider whitelist: tags: - - BulletFoam + - NFFoamRPG proto: BulletFoamRPG - capacity: 1 soundInsert: - path: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + collection: ToySqueak - type: EmitSoundOnCollide sound: - path: /Audio/DeltaV/Voice/Vulpkanin/dog_bark1.ogg - - type: MagazineVisuals - magState: mag - steps: 2 - zeroVisible: false - - type: Appearance + collection: ToySqueak + +- type: entity + id: BulletFoamRPG + description: Looks like the REAL THING... if you squint. I hope your target's wearing face protection. + name: foam RPG rocket + parent: BaseItem + components: + - type: Tag + tags: + - NFFoamRPG + - Trash + - type: Ammo + - type: Sprite + sprite: _NF/Objects/Fun/emotional_support_rocket.rsi + state: icon + - type: EmitSoundOnCollide + sound: + path: /Audio/Weapons/rubberhammer.ogg + - type: StaminaDamageOnCollide + damage: 20 # Grown cap gun, in toys.yml for consistency with fake parent - type: entity diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/toy.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/toy.yml deleted file mode 100644 index ef7561954d2..00000000000 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/toy.yml +++ /dev/null @@ -1,20 +0,0 @@ -- type: entity - id: BulletFoamRPG - description: Looks like the REAL THING! I hope you're wearing face protection. - name: Foam RPG rocket - parent: BaseItem - components: - - type: Tag - tags: - - BulletFoam - - Trash - - type: Ammo - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi - layers: - - state: rpg - - type: EmitSoundOnCollide - sound: - path: /Audio/Weapons/rubberhammer.ogg - - type: StaminaDamageOnCollide - damage: 20 diff --git a/Resources/Prototypes/_NF/Mail/mail.yml b/Resources/Prototypes/_NF/Mail/mail.yml index d3f70d67fe7..7efd7751564 100644 --- a/Resources/Prototypes/_NF/Mail/mail.yml +++ b/Resources/Prototypes/_NF/Mail/mail.yml @@ -1340,7 +1340,7 @@ contents: - id: WeaponLauncherRocketToy - id: BulletFoamRPG - amount: 1 + amount: 2 - type: entity categories: [ HideSpawnMenu ] diff --git a/Resources/Prototypes/_NF/tags.yml b/Resources/Prototypes/_NF/tags.yml index fb0f3d7a954..81c8d23bf8d 100644 --- a/Resources/Prototypes/_NF/tags.yml +++ b/Resources/Prototypes/_NF/tags.yml @@ -108,3 +108,6 @@ - type: Tag id: NFVGRoidInterior + +- type: Tag + id: NFFoamRPG diff --git a/Resources/Textures/_NF/Objects/Fun/emotional_support_rocket.rsi/icon.png b/Resources/Textures/_NF/Objects/Fun/emotional_support_rocket.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..988a7f2cca72da729d74792a1b518cc60a7dc758 GIT binary patch literal 378 zcmV-=0fqjFP)1Z{Hz8H`%nZ995_I+#SRV*3Sl7YeW zcpB@27#JA-{bh%X z-@N>YL0wl4s~NvF2!UJYK4aDV;K6$a28P=VEKCr`|M~YHZqe;)x6#x=%@Si} zxOw>1wn>g2Y)djr}ML~7#OP0q9%NrWy2y@t^eEae8A?oQ7{Td!6+C7qW}c} Y0G9w_4r~7)8vpT$D2NP!9+9XiNT6IQ$^NiLBN@@lcJgcKW`RbT-^p)H>9rV#| z(@R_5$*<2%1R4qi4b38%Ddqgzx6N|9wq(sNzZgF8%oKC^++Mb9-?X=%D$OdjitGQK zIr_Bb{r6RyRu$Eq{?Q#g{qW7lF+U^Yzpr0b^EvY8x!a$oPhYdk(tUc%rnv3Nk1Y!J zZL`}9F&{)e&+@pz=Vq2};|OXlV|i?`0cfbFM*j7we?g}GxyfY2+b12ol#v(2^>p=f JS?83{1OV=dj+y`f literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Fun/emotional_support_rocket.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Fun/emotional_support_rocket.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..ca04d6d205d7cea543334ca50484055f7d4020b6 GIT binary patch literal 316 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU}W}maSW-L^Y)fu_Mrfgwuj0k z!Mm>en!kN9C-A~Q2|@FhmsC@Hm;TV6bJcc7nc&2d7Y`miTXeJKaX^t~m1w)P=?A;Z zPoI7Is5|qVAS2LJAkh0ITm8%O&jpnaU+%@OD_vQ9@SBBg_5j{-Mr!OPFT%`pEQU{0s~YJTeS+)B7`HX9<1;x!%*& K&t;ucLK6VEgpcF^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Fun/emotional_support_rocket.rsi/meta.json b/Resources/Textures/_NF/Objects/Fun/emotional_support_rocket.rsi/meta.json new file mode 100644 index 00000000000..60d2fc1e57f --- /dev/null +++ b/Resources/Textures/_NF/Objects/Fun/emotional_support_rocket.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "modified from tgstation at https://github.com/tgstation/tgstation/pull/21818/commits/8959238828600d01ee7c8165a0dd29007570a454 by whatston3", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Fun/emotional_support_rpg.rsi/base.png b/Resources/Textures/_NF/Objects/Fun/emotional_support_rpg.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..b6c8102d365f8bedbac9130d75af82c22e021c0a GIT binary patch literal 654 zcmV;90&)F`P)BjE7=|C4KmvgS+X=*6p{`Aa1lqv}Lj4o`7mPb*$qz_}jvbn*-MV({)+y>g=oDwG z1qrq^nASy+f|aBsIOaM;5>_nxOfs}kzaU<8cY43~yZiJVEbzZ0^H_muwW`v_kB^V% z(q4LO;AXQ4K)c;$dwV-(K+R*~!3I9I-tq0j_o?%tF|COQ8~DU~Zre}d_g1TwV8?Or zeP65dU;|&DS!{0J0#GWI;$Xh-<2Vkdr>8iMqdkJe0wF|dK?OmOSZ5eU>bf)>9UaX+ zf=KM-ehx5|ZQIrg-iOY_5`gDVvI;BGhWaXz1?)9HlOTu~5EE|;|d4i68UG5 z6&%7MoP|=Uq<}T{mVO=5EDdi;c69Qr;O0>q7{k z`oDf=BGbO_Pjt{n85oC@QpsWw&ku0V`iVeNN|n#&84ia8L7>&r8VIvi_b-+x^S=fm ogqn7FNhzn!EwI1>3;c8V11<|rdHp0Y$p8QV07*qoM6N<$g8DTtI{*Lx literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Fun/emotional_support_rpg.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Objects/Fun/emotional_support_rpg.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..8e578d036103d73539c0da5de6fd63f70003c28e GIT binary patch literal 1860 zcmV-K2fO%*P)^>;Ueqejm#tgzt7Ur5{HL} z+`4sZP=AMt9C?6jHjCfy$K&yEad83I#qaO$yV`QhfMT(zlu9L=k!&{0#>Pg+blTY1 z5UrzfRkVsP6bktLe(Lo)0PE}PY;JD$WzR7KR8sYa=C1YKRY`EAd|_E%jH;DSg^iZtyUfFbgYi5stTXa$F*zMtZU_R*|CyF zqfr5Hbadosb6CV~M#Ue>zvAD&{~rMLdfj^NH#axQWHJC&5c2svKA(?DrP9%_j*oz* zX@o){G)<#iE-P;0lgXs;dc8kWR_}!8BK-5qItK>_Hu3O&^Z`r!{QNwjP{?s6=oo-E zZ{7fKdV1>WOe&QU9*@n$m9G(=Jb9vAzkZ$H{dU$SUKYMgCd1Coj&;48hK>QKR4U5p z>8WGdz@_-szmJZNMz%m|G#dQ+%Rlk8{yp$v)%W}T>^*xa~V7>VNs`Yy6%cY~sCMU(Yss4!}DEfN7eTrfC~_ zzorsT-0ag_@5sQ$6F2c|Dv$sE5BB%>DV0h*Ee5zTd&b_g=bW4#E2i1R>-7;1&2=4& zep9#A;K68dT3t2nK@ym_PlOlhb1bARL+#Uat?+Y+Bcx=(-ek zV5H(_roF@yH!bm%<71l5CID~WzU{b1=|w#BAApbYD*WoT31EqznfB6bHqkToFNdL7bWPTB(0tYuG-Mi?sGY^utg`R4$=sroH$z zmGfGISxp^y6J=#(MbzJk_G_v&`qi@&8jXg{rmpLvR;#%#**h`xlvY($1Os7Sy*9af z_pWvQ;lqc0-Rs`Hd)8=fZEZ0#eYxE3BwiAW#l%>zJkqeA+&wzk%_DJtpO9BpS|VS!P! z!1_hkb-Q%k!^yWuB;vSP+j9W2*(?CNySoFpHX5XF(pO0+ z6e1J~b=;tF4M3?>;_>6h4%yu{48yU}<5(qS4Om)Q z0$^un$JT?F=W)gbS(l`bckbM=w#^4VBJ-(afIKtclmTwI?h3bNfMk1n8%@*DbzO{8 z7RZAU@{m*}ld&?ujlO4r)zwui8^($I_wTd1y87V4rdk0*TlO_)F5E!hUnuc-tB;f^-CX26ZvGyI+(c(fJgJL4<%N>d+v zM~aU|qk}0KfMhZ$M_Y03{PHJm%$`v!7M05JvDIB_$F&GvP9F*J zV?97yEwnjenx@T>t0o$a3ez<4dc9VAzMY+a{en{IKY;sL2UmyX%f-~x6xC{#U?6O3 zOr%mNYZOLxNTT&oYY(_=%E+#9u~<~v`-bf}J_4;>mTI+1a&fWav*hu3MtVZz-AOb@ z@zTd?wMr}&6Pl)>X`16(Y}X8^)oRFoA6#~7-BM}<2s-%P+Lwe&Kby@a^YilnIQ0!( zi=h00Ys@p zQ=TGmcGMh4<}C|=z7RN%&4|lP8KA`X zg+Q4gdV@qJJg=>H889loF9f^20iEuh9NqYBY99f$ghO&aCW=ppb_4R36*581)~@Ty zXU*KB=j?TEx3i;7JfvVix3j||pxJCn0MGL%6)V!VZ9LE0Q<&?z((^oQ+on{kNYC>^ z|Cfptsf6ni4=EU6&Cg+37C{gUO*nP>BsbPKXt&!FO;F<7?KU^oH#l|rLWtq<_VzXqHenLu;?;GE;P!W^#4M?N27TYp0R%w+JZ*w)+o8F^w(Whz zr%9@jpb}ZFRsmR8SODPj&%O)|=TfmE$HfOhkT}YVLaLuZC477&6iaW1u2ILM;^E0e zI^M2Mv^!jL9J$*YV9n3r`+iPEX_jSCtycN|r)vOguKzr|cfC=T07u^O2!a4Lhp6jC zZ@_EwbKHFVYRx2$ z0ch4A@?h&aYsU@)uy*V)54Nt;tUnB$mlc^VhR(hB3IOw0H$%UxWA%TQWcp4mE*0eQ zLw5ltclLWg+JY=DZogb)ZJhMoN8+b{U@QT(cpz3K;q z5TQ9C4yi_hj^oIe^7mP;y~W2T8od9}7376wq)LHL%kQ7o z<^2=L?zOsH`{Z4@xKz*@TF=C4(9{nY3}w#Cn=!PVy4We{R7l6t zc1nwgaKLyesY0PpU1L`gCZ!=Rwi-8u{vm!DtdmcUWcj4KlLYTGX*gTI@AuvBp6-2r zpwVbF8jVJy8BJ{4R)el#VA!^;vO=h=5Ivg^3$manky5HB^*R9KhQX71oqMH{Z$0tA zD~kXrrK(o8fJ5=)hCwfP!l}Tki-2OW*jVYbf>sm!a^gFnpFRtVN_8W)v%A+6@3w>= zS`3guD3{AE*TPO7!za7`T-2XAd|`PEY1#d9Tczom6u#Jp|y|{n0%N&}cLo zjYgx2?{sA6{8nkA43LHdfYo|I3}xi|c33PO8F1RN*26e|geqG#X78o&yZ) VCp}#*5xW2Y002ovPDHLkV1hC6{xbjo literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Fun/emotional_support_rpg.rsi/mag-0.png b/Resources/Textures/_NF/Objects/Fun/emotional_support_rpg.rsi/mag-0.png new file mode 100644 index 0000000000000000000000000000000000000000..a02ca0c4787a0d63cc1d6b375c274aada4352707 GIT binary patch literal 237 zcmV0?3q$^#67$oCa zoX>RnFTY=%{{f|x`gcYusN3_?MsdO*tOL+$`UW5)75@2l?$lC%tV993S^%&FDe%p0GXubr2#ejtzb6URlE-i!ad0t(>z@8r=nuS%r^$N`9JB+B$O@KrXMnU) n&Jl(Y03$1Rfl4W*l=|rbuDCY8cRHo$00000NkvXXu0mjfR)c4l literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Fun/emotional_support_rpg.rsi/mag-1.png b/Resources/Textures/_NF/Objects/Fun/emotional_support_rpg.rsi/mag-1.png new file mode 100644 index 0000000000000000000000000000000000000000..a02ca0c4787a0d63cc1d6b375c274aada4352707 GIT binary patch literal 237 zcmV0?3q$^#67$oCa zoX>RnFTY=%{{f|x`gcYusN3_?MsdO*tOL+$`UW5)75@2l?$lC%tV993S^%&FDe%p0GXubr2#ejtzb6URlE-i!ad0t(>z@8r=nuS%r^$N`9JB+B$O@KrXMnU) n&Jl(Y03$1Rfl4W*l=|rbuDCY8cRHo$00000NkvXXu0mjfR)c4l literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Fun/emotional_support_rpg.rsi/meta.json b/Resources/Textures/_NF/Objects/Fun/emotional_support_rpg.rsi/meta.json new file mode 100644 index 00000000000..a20bae541af --- /dev/null +++ b/Resources/Textures/_NF/Objects/Fun/emotional_support_rpg.rsi/meta.json @@ -0,0 +1,40 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "modified from tgstation at https://github.com/tgstation/tgstation/pull/21818/commits/8959238828600d01ee7c8165a0dd29007570a454, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, everything modified by whatston3", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "mag-1" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "rocket0-inhand-left", + "directions": 4 + }, + { + "name": "rocket0-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Fun/emotional_support_rpg.rsi/rocket0-inhand-left.png b/Resources/Textures/_NF/Objects/Fun/emotional_support_rpg.rsi/rocket0-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..1e765101591969bb1e01418f45a744e27a00774c GIT binary patch literal 785 zcmV+s1Md8ZP)aUf^)M)r*tTAK)JPa{fbc{P(CMNX zYCDD)dj^5@zMX|Vn*X0+c=&$+!!QiPFbs29NGY|AaXcG?oSI3JXaE@aKIZdzFAeYP zOzCt?l0*-D9{{i=Lh@opS1!r`BYsN+V*+iSdztXw+U!n1S^Sm=Pn%~fi$@Pd_c5*S zfJx6Sd5A{wJ+W@U!1pUAnA2KHsoy%e%lGWNw^**Ni3c1QP%PK@17JFxY5+*n6j3uN#Qm1JOAq1juq|-F5d>(}(ZG_tr4>&NuA6~)teJG`NCfwX!f+6F2KD=wlbXfJ&tR5i z9snq%0K7Iq2vIp3gb)YCyToZFXhg@qTLz7Fbu;m48t%C!!QiPoC9CKd~+6k*`#g%z)>$nrIb2X zi*7SIA(JH0TcTDbv^GFWsW0Ju-Ld@xXDy~H#)M+I2JkPg+qZDma{*huJAEOoU#i9G@AEiP4>;!)+t+wv_t^qHwemJe^Lp$q~C^-GJF_<^hKz@h;T+2h7T! zb)R6}gf5e9>K`!T`>sCV$N;6(n~`{1=JUDN)I4EBJYd-XQ*{v$i0G9GUD?+^Ktz=@ zp$kqc!M7suwn!;;x!J<>4`f-k>mT?uyu!~8W%|XG!rVW=Fbu;mjBWk`2%^Kyzw`h6 P00000NkvXXu0mjfHhpoH literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Fun/emotional_support_rpg.rsi/rocket0-inhand-right.png b/Resources/Textures/_NF/Objects/Fun/emotional_support_rpg.rsi/rocket0-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..2d36587e7709e0820eb3eea7d5c5063a81715eb4 GIT binary patch literal 777 zcmV+k1NQuhP)k6vjWJtQ)x(z}S*2vz~H;+4v609tph3O-Q6%B$X;ziNv;L&9q2>I6$$&0Ww{L zacsv1{1+^}-`c?YzVY*z`5r(J1VIo4L9`Rk^W?c}I2)el$pK?>z*u1uv?>c~63)4N z4FUkbwXWke2=Hq*%dMwVd1Vd2IhU*D2Ed2-Yh6c?JK?JG>KefJ{ryVY5{R3Smy_>+ zGJRGT%hf{rx7~%}RZHX{W&r10a?U>q9WW+~xZ4EE1l1DBg;IL5v|U9nbX^zo`5cyM zOVjGYbzQ92Yy5cniMN`ClwrAA#9AVX>$+GiH_|W+^!t4PkRL6yHy|qh<#~$HcnAPk zuh#$o)9Qu}Uoy+pLUX=-|75~wJjBEOBY<~95HTTafh_St2&|Tyh|8Ca`1?Cnr_wPR z5ApIm#e6=GUEkrHOT#cy#Vgt(K8vIYhGB%y1`Pl#)0S!Cg%F7LOB>;wOUH2l0KHxh z0Pt}C7%plDc<*r_e%lKnpgss(<~Eo{v`+OuK?ngL{!CMZyFgTYu-{K7lZnO{lfiaZ zd*M}LnYPrwehKRb5H4u4y~EpE^+XT^m=$=ZzH}I4Qs2MJw7snff*=TjAP9mW2!bH$ z=l15V73YCPW(AHO4c*?{$v#L;njF9JfG8#H&4I<>F3GqP5DY409q5;P<_&gkn>(%d7No8Yl zhcfs)_`a`Y4QkXuX#=8#B~2*W0%>u5U6eAwGHvNNPB>2hq-XF&NRH^JZMf=pfkG>! zCN)i~3*Yy{3|`muaHyi}bcqsL_k2>NUrZT1K@bE%5N+Z=NHN469oE%e00000NkvXX Hu0mjfyd`8@ literal 0 HcmV?d00001 From bf42561b634aeb8f3496c4d8cdbb8625ae2dafd4 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sun, 8 Dec 2024 23:50:30 +0000 Subject: [PATCH 35/52] Automatic Changelog (#2534) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index e0fa8093904..23a17e0baca 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -5755,3 +5755,9 @@ Entries: message: Made conveyors mass linkable with alt-clicking id: 5564 time: '2024-12-08T22:47:05.0000000+00:00' +- author: whatston3 + changes: + - type: Tweak + message: Coins are now stackable. + id: 5565 + time: '2024-12-08T23:50:04.0000000+00:00' From 738c958b6e0127053710c25b1c412c6f386a3837 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sun, 8 Dec 2024 23:50:54 +0000 Subject: [PATCH 36/52] Automatic Changelog (#2532) --- Resources/Changelog/Frontier.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 23a17e0baca..79187f33543 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -5761,3 +5761,11 @@ Entries: message: Coins are now stackable. id: 5565 time: '2024-12-08T23:50:04.0000000+00:00' +- author: whatston3 + changes: + - type: Tweak + message: >- + The emotional support RPG cannot be reloaded from foam darts, but comes + with 2 rockets in the mail. + id: 5566 + time: '2024-12-08T23:50:22.0000000+00:00' From 3d10c2ecb96506759dc93ddf453917b5159369de Mon Sep 17 00:00:00 2001 From: GreaseMonk <1354802+GreaseMonk@users.noreply.github.com> Date: Mon, 9 Dec 2024 01:10:05 +0100 Subject: [PATCH 37/52] Disable hostile ai on protected grids (#2398) * Disable AI on protected grids WIP * Check if faction is hostile * Kill hostile AI on protected grids * 2024 12 06 hostile ai on grid suggestions (#2524) * Cleanup! * ProtectedGrid: default KillHostileMobs to false * Remove comment --------- Co-authored-by: Whatstone * Run NPC deletion code on entity parent change evt * Remove unused HTNSystem dependencies * NPCDeletionSystem: add startup function --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Whatstone --- .../NPC/Systems/HostileNPCDeletionSystem.cs | 58 +++++++++++++++++++ .../Tiles/ProtectedGridComponent.cs | 9 +++ Resources/Maps/_NF/Outpost/frontier.yml | 1 + 3 files changed, 68 insertions(+) create mode 100644 Content.Server/_NF/NPC/Systems/HostileNPCDeletionSystem.cs diff --git a/Content.Server/_NF/NPC/Systems/HostileNPCDeletionSystem.cs b/Content.Server/_NF/NPC/Systems/HostileNPCDeletionSystem.cs new file mode 100644 index 00000000000..edf2685094f --- /dev/null +++ b/Content.Server/_NF/NPC/Systems/HostileNPCDeletionSystem.cs @@ -0,0 +1,58 @@ +using Content.Shared.Body.Systems; +using Content.Shared.NPC; +using Content.Shared.NPC.Components; +using Content.Shared.NPC.Systems; +using Content.Shared.Popups; +using Content.Shared.Tiles; +using Robust.Shared.Audio.Systems; + +namespace Content.Server._NF.NPC.Systems; + +/// +/// Destroys enemy NPCs on protected grids. +/// +public sealed partial class HostileNPCDeletionSystem : EntitySystem +{ + [Dependency] private readonly NpcFactionSystem _npcFaction = default!; + [Dependency] private readonly SharedBodySystem _sharedBodySystem = default!; + [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private readonly SharedAudioSystem _audio = default!; + + public override void Initialize() + { + SubscribeLocalEvent(OnActiveNPCStartup); + SubscribeLocalEvent(OnActiveNPCParentChanged); + } + + private void OnActiveNPCStartup(EntityUid uid, ActiveNPCComponent comp, ComponentStartup args) + { + DestroyEntityIfHostileOnProtectedGrid(uid); + } + + private void OnActiveNPCParentChanged(EntityUid uid, ActiveNPCComponent comp, EntParentChangedMessage args) + { + DestroyEntityIfHostileOnProtectedGrid(uid); + } + + private void DestroyEntityIfHostileOnProtectedGrid(EntityUid uid) + { + // If this entity is being destroyed, no need to fiddle with components + if (Terminating(uid)) + return; + + var xform = Transform(uid); + if (TryComp(xform.GridUid, out var protectedGrid)) + { + if (protectedGrid.KillHostileMobs + && TryComp(uid, out var npcFactionMember) + && _npcFaction.IsFactionHostile("NanoTrasen", (uid, npcFactionMember))) + { + _audio.PlayPredicted(protectedGrid.HostileMobKillSound, xform.Coordinates, null); + _sharedBodySystem.GibBody(uid); + Spawn("Ash", xform.Coordinates); + _popup.PopupCoordinates(Loc.GetString("admin-smite-turned-ash-other", ("name", uid)), xform.Coordinates, PopupType.LargeCaution); + QueueDel(uid); + } + } + } +} diff --git a/Content.Shared/Tiles/ProtectedGridComponent.cs b/Content.Shared/Tiles/ProtectedGridComponent.cs index da652184836..947b02d5031 100644 --- a/Content.Shared/Tiles/ProtectedGridComponent.cs +++ b/Content.Shared/Tiles/ProtectedGridComponent.cs @@ -1,4 +1,5 @@ using Robust.Shared.GameStates; +using Robust.Shared.Audio; // Frontier namespace Content.Shared.Tiles; @@ -21,5 +22,13 @@ public sealed partial class ProtectedGridComponent : Component public bool PreventExplosions = false; [DataField] public bool PreventArtifactTriggers = false; + [DataField] + public bool KillHostileMobs = false; + + /// + /// The sound made when a hostile mob is killed when entering a protected grid. + /// + [DataField] + public SoundSpecifier HostileMobKillSound = new SoundPathSpecifier("/Audio/Effects/holy.ogg"); // End Frontier } diff --git a/Resources/Maps/_NF/Outpost/frontier.yml b/Resources/Maps/_NF/Outpost/frontier.yml index 7cf56977535..506a14c2e83 100644 --- a/Resources/Maps/_NF/Outpost/frontier.yml +++ b/Resources/Maps/_NF/Outpost/frontier.yml @@ -3968,6 +3968,7 @@ entities: preventRCDUse: True preventFloorPlacement: True preventFloorRemoval: True + killHostileMobs: True - type: SpreaderGrid - type: IFF readOnly: True From 083f6a2962af7ecf355ee0086ca5aab5de7252c5 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Mon, 9 Dec 2024 00:10:30 +0000 Subject: [PATCH 38/52] Automatic Changelog (#2398) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 79187f33543..7e6dbb28ea7 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -5769,3 +5769,9 @@ Entries: with 2 rockets in the mail. id: 5566 time: '2024-12-08T23:50:22.0000000+00:00' +- author: GreaseMonk + changes: + - type: Add + message: Hostile AI no longer work on protected zones. + id: 5567 + time: '2024-12-09T00:10:05.0000000+00:00' From c45e5c509d72074143f24aa6ab0468d94392c036 Mon Sep 17 00:00:00 2001 From: PECK <74548962+PeccNeck@users.noreply.github.com> Date: Sun, 8 Dec 2024 19:13:25 -0500 Subject: [PATCH 39/52] Directional fans (#2368) Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Checkraze <71046427+Cheackraze@users.noreply.github.com> --- Resources/Maps/_NF/POI/northpole.yml | 1418 +------------------------- 1 file changed, 19 insertions(+), 1399 deletions(-) diff --git a/Resources/Maps/_NF/POI/northpole.yml b/Resources/Maps/_NF/POI/northpole.yml index d40ade8cd22..afe0e73c041 100644 --- a/Resources/Maps/_NF/POI/northpole.yml +++ b/Resources/Maps/_NF/POI/northpole.yml @@ -868,8 +868,6 @@ entities: - type: Transform pos: -2.5,14.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - proto: AirlockGlassShuttle entities: - uid: 16 @@ -952,13 +950,13 @@ entities: rot: 3.141592653589793 rad pos: -1.5,15.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 580 components: - type: Transform rot: 3.141592653589793 rad - pos: -0.5,52.5 + pos: 1.5,52.5 parent: 1 - uid: 599 components: @@ -970,55 +968,55 @@ entities: components: - type: Transform rot: 3.141592653589793 rad - pos: 1.5,52.5 + pos: -0.5,52.5 parent: 1 - uid: 601 components: - type: Transform - rot: 3.141592653589793 rad - pos: 27.5,3.5 + rot: 1.5707963267948966 rad + pos: 27.5,0.5 parent: 1 - uid: 602 components: - type: Transform - rot: 3.141592653589793 rad - pos: 27.5,2.5 + rot: 1.5707963267948966 rad + pos: 27.5,1.5 parent: 1 - uid: 603 components: - type: Transform - rot: 3.141592653589793 rad - pos: 27.5,1.5 + rot: 1.5707963267948966 rad + pos: 27.5,2.5 parent: 1 - uid: 604 components: - type: Transform - rot: 3.141592653589793 rad - pos: 27.5,0.5 + rot: 1.5707963267948966 rad + pos: 27.5,3.5 parent: 1 - uid: 605 components: - type: Transform - rot: 3.141592653589793 rad - pos: -26.5,0.5 + rot: -1.5707963267948966 rad + pos: -26.5,3.5 parent: 1 - uid: 606 components: - type: Transform - rot: 3.141592653589793 rad - pos: -26.5,1.5 + rot: -1.5707963267948966 rad + pos: -26.5,2.5 parent: 1 - uid: 607 components: - type: Transform - rot: 3.141592653589793 rad - pos: -26.5,2.5 + rot: -1.5707963267948966 rad + pos: -26.5,1.5 parent: 1 - uid: 608 components: - type: Transform - rot: 3.141592653589793 rad - pos: -26.5,3.5 + rot: -1.5707963267948966 rad + pos: -26.5,0.5 parent: 1 - proto: Bed entities: @@ -3340,16 +3338,12 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,14.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - uid: 767 components: - type: Transform rot: -1.5707963267948966 rad pos: -2.5,13.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - proto: GasVentPump entities: - uid: 768 @@ -3358,8 +3352,6 @@ entities: rot: 3.141592653589793 rad pos: -8.5,11.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - proto: GasVentScrubber entities: - uid: 769 @@ -3368,8 +3360,6 @@ entities: rot: 3.141592653589793 rad pos: -7.5,11.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - proto: GasVolumePump entities: - uid: 752 @@ -3378,16 +3368,12 @@ entities: rot: 1.5707963267948966 rad pos: -3.5,13.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - uid: 765 components: - type: Transform rot: -1.5707963267948966 rad pos: -3.5,14.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - proto: GeneratorBasic15kW entities: - uid: 772 @@ -3500,22 +3486,16 @@ entities: entities: - uid: 679 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -4.5,21.5 parent: 1 - uid: 680 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -8.5,18.5 parent: 1 - uid: 681 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -8.5,21.5 parent: 1 @@ -3582,38 +3562,28 @@ entities: entities: - uid: 1111 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -24.5,3.5 parent: 1 - uid: 1112 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 25.5,3.5 parent: 1 - uid: 1166 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -6.5,13.5 parent: 1 - uid: 1168 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 0.5,22.5 parent: 1 - uid: 1169 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -3.5,26.5 @@ -4097,8 +4067,6 @@ entities: - type: Transform pos: -2.5,13.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - proto: SubstationBasic entities: - uid: 770 @@ -4182,2056 +4150,1542 @@ entities: entities: - uid: 270 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -1.5,52.5 parent: 1 - uid: 271 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -2.5,52.5 parent: 1 - uid: 272 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 2.5,52.5 parent: 1 - uid: 273 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 3.5,52.5 parent: 1 - uid: 274 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -3.5,41.5 parent: 1 - uid: 275 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -3.5,42.5 parent: 1 - uid: 276 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -3.5,43.5 parent: 1 - uid: 277 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -3.5,44.5 parent: 1 - uid: 278 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -3.5,45.5 parent: 1 - uid: 279 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -3.5,46.5 parent: 1 - uid: 280 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -3.5,47.5 parent: 1 - uid: 281 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -3.5,48.5 parent: 1 - uid: 282 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -3.5,49.5 parent: 1 - uid: 283 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -3.5,50.5 parent: 1 - uid: 284 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -3.5,51.5 parent: 1 - uid: 285 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -3.5,52.5 parent: 1 - uid: 286 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -4.5,41.5 parent: 1 - uid: 287 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -5.5,41.5 parent: 1 - uid: 288 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -6.5,41.5 parent: 1 - uid: 289 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -7.5,41.5 parent: 1 - uid: 290 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -8.5,41.5 parent: 1 - uid: 291 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -9.5,41.5 parent: 1 - uid: 292 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -10.5,41.5 parent: 1 - uid: 293 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -11.5,41.5 parent: 1 - uid: 294 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -12.5,41.5 parent: 1 - uid: 295 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -13.5,41.5 parent: 1 - uid: 296 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -13.5,40.5 parent: 1 - uid: 297 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -13.5,39.5 parent: 1 - uid: 298 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -13.5,38.5 parent: 1 - uid: 299 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -13.5,37.5 parent: 1 - uid: 300 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -13.5,36.5 parent: 1 - uid: 301 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -13.5,35.5 parent: 1 - uid: 302 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -13.5,34.5 parent: 1 - uid: 303 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -13.5,33.5 parent: 1 - uid: 304 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -13.5,32.5 parent: 1 - uid: 305 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -13.5,31.5 parent: 1 - uid: 306 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -13.5,30.5 parent: 1 - uid: 307 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -13.5,29.5 parent: 1 - uid: 308 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -13.5,28.5 parent: 1 - uid: 309 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -14.5,28.5 parent: 1 - uid: 310 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -15.5,28.5 parent: 1 - uid: 311 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -16.5,28.5 parent: 1 - uid: 312 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -16.5,27.5 parent: 1 - uid: 313 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -16.5,26.5 parent: 1 - uid: 314 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -16.5,25.5 parent: 1 - uid: 315 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -16.5,24.5 parent: 1 - uid: 316 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -17.5,24.5 parent: 1 - uid: 317 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -18.5,24.5 parent: 1 - uid: 318 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -19.5,24.5 parent: 1 - uid: 319 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -20.5,24.5 parent: 1 - uid: 320 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -20.5,23.5 parent: 1 - uid: 321 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -20.5,22.5 parent: 1 - uid: 322 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -21.5,22.5 parent: 1 - uid: 323 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -22.5,22.5 parent: 1 - uid: 324 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -22.5,21.5 parent: 1 - uid: 325 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -22.5,20.5 parent: 1 - uid: 326 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -22.5,19.5 parent: 1 - uid: 327 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -22.5,18.5 parent: 1 - uid: 328 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -22.5,17.5 parent: 1 - uid: 329 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -21.5,17.5 parent: 1 - uid: 330 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -20.5,17.5 parent: 1 - uid: 331 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -19.5,17.5 parent: 1 - uid: 332 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -18.5,17.5 parent: 1 - uid: 333 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -17.5,17.5 parent: 1 - uid: 334 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -16.5,17.5 parent: 1 - uid: 335 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -15.5,17.5 parent: 1 - uid: 336 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -15.5,16.5 parent: 1 - uid: 337 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -15.5,15.5 parent: 1 - uid: 338 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -15.5,14.5 parent: 1 - uid: 339 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -15.5,13.5 parent: 1 - uid: 340 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -15.5,12.5 parent: 1 - uid: 341 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -15.5,11.5 parent: 1 - uid: 342 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -16.5,11.5 parent: 1 - uid: 343 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -17.5,11.5 parent: 1 - uid: 344 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -18.5,11.5 parent: 1 - uid: 345 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -19.5,11.5 parent: 1 - uid: 346 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -20.5,11.5 parent: 1 - uid: 347 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -20.5,10.5 parent: 1 - uid: 348 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -20.5,9.5 parent: 1 - uid: 349 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -20.5,8.5 parent: 1 - uid: 350 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -20.5,7.5 parent: 1 - uid: 351 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -20.5,6.5 parent: 1 - uid: 352 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -20.5,5.5 parent: 1 - uid: 353 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -21.5,5.5 parent: 1 - uid: 354 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -22.5,5.5 parent: 1 - uid: 355 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -23.5,5.5 parent: 1 - uid: 356 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -24.5,5.5 parent: 1 - uid: 357 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -25.5,5.5 parent: 1 - uid: 358 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -26.5,5.5 parent: 1 - uid: 359 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -26.5,4.5 parent: 1 - uid: 360 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -26.5,-0.5 parent: 1 - uid: 361 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -26.5,-1.5 parent: 1 - uid: 362 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -25.5,-1.5 parent: 1 - uid: 363 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -24.5,-1.5 parent: 1 - uid: 364 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -23.5,-1.5 parent: 1 - uid: 365 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -22.5,-1.5 parent: 1 - uid: 366 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -21.5,-1.5 parent: 1 - uid: 367 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -20.5,-1.5 parent: 1 - uid: 368 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -19.5,-1.5 parent: 1 - uid: 369 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -18.5,-1.5 parent: 1 - uid: 370 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -17.5,-1.5 parent: 1 - uid: 371 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -16.5,-1.5 parent: 1 - uid: 372 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -15.5,-1.5 parent: 1 - uid: 373 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -15.5,-2.5 parent: 1 - uid: 374 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -15.5,-3.5 parent: 1 - uid: 375 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -15.5,-4.5 parent: 1 - uid: 376 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -15.5,-5.5 parent: 1 - uid: 377 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -15.5,-6.5 parent: 1 - uid: 378 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -15.5,-7.5 parent: 1 - uid: 379 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -15.5,-8.5 parent: 1 - uid: 380 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -15.5,-9.5 parent: 1 - uid: 381 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -15.5,-10.5 parent: 1 - uid: 382 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -15.5,-11.5 parent: 1 - uid: 383 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -15.5,-12.5 parent: 1 - uid: 384 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -15.5,-13.5 parent: 1 - uid: 385 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -14.5,-13.5 parent: 1 - uid: 386 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -13.5,-13.5 parent: 1 - uid: 387 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -12.5,-13.5 parent: 1 - uid: 388 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -11.5,-13.5 parent: 1 - uid: 389 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -10.5,-13.5 parent: 1 - uid: 390 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -9.5,-13.5 parent: 1 - uid: 391 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -8.5,-13.5 parent: 1 - uid: 392 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -7.5,-13.5 parent: 1 - uid: 393 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -6.5,-13.5 parent: 1 - uid: 394 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -5.5,-13.5 parent: 1 - uid: 395 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -4.5,-13.5 parent: 1 - uid: 396 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -3.5,-13.5 parent: 1 - uid: 397 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -2.5,-13.5 parent: 1 - uid: 398 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -1.5,-13.5 parent: 1 - uid: 399 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -0.5,-13.5 parent: 1 - uid: 400 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 0.5,-13.5 parent: 1 - uid: 401 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 1.5,-13.5 parent: 1 - uid: 402 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 2.5,-13.5 parent: 1 - uid: 403 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 3.5,-13.5 parent: 1 - uid: 404 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 4.5,-13.5 parent: 1 - uid: 405 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 5.5,-13.5 parent: 1 - uid: 406 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 6.5,-13.5 parent: 1 - uid: 407 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 7.5,-13.5 parent: 1 - uid: 408 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 8.5,-13.5 parent: 1 - uid: 409 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 9.5,-13.5 parent: 1 - uid: 410 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 10.5,-13.5 parent: 1 - uid: 411 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 11.5,-13.5 parent: 1 - uid: 412 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 12.5,-13.5 parent: 1 - uid: 413 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 13.5,-13.5 parent: 1 - uid: 414 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 14.5,-13.5 parent: 1 - uid: 415 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 15.5,-13.5 parent: 1 - uid: 416 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 16.5,-13.5 parent: 1 - uid: 417 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 16.5,-12.5 parent: 1 - uid: 418 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 16.5,-11.5 parent: 1 - uid: 419 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 16.5,-10.5 parent: 1 - uid: 420 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 16.5,-9.5 parent: 1 - uid: 421 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 16.5,-8.5 parent: 1 - uid: 422 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 16.5,-7.5 parent: 1 - uid: 423 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 16.5,-6.5 parent: 1 - uid: 424 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 16.5,-5.5 parent: 1 - uid: 425 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 16.5,-4.5 parent: 1 - uid: 426 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 16.5,-3.5 parent: 1 - uid: 427 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 16.5,-2.5 parent: 1 - uid: 428 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 16.5,-1.5 parent: 1 - uid: 429 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 17.5,-1.5 parent: 1 - uid: 430 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 18.5,-1.5 parent: 1 - uid: 431 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 19.5,-1.5 parent: 1 - uid: 432 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 20.5,-1.5 parent: 1 - uid: 433 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 21.5,-1.5 parent: 1 - uid: 434 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 22.5,-1.5 parent: 1 - uid: 435 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 23.5,-1.5 parent: 1 - uid: 436 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 24.5,-1.5 parent: 1 - uid: 437 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 25.5,-1.5 parent: 1 - uid: 438 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 26.5,-1.5 parent: 1 - uid: 439 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 27.5,-1.5 parent: 1 - uid: 440 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 27.5,-0.5 parent: 1 - uid: 441 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 27.5,4.5 parent: 1 - uid: 442 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 27.5,5.5 parent: 1 - uid: 443 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 26.5,5.5 parent: 1 - uid: 444 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 25.5,5.5 parent: 1 - uid: 445 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 24.5,5.5 parent: 1 - uid: 446 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 23.5,5.5 parent: 1 - uid: 447 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 22.5,5.5 parent: 1 - uid: 448 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 21.5,5.5 parent: 1 - uid: 449 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 21.5,6.5 parent: 1 - uid: 450 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 21.5,7.5 parent: 1 - uid: 451 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 21.5,8.5 parent: 1 - uid: 452 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 21.5,9.5 parent: 1 - uid: 453 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 21.5,10.5 parent: 1 - uid: 454 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 21.5,11.5 parent: 1 - uid: 455 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 20.5,11.5 parent: 1 - uid: 456 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 19.5,11.5 parent: 1 - uid: 457 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 18.5,11.5 parent: 1 - uid: 458 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 17.5,11.5 parent: 1 - uid: 459 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 16.5,11.5 parent: 1 - uid: 460 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 16.5,12.5 parent: 1 - uid: 461 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 16.5,13.5 parent: 1 - uid: 462 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 16.5,14.5 parent: 1 - uid: 463 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 16.5,15.5 parent: 1 - uid: 464 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 16.5,16.5 parent: 1 - uid: 465 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 16.5,17.5 parent: 1 - uid: 466 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 17.5,17.5 parent: 1 - uid: 467 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 18.5,17.5 parent: 1 - uid: 468 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 19.5,17.5 parent: 1 - uid: 469 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 20.5,17.5 parent: 1 - uid: 470 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 21.5,17.5 parent: 1 - uid: 471 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 22.5,17.5 parent: 1 - uid: 472 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 23.5,17.5 parent: 1 - uid: 473 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 23.5,18.5 parent: 1 - uid: 474 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 23.5,19.5 parent: 1 - uid: 475 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 23.5,20.5 parent: 1 - uid: 476 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 23.5,21.5 parent: 1 - uid: 477 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 23.5,22.5 parent: 1 - uid: 478 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 22.5,22.5 parent: 1 - uid: 479 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 21.5,22.5 parent: 1 - uid: 480 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 21.5,23.5 parent: 1 - uid: 481 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 21.5,24.5 parent: 1 - uid: 482 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 20.5,24.5 parent: 1 - uid: 483 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 19.5,24.5 parent: 1 - uid: 484 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 18.5,24.5 parent: 1 - uid: 485 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 17.5,24.5 parent: 1 - uid: 486 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 17.5,25.5 parent: 1 - uid: 487 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 17.5,26.5 parent: 1 - uid: 488 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 17.5,27.5 parent: 1 - uid: 489 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 17.5,28.5 parent: 1 - uid: 490 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 16.5,28.5 parent: 1 - uid: 491 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 15.5,28.5 parent: 1 - uid: 492 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 14.5,28.5 parent: 1 - uid: 493 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 14.5,29.5 parent: 1 - uid: 494 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 14.5,30.5 parent: 1 - uid: 495 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 14.5,31.5 parent: 1 - uid: 496 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 14.5,32.5 parent: 1 - uid: 497 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 14.5,33.5 parent: 1 - uid: 498 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 14.5,34.5 parent: 1 - uid: 499 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 14.5,35.5 parent: 1 - uid: 500 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 14.5,36.5 parent: 1 - uid: 501 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 14.5,37.5 parent: 1 - uid: 502 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 14.5,38.5 parent: 1 - uid: 503 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 14.5,39.5 parent: 1 - uid: 504 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 14.5,40.5 parent: 1 - uid: 505 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 14.5,41.5 parent: 1 - uid: 506 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 13.5,41.5 parent: 1 - uid: 507 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 12.5,41.5 parent: 1 - uid: 508 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 11.5,41.5 parent: 1 - uid: 509 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 10.5,41.5 parent: 1 - uid: 510 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 9.5,41.5 parent: 1 - uid: 511 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 8.5,41.5 parent: 1 - uid: 512 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 7.5,41.5 parent: 1 - uid: 513 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 6.5,41.5 parent: 1 - uid: 514 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 5.5,41.5 parent: 1 - uid: 515 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 4.5,41.5 parent: 1 - uid: 516 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 4.5,42.5 parent: 1 - uid: 517 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 4.5,43.5 parent: 1 - uid: 518 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 4.5,44.5 parent: 1 - uid: 519 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 4.5,45.5 parent: 1 - uid: 520 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 4.5,46.5 parent: 1 - uid: 521 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 4.5,47.5 parent: 1 - uid: 522 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 4.5,48.5 parent: 1 - uid: 523 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 4.5,49.5 parent: 1 - uid: 524 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 4.5,50.5 parent: 1 - uid: 525 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 4.5,51.5 parent: 1 - uid: 526 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 4.5,52.5 @@ -6240,666 +5694,476 @@ entities: entities: - uid: 1193 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 15.5,38.5 parent: 1 - uid: 1194 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 15.5,37.5 parent: 1 - uid: 1195 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 16.5,38.5 parent: 1 - uid: 1196 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 16.5,37.5 parent: 1 - uid: 1197 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 17.5,38.5 parent: 1 - uid: 1198 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 17.5,37.5 parent: 1 - uid: 1199 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 17.5,36.5 parent: 1 - uid: 1200 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 17.5,35.5 parent: 1 - uid: 1201 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 17.5,34.5 parent: 1 - uid: 1202 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 18.5,34.5 parent: 1 - uid: 1203 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 19.5,34.5 parent: 1 - uid: 1204 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 19.5,33.5 parent: 1 - uid: 1205 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 19.5,32.5 parent: 1 - uid: 1206 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 18.5,32.5 parent: 1 - uid: 1207 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 17.5,32.5 parent: 1 - uid: 1208 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 16.5,32.5 parent: 1 - uid: 1209 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 15.5,32.5 parent: 1 - uid: 1210 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 20.5,32.5 parent: 1 - uid: 1211 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 20.5,33.5 parent: 1 - uid: 1212 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 20.5,34.5 parent: 1 - uid: 1213 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 10.5,42.5 parent: 1 - uid: 1214 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 11.5,42.5 parent: 1 - uid: 1215 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 10.5,43.5 parent: 1 - uid: 1216 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 10.5,44.5 parent: 1 - uid: 1217 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 10.5,45.5 parent: 1 - uid: 1218 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 9.5,45.5 parent: 1 - uid: 1219 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 9.5,44.5 parent: 1 - uid: 1220 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 8.5,45.5 parent: 1 - uid: 1221 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 8.5,44.5 parent: 1 - uid: 1222 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 7.5,45.5 parent: 1 - uid: 1223 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 7.5,44.5 parent: 1 - uid: 1224 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 6.5,45.5 parent: 1 - uid: 1225 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 6.5,44.5 parent: 1 - uid: 1226 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 5.5,45.5 parent: 1 - uid: 1227 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 5.5,44.5 parent: 1 - uid: 1228 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 5.5,46.5 parent: 1 - uid: 1229 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 5.5,47.5 parent: 1 - uid: 1230 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 5.5,48.5 parent: 1 - uid: 1231 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 6.5,46.5 parent: 1 - uid: 1232 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 6.5,47.5 parent: 1 - uid: 1233 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 6.5,48.5 parent: 1 - uid: 1234 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 7.5,46.5 parent: 1 - uid: 1235 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -4.5,47.5 parent: 1 - uid: 1236 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -4.5,46.5 parent: 1 - uid: 1237 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -5.5,47.5 parent: 1 - uid: 1238 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -5.5,46.5 parent: 1 - uid: 1239 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -6.5,47.5 parent: 1 - uid: 1240 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -6.5,46.5 parent: 1 - uid: 1241 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -4.5,45.5 parent: 1 - uid: 1242 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -4.5,44.5 parent: 1 - uid: 1243 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -5.5,45.5 parent: 1 - uid: 1244 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -5.5,44.5 parent: 1 - uid: 1245 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -6.5,45.5 parent: 1 - uid: 1246 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -6.5,44.5 parent: 1 - uid: 1247 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -7.5,44.5 parent: 1 - uid: 1248 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -8.5,44.5 parent: 1 - uid: 1249 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -9.5,44.5 parent: 1 - uid: 1250 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -9.5,43.5 parent: 1 - uid: 1251 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -9.5,42.5 parent: 1 - uid: 1252 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -10.5,42.5 parent: 1 - uid: 1253 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -11.5,42.5 parent: 1 - uid: 1254 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -14.5,39.5 parent: 1 - uid: 1255 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -14.5,38.5 parent: 1 - uid: 1256 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -14.5,37.5 parent: 1 - uid: 1257 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -14.5,36.5 parent: 1 - uid: 1258 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -14.5,35.5 parent: 1 - uid: 1259 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -14.5,34.5 parent: 1 - uid: 1260 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -14.5,33.5 parent: 1 - uid: 1261 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -14.5,32.5 parent: 1 - uid: 1262 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -15.5,39.5 parent: 1 - uid: 1263 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -15.5,38.5 parent: 1 - uid: 1264 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -15.5,37.5 parent: 1 - uid: 1265 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -15.5,36.5 parent: 1 - uid: 1266 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -15.5,35.5 parent: 1 - uid: 1267 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -15.5,34.5 parent: 1 - uid: 1268 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -15.5,33.5 parent: 1 - uid: 1269 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -15.5,32.5 parent: 1 - uid: 1270 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -16.5,35.5 parent: 1 - uid: 1271 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -17.5,35.5 parent: 1 - uid: 1272 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -18.5,35.5 parent: 1 - uid: 1273 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -19.5,35.5 parent: 1 - uid: 1274 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -19.5,34.5 parent: 1 - uid: 1275 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -19.5,33.5 parent: 1 - uid: 1276 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -19.5,32.5 parent: 1 - uid: 1277 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -18.5,32.5 parent: 1 - uid: 1278 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -17.5,32.5 parent: 1 - uid: 1279 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -16.5,32.5 parent: 1 - uid: 1280 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -18.5,33.5 parent: 1 - uid: 1281 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -5.5,43.5 parent: 1 - uid: 1282 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -5.5,42.5 parent: 1 - uid: 1283 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -4.5,43.5 parent: 1 - uid: 1284 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -4.5,42.5 parent: 1 - uid: 1285 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 5.5,42.5 parent: 1 - uid: 1286 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 5.5,43.5 parent: 1 - uid: 1287 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 6.5,42.5 parent: 1 @@ -6907,2520 +6171,1890 @@ entities: entities: - uid: 2 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -14.5,11.5 parent: 1 - uid: 24 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -19.5,-0.5 parent: 1 - uid: 25 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -21.5,-0.5 parent: 1 - uid: 26 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -20.5,-0.5 parent: 1 - uid: 27 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -23.5,-0.5 parent: 1 - uid: 28 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -22.5,-0.5 parent: 1 - uid: 29 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -25.5,-0.5 parent: 1 - uid: 30 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -24.5,-0.5 parent: 1 - uid: 31 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -25.5,4.5 parent: 1 - uid: 32 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -24.5,4.5 parent: 1 - uid: 33 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -23.5,4.5 parent: 1 - uid: 34 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -22.5,4.5 parent: 1 - uid: 35 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -21.5,4.5 parent: 1 - uid: 36 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -19.5,7.5 parent: 1 - uid: 37 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -19.5,5.5 parent: 1 - uid: 38 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -19.5,8.5 parent: 1 - uid: 39 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -19.5,4.5 parent: 1 - uid: 40 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -19.5,6.5 parent: 1 - uid: 41 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -19.5,9.5 parent: 1 - uid: 42 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -18.5,10.5 parent: 1 - uid: 43 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -19.5,10.5 parent: 1 - uid: 44 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -16.5,10.5 parent: 1 - uid: 45 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -17.5,10.5 parent: 1 - uid: 46 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -15.5,10.5 parent: 1 - uid: 47 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -20.5,4.5 parent: 1 - uid: 48 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -16.5,-0.5 parent: 1 - uid: 49 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -14.5,-2.5 parent: 1 - uid: 50 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -17.5,-0.5 parent: 1 - uid: 51 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -14.5,-0.5 parent: 1 - uid: 52 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -14.5,-1.5 parent: 1 - uid: 53 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -15.5,-0.5 parent: 1 - uid: 54 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -18.5,-0.5 parent: 1 - uid: 55 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -14.5,-7.5 parent: 1 - uid: 56 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -14.5,-8.5 parent: 1 - uid: 57 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -14.5,-5.5 parent: 1 - uid: 58 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -14.5,-6.5 parent: 1 - uid: 59 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -14.5,-3.5 parent: 1 - uid: 60 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -14.5,-4.5 parent: 1 - uid: 61 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -14.5,-11.5 parent: 1 - uid: 62 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -14.5,-12.5 parent: 1 - uid: 63 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -14.5,-10.5 parent: 1 - uid: 64 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -14.5,-9.5 parent: 1 - uid: 65 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -14.5,10.5 parent: 1 - uid: 66 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -14.5,12.5 parent: 1 - uid: 67 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -14.5,13.5 parent: 1 - uid: 68 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -14.5,14.5 parent: 1 - uid: 69 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -14.5,15.5 parent: 1 - uid: 70 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -14.5,16.5 parent: 1 - uid: 71 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -14.5,17.5 parent: 1 - uid: 72 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -14.5,18.5 parent: 1 - uid: 73 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 16.5,-0.5 parent: 1 - uid: 74 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -15.5,18.5 parent: 1 - uid: 75 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -16.5,18.5 parent: 1 - uid: 76 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -17.5,18.5 parent: 1 - uid: 77 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -18.5,18.5 parent: 1 - uid: 78 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -19.5,18.5 parent: 1 - uid: 79 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -20.5,18.5 parent: 1 - uid: 80 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -21.5,18.5 parent: 1 - uid: 81 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -21.5,19.5 parent: 1 - uid: 82 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -21.5,20.5 parent: 1 - uid: 83 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -21.5,21.5 parent: 1 - uid: 84 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -20.5,21.5 parent: 1 - uid: 85 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -19.5,21.5 parent: 1 - uid: 86 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -19.5,22.5 parent: 1 - uid: 87 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -19.5,23.5 parent: 1 - uid: 88 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -18.5,23.5 parent: 1 - uid: 89 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -17.5,23.5 parent: 1 - uid: 90 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -16.5,23.5 parent: 1 - uid: 91 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -15.5,23.5 parent: 1 - uid: 92 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -15.5,24.5 parent: 1 - uid: 93 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -15.5,25.5 parent: 1 - uid: 94 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -15.5,26.5 parent: 1 - uid: 95 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -15.5,27.5 parent: 1 - uid: 96 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -14.5,27.5 parent: 1 - uid: 97 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -13.5,27.5 parent: 1 - uid: 98 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -12.5,27.5 parent: 1 - uid: 99 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -12.5,28.5 parent: 1 - uid: 100 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -12.5,29.5 parent: 1 - uid: 101 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -12.5,30.5 parent: 1 - uid: 102 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -12.5,31.5 parent: 1 - uid: 103 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -12.5,32.5 parent: 1 - uid: 104 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -12.5,33.5 parent: 1 - uid: 105 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -12.5,34.5 parent: 1 - uid: 106 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -12.5,35.5 parent: 1 - uid: 107 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -12.5,36.5 parent: 1 - uid: 108 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -12.5,37.5 parent: 1 - uid: 109 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -12.5,38.5 parent: 1 - uid: 110 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -12.5,39.5 parent: 1 - uid: 111 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -12.5,40.5 parent: 1 - uid: 112 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -13.5,-12.5 parent: 1 - uid: 113 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -12.5,-12.5 parent: 1 - uid: 114 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -11.5,-12.5 parent: 1 - uid: 115 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -10.5,-12.5 parent: 1 - uid: 116 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -9.5,-12.5 parent: 1 - uid: 117 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -8.5,-12.5 parent: 1 - uid: 118 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -7.5,-12.5 parent: 1 - uid: 119 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -6.5,-12.5 parent: 1 - uid: 120 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -5.5,-12.5 parent: 1 - uid: 121 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -4.5,-12.5 parent: 1 - uid: 122 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -3.5,-12.5 parent: 1 - uid: 123 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -2.5,-12.5 parent: 1 - uid: 124 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -1.5,-12.5 parent: 1 - uid: 125 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -0.5,-12.5 parent: 1 - uid: 126 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 0.5,-12.5 parent: 1 - uid: 127 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 1.5,-12.5 parent: 1 - uid: 128 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 2.5,-12.5 parent: 1 - uid: 129 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 3.5,-12.5 parent: 1 - uid: 130 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 4.5,-12.5 parent: 1 - uid: 131 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 5.5,-12.5 parent: 1 - uid: 132 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 6.5,-12.5 parent: 1 - uid: 133 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 7.5,-12.5 parent: 1 - uid: 134 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 8.5,-12.5 parent: 1 - uid: 135 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 9.5,-12.5 parent: 1 - uid: 136 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 10.5,-12.5 parent: 1 - uid: 137 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 11.5,-12.5 parent: 1 - uid: 138 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 12.5,-12.5 parent: 1 - uid: 139 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 13.5,-12.5 parent: 1 - uid: 140 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 14.5,-12.5 parent: 1 - uid: 141 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 15.5,-12.5 parent: 1 - uid: 142 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 15.5,-11.5 parent: 1 - uid: 143 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 15.5,-10.5 parent: 1 - uid: 144 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 15.5,-9.5 parent: 1 - uid: 145 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 15.5,-8.5 parent: 1 - uid: 146 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 15.5,-7.5 parent: 1 - uid: 147 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 15.5,-6.5 parent: 1 - uid: 148 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 15.5,-5.5 parent: 1 - uid: 149 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 15.5,-4.5 parent: 1 - uid: 150 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 15.5,-3.5 parent: 1 - uid: 151 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 15.5,-2.5 parent: 1 - uid: 152 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 15.5,-1.5 parent: 1 - uid: 153 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 15.5,-0.5 parent: 1 - uid: 154 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 17.5,-0.5 parent: 1 - uid: 155 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 18.5,-0.5 parent: 1 - uid: 156 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 19.5,-0.5 parent: 1 - uid: 157 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 20.5,-0.5 parent: 1 - uid: 158 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 21.5,-0.5 parent: 1 - uid: 159 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 22.5,-0.5 parent: 1 - uid: 160 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 23.5,-0.5 parent: 1 - uid: 161 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 24.5,-0.5 parent: 1 - uid: 162 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 25.5,-0.5 parent: 1 - uid: 163 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 26.5,-0.5 parent: 1 - uid: 164 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 26.5,4.5 parent: 1 - uid: 165 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 25.5,4.5 parent: 1 - uid: 166 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 24.5,4.5 parent: 1 - uid: 167 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 23.5,4.5 parent: 1 - uid: 168 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 22.5,4.5 parent: 1 - uid: 169 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 21.5,4.5 parent: 1 - uid: 170 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 20.5,4.5 parent: 1 - uid: 171 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 20.5,5.5 parent: 1 - uid: 172 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 20.5,6.5 parent: 1 - uid: 173 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 20.5,7.5 parent: 1 - uid: 174 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 20.5,8.5 parent: 1 - uid: 175 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 20.5,9.5 parent: 1 - uid: 176 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 20.5,10.5 parent: 1 - uid: 177 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 19.5,10.5 parent: 1 - uid: 178 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 18.5,10.5 parent: 1 - uid: 179 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 17.5,10.5 parent: 1 - uid: 180 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 16.5,10.5 parent: 1 - uid: 181 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 15.5,10.5 parent: 1 - uid: 182 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 15.5,11.5 parent: 1 - uid: 183 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 15.5,12.5 parent: 1 - uid: 184 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 15.5,13.5 parent: 1 - uid: 185 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 15.5,14.5 parent: 1 - uid: 186 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 15.5,15.5 parent: 1 - uid: 187 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 15.5,16.5 parent: 1 - uid: 188 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 15.5,17.5 parent: 1 - uid: 189 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 15.5,18.5 parent: 1 - uid: 190 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 16.5,18.5 parent: 1 - uid: 191 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 17.5,18.5 parent: 1 - uid: 192 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 18.5,18.5 parent: 1 - uid: 193 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 19.5,18.5 parent: 1 - uid: 194 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 20.5,18.5 parent: 1 - uid: 195 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 21.5,18.5 parent: 1 - uid: 196 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 22.5,18.5 parent: 1 - uid: 197 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 22.5,19.5 parent: 1 - uid: 198 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 22.5,20.5 parent: 1 - uid: 199 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 22.5,21.5 parent: 1 - uid: 200 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 21.5,21.5 parent: 1 - uid: 201 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 20.5,21.5 parent: 1 - uid: 202 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 19.5,23.5 parent: 1 - uid: 203 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 20.5,22.5 parent: 1 - uid: 204 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 20.5,23.5 parent: 1 - uid: 205 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 18.5,23.5 parent: 1 - uid: 206 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 17.5,23.5 parent: 1 - uid: 207 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 16.5,23.5 parent: 1 - uid: 208 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 16.5,24.5 parent: 1 - uid: 209 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 16.5,25.5 parent: 1 - uid: 210 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 16.5,26.5 parent: 1 - uid: 211 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 16.5,27.5 parent: 1 - uid: 212 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 15.5,27.5 parent: 1 - uid: 213 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 14.5,27.5 parent: 1 - uid: 214 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 13.5,27.5 parent: 1 - uid: 215 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 13.5,28.5 parent: 1 - uid: 216 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 13.5,29.5 parent: 1 - uid: 217 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 13.5,30.5 parent: 1 - uid: 218 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 13.5,31.5 parent: 1 - uid: 219 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 13.5,32.5 parent: 1 - uid: 220 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 13.5,33.5 parent: 1 - uid: 221 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 13.5,34.5 parent: 1 - uid: 222 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 13.5,35.5 parent: 1 - uid: 223 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 13.5,36.5 parent: 1 - uid: 224 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 13.5,37.5 parent: 1 - uid: 225 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 13.5,38.5 parent: 1 - uid: 226 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 13.5,39.5 parent: 1 - uid: 227 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 13.5,40.5 parent: 1 - uid: 228 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -11.5,40.5 parent: 1 - uid: 229 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -10.5,40.5 parent: 1 - uid: 230 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -9.5,40.5 parent: 1 - uid: 231 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -8.5,40.5 parent: 1 - uid: 232 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -7.5,40.5 parent: 1 - uid: 233 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -6.5,40.5 parent: 1 - uid: 234 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -5.5,40.5 parent: 1 - uid: 235 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -4.5,40.5 parent: 1 - uid: 236 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -3.5,40.5 parent: 1 - uid: 237 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -2.5,51.5 parent: 1 - uid: 238 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -2.5,50.5 parent: 1 - uid: 239 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -2.5,49.5 parent: 1 - uid: 240 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -2.5,48.5 parent: 1 - uid: 241 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -2.5,47.5 parent: 1 - uid: 242 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -2.5,46.5 parent: 1 - uid: 243 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -2.5,45.5 parent: 1 - uid: 244 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -2.5,44.5 parent: 1 - uid: 245 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -2.5,43.5 parent: 1 - uid: 246 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -2.5,42.5 parent: 1 - uid: 247 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -2.5,41.5 parent: 1 - uid: 248 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -2.5,40.5 parent: 1 - uid: 249 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 12.5,40.5 parent: 1 - uid: 250 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 11.5,40.5 parent: 1 - uid: 251 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 10.5,40.5 parent: 1 - uid: 252 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 9.5,40.5 parent: 1 - uid: 253 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 8.5,40.5 parent: 1 - uid: 254 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 7.5,40.5 parent: 1 - uid: 255 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 6.5,40.5 parent: 1 - uid: 256 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 5.5,40.5 parent: 1 - uid: 257 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 4.5,40.5 parent: 1 - uid: 258 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 3.5,40.5 parent: 1 - uid: 259 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 3.5,41.5 parent: 1 - uid: 260 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 3.5,42.5 parent: 1 - uid: 261 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 3.5,43.5 parent: 1 - uid: 262 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 3.5,44.5 parent: 1 - uid: 263 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 3.5,45.5 parent: 1 - uid: 264 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 3.5,46.5 parent: 1 - uid: 265 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 3.5,47.5 parent: 1 - uid: 266 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 3.5,48.5 parent: 1 - uid: 267 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 3.5,49.5 parent: 1 - uid: 268 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 3.5,50.5 parent: 1 - uid: 269 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 3.5,51.5 parent: 1 - uid: 527 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -1.5,51.5 parent: 1 - uid: 528 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 2.5,51.5 parent: 1 - uid: 529 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 1.5,29.5 parent: 1 - uid: 530 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 1.5,28.5 parent: 1 - uid: 531 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 1.5,27.5 parent: 1 - uid: 532 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 1.5,26.5 parent: 1 - uid: 533 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 1.5,23.5 parent: 1 - uid: 534 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 1.5,22.5 parent: 1 - uid: 538 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 1.5,18.5 parent: 1 - uid: 539 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 1.5,17.5 parent: 1 - uid: 540 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 1.5,16.5 parent: 1 - uid: 541 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 1.5,15.5 parent: 1 - uid: 542 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 1.5,14.5 parent: 1 - uid: 543 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 1.5,13.5 parent: 1 - uid: 544 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 1.5,12.5 parent: 1 - uid: 545 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -1.5,12.5 parent: 1 - uid: 546 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -2.5,12.5 parent: 1 - uid: 547 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -3.5,12.5 parent: 1 - uid: 548 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -4.5,12.5 parent: 1 - uid: 550 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -6.5,12.5 parent: 1 - uid: 551 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -9.5,12.5 parent: 1 - uid: 552 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -9.5,13.5 parent: 1 - uid: 553 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -9.5,14.5 parent: 1 - uid: 554 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -9.5,15.5 parent: 1 - uid: 555 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -9.5,16.5 parent: 1 - uid: 556 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -9.5,17.5 parent: 1 - uid: 560 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -9.5,21.5 parent: 1 - uid: 561 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -9.5,22.5 parent: 1 - uid: 562 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -9.5,23.5 parent: 1 - uid: 563 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -9.5,24.5 parent: 1 - uid: 566 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -9.5,27.5 parent: 1 - uid: 567 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -9.5,28.5 parent: 1 - uid: 568 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -9.5,29.5 parent: 1 - uid: 569 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -8.5,29.5 parent: 1 - uid: 570 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -7.5,29.5 parent: 1 - uid: 571 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -6.5,29.5 parent: 1 - uid: 572 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -5.5,29.5 parent: 1 - uid: 573 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -1.5,29.5 parent: 1 - uid: 574 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -0.5,29.5 parent: 1 - uid: 575 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 0.5,29.5 parent: 1 - uid: 611 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -8.5,17.5 parent: 1 - uid: 612 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -7.5,17.5 parent: 1 - uid: 613 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -6.5,17.5 parent: 1 - uid: 614 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -5.5,17.5 parent: 1 - uid: 615 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -4.5,17.5 parent: 1 - uid: 616 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -3.5,17.5 parent: 1 - uid: 617 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -3.5,16.5 parent: 1 - uid: 618 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -3.5,15.5 parent: 1 - uid: 619 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -2.5,15.5 parent: 1 - uid: 620 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -1.5,15.5 parent: 1 - uid: 621 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -1.5,14.5 parent: 1 - uid: 622 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -1.5,13.5 parent: 1 - uid: 623 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -0.5,15.5 parent: 1 - uid: 625 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -8.5,22.5 parent: 1 - uid: 626 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -7.5,22.5 parent: 1 - uid: 627 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -6.5,22.5 parent: 1 - uid: 628 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -5.5,22.5 parent: 1 - uid: 629 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -4.5,22.5 parent: 1 - uid: 630 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -3.5,22.5 parent: 1 - uid: 631 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -3.5,21.5 parent: 1 - uid: 632 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -3.5,18.5 parent: 1 - uid: 633 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -3.5,19.5 parent: 1 - uid: 634 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -3.5,23.5 parent: 1 - uid: 635 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -2.5,23.5 parent: 1 - uid: 638 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -2.5,26.5 parent: 1 - uid: 639 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -1.5,26.5 parent: 1 - uid: 640 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -0.5,26.5 parent: 1 - uid: 641 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 0.5,26.5 @@ -9525,50 +8159,36 @@ entities: entities: - uid: 549 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 1.5,25.5 parent: 1 - uid: 609 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -2.5,25.5 parent: 1 - uid: 610 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -3.5,20.5 parent: 1 - uid: 624 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 1.5,24.5 parent: 1 - uid: 636 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 0.5,15.5 parent: 1 - uid: 637 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -2.5,24.5 parent: 1 - uid: 642 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -5.5,12.5 parent: 1 From e5dd93f8ee7d5e4030388ec22c996d882881c518 Mon Sep 17 00:00:00 2001 From: chrome-cirrus <95361+chrome-cirrus@users.noreply.github.com> Date: Mon, 9 Dec 2024 18:57:42 +0100 Subject: [PATCH 40/52] Charon (New Shuttle) (#2119) * Add Charon shuttle * Change to a manufacturer name whose acronym has less potential for confusion * Add BecomesStation component * Update sell price since a bunch of tile prices just got changed * Remove some duplicate objects, move around some emergency gear * Reference correct guidebook page in ship yml * Hide my network configurator sins * Move waste vent to a cleaner spot, add wall cabinet to bathroom * Add vacuum atmos helper markers. Change plating to lattice under engines + fix a few other platings. * Make some spicy windows mild, also update price and tile count * Update based on lastest round of feedback * More decals, tweak supplies * Equipment, ship price, and decor adjustments * Replace wall fuel tank with a portable one --------- Co-authored-by: eidolon <95361+eidolon-zz@users.noreply.github.com> Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Checkraze <71046427+Cheackraze@users.noreply.github.com> --- .../Locale/en-US/_NF/guidebook/guides.ftl | 1 + .../Maps/_NF/Shuttles/Expedition/charon.yml | 8002 +++++++++++++++++ .../Catalog/Fills/Paper/Shipyard/manuals.yml | 9 + .../Prototypes/_NF/Guidebook/shipyard.yml | 6 + .../_NF/Shipyard/Expedition/charon.yml | 45 + .../_NF/Guidebook/Shipyard/Charon.xml | 105 + 6 files changed, 8168 insertions(+) create mode 100644 Resources/Maps/_NF/Shuttles/Expedition/charon.yml create mode 100644 Resources/Prototypes/_NF/Shipyard/Expedition/charon.yml create mode 100644 Resources/ServerInfo/_NF/Guidebook/Shipyard/Charon.xml diff --git a/Resources/Locale/en-US/_NF/guidebook/guides.ftl b/Resources/Locale/en-US/_NF/guidebook/guides.ftl index 5ed6a666bc2..5a008481981 100644 --- a/Resources/Locale/en-US/_NF/guidebook/guides.ftl +++ b/Resources/Locale/en-US/_NF/guidebook/guides.ftl @@ -41,6 +41,7 @@ guide-entry-shipyard-brigand = Brigand guide-entry-shipyard-bulker = Bulker guide-entry-shipyard-camper = Camper guide-entry-shipyard-ceres = Ceres +guide-entry-shipyard-charon = Charon guide-entry-shipyard-chisel = Chisel guide-entry-shipyard-comet = Comet guide-entry-shipyard-construct = Construct diff --git a/Resources/Maps/_NF/Shuttles/Expedition/charon.yml b/Resources/Maps/_NF/Shuttles/Expedition/charon.yml new file mode 100644 index 00000000000..10dd44ef769 --- /dev/null +++ b/Resources/Maps/_NF/Shuttles/Expedition/charon.yml @@ -0,0 +1,8002 @@ +meta: + format: 6 + postmapinit: false +tilemap: + 0: Space + 33: FloorDark + 4: FloorGlass + 1: FloorKitchen + 3: FloorLaundry + 113: FloorTechMaint + 2: FloorWoodTile + 130: Lattice + 131: Plating +entities: +- proto: "" + entities: + - uid: 1 + components: + - type: MetaData + name: Charon + - type: Transform + pos: -2.1354167,-0.5052121 + parent: invalid + - type: BecomesStation + id: Charon + - type: MapGrid + chunks: + 0,0: + ind: 0,0 + tiles: gwAAAAAAIQAAAAADcQAAAAAAIQAAAAADgwAAAAAAgwAAAAAAgwAAAAAABAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAACIQAAAAADgwAAAAAAIQAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAABIQAAAAACgwAAAAAAIQAAAAABcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAIQAAAAABcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAACgwAAAAAAIQAAAAACgwAAAAAAgwAAAAAAgwAAAAAABAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAgwAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAgwAAAAAAgwAAAAAAIQAAAAABgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAADgwAAAAAAIQAAAAADgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAADgwAAAAAAIQAAAAABgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAIQAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAABIQAAAAABIQAAAAACgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAIQAAAAACIQAAAAACgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAIQAAAAAAIQAAAAADgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAACcQAAAAAAgwAAAAAAcQAAAAAABAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,0: + ind: -1,0 + tiles: BAAAAAADgwAAAAAAgwAAAAAAgwAAAAAAIQAAAAAAcQAAAAAAIQAAAAAAgwAAAAAAIQAAAAACIQAAAAABgwAAAAAAIQAAAAACIQAAAAABIQAAAAAAIQAAAAABIQAAAAABcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAIQAAAAACgwAAAAAAIQAAAAAAIQAAAAADgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAIQAAAAABgwAAAAAAIQAAAAACIQAAAAACIQAAAAAAIQAAAAACgwAAAAAAIQAAAAACIQAAAAACIQAAAAABIQAAAAACIQAAAAADcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAIQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAABAAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAABIQAAAAADIQAAAAACAgAAAAABAgAAAAACIQAAAAACAgAAAAADIQAAAAACAgAAAAADIQAAAAABAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAAgAAAAABAgAAAAABIQAAAAABAgAAAAAAIQAAAAADAgAAAAADIQAAAAACAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAIQAAAAABIQAAAAAAcQAAAAAAIQAAAAABIQAAAAADcQAAAAAAIQAAAAADcQAAAAAAIQAAAAADAQAAAAAAAQAAAAAAAAAAAAAABAAAAAABgwAAAAAAIQAAAAABIQAAAAACIQAAAAADIQAAAAACIQAAAAADIQAAAAACIQAAAAADIQAAAAABIQAAAAAAIQAAAAABIQAAAAACIQAAAAADIQAAAAACAAAAAAAAgwAAAAAAIQAAAAADIQAAAAAAIQAAAAABIQAAAAABIQAAAAABIQAAAAAAIQAAAAACIQAAAAACcQAAAAAAIQAAAAADAQAAAAAAAQAAAAAAIQAAAAAAIQAAAAADAAAAAAAAgwAAAAAAIQAAAAAAIQAAAAAAIQAAAAADIQAAAAACIQAAAAABIQAAAAABAwAAAAAAAwAAAAAAAwAAAAAAIQAAAAAAAQAAAAAAAQAAAAAAIQAAAAAAIQAAAAABAAAAAAAAgwAAAAAAIQAAAAACIQAAAAABIQAAAAACIQAAAAACIQAAAAABgwAAAAAAgwAAAAAAgwAAAAAAAwAAAAAAIQAAAAACAQAAAAAAAQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAgwAAAAAAIQAAAAABIQAAAAABIQAAAAABIQAAAAADgwAAAAAAAAAAAAAAAAAAAAAABAAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAABAAAAAADAAAAAAAAAAAAAAAABAAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAABAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,-1: + ind: -1,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAIQAAAAACgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAIQAAAAABIQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAADIQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAABIQAAAAAAIQAAAAABgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAgwAAAAAAIQAAAAADIQAAAAADIQAAAAACIQAAAAADgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAIQAAAAADIQAAAAADIQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAIQAAAAACIQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAABAAAAAAAgwAAAAAAgwAAAAAAIQAAAAACIQAAAAADgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAAAIQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAABgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAADgwAAAAAAIQAAAAAAIQAAAAADIQAAAAACgwAAAAAAgwAAAAAAgwAAAAAAIQAAAAAAIQAAAAADgwAAAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAIQAAAAABIQAAAAABIQAAAAADIQAAAAABIQAAAAACIQAAAAACIQAAAAAAIQAAAAABIQAAAAAAIQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAADgwAAAAAAIQAAAAADIQAAAAACIQAAAAABIQAAAAACIQAAAAABIQAAAAAAIQAAAAABIQAAAAACIQAAAAAAIQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAADgwAAAAAAIQAAAAAAgwAAAAAAIQAAAAABIQAAAAADIQAAAAACIQAAAAACIQAAAAACIQAAAAABIQAAAAACIQAAAAACAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAIQAAAAACgwAAAAAAIQAAAAADIQAAAAACIQAAAAACIQAAAAADIQAAAAADIQAAAAABIQAAAAADIQAAAAAC + version: 6 + 0,-1: + ind: 0,-1 + tiles: cQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAADggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAADIQAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAAAIQAAAAADgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAABIQAAAAADIQAAAAADgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAACIQAAAAADIQAAAAAAIQAAAAACgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAABIQAAAAADIQAAAAAAIQAAAAADgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAAAIQAAAAACgwAAAAAAIQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAADIQAAAAABgwAAAAAAgwAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAADIQAAAAABgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAADIQAAAAABgwAAAAAAIQAAAAACgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAABIQAAAAAAgwAAAAAAIQAAAAABgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAACgwAAAAAAIQAAAAADgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAACgwAAAAAAIQAAAAABgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + 0,-2: + ind: 0,-2 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAABAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,-2: + ind: -1,-2 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAACgwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: + - node: + color: '#FFFFFFFF' + id: Box + decals: + 122: 3,-8 + 123: -12,-9 + 124: -12,-8 + 125: 3,-11 + 126: 3,-12 + 127: -12,-11 + 128: -12,-12 + 242: 3,-9 + - node: + color: '#334E6DC8' + id: BrickCornerOverlayNE + decals: + 9: -11,12 + 17: -10,10 + - node: + color: '#3EB38896' + id: BrickCornerOverlayNE + decals: + 85: -1,0 + - node: + color: '#9FED5896' + id: BrickCornerOverlayNE + decals: + 148: -3,11 + 149: -1,7 + 150: 0,6 + - node: + color: '#EFB34196' + id: BrickCornerOverlayNE + decals: + 71: -4,0 + 270: 1,2 + 273: -7,2 + - node: + color: '#334E6DC8' + id: BrickCornerOverlayNW + decals: + 10: -14,12 + - node: + color: '#3EB38896' + id: BrickCornerOverlayNW + decals: + 86: -2,0 + - node: + color: '#9FED5896' + id: BrickCornerOverlayNW + decals: + 146: -4,11 + 147: -2,7 + - node: + color: '#EFB34196' + id: BrickCornerOverlayNW + decals: + 70: -8,0 + 269: -10,2 + 274: -5,2 + - node: + color: '#334E6DC8' + id: BrickCornerOverlaySE + decals: + 13: -11,5 + 20: -10,8 + - node: + color: '#3EB38896' + id: BrickCornerOverlaySE + decals: + 90: -1,-4 + - node: + color: '#9FED5896' + id: BrickCornerOverlaySE + decals: + 151: -3,9 + 152: 0,5 + - node: + color: '#EFB34196' + id: BrickCornerOverlaySE + decals: + 72: -4,-4 + 335: 1,-5 + - node: + color: '#334E6DC8' + id: BrickCornerOverlaySW + decals: + 11: -14,9 + 12: -12,5 + - node: + color: '#3EB38896' + id: BrickCornerOverlaySW + decals: + 91: -2,-4 + - node: + color: '#9FED5896' + id: BrickCornerOverlaySW + decals: + 153: -4,9 + 154: -2,5 + - node: + color: '#A4610696' + id: BrickCornerOverlaySW + decals: + 95: -10,-5 + - node: + color: '#EFB34196' + id: BrickCornerOverlaySW + decals: + 73: -8,-1 + 74: -5,-4 + - node: + color: '#A4610696' + id: BrickEndOverlayN + decals: + 103: -10,-1 + - node: + color: '#EFB34196' + id: BrickEndOverlayN + decals: + 330: 1,-1 + - node: + color: '#334E6DC8' + id: BrickLineOverlayE + decals: + 14: -11,6 + 15: -11,7 + 16: -11,11 + 19: -10,9 + - node: + color: '#3EB38896' + id: BrickLineOverlayE + decals: + 87: -1,-1 + 88: -1,-2 + 89: -1,-3 + - node: + color: '#9FED5896' + id: BrickLineOverlayE + decals: + 156: -3,10 + - node: + color: '#A4610696' + id: BrickLineOverlayE + decals: + 107: -10,-2 + 108: -10,-3 + - node: + color: '#EFB34196' + id: BrickLineOverlayE + decals: + 81: -4,-1 + 82: -4,-2 + 83: -4,-3 + 272: 1,1 + 331: 1,-2 + 332: 1,-3 + 333: 1,-4 + - node: + color: '#334E6DC8' + id: BrickLineOverlayN + decals: + 27: -13,12 + 28: -12,12 + - node: + color: '#EFB34196' + id: BrickLineOverlayN + decals: + 77: -7,0 + 78: -5,0 + 275: -9,2 + 276: -8,2 + 277: -4,2 + 278: -3,2 + 279: -2,2 + 280: -1,2 + 281: 0,2 + - node: + color: '#334E6DC8' + id: BrickLineOverlayS + decals: + 29: -13,9 + - node: + color: '#9FED5896' + id: BrickLineOverlayS + decals: + 155: -1,5 + - node: + color: '#A4610696' + id: BrickLineOverlayS + decals: + 97: -9,-5 + - node: + color: '#EFB34196' + id: BrickLineOverlayS + decals: + 75: -7,-1 + 76: -6,-1 + 344: 0,-5 + - node: + color: '#334E6DC8' + id: BrickLineOverlayW + decals: + 22: -12,6 + 23: -12,7 + 24: -12,8 + 25: -14,10 + 26: -14,11 + - node: + color: '#3EB38896' + id: BrickLineOverlayW + decals: + 92: -2,-3 + 93: -2,-2 + 94: -2,-1 + - node: + color: '#9FED5896' + id: BrickLineOverlayW + decals: + 157: -4,10 + 159: -2,6 + - node: + color: '#A4610696' + id: BrickLineOverlayW + decals: + 104: -10,-2 + 105: -10,-3 + 106: -10,-4 + - node: + color: '#EFB34196' + id: BrickLineOverlayW + decals: + 79: -5,-3 + 80: -5,-2 + 271: -10,1 + 337: 1,-2 + 338: 1,-3 + - node: + color: '#9FED5896' + id: BrickTileWhiteInnerNe + decals: + 158: -1,6 + - node: + color: '#FFFFFFFF' + id: Caution + decals: + 129: 0,-7 + 130: -9,-7 + - node: + color: '#1861D5FF' + id: Delivery + decals: + 162: -1,-2 + - node: + color: '#951710FF' + id: Delivery + decals: + 161: -1,-1 + - node: + color: '#D58C18FF' + id: Delivery + decals: + 160: -1,-3 + - node: + color: '#FFFFFFFF' + id: DirtHeavy + decals: + 174: -9,1 + 175: -12,-1 + 176: -11,-13 + 179: -9,-9 + 180: -9,-13 + 181: -6,-10 + 182: -3,-14 + 183: 0,-9 + 200: -9,-5 + 202: 1,13 + 203: 2,12 + 204: 6,3 + 205: 6,2 + 206: -15,3 + 207: -14,2 + 238: -14,-11 + 255: -2,-7 + 256: -1,-7 + 264: -3,-7 + 295: 2,10 + 340: 1,-5 + - node: + color: '#FFFFFFFF' + id: DirtHeavyMonotile + decals: + 261: 3,-13 + - node: + color: '#FFFFFFFF' + id: DirtLight + decals: + 177: -12,-13 + 178: -11,-14 + 184: -9,-11 + 185: -6,-8 + 186: 0,-15 + 188: -6,-15 + 195: -12,-4 + 196: -6,10 + 197: 3,1 + 198: 2,-7 + 201: -10,-5 + 208: -15,1 + 209: 5,1 + 210: 5,3 + 211: 1,12 + 212: -10,11 + 215: -4,9 + 216: 0,6 + 217: -6,6 + 221: -6,8 + 239: -14,-10 + 260: 2,-13 + 296: 3,10 + 297: 3,2 + 341: 1,-4 + 342: 1,-1 + 345: 0,-5 + 346: 2,-1 + 347: 2,-2 + 348: 2,-10 + - node: + color: '#FFFFFFFF' + id: DirtMedium + decals: + 165: 2,-14 + 166: 5,-11 + 168: -12,-7 + 169: 3,-5 + 170: 0,1 + 190: -6,-13 + 191: -3,-11 + 192: 0,-7 + 193: 0,-16 + 194: -6,-8 + 213: -12,5 + 214: -1,10 + 259: 2,-11 + 298: -12,3 + - node: + color: '#334E6DC8' + id: MiniTileInnerOverlayNE + decals: + 18: -11,10 + - node: + color: '#A4610696' + id: MiniTileInnerOverlayNE + decals: + 112: -10,-4 + - node: + color: '#EFB34196' + id: MiniTileInnerOverlayNW + decals: + 339: 1,-4 + - node: + color: '#334E6DC8' + id: MiniTileInnerOverlaySE + decals: + 21: -11,8 + - node: + color: '#334E6DC8' + id: MiniTileInnerOverlaySW + decals: + 30: -12,9 + - node: + color: '#EFB34196' + id: MiniTileInnerOverlaySW + decals: + 84: -5,-1 + - node: + color: '#FFFFFFFF' + id: WarnCornerNE + decals: + 222: -11,-13 + 290: -12,3 + - node: + color: '#FFFFFFFF' + id: WarnCornerNW + decals: + 263: 2,-13 + 289: 3,3 + - node: + color: '#FFFFFFFF' + id: WarnCornerSE + decals: + 291: -12,2 + 293: 3,10 + - node: + color: '#FFFFFFFF' + id: WarnCornerSW + decals: + 288: 3,2 + 292: 1,10 + - node: + color: '#FFFFFFFF' + id: WarnEndE + decals: + 243: -12,-10 + - node: + color: '#FFFFFFFF' + id: WarnEndW + decals: + 244: 3,-10 + - node: + color: '#FFFFFFFF' + id: WarnLineE + decals: + 226: -11,-14 + - node: + color: '#FFFFFFFF' + id: WarnLineN + decals: + 294: 2,10 + - node: + color: '#FFFFFFFF' + id: WarnLineS + decals: + 227: 2,-14 + - node: + color: '#FFFFFFFF' + id: WarnLineW + decals: + 131: -6,-7 + 132: -9,-7 + 133: -3,-7 + 134: 0,-7 + 224: -12,-13 + 262: 3,-13 + 265: -14,-11 + 266: 5,-11 + - node: + color: '#FFFFFFFF' + id: WoodTrimThinCornerNe + decals: + 113: -8,6 + - node: + color: '#FFFFFFFF' + id: WoodTrimThinCornerNw + decals: + 114: -9,6 + - node: + color: '#FFFFFFFF' + id: WoodTrimThinCornerSe + decals: + 115: -8,5 + - node: + color: '#FFFFFFFF' + id: WoodTrimThinCornerSw + decals: + 116: -9,5 + - node: + color: '#FFFFFFFF' + id: WoodTrimThinEndN + decals: + 117: -6,6 + 118: -4,6 + - node: + color: '#FFFFFFFF' + id: WoodTrimThinEndS + decals: + 119: -6,5 + 120: -4,5 + - type: GridAtmosphere + version: 2 + data: + tiles: + 0,0: + 0: 65524 + -1,0: + 0: 65357 + 0,1: + 0: 60894 + -1,1: + 0: 56784 + 0,2: + 0: 44798 + -1,2: + 0: 16383 + 0,3: + 0: 2798 + 1: 256 + 0,-1: + 0: 61166 + 1,0: + 0: 65376 + 1: 8 + 1,3: + 1: 256 + 1,1: + 2: 544 + 1: 8 + 1,-1: + 2: 8192 + -4,0: + 1: 1 + 0: 65376 + -4,1: + 1: 1 + 2: 1088 + -4,2: + 1: 2 + 0: 52424 + -4,3: + 1: 32 + 0: 12 + -4,-1: + 2: 16384 + -3,0: + 0: 65522 + -3,1: + 0: 48050 + -3,2: + 0: 30591 + -3,3: + 0: 3 + 1: 64 + -3,-1: + 0: 30583 + -2,0: + 0: 65359 + -2,1: + 0: 17744 + -2,2: + 0: 18255 + -2,-1: + 0: 65535 + -2,3: + 1: 2 + 2: 192 + -1,3: + 2: 48 + 1: 4 + -1,-1: + 0: 56797 + -4,-3: + 2: 2 + 0: 19520 + -4,-2: + 0: 2 + 2: 1088 + -4,-4: + 2: 18432 + -3,-4: + 0: 65228 + 2: 16 + -3,-3: + 0: 65535 + -3,-2: + 0: 65535 + -3,-5: + 1: 11264 + -2,-4: + 0: 65535 + -2,-3: + 0: 65535 + -2,-2: + 0: 4095 + -1,-4: + 0: 65535 + -1,-3: + 0: 65535 + -1,-2: + 0: 4095 + 0,-4: + 0: 63283 + 2: 128 + 0,-3: + 0: 65535 + 0,-2: + 0: 65535 + 0,-5: + 1: 17152 + 1,-4: + 2: 8448 + 1,-3: + 0: 8992 + 2: 4 + 1,-2: + 2: 544 + 0: 4 + -1,-5: + 1: 3840 + -2,-5: + 1: 3840 + uniqueMixes: + - volume: 2500 + temperature: 293.15 + moles: + - 21.824879 + - 82.10312 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + immutable: True + moles: + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + chunkSize: 4 + - type: GasTileOverlay + - type: RadiationGridResistance +- proto: AirAlarm + entities: + - uid: 1002 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,6.5 + parent: 1 + - type: DeviceList + devices: + - 923 + - 916 + - 859 + - 860 + - 861 + - 858 + - 857 + - 862 + - 912 + - 727 + - 703 + - 895 + - 940 + - 928 + - 1000 + - 1001 + - uid: 1003 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,1.5 + parent: 1 + - type: DeviceList + devices: + - 951 + - 794 + - 818 + - 800 + - 799 + - 817 + - 1116 + - 1117 +- proto: Airlock + entities: + - uid: 718 + components: + - type: Transform + pos: -3.5,7.5 + parent: 1 + - uid: 722 + components: + - type: Transform + pos: -5.5,7.5 + parent: 1 + - uid: 723 + components: + - type: Transform + pos: -5.5,9.5 + parent: 1 +- proto: AirlockAtmosphericsGlass + entities: + - uid: 326 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,1.5 + parent: 1 +- proto: AirlockCaptainLocked + entities: + - uid: 721 + components: + - type: Transform + pos: -8.5,7.5 + parent: 1 +- proto: AirlockCargoGlass + entities: + - uid: 22 + components: + - type: Transform + pos: -10.5,4.5 + parent: 1 + - uid: 637 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,9.5 + parent: 1 + - uid: 926 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,0.5 + parent: 1 + - uid: 927 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,0.5 + parent: 1 +- proto: AirlockEngineering + entities: + - uid: 466 + components: + - type: Transform + pos: -12.5,-9.5 + parent: 1 + - uid: 471 + components: + - type: Transform + pos: 4.5,-9.5 + parent: 1 +- proto: AirlockEngineeringGlass + entities: + - uid: 639 + components: + - type: Transform + pos: -5.5,1.5 + parent: 1 +- proto: AirlockExternal + entities: + - uid: 35 + components: + - type: Transform + pos: -12.5,3.5 + parent: 1 + - uid: 38 + components: + - type: Transform + pos: 4.5,3.5 + parent: 1 + - uid: 40 + components: + - type: Transform + pos: 1.5,11.5 + parent: 1 + - uid: 42 + components: + - type: Transform + pos: 3.5,11.5 + parent: 1 + - uid: 487 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -12.5,2.5 + parent: 1 + - uid: 489 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,2.5 + parent: 1 +- proto: AirlockGlassShuttle + entities: + - uid: 41 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -15.5,2.5 + parent: 1 + - uid: 44 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -15.5,3.5 + parent: 1 + - uid: 46 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,14.5 + parent: 1 + - uid: 73 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,14.5 + parent: 1 + - uid: 486 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 7.5,2.5 + parent: 1 + - uid: 731 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 7.5,3.5 + parent: 1 +- proto: AmeController + entities: + - uid: 190 + components: + - type: Transform + pos: -7.5,-0.5 + parent: 1 + - type: AmeController + injecting: True + - type: ContainerContainer + containers: + fuelSlot: !type:ContainerSlot + showEnts: False + occludes: True + ent: 78 +- proto: AmeJar + entities: + - uid: 78 + components: + - type: Transform + parent: 190 + - type: Physics + canCollide: False +- proto: AmeShielding + entities: + - uid: 75 + components: + - type: Transform + pos: -5.5,-1.5 + parent: 1 + - uid: 76 + components: + - type: Transform + pos: -5.5,-2.5 + parent: 1 + - uid: 77 + components: + - type: Transform + pos: -5.5,-3.5 + parent: 1 + - uid: 106 + components: + - type: Transform + pos: -7.5,-3.5 + parent: 1 + - uid: 214 + components: + - type: Transform + pos: -7.5,-2.5 + parent: 1 + - uid: 215 + components: + - type: Transform + pos: -7.5,-1.5 + parent: 1 + - uid: 230 + components: + - type: Transform + pos: -6.5,-3.5 + parent: 1 + - uid: 396 + components: + - type: Transform + pos: -6.5,-1.5 + parent: 1 + - uid: 437 + components: + - type: Transform + pos: -6.5,-2.5 + parent: 1 + - type: PointLight + radius: 2 + enabled: True +- proto: APCBasic + entities: + - uid: 377 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-10.5 + parent: 1 + - uid: 378 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -12.5,-10.5 + parent: 1 + - uid: 656 + components: + - type: Transform + pos: -3.5,1.5 + parent: 1 + - uid: 740 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,7.5 + parent: 1 +- proto: AtmosDeviceFanDirectional + entities: + - uid: 45 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 7.5,2.5 + parent: 1 + - uid: 216 + components: + - type: Transform + pos: -8.5,-16.5 + parent: 1 + - uid: 217 + components: + - type: Transform + pos: -7.5,-16.5 + parent: 1 + - uid: 218 + components: + - type: Transform + pos: -6.5,-16.5 + parent: 1 + - uid: 219 + components: + - type: Transform + pos: -5.5,-16.5 + parent: 1 + - uid: 220 + components: + - type: Transform + pos: -4.5,-16.5 + parent: 1 + - uid: 221 + components: + - type: Transform + pos: -3.5,-16.5 + parent: 1 + - uid: 222 + components: + - type: Transform + pos: -2.5,-16.5 + parent: 1 + - uid: 223 + components: + - type: Transform + pos: -1.5,-16.5 + parent: 1 + - uid: 224 + components: + - type: Transform + pos: -0.5,-16.5 + parent: 1 + - uid: 225 + components: + - type: Transform + pos: 0.5,-16.5 + parent: 1 + - uid: 226 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -15.5,3.5 + parent: 1 + - uid: 228 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -15.5,1.5 + parent: 1 + - uid: 229 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 7.5,3.5 + parent: 1 + - uid: 231 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 7.5,1.5 + parent: 1 + - uid: 232 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,14.5 + parent: 1 + - uid: 234 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,14.5 + parent: 1 + - uid: 924 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -15.5,2.5 + parent: 1 +- proto: AtmosFixBlockerMarker + entities: + - uid: 61 + components: + - type: Transform + pos: -14.5,-11.5 + parent: 1 + - uid: 118 + components: + - type: Transform + pos: 5.5,-0.5 + parent: 1 + - uid: 260 + components: + - type: Transform + pos: -13.5,-5.5 + parent: 1 + - uid: 318 + components: + - type: Transform + pos: 5.5,-12.5 + parent: 1 + - uid: 412 + components: + - type: Transform + pos: 5.5,-5.5 + parent: 1 + - uid: 499 + components: + - type: Transform + pos: -14.5,8.5 + parent: 1 + - uid: 546 + components: + - type: Transform + pos: -14.5,13.5 + parent: 1 + - uid: 634 + components: + - type: Transform + pos: -9.5,13.5 + parent: 1 + - uid: 638 + components: + - type: Transform + pos: -6.5,12.5 + parent: 1 + - uid: 1006 + components: + - type: Transform + pos: -5.5,13.5 + parent: 1 + - uid: 1024 + components: + - type: Transform + pos: -4.5,13.5 + parent: 1 + - uid: 1025 + components: + - type: Transform + pos: -3.5,13.5 + parent: 1 + - uid: 1081 + components: + - type: Transform + pos: -2.5,13.5 + parent: 1 + - uid: 1137 + components: + - type: Transform + pos: -1.5,12.5 + parent: 1 + - uid: 1138 + components: + - type: Transform + pos: 0.5,14.5 + parent: 1 + - uid: 1139 + components: + - type: Transform + pos: 4.5,14.5 + parent: 1 + - uid: 1140 + components: + - type: Transform + pos: -13.5,6.5 + parent: 1 + - uid: 1141 + components: + - type: Transform + pos: -13.5,5.5 + parent: 1 + - uid: 1142 + components: + - type: Transform + pos: -15.5,4.5 + parent: 1 + - uid: 1143 + components: + - type: Transform + pos: -15.5,0.5 + parent: 1 + - uid: 1144 + components: + - type: Transform + pos: -13.5,-0.5 + parent: 1 + - uid: 1146 + components: + - type: Transform + pos: 7.5,0.5 + parent: 1 + - uid: 1147 + components: + - type: Transform + pos: 7.5,4.5 + parent: 1 + - uid: 1148 + components: + - type: Transform + pos: 5.5,5.5 + parent: 1 + - uid: 1149 + components: + - type: Transform + pos: 5.5,6.5 + parent: 1 + - uid: 1150 + components: + - type: Transform + pos: -13.5,-6.5 + parent: 1 + - uid: 1154 + components: + - type: Transform + pos: -13.5,-12.5 + parent: 1 + - uid: 1155 + components: + - type: Transform + pos: -12.5,-13.5 + parent: 1 + - uid: 1156 + components: + - type: Transform + pos: -11.5,-14.5 + parent: 1 + - uid: 1157 + components: + - type: Transform + pos: -10.5,-16.5 + parent: 1 + - uid: 1158 + components: + - type: Transform + pos: -9.5,-17.5 + parent: 1 + - uid: 1159 + components: + - type: Transform + pos: -8.5,-17.5 + parent: 1 + - uid: 1160 + components: + - type: Transform + pos: -7.5,-17.5 + parent: 1 + - uid: 1161 + components: + - type: Transform + pos: -6.5,-17.5 + parent: 1 + - uid: 1162 + components: + - type: Transform + pos: -5.5,-17.5 + parent: 1 + - uid: 1163 + components: + - type: Transform + pos: -4.5,-17.5 + parent: 1 + - uid: 1164 + components: + - type: Transform + pos: -3.5,-17.5 + parent: 1 + - uid: 1165 + components: + - type: Transform + pos: -2.5,-17.5 + parent: 1 + - uid: 1166 + components: + - type: Transform + pos: -1.5,-17.5 + parent: 1 + - uid: 1167 + components: + - type: Transform + pos: -0.5,-17.5 + parent: 1 + - uid: 1168 + components: + - type: Transform + pos: 0.5,-17.5 + parent: 1 + - uid: 1169 + components: + - type: Transform + pos: 1.5,-17.5 + parent: 1 + - uid: 1170 + components: + - type: Transform + pos: 2.5,-16.5 + parent: 1 + - uid: 1171 + components: + - type: Transform + pos: 3.5,-14.5 + parent: 1 + - uid: 1172 + components: + - type: Transform + pos: 4.5,-13.5 + parent: 1 + - uid: 1174 + components: + - type: Transform + pos: 6.5,-11.5 + parent: 1 + - uid: 1177 + components: + - type: Transform + pos: 5.5,-6.5 + parent: 1 +- proto: Bed + entities: + - uid: 741 + components: + - type: Transform + pos: -8.5,5.5 + parent: 1 + - uid: 742 + components: + - type: Transform + pos: -5.5,5.5 + parent: 1 + - uid: 743 + components: + - type: Transform + pos: -3.5,5.5 + parent: 1 +- proto: BedsheetSpawner + entities: + - uid: 465 + components: + - type: Transform + pos: -8.5,5.5 + parent: 1 + - uid: 745 + components: + - type: Transform + pos: -5.5,5.5 + parent: 1 + - uid: 746 + components: + - type: Transform + pos: -3.5,5.5 + parent: 1 +- proto: BenchSofaLeft + entities: + - uid: 684 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,9.5 + parent: 1 +- proto: BenchSofaRight + entities: + - uid: 580 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,10.5 + parent: 1 +- proto: BlastDoor + entities: + - uid: 238 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,-16.5 + parent: 1 + - uid: 239 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-16.5 + parent: 1 + - uid: 240 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,-16.5 + parent: 1 + - uid: 241 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-16.5 + parent: 1 + - uid: 242 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-16.5 + parent: 1 + - uid: 243 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,-16.5 + parent: 1 + - uid: 244 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-16.5 + parent: 1 + - uid: 245 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-16.5 + parent: 1 + - uid: 246 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-16.5 + parent: 1 + - uid: 484 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,-16.5 + parent: 1 + - uid: 1110 + components: + - type: Transform + pos: -15.5,1.5 + parent: 1 + - uid: 1111 + components: + - type: Transform + pos: -12.5,1.5 + parent: 1 + - uid: 1112 + components: + - type: Transform + pos: -11.5,0.5 + parent: 1 + - uid: 1113 + components: + - type: Transform + pos: 3.5,0.5 + parent: 1 + - uid: 1114 + components: + - type: Transform + pos: 4.5,1.5 + parent: 1 + - uid: 1115 + components: + - type: Transform + pos: 7.5,1.5 + parent: 1 +- proto: Bucket + entities: + - uid: 1016 + components: + - type: Transform + pos: -5.573845,11.243024 + parent: 1 +- proto: ButtonFrameCaution + entities: + - uid: 1020 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-15.5 + parent: 1 + - uid: 1021 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,-15.5 + parent: 1 + - uid: 1120 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,-3.5 + parent: 1 + - uid: 1121 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-3.5 + parent: 1 +- proto: CableApcExtension + entities: + - uid: 327 + components: + - type: Transform + pos: -10.5,3.5 + parent: 1 + - uid: 447 + components: + - type: Transform + pos: -3.5,3.5 + parent: 1 + - uid: 533 + components: + - type: Transform + pos: -12.5,-10.5 + parent: 1 + - uid: 534 + components: + - type: Transform + pos: -11.5,-10.5 + parent: 1 + - uid: 535 + components: + - type: Transform + pos: -10.5,-10.5 + parent: 1 + - uid: 536 + components: + - type: Transform + pos: -9.5,-10.5 + parent: 1 + - uid: 537 + components: + - type: Transform + pos: -9.5,-11.5 + parent: 1 + - uid: 538 + components: + - type: Transform + pos: -9.5,-12.5 + parent: 1 + - uid: 539 + components: + - type: Transform + pos: -9.5,-13.5 + parent: 1 + - uid: 540 + components: + - type: Transform + pos: -9.5,-14.5 + parent: 1 + - uid: 541 + components: + - type: Transform + pos: -9.5,-15.5 + parent: 1 + - uid: 542 + components: + - type: Transform + pos: 1.5,-15.5 + parent: 1 + - uid: 543 + components: + - type: Transform + pos: 1.5,-14.5 + parent: 1 + - uid: 544 + components: + - type: Transform + pos: 1.5,-13.5 + parent: 1 + - uid: 545 + components: + - type: Transform + pos: 1.5,-12.5 + parent: 1 + - uid: 547 + components: + - type: Transform + pos: 1.5,-11.5 + parent: 1 + - uid: 548 + components: + - type: Transform + pos: 1.5,-10.5 + parent: 1 + - uid: 549 + components: + - type: Transform + pos: 2.5,-10.5 + parent: 1 + - uid: 550 + components: + - type: Transform + pos: 3.5,-10.5 + parent: 1 + - uid: 551 + components: + - type: Transform + pos: 4.5,-10.5 + parent: 1 + - uid: 552 + components: + - type: Transform + pos: -9.5,-9.5 + parent: 1 + - uid: 553 + components: + - type: Transform + pos: -9.5,-8.5 + parent: 1 + - uid: 554 + components: + - type: Transform + pos: -9.5,-7.5 + parent: 1 + - uid: 555 + components: + - type: Transform + pos: -9.5,-6.5 + parent: 1 + - uid: 556 + components: + - type: Transform + pos: -9.5,-5.5 + parent: 1 + - uid: 557 + components: + - type: Transform + pos: 1.5,-9.5 + parent: 1 + - uid: 558 + components: + - type: Transform + pos: 1.5,-8.5 + parent: 1 + - uid: 559 + components: + - type: Transform + pos: 1.5,-7.5 + parent: 1 + - uid: 560 + components: + - type: Transform + pos: 1.5,-6.5 + parent: 1 + - uid: 561 + components: + - type: Transform + pos: 1.5,-5.5 + parent: 1 + - uid: 562 + components: + - type: Transform + pos: -8.5,-5.5 + parent: 1 + - uid: 563 + components: + - type: Transform + pos: -7.5,-5.5 + parent: 1 + - uid: 564 + components: + - type: Transform + pos: -6.5,-5.5 + parent: 1 + - uid: 565 + components: + - type: Transform + pos: -6.5,-4.5 + parent: 1 + - uid: 566 + components: + - type: Transform + pos: -5.5,-4.5 + parent: 1 + - uid: 567 + components: + - type: Transform + pos: -1.5,-4.5 + parent: 1 + - uid: 568 + components: + - type: Transform + pos: -1.5,-5.5 + parent: 1 + - uid: 569 + components: + - type: Transform + pos: -0.5,-5.5 + parent: 1 + - uid: 570 + components: + - type: Transform + pos: 0.5,-5.5 + parent: 1 + - uid: 571 + components: + - type: Transform + pos: 4.5,2.5 + parent: 1 + - uid: 572 + components: + - type: Transform + pos: 3.5,2.5 + parent: 1 + - uid: 573 + components: + - type: Transform + pos: 2.5,2.5 + parent: 1 + - uid: 574 + components: + - type: Transform + pos: -12.5,2.5 + parent: 1 + - uid: 575 + components: + - type: Transform + pos: -11.5,2.5 + parent: 1 + - uid: 576 + components: + - type: Transform + pos: -10.5,2.5 + parent: 1 + - uid: 585 + components: + - type: Transform + pos: -11.5,11.5 + parent: 1 + - uid: 586 + components: + - type: Transform + pos: -12.5,11.5 + parent: 1 + - uid: 587 + components: + - type: Transform + pos: -10.5,11.5 + parent: 1 + - uid: 598 + components: + - type: Transform + pos: -6.5,1.5 + parent: 1 + - uid: 599 + components: + - type: Transform + pos: -6.5,2.5 + parent: 1 + - uid: 600 + components: + - type: Transform + pos: -6.5,3.5 + parent: 1 + - uid: 602 + components: + - type: Transform + pos: -4.5,1.5 + parent: 1 + - uid: 603 + components: + - type: Transform + pos: -4.5,2.5 + parent: 1 + - uid: 604 + components: + - type: Transform + pos: -4.5,3.5 + parent: 1 + - uid: 605 + components: + - type: Transform + pos: -10.5,-5.5 + parent: 1 + - uid: 606 + components: + - type: Transform + pos: -10.5,-4.5 + parent: 1 + - uid: 614 + components: + - type: Transform + pos: -9.5,3.5 + parent: 1 + - uid: 615 + components: + - type: Transform + pos: -8.5,3.5 + parent: 1 + - uid: 616 + components: + - type: Transform + pos: -7.5,3.5 + parent: 1 + - uid: 617 + components: + - type: Transform + pos: -5.5,3.5 + parent: 1 + - uid: 618 + components: + - type: Transform + pos: -2.5,3.5 + parent: 1 + - uid: 620 + components: + - type: Transform + pos: -1.5,3.5 + parent: 1 + - uid: 621 + components: + - type: Transform + pos: -0.5,3.5 + parent: 1 + - uid: 622 + components: + - type: Transform + pos: 1.5,3.5 + parent: 1 + - uid: 623 + components: + - type: Transform + pos: 0.5,3.5 + parent: 1 + - uid: 624 + components: + - type: Transform + pos: 2.5,3.5 + parent: 1 + - uid: 625 + components: + - type: Transform + pos: 2.5,-5.5 + parent: 1 + - uid: 633 + components: + - type: Transform + pos: 2.5,-4.5 + parent: 1 + - uid: 641 + components: + - type: Transform + pos: -4.5,-4.5 + parent: 1 + - uid: 644 + components: + - type: Transform + pos: -11.5,-5.5 + parent: 1 + - uid: 645 + components: + - type: Transform + pos: -11.5,-6.5 + parent: 1 + - uid: 646 + components: + - type: Transform + pos: 3.5,-5.5 + parent: 1 + - uid: 647 + components: + - type: Transform + pos: 3.5,-6.5 + parent: 1 + - uid: 648 + components: + - type: Transform + pos: 3.5,-11.5 + parent: 1 + - uid: 649 + components: + - type: Transform + pos: 2.5,-12.5 + parent: 1 + - uid: 650 + components: + - type: Transform + pos: -11.5,-11.5 + parent: 1 + - uid: 651 + components: + - type: Transform + pos: -10.5,-12.5 + parent: 1 + - uid: 659 + components: + - type: Transform + pos: -10.5,7.5 + parent: 1 + - uid: 660 + components: + - type: Transform + pos: -9.5,8.5 + parent: 1 + - uid: 663 + components: + - type: Transform + pos: -3.5,1.5 + parent: 1 + - uid: 664 + components: + - type: Transform + pos: -10.5,1.5 + parent: 1 + - uid: 665 + components: + - type: Transform + pos: -10.5,0.5 + parent: 1 + - uid: 666 + components: + - type: Transform + pos: 2.5,1.5 + parent: 1 + - uid: 667 + components: + - type: Transform + pos: 2.5,0.5 + parent: 1 + - uid: 668 + components: + - type: Transform + pos: -10.5,-3.5 + parent: 1 + - uid: 669 + components: + - type: Transform + pos: 2.5,-3.5 + parent: 1 + - uid: 670 + components: + - type: Transform + pos: -13.5,2.5 + parent: 1 + - uid: 671 + components: + - type: Transform + pos: -13.5,1.5 + parent: 1 + - uid: 672 + components: + - type: Transform + pos: 5.5,2.5 + parent: 1 + - uid: 673 + components: + - type: Transform + pos: 5.5,1.5 + parent: 1 + - uid: 737 + components: + - type: Transform + pos: 2.5,11.5 + parent: 1 + - uid: 738 + components: + - type: Transform + pos: 2.5,10.5 + parent: 1 + - uid: 739 + components: + - type: Transform + pos: 2.5,9.5 + parent: 1 + - uid: 757 + components: + - type: Transform + pos: -9.5,7.5 + parent: 1 + - uid: 758 + components: + - type: Transform + pos: -11.5,7.5 + parent: 1 + - uid: 759 + components: + - type: Transform + pos: -11.5,6.5 + parent: 1 + - uid: 760 + components: + - type: Transform + pos: -11.5,8.5 + parent: 1 + - uid: 761 + components: + - type: Transform + pos: -11.5,9.5 + parent: 1 + - uid: 762 + components: + - type: Transform + pos: -11.5,10.5 + parent: 1 + - uid: 763 + components: + - type: Transform + pos: -8.5,8.5 + parent: 1 + - uid: 764 + components: + - type: Transform + pos: -7.5,8.5 + parent: 1 + - uid: 765 + components: + - type: Transform + pos: -6.5,8.5 + parent: 1 + - uid: 766 + components: + - type: Transform + pos: -5.5,8.5 + parent: 1 + - uid: 767 + components: + - type: Transform + pos: -4.5,8.5 + parent: 1 + - uid: 768 + components: + - type: Transform + pos: -3.5,8.5 + parent: 1 + - uid: 769 + components: + - type: Transform + pos: -2.5,8.5 + parent: 1 + - uid: 770 + components: + - type: Transform + pos: -2.5,9.5 + parent: 1 + - uid: 771 + components: + - type: Transform + pos: -1.5,9.5 + parent: 1 + - uid: 772 + components: + - type: Transform + pos: -0.5,9.5 + parent: 1 + - uid: 773 + components: + - type: Transform + pos: 1.5,9.5 + parent: 1 + - uid: 774 + components: + - type: Transform + pos: 0.5,9.5 + parent: 1 + - uid: 775 + components: + - type: Transform + pos: 2.5,8.5 + parent: 1 + - uid: 776 + components: + - type: Transform + pos: 2.5,7.5 + parent: 1 + - uid: 777 + components: + - type: Transform + pos: 2.5,6.5 + parent: 1 + - uid: 778 + components: + - type: Transform + pos: 2.5,5.5 + parent: 1 + - uid: 779 + components: + - type: Transform + pos: -2.5,10.5 + parent: 1 + - uid: 780 + components: + - type: Transform + pos: -2.5,11.5 + parent: 1 + - uid: 781 + components: + - type: Transform + pos: -3.5,11.5 + parent: 1 + - uid: 797 + components: + - type: Transform + pos: 2.5,12.5 + parent: 1 +- proto: CableHV + entities: + - uid: 67 + components: + - type: Transform + pos: -5.5,0.5 + parent: 1 + - uid: 68 + components: + - type: Transform + pos: -4.5,-0.5 + parent: 1 + - uid: 183 + components: + - type: Transform + pos: -6.5,0.5 + parent: 1 + - uid: 184 + components: + - type: Transform + pos: -4.5,0.5 + parent: 1 + - uid: 381 + components: + - type: Transform + pos: -3.5,-0.5 + parent: 1 + - uid: 382 + components: + - type: Transform + pos: -3.5,-1.5 + parent: 1 + - uid: 384 + components: + - type: Transform + pos: -4.5,-1.5 + parent: 1 + - uid: 449 + components: + - type: Transform + pos: -3.5,-2.5 + parent: 1 + - uid: 476 + components: + - type: Transform + pos: -6.5,-0.5 + parent: 1 + - uid: 505 + components: + - type: Transform + pos: -7.5,-0.5 + parent: 1 + - uid: 506 + components: + - type: Transform + pos: -7.5,0.5 + parent: 1 +- proto: CableMV + entities: + - uid: 149 + components: + - type: Transform + pos: -7.5,3.5 + parent: 1 + - uid: 176 + components: + - type: Transform + pos: -8.5,3.5 + parent: 1 + - uid: 186 + components: + - type: Transform + pos: -10.5,-10.5 + parent: 1 + - uid: 189 + components: + - type: Transform + pos: -3.5,-3.5 + parent: 1 + - uid: 237 + components: + - type: Transform + pos: -5.5,3.5 + parent: 1 + - uid: 280 + components: + - type: Transform + pos: -6.5,3.5 + parent: 1 + - uid: 281 + components: + - type: Transform + pos: -5.5,2.5 + parent: 1 + - uid: 283 + components: + - type: Transform + pos: -5.5,1.5 + parent: 1 + - uid: 284 + components: + - type: Transform + pos: -5.5,0.5 + parent: 1 + - uid: 285 + components: + - type: Transform + pos: -4.5,0.5 + parent: 1 + - uid: 502 + components: + - type: Transform + pos: -3.5,-4.5 + parent: 1 + - uid: 503 + components: + - type: Transform + pos: -3.5,-2.5 + parent: 1 + - uid: 504 + components: + - type: Transform + pos: -11.5,-10.5 + parent: 1 + - uid: 507 + components: + - type: Transform + pos: -3.5,-5.5 + parent: 1 + - uid: 508 + components: + - type: Transform + pos: -9.5,-10.5 + parent: 1 + - uid: 509 + components: + - type: Transform + pos: -9.5,-9.5 + parent: 1 + - uid: 510 + components: + - type: Transform + pos: -9.5,-8.5 + parent: 1 + - uid: 511 + components: + - type: Transform + pos: -9.5,-7.5 + parent: 1 + - uid: 512 + components: + - type: Transform + pos: -9.5,-6.5 + parent: 1 + - uid: 513 + components: + - type: Transform + pos: -9.5,-5.5 + parent: 1 + - uid: 514 + components: + - type: Transform + pos: -8.5,-5.5 + parent: 1 + - uid: 515 + components: + - type: Transform + pos: -7.5,-5.5 + parent: 1 + - uid: 516 + components: + - type: Transform + pos: -6.5,-5.5 + parent: 1 + - uid: 517 + components: + - type: Transform + pos: -5.5,-5.5 + parent: 1 + - uid: 518 + components: + - type: Transform + pos: -4.5,-5.5 + parent: 1 + - uid: 519 + components: + - type: Transform + pos: 4.5,-10.5 + parent: 1 + - uid: 520 + components: + - type: Transform + pos: 3.5,-10.5 + parent: 1 + - uid: 521 + components: + - type: Transform + pos: 2.5,-10.5 + parent: 1 + - uid: 522 + components: + - type: Transform + pos: 1.5,-10.5 + parent: 1 + - uid: 523 + components: + - type: Transform + pos: 1.5,-9.5 + parent: 1 + - uid: 524 + components: + - type: Transform + pos: 1.5,-8.5 + parent: 1 + - uid: 525 + components: + - type: Transform + pos: 1.5,-7.5 + parent: 1 + - uid: 526 + components: + - type: Transform + pos: 1.5,-6.5 + parent: 1 + - uid: 527 + components: + - type: Transform + pos: 1.5,-5.5 + parent: 1 + - uid: 528 + components: + - type: Transform + pos: 0.5,-5.5 + parent: 1 + - uid: 529 + components: + - type: Transform + pos: -0.5,-5.5 + parent: 1 + - uid: 530 + components: + - type: Transform + pos: -1.5,-5.5 + parent: 1 + - uid: 531 + components: + - type: Transform + pos: -2.5,-5.5 + parent: 1 + - uid: 532 + components: + - type: Transform + pos: -12.5,-10.5 + parent: 1 + - uid: 642 + components: + - type: Transform + pos: -9.5,8.5 + parent: 1 + - uid: 643 + components: + - type: Transform + pos: -8.5,8.5 + parent: 1 + - uid: 661 + components: + - type: Transform + pos: -3.5,0.5 + parent: 1 + - uid: 662 + components: + - type: Transform + pos: -3.5,1.5 + parent: 1 + - uid: 747 + components: + - type: Transform + pos: -9.5,3.5 + parent: 1 + - uid: 748 + components: + - type: Transform + pos: -10.5,3.5 + parent: 1 + - uid: 749 + components: + - type: Transform + pos: -10.5,4.5 + parent: 1 + - uid: 750 + components: + - type: Transform + pos: -10.5,5.5 + parent: 1 + - uid: 751 + components: + - type: Transform + pos: -10.5,6.5 + parent: 1 + - uid: 752 + components: + - type: Transform + pos: -10.5,7.5 + parent: 1 + - uid: 753 + components: + - type: Transform + pos: -9.5,7.5 + parent: 1 + - uid: 754 + components: + - type: Transform + pos: -4.5,-2.5 + parent: 1 + - uid: 755 + components: + - type: Transform + pos: -4.5,-1.5 + parent: 1 + - uid: 756 + components: + - type: Transform + pos: -4.5,-0.5 + parent: 1 + - uid: 1043 + components: + - type: Transform + pos: -7.5,8.5 + parent: 1 + - uid: 1044 + components: + - type: Transform + pos: -6.5,8.5 + parent: 1 + - uid: 1045 + components: + - type: Transform + pos: -5.5,8.5 + parent: 1 + - uid: 1046 + components: + - type: Transform + pos: -4.5,8.5 + parent: 1 + - uid: 1047 + components: + - type: Transform + pos: -3.5,8.5 + parent: 1 + - uid: 1048 + components: + - type: Transform + pos: -2.5,8.5 + parent: 1 + - uid: 1049 + components: + - type: Transform + pos: -1.5,8.5 + parent: 1 + - uid: 1050 + components: + - type: Transform + pos: -0.5,8.5 + parent: 1 + - uid: 1051 + components: + - type: Transform + pos: 0.5,8.5 + parent: 1 + - uid: 1052 + components: + - type: Transform + pos: 1.5,8.5 + parent: 1 + - uid: 1053 + components: + - type: Transform + pos: 2.5,8.5 + parent: 1 + - uid: 1054 + components: + - type: Transform + pos: 2.5,7.5 + parent: 1 + - uid: 1055 + components: + - type: Transform + pos: 2.5,6.5 + parent: 1 + - uid: 1056 + components: + - type: Transform + pos: 2.5,5.5 + parent: 1 + - uid: 1057 + components: + - type: Transform + pos: 2.5,0.5 + parent: 1 + - uid: 1058 + components: + - type: Transform + pos: 2.5,4.5 + parent: 1 + - uid: 1059 + components: + - type: Transform + pos: 2.5,3.5 + parent: 1 + - uid: 1060 + components: + - type: Transform + pos: 2.5,-5.5 + parent: 1 + - uid: 1061 + components: + - type: Transform + pos: 2.5,-4.5 + parent: 1 + - uid: 1062 + components: + - type: Transform + pos: 2.5,-3.5 + parent: 1 + - uid: 1063 + components: + - type: Transform + pos: 2.5,-2.5 + parent: 1 + - uid: 1064 + components: + - type: Transform + pos: 2.5,-1.5 + parent: 1 + - uid: 1066 + components: + - type: Transform + pos: 2.5,-0.5 + parent: 1 + - uid: 1067 + components: + - type: Transform + pos: 2.5,1.5 + parent: 1 + - uid: 1068 + components: + - type: Transform + pos: 2.5,2.5 + parent: 1 +- proto: CableTerminal + entities: + - uid: 383 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,-1.5 + parent: 1 + - uid: 478 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,-0.5 + parent: 1 +- proto: CapacitorStockPart + entities: + - uid: 589 + components: + - type: Transform + pos: 1.3028102,-1.328778 + parent: 1 +- proto: CarpetPurple + entities: + - uid: 1010 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,10.5 + parent: 1 + - uid: 1011 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,10.5 + parent: 1 + - uid: 1012 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,9.5 + parent: 1 + - uid: 1013 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,9.5 + parent: 1 +- proto: Catwalk + entities: + - uid: 33 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,3.5 + parent: 1 + - uid: 56 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,3.5 + parent: 1 + - uid: 69 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,2.5 + parent: 1 + - uid: 71 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,3.5 + parent: 1 + - uid: 179 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,1.5 + parent: 1 + - uid: 227 + components: + - type: Transform + pos: -14.5,2.5 + parent: 1 + - uid: 247 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-15.5 + parent: 1 + - uid: 248 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-14.5 + parent: 1 + - uid: 249 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-13.5 + parent: 1 + - uid: 250 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-12.5 + parent: 1 + - uid: 251 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-11.5 + parent: 1 + - uid: 252 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-10.5 + parent: 1 + - uid: 253 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-9.5 + parent: 1 + - uid: 254 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-8.5 + parent: 1 + - uid: 255 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-7.5 + parent: 1 + - uid: 256 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-6.5 + parent: 1 + - uid: 257 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-5.5 + parent: 1 + - uid: 266 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,-1.5 + parent: 1 + - uid: 278 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,-5.5 + parent: 1 + - uid: 279 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,-6.5 + parent: 1 + - uid: 282 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,-8.5 + parent: 1 + - uid: 286 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,-10.5 + parent: 1 + - uid: 287 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,-11.5 + parent: 1 + - uid: 288 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,-12.5 + parent: 1 + - uid: 289 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,-12.5 + parent: 1 + - uid: 290 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,-13.5 + parent: 1 + - uid: 291 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,-14.5 + parent: 1 + - uid: 292 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,-14.5 + parent: 1 + - uid: 295 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-15.5 + parent: 1 + - uid: 296 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-14.5 + parent: 1 + - uid: 297 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-13.5 + parent: 1 + - uid: 298 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-12.5 + parent: 1 + - uid: 299 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-11.5 + parent: 1 + - uid: 300 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-10.5 + parent: 1 + - uid: 301 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-9.5 + parent: 1 + - uid: 302 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-8.5 + parent: 1 + - uid: 303 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-7.5 + parent: 1 + - uid: 304 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-5.5 + parent: 1 + - uid: 305 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-15.5 + parent: 1 + - uid: 306 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-6.5 + parent: 1 + - uid: 307 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-14.5 + parent: 1 + - uid: 308 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-13.5 + parent: 1 + - uid: 309 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-11.5 + parent: 1 + - uid: 310 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-10.5 + parent: 1 + - uid: 311 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-9.5 + parent: 1 + - uid: 312 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-12.5 + parent: 1 + - uid: 313 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-8.5 + parent: 1 + - uid: 314 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-7.5 + parent: 1 + - uid: 315 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-6.5 + parent: 1 + - uid: 316 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-5.5 + parent: 1 + - uid: 320 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-4.5 + parent: 1 + - uid: 321 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-1.5 + parent: 1 + - uid: 322 + components: + - type: Transform + pos: -7.5,-6.5 + parent: 1 + - uid: 325 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,3.5 + parent: 1 + - uid: 328 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,-0.5 + parent: 1 + - uid: 329 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,-5.5 + parent: 1 + - uid: 330 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,-6.5 + parent: 1 + - uid: 331 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,-7.5 + parent: 1 + - uid: 332 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,-8.5 + parent: 1 + - uid: 333 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,-9.5 + parent: 1 + - uid: 334 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,-10.5 + parent: 1 + - uid: 335 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,-11.5 + parent: 1 + - uid: 336 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,-12.5 + parent: 1 + - uid: 337 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,-13.5 + parent: 1 + - uid: 338 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,-15.5 + parent: 1 + - uid: 339 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,-14.5 + parent: 1 + - uid: 340 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-15.5 + parent: 1 + - uid: 341 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-14.5 + parent: 1 + - uid: 342 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-13.5 + parent: 1 + - uid: 343 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-12.5 + parent: 1 + - uid: 344 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-11.5 + parent: 1 + - uid: 345 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-10.5 + parent: 1 + - uid: 346 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-9.5 + parent: 1 + - uid: 347 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-8.5 + parent: 1 + - uid: 348 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-7.5 + parent: 1 + - uid: 349 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-6.5 + parent: 1 + - uid: 350 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-5.5 + parent: 1 + - uid: 351 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-5.5 + parent: 1 + - uid: 352 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-6.5 + parent: 1 + - uid: 353 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-7.5 + parent: 1 + - uid: 354 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-8.5 + parent: 1 + - uid: 355 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-9.5 + parent: 1 + - uid: 356 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-10.5 + parent: 1 + - uid: 357 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-11.5 + parent: 1 + - uid: 358 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-12.5 + parent: 1 + - uid: 359 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-13.5 + parent: 1 + - uid: 360 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-14.5 + parent: 1 + - uid: 361 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-15.5 + parent: 1 + - uid: 362 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-15.5 + parent: 1 + - uid: 363 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-14.5 + parent: 1 + - uid: 364 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-13.5 + parent: 1 + - uid: 365 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-12.5 + parent: 1 + - uid: 366 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-11.5 + parent: 1 + - uid: 367 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-10.5 + parent: 1 + - uid: 368 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-9.5 + parent: 1 + - uid: 369 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-8.5 + parent: 1 + - uid: 370 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-7.5 + parent: 1 + - uid: 371 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-5.5 + parent: 1 + - uid: 372 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-6.5 + parent: 1 + - uid: 373 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,-5.5 + parent: 1 + - uid: 374 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,-5.5 + parent: 1 + - uid: 375 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,-5.5 + parent: 1 + - uid: 376 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-5.5 + parent: 1 + - uid: 385 + components: + - type: Transform + pos: -7.5,-7.5 + parent: 1 + - uid: 419 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,3.5 + parent: 1 + - uid: 420 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,3.5 + parent: 1 + - uid: 421 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,3.5 + parent: 1 + - uid: 422 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,3.5 + parent: 1 + - uid: 423 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,3.5 + parent: 1 + - uid: 424 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,3.5 + parent: 1 + - uid: 425 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,-4.5 + parent: 1 + - uid: 426 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-5.5 + parent: 1 + - uid: 427 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-2.5 + parent: 1 + - uid: 428 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.5,3.5 + parent: 1 + - uid: 429 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,2.5 + parent: 1 + - uid: 430 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,3.5 + parent: 1 + - uid: 431 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,4.5 + parent: 1 + - uid: 433 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,6.5 + parent: 1 + - uid: 434 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,7.5 + parent: 1 + - uid: 435 + components: + - type: Transform + pos: -7.5,-9.5 + parent: 1 + - uid: 436 + components: + - type: Transform + pos: -7.5,-15.5 + parent: 1 + - uid: 438 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,9.5 + parent: 1 + - uid: 440 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,-5.5 + parent: 1 + - uid: 441 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,3.5 + parent: 1 + - uid: 442 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,2.5 + parent: 1 + - uid: 444 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,0.5 + parent: 1 + - uid: 461 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-3.5 + parent: 1 + - uid: 577 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,5.5 + parent: 1 + - uid: 579 + components: + - type: Transform + pos: 2.5,8.5 + parent: 1 + - uid: 626 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,1.5 + parent: 1 + - uid: 627 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-0.5 + parent: 1 + - uid: 629 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,1.5 + parent: 1 + - uid: 630 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,-2.5 + parent: 1 + - uid: 632 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,-3.5 + parent: 1 + - uid: 676 + components: + - type: Transform + pos: 6.5,3.5 + parent: 1 + - uid: 677 + components: + - type: Transform + pos: 6.5,2.5 + parent: 1 + - uid: 681 + components: + - type: Transform + pos: 6.5,1.5 + parent: 1 + - uid: 682 + components: + - type: Transform + pos: -14.5,3.5 + parent: 1 + - uid: 683 + components: + - type: Transform + pos: -14.5,1.5 + parent: 1 + - uid: 685 + components: + - type: Transform + pos: -13.5,1.5 + parent: 1 + - uid: 686 + components: + - type: Transform + pos: -13.5,2.5 + parent: 1 + - uid: 687 + components: + - type: Transform + pos: -13.5,3.5 + parent: 1 + - uid: 688 + components: + - type: Transform + pos: 5.5,1.5 + parent: 1 + - uid: 689 + components: + - type: Transform + pos: 5.5,2.5 + parent: 1 + - uid: 690 + components: + - type: Transform + pos: 5.5,3.5 + parent: 1 + - uid: 852 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,3.5 + parent: 1 + - uid: 970 + components: + - type: Transform + pos: 1.5,13.5 + parent: 1 + - uid: 971 + components: + - type: Transform + pos: 2.5,13.5 + parent: 1 + - uid: 972 + components: + - type: Transform + pos: 3.5,13.5 + parent: 1 + - uid: 973 + components: + - type: Transform + pos: 3.5,12.5 + parent: 1 + - uid: 974 + components: + - type: Transform + pos: 2.5,12.5 + parent: 1 + - uid: 975 + components: + - type: Transform + pos: 1.5,12.5 + parent: 1 +- proto: Chair + entities: + - uid: 789 + components: + - type: Transform + pos: 0.5,6.5 + parent: 1 + - uid: 790 + components: + - type: Transform + pos: -0.5,6.5 + parent: 1 + - uid: 791 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,5.5 + parent: 1 + - uid: 1038 + components: + - type: Transform + pos: -7.5,6.5 + parent: 1 +- proto: ChairPilotSeat + entities: + - uid: 674 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,11.5 + parent: 1 + - uid: 692 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,11.5 + parent: 1 + - uid: 694 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -12.5,9.5 + parent: 1 +- proto: CircuitImprinter + entities: + - uid: 591 + components: + - type: Transform + pos: 1.5,-0.5 + parent: 1 +- proto: ClosetWallFireFilledRandom + entities: + - uid: 417 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,5.5 + parent: 1 +- proto: ClosetWallMaintenanceFilledRandom + entities: + - uid: 497 + components: + - type: Transform + pos: -6.5,11.5 + parent: 1 +- proto: ClosetWallO2N2FilledRandom + entities: + - uid: 135 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,10.5 + parent: 1 + - uid: 136 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-7.5 + parent: 1 + - uid: 140 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -12.5,-7.5 + parent: 1 + - uid: 1129 + components: + - type: Transform + pos: -7.5,4.5 + parent: 1 +- proto: ComputerPowerMonitoring + entities: + - uid: 470 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-0.5 + parent: 1 +- proto: ComputerTabletopCrewMonitoring + entities: + - uid: 432 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -13.5,11.5 + parent: 1 +- proto: ComputerTabletopRadar + entities: + - uid: 679 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -13.5,9.5 + parent: 1 +- proto: ComputerTabletopSalvageExpedition + entities: + - uid: 695 + components: + - type: Transform + pos: -11.5,12.5 + parent: 1 +- proto: ComputerTabletopShuttle + entities: + - uid: 680 + components: + - type: Transform + pos: -12.5,12.5 + parent: 1 +- proto: ComputerTabletopStationRecords + entities: + - uid: 418 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -13.5,10.5 + parent: 1 +- proto: ComputerWallmountWithdrawBankATM + entities: + - uid: 1023 + components: + - type: Transform + pos: -4.5,9.5 + parent: 1 +- proto: ConveyorBelt + entities: + - uid: 36 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -15.5,1.5 + parent: 1 + - uid: 39 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,1.5 + parent: 1 + - uid: 48 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,1.5 + parent: 1 + - uid: 477 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,1.5 + parent: 1 + - uid: 488 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,-5.5 + parent: 1 + - uid: 490 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -12.5,1.5 + parent: 1 + - uid: 491 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -11.5,1.5 + parent: 1 + - uid: 582 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,-4.5 + parent: 1 + - uid: 1004 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -13.5,1.5 + parent: 1 + - uid: 1028 + components: + - type: Transform + pos: 3.5,-3.5 + parent: 1 + - uid: 1085 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,0.5 + parent: 1 + - uid: 1086 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,-0.5 + parent: 1 + - uid: 1087 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,-1.5 + parent: 1 + - uid: 1088 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,-2.5 + parent: 1 + - uid: 1089 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,-3.5 + parent: 1 + - uid: 1091 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,-6.5 + parent: 1 + - uid: 1092 + components: + - type: Transform + pos: 3.5,-2.5 + parent: 1 + - uid: 1093 + components: + - type: Transform + pos: 3.5,-1.5 + parent: 1 + - uid: 1094 + components: + - type: Transform + pos: 3.5,-0.5 + parent: 1 + - uid: 1095 + components: + - type: Transform + pos: 3.5,0.5 + parent: 1 + - uid: 1096 + components: + - type: Transform + pos: 3.5,1.5 + parent: 1 + - uid: 1097 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,1.5 + parent: 1 + - uid: 1098 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,1.5 + parent: 1 + - uid: 1099 + components: + - type: Transform + pos: 3.5,-4.5 + parent: 1 + - uid: 1100 + components: + - type: Transform + pos: 3.5,-5.5 + parent: 1 + - uid: 1101 + components: + - type: Transform + pos: 3.5,-6.5 + parent: 1 +- proto: CrateMaterials + entities: + - uid: 816 + components: + - type: Transform + pos: 3.5,-2.5 + parent: 1 +- proto: CrowbarGreen + entities: + - uid: 590 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.66682,-12.7192 + parent: 1 +- proto: DefaultStationBeaconAME + entities: + - uid: 976 + components: + - type: Transform + pos: -5.5,-0.5 + parent: 1 +- proto: DefaultStationBeaconAtmospherics + entities: + - uid: 966 + components: + - type: Transform + pos: -1.5,-2.5 + parent: 1 +- proto: DefaultStationBeaconBridge + entities: + - uid: 1125 + components: + - type: Transform + pos: -11.5,10.5 + parent: 1 +- proto: DefaultStationBeaconCargoBay + entities: + - uid: 1126 + components: + - type: Transform + pos: -3.5,-9.5 + parent: 1 +- proto: DefaultStationBeaconDorms + entities: + - uid: 1127 + components: + - type: Transform + pos: -5.5,6.5 + parent: 1 +- proto: DefaultStationBeaconKitchen + entities: + - uid: 967 + components: + - type: Transform + pos: -2.5,10.5 + parent: 1 +- proto: DefibrillatorCabinetFilled + entities: + - uid: 142 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -12.5,7.5 + parent: 1 +- proto: EmergencyLight + entities: + - uid: 107 + components: + - type: Transform + pos: -2.5,-5.5 + parent: 1 + - type: Battery + startingCharge: 30000 + - uid: 457 + components: + - type: Transform + pos: -9.5,3.5 + parent: 1 + - type: Battery + startingCharge: 30000 + - uid: 1032 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,9.5 + parent: 1 + - type: Battery + startingCharge: 30000 + - uid: 1033 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,7.5 + parent: 1 + - type: Battery + startingCharge: 30000 +- proto: EngineeringTechFab + entities: + - uid: 978 + components: + - type: Transform + pos: 3.5,-7.5 + parent: 1 +- proto: ExtinguisherCabinetFilled + entities: + - uid: 446 + components: + - type: Transform + pos: -6.5,7.5 + parent: 1 + - uid: 450 + components: + - type: Transform + pos: -12.5,-8.5 + parent: 1 + - uid: 452 + components: + - type: Transform + pos: 4.5,-8.5 + parent: 1 +- proto: FaxMachineShip + entities: + - uid: 991 + components: + - type: Transform + pos: -10.5,12.5 + parent: 1 +- proto: Firelock + entities: + - uid: 1116 + components: + - type: Transform + pos: -11.5,0.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 1003 + - uid: 1117 + components: + - type: Transform + pos: 3.5,0.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 1003 +- proto: FirelockGlass + entities: + - uid: 794 + components: + - type: Transform + pos: -10.5,0.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 1003 + - uid: 951 + components: + - type: Transform + pos: 2.5,0.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 1003 + - uid: 1000 + components: + - type: Transform + pos: -10.5,4.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 1002 + - uid: 1001 + components: + - type: Transform + pos: 0.5,9.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 1002 +- proto: FlashlightLantern + entities: + - uid: 1035 + components: + - type: Transform + pos: -9.327917,-2.2779932 + parent: 1 +- proto: FloorDrain + entities: + - uid: 896 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,11.5 + parent: 1 + - type: Fixtures + fixtures: {} +- proto: FoodShakerPepper + entities: + - uid: 793 + components: + - type: Transform + pos: 0.031318903,5.7154756 + parent: 1 +- proto: FoodShakerSalt + entities: + - uid: 792 + components: + - type: Transform + pos: -0.1718061,5.5434813 + parent: 1 +- proto: GasFilterOxygenOnFlipped + entities: + - uid: 469 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' +- proto: GasMixerOn + entities: + - uid: 744 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-0.5 + parent: 1 + - type: GasMixer + inletTwoConcentration: 0.79 + inletOneConcentration: 0.21 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasPassiveVent + entities: + - uid: 493 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' +- proto: GasPipeBend + entities: + - uid: 453 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 479 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 485 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,-3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 578 + components: + - type: Transform + pos: 2.5,10.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 840 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,-5.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 841 + components: + - type: Transform + pos: -6.5,-5.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 870 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 878 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 879 + components: + - type: Transform + pos: 3.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 915 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -11.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 922 + components: + - type: Transform + pos: -10.5,6.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 946 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-5.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' +- proto: GasPipeFourway + entities: + - uid: 32 + components: + - type: Transform + pos: -1.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 472 + components: + - type: Transform + pos: -1.5,-3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' +- proto: GasPipeStraight + entities: + - uid: 265 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 324 + components: + - type: Transform + pos: -1.5,1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 439 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 480 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 481 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 483 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 495 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 496 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 583 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-5.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 607 + components: + - type: Transform + pos: -1.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 636 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-4.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 801 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-11.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 802 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-11.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 803 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,-11.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 804 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,-11.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 805 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,-11.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 806 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,-11.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 807 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,-11.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 808 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.5,-11.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 809 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-11.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 810 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-11.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 811 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-11.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 812 + components: + - type: Transform + pos: -1.5,-10.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 813 + components: + - type: Transform + pos: -1.5,-9.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 814 + components: + - type: Transform + pos: -1.5,-8.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 815 + components: + - type: Transform + pos: -1.5,-7.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 820 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,-7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 821 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,-7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 822 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.5,-7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 823 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,-7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 824 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,-7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 825 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 826 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 827 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 828 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 829 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 830 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 831 + components: + - type: Transform + pos: -6.5,-6.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 832 + components: + - type: Transform + pos: -10.5,-4.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 833 + components: + - type: Transform + pos: -10.5,-3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 834 + components: + - type: Transform + pos: -10.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 835 + components: + - type: Transform + pos: -10.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 836 + components: + - type: Transform + pos: -10.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 837 + components: + - type: Transform + pos: -10.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 838 + components: + - type: Transform + pos: -10.5,1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 842 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,-5.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 843 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,-5.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 844 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,-5.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 846 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 848 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 849 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -6.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 851 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 853 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 854 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,4.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 855 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,4.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 856 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,4.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 864 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,5.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 865 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 866 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 867 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 868 + components: + - type: Transform + pos: 2.5,4.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 872 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 873 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 874 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 875 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 883 + components: + - type: Transform + pos: 3.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 884 + components: + - type: Transform + pos: 3.5,4.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 885 + components: + - type: Transform + pos: 3.5,5.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 886 + components: + - type: Transform + pos: 3.5,6.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 887 + components: + - type: Transform + pos: 3.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 888 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 889 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 890 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 891 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 892 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 893 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 897 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 898 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 899 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 900 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,9.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 901 + components: + - type: Transform + pos: 2.5,6.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 902 + components: + - type: Transform + pos: 2.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 903 + components: + - type: Transform + pos: 2.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 904 + components: + - type: Transform + pos: 2.5,9.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 905 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,10.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 906 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,10.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 907 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,10.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 908 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,10.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 909 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,10.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 910 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,10.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 911 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,10.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 913 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 914 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,6.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 917 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 918 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 919 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 920 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,4.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 921 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,5.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 929 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 930 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 931 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 932 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 933 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 934 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 935 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 936 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 937 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -6.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 938 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 939 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 941 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-5.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 942 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-5.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 943 + components: + - type: Transform + pos: 2.5,-4.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 944 + components: + - type: Transform + pos: 2.5,-3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' +- proto: GasPipeTJunction + entities: + - uid: 293 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 294 + components: + - type: Transform + pos: -0.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 584 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-5.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 786 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 798 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-11.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 819 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 839 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 845 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 847 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 850 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 869 + components: + - type: Transform + pos: -1.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 871 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,5.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 877 + components: + - type: Transform + pos: 2.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 880 + components: + - type: Transform + pos: -3.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 881 + components: + - type: Transform + pos: -5.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 882 + components: + - type: Transform + pos: -7.5,8.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' +- proto: GasPort + entities: + - uid: 208 + components: + - type: Transform + pos: -0.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 462 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 611 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasPressurePumpOn + entities: + - uid: 156 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-6.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 159 + components: + - type: Transform + pos: 2.5,1.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 162 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' +- proto: GasVentPump + entities: + - uid: 482 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 608 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 703 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,10.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 1002 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 727 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,5.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 1002 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 817 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-7.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 1003 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 818 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,-7.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 1003 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 857 + components: + - type: Transform + pos: -3.5,5.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 1002 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 858 + components: + - type: Transform + pos: -5.5,5.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 1002 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 859 + components: + - type: Transform + pos: -7.5,5.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 1002 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 923 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -11.5,6.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 1002 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 928 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -11.5,2.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 1002 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasVentScrubber + entities: + - uid: 209 + components: + - type: Transform + pos: -1.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 609 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 799 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-11.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 1003 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 800 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,-11.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 1003 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 860 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,6.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 1002 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 861 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,6.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 1002 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 862 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,6.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 1002 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 895 + components: + - type: Transform + pos: -6.5,10.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 1002 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 912 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,5.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 1002 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 916 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,7.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 1002 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 940 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.5,2.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 1002 + - type: AtmosPipeColor + color: '#990000FF' +- proto: GravityGeneratorMini + entities: + - uid: 459 + components: + - type: Transform + pos: 5.5,-9.5 + parent: 1 +- proto: Grille + entities: + - uid: 16 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,4.5 + parent: 1 + - uid: 129 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,8.5 + parent: 1 + - uid: 130 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,9.5 + parent: 1 + - uid: 170 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -12.5,-2.5 + parent: 1 + - uid: 196 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,9.5 + parent: 1 + - uid: 197 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,10.5 + parent: 1 + - uid: 198 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,11.5 + parent: 1 + - uid: 199 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,12.5 + parent: 1 + - uid: 200 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -13.5,13.5 + parent: 1 + - uid: 201 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -12.5,13.5 + parent: 1 + - uid: 202 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -11.5,13.5 + parent: 1 + - uid: 203 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,13.5 + parent: 1 + - uid: 204 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,12.5 + parent: 1 + - uid: 205 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -13.5,8.5 + parent: 1 + - uid: 206 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -6.5,1.5 + parent: 1 + - uid: 210 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,4.5 + parent: 1 + - uid: 211 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,5.5 + parent: 1 + - uid: 212 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,6.5 + parent: 1 + - uid: 213 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,7.5 + parent: 1 + - uid: 235 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,4.5 + parent: 1 + - uid: 473 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-4.5 + parent: 1 + - uid: 474 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,-4.5 + parent: 1 + - uid: 475 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,-4.5 + parent: 1 + - uid: 619 + components: + - type: Transform + pos: -4.5,-4.5 + parent: 1 + - uid: 635 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -12.5,-3.5 + parent: 1 + - uid: 735 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,-3.5 + parent: 1 + - uid: 736 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,11.5 + parent: 1 + - uid: 995 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,-2.5 + parent: 1 +- proto: GrilleDiagonal + entities: + - uid: 191 + components: + - type: Transform + pos: -14.5,13.5 + parent: 1 + - uid: 192 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,13.5 + parent: 1 + - uid: 193 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -14.5,8.5 + parent: 1 + - uid: 194 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,4.5 + parent: 1 + - uid: 195 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,7.5 + parent: 1 +- proto: Gyroscope + entities: + - uid: 413 + components: + - type: Transform + pos: 5.5,-8.5 + parent: 1 + - uid: 414 + components: + - type: Transform + pos: -13.5,-8.5 + parent: 1 +- proto: KitchenKnife + entities: + - uid: 1124 + components: + - type: Transform + pos: -3.518915,10.611288 + parent: 1 +- proto: LightBulb + entities: + - uid: 277 + components: + - type: Transform + parent: 276 + - type: Physics + canCollide: False + - uid: 395 + components: + - type: Transform + parent: 393 + - type: Physics + canCollide: False +- proto: LockerAtmosphericsFilled + entities: + - uid: 592 + components: + - type: Transform + pos: -0.5,0.5 + parent: 1 +- proto: LockerChiefEngineerFilledHardsuit + entities: + - uid: 103 + components: + - type: Transform + pos: -11.5,6.5 + parent: 1 +- proto: LockerEngineerFilledHardsuit + entities: + - uid: 1128 + components: + - type: Transform + pos: -3.5,0.5 + parent: 1 +- proto: LockerFreezerBase + entities: + - uid: 784 + components: + - type: Transform + pos: -2.5,11.5 + parent: 1 +- proto: LockerSalvageSpecialistFilled + entities: + - uid: 593 + components: + - type: Transform + pos: -9.5,-1.5 + parent: 1 +- proto: LockerWallColorCaptain + entities: + - uid: 111 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -6.5,6.5 + parent: 1 +- proto: LockerWallColorGeneric + entities: + - uid: 959 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,6.5 + parent: 1 + - uid: 1008 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,6.5 + parent: 1 +- proto: LockerWallEVAColorSalvageFilled + entities: + - uid: 263 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,-14.5 + parent: 1 +- proto: LockerWallMaterialsFuelAmeJarFilled + entities: + - uid: 1019 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,0.5 + parent: 1 +- proto: MicroManipulatorStockPart + entities: + - uid: 945 + components: + - type: Transform + pos: 1.5528102,-2.126207 + parent: 1 +- proto: MopItem + entities: + - uid: 1015 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.511345,11.336839 + parent: 1 +- proto: NitrogenCanister + entities: + - uid: 949 + components: + - type: Transform + anchored: True + pos: -0.5,-0.5 + parent: 1 + - type: Physics + bodyType: Static +- proto: OxygenCanister + entities: + - uid: 948 + components: + - type: Transform + anchored: True + pos: -0.5,-1.5 + parent: 1 + - type: Physics + bodyType: Static +- proto: PlasticFlapsAirtightClear + entities: + - uid: 1102 + components: + - type: Transform + pos: -15.5,1.5 + parent: 1 + - uid: 1103 + components: + - type: Transform + pos: -12.5,1.5 + parent: 1 + - uid: 1104 + components: + - type: Transform + pos: 4.5,1.5 + parent: 1 + - uid: 1105 + components: + - type: Transform + pos: 7.5,1.5 + parent: 1 + - uid: 1106 + components: + - type: Transform + pos: -11.5,0.5 + parent: 1 + - uid: 1107 + components: + - type: Transform + pos: 3.5,0.5 + parent: 1 +- proto: PottedPlantRandom + entities: + - uid: 958 + components: + - type: Transform + pos: -0.5,10.5 + parent: 1 +- proto: PowerCellRecharger + entities: + - uid: 588 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -11.5,5.5 + parent: 1 + - uid: 1036 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.5,-2.5 + parent: 1 +- proto: PoweredLEDLightPostSmall + entities: + - uid: 594 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-17.5 + parent: 1 + - uid: 595 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.5,-17.5 + parent: 1 +- proto: PoweredLEDSmallLight + entities: + - uid: 37 + components: + - type: Transform + pos: -13.5,3.5 + parent: 1 + - uid: 74 + components: + - type: Transform + pos: 5.5,3.5 + parent: 1 + - uid: 102 + components: + - type: Transform + pos: -13.5,-8.5 + parent: 1 + - uid: 122 + components: + - type: Transform + pos: 5.5,-8.5 + parent: 1 + - uid: 581 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,8.5 + parent: 1 + - uid: 725 + components: + - type: Transform + pos: 2.5,13.5 + parent: 1 + - uid: 726 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,6.5 + parent: 1 + - uid: 732 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,6.5 + parent: 1 + - uid: 863 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,10.5 + parent: 1 + - uid: 953 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,0.5 + parent: 1 + - uid: 954 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,0.5 + parent: 1 + - uid: 955 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,0.5 + parent: 1 + - uid: 956 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,10.5 + parent: 1 + - uid: 957 + components: + - type: Transform + pos: -7.5,6.5 + parent: 1 +- proto: PoweredlightLED + entities: + - uid: 169 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,8.5 + parent: 1 + - uid: 652 + components: + - type: Transform + pos: -7.5,-5.5 + parent: 1 + - uid: 653 + components: + - type: Transform + pos: -0.5,-5.5 + parent: 1 + - uid: 654 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,2.5 + parent: 1 + - uid: 655 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,2.5 + parent: 1 + - uid: 657 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,-1.5 + parent: 1 + - uid: 658 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-1.5 + parent: 1 + - uid: 729 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,6.5 + parent: 1 + - uid: 730 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,10.5 + parent: 1 + - uid: 733 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -11.5,-11.5 + parent: 1 + - uid: 734 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,-11.5 + parent: 1 +- proto: PoweredStrobeLightEmpty + entities: + - uid: 276 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.5,-14.5 + parent: 1 + - type: ContainerContainer + containers: + light_bulb: !type:ContainerSlot + showEnts: False + occludes: True + ent: 277 + - type: ApcPowerReceiver + powerLoad: 0 + - type: DamageOnInteract + isDamageActive: False + - uid: 393 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-14.5 + parent: 1 + - type: ContainerContainer + containers: + light_bulb: !type:ContainerSlot + showEnts: False + occludes: True + ent: 395 + - type: ApcPowerReceiver + powerLoad: 0 + - type: DamageOnInteract + isDamageActive: False +- proto: RagItem + entities: + - uid: 1136 + components: + - type: Transform + pos: -3.612665,11.945548 + parent: 1 +- proto: Railing + entities: + - uid: 181 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,-5.5 + parent: 1 + - uid: 390 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.5,-4.5 + parent: 1 + - uid: 392 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-4.5 + parent: 1 + - uid: 445 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,-5.5 + parent: 1 + - uid: 448 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-5.5 + parent: 1 + - uid: 451 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-5.5 + parent: 1 + - uid: 456 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-5.5 + parent: 1 + - uid: 463 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,-5.5 + parent: 1 + - uid: 464 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,-5.5 + parent: 1 + - uid: 492 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-5.5 + parent: 1 + - uid: 494 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-5.5 + parent: 1 + - uid: 498 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-5.5 + parent: 1 +- proto: RailingCornerSmall + entities: + - uid: 379 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,-3.5 + parent: 1 + - uid: 380 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-3.5 + parent: 1 + - uid: 500 + components: + - type: Transform + pos: 1.5,-5.5 + parent: 1 + - uid: 501 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,-5.5 + parent: 1 +- proto: RailingRound + entities: + - uid: 1034 + components: + - type: Transform + pos: -9.5,-17.5 + parent: 1 + - uid: 1039 + components: + - type: Transform + pos: 1.5,-17.5 + parent: 1 +- proto: RandomArcade + entities: + - uid: 894 + components: + - type: Transform + pos: -1.5,10.5 + parent: 1 +- proto: RandomBook + entities: + - uid: 101 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,5.5 + parent: 1 +- proto: RandomPaintingHalloween + entities: + - uid: 1009 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,5.5 + parent: 1 +- proto: RandomPosterAny + entities: + - uid: 596 + components: + - type: Transform + pos: -12.5,-5.5 + parent: 1 + - uid: 795 + components: + - type: Transform + pos: -7.5,9.5 + parent: 1 + - uid: 876 + components: + - type: Transform + pos: 2.5,-14.5 + parent: 1 + - uid: 1007 + components: + - type: Transform + pos: -2.5,5.5 + parent: 1 + - uid: 1017 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,-2.5 + parent: 1 + - uid: 1018 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-1.5 + parent: 1 +- proto: ReinforcedWindow + entities: + - uid: 12 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,-3.5 + parent: 1 + - uid: 43 + components: + - type: Transform + pos: 2.5,11.5 + parent: 1 + - uid: 114 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -13.5,13.5 + parent: 1 + - uid: 115 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -12.5,13.5 + parent: 1 + - uid: 116 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -11.5,13.5 + parent: 1 + - uid: 117 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,13.5 + parent: 1 + - uid: 119 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,11.5 + parent: 1 + - uid: 120 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,10.5 + parent: 1 + - uid: 121 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,9.5 + parent: 1 + - uid: 123 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -13.5,8.5 + parent: 1 + - uid: 125 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,12.5 + parent: 1 + - uid: 180 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,1.5 + parent: 1 + - uid: 261 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,12.5 + parent: 1 + - uid: 386 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,-4.5 + parent: 1 + - uid: 387 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-4.5 + parent: 1 + - uid: 601 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,1.5 + parent: 1 + - uid: 628 + components: + - type: Transform + pos: -5.5,-4.5 + parent: 1 + - uid: 640 + components: + - type: Transform + pos: -4.5,-4.5 + parent: 1 + - uid: 1072 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,9.5 + parent: 1 + - uid: 1073 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,8.5 + parent: 1 + - uid: 1080 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,-2.5 + parent: 1 + - uid: 1082 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -12.5,-3.5 + parent: 1 + - uid: 1083 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -12.5,-2.5 + parent: 1 +- proto: ReinforcedWindowDiagonal + entities: + - uid: 89 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -14.5,8.5 + parent: 1 + - uid: 99 + components: + - type: Transform + pos: -14.5,13.5 + parent: 1 + - uid: 100 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,13.5 + parent: 1 +- proto: SalvageTechfabNF + entities: + - uid: 977 + components: + - type: Transform + pos: -11.5,-8.5 + parent: 1 +- proto: Screwdriver + entities: + - uid: 979 + components: + - type: Transform + pos: 1.4590602,-2.470196 + parent: 1 +- proto: ShipyardCharonInfo + entities: + - uid: 1133 + components: + - type: Transform + pos: -13.227627,12.695766 + parent: 1 +- proto: SignalButton + entities: + - uid: 996 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,-15.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 484: + - Pressed: Toggle + 238: + - Pressed: Toggle + 239: + - Pressed: Toggle + 240: + - Pressed: Toggle + 241: + - Pressed: Toggle + 242: + - Pressed: Toggle + 243: + - Pressed: Toggle + 246: + - Pressed: Toggle + 245: + - Pressed: Toggle + 244: + - Pressed: Toggle + 276: + - Pressed: Toggle + 393: + - Pressed: Toggle + - uid: 997 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-15.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 246: + - Pressed: Toggle + 245: + - Pressed: Toggle + 244: + - Pressed: Toggle + 243: + - Pressed: Toggle + 242: + - Pressed: Toggle + 241: + - Pressed: Toggle + 484: + - Pressed: Toggle + 238: + - Pressed: Toggle + 239: + - Pressed: Toggle + 240: + - Pressed: Toggle + 393: + - Pressed: Toggle + 276: + - Pressed: Toggle + - uid: 1118 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,-3.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 1112: + - Pressed: Toggle + 1111: + - Pressed: Toggle + 1110: + - Pressed: Toggle + - uid: 1119 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-3.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 1113: + - Pressed: Toggle + 1114: + - Pressed: Toggle + 1115: + - Pressed: Toggle +- proto: SignDirectionalAtmos + entities: + - uid: 961 + components: + - type: Transform + pos: -0.5,1.5 + parent: 1 +- proto: SignDirectionalBridge + entities: + - uid: 962 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,4.5 + parent: 1 +- proto: SignDirectionalCB1 + entities: + - uid: 1029 + components: + - type: Transform + pos: -9.5,0.5 + parent: 1 + - uid: 1037 + components: + - type: Transform + pos: 1.5,0.5 + parent: 1 +- proto: SignDirectionalDorms + entities: + - uid: 964 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,7.5 + parent: 1 + - uid: 965 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,9.5 + parent: 1 +- proto: SignDirectionalEng + entities: + - uid: 960 + components: + - type: Transform + pos: -7.5,1.5 + parent: 1 +- proto: SignDirectionalFood + entities: + - uid: 963 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,8.5 + parent: 1 +- proto: SignDirectionalGravity + entities: + - uid: 443 + components: + - type: Transform + pos: 4.5,-6.5 + parent: 1 +- proto: SinkStemlessWater + entities: + - uid: 720 + components: + - type: Transform + pos: -5.5,11.5 + parent: 1 +- proto: SinkWide + entities: + - uid: 785 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,9.5 + parent: 1 +- proto: SMESBasic + entities: + - uid: 187 + components: + - type: Transform + pos: -3.5,-0.5 + parent: 1 + - uid: 188 + components: + - type: Transform + pos: -3.5,-1.5 + parent: 1 +- proto: SpawnDungeonLootCutlery + entities: + - uid: 989 + components: + - type: Transform + pos: -3.456415,11.434776 + parent: 1 + - uid: 1014 + components: + - type: Transform + pos: -0.5656798,5.6530457 + parent: 1 + - uid: 1135 + components: + - type: Transform + pos: -3.456415,11.163755 + parent: 1 +- proto: SpawnDungeonLootMugs + entities: + - uid: 968 + components: + - type: Transform + pos: 0.52348495,5.589697 + parent: 1 + - uid: 1134 + components: + - type: Transform + pos: -13.602627,12.195419 + parent: 1 +- proto: SpawnDungeonVendomatsClothes + entities: + - uid: 458 + components: + - type: Transform + pos: 1.5,8.5 + parent: 1 +- proto: SpawnerHoloGraffitiRandom + entities: + - uid: 165 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -13.5,-9.5 + parent: 1 +- proto: SpawnPointLatejoin + entities: + - uid: 1065 + components: + - type: Transform + pos: -5.5,6.5 + parent: 1 + - uid: 1069 + components: + - type: Transform + pos: -3.5,6.5 + parent: 1 + - uid: 1070 + components: + - type: Transform + pos: -1.5,6.5 + parent: 1 +- proto: StationMap + entities: + - uid: 728 + components: + - type: Transform + pos: -8.5,4.5 + parent: 1 +- proto: StorageCanister + entities: + - uid: 947 + components: + - type: Transform + anchored: True + pos: -0.5,-2.5 + parent: 1 + - type: Physics + bodyType: Static +- proto: SubstationBasic + entities: + - uid: 391 + components: + - type: Transform + pos: -3.5,-2.5 + parent: 1 +- proto: SuitStorageSalv + entities: + - uid: 597 + components: + - type: Transform + pos: -9.5,-0.5 + parent: 1 +- proto: Table + entities: + - uid: 258 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -11.5,5.5 + parent: 1 + - uid: 796 + components: + - type: Transform + pos: 1.5,-2.5 + parent: 1 + - uid: 984 + components: + - type: Transform + pos: 1.5,-1.5 + parent: 1 + - uid: 988 + components: + - type: Transform + pos: -9.5,-2.5 + parent: 1 + - uid: 1130 + components: + - type: Transform + pos: -4.5,-3.5 + parent: 1 +- proto: TableCounterMetal + entities: + - uid: 631 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,10.5 + parent: 1 + - uid: 675 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -13.5,12.5 + parent: 1 + - uid: 678 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -13.5,11.5 + parent: 1 + - uid: 691 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -13.5,9.5 + parent: 1 + - uid: 693 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -12.5,12.5 + parent: 1 + - uid: 696 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -13.5,10.5 + parent: 1 + - uid: 697 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -11.5,12.5 + parent: 1 + - uid: 783 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,11.5 + parent: 1 + - uid: 990 + components: + - type: Transform + pos: -10.5,12.5 + parent: 1 +- proto: TableWood + entities: + - uid: 787 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,5.5 + parent: 1 + - uid: 788 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,5.5 + parent: 1 + - uid: 952 + components: + - type: Transform + pos: -7.5,5.5 + parent: 1 +- proto: TelecomServerFilledCommon + entities: + - uid: 1030 + components: + - type: Transform + pos: -3.5,-3.5 + parent: 1 +- proto: Thruster + entities: + - uid: 11 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,-5.5 + parent: 1 + - uid: 62 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,-11.5 + parent: 1 + - uid: 104 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,-0.5 + parent: 1 + - uid: 105 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -13.5,6.5 + parent: 1 + - uid: 109 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,5.5 + parent: 1 + - uid: 112 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,-13.5 + parent: 1 + - uid: 113 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -13.5,-5.5 + parent: 1 + - uid: 124 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,-13.5 + parent: 1 + - uid: 134 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,-14.5 + parent: 1 + - uid: 264 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -13.5,-6.5 + parent: 1 + - uid: 270 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-0.5 + parent: 1 + - uid: 271 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,-6.5 + parent: 1 + - uid: 272 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -13.5,5.5 + parent: 1 + - uid: 273 + components: + - type: Transform + pos: -5.5,13.5 + parent: 1 + - uid: 274 + components: + - type: Transform + pos: -4.5,13.5 + parent: 1 + - uid: 275 + components: + - type: Transform + pos: -3.5,13.5 + parent: 1 + - uid: 317 + components: + - type: Transform + pos: -2.5,13.5 + parent: 1 + - uid: 323 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,6.5 + parent: 1 + - uid: 394 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-14.5 + parent: 1 + - uid: 397 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-12.5 + parent: 1 + - uid: 410 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,-12.5 + parent: 1 + - uid: 411 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -14.5,-11.5 + parent: 1 +- proto: ToiletDirtyWater + entities: + - uid: 719 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,10.5 + parent: 1 +- proto: ToolboxElectricalFilled + entities: + - uid: 1027 + components: + - type: Transform + pos: -4.56157,-3.2981017 + parent: 1 +- proto: TrashBag + entities: + - uid: 1084 + components: + - type: Transform + pos: -5.2223263,11.561083 + parent: 1 +- proto: TwoWayLever + entities: + - uid: 1108 + components: + - type: Transform + pos: -9.5,-3.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 1091: + - Left: Reverse + - Right: Forward + - Middle: Off + 488: + - Left: Reverse + - Right: Forward + - Middle: Off + 582: + - Left: Reverse + - Right: Forward + - Middle: Off + 1089: + - Left: Reverse + - Right: Forward + - Middle: Off + 1088: + - Left: Reverse + - Right: Forward + - Middle: Off + 1087: + - Left: Reverse + - Right: Forward + - Middle: Off + 1086: + - Left: Reverse + - Right: Forward + - Middle: Off + 1085: + - Left: Reverse + - Right: Forward + - Middle: Off + 491: + - Left: Reverse + - Right: Forward + - Middle: Off + 490: + - Left: Reverse + - Right: Forward + - Middle: Off + 1004: + - Left: Reverse + - Right: Forward + - Middle: Off + 477: + - Left: Reverse + - Right: Forward + - Middle: Off + 36: + - Left: Reverse + - Right: Forward + - Middle: Off + - uid: 1109 + components: + - type: Transform + pos: 1.5,-3.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 39: + - Left: Reverse + - Right: Forward + - Middle: Off + 48: + - Right: Forward + - Left: Reverse + - Middle: Off + 1098: + - Left: Reverse + - Right: Forward + - Middle: Off + 1097: + - Left: Reverse + - Right: Forward + - Middle: Off + 1096: + - Right: Forward + - Left: Reverse + - Middle: Off + 1095: + - Left: Reverse + - Right: Forward + - Middle: Off + 1094: + - Left: Reverse + - Right: Forward + - Middle: Off + 1093: + - Left: Reverse + - Right: Forward + - Middle: Off + 1092: + - Left: Reverse + - Right: Forward + - Middle: Off + 1028: + - Left: Reverse + - Right: Forward + - Middle: Off + 1101: + - Left: Reverse + - Right: Forward + - Middle: Off + 1100: + - Left: Reverse + - Middle: Off + - Right: Forward + 1099: + - Left: Reverse + - Right: Forward + - Middle: Off +- proto: VendingMachineEngiDrobe + entities: + - uid: 993 + components: + - type: Transform + pos: -9.5,1.5 + parent: 1 +- proto: VendingMachineTankDispenserEVA + entities: + - uid: 969 + components: + - type: Transform + pos: -11.5,-11.5 + parent: 1 +- proto: VendingMachineYouTool + entities: + - uid: 992 + components: + - type: Transform + pos: 1.5,1.5 + parent: 1 +- proto: WallReinforced + entities: + - uid: 3 + components: + - type: Transform + pos: 6.5,4.5 + parent: 1 + - uid: 4 + components: + - type: Transform + pos: 5.5,4.5 + parent: 1 + - uid: 5 + components: + - type: Transform + pos: 4.5,4.5 + parent: 1 + - uid: 7 + components: + - type: Transform + pos: 4.5,13.5 + parent: 1 + - uid: 8 + components: + - type: Transform + pos: 4.5,12.5 + parent: 1 + - uid: 9 + components: + - type: Transform + pos: 4.5,11.5 + parent: 1 + - uid: 10 + components: + - type: Transform + pos: 4.5,10.5 + parent: 1 + - uid: 13 + components: + - type: Transform + pos: 4.5,7.5 + parent: 1 + - uid: 14 + components: + - type: Transform + pos: 4.5,6.5 + parent: 1 + - uid: 15 + components: + - type: Transform + pos: 4.5,5.5 + parent: 1 + - uid: 23 + components: + - type: Transform + pos: 0.5,11.5 + parent: 1 + - uid: 24 + components: + - type: Transform + pos: 0.5,12.5 + parent: 1 + - uid: 26 + components: + - type: Transform + pos: 0.5,13.5 + parent: 1 + - uid: 28 + components: + - type: Transform + pos: 6.5,0.5 + parent: 1 + - uid: 29 + components: + - type: Transform + pos: 5.5,0.5 + parent: 1 + - uid: 30 + components: + - type: Transform + pos: 4.5,0.5 + parent: 1 + - uid: 34 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,0.5 + parent: 1 + - uid: 57 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -12.5,4.5 + parent: 1 + - uid: 60 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -14.5,-8.5 + parent: 1 + - uid: 63 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,0.5 + parent: 1 + - uid: 64 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-15.5 + parent: 1 + - uid: 66 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,-16.5 + parent: 1 + - uid: 70 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,0.5 + parent: 1 + - uid: 72 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-2.5 + parent: 1 + - uid: 81 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -13.5,4.5 + parent: 1 + - uid: 82 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -14.5,4.5 + parent: 1 + - uid: 83 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -14.5,0.5 + parent: 1 + - uid: 84 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -13.5,0.5 + parent: 1 + - uid: 85 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -12.5,5.5 + parent: 1 + - uid: 86 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -12.5,6.5 + parent: 1 + - uid: 87 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -12.5,7.5 + parent: 1 + - uid: 90 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,11.5 + parent: 1 + - uid: 91 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,11.5 + parent: 1 + - uid: 94 + components: + - type: Transform + pos: -14.5,-9.5 + parent: 1 + - uid: 95 + components: + - type: Transform + pos: 6.5,-10.5 + parent: 1 + - uid: 96 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,11.5 + parent: 1 + - uid: 97 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,11.5 + parent: 1 + - uid: 98 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,11.5 + parent: 1 + - uid: 108 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -13.5,-7.5 + parent: 1 + - uid: 110 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,-7.5 + parent: 1 + - uid: 127 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -12.5,-0.5 + parent: 1 + - uid: 128 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -12.5,-1.5 + parent: 1 + - uid: 131 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -12.5,-4.5 + parent: 1 + - uid: 132 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -12.5,-5.5 + parent: 1 + - uid: 133 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -12.5,-6.5 + parent: 1 + - uid: 137 + components: + - type: Transform + pos: 4.5,-11.5 + parent: 1 + - uid: 139 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -12.5,-12.5 + parent: 1 + - uid: 143 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-2.5 + parent: 1 + - uid: 144 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-1.5 + parent: 1 + - uid: 145 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-0.5 + parent: 1 + - uid: 146 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,-4.5 + parent: 1 + - uid: 147 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-4.5 + parent: 1 + - uid: 148 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-4.5 + parent: 1 + - uid: 150 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,-1.5 + parent: 1 + - uid: 151 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,-0.5 + parent: 1 + - uid: 154 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,-15.5 + parent: 1 + - uid: 155 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-16.5 + parent: 1 + - uid: 157 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,-2.5 + parent: 1 + - uid: 160 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-12.5 + parent: 1 + - uid: 161 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-7.5 + parent: 1 + - uid: 164 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-8.5 + parent: 1 + - uid: 166 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-6.5 + parent: 1 + - uid: 167 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-5.5 + parent: 1 + - uid: 168 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-4.5 + parent: 1 + - uid: 171 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-1.5 + parent: 1 + - uid: 172 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-0.5 + parent: 1 + - uid: 175 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,1.5 + parent: 1 + - uid: 177 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,1.5 + parent: 1 + - uid: 178 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,1.5 + parent: 1 + - uid: 182 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,1.5 + parent: 1 + - uid: 185 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,-3.5 + parent: 1 + - uid: 207 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-3.5 + parent: 1 + - uid: 233 + components: + - type: Transform + pos: 2.5,14.5 + parent: 1 + - uid: 259 + components: + - type: Transform + pos: -2.5,12.5 + parent: 1 + - uid: 262 + components: + - type: Transform + pos: -4.5,12.5 + parent: 1 + - uid: 267 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,-14.5 + parent: 1 + - uid: 268 + components: + - type: Transform + pos: -5.5,12.5 + parent: 1 + - uid: 269 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,-13.5 + parent: 1 + - uid: 319 + components: + - type: Transform + pos: -3.5,12.5 + parent: 1 + - uid: 401 + components: + - type: Transform + pos: 4.5,-10.5 + parent: 1 + - uid: 402 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -13.5,-11.5 + parent: 1 + - uid: 403 + components: + - type: Transform + pos: -14.5,-10.5 + parent: 1 + - uid: 404 + components: + - type: Transform + pos: 6.5,-9.5 + parent: 1 + - uid: 405 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,-11.5 + parent: 1 + - uid: 406 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-13.5 + parent: 1 + - uid: 407 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-14.5 + parent: 1 + - uid: 408 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -12.5,-8.5 + parent: 1 + - uid: 409 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -12.5,-7.5 + parent: 1 + - uid: 415 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,-8.5 + parent: 1 + - uid: 455 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-4.5 + parent: 1 + - uid: 460 + components: + - type: Transform + pos: -12.5,-10.5 + parent: 1 + - uid: 467 + components: + - type: Transform + pos: -12.5,-11.5 + parent: 1 + - uid: 610 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,0.5 + parent: 1 + - uid: 612 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-3.5 + parent: 1 + - uid: 613 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-1.5 + parent: 1 + - uid: 782 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,-0.5 + parent: 1 + - uid: 925 + components: + - type: Transform + pos: -9.5,0.5 + parent: 1 + - uid: 1005 + components: + - type: Transform + pos: 1.5,0.5 + parent: 1 +- proto: WallReinforcedDiagonal + entities: + - uid: 2 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,4.5 + parent: 1 + - uid: 6 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,0.5 + parent: 1 + - uid: 27 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,14.5 + parent: 1 + - uid: 47 + components: + - type: Transform + pos: 0.5,14.5 + parent: 1 + - uid: 65 + components: + - type: Transform + pos: -14.5,-7.5 + parent: 1 + - uid: 79 + components: + - type: Transform + pos: -15.5,4.5 + parent: 1 + - uid: 80 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -15.5,0.5 + parent: 1 + - uid: 88 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.5,11.5 + parent: 1 + - uid: 92 + components: + - type: Transform + pos: -6.5,12.5 + parent: 1 + - uid: 93 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,12.5 + parent: 1 + - uid: 126 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -12.5,8.5 + parent: 1 + - uid: 138 + components: + - type: Transform + pos: 3.5,-12.5 + parent: 1 + - uid: 141 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-16.5 + parent: 1 + - uid: 158 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,-16.5 + parent: 1 + - uid: 163 + components: + - type: Transform + pos: 5.5,-10.5 + parent: 1 + - uid: 173 + components: + - type: Transform + pos: -8.5,1.5 + parent: 1 + - uid: 174 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,1.5 + parent: 1 + - uid: 388 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-4.5 + parent: 1 + - uid: 389 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,-4.5 + parent: 1 + - uid: 398 + components: + - type: Transform + pos: 2.5,-13.5 + parent: 1 + - uid: 399 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,-13.5 + parent: 1 + - uid: 400 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -11.5,-12.5 + parent: 1 + - uid: 416 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-7.5 + parent: 1 + - uid: 468 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -13.5,-10.5 + parent: 1 +- proto: WallSolid + entities: + - uid: 20 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -11.5,4.5 + parent: 1 + - uid: 21 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,10.5 + parent: 1 + - uid: 31 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,8.5 + parent: 1 + - uid: 49 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,4.5 + parent: 1 + - uid: 50 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,4.5 + parent: 1 + - uid: 51 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,4.5 + parent: 1 + - uid: 52 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,4.5 + parent: 1 + - uid: 53 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,4.5 + parent: 1 + - uid: 54 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,4.5 + parent: 1 + - uid: 58 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,4.5 + parent: 1 + - uid: 59 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -6.5,4.5 + parent: 1 + - uid: 698 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.5,5.5 + parent: 1 + - uid: 699 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.5,6.5 + parent: 1 + - uid: 700 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.5,7.5 + parent: 1 + - uid: 701 + components: + - type: Transform + pos: -4.5,5.5 + parent: 1 + - uid: 702 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,7.5 + parent: 1 + - uid: 704 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,7.5 + parent: 1 + - uid: 705 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,11.5 + parent: 1 + - uid: 706 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,10.5 + parent: 1 + - uid: 707 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,9.5 + parent: 1 + - uid: 708 + components: + - type: Transform + pos: -2.5,5.5 + parent: 1 + - uid: 709 + components: + - type: Transform + pos: -4.5,6.5 + parent: 1 + - uid: 710 + components: + - type: Transform + pos: -2.5,7.5 + parent: 1 + - uid: 711 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,9.5 + parent: 1 + - uid: 712 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,9.5 + parent: 1 + - uid: 713 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,9.5 + parent: 1 + - uid: 714 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,7.5 + parent: 1 + - uid: 715 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,10.5 + parent: 1 + - uid: 716 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,5.5 + parent: 1 + - uid: 717 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,6.5 + parent: 1 + - uid: 724 + components: + - type: Transform + pos: -2.5,6.5 + parent: 1 +- proto: WarpPoint + entities: + - uid: 1071 + components: + - type: Transform + pos: -10.5,9.5 + parent: 1 +- proto: WeldingFuelTankFull + entities: + - uid: 454 + components: + - type: Transform + pos: 3.5,-11.5 + parent: 1 +- proto: Window + entities: + - uid: 18 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,4.5 + parent: 1 + - uid: 25 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,7.5 + parent: 1 + - uid: 55 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,6.5 + parent: 1 + - uid: 152 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,4.5 + parent: 1 + - uid: 153 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,4.5 + parent: 1 + - uid: 236 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,5.5 + parent: 1 +- proto: WindowDiagonal + entities: + - uid: 17 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,7.5 + parent: 1 + - uid: 19 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,4.5 + parent: 1 +- proto: Wrench + entities: + - uid: 950 + components: + - type: Transform + pos: -1.1835101,-1.9426599 + parent: 1 +... diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Paper/Shipyard/manuals.yml b/Resources/Prototypes/_NF/Catalog/Fills/Paper/Shipyard/manuals.yml index 7b71ac87be3..9b4d61733e5 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Paper/Shipyard/manuals.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Paper/Shipyard/manuals.yml @@ -135,3 +135,12 @@ - type: GuideHelp guides: - ShipyardSearchlight + +- type: entity + parent: ShipyardInfoBase + id: ShipyardCharonInfo + name: Charon user manual + components: + - type: GuideHelp + guides: + - ShipyardCharon diff --git a/Resources/Prototypes/_NF/Guidebook/shipyard.yml b/Resources/Prototypes/_NF/Guidebook/shipyard.yml index a73e161ea89..5dec78ace72 100644 --- a/Resources/Prototypes/_NF/Guidebook/shipyard.yml +++ b/Resources/Prototypes/_NF/Guidebook/shipyard.yml @@ -15,6 +15,7 @@ - ShipyardBulker - ShipyardCamper - ShipyardCeres + - ShipyardCharon - ShipyardChisel - ShipyardComet - ShipyardConstruct @@ -102,6 +103,11 @@ name: guide-entry-shipyard-ceres text: "/ServerInfo/_NF/Guidebook/Shipyard/Ceres.xml" +- type: guideEntry + id: ShipyardCharon + name: guide-entry-shipyard-charon + text: "/ServerInfo/_NF/Guidebook/Shipyard/Charon.xml" + - type: guideEntry id: ShipyardChisel name: guide-entry-shipyard-chisel diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/charon.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/charon.yml new file mode 100644 index 00000000000..c02d155fc1f --- /dev/null +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/charon.yml @@ -0,0 +1,45 @@ +# Author Info +# GitHub: chrome-cirrus +# Discord: scry + +# Maintainer Info +# GitHub: chrome-cirrus +# Discord: scry + +# Shuttle Notes: +# +- type: vessel + id: Charon + name: EIS Charon + description: Originally built as a roll-on, roll-off transport for heavy terraforming equipment. Since its obsolescence and appearance on the secondary market, the Charon has become a favorite of upfitters for the broad possibilities afforded by its open equipment bay. A product of Endurance Industrial Shipyards. + # Sell value @ exped shipyard 70408, 15% markup and a little rounding gives us... + price: 81000 + # 24x33 tiles + # 627 total tiles + # In light of the mid-range tile count and relatively narrow width I feel like Medium is more appropriate than Large even though it is technically one tile too long for the class. + category: Medium + group: Expedition + shuttlePath: /Maps/_NF/Shuttles/Expedition/charon.yml + guidebookPage: ShipyardCharon + class: + - Expedition + +- type: gameMap + id: Charon + mapName: 'Charon' + mapPath: /Maps/_NF/Shuttles/Expedition/charon.yml + minPlayers: 0 + stations: + Charon: + stationProto: StandardFrontierExpeditionVessel + components: + - type: StationNameSetup + mapNameTemplate: 'Charon {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: '14' + - type: StationJobs + availableJobs: + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Charon.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Charon.xml new file mode 100644 index 00000000000..91f1067542b --- /dev/null +++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Charon.xml @@ -0,0 +1,105 @@ + + # CHARON CLASS RO-RO EQUIPMENT TRANSPORT + + + + + + + [color=#a4885c]Ship Size:[/color] Medium + + [color=#a4885c]Recommended Crew:[/color] 2-4 + + [color=#a4885c]Power Gen Type:[/color] AME + + [color=#a4885c]Expeditions:[/color] Yes + + [color=#a4885c]IFF Console:[/color] None + + Originally built as a roll-on, roll-off transport for heavy terraforming equipment. Since its obsolescence and appearance on the secondary market, the Charon has become a favorite of upfitters for the broad possibilities afforded by its open equipment bay. A product of Endurance Industrial Shipyards. + + # PREFLIGHT CHECKLIST + + ## 1. Power supply + + ## 1.1. Battery units + + + + + + + - Check that the SMES units are anchored to the floor, verify charge level and status. + - Check that the substation unit is anchored to the floor, verify charge level and status. + - Check each APC unit and verify its breaker is on, and that the unit is charging. There are four total, two in the equipment bay, one on the forward wall of the AME room, and one in the bridge. + - Verify each APC unit registers some load, if not this may indicate problems. + + ## 1.2. AME generator unit. + + + + + + + - Check that the AME core is properly shielded. + - Check that the AME controller unit is anchored to the floor. + - Check the AME controller unit 'Fueling Status' readout. + - Check the AME controller unit 'Injection Amount' setting. + - Enable AME injection. + - Check power monitoring console to validate AME output level and confirm that battery draw is negligible with the AME active. In stock configuration the ship should consume approximately 45kW at idle. + + ## 2. Atmospherics + + ## 2.1. Distribution Network + + + + + + + - Ensure oxygen and nitrogen canisters are anchored to their connector ports. + - Verify atmos network gas mixer is configured to 21% on its primary port (O2) and 79% on is side port (N2). + - Verify gas mixer is configured to circa 101kPa. + - Enable gas mixer. + + ## 2.2. Waste Network + + + + + + - Ensure storage canister is anchored to its connector port. + - Inspect and enable waste network booster pumps, located on the starboard side of the ship in the equipment bay, and transit corridor just forward of the cargo section door. + - Inspect waste network gas filter, verify it is set to a desired gas for scavenging from waste loop. + - Enable waste network gas filter. + - Inspect and enable waste network exhaust pump, located in the starboard equipment bay corridor near the conveyor system controls. + + ## 2.3. Air alarm and firelock system + + + + + - Examine the crew section air alarm in the bridge, ensure sensors are reading normal. + - Set the crew section air alarm in the bridge to 'Filtering (Wide)'. + - Note the location of the firelocks linked to the crew section air alarm, which are integrated into the doors to the bridge and galley. + - Examine the cargo section air alarm on the forward wall of the engineering capsule, ensure sensors are reading normal. + - Set the cargo section air alarm to 'Filtering (Wide)'. + - Note the location of the firelocks linked to the cargo section air alarm, which are integrated into the doors to the equipment bay. + + ## 3. Other checks + + + + + + + + + + - Check that the gyroscopes are anchored, powered, and enabled. These devices are located in the engineering closets in the equipment bay. + - Check that the mini gravity generator is anchored, powered, and enabled. This device is located in the starboard side engineering closet in the equipment bay. + - Check that the equipment bay blast doors are closed. These can be controlled by the wall switches to either side of the doors. + - Check that the conveyor system blast doors are closed. These can be actuated by the wall switches in the corridor on each side of the engineering capsule. + - Check that the conveyor belts on each side of the ship are in good order. These can be operated with the floor levers in the corridor on either side of the engineering capsule. + + From 975437a0acdd3c25c071a86b11d59525693fe617 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Mon, 9 Dec 2024 17:58:07 +0000 Subject: [PATCH 41/52] Automatic Changelog (#2119) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 7e6dbb28ea7..153e97b9936 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -5775,3 +5775,9 @@ Entries: message: Hostile AI no longer work on protected zones. id: 5567 time: '2024-12-09T00:10:05.0000000+00:00' +- author: chrome-cirrus + changes: + - type: Add + message: Added ITS Charon class medium size expedition ship + id: 5568 + time: '2024-12-09T17:57:42.0000000+00:00' From 2f5369e5d6cad21ef12ff7d9ad48db1cf68f3ff2 Mon Sep 17 00:00:00 2001 From: Whatstone <166147148+whatston3@users.noreply.github.com> Date: Mon, 9 Dec 2024 15:40:05 -0500 Subject: [PATCH 42/52] Science Rebalance: The Point of Points (#2537) * WIP: science revalue, no tech disks & anom sync * inner anomalies generate cores, no phasing effect * Remove tech disk references * comments * Added info about points earned in scanner * Unhardcode anomaly assessment values * Remove anomalous nerd smash --------- Co-authored-by: Dvir --- .../Anomaly/AnomalySystem.Scanner.cs | 6 ++++ .../Anomaly/AnomalySystem.Vessel.cs | 11 +++++++- .../Components/SecretDataAnomalyComponent.cs | 1 + .../Anomaly/Effects/AnomalyCoreSystem.cs | 8 ++++++ .../Anomaly/Effects/InnerBodyAnomalySystem.cs | 3 ++ .../XenoArtifacts/ArtifactComponent.cs | 2 +- .../Anomaly/Components/AnomalyComponent.cs | 13 +++++++++ .../Components/AnomalyCoreComponent.cs | 18 ++++++++++++ .../Anomaly/SharedAnomalyCoreSystem.cs | 23 +++++++++++++++ Content.Shared/Anomaly/SharedAnomalySystem.cs | 10 +++++++ .../Locale/en-US/_NF/anomaly/anomaly.ftl | 2 ++ .../en-US/_NF/cargo/pirate-bounties.ftl | 1 - Resources/Maps/_NF/Dungeon/mineshaft.yml | 7 ----- Resources/Maps/_NF/POI/anomalousgeode.yml | 7 ----- Resources/Maps/_NF/Test/dev_map.yml | 7 ----- .../Spawners/Random/Salvage/tables_loot.yml | 4 +-- .../Markers/Spawners/Random/maintenance.yml | 2 +- .../Objects/Specific/Research/disk.yml | 2 +- .../Machines/Computers/techdiskterminal.yml | 1 + .../Structures/Machines/anomaly_sync.yml | 1 + .../Entities/Structures/Machines/lathe.yml | 4 +-- .../Specific/Anomaly/anomaly_injectors.yml | 12 +++++++- .../Prototypes/Recipes/Lathes/electronics.yml | 20 +++++++------ .../Prototypes/Research/experimental.yml | 28 ++++++++++--------- .../XenoArch/Effects/utility_effects.yml | 14 ++++++---- .../_NF/Catalog/Bounties/pirate_bounties.yml | 9 ------ .../Random/dungeon_items_research.yml | 5 ---- .../Entities/Objects/Devices/flatpacks.yml | 9 ------ 28 files changed, 149 insertions(+), 81 deletions(-) create mode 100644 Resources/Locale/en-US/_NF/anomaly/anomaly.ftl diff --git a/Content.Server/Anomaly/AnomalySystem.Scanner.cs b/Content.Server/Anomaly/AnomalySystem.Scanner.cs index 9d81878cd8f..c3de06a5ebb 100644 --- a/Content.Server/Anomaly/AnomalySystem.Scanner.cs +++ b/Content.Server/Anomaly/AnomalySystem.Scanner.cs @@ -175,6 +175,12 @@ public FormattedMessage GetScannerMessage(AnomalyScannerComponent component) msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-point-output-unknown")); else msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-point-output", ("point", GetAnomalyPointValue(anomaly, anomalyComp)))); + //Frontier: Point earned + if (secret != null && secret.Secret.Contains(AnomalySecretData.PointsEarned)) + msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-point-earned-unknown")); + else + msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-point-earned", ("point", anomalyComp.PointsEarned))); + // End Frontier msg.PushNewline(); msg.PushNewline(); diff --git a/Content.Server/Anomaly/AnomalySystem.Vessel.cs b/Content.Server/Anomaly/AnomalySystem.Vessel.cs index 53ac34f9381..868d8c29f04 100644 --- a/Content.Server/Anomaly/AnomalySystem.Vessel.cs +++ b/Content.Server/Anomaly/AnomalySystem.Vessel.cs @@ -95,7 +95,16 @@ private void OnVesselGetPointsPerSecond(EntityUid uid, AnomalyVesselComponent co if (!this.IsPowered(uid, EntityManager) || component.Anomaly is not {} anomaly) return; - args.Points += (int) (GetAnomalyPointValue(anomaly) * component.PointMultiplier); + var rawPointValue = GetAnomalyPointValue(anomaly); // Frontier: cache value + args.Points += (int)(rawPointValue * component.PointMultiplier); // Frontier: GetAnomalyPointValue() < rawPointValue + // Frontier: increase anomaly points + if (TryComp(anomaly, out var anomalyComp) + && anomalyComp.LastTickPointsEarned != Timing.CurTick) + { + anomalyComp.LastTickPointsEarned = Timing.CurTick; + anomalyComp.PointsEarned += rawPointValue; + } + // End Frontier } private void OnVesselAnomalyShutdown(ref AnomalyShutdownEvent args) diff --git a/Content.Server/Anomaly/Components/SecretDataAnomalyComponent.cs b/Content.Server/Anomaly/Components/SecretDataAnomalyComponent.cs index 80eecaafc79..b3e22dbce56 100644 --- a/Content.Server/Anomaly/Components/SecretDataAnomalyComponent.cs +++ b/Content.Server/Anomaly/Components/SecretDataAnomalyComponent.cs @@ -36,6 +36,7 @@ public enum AnomalySecretData : byte Severity, Stability, OutputPoint, + PointsEarned, // Frontier ParticleDanger, ParticleUnstable, ParticleContainment, diff --git a/Content.Server/Anomaly/Effects/AnomalyCoreSystem.cs b/Content.Server/Anomaly/Effects/AnomalyCoreSystem.cs index dea116a65e7..0705d7baa7a 100644 --- a/Content.Server/Anomaly/Effects/AnomalyCoreSystem.cs +++ b/Content.Server/Anomaly/Effects/AnomalyCoreSystem.cs @@ -18,6 +18,14 @@ public override void Initialize() private void OnGetPrice(Entity core, ref PriceCalculationEvent args) { + // Frontier: quick path + if (core.Comp.EndPrice == core.Comp.StartPrice) + { + args.Price = core.Comp.EndPrice; + return; + } + // End Frontier + var timeLeft = core.Comp.DecayMoment - _gameTiming.CurTime; var lerp = timeLeft.TotalSeconds / core.Comp.TimeToDecay; lerp = Math.Clamp(lerp, 0, 1); diff --git a/Content.Server/Anomaly/Effects/InnerBodyAnomalySystem.cs b/Content.Server/Anomaly/Effects/InnerBodyAnomalySystem.cs index 38c4c51d874..1b2cdbd26a0 100644 --- a/Content.Server/Anomaly/Effects/InnerBodyAnomalySystem.cs +++ b/Content.Server/Anomaly/Effects/InnerBodyAnomalySystem.cs @@ -17,6 +17,7 @@ using Robust.Shared.Audio.Systems; using Robust.Shared.Physics.Events; using Robust.Shared.Prototypes; +using Robust.Server.GameObjects; // Frontier namespace Content.Server.Anomaly.Effects; @@ -35,6 +36,8 @@ public sealed class InnerBodyAnomalySystem : SharedInnerBodyAnomalySystem [Dependency] private readonly SharedPopupSystem _popup = default!; [Dependency] private readonly IPrototypeManager _proto = default!; [Dependency] private readonly StunSystem _stun = default!; + [Dependency] private readonly TransformSystem _transform = default!; // Frontier + [Dependency] private readonly SharedAnomalyCoreSystem _anomalyCore = default!; // Frontier private readonly Color _messageColor = Color.FromSrgb(new Color(201, 22, 94)); diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactComponent.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactComponent.cs index e097c9c193f..7111e194627 100644 --- a/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactComponent.cs +++ b/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactComponent.cs @@ -58,7 +58,7 @@ public sealed partial class ArtifactComponent : Component /// to determine the monetary value of the artifact /// [DataField("priceMultiplier"), ViewVariables(VVAccess.ReadWrite)] - public float PriceMultiplier = 0.175f; + public float PriceMultiplier = 0.4f; // Frontier: 0.175 < 0.4 /// /// The base amount of research points for each artifact node. diff --git a/Content.Shared/Anomaly/Components/AnomalyComponent.cs b/Content.Shared/Anomaly/Components/AnomalyComponent.cs index e6228b5fb0d..18dd1542bbd 100644 --- a/Content.Shared/Anomaly/Components/AnomalyComponent.cs +++ b/Content.Shared/Anomaly/Components/AnomalyComponent.cs @@ -5,6 +5,7 @@ using Robust.Shared.GameStates; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; +using Robust.Shared.Timing; // Frontier namespace Content.Shared.Anomaly.Components; @@ -259,6 +260,18 @@ public sealed partial class AnomalyComponent : Component [DataField] public bool DeleteEntity = true; + + /// + /// Frontier: the number of points earned by this anomaly. + /// + [ViewVariables] + public int PointsEarned = 0; + + /// + /// Frontier: the last time this anomaly earned points. Prevents double counting. + /// + [ViewVariables] + public GameTick LastTickPointsEarned = GameTick.Zero; } /// diff --git a/Content.Shared/Anomaly/Components/AnomalyCoreComponent.cs b/Content.Shared/Anomaly/Components/AnomalyCoreComponent.cs index 68d00f03ecb..5fbdfe1a9f3 100644 --- a/Content.Shared/Anomaly/Components/AnomalyCoreComponent.cs +++ b/Content.Shared/Anomaly/Components/AnomalyCoreComponent.cs @@ -49,4 +49,22 @@ public sealed partial class AnomalyCoreComponent : Component [DataField, ViewVariables(VVAccess.ReadWrite)] [AutoNetworkedField] public int Charge = 5; + + /// + /// Frontier: the fraction of the price to be taken from the researched points + /// + [DataField] + public double PointPriceCoefficient = 0.4; + + /// + /// Frontier: the maximum price for the core to be worth + /// + [DataField] + public double MaximumPrice = 30000; + + /// + /// Frontier: the maximum price for the core to be worth + /// + [DataField, ViewVariables(VVAccess.ReadWrite)] + public double MinimumPrice = 200; } diff --git a/Content.Shared/Anomaly/SharedAnomalyCoreSystem.cs b/Content.Shared/Anomaly/SharedAnomalyCoreSystem.cs index f4864a532b8..252fd144409 100644 --- a/Content.Shared/Anomaly/SharedAnomalyCoreSystem.cs +++ b/Content.Shared/Anomaly/SharedAnomalyCoreSystem.cs @@ -6,6 +6,8 @@ using Robust.Shared.Physics; using Robust.Shared.Physics.Components; using Robust.Shared.Timing; +using Robust.Shared.Network; // Frontier +using Content.Shared.Anomaly.Effects; // Frontier namespace Content.Shared.Anomaly; @@ -17,6 +19,7 @@ public sealed class SharedAnomalyCoreSystem : EntitySystem [Dependency] private readonly IGameTiming _gameTiming = default!; [Dependency] private readonly SharedAppearanceSystem _appearance = default!; [Dependency] private readonly ItemSlotsSystem _itemSlots = default!; + [Dependency] private readonly INetManager _net = default!; // Frontier public override void Initialize() { @@ -109,4 +112,24 @@ private void Decay(EntityUid uid, AnomalyCoreComponent component) component.IsDecayed = true; Dirty(uid, component); } + + // Frontier: settable anomaly price + /// + /// Sets the value of an anomaly core based on the number of points it earned. + /// + /// The anomaly core entity + /// The anomaly core component to set. + /// The number of points earned by the anomaly during its lifetime. + [Access(typeof(SharedAnomalySystem), typeof(SharedInnerBodyAnomalySystem))] + public void SetValueFromPointsEarned(EntityUid uid, AnomalyCoreComponent component, int pointsEarned) + { + if (!_net.IsServer) + return; + + int price = (int)double.Clamp((pointsEarned * component.PointPriceCoefficient), component.MinimumPrice, component.MaximumPrice); + + component.StartPrice = price; + component.EndPrice = price; + } + // End Frontier: settable anomaly price } diff --git a/Content.Shared/Anomaly/SharedAnomalySystem.cs b/Content.Shared/Anomaly/SharedAnomalySystem.cs index 00d97c1a46e..d3ba10c0eb8 100644 --- a/Content.Shared/Anomaly/SharedAnomalySystem.cs +++ b/Content.Shared/Anomaly/SharedAnomalySystem.cs @@ -34,6 +34,7 @@ public abstract class SharedAnomalySystem : EntitySystem [Dependency] protected readonly SharedPopupSystem Popup = default!; [Dependency] private readonly IPrototypeManager _prototype = default!; [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private readonly SharedAnomalyCoreSystem _anomalyCore = default!; // Frontier public override void Initialize() { @@ -47,6 +48,8 @@ private void OnAnomalyThrowStart(Entity ent, ref MeleeThrowOnH { if (!TryComp(args.Used, out var corePowered) || !TryComp(ent, out var body)) return; + if (HasComp(ent.Owner)) // Frontier + return; // Frontier _physics.SetBodyType(ent, BodyType.Dynamic, body: body); ChangeAnomalyStability(ent, Random.NextFloat(corePowered.StabilityPerThrow.X, corePowered.StabilityPerThrow.Y), ent.Comp); } @@ -189,6 +192,13 @@ public void EndAnomaly(EntityUid uid, AnomalyComponent? component = null, bool s { var core = Spawn(supercritical ? component.CorePrototype : component.CoreInertPrototype, Transform(uid).Coordinates); _transform.PlaceNextTo(core, uid); + + // Frontier: set value to points retrieved + if (TryComp(core, out var coreComp)) + { + _anomalyCore.SetValueFromPointsEarned(core, coreComp, component.PointsEarned); + } + // End Frontier } if (component.DeleteEntity) diff --git a/Resources/Locale/en-US/_NF/anomaly/anomaly.ftl b/Resources/Locale/en-US/_NF/anomaly/anomaly.ftl new file mode 100644 index 00000000000..6094c72ac89 --- /dev/null +++ b/Resources/Locale/en-US/_NF/anomaly/anomaly.ftl @@ -0,0 +1,2 @@ +anomaly-scanner-point-earned = Points earned: [color=gray]{$point}[/color] +anomaly-scanner-point-earned-unknown = Points earned: [color=red]ERROR[/color] diff --git a/Resources/Locale/en-US/_NF/cargo/pirate-bounties.ftl b/Resources/Locale/en-US/_NF/cargo/pirate-bounties.ftl index c59b87e4e71..400efb59e87 100644 --- a/Resources/Locale/en-US/_NF/cargo/pirate-bounties.ftl +++ b/Resources/Locale/en-US/_NF/cargo/pirate-bounties.ftl @@ -4,7 +4,6 @@ pirate-bounty-item-extinguisher = Fire Extinguisher pirate-bounty-item-captainGloves = Captain Gloves pirate-bounty-item-gyro = Gyroscope (any) pirate-bounty-item-defib = Defibrillator -pirate-bounty-item-researchDisk = Technology Disk pirate-bounty-item-alcohol = Booze Dispenser pirate-bounty-item-thruster = Thruster pirate-bounty-item-gravGen = Gravity Generator diff --git a/Resources/Maps/_NF/Dungeon/mineshaft.yml b/Resources/Maps/_NF/Dungeon/mineshaft.yml index 4addeb53ecf..2de4ad9c575 100644 --- a/Resources/Maps/_NF/Dungeon/mineshaft.yml +++ b/Resources/Maps/_NF/Dungeon/mineshaft.yml @@ -3019,13 +3019,6 @@ entities: - type: Transform pos: 43.312515,23.740736 parent: 2 -- proto: MachineAnomalySynchronizer - entities: - - uid: 591 - components: - - type: Transform - pos: 36.5,22.5 - parent: 2 - proto: MachineArtifactCrusher entities: - uid: 680 diff --git a/Resources/Maps/_NF/POI/anomalousgeode.yml b/Resources/Maps/_NF/POI/anomalousgeode.yml index e9a0c066f19..1d633f08edf 100644 --- a/Resources/Maps/_NF/POI/anomalousgeode.yml +++ b/Resources/Maps/_NF/POI/anomalousgeode.yml @@ -3566,13 +3566,6 @@ entities: - type: Transform pos: 3.5,3.5 parent: 1 -- proto: MachineAnomalySynchronizer - entities: - - uid: 665 - components: - - type: Transform - pos: 3.5,0.5 - parent: 1 - proto: MachineAnomalyVessel entities: - uid: 662 diff --git a/Resources/Maps/_NF/Test/dev_map.yml b/Resources/Maps/_NF/Test/dev_map.yml index d97f28f857d..17d9cb3c7fa 100644 --- a/Resources/Maps/_NF/Test/dev_map.yml +++ b/Resources/Maps/_NF/Test/dev_map.yml @@ -3777,13 +3777,6 @@ entities: rot: 3.141592653589793 rad pos: -8.5,1.5 parent: 179 -- proto: ComputerTechnologyDiskTerminal - entities: - - uid: 1088 - components: - - type: Transform - pos: 13.5,16.5 - parent: 179 - proto: ComputerWallmountBankATM entities: - uid: 1228 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml index c51502d6830..5aa5a1ee13b 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml @@ -123,8 +123,8 @@ children: - id: MaterialDiamond1 - id: TreasureCPUSupercharged - - id: TechnologyDiskRare - weight: 0.5 + # - id: TechnologyDiskRare # Frontier + # weight: 0.5 # Frontier - id: ResearchDisk10000 weight: 0.5 - id: ArabianLamp diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index 98bb808e9be..df65a6dafb1 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -285,7 +285,7 @@ - id: WelderIndustrial - id: SheetPlasteel10 - id: ClothingMaskGasExplorer - - id: TechnologyDisk + # - id: TechnologyDisk # Frontier - id: ResearchDisk5000 - id: PetCarrier - id: DrinkMopwataBottleRandom diff --git a/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml b/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml index 4f53dd52cfe..c201f7a0cbd 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml @@ -63,7 +63,7 @@ - type: TechnologyDisk tierWeightPrototype: TechDiskTierWeights # Frontier - type: StaticPrice - price: 5000 # Frontier - Rebalance + price: 0.01 # Frontier - research points are a means to an end, not an end of their own - type: PirateBountyItem # Frontier id: TechnologyDisk # Frontier diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/techdiskterminal.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/techdiskterminal.yml index dd58b9709d3..a1570f8e7fe 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/techdiskterminal.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/techdiskterminal.yml @@ -1,6 +1,7 @@ - type: entity parent: BaseComputer id: ComputerTechnologyDiskTerminal + categories: [ HideSpawnMenu ] # Frontier: no tech disks name: tech disk terminal description: A terminal used to print out technology disks. components: diff --git a/Resources/Prototypes/Entities/Structures/Machines/anomaly_sync.yml b/Resources/Prototypes/Entities/Structures/Machines/anomaly_sync.yml index eeaae611c37..052b1de64af 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/anomaly_sync.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/anomaly_sync.yml @@ -3,6 +3,7 @@ parent: [ BaseMachinePowered, ConstructibleMachine ] name: anomaly synchronizer description: A sophisticated device that reads changes in anomalous waves, and converts them into energy signals. + categories: [ HideSpawnMenu ] # Frontier: doesn't make much sense for Frontier components: - type: AnomalySynchronizer - type: Machine diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index b0d48161595..c9c23c910a9 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -546,7 +546,7 @@ - SheetifierMachineCircuitboard - ShuttleConsoleCircuitboard - RadarConsoleCircuitboard - - TechDiskComputerCircuitboard + # - TechDiskComputerCircuitboard # Frontier: no tech disks - DawInstrumentMachineCircuitboard - CloningConsoleComputerCircuitboard - StasisBedMachineCircuitboard @@ -575,7 +575,7 @@ - ExosuitFabricatorMachineCircuitboard - AnomalyVesselCircuitboard - AnomalyVesselExperimentalCircuitboard - - AnomalySynchronizerCircuitboard + # - AnomalySynchronizerCircuitboard # Frontier: doesn't make sense for Frontier gameplay - APECircuitboard - ArtifactAnalyzerMachineCircuitboard - ArtifactCrusherMachineCircuitboard diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injectors.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injectors.yml index 24a76dfb62e..1848486677e 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injectors.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injectors.yml @@ -46,6 +46,7 @@ deleteEntity: false maxPointsPerSecond: 100 corePrototype: AnomalyCorePyroclastic + coreInertPrototype: AnomalyCorePyroclasticInert # Frontier - type: InnerBodyAnomaly injectionProto: AnomalyInjectionPyroclastic startMessage: inner-anomaly-start-message-pyro @@ -75,6 +76,7 @@ deleteEntity: false maxPointsPerSecond: 100 corePrototype: AnomalyCoreElectricity + coreInertPrototype: AnomalyCoreElectricityInert # Frontier - type: InnerBodyAnomaly injectionProto: AnomalyInjectionElectric startMessage: inner-anomaly-start-message-shock @@ -104,6 +106,7 @@ deleteEntity: false maxPointsPerSecond: 100 corePrototype: AnomalyCoreShadow + coreInertPrototype: AnomalyCoreShadowInert # Frontier - type: InnerBodyAnomaly injectionProto: AnomalyInjectionShadow startMessage: inner-anomaly-start-message-shadow @@ -133,6 +136,7 @@ deleteEntity: false maxPointsPerSecond: 100 corePrototype: AnomalyCoreIce + coreInertPrototype: AnomalyCoreIceInert # Frontier - type: InnerBodyAnomaly injectionProto: AnomalyInjectionIce startMessage: inner-anomaly-start-message-frost @@ -162,6 +166,7 @@ deleteEntity: false maxPointsPerSecond: 100 corePrototype: AnomalyCoreFlora + coreInertPrototype: AnomalyCoreFloraInert # Frontier - type: InnerBodyAnomaly injectionProto: AnomalyInjectionFlora startMessage: inner-anomaly-start-message-flora @@ -191,6 +196,7 @@ deleteEntity: false maxPointsPerSecond: 100 corePrototype: AnomalyCoreBluespace + coreInertPrototype: AnomalyCoreBluespaceInert # Frontier - type: InnerBodyAnomaly injectionProto: AnomalyInjectionBluespace startMessage: inner-anomaly-start-message-bluespace @@ -220,6 +226,7 @@ deleteEntity: false maxPointsPerSecond: 100 corePrototype: AnomalyCoreFlesh + coreInertPrototype: AnomalyCoreFleshInert # Frontier - type: InnerBodyAnomaly injectionProto: AnomalyInjectionFlesh startMessage: inner-anomaly-start-message-flesh @@ -249,6 +256,7 @@ deleteEntity: false maxPointsPerSecond: 100 corePrototype: AnomalyCoreGravity + coreInertPrototype: AnomalyCoreGravityInert # Frontier - type: InnerBodyAnomaly injectionProto: AnomalyInjectionGravity startMessage: inner-anomaly-start-message-grav @@ -278,6 +286,7 @@ deleteEntity: false maxPointsPerSecond: 100 corePrototype: AnomalyCoreTech + coreInertPrototype: AnomalyCoreTechInert # Frontier - type: InnerBodyAnomaly injectionProto: AnomalyInjectionTech startMessage: inner-anomaly-start-message-tech @@ -308,6 +317,7 @@ deleteEntity: false maxPointsPerSecond: 100 corePrototype: AnomalyCoreRock + coreInertPrototype: AnomalyCoreRockInert # Frontier - type: InnerBodyAnomaly injectionProto: AnomalyInjectionRock startMessage: inner-anomaly-start-message-rock @@ -317,4 +327,4 @@ speciesSprites: Vox: sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi - state: rock_VOX \ No newline at end of file + state: rock_VOX diff --git a/Resources/Prototypes/Recipes/Lathes/electronics.yml b/Resources/Prototypes/Recipes/Lathes/electronics.yml index 4fe77dcba3f..07d532185f6 100644 --- a/Resources/Prototypes/Recipes/Lathes/electronics.yml +++ b/Resources/Prototypes/Recipes/Lathes/electronics.yml @@ -268,10 +268,12 @@ id: AnomalyVesselExperimentalCircuitboard result: AnomalyVesselExperimentalCircuitboard -- type: latheRecipe - parent: BaseSilverCircuitboardRecipe - id: AnomalySynchronizerCircuitboard - result: AnomalySynchronizerCircuitboard +# Frontier: no recipes for the anomaly synchronizer +# - type: latheRecipe +# parent: BaseSilverCircuitboardRecipe +# id: AnomalySynchronizerCircuitboard +# result: AnomalySynchronizerCircuitboard +# End Frontier - type: latheRecipe parent: BaseCircuitboardRecipe @@ -293,10 +295,12 @@ id: AnalysisComputerCircuitboard result: AnalysisComputerCircuitboard -- type: latheRecipe - parent: BaseGoldCircuitboardRecipe - id: TechDiskComputerCircuitboard - result: TechDiskComputerCircuitboard +# Frontier: no tech disk recipes +# - type: latheRecipe +# parent: BaseGoldCircuitboardRecipe +# id: TechDiskComputerCircuitboard +# result: TechDiskComputerCircuitboard +# End Frontier - type: latheRecipe parent: BaseGoldCircuitboardRecipe diff --git a/Resources/Prototypes/Research/experimental.yml b/Resources/Prototypes/Research/experimental.yml index dafb1e04f81..c682b85d74c 100644 --- a/Resources/Prototypes/Research/experimental.yml +++ b/Resources/Prototypes/Research/experimental.yml @@ -45,17 +45,19 @@ - AnalysisComputerCircuitboard - ArtifactAnalyzerMachineCircuitboard -- type: technology - id: AlternativeResearch - name: research-technology-alternative-research - icon: - sprite: Structures/Machines/tech_disk_printer.rsi - state: display - discipline: Experimental - tier: 1 - cost: 5000 - recipeUnlocks: - - TechDiskComputerCircuitboard +# Frontier: no tech disks +# - type: technology +# id: AlternativeResearch +# name: research-technology-alternative-research +# icon: +# sprite: Structures/Machines/tech_disk_printer.rsi +# state: display +# discipline: Experimental +# tier: 1 +# cost: 5000 +# recipeUnlocks: +# - TechDiskComputerCircuitboard +# End Frontier: no tech disks - type: technology id: MagnetsTech @@ -121,7 +123,7 @@ cost: 10000 recipeUnlocks: - WeaponPistolCHIMP - - AnomalySynchronizerCircuitboard + # - AnomalySynchronizerCircuitboard # Frontier: doesn't make sense for Frontier - AnomalyVesselExperimentalCircuitboard technologyPrerequisites: - BasicAnomalousResearch @@ -164,4 +166,4 @@ # tier: 3 # cost: 10000 # recipeUnlocks: - # - DeviceQuantumSpinInverter \ No newline at end of file + # - DeviceQuantumSpinInverter diff --git a/Resources/Prototypes/XenoArch/Effects/utility_effects.yml b/Resources/Prototypes/XenoArch/Effects/utility_effects.yml index 282f9584cc0..7bed06c8fe8 100644 --- a/Resources/Prototypes/XenoArch/Effects/utility_effects.yml +++ b/Resources/Prototypes/XenoArch/Effects/utility_effects.yml @@ -55,12 +55,14 @@ grid: - 0,0,10,5 -- type: artifactEffect - id: EffectPhasing - targetDepth: 2 - effectHint: artifact-effect-hint-phasing - permanentComponents: - - type: PhasingArtifact +# Frontier: artifacts should always be sellable +# - type: artifactEffect +# id: EffectPhasing +# targetDepth: 2 +# effectHint: artifact-effect-hint-phasing +# permanentComponents: +# - type: PhasingArtifact +# End Frontier - type: artifactEffect id: EffectWandering diff --git a/Resources/Prototypes/_NF/Catalog/Bounties/pirate_bounties.yml b/Resources/Prototypes/_NF/Catalog/Bounties/pirate_bounties.yml index 4ec01493561..fd49a9f2ca7 100644 --- a/Resources/Prototypes/_NF/Catalog/Bounties/pirate_bounties.yml +++ b/Resources/Prototypes/_NF/Catalog/Bounties/pirate_bounties.yml @@ -54,15 +54,6 @@ amount: 3 id: Defibrillator -- type: pirateBounty - id: PirateBountyResearchDisk - reward: 5 - description: pirate-bounty-description-generic - entries: - - name: pirate-bounty-item-researchDisk - amount: 7 - id: TechnologyDisk - - type: pirateBounty id: PirateBountyAlcohol reward: 4 diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_research.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_research.yml index aaa453c02b7..fd7e2290907 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_research.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_research.yml @@ -217,11 +217,9 @@ - ResearchDisk - ResearchDisk - ResearchDisk5000 - - TechnologyDisk chance: 0.95 offset: 0.0 rarePrototypes: - - TechnologyDiskRare - ResearchDisk10000 - WeaponCaseShortDocumentsFilled rareChance: 0.05 @@ -246,7 +244,6 @@ # Computers - ResearchComputerCircuitboard - AnalysisComputerCircuitboard - - TechDiskComputerCircuitboard # Lathes - CircuitImprinterMachineCircuitboard - ExosuitFabricatorMachineCircuitboard @@ -259,7 +256,6 @@ - APECircuitboard - ArtifactAnalyzerMachineCircuitboard - ArtifactCrusherMachineCircuitboard - - AnomalySynchronizerCircuitboard - AnomalyVesselCircuitboard - AnomalyVesselExperimentalCircuitboard chance: 0.9 @@ -296,7 +292,6 @@ - MachineArtifactCrusherFlatpack - ComputerResearchAndDevelopmentFlatpack - ResearchAndDevelopmentServerFlatpack - - MachineAnomalySynchronizerFlatpack - MachineAnomalyVesselExperimentalFlatpack - MachineAnomalyVesselFlatpack chance: 0.95 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml index 0da334c3c35..13d1ace68b4 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml @@ -268,15 +268,6 @@ - type: Flatpack entity: MachineArtifactCrusher -- type: entity - parent: ExosuitFabricatorFlatpack - id: MachineAnomalySynchronizerFlatpack - name: anomaly synchronizer flatpack - description: A flatpack used for constructing an anomaly synchronizer. - components: - - type: Flatpack - entity: MachineAnomalySynchronizer - - type: entity parent: ExosuitFabricatorFlatpack id: MachineAnomalyVesselExperimentalFlatpack From ab9ce59e6b55d5585b5044ef6833f58b44a5c6ed Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Mon, 9 Dec 2024 20:40:31 +0000 Subject: [PATCH 43/52] Automatic Changelog (#2537) --- Resources/Changelog/Frontier.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 153e97b9936..d8f86502044 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -5781,3 +5781,11 @@ Entries: message: Added ITS Charon class medium size expedition ship id: 5568 time: '2024-12-09T17:57:42.0000000+00:00' +- author: whatston3 + changes: + - type: Tweak + message: Artifacts and anomaly cores are valued at 40% of the points generated. + - type: Remove + message: The technology printer and anomaly synchronizer are no longer printable. + id: 5569 + time: '2024-12-09T20:40:05.0000000+00:00' From 5399a7f9b7a7201a78530a77fb2f9905c3cb24d2 Mon Sep 17 00:00:00 2001 From: Unkn0wn_Gh0st Date: Mon, 9 Dec 2024 17:38:34 -0600 Subject: [PATCH 44/52] New shade for 100k bills (#2536) * New shade for 100k bills * Cash sprite consistency --------- Co-authored-by: Whatstone --- .../_NF/Entities/Objects/Misc/space_cash.yml | 11 + .../_NF/Objects/Economy/cash.rsi/cash.png | Bin 286 -> 375 bytes .../_NF/Objects/Economy/cash.rsi/cash_10.png | Bin 292 -> 424 bytes .../_NF/Objects/Economy/cash.rsi/cash_100.png | Bin 291 -> 413 bytes .../Objects/Economy/cash.rsi/cash_1000.png | Bin 290 -> 414 bytes .../Objects/Economy/cash.rsi/cash_10000.png | Bin 695 -> 695 bytes .../Objects/Economy/cash.rsi/cash_100000.png | Bin 811 -> 1466 bytes .../Objects/Economy/cash.rsi/cash_25000.png | Bin 681 -> 681 bytes .../Objects/Economy/cash.rsi/cash_250000.png | Bin 1155 -> 3037 bytes .../_NF/Objects/Economy/cash.rsi/cash_500.png | Bin 299 -> 401 bytes .../Objects/Economy/cash.rsi/cash_5000.png | Bin 231 -> 380 bytes .../Objects/Economy/cash.rsi/cash_50000.png | Bin 701 -> 701 bytes .../_NF/Objects/Economy/cash.rsi/meta.json | 266 +++++++++--------- .../Economy/counterfeit_cash.rsi/cash.png | Bin 223 -> 360 bytes .../Economy/counterfeit_cash.rsi/cash_10.png | Bin 228 -> 425 bytes .../Economy/counterfeit_cash.rsi/cash_100.png | Bin 227 -> 409 bytes .../counterfeit_cash.rsi/cash_1000.png | Bin 227 -> 399 bytes .../counterfeit_cash.rsi/cash_10000.png | Bin 695 -> 693 bytes .../counterfeit_cash.rsi/cash_100000.png | Bin 809 -> 797 bytes .../counterfeit_cash.rsi/cash_25000.png | Bin 680 -> 680 bytes .../counterfeit_cash.rsi/cash_250000.png | Bin 1154 -> 1145 bytes .../Economy/counterfeit_cash.rsi/cash_500.png | Bin 234 -> 401 bytes .../counterfeit_cash.rsi/cash_5000.png | Bin 231 -> 231 bytes .../counterfeit_cash.rsi/cash_50000.png | Bin 699 -> 699 bytes 24 files changed, 144 insertions(+), 133 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Misc/space_cash.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/space_cash.yml index 6681dec0299..64f182fc84e 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Misc/space_cash.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Misc/space_cash.yml @@ -20,6 +20,17 @@ - type: Stack count: 25000 +- type: entity + parent: SpaceCash + id: SpaceCash100000 + suffix: 100000 + components: + - type: Icon + sprite: _NF/Objects/Economy/cash.rsi + state: cash_100000 + - type: Stack + count: 100000 + # Fake fake money (ikr) - type: entity parent: BaseItem diff --git a/Resources/Textures/_NF/Objects/Economy/cash.rsi/cash.png b/Resources/Textures/_NF/Objects/Economy/cash.rsi/cash.png index 42e7b863e685d9974b0f2cf88fe948c507cc45d9..7ce8d6fd7b6e2cf6e729971c81b4866e5951c0dd 100644 GIT binary patch delta 359 zcmV-t0hs=t0`~%t8Gi-<0047(dh`GQ0X|7YK~z|U?UXS~!$25@A0-VaXP^X^41t0} z90QW6E^+b?ICOI9(yf2PrCS%>{Rz%O1}R;f>{f6nhz23ODTcH|Oze_NK}CdnwwLd{ z@B4UZb9uVA`fiV%x`KITuCh+1Jbc$a4-#%rgK0002ovPDHLk FV1oCosf_>t delta 270 zcmey)G>>V5WIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hEfKP~P zf-NVTGaFM1)6P4nJ@ErzW#^d=bQW)wP81g+`978Pp-}Za+9Z=wKVP&-cZeL*9ka=a>ZMC;K zZ0*looNF)eueisdBd)_>;#%wy%hM1s$sk~vozP{Tf=Ba;(o!axy_b5iZDDE>@0MJT zbvs;@pHbA)>OT{(*)&0y%EbL5Kz$?2ZWTJ)s(c z_p=X%oV0p zLg*T{(Mb=teSEZu95iGfPYrLhVu0&q@O_O8qIi{ zck`9lAWiwR+F1ie;CXqvBQ{85yB?LBI?Z?+GGJOIz?KFGJ)QI1g3DZw-RCW-2jsUv z+Q4MwL@uAlBO^4x)Eh<)U)+!9^8FdV@h4O$6p9ZSDH4d&2a=rB00000NkvXXu0mjf D#KOIV delta 276 zcmZ3%yo70jWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hEfKP~P zf-NVDg)5(X;?7cWr^bn@Id$ju3GAI-e)+T_v#K6Y)u*H#+kq5!NswRge>h<9@@M=6 z6y_}Oh%9Dc;5!V$jK}j=q%hPoFqC?_IEGmGzwJNBci4c#nR~0^$^Z2QyIG4o!rn%$ z{CbqDE+Qqn{tHuVIm@(GiH^2!1y|*G7);E$xQ=)jpJSM-Fy$#vV#D7o2eTThX>G;# z_wiO;e6aYS=l7>=7Jq+!p?c+idbAWzmUYN`>zwODK}i>i|w6%C!WfPx5Wg$&?`cpT0U;EP3d6_jGcvtAYCF5J1guDN z|I|mOmxt?@qht84fZB-kcBXj+C);hTA1o;~fch0E6A)&QxIB#p19?ko;C+z1`1s~E sl}?4!z#HzQvHg%0>2w;6MkD7FMCFR<1E(jj00000Ne4wvM6N<$f)X;X;s5{u delta 275 zcmbQsyqIZ%WIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hEfKP~P zf-NUMvy%X0^v+UoSJQ5N`Qmf?1oloZzkFJegFzFhD&%MDUm(R@666>B9}XD2{24z1 zg*gj6B8wRq_zr_GM@}-M%23Q9SB$?&Pu< zftklUR@%N`_sM6O#+c8rYg4$3F`I*q7EcIA%kP z57Zppo93N=xv6>mzW=To)vN}}4N_il*`~@33xDo2ORHtdc*{^Eru=US%jDZUKxZ*{ My85}Sb4q9e0H3{N7XSbN diff --git a/Resources/Textures/_NF/Objects/Economy/cash.rsi/cash_1000.png b/Resources/Textures/_NF/Objects/Economy/cash.rsi/cash_1000.png index 6a5688cd866d413a9e40239c01388bd43c060164..6271c90e99b574eec91284b598c58f15ffbdecb9 100644 GIT binary patch delta 399 zcmV;A0dW4J0-ghq8Gi-<0047(dh`GQ0cA-ZbHVr*K7*Tv%DPM z-+9mPyyrb&Fc=I5!+&OfbJ6{4ji_Iu7>T&b4X(evE*aenLw`-2kH^9+tXDAz^X z4zPf>9geS;0Z`Hc2H)aih=ITkC~47ZzOZvTpj38I(n8w~S_touPffk}JTVMVX!Pk; z)06ew2DI&D%PDHLkV1gThv2FkW delta 274 zcmbQoyohOnWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hEfKP~P zf-R>jGjj|R)6P=yZe8sXdHHku1oloZzkFIzot*`!>daC19w5bC666>B9}XD2{24z1 zg*gj6B8wRq_zr_G9>|~9VIP?5#(lcQvP4?LR%AZ;H%Fbor20F{r L)z4*}Q$iB}6{%$8 diff --git a/Resources/Textures/_NF/Objects/Economy/cash.rsi/cash_10000.png b/Resources/Textures/_NF/Objects/Economy/cash.rsi/cash_10000.png index 3400ef8a0a2e3fd72274d9947b709e01455e9f31..8038bb576ff4d6230e57d3a84e5236e4537574bd 100644 GIT binary patch delta 27 jcmdnax}9}`oxtS|t;?qsc@$X~7#Qr|e^|ZIFOvxXjD89K delta 27 jcmdnax}9}`oxtAd<(E$@@+h(}FfjCI6nSj)%VYuoi#Z7` diff --git a/Resources/Textures/_NF/Objects/Economy/cash.rsi/cash_100000.png b/Resources/Textures/_NF/Objects/Economy/cash.rsi/cash_100000.png index 4c5da7804b31c9912f756dffd5a42e7740b68846..26b4e80b1f11b135b707dc8876b90552619a076a 100644 GIT binary patch literal 1466 zcma)+X;4#F6vu-RsS8F+k>WyhKpD}Nsj@_;=79w604f3^Mxg{1NHkGWNfS(7LU`HeW3XTP$vboJIrq+-`JZ!sch1#7 ze;>;g>sKHU2us{SuOQfFz`OE`W$^ik5@AFj%rkLbo<~z@^2zVcZ8-b&Vzy&1hhB)^)M} z*2hIx?0wCxziiC{uZ}RAlG^lYoYI&+xCO6DdLGixY5*@Sl| zN!qnLf@Qfg`8*}_Y@6=q*z^5U;ehDI52o{=$nL_!%AgmzCwH&2FHlp$qPQVr@a1M_ z{v}`U8ouaoU@hyFjAc-V%670&P(0i3NHo4Pbp|hOCd3`CR8h#MC15WdEZ#A)9MnB!H zk~y0-?xKx&y^m4mmV#r?PWNXhb z`>pqq0;>2NUdbR`D-Uj+n(7gIR1s@Yi zissGVT{DMeMkg`B^*>Dmy{?2!=5Kwv!QIsKw%dx{8dU-MZgav;T$^6gN1*`beM9_F zUt{=Dg6t?oH|F;X1Q6Re{EvAjDp6(tV2VhBa>`9IJ96?pdvB{v{H&TJm!@b1 zQ}v9^s~wF9$?RycZzCf>hF1DVC-43(hv^+nf)g|I$3v;7Hw zoS>wP84VWbp>V*n-i=q06KrP7XQDStAT_d(G4UC>@;O>A1Kn(cP633+c>ABh{5VRlOa?Nciy=7Oa)+2R6Auk{7~P?6eHh4JXZG|(m|vX2ZX2C+ z%fJH5svUZ~c`le1w)_oFzx=^g>jV{Djm+k3z}kXW4m$Y(nNdzkssNIzKpH_6Di@j@pm6K3I)MEjgvMAw zI@K3zM7-l40X$Nju?liqt^tO@fZjq6p(ePE_ZdAnpxcijl*a%<>`jBfRCM3!&_0n# z9XC>3D5wTePwP^ROBc!_6H}dqy*{l0jp+E9-ty*XG&DG>dp;2rEO8v*03o@waXgTb zwlrHSmMEC*{iT<+V$zg*@}(;7N!OA`1E>m`_cM7Nx)L%RIuqk89Nq0fTTBKC=BP*- zE3ctVEsTuM8|kk)zXEjQ0@X@7ehwsBOM1?;82Z~3xN)2S$8F%yorn;Y#o=9iJ0)==P!bJ+>JbW zN1_0=<~aOMZN>ss*KT-09Id!?^`E1!G1vVSX@e;Kq;PMiY0GvM>CLfj+LV4j(7jQr n_W)qOYi*>_|F{5LoQ2zzK(z0~3A`g7SU`pI_V=paf9le|FkuZn delta 799 zcmdnRy_#);WIZzj1H)&ZDd&NdN`Oy@Yl1E3el_WfwnjTk#b2bvzX%IFw@+a2^zzH6 z6_<(d166$xU=S>wwGhbSDGBlm{tpKX|JVGyW5~e3w93=PF{EP7+c}MS%?3O!($6NW z`TzgmVHOXMN6lHTAy=2q3QObBUpHgN;g^r=D?e8VG%&CzFfeiyY^dGxfB)mt@^?1$ z%>R0J!|k`besC$&@hmPEI_j!#`0EverQFfuFOT`xL587vFPxxB9pDF)aJ^wAPl)vkbaxwm7zF=Rl{15Xl z<}d7i>M?d4FoS_1$Ed*D0s1^I~ieT%=c-g0F4vOg{P|AH^_R)3i@ zA@|Q8<{^B1KvUol%eWU+koqoe> z=Co4&>-;~8{yM1NpZ@Rg@fg-G?DLM5*}mYfhebZf)(5{C*X`5ZCbTZh?Ks2kuZ(Wx zwQ=?hU-o<75BQ+va8rH(m&}X*UwBy$$iFCgK7VzCh-kyFdoLz1ycYHgS@42i;EsI3 zs{IeXa!q;7%(9;U1LMp3>H8Kw2yM8%zN!0fqjSS*Ai+@lJL7-&t Ze=ht=t{kgu5-?3Oc)I$ztaD0e0sz$td!YaT diff --git a/Resources/Textures/_NF/Objects/Economy/cash.rsi/cash_25000.png b/Resources/Textures/_NF/Objects/Economy/cash.rsi/cash_25000.png index fcfb013f861339100fecc566b832e64eeafa255b..b0f705a34f11b8e189255f7bd4cb7f30d22c8e96 100644 GIT binary patch delta 27 jcmZ3mzL-|nq9$J8`Ph<7SNMzc97WwU7VY?AnwGfZ&k z>RS*tCY2Yh4SxyO#nVa|D$xk;1=lWp^|5-hB!j01ha6raJk9uTU%fUm`ByoCAEkS5E~6MMuFs z#19&Thp;F*0yHwb*@9pfeC-^*p~rm?t0NgRo@Ls3;5peVG4-V2;Mr+Nd(9>vQ0)CL zcv{8zS^~}w^!AZ@5c|#}{rS0t*i^C-@KnB~+4Vl1?9YD1`>mkw z&YHlsWsTT&;xzMT|6Y5GF-N>bMP@j*S`Debr0l7tt(TsVAb#J zRn^t=yY6NZb!tEnV;{i=p+Y@!dCRK&PuEFslNBua6UJNBtTLwKPmC#D(gx2PmM9Z86{9s^I`rhXmD2A{;`z|aOQ)@=jZ`!LIP6= zInRs?j}XvjZX;1BJ0CsI&`7RS!G4;)9T1_|R&U4OFx?KE6(oG72(NyLo=myox7cPW z7LV0XmDkchLQzFYtOl|Vx~eJ3o^;QWcA~TWeUwz&NomK z*3}{Mn@>nozdjX_BPT;Noo{1~eQPS2f=}a^mtlC1;M;lCOea%1(Bl!|U7Z!463Z7e z3kml_Hdyg>@BEdbZY2Bmz2Pn`M^OZ?Jsb()no+tuM8|&8nD5?HZLb@DCfzs&FCzHP z-i%h>i|+H=zOwd0d;*J(kIwd4PMq-)vDb7`=>zP+rk%2DfT@BXeZAgn5OUH7)^G7v z;y-B!vyI6P0ng-IsWXzolm8E^*1!`#n|s>4zK7DnCSY~cU@1Stv?${ zIcj%Ym(D(!U1L3A&1lYfF$Fs7!G(o|#h^tx4}>51bQ(CnZZ0jAXgZ|A)ma&p!TCK) zxyD8$8ux`ywwHsqIi^e|YBSRk{>z-(a$WI?ikWeTWd*O!g&NEL5=zd@o3I{P1?yZs%8b8l?gukaQ$jv$=AlCf$#(a8 z4nI#yeHCN&r5!iNrXRy6DRu0=l-yI%H29&At%?Eyz%${`O>5o7Xn050VRv8Dz9ENtUms&@)=r3OziJILO*0y;_W)L9}$w`qbJ znYBWcWHUZ_bT(ap5qGoI(qXh2o%-j0BwupSsJ^79u3DGG?b9%NMrL3`6VM_YvnQ1M zn@@|dTXnfC?aVKRIK=7M#Pe#3l82Cf)CyEb?B^mbaizyIk{(T~++fdz?@Q&t!zTLp zSq=LQ*j1ie<+)L9g$xX}d}eDF=feVNS_m85GDhCY25(#wh!h|5{cGDyr=P?qkbA!>LQ4 zxKh9tm==Xa&1@6)4+CQrf?JVOrt>cLWF^^y5Q)S#q3D*{M(Nw{YG@i%Ibd`fit_@n zpur@$ekQO>&=UaE_%c+$hRJpBLgS4*kqjHT_=p1fK3)6M88g~N1tM53{$qlj;oF?) zulG5{dAraK<&D~k2m3OJ7t;sVRc%`x6oY&Q?uc_kX=Pg0M@pM7X4K^aw*+{d;3X~u z*axrx_`D&ha;_5jbxG|RuXN7OkN!%Ha8MZQAUX0m!Vs}R(GxmIqRav;7w0SbHMOs;0RI!j)*g1h>ZY>or=44J1 zn&I$}G%rwpT~x^iN8@9ti>u^su$*vWQJ|AmIOd2?VkFYjOAg@hP?i{%@CIdmIdz87 z%S2jh7hDj7hkr^~xGY3f@t^e$oZ;5DIdW|KalI6Q&{XxYKJy7maKC}>*~JmuG+@3X zmO5OC%$Ssr@%9NE=e^?PtqG@`l$@L-%n|oM|7r56@jGD<$a;*@?c7zm)h7ACe_=>- z!CH^a_ghu z$$f+D!_^u>vCwhyF?jN>XC-4J7TBjCV znz%~N^=Dz;p&>$KBxiCno3mPnp#D}LCD>~rm@N6qj?j_(t?7Ixd;L6_Ec_ett@kIZ(DEW~Bc~Rj#Ccwo zbP@W%Ys$FaTB-^yea8_HOf~vvw`6s`mEh3dblvi?i5D^PnPuT?K1qINa=5MQeh8O< znEWeEF1oI8qh*~$6Ff_f0Y=yKBoy%w`R{Xv9wZUEdUE#sZTj8onU&sxV}J8p0{oQ+ z;W5Mv=hyZda5k+qHD=~`A0Ka@x}Rw}j{7e=C6A-}{^VJ#^b|CfMQ2T0JpL~0?d`K4 zN{(5wlbAZWY3JNr5v6T<8s@-HRqfc68b^t4kH~lVke@ZLAI6f{nswFmi$A@g3JVh^CYW-%qDg@LWvnA}7XjaK_yN7omCR`&*h0xKc3_Bcq}U{m`d z4x;R21w=GKR8N)N?78-+?9wSN|43gj|Jdhz5GE~6wRKp^iVp`p=9r%SyJk?(&1 literal 1155 zcmeAS@N?(olHy`uVBq!ia0vp^2|(Py!3-o1GtKD$QY!*{LR=GUIoX`qm{OQ_mWs1j zxbnFt@-sULFh;vfb=f<;+@i_i@@d6$`vjaCC#vSuxtezC%NMigvoNdbaWH7Qu(&2L zCAu;*$1pK<8g`W{R&?uXm&nWOGV7|dv$%pmczAeTUS2~(gPNL}kTJ7_E3ijnuv(Vel_Wfwni_)0$-%WFB9Q+{rz+e z(9ISlL4Lvi@d5^%vKl&X3>X-ggFIavLoyoQPH)V+Wgy~ud6!6Bjq{CbK_1%zBfP^B zVkKJt{-6JL=C8<2le1<`@tFH0+jZxa6UWs(mrkg8Yw5}2;=tl^z?$U`?~n7JzwwJt zH}g8R^!wJ;jlGkMK0I6B4&)jz^aKf9>YgYU%kYwegW=|k=f}fmo@01-g2}<|;m?z$ z>xvt!KM70-vhs4DzS8gD>f|YG4Tim&3(X|5c`B;rC^GnDO!EKq(B-w_dHpE6k4DFihFA zOz)l7J%&?EtV{YrScIN+5wJ?AU=f@-|Xz zDs0>L94~9WB=LdOY4$;{$#td&X0tu7b~t0`e%kiJv4&-;fv0U1vNuEt#IIIuZMZjI z3FJACDcN=oi()=A&R6ZszQ+^~^xwTd=AMsc@fURN=T}l-f}#b|4)OV-{Qba~Tl{_N z^4{J_n?639Uw=zO)1KMksQ&(|zZPD~UJw=Tz;Gk?Y{jjQr*-Ey#xmTvu5jgib?@^k z{wu!)Hmo~S5tD5bW}wWFQ~u}E?%O$E%bIohSsG@&vRxnbTB=&k;c&uPZV6_aH3t`S z@t%-+Gj9X4^%jXYy$9t?dw?-{SgjegJ$BxnCu^#poZ@8fqza7qOxRtJ_6 z<`*&<;x>D3XlUxoGW)sL?YEcn`&DAW^k-%Efr)*~AHRIM;viNLVtL;$}}-b?)TDqInzQ} zlDI{e_IygG`$T&_#Vxu-xd>U36fO^uB}sce)xGVSMQQ>7Dpu5*GscY;!V#!}LO25N z*+a!jYXE{qOKbgMpWw6Jon06W7!weVU_7Ye5BpU7(b`0;h;k9a5n6L|euO{l>+j8) zh0%bD*EyW^)Y-^SQ-ta-p-v~K__I=s~9z4eg(z^qFj_Yd>0K#dMnkya`l=yck=kQlkU&> fjX$BqVzGPxvetu~=(ny#00000NkvXXu0mjff%C3? delta 283 zcmbQpyqal(WIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$g>fKP~P zf-R>Di)#W?;?7d>PQ$Kp#fo$L1oloZzkFJ8lIs**W?i7dno0|GAjMM>=PdAuEM{QfI}E~%$LsS~qyR-LJY5_^Ed1a09~5d(;BaA1)cpJZ|5+iM4BzW% zS+)k7`bDRIS|FcMrEI`k(R^d-9wYO`%!>>(PHHvCrL$ZK35f`Aosn=jv}q0}i?!0S z7OQ^aM(xU}2@?~-=5NkqkN^8meBqO+DAmO2R`@e4eIv3pNTHdSI4e#wriqZudhU;F!`=B;luN-CVvKl!O6h}0F+W_t%-t! zQs%L|m=mWVv)PPlwTgF>p`I0ft!r|grfvLM*Thb*QE0BvfYzFpH>RJ4hzL5>h{(FF zwb1~?8_kz-8>dB+B0_(DO%xW!>b*ufSSJmHmtDU;}xcTazCb@8oZG-JkIrKcU0naC`#C1BmQziS?-f0000< KMNUMnLSTX#uBo2@ delta 214 zcmeyv^qg^mWIZzj1B1(wu46z-F~BFpHNlqC)zvjTJbY)Vctb-&US8h0eFA%@mtQ`u zsHUa{RAun^DkqTQE(!7r{tpKXUjB@qfWldxE{-7BPn=4wz7aM}CjOw|AX2Xh~C ztrXnLYO26f^i4bP0 Hl+XkKsYPdw++h8`U{y*HkDYiNz>H zHgT~Sg^-bi2n1NcAR`I?>;N*7Iu?OIHgO>Wq2oT7Nu-i+>G`141@}0vjxx-aV>H7C zRFckV<0Q@j0NmrClE6I(P)T3~`)Iz-Y2%AD)JwIs8#{3A zRG6mWms52)@KJfGtvN8QUF|>;=SBypBbP4K3 q^)|k}ub`^_ykBD*KcU59vAhFKcaB3icsLE=4$!Q?PT@vIM{2vY&y!;tI0fm!1T^vI!df!fPI2?x{-smbf zToDHj4lRvGWo>P4=OPF#;?m@zn^R**ac)AJAW~^l|3JeXfgCsJAV`A^!mto-vO;<@}73Nb1O;<^uCeU=1`P89b?UKqWXu3+j+V$^Iga)u(kMg2K z(K0D7N;L8{6j>sX%wW5o?-^Z<0Z?R#M!rU6P^V~_bd1(!0Tfxnc0D>qi)Oq{Wl+a< zJ?2vfMV5Te{(t43A7*u~^e6&%VAaUV++kRzA4ZWSCO;U&O?kQ#}h_ifTcHyEWUZ1t>ybOe&Z(;2n2!;cN6%E!0r@3>Hq)$07*qoM6N<$ Eg8q8Ega7~l delta 211 zcmZ3<{Dg6WWIZzj1B1(wu46z-F~BFpHNlpX#ln@(J#lBLxKraq)ttI>`vmq*FTZ?R zky%v_sOnSFj_p8-yCldj_&*#lc=%zeU-HO(1 z&8hBYC+;j*e$Zp{L*CQzS6Z&UI}r9bs(Q!CN;@W*crN8H-k~p-0qtb)boFyt=akR{ E0NhVi!vFvP diff --git a/Resources/Textures/_NF/Objects/Economy/counterfeit_cash.rsi/cash_100.png b/Resources/Textures/_NF/Objects/Economy/counterfeit_cash.rsi/cash_100.png index 1ac87bc1483bfc89cc36c5ba207bd69e301256b5..7d78f504fc35bd284a11dfa8649ac8a3d0548251 100644 GIT binary patch delta 394 zcmV;50d@Z40ht4k8Gi-<0047(dh`GQ0bof)K~z|U?US)f!$1^=e~EUei`#L{(EbZS z5^-@*bm;1!2pv2!buEH}vy_5+r;?>24h5Ie!L|-{kPdcqRS^?z5+_C4bMkB{cL{V7 z?pq$@{qFJcat9a;27|%ypE=shibZEEs~W3I+rpaUw1*Ejx_`L7+e?&q7Z;YQXX_67 zo{K?sgnqA$L3IS*b5Y1s2s?uBxp4MZ;Cn8F9iiWAqmZX_H3_W%=P@cR2F3zZS`4+? z83>`UCOL2(%gpV~0|1~|?trlXVc3v03FR*U0757@j}e9qWQGnZC#T>%hOi?L;>yg{ z?wXV!gwE831b;Y>(JXgRVu6$)gyQ*Sb_3IQW%~QV0)$YM>P5MM@AWq@7R+tn>2-w6 z&_StQl)}Fi(2FQ)(F?wgIxT|TmzI^eyeFA%@mtQ`u z$ibiqR2A~G^)Ha(E(!7r{tpKXUjB@qfWm2>E{-7BO6KJM#bkgQh{s zu8X!Wco(Pl_)SCGSG9-iaojxYse(&Yyss+BG6XX#8!fuDoSnl-@l1%RIvcZp^V=5; z7w$Y{n<@RpK%%zl!8cLUm0PtpTxq!`_wR{~Jfm6RB;|h!Lc9HeRx)_H`njxgN@xNA D1c6f? diff --git a/Resources/Textures/_NF/Objects/Economy/counterfeit_cash.rsi/cash_1000.png b/Resources/Textures/_NF/Objects/Economy/counterfeit_cash.rsi/cash_1000.png index 85552174e64883e9df44461ab35cce8593dd87a6..db27a5f10b6bc0d0989ea431231ce776e2975da8 100644 GIT binary patch delta 383 zcmV-_0f7GF0gnTa8Gi-<0047(dh`GQ0ai&wK~z|U?UOM}12G)MUu8x$NIIys7H>sKh)j)HV^>?(8!PK`k**2baSfwY&L?Ih&4 z{D-`}JRbi527|$1F#KoE_t)jB9@(UWN+u&6srEnGrI*>%j1UCAhr;0o0^b881obXO-gW1u4rKtw1v)K)c6AG#7D2f=ghOpO zQi5?2Yp$L)0RRrQ7tW;vIMfE?0>`%_9Gpn>YDF+EzzF&ENLcxZ!vH|JIgGU{1z=p@ z>>?L8z_?i0KzOt(QK(+67`LS(aS0>CyPH`9RzHWYoe|nq%yxj<06yVR8?S`G>KDMc zn43Bhw=>NzIKAA){q?){5!EkHHo!>Yy+3JGBnEiP>Wv>?cq$#fmk2NzPqfZ^uw)vY d!C)|`_yIHmg%sk?384T0002ovPDHLkV1iCysjL71 delta 210 zcmeBYe#|&QvYwfNfx%@-*D)Za7~m7)nqbT6%FGfK7qZ{%P*f+ zRA*-asycJjy$48fmjw9*|AzwxFMq~QK;bk`7sn8b-nSEOb2TUkxa>W1ChGtHgQ_d1 zC|!&W_-wK!oqtW<-p=2R*O?AGN&W~B^3LXzWtiM3#~CMbL{5Q2(ID_=<@&vi>CFaG zI@X&M&+uCDxHa>(-PX=Z$_`IhS-95r&&f(Vrkq%7<1+@i`J`mH0D$~m$3?T#n002Ml@T-wd8hV`)(-dVP|dfc+t^=AN;AxU}-wz|#OERe+2#lu>> zkL#m+aeqnvQUOgWP}+g6707l_%C|Wn-}v0F0^S&>9h54t#48m@^Gg*-@~aha;|_+Y z-j{Yb#)pk~zyA!Z`Iard9=B}2`wZNE70lzk9OVmK7M}pV=J8sNvIVY-KjoY7zCi#2 z5P$##AOHafKmY^l|;VzK`k|_yca#&p2O^ zKVa)){a`VIkk%e_w%B->KkyNT z{s8@fpC(*B2tWV=5P$##AOHafK!B&*72mInQvIK)*InFx9Y_5EF&p{^n)(NY{(!2JQZzd&$*foA;$ z1%JTQJ=XVv`U7G%^ba)k4<2(B&>#3z&bNd9009U<00Izz00bZa0scQg>s{|}0a}$$ zJ3yx2gGzw?0UE;D0I7ZtVR#?l4>%({y-@<1RUjaJ?}leRy#lFzFI6DxFSw`zi+;!d z4;cSpa5lj0S3#rxZw6@9|IGl^^P~Bv1N`|Q009VaJHR)%%STrjIwRiz0000?0rm delta 622 zcmdnWx}9}`oxtAd<(E$@@+h(}FfjCI6nRYald8A!ba4!+nDcgaZ{A@Ao|f5H*sguA ze{l54d6t4@6MHhOmiT%0zHGl9vUBzCUnO$-K%HRVckcW%^W)Ri+X^M$e@*aNc2_)} z@r1R%O~8VKhL*?MS-Ce$W{-?blMxFjEc>`YO#bn& zFgwfosry44LRr16AM9m1$>;Uc==ce7yXm0^xF2t74r1L_v6RVbe+c8$__YnQ%MEj!du5k$-w}&v*mv#Yt-eXD@4D@uPTp`I z=3EFpuPFRZyrkye_^|DEq1%_)J1ncO7r46iA%9Qd-(CCqU)}t`erL`6w>8`TFh<_L z_FuK#{|50_hRv!mGhVao1D|4wLh2Q0W{eds+OAa4= z#V_zT?tK4W!JF5=d)+@S8}(~{1miVpli%DLg$YIV3F{hwHhmYLa5w&dXT9S=d4baW z*VUVTF(++%DZk+xzg)5C0r?*x=lYrdq1gS;-r;rZ`+UZzss7dui|#WA8~kRrXj#p; zrH((bO7^gPfm3irC9B0shYer$&i?o5spy4YdqWzR?0>L~E9ckUf3*kxa5t}J+!fE- w`)j}Cg3$lw%pvE`Ka1!4@SGWFk3)Gw{v_-boFyt=akR{0N>LchyVZp diff --git a/Resources/Textures/_NF/Objects/Economy/counterfeit_cash.rsi/cash_100000.png b/Resources/Textures/_NF/Objects/Economy/counterfeit_cash.rsi/cash_100000.png index 162043b5880ae77a858576868820f5a6f0bc2a72..707382f69b63b9987106ce907fbf69410b3097e4 100644 GIT binary patch literal 797 zcmeAS@N?(olHy`uVBq!ia0vp^4M4nrgBeJE_L*`XNGS&Rgt!9fNizC7l&yD`ia!p@ zy4<04ZlAzCtBA{|6(a;?fU@1K=e&RvcS(?6@P9a9@bYK;#K6F`z|+Msq+-t7Io$cp z20Sg&uWWAp|KHrs*=oaY)#z|Fb=Hw*7Jnagt}8G7RS|C^$D+W%$l<`iBx1kc?3ujW ze8w{d{m-8#ome(k{69lSY1p2L3ThRc2gSM9d{nUOxqo-Z#T=1xzdbvI4!qV+{oojW z{kVph$D=sTrPA^yw|D2=dD%L76_ee{20N#n%=^O_Uzx4i9ToI{r z$}g-sAoM;&;cR|rLT5AAjvdW~tG2F{J@#XVVD{_%A7`z6l6S-D_f6+3^um8K zEkByx5N^AP^<4M;r!zn7a%5lQW4o%7PZ;ChB%>}k{M1%CZ= z2sse&U;cr72t((-{@pIW{xkevu)L;7k-^n=CfkMAAH)~ z@b7@p=U(=|jL2U3W5@8f@%-+`FKQag1Q`CVzj?#n<8Qm$e}_5EznM4KFOcO^sDD-9 z@SJ;=^_R$Y)+_(da;f}t+Rfxz&v5O#hTRdV<{Ho6+_Ro@Kls_;dH3*VW; z{9iB|mxTvzuJ5X5NY`GR+wi8wVfAi1Yx{;T`#a|ce9(2cCBJ}6=EeUXoU8}rGfJMn zU(s-0o8fEiYG}m)JWL)E`*)uclQs_!$!)QQh|!=J-6 p=Pi&}qn&%k{xvk-9uzg$uX4U|5H~TJ4?l1q{P1n3p}?^VDI$u%cm8WiSRQpFnkbT z5GjkQGtPx!-0WGAfZ0J{{4^bk3X}g%{YF3lVM7Gtav=b z5o`Tx9s9k{Qa@{tC->>pG$7h+HlNT)Z=rsXvE_M zOnT=MY_9yiR?m}MGpFPG*ZUQxujhzd&-ti&;BEOqqq=Kr|FBFyn%;0f)#lpTH!RnW z+CQ~_Sli6N0&{r-1Iv#o%OCxo8o20x=-qZN+2#KjzVM$>{IBrkZ{v!Fh5zgi+OJ>` zs+CXg{PLgkpJQyJ@BQuC1)J(GtU0je|JQ)`6YUxPG8fmMuwP*BQ2(Id&{M32-?G0D zvVCT~KvwCTui^{-IMtf}Vqf-|xmI4(;2Xa~-HEH^Z~2c%e);-8hV_NKLcQV>S+TA5 z7gjnvlm|M)kJae^g5bs{ziY49FL)KVp#DMNzKd^mF>Sxk`h|Vo+`mN^Oag%-NHX%Eq_Mo_4L>56aJZhzKZ`@&Gh;g!@<|gYuta`KVmMjhpXUsY{5qR z4crA=fy9No_pSe3{qdVKou5gdfnhuIAI25jS9002O8zo%1Cz9;tDnm{r-UW|N0@SI diff --git a/Resources/Textures/_NF/Objects/Economy/counterfeit_cash.rsi/cash_25000.png b/Resources/Textures/_NF/Objects/Economy/counterfeit_cash.rsi/cash_25000.png index fcac67aa823759ed8a0bb59435a7f924faea423b..83ddb0d2f8db3e09e8ac7fa9fe7d4c8396ee0f13 100644 GIT binary patch delta 27 jcmZ3%x`K6roxtS|t;?qs<@s3{7#IrY_oi+1i(&!*g((RQ delta 27 jcmZ3%x`K6roxtAd<(E$@%JZ`@FfbgH;BVdN7sUhshHePG diff --git a/Resources/Textures/_NF/Objects/Economy/counterfeit_cash.rsi/cash_250000.png b/Resources/Textures/_NF/Objects/Economy/counterfeit_cash.rsi/cash_250000.png index 32077d7b805c6bb8363adf2c9cf2724b8b768f07..c2cfcea129fbf1b4cbd450e8763c8a31b7dd6c85 100644 GIT binary patch delta 918 zcmV;H18Mw%3Hb<+L<7@^Dv?Kf8I#}aUYFH5*x=YZ#0000ubW%=Jk>MJV z@C1?jA%93oL_t(&f$f)#PTMdPg#)HEH$MH@Mj=hMK|7j`rh{f}v-f|qU8lAsJDH|Q ziNquyE9ihLfBxhkxzX2w69qs31V8}1L%`pF|2(h%aCNOCOu2SGb~Dluri`5V+p&%? zW$XcB0>#NyEaNL6P5=)u;rYq*W+ErRR6QPG#((p(`Rz>3fVp~nKoTc0;_E~v;MI}D z9$-4*WhbMl#E7RSQ+R;+jF+8_=TeS&el|zTATb8b{^P_qm}&#uTpWCZxi*lu7l)Ps zDTj+e%zJ1VkaB1Yraav?Amz{)%z3`s0GBf$Rw3#zKywDfD1JH&(3}A=iXR^^_*-Nm zY=3hBCc-usU?OaD0Ut~v+nfbHnnboa^Pfy2+gyOnQ2)upB>(~-00JNY0w4h1Ct#>s z#oax zY>?hH4qXOP88rJx<^$CJ8w0g}@aQs-jlqKV*kO=qgPfi8L$DA0dXa2pTXd7k%_R)1(*oiT!4wN%>{fn ziEMKg_+b*+=FI;ziEMKLHsSk000ck)1V8`;Kmhau=pCpRJf3ufDW{$RHDllJ>+`Xe z^|1!dHTnjeYhJWIoh43S0@t1a^;sL>sP>O@?*^nCw85DbhA@CW17aBU4H*0_G7+}* s3;1Oc+14-MkH7a0=sf`t0RI8tH_Lx|mY+GH8~^|S07*qoM6N<$f|F{Qf&c&j delta 927 zcmV;Q17Q652!aWaL<7B-cacYX8^0zS(LFNgR#E6=U#1ifMf>Hf0000ubW%=Jk>MJV z@C1?jA%9UxL_t(&f$f)#ZksR|MQPn1K78}DtxXfy)+TFUO;}5oz~2AO_L2WDpU3qtE-rP1DVNUIuC8^2Dc8>U&8?0w z<<s-oP9_QXMNQ^)hGjAO_ z2BaL$1_`gBV?fHGHQ$wdAtNb00ck)1V8`;!21M@ zb*i|#*Ab@NJ6~Ho=m=9Dobkse9bw9o2UxC_E4jK`N?^5Aw+BcwNolr7B^DWwW~m3* z&}O|^KW^ma5#ROb{m6WPT7PSx)(^h=3}kC?&ui>4NVNe!AoLlKr1jYV{RS&-K>VcC z?HiEZ16pK6J$u0Gm*+hoCauW_jQ$px2-{qMiLlKDmrXQKy~l|d7-XtF0n13E)THh!|%S_?d5)l zJzwwu)q&?dyj8LSfASH#W55#>%6|aQIru7i45TtBUr>S_e1l3G98f_y^cl$3pk05F z`v#>pKxW0bx_dDCTVx_^a{(s8 zHWy$bY;ytMO(NTz34WMFwmIWJO(NS|fKB-SAOHd&00JNY0w4f}0Spe*6Koz&I>MCG zz<`F&_f36lWOJ;6rpC~Kx~Us9r&{6!CZHbNpwo|9}oc_jV{c6iTK-hYZqHu=TGHg6MJtS0QyM2BqW&R0rXn z<>T_b_wn-P?m(l_Xf&GtO#66mwe5^*R^y~vU)hPByZQ1cgnx&NLKAn%?M_y&lDAPh z62G^gJD=kB7Dz{8)=Z*Ggmfg<`99K-bmvpL^C@P{+^9w58c?w!4B7;)M;NrJ_j?FK zU?(;zR;dOca6MX`8G-B391YT1MCLC55Qad-isop*?$RRkuTimDCt%1_b9H*a&HVtD z7Qzte_cG)fPsLxj1V{@TEN2u<>)&m7W0pf;NQ}kCdF9`8)VbnCURS*#H>=NM0li_*P z=3#m?A)t7MVqw;U)Bw@hauNFuO^)8pyjy+Cw-4&ie{vKs?Odf^(wg|i252jTr>mdK II;Vst0D10J!TsGt_o zTToYo%Q!orVP7Qtz-xhNp$sCGq*`bISVb9;Gm8k@838bCOvn(cf(fu;Gr;d;P))82~q9(Q016xgK?cq<}=Oe%Ye2^prcAc`D00000NkvXXu0mjfRXjY- delta 145 zcmV;C0B-;10p|gbJ`lZ^chk!uCMG5T001!K)d`VKBX(N~z#t3+ePlPb_djrBQA-t( z{uSBmQBQ4?Fc16z%2?cpWo`3P_Te2^prQz{8O00000NkvXXu0mjfFYGq* diff --git a/Resources/Textures/_NF/Objects/Economy/counterfeit_cash.rsi/cash_50000.png b/Resources/Textures/_NF/Objects/Economy/counterfeit_cash.rsi/cash_50000.png index e96263f2b67f2f84760b652ae9ed48e3aeef4867..e49933a6cec8990add3cc2e04cda96116679c91f 100644 GIT binary patch delta 27 jcmdnZx|?-^oxtS|t;?qsMMOjx7#KLVwoKmWm&*hIhmQ#% delta 27 jcmdnZx|?-^oxtAd<(E$@iin6XFfi;eVk_9_m&*hIilzwj From 68c1acf1615941e0b4fecefa7ed48caf30eeae57 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Tue, 10 Dec 2024 02:40:25 +0200 Subject: [PATCH 45/52] Technology disks: cleanup, removing references, upstream values (#2418) * Add notes, restore upstream numbers * Update disk.yml * Remove all disk printing fully * Update salvage_loot.yml * comments, $200 for a 1k pt research disk * tech disk terminal board: nospawn * no research point disk comments (inaccurate) * tech disk value comment * tech disk, rare tech disk: nospawn --------- Co-authored-by: Whatstone Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> --- .../UI/DiskConsoleBoundUserInterface.cs | 2 +- .../Components/DiskConsoleComponent.cs | 14 +- Content.Shared/Research/SharedDiskConsole.cs | 12 +- .../IgnoredPrototypes/ignoredPrototypes.yml | 4 +- .../Devices/Circuitboards/computer.yml | 1 + .../Objects/Specific/Research/disk.yml | 18 +- .../Prototypes/Procedural/salvage_loot.yml | 312 ++++++++---------- .../Prototypes/Procedural/salvage_misc.yml | 0 .../Prototypes/Research/experimental.yml | 24 +- .../_NF/Guidebook/Shipyard/Gourd.xml | 1 - .../_NF/Guidebook/Shipyard/Investigator.xml | 1 - .../_NF/Guidebook/Shipyard/Sparrow.xml | 1 - 12 files changed, 179 insertions(+), 211 deletions(-) delete mode 100644 Resources/Prototypes/Procedural/salvage_misc.yml diff --git a/Content.Client/Research/UI/DiskConsoleBoundUserInterface.cs b/Content.Client/Research/UI/DiskConsoleBoundUserInterface.cs index 957d5926129..2005c35ef51 100644 --- a/Content.Client/Research/UI/DiskConsoleBoundUserInterface.cs +++ b/Content.Client/Research/UI/DiskConsoleBoundUserInterface.cs @@ -28,7 +28,7 @@ protected override void Open() { SendMessage(new DiskConsolePrintDiskMessage()); }; - _menu.OnPrintRareButtonPressed += () => + _menu.OnPrintRareButtonPressed += () => // Frontier: Rare disk { SendMessage(new DiskConsolePrintRareDiskMessage()); }; diff --git a/Content.Server/Research/TechnologyDisk/Components/DiskConsoleComponent.cs b/Content.Server/Research/TechnologyDisk/Components/DiskConsoleComponent.cs index d9930ad972c..65acb34a684 100644 --- a/Content.Server/Research/TechnologyDisk/Components/DiskConsoleComponent.cs +++ b/Content.Server/Research/TechnologyDisk/Components/DiskConsoleComponent.cs @@ -11,13 +11,13 @@ public sealed partial class DiskConsoleComponent : Component /// How much it costs to print a disk /// [DataField("pricePerDisk"), ViewVariables(VVAccess.ReadWrite)] - public int PricePerDisk = 10000; + public int PricePerDisk = 1000; /// - /// How much it costs to print a rare disk + /// Frontier: How much it costs to print a rare disk /// [DataField("pricePerRareDisk"), ViewVariables(VVAccess.ReadWrite)] - public int PricePerRareDisk = 13000; + public int PricePerRareDisk = 1300; /// /// The prototype of what's being printed @@ -25,11 +25,11 @@ public sealed partial class DiskConsoleComponent : Component [DataField("diskPrototype", customTypeSerializer: typeof(PrototypeIdSerializer)), ViewVariables(VVAccess.ReadWrite)] public string DiskPrototype = "TechnologyDisk"; - [DataField("diskPrototypeRare", customTypeSerializer: typeof(PrototypeIdSerializer)), ViewVariables(VVAccess.ReadWrite)] - public string DiskPrototypeRare = "TechnologyDiskRare"; + [DataField("diskPrototypeRare", customTypeSerializer: typeof(PrototypeIdSerializer)), ViewVariables(VVAccess.ReadWrite)] // Frontier + public string DiskPrototypeRare = "TechnologyDiskRare"; // Frontier - [DataField("diskRare"), ViewVariables(VVAccess.ReadWrite)] - public bool DiskRare = false; + [DataField, ViewVariables(VVAccess.ReadWrite)] // Frontier + public bool DiskRare = false; // Frontier /// /// How long it takes to print diff --git a/Content.Shared/Research/SharedDiskConsole.cs b/Content.Shared/Research/SharedDiskConsole.cs index caf8dec753c..0b71fb2ab70 100644 --- a/Content.Shared/Research/SharedDiskConsole.cs +++ b/Content.Shared/Research/SharedDiskConsole.cs @@ -12,17 +12,17 @@ public enum DiskConsoleUiKey : byte public sealed class DiskConsoleBoundUserInterfaceState : BoundUserInterfaceState { public bool CanPrint; - public bool CanPrintRare; + public bool CanPrintRare; // Frontier public int PointCost; - public int PointCostRare; + public int PointCostRare; // Frontier public int ServerPoints; - public DiskConsoleBoundUserInterfaceState(int serverPoints, int pointCost, int pointCostRare, bool canPrint, bool canPrintRare) + public DiskConsoleBoundUserInterfaceState(int serverPoints, int pointCost, int pointCostRare, bool canPrint, bool canPrintRare) // Frontier: add pointCostRare, canPrintRare { CanPrint = canPrint; - CanPrintRare = canPrintRare; + CanPrintRare = canPrintRare; // Frontier PointCost = pointCost; - PointCostRare = pointCostRare; + PointCostRare = pointCostRare; // Frontier ServerPoints = serverPoints; } } @@ -33,7 +33,7 @@ public sealed class DiskConsolePrintDiskMessage : BoundUserInterfaceMessage } -[Serializable, NetSerializable] +[Serializable, NetSerializable] // Frontier public sealed class DiskConsolePrintRareDiskMessage : BoundUserInterfaceMessage { diff --git a/Resources/IgnoredPrototypes/ignoredPrototypes.yml b/Resources/IgnoredPrototypes/ignoredPrototypes.yml index 251db4fd8e4..c6b5e86417d 100644 --- a/Resources/IgnoredPrototypes/ignoredPrototypes.yml +++ b/Resources/IgnoredPrototypes/ignoredPrototypes.yml @@ -8,4 +8,6 @@ # - /Prototypes/Catalog/uplink_catalog.yml - /Prototypes/GameRules/events.yml # Frontier - Fuck this file - /Prototypes/Procedural/Themes/vgroidinterior.yml - - /Prototypes/Procedural/vgroid.yml \ No newline at end of file + - /Prototypes/Procedural/vgroid.yml + - /Prototypes/Procedural/salvage_loot.yml + - /Prototypes/Procedural/salvage_rewards.yml \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml index df00bb3edac..686aa59a24a 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml @@ -240,6 +240,7 @@ parent: BaseComputerCircuitboard id: TechDiskComputerCircuitboard name: tech disk terminal board + categories: [ HideSpawnMenu ] # Frontier: no tech disks description: A computer printed circuit board for a technology disk terminal. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml b/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml index c201f7a0cbd..38b8ce55f83 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml @@ -11,6 +11,8 @@ - type: GuideHelp guides: - Science + - type: StaticPrice # Frontier + price: 200 # Frontier - type: entity parent: ResearchDisk @@ -20,8 +22,8 @@ components: - type: ResearchDisk points: 5000 - - type: StaticPrice - price: 1500 # Frontier - To be fair, its worth half a tech disk, but we still require tech to print it so its lower. + - type: StaticPrice # Frontier + price: 1000 # Frontier - type: entity parent: ResearchDisk @@ -31,8 +33,8 @@ components: - type: ResearchDisk points: 10000 - - type: StaticPrice - price: 3000 # Frontier - To be fair, its worth a tech disk, but we still require tech to print it so its lower. + - type: StaticPrice # Frontier + price: 2000 # Frontier - type: entity parent: ResearchDisk @@ -49,6 +51,7 @@ id: TechnologyDisk name: technology disk description: A disk for the R&D server containing research technology. + categories: [ HideSpawnMenu ] # Frontier: no tech disks components: - type: Sprite sprite: Objects/Misc/module.rsi @@ -63,7 +66,9 @@ - type: TechnologyDisk tierWeightPrototype: TechDiskTierWeights # Frontier - type: StaticPrice - price: 0.01 # Frontier - research points are a means to an end, not an end of their own + price: 0.01 # Frontier 100<0.01 - research points are a means to an end, not an end of their own + - type: StealTarget + stealGroup: TechnologyDisk - type: PirateBountyItem # Frontier id: TechnologyDisk # Frontier @@ -71,6 +76,7 @@ parent: TechnologyDisk id: TechnologyDiskRare suffix: rare. + categories: [ HideSpawnMenu ] # Frontier: no tech disks components: - type: TechnologyDisk - tierWeightPrototype: RareTechDiskTierWeights # Frontier + tierWeightPrototype: RareTechDiskTierWeights diff --git a/Resources/Prototypes/Procedural/salvage_loot.yml b/Resources/Prototypes/Procedural/salvage_loot.yml index 7da0a866bf0..2ad009d0443 100644 --- a/Resources/Prototypes/Procedural/salvage_loot.yml +++ b/Resources/Prototypes/Procedural/salvage_loot.yml @@ -1,224 +1,186 @@ # Loot table # Main loot table for random spawns -#- type: salvageLoot -# id: SalvageLoot -# loots: -# - !type:RandomSpawnsLoot -# entries: -# - proto: AdvMopItem -# prob: 0.5 -# - proto: AmmoTechFabCircuitboard -# cost: 2 -# - proto: AutolatheMachineCircuitboard -# cost: 2 -# - proto: BiomassReclaimerMachineCircuitboard -# cost: 2 -# - proto: BluespaceBeaker -# cost: 2 -# - proto: CyborgEndoskeleton -# cost: 3 -# prob: 0.5 -# - proto: ChemDispenserMachineCircuitboard -# cost: 2 -# - proto: CircuitImprinter -# cost: 2 -# - proto: CloningConsoleComputerCircuitboard -# cost: 2 -# - proto: CloningPodMachineCircuitboard -# cost: 2 -# - proto: CognizineChemistryBottle -# - proto: FoodBoxDonkpocketCarp -# prob: 0.5 -# - proto: CratePartsT3 -# cost: 2 -# prob: 0.5 -# - proto: CratePartsT3T4 -# cost: 5 -# prob: 0.5 -# - proto: CratePartsT4 -# cost: 5 -# prob: 0.5 -# - proto: CrateSalvageEquipment -# cost: 3 -# prob: 0.5 -# - proto: GasRecycler -# cost: 2 -# - proto: GeneratorRTG -# cost: 5 -# - proto: GravityGeneratorMini -# cost: 2 -# - proto: GyroscopeUnanchored -# cost: 2 -# prob: 0.1 -# - proto: MedicalScannerMachineCircuitboard -# cost: 2 -# - proto: NuclearBombKeg -# cost: 5 -# - proto: OmnizineChemistryBottle -# prob: 0.5 -# - proto: PortableGeneratorPacman -# cost: 2 -# - proto: PortableGeneratorSuperPacman -# cost: 3 -# - proto: PowerCellAntiqueProto -# cost: 5 -# prob: 0.5 -# - proto: ProtolatheMachineCircuitboard -# - proto: RandomArtifactSpawner -# cost: 2 -# - proto: RandomCargoCorpseSpawner -# cost: 2 -# prob: 0.5 -# - proto: RandomCommandCorpseSpawner -# cost: 5 -# prob: 0.5 -# - proto: RandomEngineerCorpseSpawner -# cost: 2 -# prob: 0.5 -# - proto: RandomMedicCorpseSpawner -# cost: 2 -# prob: 0.5 -# - proto: RandomScienceCorpseSpawner -# cost: 2 -# prob: 0.5 -# - proto: RandomSecurityCorpseSpawner -# cost: 2 -# prob: 0.5 -# - proto: RandomServiceCorpseSpawner -# cost: 2 -# prob: 0.5 -# - proto: ResearchAndDevelopmentServerMachineCircuitboard -# cost: 5 -# prob: 0.5 -# - proto: ResearchDisk10000 -# prob: 0.5 -# - proto: ResearchDisk5000 -# prob: 0.5 -# - proto: RipleyHarness -# cost: 3 -# prob: 0.5 -# - proto: RPED -# - proto: SpaceCash1000 -# - proto: SpaceCash10000 -# cost: 10 -# - proto: SpaceCash2500 -# cost: 3 -# - proto: SpaceCash5000 -# cost: 5 -# - proto: TechnologyDiskRare -# cost: 5 -# prob: 0.5 -# - proto: ThrusterUnanchored -# - proto: WaterTankHighCapacity -# - proto: WeldingFuelTankHighCapacity -# cost: 3 -# - proto: WeaponTeslaGun -# prob: 0.1 -# cost: 2 +# - type: salvageLoot + # id: SalvageLoot + # loots: + # - !type:RandomSpawnsLoot + # entries: + # - proto: AdvMopItem + # prob: 0.5 + # - proto: AmmoTechFabCircuitboard + # cost: 2 + # - proto: AutolatheMachineCircuitboard + # cost: 2 + # - proto: BiomassReclaimerMachineCircuitboard + # cost: 2 + # - proto: BluespaceBeaker + # cost: 2 + # - proto: CyborgEndoskeleton + # cost: 3 + # prob: 0.5 + # - proto: ChemDispenserMachineCircuitboard + # cost: 2 + # - proto: CircuitImprinter + # cost: 2 + # - proto: CloningConsoleComputerCircuitboard + # cost: 2 + # - proto: CloningPodMachineCircuitboard + # cost: 2 + # - proto: CognizineChemistryBottle + # - proto: FoodBoxDonkpocketCarp + # prob: 0.5 + # - proto: CrateSalvageEquipment + # cost: 3 + # prob: 0.5 + # - proto: GasRecycler + # cost: 2 + # - proto: GeneratorRTG + # cost: 5 + # - proto: GravityGeneratorMini + # cost: 2 + # - proto: GyroscopeUnanchored + # cost: 2 + # prob: 0.1 + # - proto: MedicalScannerMachineCircuitboard + # cost: 2 + # - proto: NuclearBombKeg + # cost: 5 + # - proto: OmnizineChemistryBottle + # prob: 0.5 + # - proto: PortableGeneratorPacman + # cost: 2 + # - proto: PortableGeneratorSuperPacman + # cost: 3 + # - proto: PowerCellAntiqueProto + # cost: 5 + # prob: 0.5 + # - proto: ProtolatheMachineCircuitboard + # - proto: RandomArtifactSpawner + # cost: 2 + # - proto: RandomCargoCorpseSpawner + # cost: 2 + # prob: 0.5 + # - proto: RandomCommandCorpseSpawner + # cost: 5 + # prob: 0.5 + # - proto: RandomEngineerCorpseSpawner + # cost: 2 + # prob: 0.5 + # - proto: RandomMedicCorpseSpawner + # cost: 2 + # prob: 0.5 + # - proto: RandomScienceCorpseSpawner + # cost: 2 + # prob: 0.5 + # - proto: RandomSecurityCorpseSpawner + # cost: 2 + # prob: 0.5 + # - proto: RandomServiceCorpseSpawner + # cost: 2 + # prob: 0.5 + # - proto: ResearchAndDevelopmentServerMachineCircuitboard + # cost: 5 + # prob: 0.5 + # - proto: ResearchDisk10000 + # prob: 0.5 + # - proto: ResearchDisk5000 + # prob: 0.5 + # - proto: RipleyHarness + # cost: 3 + # prob: 0.5 + # - proto: SpaceCash1000 + # - proto: SpaceCash10000 + # cost: 10 + # - proto: SpaceCash2500 + # cost: 3 + # - proto: SpaceCash5000 + # cost: 5 + # - proto: TechnologyDiskRare + # cost: 5 + # prob: 0.5 + # - proto: ThrusterUnanchored + # - proto: WaterTankHighCapacity + # - proto: WeldingFuelTankHighCapacity + # cost: 3 + # - proto: WeaponTeslaGun + # prob: 0.1 + # cost: 2 -# Mob loot table +# # Mob loot table -# Boss loot table +# # Boss loot table + +# # Ores - these are guaranteed +# # - Low value +# - type: salvageLoot + # id: OreIron + # guaranteed: true + # loots: + # - !type:BiomeMarkerLoot + # proto: OreIron -# Ores - these are guaranteed -# - Low value # - type: salvageLoot - # id: OreTin - # desc: Veins of steel + # id: OreCoal # guaranteed: true # loots: # - !type:BiomeMarkerLoot - # proto: - # Caves: OreTin - # Grasslands: OreTin - # Lava: BasaltOreTin - # Snow: SnowOreTin + # proto: OreCoal # - type: salvageLoot # id: OreQuartz - # desc: Veins of quartz # guaranteed: true # loots: # - !type:BiomeMarkerLoot - # proto: - # Caves: OreQuartz - # Grasslands: OreQuartz - # Lava: BasaltOreQuartz - # Snow: SnowOreQuartz + # proto: OreQuartz -#- type: salvageLoot -# id: OreSalt -# guaranteed: true -# loots: -# - !type:BiomeMarkerLoot -# proto: OreSalt +# - type: salvageLoot + # id: OreSalt + # guaranteed: true + # loots: + # - !type:BiomeMarkerLoot + # proto: OreSalt -# - Medium value +# # - Medium value # - type: salvageLoot # id: OreGold - # desc: Veins of gold ore # guaranteed: true # loots: # - !type:BiomeMarkerLoot - # proto: - # Caves: OreGold - # Grasslands: OreGold - # Lava: BasaltOreGold - # Snow: SnowOreGold + # proto: OreGold # - type: salvageLoot # id: OreSilver - # desc: Veins of silver ore # guaranteed: true # loots: # - !type:BiomeMarkerLoot - # proto: - # Caves: OreSilver - # Grasslands: OreSilver - # Lava: BasaltOreSilver - # Snow: SnowOreSilver + # proto: OreSilver -# - High value +# # - High value # - type: salvageLoot # id: OrePlasma - # desc: Veins of plasma ore # guaranteed: true # loots: # - !type:BiomeMarkerLoot - # proto: - # Caves: OrePlasma - # Grasslands: OrePlasma - # Lava: BasaltOrePlasma - # Snow: SnowOrePlasma + # proto: OrePlasma # - type: salvageLoot # id: OreUranium - # desc: Veins of uranium ore # guaranteed: true # loots: # - !type:BiomeMarkerLoot - # proto: - # Caves: OreUranium - # Grasslands: OreUranium - # Lava: BasaltOreUranium - # Snow: SnowOreUranium + # proto: OreUranium # - type: salvageLoot -# id: OreDiamond -# guaranteed: true -# loots: -# - !type:BiomeMarkerLoot -# proto: OreDiamond + # id: OreDiamond + # guaranteed: true + # loots: + # - !type:BiomeMarkerLoot + # proto: OreDiamond # - type: salvageLoot # id: OreArtifactFragment - # desc: artifact fragment-embedded rock # guaranteed: true # loots: # - !type:BiomeMarkerLoot - # proto: - # Caves: OreArtifactFragment - # Grasslands: OreArtifactFragment - # Lava: BasaltOreArtifactFragment - # Snow: SnowOreArtifactFragment + # proto: OreArtifactFragment \ No newline at end of file diff --git a/Resources/Prototypes/Procedural/salvage_misc.yml b/Resources/Prototypes/Procedural/salvage_misc.yml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/Resources/Prototypes/Research/experimental.yml b/Resources/Prototypes/Research/experimental.yml index c682b85d74c..d7e93dcf422 100644 --- a/Resources/Prototypes/Research/experimental.yml +++ b/Resources/Prototypes/Research/experimental.yml @@ -128,18 +128,18 @@ technologyPrerequisites: - BasicAnomalousResearch -# - type: technology - # id: DeterrenceTechnologies - # name: research-technology-deterrence - # icon: - # sprite: Objects/Weapons/Guns/Battery/particle_decelerator.rsi - # state: base - # discipline: Experimental - # tier: 2 - # cost: 7500 - # recipeUnlocks: - # - WeaponParticleDecelerator - # - HoloprojectorField +- type: technology + id: DeterrenceTechnologies + name: research-technology-deterrence + icon: + sprite: Objects/Devices/Holoprojectors/field.rsi # Frontier particle_decelerator.rsi - diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Investigator.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Investigator.xml index a1085dce5b4..b28515283e0 100644 --- a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Investigator.xml +++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Investigator.xml @@ -5,7 +5,6 @@ - diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Sparrow.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Sparrow.xml index c090d141a46..3cb51e5c932 100644 --- a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Sparrow.xml +++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Sparrow.xml @@ -5,7 +5,6 @@ - From 46c84380dd1bc19ed1c7c11e59061e6a2bb19cec Mon Sep 17 00:00:00 2001 From: Whatstone <166147148+whatston3@users.noreply.github.com> Date: Tue, 10 Dec 2024 10:00:03 -0500 Subject: [PATCH 46/52] BuckleSystem: stop setting every interaction as handled (#2538) * BuckleSystem: only set handled to true if handled * Handle buckles when handling buckles * Remove unused frontier code --------- Co-authored-by: Dvir --- Content.Shared/Buckle/Components/BuckleComponent.cs | 7 ------- Content.Shared/Buckle/SharedBuckleSystem.Interaction.cs | 8 ++++++-- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Content.Shared/Buckle/Components/BuckleComponent.cs b/Content.Shared/Buckle/Components/BuckleComponent.cs index c86b21b4187..1518ccea9ba 100644 --- a/Content.Shared/Buckle/Components/BuckleComponent.cs +++ b/Content.Shared/Buckle/Components/BuckleComponent.cs @@ -70,13 +70,6 @@ public sealed partial class BuckleComponent : Component /// Used for client rendering /// [ViewVariables] public int? OriginalDrawDepth; - - /// - /// Frontier - True if the entity is blocked from buckling. - /// - [DataField] - [ViewVariables(VVAccess.ReadWrite)] - public bool Disable; } public sealed partial class UnbuckleAlertEvent : BaseAlertEvent; diff --git a/Content.Shared/Buckle/SharedBuckleSystem.Interaction.cs b/Content.Shared/Buckle/SharedBuckleSystem.Interaction.cs index 1a15e52a3c4..06d70d08d31 100644 --- a/Content.Shared/Buckle/SharedBuckleSystem.Interaction.cs +++ b/Content.Shared/Buckle/SharedBuckleSystem.Interaction.cs @@ -114,11 +114,15 @@ private void OnBuckleInteractHand(Entity ent, ref InteractHandE if (args.Handled) return; + // Frontier: set handled to true only if you actually unbuckle something if (ent.Comp.BuckledTo != null) - TryUnbuckle(ent!, args.User, popup: true); + { + args.Handled = TryUnbuckle(ent!, args.User, popup: true); + } // TODO BUCKLE add out bool for whether a pop-up was generated or not. - args.Handled = true; + // args.Handled = true; + // End Frontier: set handled to true only if you actually unbuckle something } private void AddStrapVerbs(EntityUid uid, StrapComponent component, GetVerbsEvent args) From 951e83da12e3301ea6fc6cfee4872c901106d87a Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Tue, 10 Dec 2024 15:00:29 +0000 Subject: [PATCH 47/52] Automatic Changelog (#2538) --- Resources/Changelog/Frontier.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index d8f86502044..40d9f16a2bb 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -5789,3 +5789,11 @@ Entries: message: The technology printer and anomaly synchronizer are no longer printable. id: 5569 time: '2024-12-09T20:40:05.0000000+00:00' +- author: whatston3 + changes: + - type: Fix + message: >- + Clicking on mobs should pick them up, pet them, or otherwise interact as + normal. + id: 5570 + time: '2024-12-10T15:00:03.0000000+00:00' From 157cb019687777788f17cd09a076a55c3b8b9e15 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Tue, 10 Dec 2024 21:59:56 +0200 Subject: [PATCH 48/52] Whitelists Panel (DeltaV) (#2152) * job whitelists panel !!! (#1678) * make JobPrototype.Whitelisted respect blanket whitelist, make jobs use it * add jobwhitelists command and ui * add job whitelist button to player panel --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * Fixup * Update JobWhitelistManager.cs * Update JobRequirementsManager.cs * job whitelist panel presets (#1717) * SHIT -> GOLD * the label looks like shit * make jobs that dont use whitelist greyed out on whitelist panel (#1718) Co-authored-by: deltanedas <@deltanedas:kde.org> * Update whitelist_tiers.yml * FTL * Update departments.yml * Update departments.yml * Whitelist panel suggestions --------- Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: Milon Co-authored-by: Whatstone --- .../UI/PlayerPanel/PlayerPanel.xaml | 1 + .../UI/PlayerPanel/PlayerPanel.xaml.cs | 4 + .../UI/PlayerPanel/PlayerPanelEui.cs | 1 + .../UI/DepartmentWhitelistPanel.xaml | 11 ++ .../UI/DepartmentWhitelistPanel.xaml.cs | 82 ++++++++++ .../UI/GhostRoleSetWhitelistPanel.xaml | 11 ++ .../UI/GhostRoleSetWhitelistPanel.xaml.cs | 67 +++++++++ .../Administration/UI/JobWhitelistsEui.cs | 42 ++++++ .../UI/JobWhitelistsWindow.xaml | 20 +++ .../UI/JobWhitelistsWindow.xaml.cs | 108 +++++++++++++ .../JobRequirementsManager.cs | 4 + .../Commands/JobWhitelistsCommand.cs | 45 ++++++ .../DeltaV/Administration/JobWhitelistsEui.cs | 142 ++++++++++++++++++ .../JobWhitelist/JobWhitelistManager.cs | 7 +- Content.Server/Whitelist/WhitelistCommands.cs | 2 +- Content.Shared/Administration/AdminFlags.cs | 7 +- .../Administration/JobWhitelistsEuiState.cs | 70 +++++++++ .../Whitelist/WhitelistTierPrototype.cs | 24 +++ Content.Shared/Roles/JobPrototype.cs | 5 +- .../_NF/ghost/roles/ghost-role-component.ftl | 4 +- .../Locale/en-US/_NF/job/department-desc.ftl | 8 +- Resources/Locale/en-US/_NF/job/department.ftl | 6 +- .../deltav/administration/ui/player-panel.ftl | 5 + .../Locale/en-US/deltav/info/whitelists.ftl | 3 + .../Locale/en-US/job/department-desc.ftl | 18 +-- Resources/Locale/en-US/job/department.ftl | 16 +- .../Roles/Jobs/Security/head_of_security.yml | 4 +- .../Prototypes/Roles/Jobs/departments.yml | 94 +++++------- .../_NF/Roles/Ghostroles/whitelisted.yml | 4 +- .../Roles/Jobs/Fun/emergencyresponseteam.yml | 6 +- .../_NF/Roles/Jobs/Nfsd/sheriff.yml | 1 - .../Prototypes/_NF/Roles/Jobs/departments.yml | 8 +- 32 files changed, 733 insertions(+), 97 deletions(-) create mode 100644 Content.Client/DeltaV/Administration/UI/DepartmentWhitelistPanel.xaml create mode 100644 Content.Client/DeltaV/Administration/UI/DepartmentWhitelistPanel.xaml.cs create mode 100644 Content.Client/DeltaV/Administration/UI/GhostRoleSetWhitelistPanel.xaml create mode 100644 Content.Client/DeltaV/Administration/UI/GhostRoleSetWhitelistPanel.xaml.cs create mode 100644 Content.Client/DeltaV/Administration/UI/JobWhitelistsEui.cs create mode 100644 Content.Client/DeltaV/Administration/UI/JobWhitelistsWindow.xaml create mode 100644 Content.Client/DeltaV/Administration/UI/JobWhitelistsWindow.xaml.cs create mode 100644 Content.Server/DeltaV/Administration/Commands/JobWhitelistsCommand.cs create mode 100644 Content.Server/DeltaV/Administration/JobWhitelistsEui.cs create mode 100644 Content.Shared/DeltaV/Administration/JobWhitelistsEuiState.cs create mode 100644 Content.Shared/DeltaV/Whitelist/WhitelistTierPrototype.cs create mode 100644 Resources/Locale/en-US/deltav/administration/ui/player-panel.ftl create mode 100644 Resources/Locale/en-US/deltav/info/whitelists.ftl diff --git a/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml b/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml index 8feec273b47..5b3b9f007ca 100644 --- a/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml +++ b/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml @@ -31,6 +31,7 @@