From a7a8ba39659b47373cf07dda607655ce4def628f Mon Sep 17 00:00:00 2001 From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Date: Fri, 3 May 2024 03:27:36 +0300 Subject: [PATCH 1/9] Add felinids/goblins/vulps to hoverbike built-in storage blacklist (#1324) * Blacklist felinids/goblins/vulps from hoverbike built-in storage * different blacklist comp * Update vehicles.yml --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- .../Entities/Objects/Vehicles/vehicles.yml | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Vehicles/vehicles.yml b/Resources/Prototypes/_NF/Entities/Objects/Vehicles/vehicles.yml index fdda560c9e7..cd49d37bc62 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Vehicles/vehicles.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Vehicles/vehicles.yml @@ -58,19 +58,22 @@ name: skeleton motorcycle description: Bad to the Bone. components: - - type: Storage - grid: - - 0,0,1,3 - - 3,0,6,3 - - 8,0,9,3 - maxItemSize: Huge - - type: ContainerContainer - containers: - storagebase: !type:Container - - type: UserInterface - interfaces: - - key: enum.StorageUiKey.Key - type: StorageBoundUserInterface + - type: Storage + grid: + - 0,0,1,3 + - 3,0,6,3 + - 8,0,9,3 + maxItemSize: Huge + blacklist: + components: + - HumanoidAppearance + - type: ContainerContainer + containers: + storagebase: !type:Container + - type: UserInterface + interfaces: + - key: enum.StorageUiKey.Key + type: StorageBoundUserInterface # New Frontier vehicles - type: entity From 9babfa4b77cb03102ec637db51b1b1c7f63c626c Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Fri, 3 May 2024 00:28:23 +0000 Subject: [PATCH 2/9] Automatic Changelog (#1324) --- Resources/Changelog/Changelog.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 1c1893884d2..e7f7d050ab3 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -4487,3 +4487,9 @@ Entries: message: Fixed mailpod power issue id: 4969 time: '2024-05-02T01:21:52.0000000+00:00' +- author: erhardsteinhauer + changes: + - type: Fix + message: Added felinids/goblins/vulps to hoverbike built-in storage blacklist. + id: 4970 + time: '2024-05-03T00:27:37.0000000+00:00' From cea92351f3925be75746c5eb4a960459f9232977 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Fri, 3 May 2024 03:40:25 +0300 Subject: [PATCH 3/9] Update pda.yml (#1326) --- .../_NF/Entities/Objects/Devices/pda.yml | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml index 5a38f92d927..e0093a21e2c 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml @@ -125,6 +125,11 @@ state: pda-sheriff bookSlot: # Frontier startingItem: HyperlinkBookNfsdSop + priority: -2 + whitelist: + tags: + - BookSpaceLaw + - BookNfsdSop - type: PdaBorderColor borderColor: "#FFFDD0" accentHColor: "#896b49" @@ -155,6 +160,11 @@ state: pda-cadet bookSlot: # Frontier startingItem: HyperlinkBookNfsdSop + priority: -2 + whitelist: + tags: + - BookSpaceLaw + - BookNfsdSop - type: PdaBorderColor borderColor: "#FFFDD0" accentHColor: "#896b49" @@ -185,6 +195,11 @@ state: pda-deputy bookSlot: # Frontier startingItem: HyperlinkBookNfsdSop + priority: -2 + whitelist: + tags: + - BookSpaceLaw + - BookNfsdSop - type: PdaBorderColor borderColor: "#FFFDD0" accentHColor: "#896b49" @@ -215,6 +230,11 @@ state: pda-brigmed bookSlot: # Frontier startingItem: HyperlinkBookNfsdSop + priority: -2 + whitelist: + tags: + - BookSpaceLaw + - BookNfsdSop - type: PdaBorderColor borderColor: "#FFFDD0" accentHColor: "#896b49" @@ -245,6 +265,11 @@ state: pda-sergeant bookSlot: # Frontier startingItem: HyperlinkBookNfsdSop + priority: -2 + whitelist: + tags: + - BookSpaceLaw + - BookNfsdSop - type: PdaBorderColor borderColor: "#FFFDD0" accentHColor: "#896b49" @@ -275,6 +300,11 @@ state: pda-bailiff bookSlot: # Frontier startingItem: HyperlinkBookNfsdSop + priority: -2 + whitelist: + tags: + - BookSpaceLaw + - BookNfsdSop - type: PdaBorderColor borderColor: "#FFFDD0" accentHColor: "#896b49" @@ -305,6 +335,11 @@ state: pda-detective bookSlot: # Frontier startingItem: HyperlinkBookNfsdSop + priority: -2 + whitelist: + tags: + - BookSpaceLaw + - BookNfsdSop - type: PdaBorderColor borderColor: "#774705" - type: Icon @@ -321,6 +356,10 @@ state: pda-sr penSlot: startingItem: PenCentcom + priority: -1 + whitelist: + tags: + - Write - type: PdaBorderColor borderColor: "#789876" accentHColor: "#447987" From 2500778e1f25e953efecae6c75639c83fe54d44c Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Fri, 3 May 2024 03:57:53 +0300 Subject: [PATCH 4/9] Fixing this mess (#1310) --- .../Storage/Canisters/gas_canisters.yml | 18 ++- .../Storage/canister.rsi/black-1.png | Bin 329 -> 705 bytes .../Structures/Storage/canister.rsi/black.png | Bin 340 -> 497 bytes .../Storage/canister.rsi/blue-1.png | Bin 377 -> 819 bytes .../Structures/Storage/canister.rsi/blue.png | Bin 394 -> 541 bytes .../Storage/canister.rsi/can-connector.png | Bin 269 -> 306 bytes .../Storage/canister.rsi/can-o0.png | Bin 206 -> 103 bytes .../Storage/canister.rsi/can-o1.png | Bin 114 -> 96 bytes .../Storage/canister.rsi/can-o2.png | Bin 112 -> 99 bytes .../Storage/canister.rsi/can-o3.png | Bin 114 -> 99 bytes .../Storage/canister.rsi/can-oa1.png | Bin 144 -> 186 bytes .../Storage/canister.rsi/can-open.png | Bin 143 -> 127 bytes .../Storage/canister.rsi/darkblue-1.png | Bin 377 -> 753 bytes .../Storage/canister.rsi/darkblue.png | Bin 491 -> 478 bytes .../Storage/canister.rsi/frezon-1.png | Bin 377 -> 481 bytes .../Storage/canister.rsi/frezon.png | Bin 394 -> 453 bytes .../Storage/canister.rsi/grey-1.png | Bin 324 -> 890 bytes .../Structures/Storage/canister.rsi/grey.png | Bin 341 -> 615 bytes .../Storage/canister.rsi/orange-1.png | Bin 351 -> 781 bytes .../Storage/canister.rsi/orange.png | Bin 359 -> 478 bytes .../Structures/Storage/canister.rsi/red-1.png | Bin 352 -> 729 bytes .../Structures/Storage/canister.rsi/red.png | Bin 358 -> 515 bytes .../Storage/canister.rsi/redws-1.png | Bin 378 -> 834 bytes .../Structures/Storage/canister.rsi/redws.png | Bin 403 -> 607 bytes .../Storage/canister.rsi/water_vapor-1.png | Bin 329 -> 705 bytes .../Storage/canister.rsi/water_vapor.png | Bin 483 -> 612 bytes .../Storage/canister.rsi/yellow-1.png | Bin 367 -> 707 bytes .../Storage/canister.rsi/yellow.png | Bin 386 -> 606 bytes .../Storage/canister.rsi/black-1.png | Bin 0 -> 329 bytes .../Structures/Storage/canister.rsi/black.png | Bin 0 -> 340 bytes .../Storage/canister.rsi/blue-1.png | Bin 0 -> 377 bytes .../Structures/Storage/canister.rsi/blue.png | Bin 0 -> 394 bytes .../Storage/canister.rsi/can-connector.png | Bin 0 -> 269 bytes .../Storage/canister.rsi/can-o0.png | Bin 0 -> 206 bytes .../Storage/canister.rsi/can-o1.png | Bin 0 -> 114 bytes .../Storage/canister.rsi/can-o2.png | Bin 0 -> 112 bytes .../Storage/canister.rsi/can-o3.png | Bin 0 -> 114 bytes .../Storage/canister.rsi/can-oa1.png | Bin 0 -> 144 bytes .../Storage/canister.rsi/can-open.png | Bin 0 -> 143 bytes .../Storage/canister.rsi/darkblue-1.png | Bin 0 -> 377 bytes .../Storage/canister.rsi/darkblue.png | Bin 0 -> 491 bytes .../Storage/canister.rsi/frezon-1.png | Bin 0 -> 377 bytes .../Storage/canister.rsi/frezon.png | Bin 0 -> 394 bytes .../Storage/canister.rsi/green-1.png | Bin 0 -> 768 bytes .../Structures/Storage/canister.rsi/green.png | Bin 0 -> 688 bytes .../Storage/canister.rsi/greenys-1.png | Bin 0 -> 8022 bytes .../Storage/canister.rsi/greenys.png | Bin 0 -> 7818 bytes .../Storage/canister.rsi/grey-1.png | Bin 0 -> 324 bytes .../Structures/Storage/canister.rsi/grey.png | Bin 0 -> 341 bytes .../Storage/canister.rsi/locked.png | Bin 0 -> 4821 bytes .../Structures/Storage/canister.rsi/meta.json | 122 ++++++++++++++++++ .../Storage/canister.rsi/orange-1.png | Bin 0 -> 351 bytes .../Storage/canister.rsi/orange.png | Bin 0 -> 359 bytes .../Structures/Storage/canister.rsi/red-1.png | Bin 0 -> 352 bytes .../Structures/Storage/canister.rsi/red.png | Bin 0 -> 358 bytes .../Storage/canister.rsi/redws-1.png | Bin 0 -> 378 bytes .../Structures/Storage/canister.rsi/redws.png | Bin 0 -> 403 bytes .../canister.rsi/scrubber-connector.png | Bin 0 -> 303 bytes .../Storage/canister.rsi/scrubber-open.png | Bin 0 -> 138 bytes .../Storage/canister.rsi/unlocked.png | Bin 0 -> 4836 bytes .../Storage/canister.rsi/water_vapor-1.png | Bin 0 -> 329 bytes .../Storage/canister.rsi/water_vapor.png | Bin 0 -> 483 bytes .../Storage/canister.rsi/yellow-1.png | Bin 0 -> 367 bytes .../Storage/canister.rsi/yellow.png | Bin 0 -> 386 bytes 64 files changed, 139 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/black-1.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/black.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/blue-1.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/blue.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/can-connector.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/can-o0.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/can-o1.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/can-o2.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/can-o3.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/can-oa1.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/can-open.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/darkblue-1.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/darkblue.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/frezon-1.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/frezon.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/green-1.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/green.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/greenys-1.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/greenys.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/grey-1.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/grey.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/locked.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/orange-1.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/orange.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/red-1.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/red.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/redws-1.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/redws.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/scrubber-connector.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/scrubber-open.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/unlocked.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/water_vapor-1.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/water_vapor.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/yellow-1.png create mode 100644 Resources/Textures/_NF/Structures/Storage/canister.rsi/yellow.png diff --git a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml index 1085ca2795b..458b05d09cf 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml @@ -111,6 +111,7 @@ name: storage canister components: - type: Sprite + sprite: _NF/Structures/Storage/canister.rsi # Frontier layers: - state: yellow - type: GasCanister @@ -160,6 +161,7 @@ description: A canister that can contain any type of gas. This one is supposed to contain air mixture. It can be attached to connector ports using a wrench. components: - type: Sprite + sprite: _NF/Structures/Storage/canister.rsi # Frontier layers: - state: grey - type: GasCanister @@ -200,6 +202,7 @@ description: A canister that can contain any type of gas. This one is supposed to contain oxygen. It can be attached to connector ports using a wrench. components: - type: Sprite + sprite: _NF/Structures/Storage/canister.rsi # Frontier layers: - state: blue - type: GasCanister @@ -254,6 +257,7 @@ description: A canister that can contain any type of gas. This one is supposed to contain nitrogen. It can be attached to connector ports using a wrench. components: - type: Sprite + sprite: _NF/Structures/Storage/canister.rsi # Frontier layers: - state: red - type: GasCanister @@ -310,6 +314,7 @@ description: A canister that can contain any type of gas. This one is supposed to contain carbon dioxide. It can be attached to connector ports using a wrench. components: - type: Sprite + sprite: _NF/Structures/Storage/canister.rsi # Frontier layers: - state: black - type: GasCanister @@ -370,6 +375,7 @@ description: A canister that can contain any type of gas. This one is supposed to contain plasma. It can be attached to connector ports using a wrench. components: - type: Sprite + sprite: _NF/Structures/Storage/canister.rsi # Frontier layers: - state: orange - type: GasCanister @@ -459,6 +465,7 @@ description: A canister that can contain any type of gas. This one is supposed to contain water vapor. It can be attached to connector ports using a wrench. components: - type: Sprite + sprite: _NF/Structures/Storage/canister.rsi # Frontier layers: - state: water_vapor - type: GasCanister @@ -550,6 +557,7 @@ description: A canister that can contain any type of gas. This one is supposed to contain nitrous oxide. It can be attached to connector ports using a wrench. components: - type: Sprite + sprite: _NF/Structures/Storage/canister.rsi # Frontier layers: - state: redws - type: GasCanister @@ -673,7 +681,7 @@ damageModifierSet: Metallic - type: InteractionOutline - type: Sprite - sprite: Structures/Storage/canister.rsi + sprite: _NF/Structures/Storage/canister.rsi state: grey-1 - type: Physics bodyType: Dynamic @@ -700,6 +708,7 @@ noSpawn: true components: - type: Sprite + sprite: _NF/Structures/Storage/canister.rsi # Frontier state: yellow-1 - type: entity @@ -708,6 +717,7 @@ noSpawn: true components: - type: Sprite + sprite: _NF/Structures/Storage/canister.rsi # Frontier state: grey-1 - type: entity @@ -716,6 +726,7 @@ noSpawn: true components: - type: Sprite + sprite: _NF/Structures/Storage/canister.rsi # Frontier state: blue-1 - type: entity @@ -724,6 +735,7 @@ noSpawn: true components: - type: Sprite + sprite: _NF/Structures/Storage/canister.rsi # Frontier state: red-1 - type: entity @@ -732,6 +744,7 @@ noSpawn: true components: - type: Sprite + sprite: _NF/Structures/Storage/canister.rsi # Frontier state: black-1 - type: entity @@ -740,6 +753,7 @@ noSpawn: true components: - type: Sprite + sprite: _NF/Structures/Storage/canister.rsi # Frontier state: orange-1 - type: entity @@ -757,6 +771,7 @@ noSpawn: true components: - type: Sprite + sprite: _NF/Structures/Storage/canister.rsi # Frontier state: water_vapor-1 - type: entity @@ -773,6 +788,7 @@ noSpawn: true components: - type: Sprite + sprite: _NF/Structures/Storage/canister.rsi # Frontier state: redws-1 - type: entity diff --git a/Resources/Textures/Structures/Storage/canister.rsi/black-1.png b/Resources/Textures/Structures/Storage/canister.rsi/black-1.png index 2f7fc54a31d9ae8803959f49eb998bd39f8d1e00..791f22c9585e4edbb8f317ed5056af0c0401aa54 100644 GIT binary patch delta 693 zcmV;m0!sbK0>K547=H)`0001UdV2H#00M|fL_t(|ob8r9OY2Y=$A7U&O#;neYbj1j zpYP*Xu-4l#02$yyW=!7?_S--@K+Q zz6uWy4@$&r{LRhHG_h%NdV0DrS7Hw|8V!UH35So54-CV=bzJ~l*JUsmP$(3r*Xx-{ zd%Yf&N@b~LQk$^RXsF*p2wd02Fs4t{!NCExZ7)pv`+rvvu$B_AG0$*+f6s6@RAW3m zJjAwbgb?bO$DhCbxwan#=*b<&!M1I#uC6GRN?4YK5JF8T>vl;>r4sM&@2d-t$RZ~v zCje}1Z6!qN=UJM~Ce3D(ZnwLrp$Y9k! bBy0Wwoo@~i%npX!00000NkvXXu0mjfczRWM delta 314 zcmV-A0mc5o1<3-C7=Hu<0001iRAQZFw! zV_;zO^Yh5a&w6xpfRp$l00001bW%=J06^y0W&i*H)=5M`R49?%(7|rPFboFZgg0=5 zIKyBm$2M+LwCf}upjFtq(;BPUc3daK8}I^1+;`wTNehVV6@TWNzk~hTjQ#V1DVqVn zz0V#-QC`wbIIi8I>KXu%g76^l(>;GkL9_$cBp#X-?u)rKg>gSTVO)fEpw&+ozqA)r~1rQ#`0OuHH)DOtS z>MvlbmrQ&b>gp|G%i{m2yt1%VSt5`kI#5&7f_*QI)S+jA;A{Kj+;jZ^{umF`Kq17y z8TfL!kj5qj2_Xih6lZ>Dtw|)v1X#0wf~o?Ez~OKhC`3510DrLCLWbKX1Xc>NEW>`k z55}fx3avE&S_;?-oX_WA`|)^WjYn1>%Q9GNNrNh-$W_2nfSLjh*eL*j=hF!Q(7uen zU!TTj@m`>+DwJhO9_w)nfe<*80|W(@%I>Ww#+QD46#ZA5uYeF@i1{F>fHNNeSZmQV zO^h$fvYg6LDSs7RH%K1vNf=|I@tl2wT?GJED}h@9zy=eB%CK!)HUV}Sx)ew$e|!UY z@&g0~eB)VbA*FRwHz?PJU?_ z?)BB$&-t6-(yl#p!w?8#BwQG(NB|f+hPhw74}Hz>MZI%9UNA2qY6OwjwO+b1(e>1F;`y<0|mBmR&q136~+m4424l!8W8Jc050#G zZ8+_3dru#b|F8&;#{FCeZ6v$4*{1(>DGkgaRPJ^09}V>)9v$7vF{vGu|OdBhS0MIlwJBZVM1S5XHvxD z3NYhfQxj705&+I$y^0_RsK;i(NCYwj#FN8uG3(ZEfV#gxZc+j!jb~_WZf4-s7XUJ| zT`VstA%8Dxnn5a_97a7>U>oae^d&_;p@2{@h*Z7?<^B`q&L3?$BN0^ZJjk4?jU$n` zIPuI|ZA{_<8UoawjyS{O!m(Taa%f1KWC)0--@u;|)6Hti*RG|<{||+me8z|{x8&cyBCKq?!t24OD7_JmAK1f*OV{E>=+&n198c_M^Q_Jd l_aGSaP$-nrpN}-`@DH^J93Q-lhco~H002ovPDHLkV1iX-g0=tv delta 361 zcmV-v0ha!=2KfSz8Gi!+002a!ipBr{06b7kR7L;)|7vP#M@LK=Fi^I(wxOY~9ynYT zitQ;_h~nbn%F4J5D?Hy?<->0)K!@vM;7-RrDK^=gC0dSbXv4G*A`mNnOHU$A#K>z;@?;^Tk$nf^_mZB-DVraKD&00000NkvXX Hu0mjf4|%8c diff --git a/Resources/Textures/Structures/Storage/canister.rsi/blue.png b/Resources/Textures/Structures/Storage/canister.rsi/blue.png index c39f1ff26e9569c5932254727626659431ec0127..412994d96c8a01d3cbb4ccd96d80e4157008154f 100644 GIT binary patch delta 528 zcmV+r0`L8b1Dynr7=H)`0001UdV2H#00HDlL_t(|ob6XVO9Md=eTtQ_3ncylxlNHu zun|()2q%aUkrY>LX&Zv|5p69GgdpJv280M{QVRZpfS&jVVkDiZ&*F0Ho=I+Jl7Nk` zNiIxg-ps03z_LT>`mFfg(kKTlgx=Pn4PXR9j z#1e48Z$bcvwQT^v=SlQ@w;6qk!T{b`4ze{Q`&wUwKpHr~0ZImDj9s@rNIVPedm;mt z9h&+eJp*y`0e?{g5}Hu9hH4C@>l<~0)&m-epdnLDgE%k|>?r^+cM`Z004&giX=C{G z{>3K1SHejNgyT*91^^}I+BRoEZ@hjJ!to#+PX!GcQjrmkm)HZ8onR!;>vj|g{nR>i zGJ5b{x3fHf7^D00+zHS#008yl4Am{a2X4xF0Kh>5cz>?ufoccY!V!Qd1Ebf;smC-$ zG!nRIe;A#ppgJ-+(tpV%$ey;Trl>uP$+pG}=yey4mpIk__4EmKF*2zpK*>O{q7;zg zFotw}k|eXGc$N??gLDGXD*f4r%)pe_GTz06xQvtnuIy&?n}`X-d*MF-;2VOPt|IeG S!e0OY00{s|MNUMnLSTY_r|c{M delta 379 zcmV->0fhdY1d0QY7=Hu<0001iRAmVo_wl8G+Ks z4s~)-)@3!hB^QFnm2G+PN2ykq7T8l!+z|lp{Uni+mRHXJ@ow{b3tz!)mYp}(07JT) z5%mV#p(9eV&~(D7>M#z~uUW)xbidsWIso`%dJI_`a46wYa+a9K%qUBQs7bN_pqp4c zGyv`+8=)o_W`-BweMJMCc87}40D3#j_=f*@Rq005>I1<09F*#RpaY?{*LrBtB<&b< ZJpY16O<2m#t&IQx002ovPDHLkV1n6(uTcO1 diff --git a/Resources/Textures/Structures/Storage/canister.rsi/can-connector.png b/Resources/Textures/Structures/Storage/canister.rsi/can-connector.png index 9360a41c58ba355632074d216c2ce7e9c6f61de5..7996e1b26dbe64d980dd740285fb66b53173a8ea 100644 GIT binary patch delta 291 zcmV+;0o?wL0-7=H)`0001UdV2H#008+(L_t(|ob8pt3WOjOMQ>B&P6#A|zQF(g zn7$yWMFg(0AZO7ePNP#YIV%qYB@fPhPb(l2i9{j+sq0#u)np+9R8<843IN)+P5vGL z0Lrq&x~>4AY#|;YIveQXYA%qZ+QtGvD0bCy+6R#~e%1y>`M4G1h`HI{-fDKdXBfcd7A;epF#Op&uDFq=! pUsvAq+u)pAe;lo@^++Ugl_ymqU5}tdx+4Gp002ovPDHLkV1kDMe8>O* delta 253 zcmVW79geP>EaktG3V{Mjl2vBJj@$9{@44(CpeUB)GuISV7NYO li|2NE{W))eDj66K_%r9eW&XcYUUfN$>*?y}vd$@?2>_|D97+HH delta 188 zcmYd4$2dWlBSEK+1tvy{F zLp;3Sp54gHpuofIc goQ2~93kQS5w{PMP_cyXc0?lFYboFyt=akR{0E8<(Q2+n{ diff --git a/Resources/Textures/Structures/Storage/canister.rsi/can-o1.png b/Resources/Textures/Structures/Storage/canister.rsi/can-o1.png index 6f9566ee13cfef2cfc8ec94125469f1878b8dfcc..2e548fcaca256ad4f71aa1d235df5e812667be34 100644 GIT binary patch delta 77 zcmXR)m>}W7!N$PAP+V2@1xTrTx;TbZ%z1mpQINragL#A8KihISw(~9yLJW2$nUmvU fiYGEK95}{Y6v_NQXIJV^pcV#CS3j3^P6(9Y}Eo_=LFr|Np;7M&rJYg+s97M4%vJNswPKgTu2MX+Vy+ vr;B5V#MI=31^NXIhDHfIyjHs#Oc)qCS1??hJV8PcsD#1O)z4*}Q$iB}2E7}R diff --git a/Resources/Textures/Structures/Storage/canister.rsi/can-o2.png b/Resources/Textures/Structures/Storage/canister.rsi/can-o2.png index 1a0a402363614b983d3bc4474405862a4e2c7164..094ee1e3c60e7e0c5c1f8e5b0c28d3ba0adcbcf6 100644 GIT binary patch delta 80 zcmXR&o*?1P!N$PAP+V2@1xRUmx;TbZ%z1lmBQJvi&tZeb|L@Pf`gh?=4><)5#)QOK kewTe8|Cz?0s#LU3Jz$Y>(9Z2y6_=LFr|NsBYOosnw7!+Ie{@Uz24HRcA3GxeOaCmkj u4agDlba4!kn3|j*p>SXu<6J`xMuunS7<0w$#99Jn89ZJ6T-G@yGywo^SskhX diff --git a/Resources/Textures/Structures/Storage/canister.rsi/can-o3.png b/Resources/Textures/Structures/Storage/canister.rsi/can-o3.png index 87a68af474a82f663d1d658f8c9f8066e47001e7..014ed7833d45f8f7b62c72fecd889d900237b7c9 100644 GIT binary patch delta 80 zcmXR)o*?1P!N$PAP+V2@1xRUmx;TbZ%z1lmBQJvi&tZeb&j0@3*t^ixtw?+UO9SuR jWtZoF$=T1qa9}m}CUX|(9Y}Eo_=LFr|NmdHRgdAGxVX~Sa-bk%NswPKgTu2MX+Vy+ ur;B5V#MI=31;z<2h9-$Tyj9kXA`A>BZyAEse%6E3GkCiCxvXbIO&;K94zizIIdw>k<-dc7^2_Pu4 z5udnp{v!bn-oTWEiZ2~Ge?z=mQjKL#TyhUoN=Z0yM!9RrvPPgiZU;3aSef}41k=Pj UUrU{>1GUn`U!_CQ_j zv(P#N^(bZrh99jLXPh8W&ce*Vz|a_yejG>%1^9%x{{R2q%`Lc~pj2DixWA_-EG*vi**$%rEMrNK zUoeBivm0qZj<%PnS ZU?{rGtZM$1=P*zkgQu&X%Q~loCIE{qC7S>M diff --git a/Resources/Textures/Structures/Storage/canister.rsi/darkblue-1.png b/Resources/Textures/Structures/Storage/canister.rsi/darkblue-1.png index 1cb0f83ebf121dd618cf696a5a0180f0c66ea5ac..c8bea6c38af095c39aec0832efaddba197e0f5a7 100644 GIT binary patch delta 740 zcmVMg%<~rpmk< zOJ^jnzepIhWGq`YO_c?D!RCr=_<_W|&|TaYW)n_(>hl_sR&a86A7k)zP}7pN;rKt(>s z<@%>AeEJ4JRgGCCPm@Z+VIf8bz5!oRSBFzKAr%BY2CYM_#P8+D*(daM z9|K@@v`q*Z4#T;LOmYw;I(gLbw2&;3;?>Gtg+wxai3W6TP z`m?DOF+ZMjADsF9fX|EXa0e0$UAf4O(fj#Dl<*vHJW=OaZH)U>I~I$T^yi}tJ^TY_ WMhU6HdbU0Q0000J5D?Hy?<->0)K!@vM;7-RrDK^=gC0dSbXv4G*A`mNnOHU$A#K>z;@?;^Tk$nf^_mZB-DVraKD&00000NkvXX Hu0mjfWq+tL diff --git a/Resources/Textures/Structures/Storage/canister.rsi/darkblue.png b/Resources/Textures/Structures/Storage/canister.rsi/darkblue.png index f664d0f3bf03495e805253522edba0a42a145f1d..06a097b0bd1f935601296d28c8cf2add2cdf34f3 100644 GIT binary patch delta 463 zcmV;=0WkjS1KtCW8Gi-<0047(dh`GQ0i{VqK~#90?Uz4F#6T3rKgCL|7cU?gi>(C9 zTtG-=A(A51+(E2^o?$>(WC>dfUcf5^B;o~@wbeQn*^Co6JM+C5u<>hlv&_Et+xK?| z_+#zRC!?emS$=(_Y;yonQtP}B`8PLL6a)<*^4^L7*rSb2Q-7eGhmA%_ZO;4!l&&qkDl^t;HPaSGWu~(Sn4J&=P?@n1?yq*`!nn@2ofiT0IqHS<0FDN* z&AA%^+k&6mL>#mW`XDxRFrmIX`YwouZcz2f_HNo zuOFECrj&JCm~7$Ot=pD*Y+SpwswFFXcI?_+jrqPVbsEe5HoHAyI-t1mbRaYT+&jzP zRT({dn6b57$R>UvXTyx5fUM5i(1?a4yKaU<2dABHNo07J5Wz6ZkI$pNF)rfhmdK II;Vst05z?{#{d8T diff --git a/Resources/Textures/Structures/Storage/canister.rsi/frezon-1.png b/Resources/Textures/Structures/Storage/canister.rsi/frezon-1.png index 1cb0f83ebf121dd618cf696a5a0180f0c66ea5ac..7c02c3993e0182ddc839c863eebf4c7f00a8b055 100644 GIT binary patch delta 455 zcmey#^pJUiNGZx^prw85kH?(j9#r85lP9bN@+X1@fZ;d_r6~!-`LxI%U1{ zIfHGKVEu}xPoLJ_{PptXOA!%~w{PEGzkXedf#Ji455)`&oGgs*-n|3riwj|p0Z|Of z%F3@_zm}Gke*gZxprD|-pncV4-+A+9?rKQ3IjK;>`B3JZ?XS3% zj4DAK4u)|}Q>ya( zFE2Pmo&WCc?i_T(^YinFwE7_;Ey&2v%G35VP2D;G0004WQchC!S2EU}oXkrghb7(7*O7r?V?XzwL{=c*KENl$ zl{2ik_U13a`W2^6ow|Pg`u+R&8KhLKcRnv>V2BF=Vg?3o0cI<|*RNkcefsqM`}ZF{ ze0clz?aP-h-@SVWG((b!DFH}{mIV0){|AG52n8bT-AZ)9w-&p4wTbV4CrY^g-^F~z zHPP&oPDsYb!;6j{sO)9yeE{S>#ntNKVVMeQrVpIK}ta@gW(^Gq=xN-&mJ<{m?{J78Fw7Lr^5VI;;NP0 zW`?kxu4-QQqTl?IKEV>kYp`@mL62BE_xU4EYdpFQZm-#MScxyiGyW>?hFp1}Dw7b) T`KCcYzcYBc`njxgN@xNA-%7y< delta 379 zcmV->0fhd=1BwHX7=Hu<0001iRAmVo_wl8G+Ks z4s~)-)@3!hB^QFnm2G+PN2ykq7T8l!+z|lp{Uni+mRHXJ@ow{b3tz!)mYp}(07JT) z5%mV#p(9eV&~(D7>M#z~uUW)xbidsWIso`%dJI_`a46wYa+a9K%qUBQs7bN_pqp4c zGyv`+8=)o_W`-BweMJMCc87}40D3#j_=f*@Rq005>I1<09F*#RpaY?{*LrBtB<&b< ZJpY16O<2m#t&IQx002ovPDHLkV1g4{ z0FopDP%f8sKYypwsoR-M27u7eklxAfajPhTXg1I)#*9E9U|QtYj~@;1R#K^^v6WPc z<1b(MFgdA;p`oFsuTQ7bOiWC0dV1QFM0=D3s3-GAL(mY0`-Z*6a!B5e(r2AWZ; z)v#DB0KC-ec)ecL>-Fl3Zfa@@fM77l+S=Ni`I^>1Hk(D3Wm890Rk^#nqr1Bs0Jq!C z*47rZY-NC7N+o_P7AX`8KPEsE(aP1;70F~$FP_b2>Fet=O;{`z0T>$_YpVm6w;cBO z_gPw6(tq3T^ZA&cpC^$>nELnk_wz3C?#;q&2`H6HY;SJ^P^nb#`Fw0_YyhynzHSg9 zNfO0k5$_*fE-o(G5@31`Xx!Y~=yp#}59M;1SS*Iy?IsqBnZ^_f1r84n+nRs)w*!8^ z-*m8At?G6(8pY{!lFQ|IdU_(4%i(glXpAou3V+Pb&I0Jqw-A4_+5QHsW+D_t(e06u z5t7Ly(P$KaL?Xe_(NUAX-|y%6_!vNcLi56IJ*EZtb{FLHd4quK>ubZd93LMi6bdmj zGo$Ycjp^xW4h{|sc|J@|0;Wf?F5q)MpO0z*kw^rf=`z~e+tU*c3=AMi5{rwA1_6J4 z{b*_s@EW&@A~apcS{EXbi0OH-y1L5A$q4{4@s?7Ll6Y4Rx1ED zn~i$CPNh$wu^TF_y+>mEsB-!5dZ)H002ovPDHLk FV1i)3rLX`1 delta 309 zcmV-50m}aR2E+o87=Hu<0001iRAT^C2QFdTz-K00001bW%=J06^y0W&i*H(Md!>R49?%(7_JDKoADtU2ia1 z?uZAd>{jZg+1=u-33{z9?hTI&g`S0Qh-EO-S&*qC^#~QsE0(!jz~T*BBdS6i zSdpnse?(}sM7&-6bL*0+t%EJ%)j z?AE4GttCwRzAmT*v(cseiB7o>P(O|UpYi(nR+lz3+Xz_q{m4C*un>&}2;L5dVI8A#sy}OvXf#raJXuw|`nB5npu(KMf{hf^#k? zW6+5OG&)c%pqnED*#iJD2m)A^C5>$~8s)hDsRs%ShePQ(=Uj`AEMO1>`0@0ljI&!U zBxy=EtyTx9BhZ2N2mm0yzXt&PagWcxz8yd3k8{|zjU-9PTsI#PAcIbEfY5<+Yv<1A zZ=N43->V%k8GjS1O^|lLWK0Z#0C%+-!Z5^gxm4*zk|gMKI=HLVkff>dy+QIouh#x+2c)sr=&vO`tf$4Or z#i#5*)p+Ca7@Tu(&hh=>p)4Ln5da{HBDCA>GJZ4~U4JjY^Sn|-v)O!ip65AS*G0Wv zhwHk?^SmtXdEWH`s>rhJ-EW3rAdX|~c00sz48t&VC}{%r`~AhUD2m|wK7ivm3J(-H zH@CM^ZjuSN+pYAx@PJNE0a6Fn>otk&T+ZQexK2Q^cEEWPs&a*p-{6!Z==b~O_bkgu z&IW+lY*PjRa2)440jFY$j{JOn)=9kx<)zWGEK%)(&W*@%9IRF=X${h?*s?4E{2hnt o&!}j-syJD|sSp(?h5w_#E5U`$Gra>DdjJ3c07*qoM6N<$g83a9Jpcdz delta 326 zcmV-M0lEI?1l0nN7=Hu<0001iRAT^V!+i z$jHwpDEkEf0004WQchC4tt|OVY zbG9h^0zM#J1n0C<`2CSqF*(#Xo@`@GQ9KPmtqJm3wD&kN$bXXnI3C_IQ0ZKUJ2(#> z%C8+X+K@3BL;|HuZYl;phH={6GI+1+DVMZmlBsJm(4TWZ$RO2=jZuwutC6N&C%-fd zx9YoX-{((;OSAScHA5hbk#J!sBLQIS80LQQKJ*pC2ldYN_`88nsAJS*x5pe5*;In| z#GsbiUuOn+qdx=z^I#R+GiC;OWB@P3K6)tLhs9>`fig&V_5PYG(#qDq%^O@LMe#iT Y0pU9~I%jRoy8r+H07*qoM6N<$f{_E2y#N3J diff --git a/Resources/Textures/Structures/Storage/canister.rsi/orange-1.png b/Resources/Textures/Structures/Storage/canister.rsi/orange-1.png index 136b36ca3cd675473e6325737069537f61a7a4c9..4d0714e54571088674675b1319e933b835138375 100644 GIT binary patch delta 768 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 diff --git a/Resources/Textures/Structures/Storage/canister.rsi/redws-1.png b/Resources/Textures/Structures/Storage/canister.rsi/redws-1.png index 5f924fffce0dc2d2d85b00c2d4adbd08146736d8..d5c412875d8a12d4eb6d93a9e52410a6d4eb0348 100644 GIT binary patch delta 822 zcmV-61IhgQ0>TE68Gi-<0047(dh`GQ0|`k)K~#90?UqkS6j2<va89K`n?7?G!9b}uutP|H zg!CZlz79J(zMWllJ-1&NnBV)o-~0Z4-`{)l25P9Gh8k-4-+v)gBLVWLfN3}847?eG zzJvVLBBYW}q|*STOq1K1RyKKXa}$341mFVDrTF^XSWHtMCkf#ve`}gJuJbi;8aV0N zb5bIN5IeRl0W!J{z}3Y?0495Ss^tX=YK7E+x26f~SEg1tCMCN|OBBgf{QCIOd++l3 z`qF7qzI7d7Vt;%bEK7zGAn&>r6rHO;yKkX+A;{P^b-FIpB-H9xDQ`>4G*MgYho?X& z7{q~!y)R;TXvkCG$-n@gf$PB_A`$^$$`^aGp#gwPripD?KtXnOvxkc0M`2S+p3Tn# zkkoaq$K!lFJ^ zulmE<1%HssR+mIY1=?q41>p62b!5cz6-f^ww>6Eg{r!CH@2@@qQCC+oxH>ZOPP=lY zVt}duKrkAGeBSf-x{383qK*o06AB@S7)H@Nf5Wo87X0n*rlr1~3Bw@ep68iduJAR> z=gDtx0}wF`mfba$4TE4T2Ed1xFFiv4h3DM`_kW$j4e(=n8h|ew8@zh)!kc(&c$io? zT(OEXi3EXgm^+=Fg`^ZT-@M7><;y_%r#NL<<;M{4s)YT0kkoaSg`nBp@eh1N1OjET z04TPj45uus^y*H4+;tqe>o_t2az)eRil)iut*vs$w&jj(%X24A$mMuku4tMZ0{MM> z+%J37*orb8fU15-GH`Jh-j6}Pl3&Gfe@JTh2heUP(J#@8od5s;07*qoM6N<$f>|bx A82|tP delta 362 zcmV-w0hRv32KoY!8Gi!+002a!ipBr{06b7kR7L;)|7dGyM@LLdASbl9v!S7{-z+$c z94O%9-^k0yFE2RxMM3QE>%1Z^^Yiohc4#3YEjk$<$jHzAs*q@=>p%bi00DGTPE!Ct z=GbNc008VsL_t(IjqQ@ja)dApMDZrs76JwS|6kL##~Csia(_=%T7?hjxzWP1{OhmD zIgita5FGR-9h3LS6X#rFd_`O=sn+U~@LEdfV(#b6vu?E}*0sdIirDuMRCN$8m%y9Z zrZ8Y75#B{qcV0T+N)E|V17N^}yEK6h9tL_ClyuFk$TtH3vUAV|tcA7)7y+OY2Im0I zFF*#6E&!Ui0%M15M>Tr_Drn^!U~)*cCqS6Q1ac8NOh{0xe-zmrW|1Y6l2$yIHc`Wz zL$e@maWkkf>Jjfp-3e;Dxmi|UH@<*(H|y>Q9QpCT{7nC*PxpuqcjWjYhX4Qo07*qo IM6N<$f<$JcIsgCw diff --git a/Resources/Textures/Structures/Storage/canister.rsi/redws.png b/Resources/Textures/Structures/Storage/canister.rsi/redws.png index 630651777084e1e28ef3dc2219bc16052c314c80..8390cb6539a4d06f8f66c9ee27f36208e0654894 100644 GIT binary patch delta 594 zcmV-Y0R( zELsd%N_UUxnDy{hFdn*OG$ElF&p}%;WNJ6>ri+#qEg?gfYAS`0F$o?jb+Avl&`S5t z6?ExaY>TJ&zI*S#dp`Kb7DydOQ1}F%2xGUU$%jWrKKWrbD}N*qB1+%Y8Tu)MBoy`FExlvmIBR*Jd!;danc$EAsO`Ye4NCV>};pXy^sn%ux zD=o`-cXb6}NPd6sjO_$iXw6}glpvj*9l~}Sf^}sJYk_%AzFd+omjL{jO#U7K;KRWI z0EbCJad*d0AnbO@Z*L#@wRU$2x3>6xav}*U2e3iRkbfCiVzk@hJGPzM&=y|0PCT&A zg7YjZVFpT-0t9$tecu@1RH+i;TZNAeV<$g#Y*`V2Z7(XG+ZFIN5kOU9lhm$&(Lmih zwt0`^Du_+3@mbI~fGw;l5lY_O7+@I3BKIA)-+Q3 zND>whj!R=R5ufev({8nX^9j4%hk!v)&Vsj5>-68(e*?Ht00001bW%=J06^y0W&i*I6iGxuR49>c z(7#TEFdPT)a!hR3Hbg>VaxF2e0x|v@eS-4_d;)efq^xMnb$>K*LMP&6;^t(^6UZ$- z0JE=Q&r5%0xbN0a+HZd?LVJS==M3AmlU-#xa{zbYU_754TVQ@sEXf3pa)JHp38Xw? zQDniK547=H)`0001UdV2H#00M|fL_t(|ob8seOB+!f$3O3qATdO1CkqY^ z!i5k7mw-!09fTIk4f+RUuUIla3NBfaQ4mU@LTQMfm!!cz;raDgNW=2!N$p4aafD zCSPA%aC>(r0364Oh_yC1_1cl=CNiMKH=0d?AON5OT$>KV5Fv!<`F;qn+h_prWq%)l z{Q7!QU9F!r?>3rE0LtYu0DYi5h~3=W@N{{J5;ysEJ+!ITD$e)zR8@2=2m)N!WoKt6 z%mU$`PDd|L*?*5&6@s4cldD#RX~N9@9dH{XZnkz5U4d*SLl6Y9y;tO_Rm}2xo=3Z0 zN6gLwuqq|1#{3ugJOCTD8vgOI&IMz$T1q?#J>SJx3a@dwxpybC7+~B^vuW} za2yBE^I|8yT38_GdD?`O5-BBCp#WmI>3?^-04&?~^nV7F2}QeJ2c9$jd4CT)mtGp# z^&cL{%+Krlm$uED$z2@7niNo#$W^O)OiGF8c{+Pd7=1B5A9SZTU=<3Hz+lJI^L={0 zuSJ#cn28a-caxbIYXJ;Puljv(da7flfjHhv$;WmZfDbDx|21F%h+Hl*xZ7y3yuBT} zVAMcnZhsE?eH}j>j2}+>76>6C8_@GS-GWl71fWhYZNPP1==bSAJ_1lGm1wyx04>)g zQ!E1T?c~JNjBFVFEqJ=RdKNZ%r^J-_Bplnunwh~Wm&fM4Ef&ddZ2_@Ial8Rj*gSkp zOd-d%vGRGWL8YcZL_WvLM0Ra$;(5^NbT~UZ8!ooMFrn5m#pigG*q@Lkc)d70!xR0m bq$K4p+5;fR^44i500000NkvXXu0mjfH~T{} delta 314 zcmV-A0mc5o1<3-C7=Hu<0001iRAQZFw! zV_;zO^Yh5a&w6xpfRp$l00001bW%=J06^y0W&i*H)=5M`R49?%(7|rPFboFZgg0=5 zIKyBm$2M+LwCf}upjFtq(;BPUc3daK8}I^1+;`wTNehVV6@TWNzk~hTjQ#V1DVqVn zz0V#-QC`wbIIi8I>KXu%g76^l(>;GkL9_$cBp#X-?u)rKg>gSTVO)fEpw&+ozqA)r~1rQ#`0OuHZ!v+ zODOawc*&6Ej@hzw&EDZrx|9rB3lA?HgO&_gIu|qq<4uH2DQN2)8$+VkK_8JC$M0TM zrO*TBN%qyb$M@ZjC*U8$6WH3n!Oaz5wbml#qAre~zUBq;F z=2?igATtIpN29HVgZ+Js4iDM<;t0GuKHmEK{PI%7$BsZ|45m@UGM=BERZ-|K0@EnM zx6@PB7JRZeGO5t@J0|0(f@%`5q#Y#)U_c+FTLC^3d0yvO32Y3;9Qg%Ox zTKBYky#AtfQ-6eoBM)2=u$eIcfHX~!rm4fch(Oi0?-z?oL}%E{7`sXmn;BDeH|Hl$ zQ=4C3+xx}B*%6&vFpVP2XEOl6DoHTh-Gv_nfLBJ=Hu&=#`Ff3fy#@e$y0~!uLsk{M zJvjjY%x5#$WfS0u!hBh^#Cc-ep zhohtVK2JC}*y@LKB&$Wd3PS{g!4m_2Jbonfym}V6oO1;LWj9+TNkP0p1ORx$Vbd{- kU;5_4o$bB75&i%81xkV0Vt8IZHUIzs07*qoM6N<$f@!Q3=>Px# delta 468 zcmaFD@|byoWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hQfKQ04 zqLQw@z6B4DL~=qxRY^%uP>{R3Phw(jXXo673)i1GasKAbo1fpm|NQwgP)Gf8*$+U9 zza+>n_&*9@xN>L4LZB39fk%C0F#`kNVGw3Kp1&dm=n5527sn6_|JF&3lUfxxTm{8N zi~s&Vf0sM+=8H4;%=dEjg}1EuznE2F(St*WIUL_Be_W($^KNf(fpENB1IHDbTirt2k##*K~EmcZ|j^H==Xr zs?@}<cH68Gi-<0047(dh`GQ0*XmQK~#90?Up@DD?t>7pOrKs*lcHPL=e)% zHm#&d1W6%G{=kx$a@Q)2g^iV)G8+5?*;X)VF1EH}k?P__)^f{m%elqL>_>L>MsIoZ z!f@u}e7tjJX3xSJYpk)x8vi@2rLhL+bYN>MnS6g&00co0>whbybh#Wbn`IqLr#YXi z!FADq4nwr-qP4c;rj*iYU8R&(O6f2}cRJF-P+Fsb{vbpl3|kFQt-`|tTwf;&MY|8f zB*^Y=qT6UdtF?OYUJt8e2GuImYSKSH7wLH_V~`G`p_i%P* z1CcJdF4`;rIDZaQDlnVD_BI4T07%*$NBU;{?oMnjF5vA==8J+G|BfRvouxPf$H!2w z!(?Iu&~Ddr&di#D=S9rtLcr{>T(+02A{@uqMogzztyYrBjln>I7s2cvU_Aa&s52TR z_9l3{T`$}~5#kIyKZ|j*8BwV~xg4OBib;50lr#2y8-L%2Za0eWz*kX92Z!ttq|P7T zFU|nK?XAsdlqa|fHe6Rahli^<*t8<{tcXoZ^t)Y=jmEd)QyL6lK3^^Po)z(1+Zp)_ zczTN1+4&xU4UmhJK8C-MNK374YBiWn|ABzk{ZEzBFW^<%83}R+mi0e+H8}$24nSvd zo*kgWcz?W)Qt~CVESZ1R{Y(a4bwAcOKIF9|5@0gv$NlA6VSyB)!9XUKv(awsf=G<gLlERy8X}%|6|W74IkQjE z>!nJ!l;FOGd^t8Hc~O=%poc@z*SfD=S8S?PnJ@neiNYU}1)&TM4&d=Isg6fS0Y%8{ cYK;}}2Mq}}POJcZ;Q#;t07*qoM6N<$g1f~>Gynhq delta 351 zcmV-l0igcF1@8io8Gi!+002a!ipBr{05DKYR7L;){~8(^M@LLZKmaZ-E}@~X*1!^h zauF{tIQQQo{N_QdkrVUt^C2QF$jHzC^MrhFVk-au00DGTPE!Ct=GbNc008YtL_t(I zjqQ@%a>O7Ag%?o}3HttT+oPuGw%zP~X9^Q9^yBcC$K&7rntu@`oQWwj6Tf)QB_+Iz zQkG2o17Xdj)|!fG6TD7SUFR9E>PM|bp+u|>Z;jdAH$geG9uWubNnH#=X6{WN3qS~$ zC=+PnDu|VD0Lt4GnIMW%7&EPV zvIcH${2Ir85N$TV%Zryuh3!^#WHN!Zsl=~oXbr|O2sAZN$yLbvGMUgAbZTMD#%Kx_ z3*Y9<+|&VMO5r(mr&_#rB>quLu+IEk9@ z=lOIhCJ8vFY7&dZ+uuI{wfEHu0M@3E{D}z~L{Cp|_kIAK2=wv%JR^Z2{G#eaV8^gY zc+g$Y$B^ez%zhWlO5pVsb+rS-MK}g)OWfU!pBYWTdJPmsBe#ois36;L&X40i1p$Al z#Ic`*%}SITzKoj5n2=1k*Ks(EX-E`>Uzf{K~yM_ZID4vgD@C|%edfeZHbKA z3I_Ei)F@XpLHz;!0VpYYWHYPYL>3)4(PZQ2%C@xSu=my{?|=7xUta(Y3L?)VP`?ej z(^vs>YCt$1U1&gT#u79DCn<;a%>YE6PkdhkqX!uKI@CycR%H2LOUk(yCS*I%mEBE)jU4en(IG diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/black-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/black-1.png new file mode 100644 index 0000000000000000000000000000000000000000..2f7fc54a31d9ae8803959f49eb998bd39f8d1e00 GIT binary patch literal 329 zcmV-P0k-~$P)Zg8Od%pIp`ou*Qc^E3IAdU7^Yin_$j^FobbyoiA^-pY0d!JMQvg8b*k%9#0M+qf#2fGeNZfbeJxL3Q z>=ovlzk~hTjQ#V1DVqVnz0V#-QC`wbIIi8I>KXu%g76^l(>;GkL9_$cBp#X-?u)rK zg>gSTVO)fEpw&+o zz=NO*vWkL`> b=x?0?Zn-{939AGM00000NkvXXu0mjfSCNUL literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/black.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/black.png new file mode 100644 index 0000000000000000000000000000000000000000..2b07b2b087de424e2cdea45a4f36f45737149617 GIT binary patch literal 340 zcmV-a0jvIrP)PbXFR49>c(ZO!R zAPfM|r2If_qUBmcm0d@ewsWQ^`vN{7Z3O4EQ~3RnRxvr$H=b-`Oi{cHK&1%sxwMZs zGKfRwHz?PJU?_?)BB$&-t6-(yl#p!w?8#BwQG(NB|f+hPhw74}Hz>MZI%9 zUN|zzZ?Y9+LNAuw8th3{^0000()00001bW%=J06^y0W&i*H>q$gGR5*?8lG}EKAPhz2)`SoP!TF|*&K6m+y3>}!S2E*A`mNnOHU$A#K>z;@?;^Tk$nf^_m XZB-DVraKD&00000NkvXXu0mjfO`4}& literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/blue.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/blue.png new file mode 100644 index 0000000000000000000000000000000000000000..c39f1ff26e9569c5932254727626659431ec0127 GIT binary patch literal 394 zcmV;50d@X~P)wzkU3%HrbU?(Xg$I9#v;psWA@00DGTPE!Ct z=GbNc009n3L_t(2k!{euPQx$|2XLoZGS+rP6p5jBs>~!o;$tgF;R*5pp^-BOP`x6t z1h$9;iID|4Pe3}cd**paTlt)!|II($ozF(-XfWZNVS9G6edYk}!ohexJF~$2qF9j$ zEOUYVn+c>mVo_wl8G+Ks4s~)-)@3!hB^QFnm2G+PN2ykq7T8l!+z|lp{Uni+mRHXJ z@ow{b3tz!)mYp}(07JT)5%mV#p(9eV(88(eFb>tPS;TF0zugWx0Qh5i3|Sj+DB)6a zmYB!PC`*K>NwNT-n^-(F0PZ6jp(Yn*h8N&{MFX35hlCCtSts-ugr+2Di#miJ40_YCTAmBim6p!P`;1Ktbiep$6xMwG2+1)g4$bomD6?IupD0nZPa! zCanu{d<(s`7cj{NEPW|!AR3^bav)^M!H@$r=Q&fC_%>K(sByV+FfjZ)CTYg6dFUq4 Op$wj`elF{r5}E*ptXz}; literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-o0.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-o0.png new file mode 100644 index 0000000000000000000000000000000000000000..89f617973f8bca28041d61e91bb0ff746df11552 GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@QjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`c>;VwTzh0R?(10mEXx22yfK;J2~t-QcY_H7L+1*Hi<2ivC<2u*c)I$z JtaD0e0syAo9NGW? literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-o2.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-o2.png new file mode 100644 index 0000000000000000000000000000000000000000..1a0a402363614b983d3bc4474405862a4e2c7164 GIT binary patch literal 112 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@o&cW^*Z=?jpP9+<{|tj-tKMIm zeW!uqj3q&S!3+-1ZlnP@LY^*;Are!Q6C@N4Y-5~jsKLna>>OjR*qvBQpe%!@tDnm{ Hr-UW|3`!pK literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-o3.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-o3.png new file mode 100644 index 0000000000000000000000000000000000000000..87a68af474a82f663d1d658f8c9f8066e47001e7 GIT binary patch literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@&H$ef*Z=?jE4Jz}+!Gg9`dSVY zWGo5t3ubV5b|VeQ5%+X)43U_coUp(+p~cW7k%za+x>1CI!Q?GNu-eahka`ABS3j3^ HP6m75!&0 zzPDQ>BqXFaS~?r3fUzXVFPOpM*^M+HN7K{AF+^ixa)QJ}hlT|WlZ0k9Y%-iBB^qqP nxHY7t(Zqz&&5@^?&60t^;w4kBc<9V4Kurvuu6{1-oD!M()00001bW%=J06^y0W&i*H>q$gGR5*?8lG}EKAPhz2)`SoP!TF|*&K6m+y3>}!S2E*A`mNnOHU$A#K>z;@?;^Tk$nf^_m XZB-DVraKD&00000NkvXXu0mjfO`4}& literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/darkblue.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/darkblue.png new file mode 100644 index 0000000000000000000000000000000000000000..f664d0f3bf03495e805253522edba0a42a145f1d GIT binary patch literal 491 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijK0(?STH6uD?N)AgI1axfqb?Wjrm%0B%yWaBfNGK}l>g!v$yZZzM1tljW z$XUcxm6QNAy>2|U6i5k_1o;L3M+FQIlw&1U_ohalU{)~c4Q?AftvcQxkwy3}bb``hgHi0Odh z#?yh!{B!Rte^+Jn>|w^%av_`eg`5pDiUP7aYa<$x?7A5a9h`Q)C6VD>LIlGsKR%E8 z#<+;1j|-lwH@Hu_%)!1cOo7Ay_sZ%|!WX)g^)&tK*kmkC|FzjQgzo*%RIRJ-UdArE Q1sISFp00i_>zopr07W{&q5uE@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/frezon-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/frezon-1.png new file mode 100644 index 0000000000000000000000000000000000000000..1cb0f83ebf121dd618cf696a5a0180f0c66ea5ac GIT binary patch literal 377 zcmV-<0fzpGP)()00001bW%=J06^y0W&i*H>q$gGR5*?8lG}EKAPhz2)`SoP!TF|*&K6m+y3>}!S2E*A`mNnOHU$A#K>z;@?;^Tk$nf^_m XZB-DVraKD&00000NkvXXu0mjfO`4}& literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/frezon.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/frezon.png new file mode 100644 index 0000000000000000000000000000000000000000..c39f1ff26e9569c5932254727626659431ec0127 GIT binary patch literal 394 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 UX@%Ix(uW!~(lgO5)4mq=KZ%P2K>z>% literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/grey-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/grey-1.png new file mode 100644 index 0000000000000000000000000000000000000000..d7bef4b366c90cc62db43143e81611e14e66a9bf GIT binary patch literal 324 zcmV-K0lWT*P)TI&g`S0Qh-EO-S&*qC z^#~QsE0(!jz~T*BBdS6iSdpnse?(}sM7&-6bL*0+t%EJ%)j?AE4GttCwRzNiJW(WU%}PPq?IKaK#O@%s5zniA>{`mHCG W`a^S1V9wq$gGR49>c(ZO!R zAPfM|P=25`(Q>V!%B~}swsW>9`vN{7T?FT}Q~3RnRxvr$H=b-`Oi?@yK&=V#S+w^! zGRTtvI3C_IQ0ZKUJ2(#>%C8+X+K@3BL;|HuZYl;phH={6GI+1+DVMZmlBsJm(4TWZ z$RO2=jZuwutC6N&C%-fdx9YoX-{((;OSAScHA5hbk#J!sBLQIS80LQQKJ*pC2ldYN z_`88nsAJS*x5pe5*;In|#GsbiUuOn+qXYr-U=`dmW(Ig<058NodMMt9#b)t=GDvv! n{+cV&%GSTl8(bwt@jU(k;X5`uXKl^900000NkvXXu0mjf(N&c* literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/locked.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/locked.png new file mode 100644 index 0000000000000000000000000000000000000000..9edd84975f38e5862c0875e7427c9c95bb1d2af9 GIT binary patch literal 4821 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 x*m)*T=mg4{b00DGTPE!Ct=GbNc008$%L_t(2 zk!{hzZo?o90MJl=poVC<)=*{F5vJ{&Ey})t4@egg^_X@F+jXaX!M=AeDJF;d#*=M~ zDT00001 zbW%=J06^y0W&i*H-bqA3R5*?8ky(z!APhuf3fn-N%>8dW1$25(|Bp1bLL}8$6-JrV&{}b46fGr?D0BqtB z=+SzKxC72)cml$@mAC`S=5K(S_AoWpnyy982uG1@onH7|+Z49R8jd!{Bz5}9pw_6D ye;)NDbnND2S##aYz`K)mPlOS%9{;?{-|QEhUJ0es%(Q0!0000i_@%0d!JMQvg8b*k%9#0P{&i zK~yM_ZPCGQgD?yLP$)l8J7`Ed)yc%J4Vktx8)9FO51>QInYJR=eZ{_a0SSjgean;W zI8K&53_vLf(m6M492tsJ4sbl26HsYwi#vGf9h9FtXrv;g666ttP^oF&yTK3R?v~y; zS&ym2lu^dkB%r&s-^fsiCmn(q^j1@-dYSyv{BCfozKnUBJ~-pjEIm}s;0Z$@oEgeM z02o?^shgeiUB&QDowXhQY>*3-AxP5OV-A9JEJ1x@5Oe)^ofwK6Mevvgt65FH&ufO@eQ0cE=OIA>ug+alMO@kPw`qfm#K<1UKcbp9L6^ndvj6}907*qoM6N<$ Ef?%PRd;kCd literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/redws-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/redws-1.png new file mode 100644 index 0000000000000000000000000000000000000000..5f924fffce0dc2d2d85b00c2d4adbd08146736d8 GIT binary patch literal 378 zcmV-=0fqjFP)U z&;6>9Xr}8x00001bW%=J06^y0W&i*H>`6pHR5*?8lF4#}FbqWTCfODO1^)kE)3(PM zG8uADRa%7)=(*9tvi$3>$vKbHhY%d}CLNRa$P?#WVthqhEUDJ&lki$f=wj~Y%(HH_ zCf2pYz>3)S5L9&#E|4;}`37?gC)tjIS5 z0J3w?2CRj)1{eXL69(r1&M!a)kS+k4xB`c5M>Tr_Drn^!U~)*cCqS6Q1ac8NOh{0x ze-zmrW|1Y6l2$yIHc`WzL$e@maWkkf>Jjfp-3e;Dxmi|UH@<*(H|y>Q9QpCT{7nC* YPxpuqcjWjYhX4Qo07*qoM6N<$f^fj1kpKVy literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/redws.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/redws.png new file mode 100644 index 0000000000000000000000000000000000000000..630651777084e1e28ef3dc2219bc16052c314c80 GIT binary patch literal 403 zcmV;E0c`$>P))}ox9|T1&Fm9oP;hZlRJ=o>s5G@{)7vE<2=O<`e>gb?0)ar_ z%S1;Llv2z3-57JY#)Y4w=6RlPYJJ}?ZQFViVclrod>qHyxUOq_iFoKh9LE4OO#^@s z0)V0@0K7PHSAbG#ky4_yj@GsHoGi=U?F~E;!o9G4?cGqut_$XQ-aPk2eN2EcCQ6dT z`n@bmXE6^$Xk(hD%~&b52qCDd%K12)k3jxP(lp)FhGC%VI@hgU6QD2J>rLn^0Ipfs zy8v)HpZ+HUaJ`h)whJM=yJN+c_E-LbKp+tKI)8#XS8T#jPCWns002ovPDHLkV1lgg Bh6Vrt literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/scrubber-open.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/scrubber-open.png new file mode 100644 index 0000000000000000000000000000000000000000..4eb9d1e70828df113e2d42ecc043a93cbf272a2a GIT binary patch literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJKu;IPkcv5PFK*;@P~>n8{JSxc zIW6J;RF4}Cm+YBZjy;?A>!-pdF`&wZ<7Mh9O65WGW~TlRXALPe+4K8bN!OX2Ee*S; l&%DODY`=iu+PViT<&XFB9+~UseFUh5!PC{xWt~$(695C}GlKvC literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/unlocked.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/unlocked.png new file mode 100644 index 0000000000000000000000000000000000000000..5ba12d06af22d321ccc5b7ec8184b4e1fa0948e5 GIT binary patch literal 4836 zcmeHKc~leU79RuwS*#nNt&}l>E!IggA-jY%Kq4YrWYdb1%p{DEg={RZJOxFi?$o7H zsv?LR;(~nw;`52sNj0K@j99773%kH*C6Wt-+@*GqVSRENPjNIDHhB25YoxIhjJh`V0*L6X~QJ zg3_-)-tuMsqiGJgZSg^y7m983?sU!Dh_H-4YKQ)YW^t~W4ibGoN%=yakx8L{rwpgyF`Xl#>cPGCt-mc27 zn4WasWs3TWU)HDRx|@1kit3M)IUO*bT=vw%{j1T99uXImuAaxUS_51at!^{BpSi@0 z?aR2g{4R3eRS)YGHP0@7&xm1OiMn+| z94_f}KJnzEgGVWe(YMdk-7jx@Vbiq5qUv#1Z2hkXoqc;1Gk4W?xA#5&uHse8-_BBJ z&DI#I+0U>3til%L<`LH|dzubQoW}h_7i=tiu)Mf&ol$Z-cN_v-j^0u)wR3Cmex&+=bt-rbdA8SExAa^c0*E1= z3WxmXp%68PJR=qPL6<}u$GM(O5o$^-BThBNQ)0)!b35bQLpE5kFVr&^px2}0C$(Di zRW|qqj3unu@pcQ(?BV)4yDIkVNs?SHDJ_o=&7bg1>BbocLJxl%=TN%2p#hnf+THP> z?tE*-mWFr@xoFO{BlikJv(JyXlXJ{|+Qz7=S!?D7hF#uwWq#=CZt^f0dcNRT%dC4; z*WQru*6QAt`W@ND%=X3&%N^Y^Hs%$xJsP-%Qu3l=+nrJ)*0*`F-x}(o8u5WVV|3ub zYk@hE&1(>09a*jF`7w}uZUhrY%hyh zRAvZ&T^q4rUi@AD`6=#)R(h1c0l|)hWZ{(H{lQ=7F(3aV_+#l>-yrJN`2<}%V~3qn z{wecje;7R`JIqucr`9sdwaL%1iOE|nv@kiy5soB%;uJx39qL=q{=)DqE|b0o6NWEl^q`1;s+r}F`TlF(yt zx-vzj6Prn6PG@)^z1+X@5ShmXSE$ zyyVC^OcsyJLvWPALYOF*j&N}=48f#cI9JAFFbSMF3`(rh=`odzFhK!uDhY5_l%V>;BVLaPInXu?G4R4;~EV>%W- zNCps#nd%e(nB^cBexR1X^lGg{txge8Od-K0&p~whGv%BDMdn|2Bm*w-OASn}UzY z`cu$hMglj-39$NAvLsBUAi(q(DA%`g@=r)C-j&42*$t za5|5}`+JAB4Z8jJ-WPo443=A(Y3u%MHaDX!q?_c>EIE%k>3mE>e$$Rnpfvyj9 zy%z)TW&EMKKG5}E47``|hwA#j(PcOEI7O(yzo0bmu%wBd_bYhNvX+L12%$Ho_l^_0 zzX6g_8d1Csg6zkeE(@rja3T=e=*3|{Hg|0uog8M?EwNq?L=>^mUlMovaU<#oLAI8M rzI>VHJ-ciD(QyTk=0Nl)2&y?!s~9n|)MZONu!h7zbA;sq3v>PhNB9(o literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/water_vapor-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/water_vapor-1.png new file mode 100644 index 0000000000000000000000000000000000000000..2f7fc54a31d9ae8803959f49eb998bd39f8d1e00 GIT binary patch literal 329 zcmV-P0k-~$P)Zg8Od%pIp`ou*Qc^E3IAdU7^Yin_$j^FobbyoiA^-pY0d!JMQvg8b*k%9#0M+qf#2fGeNZfbeJxL3Q z>=ovlzk~hTjQ#V1DVqVnz0V#-QC`wbIIi8I>KXu%g76^l(>;GkL9_$cBp#X-?u)rK zg>gSTVO)fEpw&+o zz=NO*vWkL`> b=x?0?Zn-{939AGM00000NkvXXu0mjfSCNUL literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/water_vapor.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/water_vapor.png new file mode 100644 index 0000000000000000000000000000000000000000..993c5ac4ff668b4d96f876ebaf3beab7c7c7fa91 GIT binary patch literal 483 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikd1AIbU6_s@L^(}aKB$5*ns!B?Nf`Z)LeG(IMJ3HqtT)6(kiSsva-u(Rj z{pZi0fja7!%YFb-{3Stt!T(VJ!<9QT76PR>3p^r=85sBugD~Uq{1qucN2qwZIEGmG zw@zxD)T+SYDkv^m{P+L)yWE*KU!1vTzL%>nyk*7z#jFa89vnK%;rL$p<04g?cYBKq zgyZEZSoSjn{%KU&X2opS#UYbq!<@r!!E`{{Qs4IFy=5TdhU3{nZVAXr}S}y zYnsUOjw2p(+$&g_mj0f>S(@jd=W}R^LXx81(F1XvkEw-6W zBE~vE)OdrGf$&=EfGE==OSW#?dm<`o_4L)-!nR4x&}aR`t+@8O@j6a{wk2G}IZL{x zs~f&!GF{=gPLU<*@hG zC-3)uUta(Y3L?)VP`?ej(^vs>YCt$1U1&gT#u79DCn<;a%>YE6PkdhkqX!uKI@Cyc zR%H2LOUk(y>Gnqf>oUZnWS Date: Thu, 2 May 2024 21:23:37 -0400 Subject: [PATCH 5/9] 05/02/2024 (#1327) Removed the Whiskey, as the Brigmed has more than enough Medbay space on every NFSD capital ship. Updated Shipyard files from Security to Nfsd. --- .../Shuttles/{Security => Nfsd}/cleric.yml | 0 .../Shuttles/{Security => Nfsd}/empress.yml | 0 .../Shuttles/{Security => Nfsd}/enforcer.yml | 0 .../Shuttles/{Security => Nfsd}/fighter.yml | 0 .../{Security => Nfsd}/hospitaller.yml | 0 .../{Security => Nfsd}/inquisitor.yml | 0 .../{Security => Nfsd}/interceptor.yml | 0 .../Shuttles/{Security => Nfsd}/marauder.yml | 0 .../{Security => Nfsd}/opportunity.yml | 0 .../Shuttles/{Security => Nfsd}/prowler.yml | 0 .../_NF/Shuttles/{Security => Nfsd}/rogue.yml | 0 .../Shuttles/{Security => Nfsd}/templar.yml | 0 .../Shuttles/{Security => Nfsd}/trident.yml | 0 .../_NF/Shuttles/{Security => Nfsd}/wasp.yml | 0 .../Shuttles/{Security => Nfsd}/whiskey.yml | 0 .../Shipyard/{Security => Nfsd}/cleric.yml | 4 +-- .../Shipyard/{Security => Nfsd}/empress.yml | 6 ++--- .../Shipyard/{Security => Nfsd}/enforcer.yml | 4 +-- .../Shipyard/{Security => Nfsd}/fighter.yml | 4 +-- .../{Security => Nfsd}/hospitaller.yml | 4 +-- .../{Security => Nfsd}/inquisitor.yml | 4 +-- .../{Security => Nfsd}/interceptor.yml | 4 +-- .../Shipyard/{Security => Nfsd}/marauder.yml | 4 +-- .../{Security => Nfsd}/opportunity.yml | 4 +-- .../Shipyard/{Security => Nfsd}/prowler.yml | 4 +-- .../_NF/Shipyard/{Security => Nfsd}/rogue.yml | 4 +-- .../Shipyard/{Security => Nfsd}/templar.yml | 4 +-- .../Shipyard/{Security => Nfsd}/trident.yml | 4 +-- .../_NF/Shipyard/{Security => Nfsd}/wasp.yml | 4 +-- .../Prototypes/_NF/Shipyard/Nfsd/whiskey.yml | 26 +++++++++++++++++++ .../_NF/Shipyard/Security/whiskey.yml | 26 ------------------- 31 files changed, 55 insertions(+), 55 deletions(-) rename Resources/Maps/_NF/Shuttles/{Security => Nfsd}/cleric.yml (100%) rename Resources/Maps/_NF/Shuttles/{Security => Nfsd}/empress.yml (100%) rename Resources/Maps/_NF/Shuttles/{Security => Nfsd}/enforcer.yml (100%) rename Resources/Maps/_NF/Shuttles/{Security => Nfsd}/fighter.yml (100%) rename Resources/Maps/_NF/Shuttles/{Security => Nfsd}/hospitaller.yml (100%) rename Resources/Maps/_NF/Shuttles/{Security => Nfsd}/inquisitor.yml (100%) rename Resources/Maps/_NF/Shuttles/{Security => Nfsd}/interceptor.yml (100%) rename Resources/Maps/_NF/Shuttles/{Security => Nfsd}/marauder.yml (100%) rename Resources/Maps/_NF/Shuttles/{Security => Nfsd}/opportunity.yml (100%) rename Resources/Maps/_NF/Shuttles/{Security => Nfsd}/prowler.yml (100%) rename Resources/Maps/_NF/Shuttles/{Security => Nfsd}/rogue.yml (100%) rename Resources/Maps/_NF/Shuttles/{Security => Nfsd}/templar.yml (100%) rename Resources/Maps/_NF/Shuttles/{Security => Nfsd}/trident.yml (100%) rename Resources/Maps/_NF/Shuttles/{Security => Nfsd}/wasp.yml (100%) rename Resources/Maps/_NF/Shuttles/{Security => Nfsd}/whiskey.yml (100%) rename Resources/Prototypes/_NF/Shipyard/{Security => Nfsd}/cleric.yml (87%) rename Resources/Prototypes/_NF/Shipyard/{Security => Nfsd}/empress.yml (82%) rename Resources/Prototypes/_NF/Shipyard/{Security => Nfsd}/enforcer.yml (86%) rename Resources/Prototypes/_NF/Shipyard/{Security => Nfsd}/fighter.yml (87%) rename Resources/Prototypes/_NF/Shipyard/{Security => Nfsd}/hospitaller.yml (85%) rename Resources/Prototypes/_NF/Shipyard/{Security => Nfsd}/inquisitor.yml (84%) rename Resources/Prototypes/_NF/Shipyard/{Security => Nfsd}/interceptor.yml (84%) rename Resources/Prototypes/_NF/Shipyard/{Security => Nfsd}/marauder.yml (86%) rename Resources/Prototypes/_NF/Shipyard/{Security => Nfsd}/opportunity.yml (87%) rename Resources/Prototypes/_NF/Shipyard/{Security => Nfsd}/prowler.yml (86%) rename Resources/Prototypes/_NF/Shipyard/{Security => Nfsd}/rogue.yml (87%) rename Resources/Prototypes/_NF/Shipyard/{Security => Nfsd}/templar.yml (85%) rename Resources/Prototypes/_NF/Shipyard/{Security => Nfsd}/trident.yml (86%) rename Resources/Prototypes/_NF/Shipyard/{Security => Nfsd}/wasp.yml (86%) create mode 100644 Resources/Prototypes/_NF/Shipyard/Nfsd/whiskey.yml delete mode 100644 Resources/Prototypes/_NF/Shipyard/Security/whiskey.yml diff --git a/Resources/Maps/_NF/Shuttles/Security/cleric.yml b/Resources/Maps/_NF/Shuttles/Nfsd/cleric.yml similarity index 100% rename from Resources/Maps/_NF/Shuttles/Security/cleric.yml rename to Resources/Maps/_NF/Shuttles/Nfsd/cleric.yml diff --git a/Resources/Maps/_NF/Shuttles/Security/empress.yml b/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml similarity index 100% rename from Resources/Maps/_NF/Shuttles/Security/empress.yml rename to Resources/Maps/_NF/Shuttles/Nfsd/empress.yml diff --git a/Resources/Maps/_NF/Shuttles/Security/enforcer.yml b/Resources/Maps/_NF/Shuttles/Nfsd/enforcer.yml similarity index 100% rename from Resources/Maps/_NF/Shuttles/Security/enforcer.yml rename to Resources/Maps/_NF/Shuttles/Nfsd/enforcer.yml diff --git a/Resources/Maps/_NF/Shuttles/Security/fighter.yml b/Resources/Maps/_NF/Shuttles/Nfsd/fighter.yml similarity index 100% rename from Resources/Maps/_NF/Shuttles/Security/fighter.yml rename to Resources/Maps/_NF/Shuttles/Nfsd/fighter.yml diff --git a/Resources/Maps/_NF/Shuttles/Security/hospitaller.yml b/Resources/Maps/_NF/Shuttles/Nfsd/hospitaller.yml similarity index 100% rename from Resources/Maps/_NF/Shuttles/Security/hospitaller.yml rename to Resources/Maps/_NF/Shuttles/Nfsd/hospitaller.yml diff --git a/Resources/Maps/_NF/Shuttles/Security/inquisitor.yml b/Resources/Maps/_NF/Shuttles/Nfsd/inquisitor.yml similarity index 100% rename from Resources/Maps/_NF/Shuttles/Security/inquisitor.yml rename to Resources/Maps/_NF/Shuttles/Nfsd/inquisitor.yml diff --git a/Resources/Maps/_NF/Shuttles/Security/interceptor.yml b/Resources/Maps/_NF/Shuttles/Nfsd/interceptor.yml similarity index 100% rename from Resources/Maps/_NF/Shuttles/Security/interceptor.yml rename to Resources/Maps/_NF/Shuttles/Nfsd/interceptor.yml diff --git a/Resources/Maps/_NF/Shuttles/Security/marauder.yml b/Resources/Maps/_NF/Shuttles/Nfsd/marauder.yml similarity index 100% rename from Resources/Maps/_NF/Shuttles/Security/marauder.yml rename to Resources/Maps/_NF/Shuttles/Nfsd/marauder.yml diff --git a/Resources/Maps/_NF/Shuttles/Security/opportunity.yml b/Resources/Maps/_NF/Shuttles/Nfsd/opportunity.yml similarity index 100% rename from Resources/Maps/_NF/Shuttles/Security/opportunity.yml rename to Resources/Maps/_NF/Shuttles/Nfsd/opportunity.yml diff --git a/Resources/Maps/_NF/Shuttles/Security/prowler.yml b/Resources/Maps/_NF/Shuttles/Nfsd/prowler.yml similarity index 100% rename from Resources/Maps/_NF/Shuttles/Security/prowler.yml rename to Resources/Maps/_NF/Shuttles/Nfsd/prowler.yml diff --git a/Resources/Maps/_NF/Shuttles/Security/rogue.yml b/Resources/Maps/_NF/Shuttles/Nfsd/rogue.yml similarity index 100% rename from Resources/Maps/_NF/Shuttles/Security/rogue.yml rename to Resources/Maps/_NF/Shuttles/Nfsd/rogue.yml diff --git a/Resources/Maps/_NF/Shuttles/Security/templar.yml b/Resources/Maps/_NF/Shuttles/Nfsd/templar.yml similarity index 100% rename from Resources/Maps/_NF/Shuttles/Security/templar.yml rename to Resources/Maps/_NF/Shuttles/Nfsd/templar.yml diff --git a/Resources/Maps/_NF/Shuttles/Security/trident.yml b/Resources/Maps/_NF/Shuttles/Nfsd/trident.yml similarity index 100% rename from Resources/Maps/_NF/Shuttles/Security/trident.yml rename to Resources/Maps/_NF/Shuttles/Nfsd/trident.yml diff --git a/Resources/Maps/_NF/Shuttles/Security/wasp.yml b/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml similarity index 100% rename from Resources/Maps/_NF/Shuttles/Security/wasp.yml rename to Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml diff --git a/Resources/Maps/_NF/Shuttles/Security/whiskey.yml b/Resources/Maps/_NF/Shuttles/Nfsd/whiskey.yml similarity index 100% rename from Resources/Maps/_NF/Shuttles/Security/whiskey.yml rename to Resources/Maps/_NF/Shuttles/Nfsd/whiskey.yml diff --git a/Resources/Prototypes/_NF/Shipyard/Security/cleric.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/cleric.yml similarity index 87% rename from Resources/Prototypes/_NF/Shipyard/Security/cleric.yml rename to Resources/Prototypes/_NF/Shipyard/Nfsd/cleric.yml index 9c9a2488ff3..8624447b653 100644 --- a/Resources/Prototypes/_NF/Shipyard/Security/cleric.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/cleric.yml @@ -6,12 +6,12 @@ category: Small group: None mapchecker_group_override: Security # Treat this as a security vessel for mapchecker purposes - shuttlePath: /Maps/_NF/Shuttles/Security/cleric.yml + shuttlePath: /Maps/_NF/Shuttles/Nfsd/cleric.yml - type: gameMap id: Cleric mapName: 'NSF Cleric' - mapPath: /Maps/_NF/Shuttles/Security/cleric.yml + mapPath: /Maps/_NF/Shuttles/Nfsd/cleric.yml minPlayers: 0 stations: Cleric: diff --git a/Resources/Prototypes/_NF/Shipyard/Security/empress.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml similarity index 82% rename from Resources/Prototypes/_NF/Shipyard/Security/empress.yml rename to Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml index 23ea5ea0eda..65ceeca721b 100644 --- a/Resources/Prototypes/_NF/Shipyard/Security/empress.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml @@ -1,16 +1,16 @@ - type: vessel id: Empress name: NSF Empress - description: A large patrol vessel capable of carrying up to 3 smaller faster attack ships. the flagship vessel of security. + description: A large patrol vessel capable of carrying up to 3 smaller faster attack ships. the flagship vessel of the nfsd. price: 170000 #Appraisal value is 150000 category: Large group: Security - shuttlePath: /Maps/_NF/Shuttles/Security/empress.yml + shuttlePath: /Maps/_NF/Shuttles/Nfsd/empress.yml - type: gameMap id: Empress mapName: 'NSF Empress' - mapPath: /Maps/_NF/Shuttles/Security/empress.yml + mapPath: /Maps/_NF/Shuttles/Nfsd/empress.yml minPlayers: 0 stations: Empress: diff --git a/Resources/Prototypes/_NF/Shipyard/Security/enforcer.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/enforcer.yml similarity index 86% rename from Resources/Prototypes/_NF/Shipyard/Security/enforcer.yml rename to Resources/Prototypes/_NF/Shipyard/Nfsd/enforcer.yml index 455ea28a6a2..20bbcf0c2e3 100644 --- a/Resources/Prototypes/_NF/Shipyard/Security/enforcer.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/enforcer.yml @@ -5,12 +5,12 @@ # price: 21350 # category: Small # group: Security - # shuttlePath: /Maps/_NF/Shuttles/Security/enforcer.yml + # shuttlePath: /Maps/_NF/Shuttles/Nfsd/enforcer.yml # - type: gameMap # id: Enforcer # mapName: 'NSF Enforcer' - # mapPath: /Maps/_NF/Shuttles/Security/enforcer.yml + # mapPath: /Maps/_NF/Shuttles/Nfsd/enforcer.yml # minPlayers: 0 # stations: # Enforcer: diff --git a/Resources/Prototypes/_NF/Shipyard/Security/fighter.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/fighter.yml similarity index 87% rename from Resources/Prototypes/_NF/Shipyard/Security/fighter.yml rename to Resources/Prototypes/_NF/Shipyard/Nfsd/fighter.yml index 1763ac0bf41..b5f09a9584a 100644 --- a/Resources/Prototypes/_NF/Shipyard/Security/fighter.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/fighter.yml @@ -6,12 +6,12 @@ category: Small group: None mapchecker_group_override: Security # Treat this as a security vessel for mapchecker purposes - shuttlePath: /Maps/_NF/Shuttles/Security/fighter.yml + shuttlePath: /Maps/_NF/Shuttles/Nfsd/fighter.yml - type: gameMap id: Fighter mapName: 'NSF Fighter' - mapPath: /Maps/_NF/Shuttles/Security/fighter.yml + mapPath: /Maps/_NF/Shuttles/Nfsd/fighter.yml minPlayers: 0 stations: Fighter: diff --git a/Resources/Prototypes/_NF/Shipyard/Security/hospitaller.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/hospitaller.yml similarity index 85% rename from Resources/Prototypes/_NF/Shipyard/Security/hospitaller.yml rename to Resources/Prototypes/_NF/Shipyard/Nfsd/hospitaller.yml index 154cfad9122..9140d00ed68 100644 --- a/Resources/Prototypes/_NF/Shipyard/Security/hospitaller.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/hospitaller.yml @@ -5,12 +5,12 @@ price: 28220 category: Small group: Security - shuttlePath: /Maps/_NF/Shuttles/Security/hospitaller.yml + shuttlePath: /Maps/_NF/Shuttles/Nfsd/hospitaller.yml - type: gameMap id: Hospitaller mapName: 'NSF Hospitaller' - mapPath: /Maps/_NF/Shuttles/Security/hospitaller.yml + mapPath: /Maps/_NF/Shuttles/Nfsd/hospitaller.yml minPlayers: 0 stations: Hospitaller: diff --git a/Resources/Prototypes/_NF/Shipyard/Security/inquisitor.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/inquisitor.yml similarity index 84% rename from Resources/Prototypes/_NF/Shipyard/Security/inquisitor.yml rename to Resources/Prototypes/_NF/Shipyard/Nfsd/inquisitor.yml index d0d3dbda15e..b74d7ea1b53 100644 --- a/Resources/Prototypes/_NF/Shipyard/Security/inquisitor.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/inquisitor.yml @@ -5,12 +5,12 @@ price: 29000 category: Small group: Security - shuttlePath: /Maps/_NF/Shuttles/Security/inquisitor.yml + shuttlePath: /Maps/_NF/Shuttles/Nfsd/inquisitor.yml - type: gameMap id: Inquisitor mapName: 'NSF Inquisitor' - mapPath: /Maps/_NF/Shuttles/Security/inquisitor.yml + mapPath: /Maps/_NF/Shuttles/Nfsd/inquisitor.yml minPlayers: 0 stations: Inquisitor: diff --git a/Resources/Prototypes/_NF/Shipyard/Security/interceptor.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/interceptor.yml similarity index 84% rename from Resources/Prototypes/_NF/Shipyard/Security/interceptor.yml rename to Resources/Prototypes/_NF/Shipyard/Nfsd/interceptor.yml index 851af76029c..db925fb3009 100644 --- a/Resources/Prototypes/_NF/Shipyard/Security/interceptor.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/interceptor.yml @@ -5,12 +5,12 @@ price: 21350 category: Small group: Security - shuttlePath: /Maps/_NF/Shuttles/Security/interceptor.yml + shuttlePath: /Maps/_NF/Shuttles/Nfsd/interceptor.yml - type: gameMap id: Interceptor mapName: 'NSF Interceptor' - mapPath: /Maps/_NF/Shuttles/Security/interceptor.yml + mapPath: /Maps/_NF/Shuttles/Nfsd/interceptor.yml minPlayers: 0 stations: Interceptor: diff --git a/Resources/Prototypes/_NF/Shipyard/Security/marauder.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/marauder.yml similarity index 86% rename from Resources/Prototypes/_NF/Shipyard/Security/marauder.yml rename to Resources/Prototypes/_NF/Shipyard/Nfsd/marauder.yml index f185e49325d..76041bbd1fd 100644 --- a/Resources/Prototypes/_NF/Shipyard/Security/marauder.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/marauder.yml @@ -5,12 +5,12 @@ price: 111550 category: Large group: Security - shuttlePath: /Maps/_NF/Shuttles/Security/marauder.yml + shuttlePath: /Maps/_NF/Shuttles/Nfsd/marauder.yml - type: gameMap id: Marauder mapName: 'NSF Marauder' - mapPath: /Maps/_NF/Shuttles/Security/marauder.yml + mapPath: /Maps/_NF/Shuttles/Nfsd/marauder.yml minPlayers: 0 stations: Marauder: diff --git a/Resources/Prototypes/_NF/Shipyard/Security/opportunity.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/opportunity.yml similarity index 87% rename from Resources/Prototypes/_NF/Shipyard/Security/opportunity.yml rename to Resources/Prototypes/_NF/Shipyard/Nfsd/opportunity.yml index d4437f1c2bf..dcb6086fe75 100644 --- a/Resources/Prototypes/_NF/Shipyard/Security/opportunity.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/opportunity.yml @@ -5,12 +5,12 @@ # price: 70000 # category: Medium # group: Security - # shuttlePath: /Maps/_NF/Shuttles/Security/opportunity.yml + # shuttlePath: /Maps/_NF/Shuttles/Nfsd/opportunity.yml # - type: gameMap # id: Opportunity # mapName: 'NSF Opportunity' - # mapPath: /Maps/_NF/Shuttles/Security/opportunity.yml + # mapPath: /Maps/_NF/Shuttles/Nfsd/opportunity.yml # minPlayers: 0 # stations: # Opportunity: diff --git a/Resources/Prototypes/_NF/Shipyard/Security/prowler.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/prowler.yml similarity index 86% rename from Resources/Prototypes/_NF/Shipyard/Security/prowler.yml rename to Resources/Prototypes/_NF/Shipyard/Nfsd/prowler.yml index 3d5a070749c..6bfe750ee4c 100644 --- a/Resources/Prototypes/_NF/Shipyard/Security/prowler.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/prowler.yml @@ -5,12 +5,12 @@ price: 49220 category: Medium group: Security - shuttlePath: /Maps/_NF/Shuttles/Security/prowler.yml + shuttlePath: /Maps/_NF/Shuttles/Nfsd/prowler.yml - type: gameMap id: Prowler mapName: 'NSF Prowler' - mapPath: /Maps/_NF/Shuttles/Security/prowler.yml + mapPath: /Maps/_NF/Shuttles/Nfsd/prowler.yml minPlayers: 0 stations: Prowler: diff --git a/Resources/Prototypes/_NF/Shipyard/Security/rogue.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/rogue.yml similarity index 87% rename from Resources/Prototypes/_NF/Shipyard/Security/rogue.yml rename to Resources/Prototypes/_NF/Shipyard/Nfsd/rogue.yml index 60b9fb9a401..c7e5c337fa8 100644 --- a/Resources/Prototypes/_NF/Shipyard/Security/rogue.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/rogue.yml @@ -6,12 +6,12 @@ category: Small group: None mapchecker_group_override: Security # Treat this as a security vessel for mapchecker purposes - shuttlePath: /Maps/_NF/Shuttles/Security/rogue.yml + shuttlePath: /Maps/_NF/Shuttles/Nfsd/rogue.yml - type: gameMap id: Rogue mapName: 'NSF Rogue' - mapPath: /Maps/_NF/Shuttles/Security/rogue.yml + mapPath: /Maps/_NF/Shuttles/Nfsd/rogue.yml minPlayers: 0 stations: Rogue: diff --git a/Resources/Prototypes/_NF/Shipyard/Security/templar.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/templar.yml similarity index 85% rename from Resources/Prototypes/_NF/Shipyard/Security/templar.yml rename to Resources/Prototypes/_NF/Shipyard/Nfsd/templar.yml index b339915e099..3321cf8ad3f 100644 --- a/Resources/Prototypes/_NF/Shipyard/Security/templar.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/templar.yml @@ -5,12 +5,12 @@ price: 24220 category: Small group: Security - shuttlePath: /Maps/_NF/Shuttles/Security/templar.yml + shuttlePath: /Maps/_NF/Shuttles/Nfsd/templar.yml - type: gameMap id: Templar mapName: 'NSF Templar' - mapPath: /Maps/_NF/Shuttles/Security/templar.yml + mapPath: /Maps/_NF/Shuttles/Nfsd/templar.yml minPlayers: 0 stations: Templar: diff --git a/Resources/Prototypes/_NF/Shipyard/Security/trident.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/trident.yml similarity index 86% rename from Resources/Prototypes/_NF/Shipyard/Security/trident.yml rename to Resources/Prototypes/_NF/Shipyard/Nfsd/trident.yml index be8f24929c9..d1f336ccd17 100644 --- a/Resources/Prototypes/_NF/Shipyard/Security/trident.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/trident.yml @@ -5,12 +5,12 @@ # price: 49300 # category: Medium # group: Security - # shuttlePath: /Maps/_NF/Shuttles/Security/trident.yml + # shuttlePath: /Maps/_NF/Shuttles/Nfsd/trident.yml # - type: gameMap # id: Trident # mapName: 'NSF Trident' - # mapPath: /Maps/_NF/Shuttles/Security/trident.yml + # mapPath: /Maps/_NF/Shuttles/Nfsd/trident.yml # minPlayers: 0 # stations: # Trident: diff --git a/Resources/Prototypes/_NF/Shipyard/Security/wasp.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/wasp.yml similarity index 86% rename from Resources/Prototypes/_NF/Shipyard/Security/wasp.yml rename to Resources/Prototypes/_NF/Shipyard/Nfsd/wasp.yml index 33c723de7dc..23c663dfbed 100644 --- a/Resources/Prototypes/_NF/Shipyard/Security/wasp.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/wasp.yml @@ -5,12 +5,12 @@ price: 135000 category: Large group: Security - shuttlePath: /Maps/_NF/Shuttles/Security/wasp.yml + shuttlePath: /Maps/_NF/Shuttles/Nfsd/wasp.yml - type: gameMap id: Wasp mapName: 'NSF Wasp' - mapPath: /Maps/_NF/Shuttles/Security/wasp.yml + mapPath: /Maps/_NF/Shuttles/Nfsd/wasp.yml minPlayers: 0 stations: Wasp: diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/whiskey.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/whiskey.yml new file mode 100644 index 00000000000..f2a7363cc6b --- /dev/null +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/whiskey.yml @@ -0,0 +1,26 @@ +# - type: vessel +# id: Whiskey +# name: NSF Whiskey +# description: A heavy duty NSFD rescue ship, suited for one to two brigmedics and a pilot. +# price: 55000 +# category: Medium +# group: Security +# shuttlePath: /Maps/_NF/Shuttles/Nfsd/whiskey.yml + +# - type: gameMap +# id: Whiskey +# mapName: 'NSF Whiskey' +# mapPath: /Maps/_NF/Shuttles/Nfsd/whiskey.yml +# minPlayers: 0 +# stations: +# Whiskey: +# stationProto: StandardFrontierVessel +# components: +# - type: StationNameSetup +# mapNameTemplate: 'Whiskey {1}' +# nameGenerator: +# !type:NanotrasenNameGenerator +# prefixCreator: '14' +# - type: StationJobs +# overflowJobs: [] +# availableJobs: {} \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Shipyard/Security/whiskey.yml b/Resources/Prototypes/_NF/Shipyard/Security/whiskey.yml deleted file mode 100644 index 8c303e79e9c..00000000000 --- a/Resources/Prototypes/_NF/Shipyard/Security/whiskey.yml +++ /dev/null @@ -1,26 +0,0 @@ -- type: vessel - id: Whiskey - name: NSF Whiskey - description: A heavy duty NSFD rescue ship, suited for one to two brigmedics and a pilot. - price: 55000 - category: Medium - group: Security - shuttlePath: /Maps/_NF/Shuttles/Security/whiskey.yml - -- type: gameMap - id: Whiskey - mapName: 'NSF Whiskey' - mapPath: /Maps/_NF/Shuttles/Security/whiskey.yml - minPlayers: 0 - stations: - Whiskey: - stationProto: StandardFrontierVessel - components: - - type: StationNameSetup - mapNameTemplate: 'Whiskey {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: '14' - - type: StationJobs - overflowJobs: [] - availableJobs: {} \ No newline at end of file From 5a34577e0d8d87eb920b362b4aee6c19cc56d573 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Fri, 3 May 2024 13:17:09 +0300 Subject: [PATCH 6/9] Update labeler.yml (#1328) * Update labeler.yml * Apply suggestions from code review Co-authored-by: whatston3 <166147148+whatston3@users.noreply.github.com> --------- Co-authored-by: whatston3 <166147148+whatston3@users.noreply.github.com> --- .github/labeler.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index d4029285b52..85129b003b0 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -2,25 +2,25 @@ # - "Resources/Maps/**/*.yml" # All .yml files in the Resources/Maps directory, recursive. "Map-Admin": - - "Resources/Maps/_NF/Admin/*.yml" # Grid Files + - "Resources/Maps/_NF/Admin/**/*.yml" # Grid Files "Map-Bluespace": - - "Resources/Maps/_NF/Bluespace/*.yml" # Grid Files + - "Resources/Maps/_NF/Bluespace/**/*.yml" # Grid Files "Map-Dungeon": - - "Resources/Maps/_NF/Dungeon/*.yml" # Grid Files + - "Resources/Maps/_NF/Dungeon/**/*.yml" # Grid Files "Map-Outpost": - "Resources/Maps/_NF/Outpost/*.yml" # Map Files - "Resources/Prototypes/_MF/Maps/Outpost/*.yml" # Prototypes Files "Map-Shuttle": - - "Resources/Maps/_NF/Shuttles/*.yml" # Grid Files - - "Resources/Prototypes/_NF/Shipyard/*.yml" # Prototypes Files + - "Resources/Maps/_NF/Shuttles/**/*.yml" # Grid Files + - "Resources/Prototypes/_NF/Shipyard/**/*.yml" # Prototypes Files "Map-POI": - - "Resources/Maps/_NF/POI/*.yml" # Grid Files - - "Resources/Prototypes/_MF/Maps/POI/*.yml" # Prototypes Files + - "Resources/Maps/_NF/POI/**/*.yml" # Grid Files + - "Resources/Prototypes/_MF/Maps/POI/**/*.yml" # Prototypes Files "Sprites": - "**/*.rsi/*.png" From bfee5627062cd0291d0215275d71db8116f650f1 Mon Sep 17 00:00:00 2001 From: Wolfking6116 <31782778+Wolfking6116@users.noreply.github.com> Date: Fri, 3 May 2024 07:04:14 -0400 Subject: [PATCH 7/9] Refinement process follow-up (#1144) * added new science books to R&D lockers for hints * silly meal * removed funny food, too much distraction * customised icons from merge * Book Pool * Update bookshelf.yml --------- Co-authored-by: Wolfking6116 Co-authored-by: Dvir --- .../en-US/_NF/paper/book-authorbooks.ftl | 153 ++++++++++++++++++ .../Catalog/Fills/Books/bookshelf.yml | 12 ++ .../Entities/Objects/Misc/books_author.yml | 71 ++++++++ 3 files changed, 236 insertions(+) create mode 100644 Resources/Locale/en-US/_NF/paper/book-authorbooks.ftl create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Misc/books_author.yml diff --git a/Resources/Locale/en-US/_NF/paper/book-authorbooks.ftl b/Resources/Locale/en-US/_NF/paper/book-authorbooks.ftl new file mode 100644 index 00000000000..92ac51e679a --- /dev/null +++ b/Resources/Locale/en-US/_NF/paper/book-authorbooks.ftl @@ -0,0 +1,153 @@ +book-text-academia-volumeone = Scientific Academia Vol.I + + Title: Scientific Academia Vol.I + + Author: Bertle "Book" Bartleby + + Introduction + + Congratulations on recieving your honourary starters guide to the Scientific Method on the Frontier. In this three hundred and forty seven page thesis I will explain... (Oh, it seems someone has torn out the rest of the pages.) + +book-text-science-philospher = Cooking with the Philospher's Stone + + Section: Mystical Culinary Delights + + 1. Starmetal Elixir + + Ingredients: + + 1 tsp ground Starmetal + 1 cup hot water + 1 tbsp honey + 2 slices of lemon + Instructions: + + In a small pot, bring the water to a gentle boil. + Add the ground Starmetal and let it simmer for 5 minutes. + Remove from heat and strain the mixture into a cup. + Add honey and lemon slices for taste. + Enjoy the elixir warm, ideal for enhancing magical focus. + + 2. Dragon's Blood Stew + + Ingredients: + + 1 lb diced meat (your choice) + 2 tbsp Dragon's Blood resin (crushed) + 1 onion, chopped + 2 carrots, chopped + 2 potatoes, chopped + 4 cups beef or vegetable broth + Salt and pepper to taste + 1 tsp thyme + Instructions: + + In a large pot, brown the meat over medium heat. + Add the onions and cook until translucent. + Add the Dragon's Blood resin, carrots, potatoes, broth, salt, pepper, and thyme. + Bring to a boil, then reduce heat and simmer for 1 hour, or until the meat is tender. + Serve hot, perfect for a hearty meal after a long quest. + + 3. Starmetal and Dragon's Blood Tea + + Ingredients: + + 1 tsp ground Starmetal + 1 tsp Dragon's Blood resin (crushed) + 1 cup boiling water + Honey or sugar to taste + Instructions: + + In a teapot or cup, combine the ground Starmetal and crushed Dragon's Blood resin. + Pour boiling water over the mixture and let it steep for 5 minutes. + Strain the tea into a cup and add honey or sugar to taste. + Enjoy this mystical blend for a magical boost in energy. + +book-text-science-dwarven = Dwarven Guide to Free Thinking + + Title: Dwarven Guide to Free Thinking + + Author: Grimbald Stoneheart + + Introduction + + Welcome, dear reader, to a journey unlike any other. I am Grimbald Stoneheart, a dwarf who has delved deep into the mines of knowledge and emerged with precious gems of wisdom. In this guide, I will share with you the secrets of opening one's mind, with a special focus on the potent substance known as Nåzomvim. Prepare to embark on a journey that will expand your horizons and challenge your perceptions. + + Chapter 1: Understanding Nåzomvim + + Nåzomvim, a rare and powerful substance, is extracted from the mystical Nåzom Tatlosh. A fish found in the depths of underground lakes. Revered for its mind-expanding properties, it is a key to unlocking the doors of perception. However, it must be approached with respect and caution, for its potency is not to be underestimated. + + Chapter 2: Preparing the Mind + + Before one can fully embrace the effects of Nåzomvim, it is essential to prepare the mind. This involves practices such as meditation, deep breathing, and visualization. These techniques help to clear the mind of clutter and create a receptive state for the transformative experience ahead. + + Chapter 3: The Ritual of Consumption + + The consumption of Nåzomvim is a sacred ritual. It should be done in a quiet, comfortable space, free from distractions. A small dose is all that is needed to begin the journey. As the Nåzomvim takes effect, one may feel a sense of euphoria, followed by a profound opening of the mind. + + Chapter 4: Navigating the Expanded Mind + + With the mind open, you will experience thoughts and ideas flowing freely, unbound by the constraints of conventional thinking. It is a time to explore, to question, and to discover. Keep a journal nearby to record your insights and revelations, for they may prove invaluable. + + Chapter 5: Integration and Reflection + + After the effects of Nåzomvim have subsided, it is crucial to take time for integration and reflection. This is when the true value of the experience is realized. Reflect on what you have learned and how it can be applied to your life. The goal is not just to think freely but to live freely as well. + + Conclusion + + The journey of opening one's mind is a lifelong quest, and Nåzomvim is but one tool in the vast arsenal of knowledge. Embrace the lessons learned, and continue to seek out new experiences and perspectives. Remember, the mind is like a forge; it must be constantly tended and fueled to produce the finest creations. + + May your mind be as open as the halls of our ancestors, and may your thoughts flow as freely as the mountain streams. + + With wisdom and respect, + Grimbald Stoneheart + +book-text-science-clown = Honker's Hilarious Tight-Five + + Title: Honker's Hilarious Tight-Five + + Setting: A small, dimly lit stage on a spaceship. A spotlight shines on a microphone stand at the center. The audience, consisting of various aliens and humans, is buzzing with anticipation. Suddenly, the lights dim, and a spotlight illuminates Honker, the space clown, who bounces onto the stage wearing a bright, mismatched outfit with oversized shoes and a red nose that honks. + + Honker: (Waving) Hey there, galaxy gang! It's me, Honker, your favorite space clown! (Honks nose) Ready to blast off into some laughs? + + Audience: (Applause and cheers) + + Honker: So, I was floating around the Milky Way the other day, and I bumped into an asteroid. I said, "Hey, watch where you're going!" And the asteroid said, "I've been here for millions of years, where have you been?" I said, "Stuck in traffic on Mars, where else?" (Honks nose) + + Audience: (Laughter) + + Honker: Speaking of Mars, you ever notice how Martians never laugh? I asked one why, and he said, "We don't have a sense of humor. It's not in our atmosphere." So I gave him a balloon animal, and guess what? It floated away! (Mimics balloon floating away) Guess their sense of humor isn't the only thing that's light! (Honks nose) + + Audience: (More laughter) + + Honker: And what's the deal with space food? I ordered a pizza on the moon, and it took light-years to arrive! When it finally got there, I was like, "This is cold!" And the delivery guy said, "What did you expect? It's a cheese moon!" (Shrugs) At least it was crater-free! (Honks nose) + + Audience: (Laughing) + + Honker: You know, I tried to start a band with some aliens. We called ourselves "The Cosmic Jokers." But we had to break up. Turns out, a black hole can't play drums, and a supernova is terrible at keeping time. The only thing we were good at was causing a big bang! (Honks nose) + + Audience: (Laughter and applause) + + Honker: (Bowing) Thank you, thank you! You've been a stellar audience! Remember, in space, no one can hear you scream, but everyone can hear you laugh! Keep smiling, and may your stars always shine bright! (Honks nose one last time) + + Audience: (Applause and cheers as Honker takes a bow and exits the stage) + + Honker: (Bouncing back into the spotlight) Oh, I almost forgot to tell ya about the time I tried to inject an asteroid with laughter! (Pauses for effect) You see, I thought, if I could just get this space rock to crack up, maybe we'd get along better. + + Audience: (Curious murmuring) + + Honker: So, there I am, floating up to this giant rock with a giant syringe filled with pure, concentrated laughter. (Mimics holding a large syringe) I push in the plunger, and you know what happened? + + Audience: (Leans in) What? + + Honker: It started giggling! A little chuckle at first, then a full-on belly laugh! (Imitates asteroid laughing) Turns out, all it needed was a good joke! So I asked, "Why did the astronaut break up with the planet?" "Because it needed space!" + + Audience: (Laughter) + + Honker: And just like that, we were on a rock 'n' roll! Literally, that asteroid laughed so hard, it changed its orbit! Now, whenever it passes by, it gives a little chuckle. Reminding us all, even the stoniest faces in the universe can crack a smile! + + Audience: (Laughter and applause) + + Honker: (Bows) Thank you, thank you! Remember, laughter's the best medicine, even for asteroids! Keep spreading those smiles, and let's make the universe a happier place, one rock at a time! (Honks nose) + + Audience: (Cheers and applause as Honker exits the stage) diff --git a/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml b/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml index b52e8530085..19277a81b1b 100644 --- a/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml +++ b/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml @@ -125,3 +125,15 @@ - id: BookInspiration prob: 0.1 orGroup: BookAuthor + - id: BookScienceTextbook # Frontier + prob: 0.1 # Frontier + orGroup: BookAuthor # Frontier + - id: BookSciencePhilospher # Frontier + prob: 0.1 # Frontier + orGroup: BookAuthor # Frontier + - id: BookScienceDwarven # Frontier + prob: 0.1 # Frontier + orGroup: BookAuthor # Frontier + - id: BookScienceClown # Frontier + prob: 0.1 # Frontier + orGroup: BookAuthor # Frontier diff --git a/Resources/Prototypes/_NF/Entities/Objects/Misc/books_author.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/books_author.yml new file mode 100644 index 00000000000..9b73fd8fc68 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Misc/books_author.yml @@ -0,0 +1,71 @@ +- type: entity + parent: BookBase + id: BookScienceTextbook + name: scientific academia vol.i + description: Volume One of the Science Textbook series. + components: + - type: Sprite + sprite: Objects/Misc/books.rsi + layers: + - state: paper + - state: cover_strong + color: "#542485" + - state: decor_wingette_circle + color: "#be69f0" + - state: icon_dna + - type: Paper + content: book-text-academia-volumeone + +- type: entity + parent: BookScienceTextbook + id: BookSciencePhilospher + name: cooking with the philospher's stone + description: A CentCom issued mixologist's book? All in the name of science, I guess. + components: + - type: Sprite + sprite: Objects/Misc/books.rsi + layers: + - state: paper + - state: cover_base + color: "#542485" + - state: decor_wingette_circle + color: "#be69f0" + - state: icon_bar + - type: Paper + content: book-text-science-philospher + +- type: entity + parent: BookScienceTextbook + id: BookScienceDwarven + name: dwarven guide to free thinking + description: A CentCom issued account of a fisherman's journey. They really expect you to read this? + components: + - type: Sprite + sprite: Objects/Misc/books.rsi + layers: + - state: paper + - state: cover_base + color: "#542485" + - state: decor_wingette_circle + color: "#be69f0" + - state: icon_fish + - type: Paper + content: book-text-science-dwarven + +- type: entity + parent: BookScienceTextbook + id: BookScienceClown + name: honker's hilarious tight-five + description: A CentCom issued Standup Comedy Script..? This is getting ridiculous! + components: + - type: Sprite + sprite: Objects/Misc/books.rsi + layers: + - state: paper + - state: cover_base + color: "#542485" + - state: decor_wingette_circle + color: "#be69f0" + - state: icon_banana + - type: Paper + content: book-text-science-clown From 7ae96445ce443ec7655144ae655b83b626df7bed Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Fri, 3 May 2024 11:04:41 +0000 Subject: [PATCH 8/9] Automatic Changelog (#1144) --- Resources/Changelog/Changelog.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index e7f7d050ab3..df749b83b1d 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -4493,3 +4493,12 @@ Entries: message: Added felinids/goblins/vulps to hoverbike built-in storage blacklist. id: 4970 time: '2024-05-03T00:27:37.0000000+00:00' +- author: Wolfking6116 + changes: + - type: Add + message: >- + CentCom has sent out some educational texts about Artifexium Refinement + to be included in a Research Director's Standard Kit across the Frontier + Sector. + id: 4971 + time: '2024-05-03T11:04:14.0000000+00:00' From 95a192807d122cc0c6555e571027018079820a97 Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Fri, 3 May 2024 16:21:52 +0300 Subject: [PATCH 9/9] Update empress.yml --- Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml index f7c1d297d8a..fa266144d43 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml @@ -1,14 +1,8 @@ - type: vessel id: Empress -<<<<<<< HEAD:Resources/Prototypes/_NF/Shipyard/Security/empress.yml name: NSF Императрица description: Крупногабаритный патрульшый шаттл ДСБФ. Рекомендованный состав команды 4-8 человек. - price: 170000 #Appraisal value is 173000 -======= - name: NSF Empress - description: A large patrol vessel capable of carrying up to 3 smaller faster attack ships. the flagship vessel of the nfsd. price: 170000 #Appraisal value is 150000 ->>>>>>> upstream/master:Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml category: Large group: Security shuttlePath: /Maps/_NF/Shuttles/Nfsd/empress.yml