From 7810572f5dd361eb6b44bd61d47814e76d394966 Mon Sep 17 00:00:00 2001 From: NightmareStalker <162575884+NightmareStalker@users.noreply.github.com> Date: Sat, 16 Nov 2024 21:40:20 +0700 Subject: [PATCH 01/32] Borderfloor Decals (#2232) --- .../Prototypes/SS220/Decals/borderfloor.yml | 387 ++++++++++++++++++ .../borderfloor_dark_corner_end_ne.png | Bin 0 -> 374 bytes .../borderfloor_dark_corner_end_nw.png | Bin 0 -> 375 bytes .../borderfloor_dark_corner_end_se.png | Bin 0 -> 339 bytes .../borderfloor_dark_corner_end_sw.png | Bin 0 -> 370 bytes .../borderfloor_dark_corner_ne.png | Bin 0 -> 292 bytes .../borderfloor_dark_corner_nw.png | Bin 0 -> 279 bytes .../borderfloor_dark_corner_se.png | Bin 0 -> 279 bytes .../borderfloor_dark_corner_sw.png | Bin 0 -> 291 bytes .../borderfloor.rsi/borderfloor_dark_e.png | Bin 0 -> 179 bytes .../borderfloor_dark_inner_ne.png | Bin 0 -> 252 bytes .../borderfloor_dark_inner_nw.png | Bin 0 -> 262 bytes .../borderfloor_dark_inner_se.png | Bin 0 -> 253 bytes .../borderfloor_dark_inner_sw.png | Bin 0 -> 264 bytes .../borderfloor.rsi/borderfloor_dark_n.png | Bin 0 -> 167 bytes .../borderfloor.rsi/borderfloor_dark_s.png | Bin 0 -> 169 bytes .../borderfloor.rsi/borderfloor_dark_w.png | Bin 0 -> 184 bytes .../borderfloor_light_corner_end_ne.png | Bin 0 -> 391 bytes .../borderfloor_light_corner_end_nw.png | Bin 0 -> 386 bytes .../borderfloor_light_corner_end_se.png | Bin 0 -> 369 bytes .../borderfloor_light_corner_end_sw.png | Bin 0 -> 397 bytes .../borderfloor_light_corner_ne.png | Bin 0 -> 315 bytes .../borderfloor_light_corner_nw.png | Bin 0 -> 294 bytes .../borderfloor_light_corner_se.png | Bin 0 -> 305 bytes .../borderfloor_light_corner_sw.png | Bin 0 -> 309 bytes .../borderfloor.rsi/borderfloor_light_e.png | Bin 0 -> 181 bytes .../borderfloor_light_inner_ne.png | Bin 0 -> 279 bytes .../borderfloor_light_inner_nw.png | Bin 0 -> 273 bytes .../borderfloor_light_inner_se.png | Bin 0 -> 261 bytes .../borderfloor_light_inner_sw.png | Bin 0 -> 274 bytes .../borderfloor.rsi/borderfloor_light_n.png | Bin 0 -> 162 bytes .../borderfloor.rsi/borderfloor_light_s.png | Bin 0 -> 163 bytes .../borderfloor.rsi/borderfloor_light_w.png | Bin 0 -> 185 bytes .../borderfloor_normal_corner_end_ne.png | Bin 0 -> 381 bytes .../borderfloor_normal_corner_end_nw.png | Bin 0 -> 365 bytes .../borderfloor_normal_corner_end_se.png | Bin 0 -> 354 bytes .../borderfloor_normal_corner_end_sw.png | Bin 0 -> 366 bytes .../borderfloor_normal_corner_ne.png | Bin 0 -> 298 bytes .../borderfloor_normal_corner_nw.png | Bin 0 -> 282 bytes .../borderfloor_normal_corner_se.png | Bin 0 -> 288 bytes .../borderfloor_normal_corner_sw.png | Bin 0 -> 294 bytes .../borderfloor.rsi/borderfloor_normal_e.png | Bin 0 -> 178 bytes .../borderfloor_normal_inner_ne.png | Bin 0 -> 256 bytes .../borderfloor_normal_inner_nw.png | Bin 0 -> 256 bytes .../borderfloor_normal_inner_se.png | Bin 0 -> 260 bytes .../borderfloor_normal_inner_sw.png | Bin 0 -> 261 bytes .../borderfloor.rsi/borderfloor_normal_n.png | Bin 0 -> 165 bytes .../borderfloor.rsi/borderfloor_normal_s.png | Bin 0 -> 170 bytes .../borderfloor.rsi/borderfloor_normal_w.png | Bin 0 -> 181 bytes .../borderfloor_overlay_corner_end_ne.png | Bin 0 -> 191 bytes .../borderfloor_overlay_corner_end_nw.png | Bin 0 -> 198 bytes .../borderfloor_overlay_corner_end_se.png | Bin 0 -> 188 bytes .../borderfloor_overlay_corner_end_sw.png | Bin 0 -> 194 bytes .../borderfloor_overlay_corner_ne.png | Bin 0 -> 180 bytes .../borderfloor_overlay_corner_nw.png | Bin 0 -> 189 bytes .../borderfloor_overlay_corner_se.png | Bin 0 -> 182 bytes .../borderfloor_overlay_corner_sw.png | Bin 0 -> 194 bytes .../borderfloor.rsi/borderfloor_overlay_e.png | Bin 0 -> 133 bytes .../borderfloor_overlay_inner_ne.png | Bin 0 -> 139 bytes .../borderfloor_overlay_inner_nw.png | Bin 0 -> 143 bytes .../borderfloor_overlay_inner_se.png | Bin 0 -> 142 bytes .../borderfloor_overlay_inner_sw.png | Bin 0 -> 147 bytes .../borderfloor.rsi/borderfloor_overlay_n.png | Bin 0 -> 126 bytes .../borderfloor.rsi/borderfloor_overlay_s.png | Bin 0 -> 129 bytes .../borderfloor.rsi/borderfloor_overlay_w.png | Bin 0 -> 142 bytes .../SS220/Decals/borderfloor.rsi/meta.json | 203 +++++++++ 66 files changed, 590 insertions(+) create mode 100644 Resources/Prototypes/SS220/Decals/borderfloor.yml create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_dark_corner_end_ne.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_dark_corner_end_nw.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_dark_corner_end_se.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_dark_corner_end_sw.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_dark_corner_ne.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_dark_corner_nw.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_dark_corner_se.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_dark_corner_sw.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_dark_e.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_dark_inner_ne.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_dark_inner_nw.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_dark_inner_se.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_dark_inner_sw.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_dark_n.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_dark_s.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_dark_w.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_corner_end_ne.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_corner_end_nw.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_corner_end_se.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_corner_end_sw.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_corner_ne.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_corner_nw.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_corner_se.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_corner_sw.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_e.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_inner_ne.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_inner_nw.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_inner_se.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_inner_sw.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_n.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_s.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_w.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_normal_corner_end_ne.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_normal_corner_end_nw.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_normal_corner_end_se.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_normal_corner_end_sw.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_normal_corner_ne.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_normal_corner_nw.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_normal_corner_se.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_normal_corner_sw.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_normal_e.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_normal_inner_ne.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_normal_inner_nw.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_normal_inner_se.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_normal_inner_sw.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_normal_n.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_normal_s.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_normal_w.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_overlay_corner_end_ne.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_overlay_corner_end_nw.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_overlay_corner_end_se.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_overlay_corner_end_sw.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_overlay_corner_ne.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_overlay_corner_nw.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_overlay_corner_se.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_overlay_corner_sw.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_overlay_e.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_overlay_inner_ne.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_overlay_inner_nw.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_overlay_inner_se.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_overlay_inner_sw.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_overlay_n.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_overlay_s.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_overlay_w.png create mode 100644 Resources/Textures/SS220/Decals/borderfloor.rsi/meta.json diff --git a/Resources/Prototypes/SS220/Decals/borderfloor.yml b/Resources/Prototypes/SS220/Decals/borderfloor.yml new file mode 100644 index 00000000000000..7a364c2b47b254 --- /dev/null +++ b/Resources/Prototypes/SS220/Decals/borderfloor.yml @@ -0,0 +1,387 @@ +#Dark +- type: decal + id: BorderfloorDarkCornerEndNE + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_dark_corner_end_ne + +- type: decal + id: BorderfloorDarkCornerEndNW + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_dark_corner_end_nw + +- type: decal + id: BorderfloorDarkCornerEndSE + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_dark_corner_end_se + +- type: decal + id: BorderfloorDarkCornerEndSW + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_dark_corner_end_sw + +- type: decal + id: BorderfloorDarkCornerNE + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_dark_corner_ne + +- type: decal + id: BorderfloorDarkCornerNW + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_dark_corner_nw + +- type: decal + id: BorderfloorDarkCornerSE + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_dark_corner_se + +- type: decal + id: BorderfloorDarkCornerSW + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_dark_corner_sw + +- type: decal + id: BorderfloorDarkInnerNE + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_dark_inner_ne + +- type: decal + id: BorderfloorDarkInnerNW + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_dark_inner_nw + +- type: decal + id: BorderfloorDarkInnerSE + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_dark_inner_se + +- type: decal + id: BorderfloorDarkInnerSW + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_dark_inner_sw + +- type: decal + id: BorderfloorDarkE + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_dark_e + +- type: decal + id: BorderfloorDarkN + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_dark_n + +- type: decal + id: BorderfloorDarkS + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_dark_s + +- type: decal + id: BorderfloorDarkW + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_dark_w + +#Normal +- type: decal + id: BorderfloorNormalCornerEndNE + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_normal_corner_end_ne + +- type: decal + id: BorderfloorNormalCornerEndNW + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_normal_corner_end_nw + +- type: decal + id: BorderfloorNormalCornerEndSE + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_normal_corner_end_se + +- type: decal + id: BorderfloorNormalCornerEndSW + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_normal_corner_end_sw + +- type: decal + id: BorderfloorNormalCornerNE + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_normal_corner_ne + +- type: decal + id: BorderfloorNormalCornerNW + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_normal_corner_nw + +- type: decal + id: BorderfloorNormalCornerSE + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_normal_corner_se + +- type: decal + id: BorderfloorNormalCornerSW + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_normal_corner_sw + +- type: decal + id: BorderfloorNormalInnerNE + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_normal_inner_ne + +- type: decal + id: BorderfloorNormalInnerNW + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_normal_inner_nw + +- type: decal + id: BorderfloorNormalInnerSE + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_normal_inner_se + +- type: decal + id: BorderfloorNormalInnerSW + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_normal_inner_sw + +- type: decal + id: BorderfloorNormalE + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_normal_e + +- type: decal + id: BorderfloorNormalN + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_normal_n + +- type: decal + id: BorderfloorNormalS + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_normal_s + +- type: decal + id: BorderfloorNormalW + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_normal_w + +#Light +- type: decal + id: BorderfloorLightCornerEndNE + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_light_corner_end_ne + +- type: decal + id: BorderfloorLightCornerEndNW + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_light_corner_end_nw + +- type: decal + id: BorderfloorLightCornerEndSE + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_light_corner_end_se + +- type: decal + id: BorderfloorLightCornerEndSW + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_light_corner_end_sw + +- type: decal + id: BorderfloorLightCornerNE + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_light_corner_ne + +- type: decal + id: BorderfloorLightCornerNW + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_light_corner_nw + +- type: decal + id: BorderfloorLightCornerSE + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_light_corner_se + +- type: decal + id: BorderfloorLightCornerSW + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_light_corner_sw + +- type: decal + id: BorderfloorLightInnerNE + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_light_inner_ne + +- type: decal + id: BorderfloorLightInnerNW + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_light_inner_nw + +- type: decal + id: BorderfloorLightInnerSE + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_light_inner_se + +- type: decal + id: BorderfloorLightInnerSW + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_light_inner_sw + +- type: decal + id: BorderfloorLightE + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_light_e + +- type: decal + id: BorderfloorLightN + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_light_n + +- type: decal + id: BorderfloorLightS + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_light_s + +- type: decal + id: BorderfloorLightW + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_light_w + +#Overlay +- type: decal + id: BorderfloorOverlayCornerEndNE + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_overlay_corner_end_ne + +- type: decal + id: BorderfloorOverlayCornerEndNW + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_overlay_corner_end_nw + +- type: decal + id: BorderfloorOverlayCornerEndSE + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_overlay_corner_end_se + +- type: decal + id: BorderfloorOverlayCornerEndSW + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_overlay_corner_end_sw + +- type: decal + id: BorderfloorOverlayCornerNE + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_overlay_corner_ne + +- type: decal + id: BorderfloorOverlayCornerNW + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_overlay_corner_nw + +- type: decal + id: BorderfloorOverlayCornerSE + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_overlay_corner_se + +- type: decal + id: BorderfloorOverlayCornerSW + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_overlay_corner_sw + +- type: decal + id: BorderfloorOverlayInnerNE + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_overlay_inner_ne + +- type: decal + id: BorderfloorOverlayInnerNW + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_overlay_inner_nw + +- type: decal + id: BorderfloorOverlayInnerSE + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_overlay_inner_se + +- type: decal + id: BorderfloorOverlayInnerSW + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_overlay_inner_sw + +- type: decal + id: BorderfloorOverlayE + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_overlay_e + +- type: decal + id: BorderfloorOverlayN + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_overlay_n + +- type: decal + id: BorderfloorOverlayS + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_overlay_s + +- type: decal + id: BorderfloorOverlayW + sprite: + sprite: SS220/Decals/borderfloor.rsi + state: borderfloor_overlay_w diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_dark_corner_end_ne.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_dark_corner_end_ne.png new file mode 100644 index 0000000000000000000000000000000000000000..f296cd0ce45b5a9d124008a5edcda0a7da987504 GIT binary patch literal 374 zcmV-+0g3*JP)Fc5`bQR2wX0a{V&mS0J;GbHI`kM zb~XKRV#Vnsc$2po>B-f6dg<7+SiOH7>$(QXIfwn;V!3?AwLg_I0MNQQ8+k4!Z`uNo zQk@Ow-2Vg23Csy3O~6=t)Aa9f000adW$I=Z)kHTtNL68KEVPQ+fxdlW6aXN+5A^L5RFgl)$pJ>0f_wG}s>!F|1Z|@6 Uj6B^mssI2007*qoM6N<$g3o-K=l}o! literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_dark_corner_end_nw.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_dark_corner_end_nw.png new file mode 100644 index 0000000000000000000000000000000000000000..5dd4838a116c87012a14cff60668554dcb454f16 GIT binary patch literal 375 zcmV--0f_#IP)^@R9J=WmBDVqAPk28CT%Lx!?sKM5}o$`&$8_Sn#;7I1>v~c zPGM1jz=}eoDZW4)TYMPszd1cVePc#rX7oLwX^xOmTK?^vi(i{kotf`;6#(P~5TZ77 zX3h_=R$#5bO%))mQIzG)i+)`$002#779IP807Y5iK3QwC%=N%m*-6sg~$H%3flH;zQ;`^3jpBm_Y@3D?Szv6O>>+K2qbGGQiTW;0K3z V_6;enZgKzs002ovPDHLkV1hIuqbdLZ literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_dark_corner_end_se.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_dark_corner_end_se.png new file mode 100644 index 0000000000000000000000000000000000000000..1970bc7ac3e37c87830c833f24b089bbb4926499 GIT binary patch literal 339 zcmV-Z0j&OsP)7Fc2IK)D#cuHz5E2U2p+HprI-1sT;yW3yW}o zxwM_M$z-}adjbRDGkV|d4_t&GuGSiPmZHm#!Q%)3fQt|)ih|C@7~+#8hLi!6sz%o{ zR{$5A3t)ditu@&W0I#MY-uDHJF<)1f09BQf_#vigf@0 literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_dark_corner_end_sw.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_dark_corner_end_sw.png new file mode 100644 index 0000000000000000000000000000000000000000..1670a568c346929189dc6a1661c8bf229979b381 GIT binary patch literal 370 zcmV-&0ge8NP)N@v~@X zYNb$0Q)9y0&`f4JFAwH3T5q;5Fn|jI*UK3u(+m=XzU+tnZe)tLA)=H5V>w_Z+g*MAetAgOWW#2u`PCX;;-Gi zPNq({SgwrYT=`*=YVEBEV3Ia=!n(Za>X2RciJy<-pA&GZ0^L5Ks-x>Z z;avs3@m2yPO(Dy&R*7`*t^&b12+lhbukg z$<^!(I$=@&+P^m>n>X2uLvgQB^4^SNmRqjnEqL#>xc<-!pc!I4g+HFT-)4GI{x9qI zh50-N-??gjEoQiW+LDv?#=CEK-)M7)$}2sVaV;!<|Iq3m&}U8_;lJlS3}@)kjP>Q4 j!2E>4(g8^AmvfvR1Cs&+!)AZ>oXZ00o)!%jo)+`_UhH}CX6CO?X7fcD9G{ zrjk$d85mN$0z;?9TR*Rfo5sH7oZ&J#8@BvI4;c2&U$F67Hv5ikYtLT}c{oSf^c$1G z*VF*JCHwxd{=RGW%aXxn_us%wtADS1nHVluegAyD?uT@P;nw-xjD`wqM;asqn1dyE ZFjp*T-O8}`01MDl44$rjF6*2Ung9WEY9Igr literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_dark_corner_se.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_dark_corner_se.png new file mode 100644 index 0000000000000000000000000000000000000000..55fbc2b5b76eb3bbad738385d22e84032d309110 GIT binary patch literal 279 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND0tG- z#W5tJ_3gBSd`$*CZS}m;lHy;D<+u(S8 z)w{L259df{yR=9!$Gx6EC6`g+Nv-iSugq)r=QBtI_gD)4m3NR4U_ZiG=pf_q%0c?j zl9zj5S1C>ugYEUIvIzwx zDSPiZo@6vqY6_CNW8qURedtKpH?bopq-Uk8-fhZ{+QoZw(&b8jRe2{y0R~17z7GuT XwNq~xYtPODdWyl*)z4*}Q$iB}rXOhL literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_dark_corner_sw.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_dark_corner_sw.png new file mode 100644 index 0000000000000000000000000000000000000000..7b001fd1853a0050fc1002690fbf2d039f084139 GIT binary patch literal 291 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND0tP= z#W5tJ_3boAz9s_!S9`atD6w0-at?Ph_xz8%!hB+y$7Q1x+5yfj7ntsrm|gy}W#;tx z|F&HGSW>reaR*0g=7eR@Pb%+S%D?V?rF7r=Y0hTap(d{_()5boGFXV8oz?M-or8~s zy@~l?c8Iocj4!pex?JiO<&!Tj@t2MBr_~n>d(Z$pnWV# zep1x=P1Y9T0jnhLh+li5Jhi;RQS-;Sy17kOvMwoC=LSEB+RLEisj##}E`>K?OWVaN mBZl|W4H#G&7#_$z;61@Jb&pc}1z(^C89ZJ6T-G@yGywn&uWs=G literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_dark_e.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_dark_e.png new file mode 100644 index 0000000000000000000000000000000000000000..25e044e41984854903ffbb708b0c2002bf923218 GIT binary patch literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND46Q$ z;usRq`u2h$SAzqO%SDcL8{`sf8>;>vW{oLej+*JTVM52%`B@w+ZPz^&K5vp+>a%E7 zow0Fd?)2Y(HEUB2OpP*sugSZ<&R%lD=NEU+{F85BVB%0fAp{$RFYnAYog!Ei4z!TL M)78&qol`;+0BP7a{{R30 literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_dark_inner_ne.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_dark_inner_ne.png new file mode 100644 index 0000000000000000000000000000000000000000..5c288b857e0d2246d01584907242de7a3b11c62e GIT binary patch literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND7enk z#W5tJ_3ac#zC#KEuKV3G4z%uC$-d#<|CloGmMMN)S0`l$Co`W)yT|rP_|R$o!)$^v zt6p!`Id5>RrKjVx56uxSuU;7!%5AdesF8Eki^m6fQ zr+>cEflTM_g+D#XI_2Ku0-J>s*0V{yXH1y(--UsJOEW$GH2J4E=~8ZDU8P?EYcT-{4^=s zCLYwc?~!VRZqaFd?h~CHP9A%@4(m$X`ez<}z<}ql0ncToX7P%`^)DZ;0Q!N!)78&q Iol`;+0NR*m{Qv*} literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_dark_inner_se.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_dark_inner_se.png new file mode 100644 index 0000000000000000000000000000000000000000..365725afb3691f09c69e86f1176d68bc234316bd GIT binary patch literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND7fC! z#W5tJ_3h+?T!#z`o#bPYo6Hg*;uU@*C+bWFq8*jvtt|G7=a zrNgE1+5xAZF_YYk1f(l-n_M3kQWz2Pu{_&D6FS$R4@xYPmLT(j)#i=jXQr_v)P1IohDn^*H75+Drz9-G3RoG8QaX>M<-h=k&T} zi`UKgRUHXEozi>1ua>y6rs$Ntw7|V;56_D5_p$5?>OWt<(L66_LGE+=$(z3_)lO`j zKch+0=}i|$XlZZNjJ_0R?^#>Vu^+R`I$$Y%eGY^A0nRm34+z)J$oU%`VR#4V3kFYD KKbLh*2~7ZFHEXm0 literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_dark_n.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_dark_n.png new file mode 100644 index 0000000000000000000000000000000000000000..4ef11e092a43c3f0349a751dfd3a3cc4c305a497 GIT binary patch literal 167 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWNC>ZJK z;usRq`u6HZ-Ub66my6tsIGI~S9U5-b>v_8{+Au|Onh6=x!3ZVO z;usRq`u6fc-UbB$mx~7r4l-?EFui!AK6SQ-61&FZ>KWw^chpaIH8M6fj=0rdJb`iN zwca`FWdyU{hH7em(tGhsNPfb)---PjzW2}hKRMpvQ2zx+z5)h01IC?6HnRT9W=#TG O!{F)a=d#Wzp$P!)y*WGp literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_dark_w.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_dark_w.png new file mode 100644 index 0000000000000000000000000000000000000000..3a5f1bdbd0cdf4d3208781b52f63d23b05554410 GIT binary patch literal 184 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND46Bx z;usRq`u4&>&ISXX)`uc%0@zo0YrM1XwsJk##QS2c_`*d={`G$S6DE9^nK*|}bIK|& zuiX{*y*VCUil2US%D4BcDve|wPuslp?eyL6H2jS(@PLcto{F9a z7#kWIQkmnxR-8B-4I?2-qct9lyxzH#WjXa)!=O_NbzLLNGA#MMKmg$9exC`>`R<2q z1bp9aGtnva{{l`2P6rNkKuY=N&~Y3A08&Z}!|?WxqbLHoUY`pPLTt#kZDHeWb&N49 zUlfJcLq?J$0i|>%q?8asV9l@Lsx!PVz9^;WwVpp?JEas=RiW3~x-RQ%`@IFcRJ{WZ z7eLmxec1(^b972sS68nkRxDqBKn>S01qOHUv4q7<1-ykXQJ7L`X5vc--PSoR;c% gY&}l~c=s##0XMKWnE0RF_y7O^07*qoM6N<$f>u(Z-2eap literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_corner_end_se.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_corner_end_se.png new file mode 100644 index 0000000000000000000000000000000000000000..85f11e7089ddd5ae577d73b550b5636dd199a0c9 GIT binary patch literal 369 zcmV-%0gnEOP)0OuU)y2jXF1)wa;o^w9&l~M@#A*B=m&iSOM}(0RAo)zaJ{_Re-$$zg+>X^}j=%bISmP5dGMU zon%TWNGXGUG{C!)Y%Xr_W0k!7oU%z?n8ShFB&5u8s#1V9%Rd6JS75KePgmdy7)l9p1`zJ* P00000NkvXXu0mjfib|ZZ literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_corner_end_sw.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_corner_end_sw.png new file mode 100644 index 0000000000000000000000000000000000000000..c3c2494ecdbc47127ced45f4784a55fc35fb2308 GIT binary patch literal 397 zcmV;80doF{P)pp zDKWKnT?YVQjG;AV_^dq?`68n*ysVptXJo z`m#z$9e!W00O(4XWf|Gdtsm#yX^(6W3Y_!FN;tNU;j5&xyW!M4U@PRa^TgZR@!JV3 z$^zFsV6)@dd14j;DhuYcWa_?`Kpe-&^L!3ZCwy5jO98Dlc^(}OlV`qpVo@m$g{zmW rO2E}iK3@Uq{m1y93M|2n900000NkvXXu0mjfrPrk) literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_corner_ne.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_corner_ne.png new file mode 100644 index 0000000000000000000000000000000000000000..79881a2d676aee14d3a9f2cb18398aca530f1ffc GIT binary patch literal 315 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWNDEQXX z#W5tJ_3hNXyv+szZuWInT>1yNz9<+qY+sNlqo&YZ(V%cK_+m9f)53*{t}RP7Ty6-s z6st$h5dJZ5Ud^^*{nL`-ZPlrTObQH43=IEoeqXL5!@^i|{x)02th91LP1QpNF=wAw z_BpQ1WjOb9-J{s+3)f|O%MukZ)xaRyIU KKbLh*2~7Zix^~(C literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_corner_nw.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_corner_nw.png new file mode 100644 index 0000000000000000000000000000000000000000..41232266422561f663ffb4cdefb8641c0aa531a2 GIT binary patch literal 294 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND0suu z#W5tJ_3hM+d`$)-uKdSJ-tvDDzoGbRsnti(4~&ya(v#jVV{X#Xv5I8xX<8I}&wJLs zJ7$&Y=G!y3+<&`{WliXbhfE3#Obi?9${$u(Eu6x|zF>;d`QjeK#m3L?1lI;KFeLM2 z&RVqfThwKfh-~*?cV^9DTx&Xg-RITstJjOW9$fm`?pAZVfrZ1Dcjh+RbwfiZs&sCb zO^{%FwM*`0adr^L+~SCA_1E3Zd#YF?r@7j*H@M$=FM9l=dGT{*h8%P0`}1#q`_It6 o>C0XV1-=gEM-4zq=jj37K%-fV(?1+=1p1M|)78&qol`;+0Id>o`Tzg` literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_corner_se.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_corner_se.png new file mode 100644 index 0000000000000000000000000000000000000000..bbfb3dff9ee672f25349f747cebe78cd37109b1e GIT binary patch literal 305 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWNDEQdZ z#W5tJ_3boUzGelPqw}xLoxCIa4dV`0@lOtN3)J5Dypv;a5f`)eOtM!>h_?D5^w?g1 z#`n|A!bWohl5>_$NxF8cDr=TP%YnuJ{fTi%7fP>*THKix9PDTj0VT9UHDKabI`K>r8RSaSM#BzQy$D&ye?b7XUBs#733JCE zaT!m|R`0q!hg-dU6^l68|2+^;Yhancu!#8%V^+`Vpyh`HJ%Qe3@O1TaS?83{1OQ^w BcU1rY literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_corner_sw.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_corner_sw.png new file mode 100644 index 0000000000000000000000000000000000000000..39088376f540777c36bf5fd265ea0d2654858902 GIT binary patch literal 309 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWNDEQpd z#W5tJ_3bo6t`-9km*c6{-7yEWZ)m?`+|$}yzUiBoTte%Ym2YevOqOlDsoQd3(T=Pu zCiMy`Je>axpG>ZB4XoLqwAQpmz~iz=bI`H(zvP@arlh`HJNN(c=kw0K-(~jNfG78r z9CL+gXJmP8y*-1f17`r!6b97?CXAX-{Vx{Eyl2k1EjH(~tNrOsSD*h8X;9!0IBqDB zd~9-1Q?cFW@2@tNDkt+a2c>1K?Trr=Wn0R3b~fX>NyQBLujd~ zW_Q9#d(i{mYoAo+g&yHzm=X0(%W{7Uivt781DOZhvbD=oCKM^V0lm!N>FVdQ&MBb@ E04p(elmGw# literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_e.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_e.png new file mode 100644 index 0000000000000000000000000000000000000000..7e51fc3157b20fa3839369ce4b0114091ff1d488 GIT binary patch literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND46c) z;usRq`u4&>&ISXX)`uMHCUd@GxVz}|ElwlP;P+os_?y@}D}LR7Dac{7&y`7YY0sR^ zGJDTQ7mFKD{{2@oJLSOCz1MDre!co$oq5}owETDf`5hP-Sp<-Y#*PD=0ttn!$3m2v QfmSkjy85}Sb4q9e0K4)#3IG5A literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_inner_ne.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_inner_ne.png new file mode 100644 index 0000000000000000000000000000000000000000..0de339ded35157a236957060c41317c8e798c738 GIT binary patch literal 279 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND0tG- z#W5tJ_3dO^t`-A<*7>Ku6*tBlj4QO3&YzfF)gbz2?HgMMpDmt`!`S}ZPL(XrebzkT zVe^FJ%AE%svTa3O8xQV$P?derg!kIN4r}!TXEv`oBy;>@c)CC5hZCC&zF+%i-(aG^ z8*{6{Fs*Rqce@{jGWPTOEv7%Ow9{N_w(qsoo1eB3yc$avw<-9oz z3=S?5bGWnD&Fu)7rposG-n%ypF?#$5s#>C6YkE#Pn*IIW;@s#pfBl)}eB@?v6ab>Q Yr`w8dI0^9Y1bT|W)78&qol`;+08#R9v;Y7A literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_inner_nw.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_inner_nw.png new file mode 100644 index 0000000000000000000000000000000000000000..ccbb00b6e830fa4a430c050a7ad071a5061e73f1 GIT binary patch literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND0tY@ z#W5tJ_3h+?yv+tYuJ)qeeI_vq$SN3L5{@=-m{|0kizh*7M?t2)f`Dq^>}^5X_L`f% zK0RVTZBFc}S8WV?ixre4k_{^MUw*yooYVK@C+9`tZb5)xdmAb@AW7)IcI@{iCFjR{;aAw1`MH*ZhOUtUXmLIG( z@oipg(WlJdpvjsRcW#Zkbj4}y{W%Kn=QdxHaxdJ=`g-I4vtk@g3P5y+vHJUjn@^B!arfZ}ZXYOsiPw6t2ObiRA z9GYM}w@^ltUoqjt&!=a_9&Fmpkj?pe*Ss}bL#!F51YIbVmHX_=^6!!O29}23+s;cQ zYseSfi(_Co7wY-+mvzXcn;FJG`R{}9TU=^*vvC0pJ?yNu1c-4g9UFEDtz`njxg HN@xNA=tp7H literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_inner_sw.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_inner_sw.png new file mode 100644 index 0000000000000000000000000000000000000000..a6933eacc6e18421de57954b3b2b30106f453383 GIT binary patch literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND0sxv z#W5tJ_3dO|uEPo*>9vy*o9ZH8_deNv!z>z)5KoH+4*6u z!YP9n23iLUcn%w!IVw^bYv1qV!m{+rs(U8B6NMc@LbqlYoLl(XN+MZd>7NV5J9`xm zM0KyNoTbLlFhwYtBlApESwnEy&*uzDALOF4bIuyNF}$~qzh?LPCgZPt_9lWCUo|T) z`oj?ZpUJRoLw3YJrtI8HTd&=0XKwg$tVaLz7P&qDYa85eFEceiz+1qaZu)^K@_XmA Ug=?;^1Nw)-)78&qol`;+0A>PfQUCw| literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_n.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_n.png new file mode 100644 index 0000000000000000000000000000000000000000..8510849d705c6859294ea164f1714231ebdd698e GIT binary patch literal 162 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWNC>Y}D z;usRq`u3`!-~j_3mV?{XAF%jw$S6HhRM~i0-C*C&+>l>fnKtjX+DZC8f6OA_(4Z1~ z{@%TYci-4tT1*r6Jzufv$*gaxTiAQfZ28yrO&e(B55`KDxNwhU-*bQ*22WQ%mvv4F FO#uFCHc|ip literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_s.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_s.png new file mode 100644 index 0000000000000000000000000000000000000000..8eb92128258443f6ac99a61614eff591e8cde9ee GIT binary patch literal 163 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWNC>ZML z;usRq`u6fhK?X$*my1_7TI^b&$i0Z)>)@YtJ@emq^ZY!sASEp=ZNt==@{$EgO>@@& zO$!NKbgy@v{zt~w_fE?tmQVitGrr&+k5q&FLS~r<3^otgtz=`kFPs$S16sh~>FVdQ I&MBb@0Mzw1%K!iX literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_w.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_light_w.png new file mode 100644 index 0000000000000000000000000000000000000000..fcb91d425a3b1d2ca2e6365221493c143635b719 GIT binary patch literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND46Z( z;usRq`u4&>-UbDp)`ydJ_^BUYoFVA{MoHL!^XTq-J7y$YdGYf7%cYr@pA~!e?B-cD z%Tv?UiDT2&vRBKe+{yUAYMJ%n>~prOU(McqUT((T_d93({m;O}q0oRr)F>7(BrPx9 VzW3v_DL`u(JYD@<);T3K0RaA?LZ|=$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_normal_corner_end_ne.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_normal_corner_end_ne.png new file mode 100644 index 0000000000000000000000000000000000000000..5d2d16d222c275eebe207803b95d809a51202fbd GIT binary patch literal 381 zcmV-@0fPRCP)#s zR-><5EFUZ&whQ*~s{-n}egtPbD2n10-37lEx3Jw}v3HV23jpGF$sqz_cFFC)?Lf4E z*n1*Mz#)?`MgXPMdk<{g6Nd-@{P)1tJz?YJ>-cg3KW{?dvkkK>L*Mr^XNUm4la14$&mnvcFz+!8!wV;dwH8`y2q9pM3H0Zgi@%3b%0G8q2LNpWIOqP^TH7Ar zuE1S^uPU%C3kV@!FS@QP0Khrt7v1Yw073|+X#!&`_%_dTRFCDQ^r9_bjG^y)P)fb# zoCAPBe~(n&rWc<9N@>taH(g2z&N-A)!MK$@HUF;^;HeJecwX}kvSrQwH9l>gq9-!0E7@2$1$H{jF~saKq&?1Tyec| z1#oe?fQA#SwVsDzKnNjoDJ4wPgf(9RD+j#yyZFNeNGV^kornP7yH#L}$>*-?GXGc| z|0Vzclu~)WlwmCn5#XH5`^AB;3b-8jZ3l?x>Cu$ZJ^@Erlx0WA?d*|ucylHD=Jx9j7*ck$H%thFy>Z5E$e1zQLqplP;0 zTrGE=mr(OKaPNeiUd}}e@Ot?n0xkzG2Y%XtKdc$hrO%V;mH+?%07*qoM6N<$f|eAJ A`2YX_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_normal_corner_end_sw.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_normal_corner_end_sw.png new file mode 100644 index 0000000000000000000000000000000000000000..6d7f8e934749ed5276fd0bbe0a4c4e1b5592764a GIT binary patch literal 366 zcmV-!0g?WRP)}s59@?`oP3?I zu50f&w|je7CHc1kf@0s|XELxn`!d>J2?8P9)8EqHD9UM(tH#j_|%|FqDxTiFbn zOT#}G$}loSPHXJo`?^~&I(y-iCV@klzL!M~xWD@A8#~|RhX5OU$EsDIe(^5Pbh`ij z#AlgfGn`|+D)Tw!?>exwj_ZPn?-T9-k)xk(ub%JpA4R^elF{r5}E*f(`tVJ literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_normal_corner_nw.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_normal_corner_nw.png new file mode 100644 index 0000000000000000000000000000000000000000..e2467e6dec80a60c75aaf507922d4127c609192f GIT binary patch literal 282 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND0s%x z#W5tJ_3hM+e9a0XuKm91YG!vzKivQ0WPj-3U48*|!xy*wmNxrNy*BOX-j)wVik0f- z(g=n15UB`5pJ_PXcP}C%)A=zqdVX5D*%=K{g>a{8{C_7aL18 zTCUyF_*>FYzJ5XGtT)dYKKT4z{K@8jTAmGqL*%rD-|zjGU-16-g>L3Y4HgP~9n6mo dMDpEX^nc#J`j^_0c%Z)+JYD@<);T3K0RV>+ap(X5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_normal_corner_se.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_normal_corner_se.png new file mode 100644 index 0000000000000000000000000000000000000000..d30bd071790cf8984de3461d885776e4c033e439 GIT binary patch literal 288 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND0s=! z#W5tJ_3gBcyoVJ;T>3Sb19q9WR<|Yah@~^!X=L5vm%8LgC(jK|&3~o~gkQ|_ljm#` z4)R(X(kr*5?9LZY{V(R=byGwxnT4U}F~_-|=k(b=+&e76tmtxe*VS{D_iH_} zN>*F_Wi4e-h^{hhU=HQ?kszHs}krt22WQ%mvv4FO#sjyX@UR% literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_normal_corner_sw.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_normal_corner_sw.png new file mode 100644 index 0000000000000000000000000000000000000000..c8c71966c0eaff1154f2546ff926c4d971b375cc GIT binary patch literal 294 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND0suu z#W5tJ_3boUt`-A<*7>L960F{C-SAzYDg0xL+#%@-hRc?dA~<&+b#gee|A^^X8xBc1 z&d(n`JQnR*XMbbjHL2SBi#50mKA*~;rFQFf{gUrfkH%iVY2_(2e_tL$X-#!|Dtn{>+Oe~xB&WZ^bznS#=5$z+Cvr}0-`zj0Dx zGQMrd)BN@JHdbTnv&$L(Eq%an@uq#^yys?R56ZcZ6~_Dwe_G33Q_A7svSQV#-4l%u q*qrZv|Kl!K9S5re1B-&i0r78z^Uv>_bfyF7M+Q${?I-@~Z}?jF@={hR*Fh(xu=-Vs0uuMsdUyOzOcN3; zJ?#^jee& z>HV8-=E9iNGyTt7#x+}C?BY8%<5AH$hJp|MEDQ|EXC7+b+w)!SoMnrE-}&h#4O3n* zN}V(kTw8lTdDgN=GbB%MN_c;M#Xl|)*FYe$t2&Yx9#h*G19Uxur>mdKI;Vst0Ic<7 AAOHXW literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_normal_inner_nw.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_normal_inner_nw.png new file mode 100644 index 0000000000000000000000000000000000000000..06665a29639d1bc4cdb7321ce0d21ff110ef349a GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND7eYf z#W5tJ_3acxzQYPUuJx;A8Yar-9oT50SpJZ~KuPjinb(vqF&9s*t)HTEBH8NqrHEy} zmF4Z=P-Kxvo)EO^)w!KZOZOeOy7Xr6{bJ3hXYQP5$yob+PRBm|2H6C5y}||GCk1ga zC_MjTQnK2gn?tc=c2bY?S4GBSGt!*TNir;$(j>5Gl|Q$K=D}+IwO>!~xT)8&V&5a< z9dnCL>vKnRas+wp={~M&aqFLX^Z^5&!v;K`87gO07@hsCTn%(RgQu&X%Q~loCIGW^ BUwi-n literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_normal_inner_se.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_normal_inner_se.png new file mode 100644 index 0000000000000000000000000000000000000000..ae55e1e0753b24df1b56714fc73eca12b5f3f85a GIT binary patch literal 260 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND7ekj z#W5tJ_3dOsuEPdAuJzvh3(nqrd~k98#LK_g_BEKPABnrHxyXdm#3D25LbQ&pK}`#b zM%N;Zt|G(jv(Df9eNtlchci8<`;RSFYcOQXz1`GtfDAXJ^p~LEwR^q&si>+a%5_d0T1)Nzha@*2hQyN^N_Lb8J82sC39cp ze_yTqxEUC(MXh{p{AY?Y(-DcK^VC0FWw2tLdm!Hb0q2{mA*TJ2tm}b3VDNPHb6Mw< G&;$VdmSbiB literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_normal_inner_sw.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_normal_inner_sw.png new file mode 100644 index 0000000000000000000000000000000000000000..82ca09f77c745851302a2e22976682ac40409d1f GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND7f9z z#W5tJ_3dPDt|JNpF51p~7k2OPzkk5F;+F&81I9<29PggfX=`ar5ptQy|K;`;k)eT0Ot>_mqg!0Rx`)UpD7seH-pYRcCoZYP z;usRq`u6HV(E|<~E(iCjw8a&Ov@Gim@#GC@@I4i=IeEf&);-ptUmIT}*{x$>)nH(l zclRmV86I;5r4@|ZckjQ;Ys{Q{Y5D}Y0;9>lq%W;^aB*>Y!rphoLaFvkl@!nl22WQ% Jmvv4FO#ouzG|&J5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_normal_s.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_normal_s.png new file mode 100644 index 0000000000000000000000000000000000000000..bedbe3ae97a149edd17488033d69966e3422dcf1 GIT binary patch literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWNC>Z1E z;usRq`u4J+AcG-?%f+*?QhSy-vlwkC(z@u--qPKZ`^{AI=NSP97Z;ZkVJ?5pG`xLx z=4Zuu%lOcPXAV@zzxu^spOC8don!ZG%lZGgznuwSe&N1?fmNeHu7L4(pJ~@@<}RQ$ O3=E#GelF{r5}E)cCONqP literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_normal_w.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_normal_w.png new file mode 100644 index 0000000000000000000000000000000000000000..54cc9039a51cffebf4cd733056e2c5706e40871d GIT binary patch literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND46c) z;usRq`u2h$UxNWhYvQa5j%RTTmp|&*%VQjE9(H%vj4LZHzD%!D6gUxnCTF^9>N1y> zE!R?d3SWJ{cRK6;s%_SX-`QS!pP56Ufq@B`_|STQar2d;YlVsv Re*&#!@O1TaS?83{1ON+rLXrRg literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_overlay_corner_end_ne.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_overlay_corner_end_ne.png new file mode 100644 index 0000000000000000000000000000000000000000..4f8232509390eac2540fddc87595fc333607d273 GIT binary patch literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWNC|Ky} z;usRq`gWQjUxNaVYxHBrD&C#{3#(Y#`Xbn3Vx%399(l5V>z_|TLQ%^a<`f%mULg~7 zH`BYb`t#`zy!yC9SnA9`5@}dz$DPX kz*05Ctfy`>KLZ2b@*CQJ4^5x<7HBzxr>mdKI;Vst0Bn&zP5=M^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_overlay_corner_end_nw.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_overlay_corner_end_nw.png new file mode 100644 index 0000000000000000000000000000000000000000..a42f91ad4a15eed5aa7e0ec79496792cd2df0b20 GIT binary patch literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWNC|Kd? z;usRq`gYnz-UA9eEWSr1bOgT1w+qGuSS@Q%(^XTM*s*B;wfqvN7p>l!p+*|3wj6&k zW9PFuYgg>NKRf@j`aT{O1qR0Wkh2F0&$+g^MP~osY>{R*JHSPwOJh6YVC^l f&#eZjahS%<#G=rwv&CTx&}IftS3j3^P6gTe~DWM4fGDJaV literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_overlay_corner_ne.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_overlay_corner_ne.png new file mode 100644 index 0000000000000000000000000000000000000000..ee99ca3ea64d4e69921fffa7b7250c7feabba1fb GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND46Ey z;usRq`u563-UA9eE`h>^4c9q-_dgcY(CE}$;OQ?i^Id$c)&5f_&n#m}+i^P9Yt`0s z*KTdAca{4OG>75ILpiG-d#d-Aciyv`RFZY$%(7K^)jvfXLR-UmfYK1~z*~&FN5MWKO^@Q`n?=H| z#%1@eT3=N2PZ?;y2ZNP6+go4PnH$e4t(OeD`ax)x^4eSa3S4tdYUFymewDg$Aj^E+){ruO(sA#5bJ0@}a-elGe zkeLwRa8|0Uyz=>(S^K9arM-T(V7GVn+AsH}ugd#v`pIhk6Z_q(xbiK5N|k;xQ#Twi99d|Dn$Yf?E81KT`rk? QITFVdQ&MBb@0Nd*$7XSbN literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_overlay_inner_ne.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_overlay_inner_ne.png new file mode 100644 index 0000000000000000000000000000000000000000..5c499b45212f9d5a30fe6bbba147c3ac7034bb0a GIT binary patch literal 139 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWNC}`{H z;usRq`u5yLUIqmo=7SA4>Mx0CE?&|gxZuFu_}oZ)pCfn6U1G|EML%>gFmXhzdVFTf hx}dwvK&?NXGx$v7sgw9=T?yndc)I$ztaD0e0sv1GDNz6b literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_overlay_inner_nw.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_overlay_inner_nw.png new file mode 100644 index 0000000000000000000000000000000000000000..521bcfc6ec063fa9e0376950d726484e112cc59b GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWNDCp?v z;usRq`u5yGPM~VHhdt9y{ykne@k@Yogn(?*_t?J^)zi$pmF{?lPt7S_ysyfKfstiS k*28&x$DZ*4wLhrl{xXs0!xD92aUhSu)78&qol`;+04>fd6#xJL literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_overlay_inner_se.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_overlay_inner_se.png new file mode 100644 index 0000000000000000000000000000000000000000..e5b8ce4a064e8a94574281fdfbaa450b722aa5f9 GIT binary patch literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWNDCpqn z;usRq`u5yLUIqmo=7S9q2Y#QQrnrZ(M_^V*)BanV?3jS6e%yUwb?%Jr$~$Yzopr0M||}GXMYp literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_overlay_n.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_overlay_n.png new file mode 100644 index 0000000000000000000000000000000000000000..5f89f5ced9bab465166e9ccb59c78b56c750e57c GIT binary patch literal 126 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWNC}`m6 z;usRq`u3coAcF!A%f{w|`wwYp@=v(vpOjD@diC@ITS@bT0}hks+_wD-RDR}{W+B_O TjWs(8fE)%-S3j3^P6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_overlay_s.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_overlay_s.png new file mode 100644 index 0000000000000000000000000000000000000000..07924c962519874edf11331112bd6f85d80152b7 GIT binary patch literal 129 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWNC}`~I z;usRq`u5yGUZ83QLz8#*n*3%H3=KBMKG0)gV5r+}^x2PZ&Z=2&j?1l;Hb{8T+Q|0B WkZt9O1zi3>?F^o-elF{r5}E)YDI&uF literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_overlay_w.png b/Resources/Textures/SS220/Decals/borderfloor.rsi/borderfloor_overlay_w.png new file mode 100644 index 0000000000000000000000000000000000000000..1988204e76add46b266de2365f1ebc52c1a6c321 GIT binary patch literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWNDCpqn z;usRq`u5yLP6h=57RRm9`~Mg16XM;%EO;cx%&u?c%$=teTDrXy{JN!b Date: Sat, 16 Nov 2024 14:41:24 +0000 Subject: [PATCH 02/32] Automatic changelog update --- Resources/Changelog/Changelog220.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/Changelog220.yml b/Resources/Changelog/Changelog220.yml index 3bce031f5e6da4..745659f597a29f 100644 --- a/Resources/Changelog/Changelog220.yml +++ b/Resources/Changelog/Changelog220.yml @@ -1,13 +1,4 @@ Entries: -- author: Kemran - changes: - - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D \u0446\u0432\u0435\ - \u0442 \u0443 \u0440\u043E\u043B\u0438 \u043F\u0441\u0438\u0445\u043E\u043B\u043E\ - \u0433\u0430 \u0432 \u0447\u0430\u0442\u0435" - type: Fix - id: 160 - time: '2024-06-05T17:43:44.0000000+00:00' - url: https://github.com/SerbiaStrong-220/space-station-14/pull/1088 - author: MiraHell changes: - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0441\u0442\u0430\u0442\ @@ -5931,3 +5922,11 @@ id: 663 time: '2024-11-15T14:14:35.0000000+00:00' url: https://github.com/SerbiaStrong-220/space-station-14/pull/2237 +- author: NightmareStalker + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043D\u043E\u0432\ + \u044B\u0435 \u0434\u0435\u043A\u0430\u043B\u0438" + type: Add + id: 664 + time: '2024-11-16T14:40:20.0000000+00:00' + url: https://github.com/SerbiaStrong-220/space-station-14/pull/2232 From f61c6d37da47287270bf475ed780422d02d361d2 Mon Sep 17 00:00:00 2001 From: Kirus59 <145689588+Kirus59@users.noreply.github.com> Date: Sat, 16 Nov 2024 17:43:01 +0300 Subject: [PATCH 03/32] Fix magboots with jet on grid (#2238) --- .../Movement/Systems/SharedJetpackSystem.cs | 42 +++++++++++++++---- .../Locale/ru-RU/ss220/movement/jetpacks.ftl | 2 +- 2 files changed, 34 insertions(+), 10 deletions(-) diff --git a/Content.Shared/Movement/Systems/SharedJetpackSystem.cs b/Content.Shared/Movement/Systems/SharedJetpackSystem.cs index 0284a99f4e373c..cbb0d14592e4fd 100644 --- a/Content.Shared/Movement/Systems/SharedJetpackSystem.cs +++ b/Content.Shared/Movement/Systems/SharedJetpackSystem.cs @@ -87,7 +87,7 @@ private void OnJetpackUserCanWeightless(EntityUid uid, JetpackUserComponent comp private void OnJetpackUserEntParentChanged(EntityUid uid, JetpackUserComponent component, ref EntParentChangedMessage args) { if (TryComp(component.Jetpack, out var jetpack) && - !CanEnableOnGrid(args.Transform.GridUid)) + (!CanEnableOnGrid(args.Transform.GridUid) || !CheckMagboots(uid))) // SS220 Magboots with jet fix { SetEnabled(component.Jetpack, jetpack, false, uid); @@ -128,17 +128,15 @@ private void OnJetpackToggle(EntityUid uid, JetpackComponent component, ToggleJe //ss220 magboots with jet on gravity fix end //SS220 Magboots with jet fix begin + if (!CheckMagboots(args.Performer)) + { + _popup.PopupClient(Loc.GetString("jetpack-no-magboots-on-grid"), uid, args.Performer); + return; + } + var slotEnumerator = _inventory.GetSlotEnumerator(args.Performer); while (slotEnumerator.NextItem(out var item)) { - if (HasComp(item) && - TryComp(item, out var itemToggle) && - itemToggle.Activated && !CanEnableOnGrid(xform.GridUid)) - { - _popup.PopupClient(Loc.GetString("jetpack-no-magboots-on-gravity"), uid, args.Performer); - return; - } - // SS220 FIX JETPACK CAMERA START (fix: https://github.com/SerbiaStrong-220/space-station-14/issues/1746) if (TryComp(args.Performer, out var buckleComponent) && buckleComponent.BuckledTo != null) { @@ -181,6 +179,32 @@ private bool CanEnableOnGrid(EntityUid? gridUid) //SS220 Fix jet in zero gravity end } + // SS220 Magboots with jet fix begin + /// + /// Checks whether the entity can use jet with magboots + /// + /// + /// true if entity can use jet with magboots + /// + private bool CheckMagboots(EntityUid user) + { + var xform = Transform(user); + if (xform.GridUid is null) + return true; + + var slotEnumerator = _inventory.GetSlotEnumerator(user); + while (slotEnumerator.NextItem(out var item)) + { + if (HasComp(item) && + TryComp(item, out var itemToggle) && + itemToggle.Activated) + return false; + } + + return true; + } + // SS220 Magboots with jet fix end + private void OnJetpackGetAction(EntityUid uid, JetpackComponent component, GetItemActionsEvent args) { args.AddAction(ref component.ToggleActionEntity, component.ToggleAction); diff --git a/Resources/Locale/ru-RU/ss220/movement/jetpacks.ftl b/Resources/Locale/ru-RU/ss220/movement/jetpacks.ftl index a71b23c794e8e1..f90a9053be9bab 100644 --- a/Resources/Locale/ru-RU/ss220/movement/jetpacks.ftl +++ b/Resources/Locale/ru-RU/ss220/movement/jetpacks.ftl @@ -1 +1 @@ -jetpack-no-magboots-on-gravity = Невозможно использовать джетпак вместе с магнитными сапогами в зоне гравитации +jetpack-no-magboots-on-grid = Невозможно использовать джетпак вместе с магнитными сапогами находясь на объекте From 6bac15af398fd27be7443a0826a0c2918758871c Mon Sep 17 00:00:00 2001 From: Maxon Date: Sat, 16 Nov 2024 14:44:05 +0000 Subject: [PATCH 04/32] Automatic changelog update --- Resources/Changelog/Changelog220.yml | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/Resources/Changelog/Changelog220.yml b/Resources/Changelog/Changelog220.yml index 745659f597a29f..28bad568bbd2bb 100644 --- a/Resources/Changelog/Changelog220.yml +++ b/Resources/Changelog/Changelog220.yml @@ -1,18 +1,4 @@ Entries: -- author: MiraHell - changes: - - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0441\u0442\u0430\u0442\ - \u0443\u0441 \u0443\u0432\u043E\u043B\u044C\u043D\u0435\u043D\u0438\u0435 \u0434\ - \u043B\u044F \u043A\u0440\u0438\u043C\u0438\u043D\u0430\u043B\u044C\u043D\u044B\ - \u0445 \u0437\u0430\u043F\u0438\u0441\u0435\u0439" - type: Add - - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043E \u043E\u0442\ - \u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0435 \u0438\u043A\u043E\u043D\ - \u043E\u043A \u0440\u043E\u0437\u044B\u0441\u043A\u0430" - type: Fix - id: 161 - time: '2024-06-06T16:11:41.0000000+00:00' - url: https://github.com/SerbiaStrong-220/space-station-14/pull/1091 - author: Kemran changes: - message: "\u0423\u0431\u0440\u0430\u043D\u044B \u0438\u0432\u0435\u043D\u0442\u044B\ @@ -5930,3 +5916,15 @@ id: 664 time: '2024-11-16T14:40:20.0000000+00:00' url: https://github.com/SerbiaStrong-220/space-station-14/pull/2232 +- author: kirus59 + changes: + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D \u0431\u0430\u0433\ + \ \u043F\u043E\u0437\u0432\u043E\u043B\u044F\u044E\u0449\u0438\u0439 \u0438\u0441\ + \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u0434\u0436\u0435\ + \u0442 \u0432\u043C\u0435\u0441\u0442\u0435 \u0441 \u043C\u0430\u0433\u043D\u0438\ + \u0442\u043A\u0430\u043C\u0438 \u043D\u0430 \u0441\u0442\u0430\u043D\u0446\u0438\ + \u0438" + type: Fix + id: 665 + time: '2024-11-16T14:43:01.0000000+00:00' + url: https://github.com/SerbiaStrong-220/space-station-14/pull/2238 From 065f32bfb67a6a50d056e140a7ad931d18111d8e Mon Sep 17 00:00:00 2001 From: Ady4ik <141335742+Ady4ik@users.noreply.github.com> Date: Sat, 16 Nov 2024 21:19:11 +0300 Subject: [PATCH 05/32] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D0=BF=D1=86=D0=B8=D0=B8=20"?= =?UTF-8?q?=D0=B2=D1=8B=D0=B4=D0=B0=D1=87=D0=B8=20=D1=80=D0=B0=D0=BD=D0=B4?= =?UTF-8?q?=D0=BE=D0=BC=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=B0=D0=BD=D1=82=D0=B0?= =?UTF-8?q?=D0=B3=D0=B0"=20[AdminTool]=20(#2231)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add makerandomantag for admins * Yzhe 8:08 pora sratb * Unfortunately --- .../Commands/AdminRandomMakeAntagSystem.cs | 123 ++++++++++++++++++ .../Locale/ru-RU/ss220/Command/command.ftl | 4 + 2 files changed, 127 insertions(+) create mode 100644 Content.Server/SS220/Commands/AdminRandomMakeAntagSystem.cs create mode 100644 Resources/Locale/ru-RU/ss220/Command/command.ftl diff --git a/Content.Server/SS220/Commands/AdminRandomMakeAntagSystem.cs b/Content.Server/SS220/Commands/AdminRandomMakeAntagSystem.cs new file mode 100644 index 00000000000000..a3f7a96190c1ab --- /dev/null +++ b/Content.Server/SS220/Commands/AdminRandomMakeAntagSystem.cs @@ -0,0 +1,123 @@ +// © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt +using System.Linq; +using Content.Server.Administration; +using Content.Server.Antag; +using Content.Server.GameTicking; +using Content.Server.GameTicking.Rules.Components; +using Content.Shared.Administration; +using Content.Shared.GameTicking; +using Content.Shared.IdentityManagement; +using Robust.Server.Player; +using Robust.Shared.Console; +using Robust.Shared.Random; +using Content.Shared.Ghost; +using Content.Server.Administration.Managers; +using Content.Server.Roles; +using Content.Shared.Mind; +using Content.Shared.Mindshield.Components; +using Content.Shared.Preferences; +using Content.Server.Preferences.Managers; + +namespace Content.Server.SS220.Commands +{ + [AdminCommand(AdminFlags.VarEdit)] // Only for admins + public sealed class MakeAntagCommand : IConsoleCommand + { + [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private readonly IServerPreferencesManager _pref = default!; + + public string Command => "makerandomantag"; + public string Description => Loc.GetString("command-makerandomantag-description"); + public string Help => $"Usage: {Command}"; + + private readonly List _antagTypes = new() // TODO: When will add a cult add a cultist there + { + "Traitor", + "Thief", + "InitialInfected", + }; + + public void Execute(IConsoleShell shell, string argStr, string[] args) + { + if (args.Length == 0 || !_antagTypes.Contains(args[0])) + { + shell.WriteLine(Loc.GetString("command-makerandomantag-objective")); + return; + } + + var successEntityUid = AdminMakeRandomAntagCommand(args[0]); + + if (successEntityUid != null) + { + shell.WriteLine(Loc.GetString("command-makerandomantag-sucess", + ("Entityname", Identity.Name(successEntityUid.Value, _entityManager)), ("antag", args[0]))); + } + else + shell.WriteLine(Loc.GetString("command-makerandomantag-negative")); + } + + private EntityUid? AdminMakeRandomAntagCommand(string defaultRule) + { + var antag = _entityManager.System(); + var playerManager = IoCManager.Resolve(); + var gameTicker = _entityManager.System(); + var random = IoCManager.Resolve(); + var mindSystem = _entityManager.System(); + var roleSystem = _entityManager.System(); + var banSystem = IoCManager.Resolve(); + + var players = playerManager.Sessions + .Where(x => gameTicker.PlayerGameStatuses[x.UserId] == PlayerGameStatus.JoinedGame) + .ToList(); + + random.Shuffle(players); // Shuffle player list to be more randomly + + foreach (var player in players) + { + + var pref = (HumanoidCharacterProfile)_pref.GetPreferences(player.UserId).SelectedCharacter; + + if (!mindSystem.TryGetMind(player.UserId, out var mindId)) // Is it player or a cow? + continue; + + if (banSystem.GetRoleBans(player.UserId) is { } roleBans && + roleBans.Contains("Job:" + defaultRule)) // Do he have a roleban on THIS antag? + continue; + + if (roleSystem.MindIsAntagonist(mindId) || + _entityManager.HasComponent(player.AttachedEntity) || + _entityManager.HasComponent(player.AttachedEntity)) // Is he already lucky boy or he is ghost or he is CAPTIAN? + continue; + + if (!pref.AntagPreferences.Contains(defaultRule)) // Do he want to be a chosen antag or no? + continue; + + switch (defaultRule) // TODO: When will add a cult add a cultist there too. U can add more for fun if u want. + { + case "Traitor": + antag.ForceMakeAntag(player, defaultRule); + break; + case "Thief": + antag.ForceMakeAntag(player, defaultRule); + break; + case "InitialInfected": + antag.ForceMakeAntag(player, defaultRule); + break; + } + if (roleSystem.MindIsAntagonist(mindId)) // If he sucessfuly passed all checks and get his antag? + return player.AttachedEntity; + } + return null; + } + + + public CompletionResult GetCompletion(IConsoleShell shell, string[] args) + { + if (args.Length == 1) + { + return CompletionResult.FromOptions(_antagTypes); + } + return CompletionResult.Empty; + } + } +} diff --git a/Resources/Locale/ru-RU/ss220/Command/command.ftl b/Resources/Locale/ru-RU/ss220/Command/command.ftl new file mode 100644 index 00000000000000..dd11d5c8f05ce3 --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/Command/command.ftl @@ -0,0 +1,4 @@ +command-makerandomantag-description = Делает случайного игрока антагонистом из предложенного списка с учетом джобок. +command-makerandomantag-negative = Не повезло. +command-makerandomantag-objective = Необходимо указать тип антагониста из предложенных. +command-makerandomantag-sucess = {$Entityname} успешно стал {$antag} From bc01833ccd0a833d9b1f4c95811a590e62cc622e Mon Sep 17 00:00:00 2001 From: Maxon Date: Sat, 16 Nov 2024 18:20:15 +0000 Subject: [PATCH 06/32] Automatic changelog update --- Resources/Changelog/Changelog220.yml | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/Changelog220.yml b/Resources/Changelog/Changelog220.yml index 28bad568bbd2bb..a6602bfda96c67 100644 --- a/Resources/Changelog/Changelog220.yml +++ b/Resources/Changelog/Changelog220.yml @@ -1,13 +1,4 @@ Entries: -- author: Kemran - changes: - - message: "\u0423\u0431\u0440\u0430\u043D\u044B \u0438\u0432\u0435\u043D\u0442\u044B\ - \ \u0441 \u043D\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043D\u044B\u043C\u0438\ - \ \u0448\u0430\u0442\u0442\u043B\u0430\u043C\u0438" - type: Remove - id: 162 - time: '2024-06-07T20:52:53.0000000+00:00' - url: https://github.com/SerbiaStrong-220/space-station-14/pull/1092 - author: NightmareStalker changes: - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u043D\u0430\ @@ -5928,3 +5919,19 @@ id: 665 time: '2024-11-16T14:43:01.0000000+00:00' url: https://github.com/SerbiaStrong-220/space-station-14/pull/2238 +- author: Ady4, ReeZiiiiiiiii + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u043E \u0432\u0435\u0441\ + \u0435\u043B\u044C\u0435 \u0434\u043B\u044F \u0430\u0434\u043C\u0438\u043D\u0438\ + \u0441\u0442\u0440\u0430\u0442\u043E\u0440\u043E\u0432." + type: Add + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u043A\u043E\u043D\ + \u0441\u043E\u043B\u044C\u043D\u0430\u044F \u043A\u043E\u043C\u0430\u043D\u0434\ + \u0430 makerandomantag \u0434\u0435\u043B\u0430\u044E\u0449\u0430\u044F \u0441\ + \u043B\u0443\u0447\u0430\u0439\u043D\u043E\u0433\u043E \u0438\u0433\u0440\u043E\ + \u043A\u0430 \u0430\u043D\u0442\u0430\u0433\u043E\u043D\u0438\u0441\u0442\u043E\ + \u043C \u0438\u0437 \u0441\u043F\u0438\u0441\u043A\u0430." + type: Add + id: 666 + time: '2024-11-16T18:19:11.0000000+00:00' + url: https://github.com/SerbiaStrong-220/space-station-14/pull/2231 From 7be6bbd7d0e3e02f8222a73de926d5808e32a1cc Mon Sep 17 00:00:00 2001 From: Andrey Ushakov <10843461+Werzet@users.noreply.github.com> Date: Sun, 17 Nov 2024 20:31:52 +1000 Subject: [PATCH 07/32] Try fix labeler-approve.yml permissions --- .github/workflows/labeler-approve.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/labeler-approve.yml b/.github/workflows/labeler-approve.yml index 15b092aa3b33e4..c1b0193bec8291 100644 --- a/.github/workflows/labeler-approve.yml +++ b/.github/workflows/labeler-approve.yml @@ -7,6 +7,7 @@ on: jobs: remove_label: permissions: + contents: read pull-requests: write if: github.event.review.state == 'approved' runs-on: ubuntu-latest From ea48eff4545051a52a8cc50442edb82fbb3e6cb2 Mon Sep 17 00:00:00 2001 From: Andrey Ushakov <10843461+Werzet@users.noreply.github.com> Date: Sun, 17 Nov 2024 20:38:09 +1000 Subject: [PATCH 08/32] Update labeler-approve.yml --- .github/workflows/labeler-approve.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/labeler-approve.yml b/.github/workflows/labeler-approve.yml index c1b0193bec8291..367875af671ebb 100644 --- a/.github/workflows/labeler-approve.yml +++ b/.github/workflows/labeler-approve.yml @@ -9,6 +9,7 @@ jobs: permissions: contents: read pull-requests: write + statuses: write if: github.event.review.state == 'approved' runs-on: ubuntu-latest steps: From fb71e3ea3959aa5a94fdc1b1f1db9103789b1888 Mon Sep 17 00:00:00 2001 From: Andrey Ushakov <10843461+Werzet@users.noreply.github.com> Date: Sun, 17 Nov 2024 20:41:23 +1000 Subject: [PATCH 09/32] Update labeler-approve.yml --- .github/workflows/labeler-approve.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/labeler-approve.yml b/.github/workflows/labeler-approve.yml index 367875af671ebb..c3a2a25ddf8979 100644 --- a/.github/workflows/labeler-approve.yml +++ b/.github/workflows/labeler-approve.yml @@ -7,7 +7,7 @@ on: jobs: remove_label: permissions: - contents: read + contents: write pull-requests: write statuses: write if: github.event.review.state == 'approved' From 9bbaaaa1118eaf234de327da287251ef9708e224 Mon Sep 17 00:00:00 2001 From: chell4592 <179739134+chell4592@users.noreply.github.com> Date: Sun, 17 Nov 2024 17:46:45 +0300 Subject: [PATCH 10/32] Librarian suit resprite (#2239) --- .../entities/clothing/uniforms/jumpskirts.ftl | 2 +- .../Entities/Clothing/Uniforms/jumpskirts.yml | 10 +++--- .../Entities/Clothing/Uniforms/jumpsuits.yml | 8 +++-- .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 985 bytes .../librarian.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1179 bytes .../Uniforms/Jumpskirt/librarian.rsi/icon.png | Bin 0 -> 570 bytes .../Jumpskirt/librarian.rsi/inhand-left.png | Bin 0 -> 727 bytes .../Jumpskirt/librarian.rsi/inhand-right.png | Bin 0 -> 701 bytes .../Jumpskirt/librarian.rsi/meta.json | 30 ++++++++++++++++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 1082 bytes .../librarian.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1359 bytes .../Uniforms/Jumpsuit/librarian.rsi/icon.png | Bin 0 -> 527 bytes .../Jumpsuit/librarian.rsi/inhand-left.png | Bin 0 -> 727 bytes .../Jumpsuit/librarian.rsi/inhand-right.png | Bin 0 -> 701 bytes .../Uniforms/Jumpsuit/librarian.rsi/meta.json | 30 ++++++++++++++++++ 15 files changed, 73 insertions(+), 7 deletions(-) create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/librarian.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/librarian.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/librarian.rsi/icon.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-left.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-right.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/librarian.rsi/meta.json create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/librarian.rsi/icon.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-left.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-right.png create mode 100644 Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/librarian.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpskirts.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpskirts.ftl index 3585420bc7be5d..4abd4d3fb476e6 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpskirts.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpskirts.ftl @@ -95,7 +95,7 @@ ent-ClothingUniformJumpskirtColorBrown = коричневая юбка-комб ent-ClothingUniformJumpskirtColorMaroon = бордовая юбка-комбинезон .desc = Обычная бордовая юбка-комбинезон без знаков различия. ent-ClothingUniformJumpskirtLibrarian = юбка-комбинезон библиотекаря - .desc = Уютный красный джемпер, подходящий для хранителя книг. + .desc = Уютный зеленый джемпер, подходящий для хранителя книг. ent-ClothingUniformJumpskirtCurator = практичная юбка .desc = Она практична. Слишком практична... ent-ClothingUniformJumpskirtPerformer = юбка-комбинезон артиста diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index fe6caeec9a569d..1260093d9a9219 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -439,12 +439,14 @@ name: librarian jumpskirt description: A cosy green jumper fit for a curator of books. components: - # Corvax-Resprite begin +#SS220 librarian resprite start - type: Sprite - sprite: Corvax/Clothing/Uniforms/Jumpskirt/librarian.rsi +# sprite: Corvax/Clothing/Uniforms/Jumpskirt/librarian.rsi + sprite: SS220/Clothing/Uniforms/Jumpskirt/librarian.rsi - type: Clothing - sprite: Corvax/Clothing/Uniforms/Jumpskirt/librarian.rsi - # Corvax-Resprite end +# sprite: Corvax/Clothing/Uniforms/Jumpskirt/librarian.rsi + sprite: SS220/Clothing/Uniforms/Jumpskirt/librarian.rsi +#SS220 librarian resprite end - type: entity parent: ClothingUniformSkirtBase diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 4ad035748b260c..0dca4788de74e0 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -702,9 +702,13 @@ description: It's very... sensible. # Corvax-Resprite components: - type: Sprite - sprite: Clothing/Uniforms/Jumpsuit/librarian.rsi +#SS220 librarian resprite start +# sprite: Clothing/Uniforms/Jumpsuit/librarian.rsi + sprite: SS220/Clothing/Uniforms/Jumpsuit/librarian.rsi - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/librarian.rsi +# sprite: Clothing/Uniforms/Jumpsuit/librarian.rsi + sprite: SS220/Clothing/Uniforms/Jumpsuit/librarian.rsi +#SS220 librarian resprite end - type: entity parent: ClothingUniformBase diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/librarian.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/librarian.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000000000000000000000000000000000..20ca4a1d58a6a64677359994463b04407ac7f296 GIT binary patch literal 985 zcmV;~119{5P)Px&lSxEDRCt{2nlVTlQ5eVn7PZ4s>S=nKNQxJ1h*ScS3`(RBf(`{26L1jhR!XN9 z3Psw*L9nz~7fUTDwCG@ngDrGvia4YNX()sYl1efZ?=X#CJ7lqz*CAevscr9_#z6c1 zmIrs2_kZ8_zW46P`vU|)5ClOG1o2lITrSq&a!1(E6ZPD5V~`48#HA-`$; zTB8rjAwRP?1lX(+g0>JmH?Fbx?jAh#wP<_#96yu@6g7)nrb|WF{1DG$xzfR zY*q;Xn3hx_c3R=~$x!ykmWc7`pE3HNmQ-Q0N>J1+!b$}F(I`CiwdjvV5#A5pW|g2N zRWtD!($_T-J_x?#Iws8BC0Lk&9(uaR^wQd51R(i%4y3;*$LX z9%1EpQJ3p`yl}R+qHkshibFsyod=LDwpvof{n06;Ha79`yK#L(OQ5T}Aig-i3;@L{ zC~W~?aef)j_EvOtdrbw(tN-cc#`oLw#^!PDuiYy#rRRE@2(m>BV5simdj z`@&L73!516BCJG^*!Ly?C^%O}r!YM>$<-hC5=d=q;>plBfP-^-y%O&9cJOw`&7Izk z;>?$N18#Y40sx%ttz7+?-n2xEg;m2N@H>Bimdlya<$enQg;QBc6sqD8_=7)ynK>Ng zUINwh2vkCwy8^1|5vYVVcLJ*E5vaC5fglKiAP9mW{vmz>6+j$_D2qp600000NkvXX Hu0mjfGik|l literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/librarian.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/librarian.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..42f2fd9bc6229e033df60b8e2245a1599fe94201 GIT binary patch literal 1179 zcmV;M1Z4Y(P)Px(RY^oaRCt{2nmtS#XBfwSE)<3v_^3-|5LM4m>yVHeWGYA;DWXv#Wk`ntt<(%v zrjR{ImAcX)%EE*?MQRiVQrar*zyK|+R8+Ucf>KL3d>JLO-MEg-Vns?Lt^>NaXRsZ= zS09R-_qRNf@9zCS@8jou);)hvC=?2XLZMK+n0RDP)<=d+fWEm^zRKssweM*y=E{W= z03>D?rPh?y&&ARJwDkJK=l0KJ^(#JE9~m;eevNit8}GM|usik<(I-y{HPrLQXPgc|BOzpx-S-|lO}>(@l5REtVC??nHZ z1+a^+EhU85##R!ev5t+cq!71`SF;GE^ovC&`p+!D#OSzKJQqs~k;&*30F%+FqQ@sj z$N%Hj%j*~0yc7Mh_sVb4-_0()lkLO<&RzNdfH&XmCcBd-7}g8Ky?%|&Z?*uKpPs?G z?(NW9j(-oz>3jX!k?2IfYzJ&?B>|YZeV4s>+ye-)wWS1r*nD;;55QhL?wPrLx8QoG zl+!O3o#@w>JGc^A2B2@SA2@i-loI#)HNeMSJWk(WKXdaDalKQHLtm;rn+?M(mqad> z7T=T`xS?OsW6(}6mKN=1-E)@sabVZCN2mHy1@L6EwC?ZoII_vuz-4~=dXBMy%RG*3 z(z?HoC!2MYgslGF4}aiUOBO_@`cmz3@$5;ntwke~%Tp?T``yp3-2!gtSKI-Xcx#hJ zxp?vH$*TSfbX&io0$Ad!@%zMgGeysd?`Bwy-*=@5Zt9nP3|gcfJ_6u`@j9(d8sGo2 zPWx-Gkb3w?#CHaIL>pS?R|_}wD=I)Vw&8(*3DDZ4iA3zJ2MFRYke8-E`46$*typ-?Ck3WY+Ucu~VubR;(Pq9oH*7P_ROPj6^Mw$)7JagrgFd}&U8o{v6@Xcx9 zz$qfLo)avM;hWP0!@8IXrP3MBTsehoXG#^IrPn7W!a#vx;_CK2LJiUlB~7TIo~zsU z3QQUHTgzPjK(_I<)kqh>zJF59PtI%iy?#5S2i&^PN2Jkjjbdr ze=qan%fGU=lpq+^nT$^Hv9!E1?4}H_Ut_rQL;6Df2f4K;xiq_2@mf*^2y}PQrFYV$ zcLMO`7mLCx5De>FJKY1bf6DDfl53}X2--HE-O1B8+Rue^gO1jdDuCT^uo77=7*AV< ziQ~Y&d9Pn%C9+JQyW>cXmEg!90F<23yXg~ze@#=R93rwF0mnbv)tu4GaG>EUnuF`K zc)g}S5HO3y>o;zhvGs)O{{v#{3G@1mTSarQqRe_V~s5yVY^OA!?p-}uU_y-US((*5Zije>S002ovPDHLkV1ko9PhbE5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/librarian.rsi/icon.png b/Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/librarian.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..610d72ce48bbb55e8323666acf3c4b2cae433a6e GIT binary patch literal 570 zcmV-A0>%A_P)Px$^hrcPR9J=Wlrd-%VI0MOr?CzZq*u9;KmrXa9i$WjS4xLc3mt^GMBTecSEqpB zPy|7QICXKzAatqOx&~>7f)oN0Z;(dPB6vr_C9%UHSjp$0S98US|8o+&w>%CW-+TA} zzwd(>F=G7h&?F+I6aZ$apcYR|S}&fHA4~AC*U_HnhN^%4M(+Ltb}#I+|8!de&@|D} zoRcO^EzK%`X7-3;Ws{X!jp8L;t<-81E1NX4M**D_38^q+W=N+DY^TE(Rqk}ma9bXI%K@MP%q&b{ zI~`t@ZUxNymP6lyYqzgT{bdsKOxdJ%-y}IuH=%qEsrp6y?Pz#8j5cL@UsW0P;a0vKOPM`nA93nhK z0GjKf4+ebRdB@t^D%+1Mtj(?R9BckKOE(>wM~CsA0Q7r%s}0Cu|@`1XSg^CPx%kx4{BRCt{2nz2h8Q5?s=S1JlFN^9z6izw<~5ECNk5aOOroVqk) zp}4yE7j$Wzi)7GB2?%izsp#Z|h7_kv9bSj_h1_}e-s`>d`I_Gcj>p~Qe)oOf{NCL= z-VY!Mf*=TjAP9mW2!bF8LI%bd7-L8ja%^B?g7JO6`5hD4{H~MHBl`PiVLHzlSy^Do z`2@z6M(>@=ZqC8ZO^d1dgPogZ+08i>(gIOpKyp3-r`|x^jv=$V*zWA|-Uf5(4b0|K zQt@WG_Jd9c!E5*Jgia@b3Ma!26YoZ9N}4UKE5jAU%_`&Q7c78}3Ez_y%!1 z=4$(fdvSJJMS3PFlx=^D7X_h*08hEW$w@Z0G>YbR3ol3d+wHecSGc>lkiL&!yqgb4 zPj3hSzuy7??sdL--Ey4|8!rl!7+}?IVKtkuYPTp1t>UnJfWpwK>$r+|QJ`c9q^HJN z{M8G@2K&*tYr*;c1K$1W`K9o^9*TGP`HS))pzImIMRT#8txV@R-gqLN@6-c4vH_2Q zNQbmM1Wo3-ZUHiQvrXh54#Fq{yr>v{T|WfK0Nny~Lk8#;pc^tkw*cLAy#dBdgjCG> z{GbfbEdY@J%2OGaGC;QgQRo>E5oCaF0lFarbPJG0rXE2A;|u`Q)*~2cfXaFVW99*z zQnAdO9`_P_W_OW!m(okcGK0XnhjAI8x*owe160=|Jc*?-nQ5*}J;HzcF{H8{!AJvC z)+0poi4`F-^#~$Ez_`~S094N}t@PA51K_Gd;QRklk3e)QzW``~`y@|Rt)u_|002ov JPDHLkV1oCwQz-xd literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-right.png b/Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..53974790e31fa676fd5020f2890c6874f45fff3f GIT binary patch literal 701 zcmV;u0z&Px%cS%G+RCt{2n!!sOK@`TnEfobXmDbec7E#oLp_q_jJxJPfOb@AEJhg{{Co2_C z?V&kZYOh}WBig?phl-Sd5Dy|P_GF|X#Zyi_yq-4fWM_7FLh8;W?+42;v&rziZ|Ci7 zvJYSwhG7_nVHk#C7=~e(;f07mL`atlbZ>s1+`fCr#=M6K1ZkFWr+Z-f#Z$_xq%pfT znBJS9+?qoM8Y)t49Kjc(YS6Rl}sSNSL}T8`R7;ExNhQcDf_>)_61$dj<@sn z%?GNEd`Bvo=$IgDSO4a*|LL9Mo6PYI-8!X%m!#7C@!-8rps)fqHcQyfZlQX3EDgST zc#Q4r7B)6Zw-=Enx|#(8a!VQK^rVKdsZrFw{X#045ZbY+QJkLCkXy>cf2kGdY8D3F zJLSZ}0?n??pmo{CgX!^3`{T<`+?<~)gEt`s(&YlFG|Ti!cL4yt;9Hk%;k>EnYW5l6 z)UV*QT5#%DC{M2AYvl;#$#r4eWOOzAQXscDN2!PRk(d}q^QMi)??347*Um2F`D8!} z6rU}VO0!I#^d8`v;7;UiRlx&h7yyVScr}}%k1+{p3iLdgg-gu03k(}c2h7E{Y zK-~1z08{=J(}7n&KPTho01FxVd%#`Q2^*JlFARMO@QO=M&60H*+?m#vpn;1$3O zC^|I*HWDcX2CZhmOC$qquNeqJ`6%qNyHlaYi1^AmzgML0*XO%C6@p?{F`3X6FbFjR zL4+DG2sHyigo@Uw8L;tTDDo}<*jqCYL?i=juNep;QVK+^8L%-0LbpKxsGVInxy3mG jAk+%D{h*owhB2Feiv-^!cL;((00000NkvXXu0mjfzP>~U literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/librarian.rsi/meta.json b/Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/librarian.rsi/meta.json new file mode 100644 index 00000000000000..299b90a6e6d5f0 --- /dev/null +++ b/Resources/Textures/SS220/Clothing/Uniforms/Jumpskirt/librarian.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", + "copyright": "Made by funny_mushroom (Discord) for SS220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000000000000000000000000000000000..0766ffe01cc6d1501e30637f59e69773f3cc1954 GIT binary patch literal 1082 zcmV-A1jYM_P)Px&^hrcPRCt{2no($5RT#&Alde8oWKEN$O-f}6HDoLVOY*RiA%<>y5XxW;^kGmR zDk459Or+?`9tM@k?90Rn8z}2TL;6q$zSvp%5QoFy2mwnhiA;JgjcKlZ$V;spAJUs9 zb<=z9nhx>&UM@Mg`TpNI=ljkHd><$j3WY+UP$(4tN>4Z}dct9GQFDpb@r#;ESl=Cn zejt@>(+Q-Kj`h3jz8FX)g(s-t_jwujr-;4vy2x$s5bN&Z#Ajddr=CGKDpVsrQO+zM zk#)q5el!t4H!ApjUI1Yh3|tW((L?}!*SCCDPX9T(FPa4dzt4+qR7mR?&Mz$y>+a(G z(h}+2$@_g?%!1)$ezx>24c({^O$7EP-!d+%Z)>GmSHD`SV@1N`M_=>h`>(Y*(Ab4C z2N?ye(U;Gb|2FCUuL6 zo4I+4YwNr;_yZra{B*P4uOEvO8XDl-%?b3NMzvH2D$S=^F!*qKmg3qvKmK7~-&P6? zpKgfH-&q7`MnUTnVE)b`p`ihWPsbfiR964zuhyPgUph>Kp^z|ZHC(;D?0=Su#REV5 zI<0T}7O*%q=*Am;k=|okbF8*ir()JA6=ki-bI|&>ZvhK^W3wq<+iHYf?=cO1V^dz; z0SB!w6*6O^BO-jl3&83x74(fw{C#d($L`*{-?21k)&KVUpU4&VLjJv}3&M%MR0>$D ztZ!^K#d8JFBO&4Mb9X!n9;Xiwi-g3rTZ@hsUMdCreQvxi4S%28*7!m5Px@1-vtn#? zq@#bu6$*typ-?Ck3WY+UP$(1%#s8GY)##rkR)2t#-%3}8dctAhiumvZHAp4J_+XOK z=bsSk?&1UUw~m*_0Is@@i`@1O!8hM!;n(GcFZck&@2jg)K1f%FEUKkC(L{iiqYoIr zJx6YP$Ehi4a@#wM-=1UT=mVmOK(jdN1gQnEc0Za3U=|GW*|OEG!KD|TckF~LmX_5Q zU>1yK!-Q-qNG-sPE7wU+&!QU@06amBe6~zl&oDC?XQ98pdS5Y0RY!-EjqI2 z=oXktoo&l?Yx12gjzXgl`f&A8vp3*LKG{V&Y{o`Mgx96DH7QigdPn;LI_ZaW1l+xM z|H%FwIIQlFR$4W!2t4dfP$(1%g+ifFDE`Cz1p?Lv_ltBJ&j0`b07*qoM6N<$g0H6u A+5i9m literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..6e384aa6c7343a4cca6f44518d55224312121b33 GIT binary patch literal 1359 zcmV-V1+e;wP)Px)2}wjjRCt{2nlVfpR~X0tE)<3vz~CC$h$v^Mb&)IwbX1{nqzF}sl%X98v{Exv znL_p;Rq9HIC<_zn6sb`dNNKAy0|P`*sVG*9MG7ayaRH-Nwu@^xGu)C!Tn6hs&i2{y zd*%#P-fwx_uYH%?EC(JKp+qZ1OkEJ?Zn0MWqEYi1b~70XZX?3>9wCqZgcHg zKL8*(x5U&ZtG=#f008cgj~=%kW7V(u%kt>3=?O^i`@HzfKZ>34FA;nB3TjI;&VKtH z9;WAz&Sa6>HXKQURX?4{R%}`I-{BE|n4ZJc#YLzs&A7U_NC)rtdEp62bfz2^wGN&~ z|BVT-im$IEsaRq&1*NqKiOm!hC+Ckd36=EiS|0s3CSY=Gf_AQJ87eXrn+5<(#inh~ zPmWF0IrQrKc7x~9uew%#kNsix%01Xh{*5cwKL-H3|4AQm+XliBxk%g-knrcvn*e}? znOTtQK2Xnd?+4ZNJprk#<n_&!x+U%yn3h1LOp_(y^b&9a<|RNfO{P9+$(?BwrTV;Z&4AK7UFo>n5v z^?6`QK(%a_Zir5B()tuN6g1UP&@BDjC{9{mAP@)y0)apv5WJ*02G`eEdB97G)C^tARLitRVbaw;_}UlV4ayv32=vev?2_k z$S`qh>jl&n<_X1&+R}_$TQ7=C8P-^=)|pyhek)9bN^AA=3sESoO|0E9qqH_*ej!@s z3$P}G1*TgzIW~b{UpEq)DXjgsieKLS4eKjOgd;MhV$=AFS)LE8DZ>+xFw*k{2Gqeq zZ2lCk&n?y57gGX)eckAld(bQQ004gYeu;Vo!Vwv_FP#JC{$U#pBeyS|L)bF-+_r&% zu|ZtBGQ`y%Qv$4pgSF^tQF)peCK`ct@ScE#wdg8>ecfd-)&iG506@hWy^}sc;K(#p z$sxk(5#ZjokF!S4LP5i48-wGxJsvX<44QWBoxAr6$8H|+5;yYQSclVg<^Q@2013;1RBen3ix^4HBeY$P)vXKfp?SCtGh9C#qd{0)QinN+UTg z&AJj`=M`!+^~S)J0OAiiE!0yQuj~J7Lu>L5X>;w|rSPx$$w@>(R9J=WlrcyfVHk#=(^Q8PidQ*FAcCRAE=oZ;K?hNaLqV6=?k?i$6c8Ll zC=?-`TpThKTx=#?579vpu}jR*8i`rFqsP_QAqXn@9rV&f2>!p|`GL?Z^6D)N#En8|Sgkli`?Z^F*-uC=*NJiBvJ*Dr%q0$!m^Ddzx?1$u|NupO80 z$&Yp7rJO@42X80d$m+`_kcf@2ypVz#aX$&a_6~Icu)L6B_)7jeNEuj4%~x02kGWC3 z-~SLwXBhu9D%#^=yh52qweVw8=?tZ>0Jz(ONJDXdPgGDcP-_Bim(#D05eJ1I5rF1- z=#>iRTZhaHOtG<;W@ccDi@iL0rGn;p$_A8nVB*7|FxtZCufm-DE8~{R+<&iIyHB?R zKEH}C_Mg8T9RAk&d%8um<26QG_%Wl@5&-D$>8?I}1GVq!V95jm0s;a8ZU7g0+P{Cn Rc;Ns5002ovPDHLkV1mA9?M(mx literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-left.png b/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..7b950cc905ce7d95c7f764586bdca3bb4589b055 GIT binary patch literal 727 zcmV;|0x127P)Px%kx4{BRCt{2nz2h8Q5?s=S1JlFN^9z6izw<~5ECNk5aOOroVqk) zp}4yE7j$Wzi)7GB2?%izsp#Z|h7_kv9bSj_h1_}e-s`>d`I_Gcj>p~Qe)oOf{NCL= z-VY!Mf*=TjAP9mW2!bF8LI%bd7-L8ja%^B?g7JO6`5hD4{H~MHBl`PiVLHzlSy^Do z`2@z6M(>@=ZqC8ZO^d1dgPogZ+08i>(gIOpKyp3-r`|x^jv=$V*zWA|-Uf5(4b0|K zQt@WG_Jd9c!E5*Jgia@b3Ma!26YoZ9N}4UKE5jAU%_`&Q7c78}3Ez_y%!1 z=4$(fdvSJJMS3PFlx=^D7X_h*08hEW$w@Z0G>YbR3ol3d+wHecSGc>lkiL&!yqgb4 zPj3hSzuy7??sdL--Ey4|8!rl!7+}?IVKtkuYPTp1t>UnJfWpwK>$r+|QJ`c9q^HJN z{M8G@2K&*tYr*;c1K$1W`K9o^9*TGP`HS))pzImIMRT#8txV@R-gqLN@6-c4vH_2Q zNQbmM1Wo3-ZUHiQvrXh54#Fq{yr>v{T|WfK0Nny~Lk8#;pc^tkw*cLAy#dBdgjCG> z{GbfbEdY@J%2OGaGC;QgQRo>E5oCaF0lFarbPJG0rXE2A;|u`Q)*~2cfXaFVW99*z zQnAdO9`_P_W_OW!m(okcGK0XnhjAI8x*owe160=|Jc*?-nQ5*}J;HzcF{H8{!AJvC z)+0poi4`F-^#~$Ez_`~S094N}t@PA51K_Gd;QRklk3e)QzW``~`y@|Rt)u_|002ov JPDHLkV1oCwQz-xd literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-right.png b/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..53974790e31fa676fd5020f2890c6874f45fff3f GIT binary patch literal 701 zcmV;u0z&Px%cS%G+RCt{2n!!sOK@`TnEfobXmDbec7E#oLp_q_jJxJPfOb@AEJhg{{Co2_C z?V&kZYOh}WBig?phl-Sd5Dy|P_GF|X#Zyi_yq-4fWM_7FLh8;W?+42;v&rziZ|Ci7 zvJYSwhG7_nVHk#C7=~e(;f07mL`atlbZ>s1+`fCr#=M6K1ZkFWr+Z-f#Z$_xq%pfT znBJS9+?qoM8Y)t49Kjc(YS6Rl}sSNSL}T8`R7;ExNhQcDf_>)_61$dj<@sn z%?GNEd`Bvo=$IgDSO4a*|LL9Mo6PYI-8!X%m!#7C@!-8rps)fqHcQyfZlQX3EDgST zc#Q4r7B)6Zw-=Enx|#(8a!VQK^rVKdsZrFw{X#045ZbY+QJkLCkXy>cf2kGdY8D3F zJLSZ}0?n??pmo{CgX!^3`{T<`+?<~)gEt`s(&YlFG|Ti!cL4yt;9Hk%;k>EnYW5l6 z)UV*QT5#%DC{M2AYvl;#$#r4eWOOzAQXscDN2!PRk(d}q^QMi)??347*Um2F`D8!} z6rU}VO0!I#^d8`v;7;UiRlx&h7yyVScr}}%k1+{p3iLdgg-gu03k(}c2h7E{Y zK-~1z08{=J(}7n&KPTho01FxVd%#`Q2^*JlFARMO@QO=M&60H*+?m#vpn;1$3O zC^|I*HWDcX2CZhmOC$qquNeqJ`6%qNyHlaYi1^AmzgML0*XO%C6@p?{F`3X6FbFjR zL4+DG2sHyigo@Uw8L;tTDDo}<*jqCYL?i=juNep;QVK+^8L%-0LbpKxsGVInxy3mG jAk+%D{h*owhB2Feiv-^!cL;((00000NkvXXu0mjfzP>~U literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/librarian.rsi/meta.json b/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/librarian.rsi/meta.json new file mode 100644 index 00000000000000..299b90a6e6d5f0 --- /dev/null +++ b/Resources/Textures/SS220/Clothing/Uniforms/Jumpsuit/librarian.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", + "copyright": "Made by funny_mushroom (Discord) for SS220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From 7835159f37f48546d304a730be93dd24f700a475 Mon Sep 17 00:00:00 2001 From: Maxon Date: Sun, 17 Nov 2024 14:47:49 +0000 Subject: [PATCH 11/32] Automatic changelog update --- Resources/Changelog/Changelog220.yml | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/Resources/Changelog/Changelog220.yml b/Resources/Changelog/Changelog220.yml index a6602bfda96c67..87e0a31f43c3fd 100644 --- a/Resources/Changelog/Changelog220.yml +++ b/Resources/Changelog/Changelog220.yml @@ -1,16 +1,4 @@ Entries: -- author: NightmareStalker - changes: - - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u043D\u0430\ - \u0437\u0432\u0430\u043D\u0438\u044F \u0438 \u043E\u043F\u0438\u0441\u0430\u043D\ - \u0438\u044F \u043F\u043B\u0430\u0442 \u0434\u043B\u044F \u041B\u0435\u0432\u043E\ - \u0433\u043E \u0438 \u041F\u0440\u0430\u0432\u043E\u0433\u043E \u0438\u0437\u043B\ - \u0443\u0447\u0430\u0442\u0435\u043B\u0435\u0439 \u0423\u0441\u043A\u043E\u0440\ - \u0438\u0442\u0435\u043B\u044F \u0427\u0430\u0441\u0442\u0438\u0446" - type: Fix - id: 163 - time: '2024-06-07T21:28:18.0000000+00:00' - url: https://github.com/SerbiaStrong-220/space-station-14/pull/1094 - author: MIXnikita changes: - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u044B \u0442\u0435\u043A\u0441\ @@ -5935,3 +5923,14 @@ id: 666 time: '2024-11-16T18:19:11.0000000+00:00' url: https://github.com/SerbiaStrong-220/space-station-14/pull/2231 +- author: funny_mushroom + changes: + - message: "\u041E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u044B \u0441\u043F\u0440\ + \u0430\u0439\u0442\u044B \u043A\u043E\u043C\u0431\u0438\u043D\u0435\u0437\u043E\ + \u043D\u0430 \u0438 \u044E\u0431\u043A\u0438-\u043A\u043E\u043C\u0431\u0438\u043D\ + \u0435\u0437\u043E\u043D\u0430 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\ + \u043A\u0430\u0440\u044F!" + type: Tweak + id: 667 + time: '2024-11-17T14:46:45.0000000+00:00' + url: https://github.com/SerbiaStrong-220/space-station-14/pull/2239 From 862c8e9240fc8b8d11e974c932c107c146bd20b8 Mon Sep 17 00:00:00 2001 From: spook <135381384+spo9k@users.noreply.github.com> Date: Sun, 17 Nov 2024 17:52:52 +0300 Subject: [PATCH 12/32] Donuts Update map (#2227) * Donuts 1 * upd upd --- Resources/Maps/SS220/Donuts.yml | 3827 +++++++++---------------------- 1 file changed, 1067 insertions(+), 2760 deletions(-) diff --git a/Resources/Maps/SS220/Donuts.yml b/Resources/Maps/SS220/Donuts.yml index 8572e8edce0d5f..c522b1c08cf0dc 100644 --- a/Resources/Maps/SS220/Donuts.yml +++ b/Resources/Maps/SS220/Donuts.yml @@ -62,6 +62,7 @@ tilemap: 106: FloorMarbleInnerSW 104: FloorMarbleVerticalBW 91: FloorMarbleVerticalWB + 130: FloorMarbleWhite 67: FloorMetalDiamond 68: FloorMime 70: FloorMiningDark @@ -218,11 +219,11 @@ entities: version: 6 1,-1: ind: 1,-1 - tiles: KQAAAAAAfwAAAAAAcQAAAAABcQAAAAADcQAAAAAAHwAAAAAAHwAAAAAAfwAAAAAAbAAAAAAAbAAAAAAATwAAAAAAMwAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAMwAAAAAAKQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbAAAAAAAbAAAAAADTwAAAAABUAAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAUAAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAfwAAAAAAKQAAAAAAKQAAAAAAfwAAAAAAbAAAAAAAbAAAAAAATwAAAAADMwAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAMwAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAfwAAAAAAbAAAAAABbAAAAAACTwAAAAABfwAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAfwAAAAAAKQAAAAAAfwAAAAAAKQAAAAAAKQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbAAAAAABbAAAAAACTwAAAAADfwAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAfwAAAAAAXgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbAAAAAACbAAAAAACbAAAAAAAbAAAAAAAbAAAAAAATwAAAAACHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAXgAAAAACXgAAAAABXgAAAAADXgAAAAADXgAAAAABbAAAAAADbAAAAAACbAAAAAADbAAAAAACbAAAAAACTwAAAAAAfwAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAfwAAAAAAXgAAAAABXgAAAAADXgAAAAACXgAAAAACXgAAAAAAZgAAAAACZgAAAAAAZgAAAAAAZgAAAAADZgAAAAACTwAAAAABfwAAAAAAMwAAAAAAUAAAAAAAMwAAAAAAfwAAAAAAXgAAAAABXgAAAAABXgAAAAABXgAAAAACXgAAAAAAawAAAAADawAAAAABawAAAAADawAAAAACawAAAAAATwAAAAACTwAAAAADTwAAAAABTwAAAAAATwAAAAADTwAAAAABfwAAAAAAfwAAAAAAgAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbAAAAAABawAAAAAAawAAAAADawAAAAACawAAAAABawAAAAADawAAAAADawAAAAABawAAAAACawAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAfwAAAAAAZgAAAAACawAAAAADawAAAAABawAAAAADawAAAAAAawAAAAAAawAAAAAAawAAAAABawAAAAAAawAAAAACgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAfwAAAAAAAQAAAAAAaQAAAAAAaQAAAAAAAQAAAAAAfwAAAAAAXgAAAAACXgAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAVwAAAAAAVwAAAAAAfwAAAAAASwAAAAAAXgAAAAABMAAAAAAASwAAAAAAfwAAAAAAXgAAAAABXgAAAAADfwAAAAAAXgAAAAADXgAAAAAACAAAAAAACAAAAAAACAAAAAAAVwAAAAAAVwAAAAAAfwAAAAAASwAAAAAAMAAAAAACXgAAAAAASwAAAAAAfwAAAAAAXgAAAAADXgAAAAADXgAAAAACXgAAAAABXgAAAAACCAAAAAAACAAAAAAACAAAAAAAVwAAAAAAVwAAAAAAfwAAAAAASwAAAAAAXgAAAAADMAAAAAAASwAAAAAAfwAAAAAAXgAAAAADXgAAAAAAXgAAAAAAXgAAAAABXgAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAAfwAAAAAASwAAAAAAMAAAAAABXgAAAAADSwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAADXgAAAAAC + tiles: KQAAAAAAfwAAAAAAggAAAAAAggAAAAAAcQAAAAAAggAAAAAAggAAAAAAfwAAAAAAbAAAAAAAbAAAAAAATwAAAAAAMwAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAMwAAAAAAKQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbAAAAAAAbAAAAAADTwAAAAABUAAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAUAAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAfwAAAAAAKQAAAAAAKQAAAAAAfwAAAAAAbAAAAAAAbAAAAAAATwAAAAADMwAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAMwAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAfwAAAAAAbAAAAAABbAAAAAACTwAAAAABfwAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAfwAAAAAAKQAAAAAAfwAAAAAAKQAAAAAAKQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbAAAAAABbAAAAAACTwAAAAADfwAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAfwAAAAAAXgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbAAAAAACbAAAAAACbAAAAAAAbAAAAAAAbAAAAAAATwAAAAACHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAXgAAAAACXgAAAAABXgAAAAADXgAAAAADXgAAAAABbAAAAAADbAAAAAACbAAAAAADbAAAAAACbAAAAAACTwAAAAAAfwAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAfwAAAAAAXgAAAAABXgAAAAADXgAAAAACXgAAAAACXgAAAAAAZgAAAAACZgAAAAAAZgAAAAAAZgAAAAADZgAAAAACTwAAAAABfwAAAAAAMwAAAAAAUAAAAAAAMwAAAAAAfwAAAAAAXgAAAAABXgAAAAABXgAAAAABXgAAAAACXgAAAAAAawAAAAADawAAAAABawAAAAADawAAAAACawAAAAAATwAAAAACTwAAAAADTwAAAAABTwAAAAAATwAAAAADTwAAAAABfwAAAAAAfwAAAAAAgAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbAAAAAABawAAAAAAawAAAAADawAAAAACawAAAAABawAAAAADawAAAAADawAAAAABawAAAAACawAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAfwAAAAAAZgAAAAACawAAAAADawAAAAABawAAAAADawAAAAAAawAAAAAAawAAAAAAawAAAAABawAAAAAAawAAAAACgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAfwAAAAAAAQAAAAAAaQAAAAAAaQAAAAAAAQAAAAAAfwAAAAAAXgAAAAACXgAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAVwAAAAAAVwAAAAAAfwAAAAAASwAAAAAAXgAAAAABMAAAAAAASwAAAAAAfwAAAAAAXgAAAAABXgAAAAADfwAAAAAAXgAAAAADXgAAAAAACAAAAAAACAAAAAAACAAAAAAAVwAAAAAAVwAAAAAAfwAAAAAASwAAAAAAMAAAAAACXgAAAAAASwAAAAAAfwAAAAAAXgAAAAADXgAAAAADXgAAAAACXgAAAAABXgAAAAACCAAAAAAACAAAAAAACAAAAAAAVwAAAAAAVwAAAAAAfwAAAAAASwAAAAAAXgAAAAADMAAAAAAASwAAAAAAfwAAAAAAXgAAAAADXgAAAAAAXgAAAAAAXgAAAAABXgAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAAfwAAAAAASwAAAAAAMAAAAAABXgAAAAADSwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAADXgAAAAAC version: 6 1,-2: ind: 1,-2 - tiles: cQAAAAADcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAUAAAAAAAdgAAAAAAfwAAAAAAfwAAAAAAdgAAAAAAHwAAAAAAfwAAAAAAawAAAAAAawAAAAAAfwAAAAAAbAAAAAAAcQAAAAAAcQAAAAAAcQAAAAACcQAAAAAAfwAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAfwAAAAAAbAAAAAABcQAAAAAAcQAAAAAAcQAAAAABcQAAAAACfwAAAAAAZQAAAAAAZQAAAAAAOAAAAAAAOAAAAAAAOAAAAAAAOAAAAAAAOAAAAAAAZQAAAAAAZQAAAAAAfwAAAAAAbAAAAAACdgAAAAAAcQAAAAAAdgAAAAAAcQAAAAADfwAAAAAAZQAAAAAAZQAAAAAAOAAAAAAAOAAAAAAAOAAAAAAAOAAAAAAAOAAAAAAAZQAAAAAAZQAAAAAAawAAAAAAbAAAAAAAcQAAAAABcQAAAAAAcQAAAAADcQAAAAABcQAAAAAAZQAAAAAAZQAAAAAAOAAAAAAAOAAAAAAAOAAAAAAAOAAAAAAAOAAAAAAAZQAAAAAAZQAAAAAAawAAAAAAbAAAAAACcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAUAAAAAAAZQAAAAAAZQAAAAAAOAAAAAAAOAAAAAAAOAAAAAAAOAAAAAAAOAAAAAAAZQAAAAAAZQAAAAAAUAAAAAAAbAAAAAADcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAABcQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAUAAAAAAAbAAAAAACcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAADfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAcQAAAAACUAAAAAAAfwAAAAAAawAAAAAAawAAAAAAfwAAAAAAbAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAACUAAAAAAAcQAAAAAAcQAAAAACcQAAAAACcQAAAAAAcQAAAAADcQAAAAABfwAAAAAAZgAAAAAAawAAAAACawAAAAAAZgAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAdgAAAAAAcQAAAAABcQAAAAAAcQAAAAABcQAAAAACcQAAAAAAcQAAAAACfwAAAAAAbAAAAAADawAAAAACawAAAAAAZgAAAAADcQAAAAABcQAAAAACcQAAAAADcQAAAAAAUAAAAAAAcQAAAAAAcQAAAAAAcQAAAAADcQAAAAADcQAAAAACcQAAAAAAfwAAAAAAbAAAAAAAawAAAAAAawAAAAAAZgAAAAAAcQAAAAAAdgAAAAAAdgAAAAAAcQAAAAACfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAcQAAAAAAUAAAAAAAfwAAAAAAbAAAAAAAawAAAAADawAAAAAAZgAAAAADcQAAAAABcQAAAAABcQAAAAACcQAAAAADHwAAAAAAHwAAAAAAHwAAAAAAfwAAAAAAZgAAAAAAawAAAAADawAAAAABawAAAAABZgAAAAADawAAAAACawAAAAAAZgAAAAADcQAAAAABcQAAAAACcQAAAAABcQAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfwAAAAAAbAAAAAADbAAAAAACbAAAAAACZgAAAAABawAAAAAAawAAAAADawAAAAACZgAAAAADfwAAAAAAfwAAAAAAcQAAAAADcQAAAAAAHwAAAAAAcQAAAAACHwAAAAAAfwAAAAAAbAAAAAADbAAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAKQAAAAAAKQAAAAAAcQAAAAAAcQAAAAABcQAAAAADHwAAAAAAHwAAAAAAfwAAAAAAbAAAAAAAbAAAAAAATwAAAAACfwAAAAAAUAAAAAAAHQAAAAAAUAAAAAAAfwAAAAAA + tiles: TwAAAAAAggAAAAAATwAAAAAAggAAAAAAfwAAAAAAUAAAAAAAdgAAAAAAfwAAAAAAfwAAAAAAdgAAAAAAHwAAAAAAfwAAAAAAawAAAAAAawAAAAAAfwAAAAAAbAAAAAAAggAAAAAATwAAAAAAggAAAAAAggAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAbAAAAAABggAAAAAAggAAAAAAggAAAAAAggAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAbAAAAAACdgAAAAAAcQAAAAAAdgAAAAAAcQAAAAADfwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAawAAAAAAbAAAAAAAcQAAAAABcQAAAAAAcQAAAAADcQAAAAABcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAawAAAAAAbAAAAAACcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAUAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAUAAAAAAAbAAAAAADcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAABcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAUAAAAAAAbAAAAAACcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAADfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAcQAAAAACUAAAAAAAfwAAAAAAawAAAAAAawAAAAAAfwAAAAAAbAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAACUAAAAAAAcQAAAAAAcQAAAAACcQAAAAACcQAAAAAAcQAAAAADcQAAAAABfwAAAAAAZgAAAAAAawAAAAACawAAAAAAZgAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAdgAAAAAAcQAAAAABcQAAAAAAcQAAAAABcQAAAAACcQAAAAAAcQAAAAACfwAAAAAAbAAAAAADawAAAAACawAAAAAAZgAAAAADcQAAAAABcQAAAAACcQAAAAADcQAAAAAAUAAAAAAAcQAAAAAAcQAAAAAAcQAAAAADcQAAAAADcQAAAAACcQAAAAAAfwAAAAAAbAAAAAAAawAAAAAAawAAAAAAZgAAAAAAcQAAAAAAdgAAAAAAdgAAAAAAcQAAAAACfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAcQAAAAAAUAAAAAAAfwAAAAAAbAAAAAAAawAAAAADawAAAAAAZgAAAAADggAAAAAAggAAAAAAggAAAAAAggAAAAAAHwAAAAAAggAAAAAAggAAAAAAfwAAAAAAZgAAAAAAawAAAAADawAAAAABawAAAAABZgAAAAADawAAAAACawAAAAAAZgAAAAADggAAAAAAggAAAAAAggAAAAAAggAAAAAAHwAAAAAAggAAAAAAggAAAAAAfwAAAAAAbAAAAAADbAAAAAACbAAAAAACZgAAAAABawAAAAAAawAAAAADawAAAAACZgAAAAADfwAAAAAAfwAAAAAAggAAAAAAggAAAAAAHwAAAAAAggAAAAAAggAAAAAAfwAAAAAAbAAAAAADbAAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAKQAAAAAAKQAAAAAAggAAAAAAggAAAAAAcQAAAAADggAAAAAAggAAAAAAfwAAAAAAbAAAAAAAbAAAAAAATwAAAAACfwAAAAAAUAAAAAAAHQAAAAAAUAAAAAAAfwAAAAAA version: 6 2,-1: ind: 2,-1 @@ -266,7 +267,7 @@ entities: version: 6 0,-2: ind: 0,-2 - tiles: aQAAAAAAaQAAAAADbQAAAAAAbQAAAAAAbQAAAAAAUAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAABcQAAAAABaQAAAAACfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAfwAAAAAAcQAAAAAAcQAAAAADcQAAAAACcQAAAAABcQAAAAABcQAAAAABfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAcQAAAAABcQAAAAAAcQAAAAABcQAAAAAAcQAAAAAAcQAAAAAAdAAAAAAAfwAAAAAAQwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAaAAAAAAAfwAAAAAAfwAAAAAAXgAAAAACfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAcQAAAAADcQAAAAACcQAAAAAAfwAAAAAAcQAAAAABaAAAAAAAfwAAAAAAXgAAAAAAXgAAAAABXgAAAAABfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAcQAAAAABcQAAAAABcQAAAAABcQAAAAACcQAAAAACfwAAAAAAcQAAAAACaAAAAAAAPwAAAAAAXgAAAAAAXgAAAAADXgAAAAACfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAcQAAAAAAcQAAAAABcQAAAAAAcQAAAAAAcQAAAAADdgAAAAAAcQAAAAADagAAAAAAfwAAAAAAXgAAAAAAXgAAAAADXgAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcQAAAAACcQAAAAADcQAAAAADcQAAAAABcQAAAAADcQAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAFAAAAAAAFAAAAAAAFQAAAAAAfwAAAAAAcQAAAAACcQAAAAACcQAAAAACcQAAAAAAUAAAAAAAcQAAAAACLwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAFAAAAAAAFAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAABcQAAAAACcQAAAAADcQAAAAADLwAAAAAAfwAAAAAAgwAAAAABfwAAAAAAfwAAAAAAgwAAAAAAFQAAAAAAFAAAAAAAFAAAAAAAfwAAAAAAEQAAAAAAEQAAAAAAHwAAAAAAEQAAAAAAfwAAAAAAcQAAAAABLwAAAAAAfwAAAAAADQAAAAAAgwAAAAAAfwAAAAAAbgAAAAAAFAAAAAAAbgAAAAAAbgAAAAAAfwAAAAAAEQAAAAAAEQAAAAAAfwAAAAAAEQAAAAAAfwAAAAAAcQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAEQAAAAAAEQAAAAAAfwAAAAAAEQAAAAAAEQAAAAAAcQAAAAABfwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAABwAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAdgAAAAAAcQAAAAACDwAAAAAAQwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAQwAAAAAAfwAAAAAABwAAAAAABwAAAAAKfwAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAKQAAAAAA + tiles: aQAAAAAAaQAAAAADbQAAAAAAbQAAAAAAbQAAAAAAUAAAAAAAggAAAAAAggAAAAAAggAAAAAAfwAAAAAAggAAAAAATwAAAAAAggAAAAAAggAAAAAATwAAAAAAggAAAAAAaQAAAAACfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAggAAAAAAggAAAAAAggAAAAAAfwAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAdAAAAAAAfwAAAAAAQwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAaAAAAAAAfwAAAAAAfwAAAAAAXgAAAAACfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAcQAAAAADcQAAAAACcQAAAAAAfwAAAAAAcQAAAAABaAAAAAAAfwAAAAAAXgAAAAAAXgAAAAABXgAAAAABfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAcQAAAAABcQAAAAABcQAAAAABcQAAAAACcQAAAAACfwAAAAAAcQAAAAACaAAAAAAAPwAAAAAAXgAAAAAAXgAAAAADXgAAAAACfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAcQAAAAAAcQAAAAABcQAAAAAAcQAAAAAAcQAAAAADdgAAAAAAcQAAAAADagAAAAAAfwAAAAAAXgAAAAAAXgAAAAADXgAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcQAAAAACcQAAAAADcQAAAAADcQAAAAABcQAAAAADcQAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAFAAAAAAAFAAAAAAAFQAAAAAAfwAAAAAAcQAAAAACcQAAAAACcQAAAAACcQAAAAAAUAAAAAAAcQAAAAACLwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAFAAAAAAAFAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAABcQAAAAACcQAAAAADcQAAAAADLwAAAAAAfwAAAAAAgwAAAAABfwAAAAAAfwAAAAAAgwAAAAAAFQAAAAAAFAAAAAAAFAAAAAAAfwAAAAAAEQAAAAAAEQAAAAAAHwAAAAAAEQAAAAAAfwAAAAAAcQAAAAABLwAAAAAAfwAAAAAADQAAAAAAgwAAAAAAfwAAAAAAbgAAAAAAFAAAAAAAbgAAAAAAbgAAAAAAfwAAAAAAEQAAAAAAEQAAAAAAfwAAAAAAEQAAAAAAfwAAAAAAcQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAEQAAAAAAEQAAAAAAfwAAAAAAEQAAAAAAEQAAAAAAggAAAAAAfwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAABwAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAdgAAAAAAggAAAAAADwAAAAAAQwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAQwAAAAAAfwAAAAAABwAAAAAABwAAAAAKfwAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAKQAAAAAA version: 6 -2,-3: ind: -2,-3 @@ -278,11 +279,11 @@ entities: version: 6 0,-3: ind: 0,-3 - tiles: MAAAAAAAMAAAAAAAXgAAAAAAXgAAAAABXgAAAAABXgAAAAAAXgAAAAAAaQAAAAAAXgAAAAABXgAAAAABXgAAAAADXgAAAAAAXgAAAAABXgAAAAABXgAAAAADXgAAAAACMAAAAAAAMAAAAAAAXgAAAAADXgAAAAACXgAAAAADXgAAAAACXgAAAAACaQAAAAAAXgAAAAACXgAAAAACXgAAAAACXgAAAAACXgAAAAADXgAAAAABXgAAAAACXgAAAAADMAAAAAAAMAAAAAAAXgAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAMAAAAAAAMAAAAAAAXgAAAAACgQAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAOAAAAAAAOAAAAAAAgQAAAAAAOAAAAAAAOAAAAAAAgQAAAAAAOAAAAAAAOAAAAAAAMAAAAAAAMAAAAAAAXgAAAAACgQAAAAAAOAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAOAAAAAAAOAAAAAAAgQAAAAAAOAAAAAAAOAAAAAAAMAAAAAAAMAAAAAAAXgAAAAACXgAAAAACXgAAAAAAXgAAAAACXgAAAAABaQAAAAAAXgAAAAADXgAAAAACXgAAAAAAXgAAAAAAXgAAAAABXgAAAAABXgAAAAABXgAAAAAAMAAAAAAAMAAAAAAAXgAAAAACXgAAAAABXgAAAAABXgAAAAACXgAAAAAAaQAAAAAAXgAAAAABXgAAAAACXgAAAAABXgAAAAAAXgAAAAACXgAAAAAAXgAAAAABXgAAAAABXgAAAAADXgAAAAAAXgAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAXgAAAAADXgAAAAABfwAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUAAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAXgAAAAAAXgAAAAADXgAAAAACfwAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAdgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfwAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUAAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAXgAAAAADXgAAAAAAXgAAAAABfwAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUAAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAdgAAAAAAUAAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAfwAAAAAAcQAAAAACcQAAAAAAcQAAAAADcQAAAAACcQAAAAABcQAAAAABfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAACcQAAAAABfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAUAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAdgAAAAAAcQAAAAAAcQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAcQAAAAAA + tiles: MAAAAAAAMAAAAAAAXgAAAAAAXgAAAAABXgAAAAABXgAAAAAAXgAAAAAAaQAAAAAAXgAAAAABXgAAAAABXgAAAAADXgAAAAAAXgAAAAABXgAAAAABXgAAAAADXgAAAAACMAAAAAAAMAAAAAAAXgAAAAADXgAAAAACXgAAAAADXgAAAAACXgAAAAACaQAAAAAAXgAAAAACXgAAAAACXgAAAAACXgAAAAACXgAAAAADXgAAAAABXgAAAAACXgAAAAADMAAAAAAAMAAAAAAAXgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAQgAAAAAAAgAAAAAAAgAAAAAAMAAAAAAAMAAAAAAAXgAAAAACQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAMAAAAAAAMAAAAAAAXgAAAAACAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAQgAAAAAAAgAAAAAAAgAAAAAAMAAAAAAAMAAAAAAAXgAAAAACXgAAAAACXgAAAAAAXgAAAAACXgAAAAABaQAAAAAAXgAAAAADXgAAAAACXgAAAAAAXgAAAAAAXgAAAAABXgAAAAABXgAAAAABXgAAAAAAMAAAAAAAMAAAAAAAXgAAAAACXgAAAAABXgAAAAABXgAAAAACXgAAAAAAaQAAAAAAXgAAAAABXgAAAAACXgAAAAABXgAAAAAAXgAAAAACXgAAAAAAXgAAAAABXgAAAAABXgAAAAADXgAAAAAAXgAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAXgAAAAADXgAAAAABfwAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUAAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAXgAAAAAAXgAAAAADXgAAAAACfwAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAdgAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfwAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUAAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAXgAAAAADXgAAAAAAXgAAAAABfwAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUAAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAdgAAAAAAUAAAAAAAfwAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAggAAAAAAggAAAAAAggAAAAAAfwAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAggAAAAAAggAAAAAAggAAAAAAfwAAAAAAggAAAAAATwAAAAAAggAAAAAAggAAAAAATwAAAAAAggAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAUAAAAAAAggAAAAAAggAAAAAAggAAAAAAdgAAAAAAggAAAAAAggAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAggAAAAAA version: 6 1,-3: ind: 1,-3 - tiles: XgAAAAABXgAAAAACXgAAAAACXgAAAAACXgAAAAADXgAAAAACXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAACXgAAAAACXgAAAAAAXgAAAAADXgAAAAACXgAAAAAAXgAAAAADXgAAAAADXgAAAAACXgAAAAABXgAAAAABXgAAAAABXgAAAAACXgAAAAABXgAAAAABXgAAAAACXgAAAAACXgAAAAACXgAAAAACXgAAAAACXgAAAAACXgAAAAADXgAAAAACgQAAAAAAOAAAAAAAgQAAAAAAOAAAAAAAOAAAAAAAgQAAAAAAOAAAAAAAOAAAAAAAXgAAAAACXgAAAAAAXgAAAAAAXgAAAAABXgAAAAADXgAAAAADXgAAAAADXgAAAAABgQAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAOAAAAAAAXgAAAAABXgAAAAABUwAAAAAAUwAAAAAAUwAAAAAAXgAAAAAAXgAAAAACXgAAAAACgQAAAAAAOAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAOAAAAAAAXgAAAAABXgAAAAABUwAAAAAAUwAAAAAAUwAAAAAAXgAAAAABXgAAAAAAXgAAAAAAXgAAAAABXgAAAAADXgAAAAABXgAAAAAAXgAAAAADXgAAAAABXgAAAAAAXgAAAAACXgAAAAACXgAAAAACXgAAAAAAXgAAAAABXgAAAAABXgAAAAABXgAAAAAAXgAAAAABXgAAAAACXgAAAAADXgAAAAABXgAAAAABXgAAAAACXgAAAAADXgAAAAABXgAAAAAAXgAAAAACXgAAAAABXgAAAAAAXgAAAAACXgAAAAACXgAAAAACXgAAAAABXgAAAAADfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAABXgAAAAADXgAAAAABXgAAAAAAXgAAAAAAXgAAAAABXgAAAAAAXgAAAAACXgAAAAABXgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAaQAAAAAAaQAAAAAAfwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAbAAAAAAAbAAAAAABbAAAAAAAbAAAAAABHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAdgAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAACdgAAAAAAHwAAAAAAdgAAAAAAHwAAAAAAHwAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAbAAAAAAAbAAAAAADbAAAAAADbAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAbAAAAAABbAAAAAAAbAAAAAADbAAAAAAAcQAAAAADcQAAAAAAcQAAAAAAcQAAAAAAdgAAAAAAcQAAAAAAcQAAAAACcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAbAAAAAABbAAAAAACbAAAAAADbAAAAAAAcQAAAAABcQAAAAABcQAAAAAAcQAAAAABdgAAAAAAcQAAAAADcQAAAAABcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAbAAAAAABbAAAAAACbAAAAAABbAAAAAACcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAABdgAAAAAAcQAAAAABcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAZgAAAAACawAAAAABawAAAAAAZgAAAAAC + tiles: XgAAAAABXgAAAAACXgAAAAACXgAAAAACXgAAAAADXgAAAAACXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAACXgAAAAACXgAAAAAAXgAAAAADXgAAAAACXgAAAAAAXgAAAAADXgAAAAADXgAAAAACXgAAAAABXgAAAAABXgAAAAABXgAAAAACXgAAAAABXgAAAAABXgAAAAACXgAAAAACXgAAAAACXgAAAAACXgAAAAACXgAAAAACXgAAAAADXgAAAAACAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAQgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAXgAAAAACXgAAAAAAXgAAAAAAXgAAAAABXgAAAAADXgAAAAADXgAAAAADXgAAAAABQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAXgAAAAABXgAAAAABUwAAAAAAUwAAAAAAUwAAAAAAXgAAAAAAXgAAAAACXgAAAAACAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAQgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAXgAAAAABXgAAAAABUwAAAAAAUwAAAAAAUwAAAAAAXgAAAAABXgAAAAAAXgAAAAAAXgAAAAABXgAAAAADXgAAAAABXgAAAAAAXgAAAAADXgAAAAABXgAAAAAAXgAAAAACXgAAAAACXgAAAAACXgAAAAAAXgAAAAABXgAAAAABXgAAAAABXgAAAAAAXgAAAAABXgAAAAACXgAAAAADXgAAAAABXgAAAAABXgAAAAACXgAAAAADXgAAAAABXgAAAAAAXgAAAAACXgAAAAABXgAAAAAAXgAAAAACXgAAAAACXgAAAAACXgAAAAABXgAAAAADfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAABXgAAAAADXgAAAAABXgAAAAAAXgAAAAAAXgAAAAABXgAAAAAAXgAAAAACXgAAAAABXgAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAaQAAAAAAaQAAAAAAfwAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAbAAAAAAAbAAAAAABbAAAAAAAbAAAAAABggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAdgAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAACggAAAAAAHwAAAAAAggAAAAAAHwAAAAAAHwAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAbAAAAAAAbAAAAAADbAAAAAADbAAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAfwAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAbAAAAAABbAAAAAAAbAAAAAADbAAAAAAAggAAAAAATwAAAAAAggAAAAAAggAAAAAAdgAAAAAAcQAAAAAAcQAAAAACcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAbAAAAAABbAAAAAACbAAAAAADbAAAAAAATwAAAAAAggAAAAAATwAAAAAAggAAAAAAdgAAAAAAcQAAAAADcQAAAAABcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAbAAAAAABbAAAAAACbAAAAAABbAAAAAACggAAAAAAggAAAAAAggAAAAAAggAAAAAAdgAAAAAAcQAAAAABcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAZgAAAAACawAAAAABawAAAAAAZgAAAAAC version: 6 0,2: ind: 0,2 @@ -386,7 +387,7 @@ entities: version: 6 5,-3: ind: 5,-3 - tiles: fgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAA + tiles: fgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAA version: 6 0,-6: ind: 0,-6 @@ -800,14 +801,6 @@ entities: id: BlackWoodTrimThinLineN decals: 2707: 41,-50 - - node: - angle: 3.141592653589793 rad - color: '#C70000A4' - id: BlackWoodTrimThinLineN - decals: - 8236: 7.9965715,-44.78011 - 8237: 7.9970045,-44.62375 - 8238: 7.9970045,-44.467392 - node: color: '#FFFFFFFF' id: BlackWoodTrimThinLineN @@ -2083,62 +2076,6 @@ entities: id: ConcreteTrimCornerSw decals: 7410: -20,-64 - - node: - color: '#FFFFFFFF' - id: Damaged - decals: - 8156: 2,-44 - 8157: 2,-45 - 8158: 2,-46 - 8159: 2,-43 - 8160: 3,-43 - 8161: 4,-43 - 8162: 6,-43 - 8163: 5,-43 - 8164: 7,-43 - 8165: 8,-43 - 8166: 9,-43 - 8167: 10,-43 - 8168: 11,-43 - 8169: 12,-43 - 8170: 13,-43 - 8171: 14,-43 - 8172: 15,-43 - 8173: 16,-43 - 8174: 17,-43 - 8175: 18,-43 - 8179: 19,-43 - 8180: 20,-43 - 8181: 21,-43 - 8182: 22,-43 - 8183: 23,-43 - 8184: 24,-43 - 8185: 24,-44 - 8186: 24,-45 - 8187: 24,-46 - 8188: 24,-47 - 8189: 23,-47 - 8190: 22,-47 - 8191: 21,-47 - 8192: 20,-47 - 8193: 19,-47 - 8194: 17,-47 - 8195: 18,-47 - 8196: 16,-47 - 8197: 15,-47 - 8198: 14,-47 - 8199: 13,-47 - 8200: 12,-47 - 8201: 11,-47 - 8202: 10,-47 - 8203: 9,-47 - 8204: 8,-47 - 8205: 7,-47 - 8206: 6,-47 - 8207: 5,-47 - 8208: 4,-47 - 8209: 3,-47 - 8210: 2,-47 - node: color: '#B1FFFFFF' id: DarkWoodTrimThinCornerNe @@ -2547,7 +2484,6 @@ entities: 3958: 63,-50 3959: 53,-52 3960: 51,-47 - 4550: 22,-30 4551: 18,-24 4552: 13,-31 4553: 16,-35 @@ -2749,8 +2685,6 @@ entities: 1797: 7.647773,-9.864132 1798: 8.616523,-10.458295 1799: 26,-42 - 1801: 14,-43 - 1802: 4,-43 1803: 1,-48 1804: -9,-54 1805: -5,-54 @@ -3069,12 +3003,6 @@ entities: color: '#9BCAFFE5' id: DirtLight decals: - 4531: 22,-30 - 4532: 26,-30 - 4533: 22,-27 - 4534: 29,-29 - 4535: 29,-27 - 4536: 28,-31 4537: 18,-34 4538: 14,-35 4539: 15,-31 @@ -3141,9 +3069,6 @@ entities: 745: 31.519527,-45.564884 746: 31.467445,-48.431458 747: 8.417126,-48.471527 - 748: 14.448377,-46.480564 - 749: 15.115043,-46.459713 - 750: 14.458793,-46.52226 751: -1.3214302,-45.27139 752: -0.9880967,-44.65638 753: 6.345237,-50.43642 @@ -3542,9 +3467,6 @@ entities: 1148: 23.750168,-7.257738 1149: 32.539967,-7.4170995 1150: 33.144135,-9.491458 - 1151: 13.973496,-43.408886 - 1152: 8.965953,-43.502705 - 1153: 8.965953,-43.502705 1154: 8.97637,-41.511738 1155: 9.049287,-41.428345 1156: 19.417751,-10.516342 @@ -4455,33 +4377,10 @@ entities: color: '#FFFFFFFF' id: Grassc3 decals: - 1577: 16.976334,-44.0318 1843: 52.055492,-51.089897 1972: -3.8329644,-15.051475 1973: -2.5829644,-16.020897 1981: -5.312131,-16.95905 - - node: - angle: 3.141592653589793 rad - color: '#C70000A4' - id: Grassc4 - decals: - 8239: 5.972558,-44.177296 - 8240: 4.128808,-45.037266 - 8241: 6.925683,-45.803425 - 8242: 9.566308,-45.240532 - 8243: 10.910058,-45.834698 - 8244: 12.050683,-44.3962 - 8245: 15.613182,-45.193623 - 8246: 18.300682,-44.97472 - 8247: 14.222558,-45.005993 - 8248: 20.206932,-45.693974 - 8249: 21.081932,-44.80273 - 8250: 22.77618,-44.271107 - 8251: 22.80743,-45.6627 - 8252: 16.889488,-45.693974 - 8253: 10.962581,-44.239838 - 8254: 7.6020927,-44.177296 - 8255: 6.5864677,-44.177296 - node: color: '#FFFFFFFF' id: Grassc4 @@ -5243,9 +5142,6 @@ entities: 3054: -34.653458,-21.37271 3055: -32.387833,-17.498972 4832: -46.506695,-38.154263 - 8142: 18,-44 - 8143: 5,-44 - 8144: 22,-46 - node: cleanable: True color: '#FFFFFFFF' @@ -7351,7 +7247,6 @@ entities: color: '#9BCAFFFF' id: SidingCornerSwOverlayGreyscale decals: - 2750: 21,-31 4032: 15,-20 4054: 15,-28 4081: 10,-36 @@ -7365,6 +7260,11 @@ entities: decals: 3432: 28,-16 6299: -28,3 + - node: + color: '#9CCAFFFF' + id: SidingCornerSwOverlayGreyscale + decals: + 8328: 21,-31 - node: color: '#A020F0A1' id: SidingCornerSwOverlayGreyscale @@ -7693,12 +7593,10 @@ entities: id: SidingInnerNeOverlayGreyscale decals: 2874: 25,-22 - 2876: 25,-26 - node: color: '#91BDEFFF' id: SidingInnerNeOverlayGreyscale decals: - 2814: 29,-28 2820: 29,-33 2837: 45,-46 2839: 48,-46 @@ -7750,17 +7648,14 @@ entities: id: SidingInnerNeOverlayGreyscale decals: 5192: 19,-23 + 8341: 25,-26 + 8343: 29,-28 - node: color: '#9DC1E9FF' id: SidingInnerNeOverlayGreyscale decals: 4930: 19,-20 4937: 19,-20 - - node: - color: '#9E4C0073' - id: SidingInnerNeOverlayGreyscale - decals: - 8304: 22,-31 - node: color: '#9FED5896' id: SidingInnerNeOverlayGreyscale @@ -7962,12 +7857,10 @@ entities: id: SidingInnerNwOverlayGreyscale decals: 2873: 25,-22 - 2875: 25,-26 - node: color: '#91BDEFFF' id: SidingInnerNwOverlayGreyscale decals: - 2806: 28,-26 2815: 31,-28 2838: 55,-46 2840: 48,-46 @@ -8021,16 +7914,13 @@ entities: id: SidingInnerNwOverlayGreyscale decals: 5191: 21,-23 + 8340: 25,-26 + 8342: 28,-26 - node: color: '#9DC1E9FF' id: SidingInnerNwOverlayGreyscale decals: 4934: 18,-19 - - node: - color: '#9E4C0073' - id: SidingInnerNwOverlayGreyscale - decals: - 8303: 28,-31 - node: color: '#9FED5896' id: SidingInnerNwOverlayGreyscale @@ -8235,7 +8125,6 @@ entities: id: SidingInnerSeOverlayGreyscale decals: 2811: 29,-24 - 2817: 29,-29 2824: 25,-20 2851: 48,-44 - node: @@ -8274,8 +8163,6 @@ entities: decals: 4423: 20,-38 4426: 19,-34 - 4429: 22,-31 - 4440: 26,-31 - node: zIndex: 11100 color: '#9C2020D8' @@ -8294,11 +8181,7 @@ entities: id: SidingInnerSeOverlayGreyscale decals: 5193: 19,-23 - - node: - color: '#9E4C0073' - id: SidingInnerSeOverlayGreyscale - decals: - 8301: 22,-26 + 8344: 29,-29 - node: color: '#9FED5896' id: SidingInnerSeOverlayGreyscale @@ -8337,11 +8220,6 @@ entities: id: SidingInnerSeOverlayGreyscale decals: 3100: -39,-31 - - node: - color: '#FA7500E5' - id: SidingInnerSeOverlayGreyscale - decals: - 4422: 22,-31 - node: color: '#FF9821A3' id: SidingInnerSeOverlayGreyscale @@ -8509,7 +8387,6 @@ entities: decals: 2797: 28,-20 2816: 31,-29 - 2823: 28,-31 2825: 25,-20 2828: 24,-12 2852: 48,-44 @@ -8544,13 +8421,6 @@ entities: 4303: 15,-26 4393: 18,-36 4394: 16,-36 - - node: - zIndex: 11100 - color: '#9BCAFFFF' - id: SidingInnerSwOverlayGreyscale - decals: - 4430: 22,-31 - 4441: 25,-31 - node: zIndex: 11100 color: '#9C2020D8' @@ -8569,11 +8439,7 @@ entities: id: SidingInnerSwOverlayGreyscale decals: 5194: 21,-23 - - node: - color: '#9E4C0073' - id: SidingInnerSwOverlayGreyscale - decals: - 8302: 28,-26 + 8345: 28,-31 - node: color: '#9FED5896' id: SidingInnerSwOverlayGreyscale @@ -8616,7 +8482,6 @@ entities: id: SidingInnerSwOverlayGreyscale decals: 4417: 21,-34 - 4424: 22,-31 - node: color: '#FA7500E6' id: SidingInnerSwOverlayGreyscale @@ -8972,9 +8837,7 @@ entities: color: '#91BDEFFF' id: SidingLineEOverlayGreyscale decals: - 2807: 29,-26 2810: 29,-25 - 2818: 29,-31 2819: 29,-32 2827: 25,-21 2842: 48,-45 @@ -9011,8 +8874,6 @@ entities: color: '#9BCAFFFF' id: SidingLineEOverlayGreyscale decals: - 2760: 29,-27 - 2761: 29,-30 4019: 22,-17 4020: 22,-18 4021: 22,-19 @@ -9064,19 +8925,19 @@ entities: 7347: 38,41 7355: 42,41 - node: - color: '#9DC1E9FF' + color: '#9CCAFFFF' id: SidingLineEOverlayGreyscale decals: - 4928: 19,-18 - 4929: 19,-19 + 8323: 29,-27 + 8324: 29,-30 + 8338: 29,-31 + 8339: 29,-26 - node: - color: '#9E4C0073' + color: '#9DC1E9FF' id: SidingLineEOverlayGreyscale decals: - 8282: 22,-30 - 8283: 22,-29 - 8284: 22,-28 - 8285: 22,-27 + 4928: 19,-18 + 4929: 19,-19 - node: color: '#9FED5896' id: SidingLineEOverlayGreyscale @@ -9586,7 +9447,6 @@ entities: color: '#91BDEFFF' id: SidingLineNOverlayGreyscale decals: - 2808: 27,-26 2813: 30,-28 2829: 46,-46 2830: 47,-46 @@ -9662,10 +9522,6 @@ entities: color: '#9BCAFFFF' id: SidingLineNOverlayGreyscale decals: - 2751: 22,-26 - 2752: 23,-26 - 2753: 24,-26 - 2754: 26,-26 2779: 30,-33 4015: 19,-16 4016: 20,-16 @@ -9732,19 +9588,19 @@ entities: 6318: -27,8 7846: -26,8 - node: - color: '#9DC1E9FF' + color: '#9CCAFFFF' id: SidingLineNOverlayGreyscale decals: - 4931: 20,-20 + 8317: 22,-26 + 8318: 23,-26 + 8319: 24,-26 + 8320: 26,-26 + 8321: 27,-26 - node: - color: '#9E4C0073' + color: '#9DC1E9FF' id: SidingLineNOverlayGreyscale decals: - 8296: 27,-31 - 8297: 26,-31 - 8298: 25,-31 - 8299: 24,-31 - 8300: 23,-31 + 4931: 20,-20 - node: color: '#9FED5896' id: SidingLineNOverlayGreyscale @@ -10221,7 +10077,6 @@ entities: decals: 2795: 27,-20 2796: 26,-20 - 2809: 27,-31 2812: 30,-29 2843: 49,-44 2845: 50,-44 @@ -10305,8 +10160,6 @@ entities: color: '#9BCAFFFF' id: SidingLineSOverlayGreyscale decals: - 2755: 24,-31 - 2756: 23,-31 2778: 30,-24 4023: 21,-20 4033: 16,-20 @@ -10353,19 +10206,17 @@ entities: 4456: 30,-8 4457: 31,-8 - node: - color: '#9DC1E9FF' + color: '#9CCAFFFF' id: SidingLineSOverlayGreyscale decals: - 4936: 19,-20 + 8325: 27,-31 + 8326: 24,-31 + 8327: 23,-31 - node: - color: '#9E4C0073' + color: '#9DC1E9FF' id: SidingLineSOverlayGreyscale decals: - 8287: 23,-26 - 8288: 24,-26 - 8289: 25,-26 - 8290: 26,-26 - 8291: 27,-26 + 4936: 19,-20 - node: color: '#9FED5896' id: SidingLineSOverlayGreyscale @@ -10945,7 +10796,6 @@ entities: decals: 2757: 21,-30 2758: 21,-29 - 2759: 21,-27 2772: 31,-32 2773: 31,-31 2774: 31,-30 @@ -11006,18 +10856,15 @@ entities: 7346: 38,41 7354: 42,41 - node: - color: '#9DC1E9FF' + color: '#9CCAFFFF' id: SidingLineWOverlayGreyscale decals: - 4933: 18,-18 + 8329: 21,-27 - node: - color: '#9E4C0073' + color: '#9DC1E9FF' id: SidingLineWOverlayGreyscale decals: - 8292: 28,-27 - 8293: 28,-28 - 8294: 28,-29 - 8295: 28,-30 + 4933: 18,-18 - node: color: '#9FED5896' id: SidingLineWOverlayGreyscale @@ -11254,11 +11101,6 @@ entities: id: StandClear decals: 58: 0,34 - - node: - color: '#3B5FA1FF' - id: TemplateNumber6 - decals: - 8281: 21,-27 - node: color: '#9BCAFFE5' id: TrimlineCornerNeOverlayGreyscale @@ -11428,11 +11270,6 @@ entities: 4227: 17,-32 4233: 17,-24 4371: 14,-40 - - node: - color: '#9E4C00FF' - id: TrimlineCornerWarnNwOverlayGreyscale - decals: - 8305: 23,-28 - node: color: '#9FED584E' id: TrimlineCornerWarnNwOverlayGreyscale @@ -11511,11 +11348,6 @@ entities: id: TrimlineCornerWarnSeOverlayGreyscale decals: 4954: 39,-26 - - node: - color: '#AE3900A3' - id: TrimlineCornerWarnSeOverlayGreyscale - decals: - 8276: 27,-29 - node: color: '#FA7500E5' id: TrimlineCornerWarnSeOverlayGreyscale @@ -11769,6 +11601,8 @@ entities: id: TrimlineLineWarnEOverlayGreyscale decals: 5190: 19,-23 + 8334: 29,-28 + 8335: 29,-29 - node: color: '#9DC1E9FF' id: TrimlineLineWarnEOverlayGreyscale @@ -11962,17 +11796,18 @@ entities: 6320: -27,1 6321: -26,1 - node: - color: '#9FED58FF' + color: '#9CCAFFFF' id: TrimlineLineWarnNOverlayGreyscale decals: - 3225: 36,-31 - 3226: 37,-31 + 8330: 25,-26 + 8331: 28,-26 + 8333: 29,-26 - node: - color: '#AE3900A3' + color: '#9FED58FF' id: TrimlineLineWarnNOverlayGreyscale decals: - 8279: 25,-28 - 8280: 26,-28 + 3225: 36,-31 + 3226: 37,-31 - node: color: '#FA7500E5' id: TrimlineLineWarnNOverlayGreyscale @@ -12115,13 +11950,6 @@ entities: 4275: 17,-20 4381: 18,-36 4382: 16,-36 - - node: - zIndex: 11100 - color: '#9BCAFFFF' - id: TrimlineLineWarnSOverlayGreyscale - decals: - 4435: 25,-31 - 4436: 26,-31 - node: color: '#9C2020C1' id: TrimlineLineWarnSOverlayGreyscale @@ -12134,6 +11962,12 @@ entities: 3443: 29,-16 6313: -27,3 6314: -26,3 + - node: + color: '#9CCAFFFF' + id: TrimlineLineWarnSOverlayGreyscale + decals: + 8336: 29,-31 + 8337: 28,-31 - node: color: '#9DC1E9FF' id: TrimlineLineWarnSOverlayGreyscale @@ -12152,22 +11986,18 @@ entities: decals: 3223: 36,-30 3224: 37,-30 - - node: - color: '#AE3900A3' - id: TrimlineLineWarnSOverlayGreyscale - decals: - 8277: 24,-29 - 8278: 25,-29 - node: color: '#EFB34196' id: TrimlineLineWarnSOverlayGreyscale decals: 4985: 46,-22 - node: - color: '#FA7500E5' + color: '#FA7500FF' id: TrimlineLineWarnSOverlayGreyscale decals: - 4419: 22,-31 + 8372: 25,-31 + 8373: 26,-31 + 8374: 22,-31 - node: color: '#FF9821FF' id: TrimlineLineWarnSOverlayGreyscale @@ -12647,6 +12477,11 @@ entities: id: TrimlineThinCornerWarnNeOverlayGreyscale decals: 6323: -27,-4 + - node: + color: '#9CCAFFFF' + id: TrimlineThinCornerWarnNeOverlayGreyscale + decals: + 8369: 27.496075,-27.4691 - node: cleanable: True color: '#AE6716FF' @@ -12769,7 +12604,6 @@ entities: color: '#88B1E0FF' id: TrimlineThinCornerWarnNwOverlayGreyscale decals: - 2895: 22,-27 2936: 5,-38 - node: color: '#9A54BFFF' @@ -12789,6 +12623,12 @@ entities: 3448: 28.593872,-11.548037 3450: 29.718872,-13.706535 6322: -31,-4 + - node: + color: '#9CCAFFFF' + id: TrimlineThinCornerWarnNwOverlayGreyscale + decals: + 8346: 22,-27 + 8368: 22.495663,-27.503935 - node: cleanable: True color: '#AE6716FF' @@ -12892,7 +12732,6 @@ entities: color: '#88B1E0FF' id: TrimlineThinCornerWarnSeOverlayGreyscale decals: - 2896: 28,-30 2935: 7,-39 - node: color: '#973519FF' @@ -12916,6 +12755,12 @@ entities: decals: 3449: 29.390747,-12.439591 6324: -27,-5 + - node: + color: '#9CCAFFFF' + id: TrimlineThinCornerWarnSeOverlayGreyscale + decals: + 8347: 28,-30 + 8370: 27.500706,-29.502697 - node: cleanable: True color: '#AE6716FF' @@ -13012,6 +12857,11 @@ entities: id: TrimlineThinCornerWarnSwOverlayGreyscale decals: 6325: -31,-5 + - node: + color: '#9CCAFFFF' + id: TrimlineThinCornerWarnSwOverlayGreyscale + decals: + 8371: 22.501045,-29.511963 - node: cleanable: True color: '#AE6716FF' @@ -13193,6 +13043,13 @@ entities: 5212: 4,-64 5213: 5,-64 5214: 3,-64 + - node: + color: '#9CCAFFFF' + id: TrimlineThinLineNOverlayGreyscale + decals: + 8364: 24,-29 + 8365: 25,-29 + 8366: 26,-29 - node: color: '#4C2A5EFF' id: TrimlineThinLineSOverlayGreyscale @@ -13207,6 +13064,13 @@ entities: 5220: 3,-61 5223: 4,-61 5224: 5,-61 + - node: + color: '#9CCAFFFF' + id: TrimlineThinLineSOverlayGreyscale + decals: + 8361: 24,-28 + 8362: 25,-28 + 8363: 26,-28 - node: color: '#210E0EC4' id: TrimlineThinLineWOverlayGreyscale @@ -13323,6 +13187,12 @@ entities: 7964: 25,-57 7965: 25,-56 8066: 8,-68 + - node: + color: '#9CCAFFFF' + id: TrimlineThinLineWarnEOverlayGreyscale + decals: + 8353: 22,-29 + 8354: 22,-28 - node: color: '#FF9821FF' id: TrimlineThinLineWarnEOverlayGreyscale @@ -13422,6 +13292,15 @@ entities: 6329: -30,-4 6330: -29,-4 6331: -28,-4 + - node: + color: '#9CCAFFFF' + id: TrimlineThinLineWarnNOverlayGreyscale + decals: + 8356: 27,-30 + 8357: 26,-30 + 8358: 25,-30 + 8359: 24,-30 + 8360: 23,-30 - node: color: '#FFFF0044' id: TrimlineThinLineWarnNOverlayGreyscale @@ -13526,6 +13405,15 @@ entities: 6326: -30,-5 6327: -29,-5 6328: -28,-5 + - node: + color: '#9CCAFFFF' + id: TrimlineThinLineWarnSOverlayGreyscale + decals: + 8348: 23,-27 + 8349: 24,-27 + 8350: 25,-27 + 8351: 26,-27 + 8367: 27,-27 - node: color: '#FFFF0044' id: TrimlineThinLineWarnSOverlayGreyscale @@ -13616,6 +13504,12 @@ entities: 7958: 25,-60 7959: 25,-61 8067: 10,-68 + - node: + color: '#9CCAFFFF' + id: TrimlineThinLineWarnWOverlayGreyscale + decals: + 8352: 28,-29 + 8355: 28,-28 - node: cleanable: True color: '#FF9821FF' @@ -14763,11 +14657,6 @@ entities: id: a decals: 7676: -29.137665,-55.27407 - - node: - color: '#AE3900A3' - id: a - decals: - 8271: 24.972023,-26.736671 - node: color: '#FFFFFFFF' id: a @@ -14803,33 +14692,12 @@ entities: id: blood1 decals: 4848: 39.96815,-60.10948 - - node: - angle: 1.0471975511965976 rad - color: '#C70000A4' - id: blood1 - decals: - 8229: 1.9388533,-44.96533 - 8230: 2.2669783,-45.07478 - - node: - color: '#E64F006C' - id: blood1 - decals: - 8222: 11,-45 - 8223: 15,-44 - 8224: 18,-46 - node: color: '#880000FF' id: blood2 decals: 4830: -45.694283,-35.464893 4844: 39.9994,-59.04624 - - node: - angle: 3.141592653589793 rad - color: '#C70000A4' - id: blood2 - decals: - 8234: 5.0060644,-44.084312 - 8235: 18.01509,-44.13122 - node: color: '#880000FF' id: blood3 @@ -14842,41 +14710,6 @@ entities: id: blood3 decals: 4847: 41.3119,-59.04624 - - node: - color: '#C70000A4' - id: blood3 - decals: - 8225: 13,-47 - 8226: 13,-44 - 8227: 20,-44 - 8228: 20,-47 - - node: - angle: 1.5707963267948966 rad - color: '#C70000A4' - id: blood3 - decals: - 8231: 23.750336,-45.022465 - - node: - angle: 3.141592653589793 rad - color: '#C70000A4' - id: blood3 - decals: - 8232: 20.023006,-43.286884 - 8233: 12.998317,-43.286884 - - node: - angle: 1.5707963267948966 rad - color: '#AE3900A3' - id: body - decals: - 8260: 13.818337,-44.50565 - - node: - color: '#E64F006C' - id: body - decals: - 8218: 22,-43 - 8219: 23,-47 - 8220: 21,-47 - 8221: 19,-43 - node: cleanable: True angle: -1.5707963267948966 rad @@ -14906,12 +14739,6 @@ entities: id: bushsnowb1 decals: 2642: 53.288998,-43.004555 - - node: - color: '#AE3900A3' - id: c - decals: - 8269: 24.253273,-26.62722 - 8272: 25.300148,-26.689764 - node: color: '#FFFFFFFF' id: cat @@ -14924,39 +14751,11 @@ entities: 7759: 72.02309,26.389494 7760: 72.02309,26.259773 7761: 72.018456,26.130054 - - node: - angle: 1.0297442586766545 rad - color: '#FFFFFFFF' - id: cyr_b - decals: - 8152: 1.355063,-44.93847 - - node: - color: '#AE3900A3' - id: cyr_d - decals: - 8266: 23.105999,-26.25196 - node: color: '#FFFFFFFF' id: cyr_f decals: 7757: 72.47679,26.85741 - - node: - angle: 1.0297442586766545 rad - color: '#FFFFFFFF' - id: cyr_g - decals: - 8154: 1.6953406,-44.389477 - - node: - angle: 1.0297442586766545 rad - color: '#FFFFFFFF' - id: cyr_i - decals: - 8155: 1.8689518,-44.22964 - - node: - color: '#AE3900A3' - id: cyr_p - decals: - 8270: 24.612648,-26.689764 - node: color: '#FFFFFFFF' id: cyr_soft_sign @@ -14967,27 +14766,6 @@ entities: id: disk decals: 2709: 39,-19 - - node: - color: '#E64F006C' - id: dwarf - decals: - 8215: 14,-43 - 8216: 14,-47 - - node: - color: '#AE3900A3' - id: e - decals: - 8265: 22.777874,-26.298868 - 8268: 23.965374,-26.392683 - 8273: 25.628273,-26.689764 - - node: - angle: 4.71238898038469 rad - color: '#BD4C00FF' - id: e - decals: - 8308: 28.809925,-27.802565 - 8313: 28.74738,-29.66194 - 8314: 28.74738,-29.97444 - node: cleanable: True color: '#FF00FFFF' @@ -15000,45 +14778,22 @@ entities: decals: 3046: -32.778656,-26.413189 7755: 71.81012,26.87131 - - node: - angle: 1.0297442586766545 rad - color: '#FFFFFFFF' - id: e - decals: - 8153: 1.5633965,-44.667446 - node: angle: 3.141592653589793 rad color: '#22E2FFFF' id: exclamationmark decals: 7670: -28.898079,-55.076015 - - node: - color: '#E64F006C' - id: exclamationmark - decals: - 8217: 14,-47 - node: color: '#FFFFFFFF' id: fireaxe decals: 3045: -27,-37 - 8213: 5,-43 - 8214: 18,-47 - node: color: '#FFFFFFFF' id: ghost decals: 3047: 46.656914,-0.24166656 - 8211: 18,-47 - 8212: 5,-43 - - node: - angle: 3.141592653589793 rad - color: '#AE3900A3' - id: grasssnow10 - decals: - 8256: 17.008118,-44.146023 - 8257: 22.029762,-45.944145 - 8258: 4.0770874,-44.16166 - node: color: '#9BCAFFFF' id: grasssnowa2 @@ -15069,17 +14824,6 @@ entities: id: guy decals: 4305: 10.999078,-24.569479 - - node: - color: '#AE3900A3' - id: h - decals: - 8267: 23.668499,-26.25196 - - node: - angle: 4.71238898038469 rad - color: '#BD4C00FF' - id: h - decals: - 8307: 28.85683,-27.47444 - node: cleanable: True color: '#FF00FFFF' @@ -15096,58 +14840,22 @@ entities: id: heart decals: 2711: 38,-17 - - node: - angle: 4.71238898038469 rad - color: '#BD4C00FF' - id: l - decals: - 8309: 28.778652,-28.13069 - 8310: 28.778652,-28.458815 - - node: - color: '#AE3900A3' - id: m - decals: - 8264: 22.324749,-26.25196 - node: color: '#9BCAFFFF' id: med decals: 4692: 18,-33 - - node: - angle: 4.71238898038469 rad - color: '#BD4C00FF' - id: n - decals: - 8315: 28.763016,-30.271315 - node: color: '#FFFFFFFF' id: nay decals: 3748: -37,13 - - node: - angle: 4.71238898038469 rad - color: '#BD4C00FF' - id: o - decals: - 8311: 28.778652,-28.78694 - node: color: '#FFFFFFFF' id: p decals: 3044: -33.216156,-26.350647 7756: 72.12494,26.87131 - - node: - angle: 1.0471975511965976 rad - color: '#8B0000FF' - id: pawprint - decals: - 8145: 2.781723,-44.810776 - 8146: 2.875473,-45.123493 - 8147: 3.141098,-44.967133 - 8148: 3.234848,-45.232944 - 8149: 3.500473,-45.107857 - 8150: 3.531723,-45.420574 - 8151: 3.812973,-45.295486 - node: color: '#9BCAFFFF' id: pawprint @@ -15158,24 +14866,6 @@ entities: id: peace decals: 4682: -20,-15 - - node: - angle: 4.71238898038469 rad - color: '#BD4C006C' - id: pound - decals: - 8316: 29.044464,-26.240065 - - node: - angle: 3.141592653589793 rad - color: '#AE3900A3' - id: questionmark - decals: - 8259: 13.896462,-43.974026 - - node: - angle: 1.5707963267948966 rad - color: '#AE3900A3' - id: randomgibs - decals: - 8261: 3.9596853,-45.814114 - node: color: '#FFFFFFFF' id: randomgibs @@ -15249,11 +14939,6 @@ entities: id: stickman decals: 3745: 8,10 - - node: - color: '#AE3900A3' - id: t - decals: - 8274: 25.956398,-26.689764 - node: cleanable: True color: '#FF00FFFF' @@ -15275,17 +14960,6 @@ entities: id: toolbox decals: 2713: 36,-17 - - node: - color: '#C05600FF' - id: uboa - decals: - 8141: 3,-44 - - node: - angle: 4.71238898038469 rad - color: '#BD4C00FF' - id: w - decals: - 8312: 28.809925,-29.22444 - type: GridAtmosphere version: 2 data: @@ -19178,13 +18852,6 @@ entities: parent: 51 - type: InstantAction container: 51 - - uid: 55 - components: - - type: Transform - parent: 54 - - type: InstantAction - originalIconColor: '#FFFFFFFF' - container: 54 - uid: 59 components: - type: Transform @@ -19192,13 +18859,6 @@ entities: - type: InstantAction originalIconColor: '#FFFFFFFF' container: 58 - - uid: 62 - components: - - type: Transform - parent: 61 - - type: InstantAction - originalIconColor: '#FFFFFFFF' - container: 61 - proto: AdminInstantEffectFlash entities: - uid: 65 @@ -21274,13 +20934,6 @@ entities: - type: Transform pos: -56.5,16.5 parent: 2 -- proto: AirlockAssemblySecurity - entities: - - uid: 209 - components: - - type: Transform - pos: -31.5,-14.5 - parent: 2 - proto: AirlockAtmosphericsGlassLocked entities: - uid: 210 @@ -23662,6 +23315,11 @@ entities: parent: 2 - proto: AirlockSecurityGlassLocked entities: + - uid: 53 + components: + - type: Transform + pos: -31.5,-14.5 + parent: 2 - uid: 585 components: - type: Transform @@ -29702,28 +29360,6 @@ entities: - type: Transform pos: 36.5,-68.5 parent: 2 - - uid: 1637 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -31.5,-14.5 - parent: 2 - - uid: 1638 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -30.5,-14.5 - parent: 2 - - uid: 1639 - components: - - type: Transform - pos: -31.5,-34.5 - parent: 2 - - uid: 1640 - components: - - type: Transform - pos: -30.5,-34.5 - parent: 2 - proto: BarricadeBlock entities: - uid: 1641 @@ -29765,42 +29401,6 @@ entities: - type: Transform pos: 70.5,-12.5 parent: 2 -- proto: BarricadeSteelFloor - entities: - - uid: 1648 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -31.5,-14.5 - parent: 2 - - uid: 1649 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -30.5,-14.5 - parent: 2 - - uid: 1650 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -31.5,-34.5 - parent: 2 - - uid: 1651 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -30.5,-34.5 - parent: 2 - - uid: 1652 - components: - - type: Transform - pos: -31.5,-34.5 - parent: 2 - - uid: 1653 - components: - - type: Transform - pos: -30.5,-34.5 - parent: 2 - proto: BarSign entities: - uid: 1654 @@ -31011,11 +30611,6 @@ entities: - type: Transform pos: -1.2796526,-84.254265 parent: 2 - - uid: 1823 - components: - - type: Transform - pos: -31.092548,-21.196648 - parent: 2 - proto: BaseChemistryEmptyVial entities: - uid: 32165 @@ -32295,12 +31890,6 @@ entities: rot: 1.5707963267948966 rad pos: 30.5,-54.5 parent: 2 - - uid: 2011 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 25.5,-27.5 - parent: 2 - proto: BookAtmosDistro entities: - uid: 2012 @@ -33210,15 +32799,10 @@ entities: - type: Transform pos: 15.512761,-22.282585 parent: 2 - - uid: 2158 - components: - - type: Transform - pos: 24.52501,-27.51296 - parent: 2 - - uid: 2159 + - uid: 10972 components: - type: Transform - pos: 26.446884,-27.575504 + pos: 27.504276,-25.372124 parent: 2 - proto: BoxSyringe entities: @@ -33963,11 +33547,6 @@ entities: - type: Transform pos: 77.5,-44.5 parent: 2 - - uid: 2286 - components: - - type: Transform - pos: 22.5,-37.5 - parent: 2 - uid: 2287 components: - type: Transform @@ -34073,11 +33652,6 @@ entities: - type: Transform pos: 13.5,-73.5 parent: 2 - - uid: 2308 - components: - - type: Transform - pos: 21.5,-37.5 - parent: 2 - uid: 2309 components: - type: Transform @@ -53160,6 +52734,11 @@ entities: canCollide: False - proto: CableHV entities: + - uid: 57 + components: + - type: Transform + pos: 60.5,21.5 + parent: 2 - uid: 6023 components: - type: Transform @@ -53910,11 +53489,6 @@ entities: - type: Transform pos: 43.5,67.5 parent: 2 - - uid: 6173 - components: - - type: Transform - pos: 60.5,17.5 - parent: 2 - uid: 6174 components: - type: Transform @@ -54170,11 +53744,6 @@ entities: - type: Transform pos: 60.5,22.5 parent: 2 - - uid: 6225 - components: - - type: Transform - pos: 60.5,21.5 - parent: 2 - uid: 6226 components: - type: Transform @@ -60030,6 +59599,21 @@ entities: - type: Transform pos: -59.5,-83.5 parent: 2 + - uid: 10909 + components: + - type: Transform + pos: 59.5,17.5 + parent: 2 + - uid: 10936 + components: + - type: Transform + pos: 60.5,17.5 + parent: 2 + - uid: 10988 + components: + - type: Transform + pos: 59.5,21.5 + parent: 2 - uid: 32297 components: - type: Transform @@ -68490,6 +68074,12 @@ entities: parent: 2 - proto: CableTerminal entities: + - uid: 60 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 60.5,17.5 + parent: 2 - uid: 9034 components: - type: Transform @@ -68561,6 +68151,12 @@ entities: rot: 3.141592653589793 rad pos: 15.5,-77.5 parent: 2 + - uid: 10935 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 60.5,21.5 + parent: 2 - proto: CandleBlackInfinite entities: - uid: 9046 @@ -68729,76 +68325,11 @@ entities: parent: 2 - proto: CandyBucket entities: - - uid: 9072 - components: - - type: Transform - pos: -17.473015,-27.859034 - parent: 2 - - uid: 9073 - components: - - type: Transform - pos: -9.532283,-23.976562 - parent: 2 - - uid: 9074 - components: - - type: Transform - pos: -14.96289,-22.46475 - parent: 2 - - uid: 9075 - components: - - type: Transform - pos: -32.746502,-22.119228 - parent: 2 - - uid: 9076 - components: - - type: Transform - pos: -31.324627,-22.087957 - parent: 2 - - uid: 9077 - components: - - type: Transform - pos: -15.752875,-57.434658 - parent: 2 - - uid: 9078 - components: - - type: Transform - pos: 3.0986032,-2.3885098 - parent: 2 - - uid: 9079 - components: - - type: Transform - pos: 25.66566,-24.37947 - parent: 2 - - uid: 9080 - components: - - type: Transform - pos: 25.748997,-31.435951 - parent: 2 - - uid: 9081 - components: - - type: Transform - pos: 38.504936,-33.548656 - parent: 2 - uid: 9082 components: - type: Transform pos: 56.398293,2.728379 parent: 2 - - uid: 9083 - components: - - type: Transform - pos: 27.72829,14.450673 - parent: 2 - - uid: 9084 - components: - - type: Transform - pos: 20.550415,-48.452663 - parent: 2 - - uid: 9085 - components: - - type: Transform - pos: 4.9056845,-55.5629 - parent: 2 - uid: 9086 components: - type: Transform @@ -68809,11 +68340,6 @@ entities: - type: Transform pos: 42.62776,11.278964 parent: 2 - - uid: 9088 - components: - - type: Transform - pos: -18.329994,-65.576775 - parent: 2 - proto: CaneSheathFilled entities: - uid: 9089 @@ -70157,13 +69683,6 @@ entities: rot: -1.5707963267948966 rad pos: 49.160793,-16.08039 parent: 2 -- proto: CarvedPumpkin - entities: - - uid: 9328 - components: - - type: Transform - pos: 17.536518,-45.292545 - parent: 2 - proto: Catwalk entities: - uid: 9329 @@ -75407,40 +74926,6 @@ entities: rot: -1.5707963267948966 rad pos: 72.297935,-22.42841 parent: 2 - - uid: 10320 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 26.46624,-27.490343 - parent: 2 - - uid: 10321 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 24.544365,-27.443436 - parent: 2 - - uid: 10322 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 25.075615,-28.272137 - parent: 2 - - uid: 10323 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 25.93499,-28.240864 - parent: 2 - - uid: 10324 - components: - - type: Transform - pos: 25.21624,-26.661644 - parent: 2 - - uid: 10325 - components: - - type: Transform - pos: 25.93499,-26.692915 - parent: 2 - proto: ChairFoldingSpawnFolded entities: - uid: 10326 @@ -77163,15 +76648,6 @@ entities: - type: Transform pos: 19.262146,-0.7981186 parent: 32095 -- proto: CigPackBlue - entities: - - uid: 10620 - components: - - type: Transform - parent: 10619 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: CigPackGreen entities: - uid: 10621 @@ -78369,20 +77845,6 @@ entities: parent: 10797 - type: Physics canCollide: False -- proto: ClothingBackpackMime - entities: - - uid: 56 - components: - - type: Transform - parent: 53 - - type: Physics - canCollide: False - - uid: 63 - components: - - type: Transform - parent: 60 - - type: Physics - canCollide: False - proto: ClothingBackpackSatchelBrigmedic entities: - uid: 20 @@ -79125,12 +78587,6 @@ entities: parent: 10905 - type: Physics canCollide: False - - uid: 10909 - components: - - type: Transform - parent: 10908 - - type: Physics - canCollide: False - proto: ClothingHeadHatCone entities: - uid: 10911 @@ -79251,12 +78707,6 @@ entities: parent: 10932 - type: Physics canCollide: False - - uid: 10936 - components: - - type: Transform - parent: 10935 - - type: Physics - canCollide: False - proto: ClothingHeadHatHardhatBlue entities: - uid: 10938 @@ -79328,14 +78778,6 @@ entities: ents: - 50 - type: ActionsContainer -- proto: ClothingHeadHatHetmanHat - entities: - - uid: 10947 - components: - - type: Transform - parent: 10946 - - type: Physics - canCollide: False - proto: ClothingHeadHatHoodCulthood entities: - uid: 10949 @@ -79345,19 +78787,16 @@ entities: parent: 2 - proto: ClothingHeadHatHoodMoth entities: - - uid: 10950 + - uid: 1650 components: - type: Transform - pos: -48.377274,-26.353546 + pos: 23.83551,-43.45527 parent: 2 -- proto: ClothingHeadHatJake - entities: - - uid: 10952 + - uid: 10950 components: - type: Transform - parent: 10951 - - type: Physics - canCollide: False + pos: -48.377274,-26.353546 + parent: 2 - proto: ClothingHeadHatOutlawHat entities: - uid: 10954 @@ -79367,6 +78806,11 @@ entities: parent: 2 - proto: ClothingHeadHatPaper entities: + - uid: 209 + components: + - type: Transform + pos: 23.476665,-27.885422 + parent: 2 - uid: 10955 components: - type: Transform @@ -79392,19 +78836,12 @@ entities: rot: 3.141592653589793 rad pos: -31.430443,3.4312785 parent: 2 -- proto: ClothingHeadHatPDHoxton - entities: - - uid: 10959 - components: - - type: Transform - pos: 17.544178,-43.537403 - parent: 2 - proto: ClothingHeadHatPDWolf entities: - - uid: 10960 + - uid: 10952 components: - type: Transform - pos: 9.553515,-43.52177 + pos: 5.02369,-43.391197 parent: 2 - proto: ClothingHeadHatPlaguedoctor entities: @@ -79414,58 +78851,6 @@ entities: parent: 10961 - type: Physics canCollide: False -- proto: ClothingHeadHatPumpkin - entities: - - uid: 54 - components: - - type: Transform - parent: 53 - - type: HandheldLight - toggleActionEntity: 55 - - type: ContainerContainer - containers: - cell_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - actions: !type:Container - showEnts: False - occludes: True - ents: - - 55 - - type: Physics - canCollide: False - - type: ActionsContainer - - uid: 61 - components: - - type: Transform - parent: 60 - - type: HandheldLight - toggleActionEntity: 62 - - type: ContainerContainer - containers: - cell_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - actions: !type:Container - showEnts: False - occludes: True - ents: - - 62 - - type: Physics - canCollide: False - - type: ActionsContainer - - uid: 10965 - components: - - type: Transform - pos: 18.458511,-44.44173 - parent: 2 - - uid: 10966 - components: - - type: Transform - pos: 6.507354,-44.457363 - parent: 2 - proto: ClothingHeadHatPwig entities: - uid: 10967 @@ -79480,12 +78865,6 @@ entities: - type: Transform pos: 41.5568,-0.253963 parent: 2 - - uid: 10970 - components: - - type: Transform - parent: 10969 - - type: Physics - canCollide: False - proto: ClothingHeadHatRedwizard entities: - uid: 10800 @@ -79494,22 +78873,6 @@ entities: parent: 10797 - type: Physics canCollide: False -- proto: ClothingHeadHatRichard - entities: - - uid: 10973 - components: - - type: Transform - parent: 10972 - - type: Physics - canCollide: False -- proto: ClothingHeadHatRichter - entities: - - uid: 10976 - components: - - type: Transform - parent: 10975 - - type: Physics - canCollide: False - proto: ClothingHeadHatSantahat entities: - uid: 22 @@ -79518,6 +78881,11 @@ entities: parent: 17 - type: Physics canCollide: False + - uid: 2011 + components: + - type: Transform + pos: 7.8491583,-45.40765 + parent: 2 - proto: ClothingHeadHatSecsoft entities: - uid: 10978 @@ -79589,14 +78957,6 @@ entities: parent: 10985 - type: Physics canCollide: False -- proto: ClothingHeadHatTony - entities: - - uid: 10989 - components: - - type: Transform - parent: 10988 - - type: Physics - canCollide: False - proto: ClothingHeadHatTophat entities: - uid: 10991 @@ -79643,12 +79003,6 @@ entities: - type: Transform pos: 37.527016,-71.45722 parent: 2 - - uid: 10998 - components: - - type: Transform - parent: 10997 - - type: Physics - canCollide: False - proto: ClothingHeadHatWelding entities: - uid: 11000 @@ -79684,14 +79038,6 @@ entities: - type: Transform pos: 100.35405,9.609166 parent: 2 -- proto: ClothingHeadHatWitch1 - entities: - - uid: 11006 - components: - - type: Transform - parent: 11005 - - type: Physics - canCollide: False - proto: ClothingHeadHatWizardFake entities: - uid: 10834 @@ -79732,11 +79078,6 @@ entities: - type: Transform pos: 0.41985416,57.579117 parent: 2 - - uid: 11012 - components: - - type: Transform - pos: 4.9086275,-43.817345 - parent: 2 - proto: ClothingHeadHelmetEVA entities: - uid: 754 @@ -79803,7 +79144,7 @@ entities: - type: MetaData desc: Пахнет каким то клоном... - type: Transform - pos: 25.17781,-26.549969 + pos: 26.478214,-28.479584 parent: 2 - proto: ClothingHeadPilotCapCap entities: @@ -79989,13 +79330,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: ClothingMaskJackal - entities: - - uid: 11042 - components: - - type: Transform - pos: 21.559502,-43.59995 - parent: 2 - proto: ClothingMaskNinja entities: - uid: 11043 @@ -80014,11 +79348,6 @@ entities: parent: 10961 - type: Physics canCollide: False - - uid: 11044 - components: - - type: Transform - pos: 5.378998,-44.27229 - parent: 2 - proto: ClothingMaskRat entities: - uid: 32387 @@ -80037,6 +79366,11 @@ entities: parent: 32095 - proto: ClothingMaskSexyClown entities: + - uid: 10969 + components: + - type: Transform + pos: 4.191863,-45.5281 + parent: 2 - uid: 11045 components: - type: Transform @@ -80045,6 +79379,11 @@ entities: parent: 2 - proto: ClothingMaskSexyMime entities: + - uid: 10959 + components: + - type: Transform + pos: 14.706193,-43.47459 + parent: 2 - uid: 11046 components: - type: Transform @@ -80468,84 +79807,12 @@ entities: parent: 2 - proto: ClothingOuterGhostSheet entities: - - uid: 57 - components: - - type: Transform - parent: 53 - - type: Physics - canCollide: False - - uid: 64 - components: - - type: Transform - parent: 60 - - type: Physics - canCollide: False - uid: 10843 components: - type: Transform parent: 10839 - type: Physics canCollide: False - - uid: 10910 - components: - - type: Transform - parent: 10908 - - type: Physics - canCollide: False - - uid: 10937 - components: - - type: Transform - parent: 10935 - - type: Physics - canCollide: False - - uid: 10948 - components: - - type: Transform - parent: 10946 - - type: Physics - canCollide: False - - uid: 10953 - components: - - type: Transform - parent: 10951 - - type: Physics - canCollide: False - - uid: 10971 - components: - - type: Transform - parent: 10969 - - type: Physics - canCollide: False - - uid: 10974 - components: - - type: Transform - parent: 10972 - - type: Physics - canCollide: False - - uid: 10977 - components: - - type: Transform - parent: 10975 - - type: Physics - canCollide: False - - uid: 10990 - components: - - type: Transform - parent: 10988 - - type: Physics - canCollide: False - - uid: 10999 - components: - - type: Transform - parent: 10997 - - type: Physics - canCollide: False - - uid: 11007 - components: - - type: Transform - parent: 11005 - - type: Physics - canCollide: False - uid: 11095 components: - type: MetaData @@ -80555,66 +79822,18 @@ entities: rot: 6.283185307179586 rad pos: -94.52586,-21.557442 parent: 2 - - uid: 11097 - components: - - type: Transform - parent: 11096 - - type: Physics - canCollide: False - - uid: 11099 - components: - - type: Transform - parent: 11098 - - type: Physics - canCollide: False - - uid: 11101 - components: - - type: Transform - parent: 11100 - - type: Physics - canCollide: False - - uid: 11103 - components: - - type: Transform - parent: 11102 - - type: Physics - canCollide: False - uid: 11105 components: - type: Transform parent: 11104 - type: Physics canCollide: False - - uid: 11107 - components: - - type: Transform - parent: 11106 - - type: Physics - canCollide: False - - uid: 11109 - components: - - type: Transform - parent: 11108 - - type: Physics - canCollide: False - - uid: 11111 - components: - - type: Transform - parent: 11110 - - type: Physics - canCollide: False - uid: 11113 components: - type: Transform parent: 11112 - type: Physics canCollide: False - - uid: 11115 - components: - - type: Transform - parent: 11114 - - type: Physics - canCollide: False - proto: ClothingOuterHardsuitSpatio entities: - uid: 32 @@ -81651,41 +80870,6 @@ entities: - type: Transform pos: -6.5,2.5 parent: 2 - - uid: 11241 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 9.5,-44.5 - parent: 2 - - uid: 11242 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 8.5,-44.5 - parent: 2 - - uid: 11243 - components: - - type: Transform - pos: 3.5,-43.5 - parent: 2 - - uid: 11244 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 3.5,-45.5 - parent: 2 - - uid: 11245 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 23.5,-45.5 - parent: 2 - - uid: 11246 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 19.5,-44.5 - parent: 2 - uid: 11247 components: - type: Transform @@ -81716,12 +80900,6 @@ entities: parent: 2 - proto: Cobweb2 entities: - - uid: 11252 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 20.5,-44.5 - parent: 2 - uid: 11253 components: - type: Transform @@ -81926,17 +81104,6 @@ entities: rot: 3.141592653589793 rad pos: -4.5,-6.5 parent: 2 - - uid: 11289 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 20.5,-44.5 - parent: 2 - - uid: 11290 - components: - - type: Transform - pos: 23.5,-43.5 - parent: 2 - proto: CockroachCube entities: - uid: 11291 @@ -83971,6 +83138,11 @@ entities: parent: 2 - proto: CrayonBox entities: + - uid: 9088 + components: + - type: Transform + pos: 23.570415,-27.29126 + parent: 2 - uid: 11582 components: - type: Transform @@ -84338,18 +83510,6 @@ entities: - type: Transform pos: -47.5,-76.5 parent: 2 -- proto: CrystalOrange - entities: - - uid: 11633 - components: - - type: Transform - pos: 9.5,-44.5 - parent: 2 - - uid: 11634 - components: - - type: Transform - pos: 19.5,-44.5 - parent: 2 - proto: CrystalSpawner entities: - uid: 11635 @@ -84553,7 +83713,7 @@ entities: pos: 6.5,-33.5 parent: 2 - type: Door - secondsUntilStateChange: -240670.3 + secondsUntilStateChange: -245712.28 state: Opening - proto: CurtainsCyanOpen entities: @@ -84685,7 +83845,7 @@ entities: pos: 61.5,-1.5 parent: 2 - type: Door - secondsUntilStateChange: -13979.588 + secondsUntilStateChange: -19021.568 state: Opening - uid: 11685 components: @@ -96388,11 +95548,6 @@ entities: parent: 2 - proto: DrinkBeerBottleFull entities: - - uid: 13657 - components: - - type: Transform - pos: 8.706821,-45.109226 - parent: 2 - uid: 13658 components: - type: Transform @@ -97138,6 +96293,11 @@ entities: parent: 2 - proto: DrinkSnowWhite entities: + - uid: 11108 + components: + - type: Transform + pos: 3.4128714,-45.45456 + parent: 2 - uid: 13773 components: - type: Transform @@ -98495,13 +97655,6 @@ entities: rot: 1.5707963267948966 rad pos: 9.606583,24.663836 parent: 2 - - uid: 13967 - components: - - type: Transform - parent: 13966 - - type: Physics - canCollide: False - - type: InsideEntityStorage - uid: 13968 components: - type: Transform @@ -104248,101 +103401,86 @@ entities: - type: Transform pos: 52.58905,-49.962524 parent: 2 -- proto: FloraTreeConifer01 +- proto: FloraTreeChristmas01 entities: - - uid: 14615 + - uid: 2308 components: - type: Transform - rot: 3.141592653589793 rad - pos: 12.980302,-32.833813 + pos: 22.082623,-45.458385 parent: 2 - - type: Fixtures - fixtures: - fix1: - shape: !type:PolygonShape - radius: 0.01 - vertices: - - -0.081242785,-0.28434977 - - 0.081242785,-0.28434977 - - 0.081242785,0.28434977 - - -0.081242785,0.28434977 - mask: [] - layer: - - Impassable - - TableLayer - - HighImpassable - - LowImpassable - - BulletImpassable - - InteractImpassable - - Opaque - density: 3500 - hard: True - restitution: 0 - friction: 0.4 - - type: ScaleVisuals - - type: Appearance -- proto: FloraTreeSnow06 - entities: - - uid: 14616 + - uid: 9078 components: - type: Transform - pos: 55.319252,-43.51269 + pos: 7.398305,-45.442745 parent: 2 -- proto: FloraTreeStump +- proto: FloraTreeChristmas02 entities: - - uid: 14617 + - uid: 6173 components: - type: Transform - pos: 4.644125,-44.496914 + pos: 13.080312,-32.797733 parent: 2 - - uid: 14618 + - uid: 10976 components: - type: Transform - pos: 20.424656,-44.73145 + pos: 14.149159,-45.02058 parent: 2 - - uid: 14619 +- proto: FloraTreeSnow03 + entities: + - uid: 1640 components: - type: Transform - pos: -28.550358,-3.8883295 + pos: 8.754117,-43.67207 parent: 2 - - uid: 14620 + - uid: 2159 components: - type: Transform - pos: 22.612156,-45.450703 + pos: 18.531136,-43.609528 parent: 2 - - uid: 14621 +- proto: FloraTreeSnow04 + entities: + - uid: 1823 components: - type: Transform - pos: 22.487156,-43.59003 + pos: 16.44968,-45.548374 parent: 2 - - uid: 32471 + - uid: 10324 components: - type: Transform - rot: 3.141592653589793 rad - pos: 8.31843,-2.186238 - parent: 32095 -- proto: FloraTreeStumpConifer + pos: 3.8945951,-45.42329 + parent: 2 +- proto: FloraTreeSnow05 entities: - - uid: 14622 + - uid: 9077 components: - type: Transform - pos: 15.478515,-45.51324 + pos: 5.289008,-43.56262 parent: 2 - - uid: 14623 + - uid: 10977 components: - type: Transform - pos: 6.456625,-45.435062 + pos: 23.474735,-43.56262 parent: 2 - - uid: 14624 +- proto: FloraTreeSnow06 + entities: + - uid: 14616 components: - type: Transform - pos: 9.456625,-44.371826 + pos: 55.319252,-43.51269 parent: 2 - - uid: 14625 +- proto: FloraTreeStump + entities: + - uid: 14619 components: - type: Transform - pos: 12.541015,-43.63694 + pos: -28.550358,-3.8883295 parent: 2 + - uid: 32471 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.31843,-2.186238 + parent: 32095 - proto: FlowersBouquet entities: - uid: 14626 @@ -105002,6 +104140,29 @@ entities: - type: Transform pos: -25.506927,20.485153 parent: 2 +- proto: FoodFrozenPopsicleBerry + entities: + - uid: 1653 + components: + - type: Transform + pos: 18.24179,-43.47459 + parent: 2 +- proto: FoodFrozenPopsicleJumbo + entities: + - uid: 11012 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 23.039177,-43.412045 + parent: 2 +- proto: FoodFrozenPopsicleOrange + entities: + - uid: 1648 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.541575,-45.58022 + parent: 2 - proto: FoodFrozenPopsicleTrash entities: - uid: 14724 @@ -105025,6 +104186,14 @@ entities: rot: 3.141592653589793 rad pos: 10.737323,2.86977 parent: 32095 +- proto: FoodFrozenSandwich + entities: + - uid: 11107 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.905222,-43.47459 + parent: 2 - proto: FoodFrozenSnowconeBase entities: - uid: 14726 @@ -105054,6 +104223,11 @@ entities: parent: 2 - proto: FoodFrozenSnowconeFruit entities: + - uid: 9081 + components: + - type: Transform + pos: 10.797643,-43.449924 + parent: 2 - uid: 14730 components: - type: Transform @@ -105062,6 +104236,11 @@ entities: parent: 2 - proto: FoodFrozenSnowconeRainbow entities: + - uid: 6225 + components: + - type: Transform + pos: 13.928803,-45.099094 + parent: 2 - uid: 14731 components: - type: Transform @@ -105075,6 +104254,11 @@ entities: parent: 2 - proto: FoodFrozenSnowconeTrash entities: + - uid: 64 + components: + - type: Transform + pos: 23.539165,-28.510857 + parent: 2 - uid: 14733 components: - type: Transform @@ -105087,6 +104271,11 @@ entities: parent: 2 - proto: FoodFrozenSundae entities: + - uid: 11042 + components: + - type: Transform + pos: 16.810036,-45.40301 + parent: 2 - uid: 14735 components: - type: Transform @@ -105210,23 +104399,6 @@ entities: - type: Transform pos: 19.100098,3.9573212 parent: 32095 -- proto: FoodMeatCrabCooked - entities: - - uid: 14752 - components: - - type: Transform - pos: 25.68499,-27.459072 - parent: 2 - - uid: 14753 - components: - - type: Transform - pos: 25.106865,-27.865604 - parent: 2 - - uid: 14754 - components: - - type: Transform - pos: 25.763115,-27.896875 - parent: 2 - proto: FoodMeatDuckCutlet entities: - uid: 14755 @@ -105366,6 +104538,13 @@ entities: - type: Transform pos: 43.76168,25.981607 parent: 2 +- proto: FoodPieBananaCreamSlice + entities: + - uid: 11007 + components: + - type: Transform + pos: 10.452391,-43.578827 + parent: 2 - proto: FoodPieXeno entities: - uid: 14777 @@ -105529,6 +104708,13 @@ entities: - type: Transform pos: 8.49281,-88.38412 parent: 2 +- proto: FoodTartCoco + entities: + - uid: 10973 + components: + - type: Transform + pos: 27.534779,-30.383854 + parent: 2 - proto: FoodTartGapple entities: - uid: 14802 @@ -105924,6 +105110,12 @@ entities: color: '#4169E1FF' - proto: GasOutletInjector entities: + - uid: 10320 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-90.5 + parent: 2 - uid: 14851 components: - type: Transform @@ -105983,12 +105175,6 @@ entities: - type: Transform pos: 54.5,49.5 parent: 2 - - uid: 14860 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,-90.5 - parent: 2 - uid: 14861 components: - type: Transform @@ -106071,6 +105257,12 @@ entities: color: '#4169E1FF' - proto: GasPassiveVent entities: + - uid: 11109 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-90.5 + parent: 2 - uid: 14873 components: - type: Transform @@ -106144,12 +105336,6 @@ entities: - type: Transform pos: 53.5,44.5 parent: 2 - - uid: 14883 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,-89.5 - parent: 2 - uid: 14884 components: - type: Transform @@ -140379,6 +139565,12 @@ entities: color: '#4169E1FF' - proto: GasVentScrubber entities: + - uid: 9328 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-89.5 + parent: 2 - uid: 19262 components: - type: Transform @@ -141582,12 +140774,6 @@ entities: - 79 - type: AtmosPipeColor color: '#B22222FF' - - uid: 19387 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,-90.5 - parent: 2 - uid: 19388 components: - type: Transform @@ -143216,6 +142402,24 @@ entities: parent: 32095 - proto: Grille entities: + - uid: 11096 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -28.5,-15.5 + parent: 2 + - uid: 11097 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -35.5,-22.5 + parent: 2 + - uid: 11098 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -28.5,-20.5 + parent: 2 - uid: 19579 components: - type: Transform @@ -143804,11 +143008,6 @@ entities: rot: -1.5707963267948966 rad pos: 49.5,46.5 parent: 2 - - uid: 19691 - components: - - type: Transform - pos: -28.5,-15.5 - parent: 2 - uid: 19692 components: - type: Transform @@ -143829,11 +143028,6 @@ entities: - type: Transform pos: -28.5,-19.5 parent: 2 - - uid: 19696 - components: - - type: Transform - pos: -28.5,-20.5 - parent: 2 - uid: 19697 components: - type: Transform @@ -143964,11 +143158,6 @@ entities: - type: Transform pos: -35.5,-23.5 parent: 2 - - uid: 19723 - components: - - type: Transform - pos: -35.5,-22.5 - parent: 2 - uid: 19724 components: - type: Transform @@ -150958,36 +150147,6 @@ entities: - type: Transform pos: 43.433556,26.419563 parent: 2 -- proto: LeavesCannabis - entities: - - uid: 20998 - components: - - type: Transform - parent: 20997 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 20999 - components: - - type: Transform - parent: 20997 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 21000 - components: - - type: Transform - parent: 20997 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 21001 - components: - - type: Transform - parent: 20997 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: LedLightBulb entities: - uid: 21003 @@ -151661,16 +150820,6 @@ entities: - type: Transform pos: -18.5,-3.5 parent: 2 - - uid: 21088 - components: - - type: Transform - pos: -9.5,-3.5 - parent: 2 - - uid: 21089 - components: - - type: Transform - pos: -14.5,-3.5 - parent: 2 - uid: 21090 components: - type: Transform @@ -153016,90 +152165,6 @@ entities: showEnts: False occludes: False ent: 42 - - uid: 53 - components: - - type: MetaData - desc: Герой данного мероприятия - name: предводитель Джек - - type: Transform - pos: -32.5,-21.5 - parent: 2 - - type: ContainerContainer - containers: - jumpsuit: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - outerClothing: !type:ContainerSlot - showEnts: False - occludes: False - ent: 57 - neck: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - mask: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - eyes: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - head: !type:ContainerSlot - showEnts: False - occludes: False - ent: 54 - suitstorage: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - back: !type:ContainerSlot - showEnts: False - occludes: False - ent: 56 - - uid: 60 - components: - - type: MetaData - desc: Любит бить битой!! - name: специалистка по конфетам Харли - - type: Transform - pos: -31.5,-21.5 - parent: 2 - - type: ContainerContainer - containers: - jumpsuit: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - outerClothing: !type:ContainerSlot - showEnts: False - occludes: False - ent: 64 - neck: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - mask: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - eyes: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - head: !type:ContainerSlot - showEnts: False - occludes: False - ent: 61 - suitstorage: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - back: !type:ContainerSlot - showEnts: False - occludes: False - ent: 63 - uid: 10574 components: - type: MetaData @@ -153397,49 +152462,6 @@ entities: showEnts: False occludes: False ent: null - - uid: 10908 - components: - - type: MetaData - desc: Конфета или жизнь - name: Буу - - type: Transform - rot: 3.141592653589793 rad - pos: -32.5,-26.5 - parent: 2 - - type: ContainerContainer - containers: - jumpsuit: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - outerClothing: !type:ContainerSlot - showEnts: False - occludes: False - ent: 10910 - neck: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - mask: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - eyes: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - head: !type:ContainerSlot - showEnts: False - occludes: False - ent: 10909 - suitstorage: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - back: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - uid: 10929 components: - type: MetaData @@ -153526,135 +152548,6 @@ entities: showEnts: False occludes: False ent: null - - uid: 10935 - components: - - type: MetaData - desc: Конфета или жизнь - name: Буу - - type: Transform - rot: 3.141592653589793 rad - pos: -33.5,-26.5 - parent: 2 - - type: ContainerContainer - containers: - jumpsuit: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - outerClothing: !type:ContainerSlot - showEnts: False - occludes: False - ent: 10937 - neck: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - mask: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - eyes: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - head: !type:ContainerSlot - showEnts: False - occludes: False - ent: 10936 - suitstorage: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - back: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - - uid: 10946 - components: - - type: MetaData - desc: Конфета или жизнь - name: Буу - - type: Transform - rot: 3.141592653589793 rad - pos: -30.5,-27.5 - parent: 2 - - type: ContainerContainer - containers: - jumpsuit: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - outerClothing: !type:ContainerSlot - showEnts: False - occludes: False - ent: 10948 - neck: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - mask: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - eyes: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - head: !type:ContainerSlot - showEnts: False - occludes: False - ent: 10947 - suitstorage: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - back: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - - uid: 10951 - components: - - type: MetaData - desc: Конфета или жизнь - name: Буу - - type: Transform - rot: 3.141592653589793 rad - pos: -32.5,-25.5 - parent: 2 - - type: ContainerContainer - containers: - jumpsuit: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - outerClothing: !type:ContainerSlot - showEnts: False - occludes: False - ent: 10953 - neck: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - mask: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - eyes: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - head: !type:ContainerSlot - showEnts: False - occludes: False - ent: 10952 - suitstorage: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - back: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - uid: 10961 components: - type: MetaData @@ -153697,135 +152590,6 @@ entities: showEnts: False occludes: False ent: null - - uid: 10969 - components: - - type: MetaData - desc: Конфета или жизнь - name: Бууу - - type: Transform - rot: 3.141592653589793 rad - pos: -33.5,-25.5 - parent: 2 - - type: ContainerContainer - containers: - jumpsuit: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - outerClothing: !type:ContainerSlot - showEnts: False - occludes: False - ent: 10971 - neck: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - mask: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - eyes: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - head: !type:ContainerSlot - showEnts: False - occludes: False - ent: 10970 - suitstorage: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - back: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - - uid: 10972 - components: - - type: MetaData - desc: Конфета или жизнь - name: Буу - - type: Transform - rot: 3.141592653589793 rad - pos: -30.5,-25.5 - parent: 2 - - type: ContainerContainer - containers: - jumpsuit: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - outerClothing: !type:ContainerSlot - showEnts: False - occludes: False - ent: 10974 - neck: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - mask: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - eyes: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - head: !type:ContainerSlot - showEnts: False - occludes: False - ent: 10973 - suitstorage: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - back: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - - uid: 10975 - components: - - type: MetaData - desc: Конфета или жизнь - name: Буу - - type: Transform - rot: 3.141592653589793 rad - pos: -32.5,-27.5 - parent: 2 - - type: ContainerContainer - containers: - jumpsuit: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - outerClothing: !type:ContainerSlot - showEnts: False - occludes: False - ent: 10977 - neck: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - mask: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - eyes: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - head: !type:ContainerSlot - showEnts: False - occludes: False - ent: 10976 - suitstorage: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - back: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - uid: 10985 components: - type: MetaData @@ -153869,307 +152633,6 @@ entities: showEnts: False occludes: False ent: null - - uid: 10988 - components: - - type: MetaData - desc: Конфета или жизнь - name: Буу - - type: Transform - rot: 3.141592653589793 rad - pos: -33.5,-27.5 - parent: 2 - - type: ContainerContainer - containers: - jumpsuit: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - outerClothing: !type:ContainerSlot - showEnts: False - occludes: False - ent: 10990 - neck: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - mask: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - eyes: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - head: !type:ContainerSlot - showEnts: False - occludes: False - ent: 10989 - suitstorage: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - back: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - - uid: 10997 - components: - - type: MetaData - desc: Конфета или жизнь - name: Буу - - type: Transform - rot: 3.141592653589793 rad - pos: -31.5,-25.5 - parent: 2 - - type: ContainerContainer - containers: - jumpsuit: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - outerClothing: !type:ContainerSlot - showEnts: False - occludes: False - ent: 10999 - neck: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - mask: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - eyes: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - head: !type:ContainerSlot - showEnts: False - occludes: False - ent: 10998 - suitstorage: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - back: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - - uid: 11005 - components: - - type: MetaData - desc: Конфета или жизнь - name: Буу - - type: Transform - rot: 3.141592653589793 rad - pos: -31.5,-26.5 - parent: 2 - - type: ContainerContainer - containers: - jumpsuit: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - outerClothing: !type:ContainerSlot - showEnts: False - occludes: False - ent: 11007 - neck: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - mask: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - eyes: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - head: !type:ContainerSlot - showEnts: False - occludes: False - ent: 11006 - suitstorage: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - back: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - - uid: 11096 - components: - - type: MetaData - desc: Иана или Конфету - name: Буу - - type: Transform - rot: -1.5707963267948966 rad - pos: 37.5,-42.5 - parent: 2 - - type: ContainerContainer - containers: - jumpsuit: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - outerClothing: !type:ContainerSlot - showEnts: False - occludes: False - ent: 11097 - neck: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - mask: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - eyes: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - head: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - suitstorage: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - back: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - - uid: 11098 - components: - - type: MetaData - desc: Конфета или жизнь - name: Буу - - type: Transform - rot: 3.141592653589793 rad - pos: -30.5,-26.5 - parent: 2 - - type: ContainerContainer - containers: - jumpsuit: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - outerClothing: !type:ContainerSlot - showEnts: False - occludes: False - ent: 11099 - neck: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - mask: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - eyes: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - head: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - suitstorage: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - back: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - - uid: 11100 - components: - - type: MetaData - desc: Конфета или жизнь - name: Буу - - type: Transform - rot: 3.141592653589793 rad - pos: -31.5,-27.5 - parent: 2 - - type: ContainerContainer - containers: - jumpsuit: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - outerClothing: !type:ContainerSlot - showEnts: False - occludes: False - ent: 11101 - neck: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - mask: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - eyes: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - head: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - suitstorage: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - back: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - - uid: 11102 - components: - - type: MetaData - desc: Конфеты или смерть - name: Буу - - type: Transform - rot: 1.5707963267948966 rad - pos: -35.5,-62.5 - parent: 2 - - type: ContainerContainer - containers: - jumpsuit: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - outerClothing: !type:ContainerSlot - showEnts: False - occludes: False - ent: 11103 - neck: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - mask: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - eyes: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - head: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - suitstorage: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - back: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - uid: 11104 components: - type: MetaData @@ -154212,135 +152675,6 @@ entities: showEnts: False occludes: False ent: null - - uid: 11106 - components: - - type: MetaData - desc: Конфеты или жизнь - name: Буу - - type: Transform - rot: 1.5707963267948966 rad - pos: 30.5,-65.5 - parent: 2 - - type: ContainerContainer - containers: - jumpsuit: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - outerClothing: !type:ContainerSlot - showEnts: False - occludes: False - ent: 11107 - neck: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - mask: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - eyes: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - head: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - suitstorage: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - back: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - - uid: 11108 - components: - - type: MetaData - desc: Мне нужна ваша одежда или ваша конфета - name: Буу - - type: Transform - rot: -1.5707963267948966 rad - pos: 55.5,-15.5 - parent: 2 - - type: ContainerContainer - containers: - jumpsuit: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - outerClothing: !type:ContainerSlot - showEnts: False - occludes: False - ent: 11109 - neck: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - mask: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - eyes: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - head: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - suitstorage: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - back: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - - uid: 11110 - components: - - type: MetaData - desc: изоли или конфетка - name: Бууу - - type: Transform - rot: 3.141592653589793 rad - pos: 47.5,3.5 - parent: 2 - - type: ContainerContainer - containers: - jumpsuit: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - outerClothing: !type:ContainerSlot - showEnts: False - occludes: False - ent: 11111 - neck: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - mask: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - eyes: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - head: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - suitstorage: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - back: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - uid: 11112 components: - type: MetaData @@ -154383,48 +152717,6 @@ entities: showEnts: False occludes: False ent: null - - uid: 11114 - components: - - type: MetaData - desc: Конфетки или ваши очки - name: Буу - - type: Transform - pos: -45.5,-7.5 - parent: 2 - - type: ContainerContainer - containers: - jumpsuit: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - outerClothing: !type:ContainerSlot - showEnts: False - occludes: False - ent: 11115 - neck: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - mask: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - eyes: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - head: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - suitstorage: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - back: !type:ContainerSlot - showEnts: False - occludes: False - ent: null - uid: 32367 components: - type: MetaData @@ -155753,16 +154045,6 @@ entities: - type: Transform pos: 14.423688,-32.23932 parent: 2 - - uid: 21443 - components: - - type: Transform - pos: 18.846405,-43.35358 - parent: 2 - - uid: 21444 - components: - - type: Transform - pos: 6.490221,-45.605145 - parent: 2 - proto: NoticeBoard entities: - uid: 21445 @@ -160228,76 +158510,12 @@ entities: rot: 1.5707963267948966 rad pos: -32.281406,2.9161236 parent: 2 - - uid: 22075 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.325109,-27.546087 - parent: 2 - - uid: 22076 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -6.903234,-23.465128 - parent: 2 - - uid: 22077 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -30.506916,-47.968014 - parent: 2 - - uid: 22078 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -22.829258,-53.230446 - parent: 2 - - uid: 22079 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 22.51081,-52.00375 - parent: 2 - - uid: 22080 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 53.49192,-49.94613 - parent: 2 - uid: 22081 components: - type: Transform rot: 1.5707963267948966 rad pos: 16.539791,-32.6061 parent: 2 - - uid: 22082 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 21.80283,-44.393078 - parent: 2 - - uid: 22083 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 14.587518,-45.237415 - parent: 2 - - uid: 22084 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 5.911481,-43.924004 - parent: 2 - - uid: 22085 - components: - - type: Transform - pos: 53.941727,3.4580524 - parent: 2 - - uid: 22086 - components: - - type: Transform - pos: 59.34798,-1.9206829 - parent: 2 - uid: 32889 components: - type: MetaData @@ -160530,6 +158748,11 @@ entities: parent: 2 - proto: PlushiePenguin entities: + - uid: 10953 + components: + - type: Transform + pos: 16.518768,-43.485012 + parent: 2 - uid: 22114 components: - type: Transform @@ -160857,18 +159080,6 @@ entities: rot: -1.5707963267948966 rad pos: 67.9725,18.520355 parent: 2 -- proto: PortableGeneratorSuperPacman - entities: - - uid: 22167 - components: - - type: Transform - pos: 60.5,21.5 - parent: 2 - - uid: 22168 - components: - - type: Transform - pos: 60.5,17.5 - parent: 2 - proto: PortableGeneratorSuperPacmanBroken entities: - uid: 22169 @@ -162270,6 +160481,116 @@ entities: parent: 2 - proto: Poweredlight entities: + - uid: 1651 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -35.5,-24.5 + parent: 2 + - uid: 9073 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -28.5,-23.5 + parent: 2 + - uid: 9075 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -28.5,-16.5 + parent: 2 + - uid: 9080 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -35.5,-18.5 + parent: 2 + - uid: 10325 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -35.5,-31.5 + parent: 2 + - uid: 10937 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 15.5,-39.5 + parent: 2 + - uid: 10946 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 20.5,-38.5 + parent: 2 + - uid: 10947 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 27.5,-30.5 + parent: 2 + - uid: 10948 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 10.5,-37.5 + parent: 2 + - uid: 10951 + components: + - type: Transform + pos: 24.5,-32.5 + parent: 2 + - uid: 10960 + components: + - type: Transform + pos: 26.5,-40.5 + parent: 2 + - uid: 10965 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,-28.5 + parent: 2 + - uid: 10966 + components: + - type: Transform + pos: 24.5,-25.5 + parent: 2 + - uid: 10970 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,-47.5 + parent: 2 + - uid: 10971 + components: + - type: Transform + pos: 9.5,-41.5 + parent: 2 + - uid: 10975 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.5,-47.5 + parent: 2 + - uid: 10990 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 25.5,-38.5 + parent: 2 + - uid: 10999 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -28.5,-32.5 + parent: 2 + - uid: 11044 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -36.5,-15.5 + parent: 2 - uid: 22394 components: - type: Transform @@ -163029,12 +161350,6 @@ entities: - type: Transform pos: 41.5,-31.5 parent: 2 - - uid: 22527 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 15.5,-39.5 - parent: 2 - uid: 22528 components: - type: Transform @@ -163265,12 +161580,6 @@ entities: rot: 3.141592653589793 rad pos: 12.5,-27.5 parent: 2 - - uid: 22565 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 20.5,-38.5 - parent: 2 - uid: 22566 components: - type: Transform @@ -163411,16 +161720,6 @@ entities: rot: -1.5707963267948966 rad pos: 22.5,-19.5 parent: 2 - - uid: 22589 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 22.5,-38.5 - parent: 2 - - type: PointLight - enabled: False - - type: ApcPowerReceiver - powerLoad: 0 - uid: 22590 components: - type: Transform @@ -163760,12 +162059,6 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,37.5 parent: 2 - - uid: 22645 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 10.5,-37.5 - parent: 2 - uid: 22646 components: - type: Transform @@ -163887,11 +162180,6 @@ entities: rot: 3.141592653589793 rad pos: -10.5,-66.5 parent: 2 - - uid: 22666 - components: - - type: Transform - pos: 24.5,-32.5 - parent: 2 - uid: 22667 components: - type: Transform @@ -164362,11 +162650,6 @@ entities: rot: 3.141592653589793 rad pos: -35.5,-2.5 parent: 2 - - uid: 22749 - components: - - type: Transform - pos: 27.5,-40.5 - parent: 2 - uid: 22750 components: - type: Transform @@ -164755,40 +163038,6 @@ entities: parent: 2 - proto: PoweredlightOrange entities: - - uid: 22798 - components: - - type: Transform - pos: 9.5,-41.5 - parent: 2 - - type: PointLight - energy: 1 - radius: 3 - - uid: 22799 - components: - - type: Transform - pos: 17.5,-41.5 - parent: 2 - - type: PointLight - energy: 1 - radius: 5 - - uid: 22800 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 15.5,-47.5 - parent: 2 - - type: PointLight - energy: 1 - radius: 4 - - uid: 22801 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 21.5,-26.5 - parent: 2 - - type: PointLight - energy: 1 - radius: 3 - uid: 22802 components: - type: Transform @@ -164841,15 +163090,6 @@ entities: rot: 1.5707963267948966 rad pos: 83.5,23.5 parent: 2 - - uid: 22811 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 21.5,-30.5 - parent: 2 - - type: PointLight - energy: 1 - radius: 5 - proto: PoweredlightPink entities: - uid: 22812 @@ -164860,6 +163100,25 @@ entities: parent: 2 - proto: PoweredLightPostSmall entities: + - uid: 9079 + components: + - type: Transform + pos: 15.5,-43.5 + parent: 2 + - uid: 10974 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-43.5 + parent: 2 + - uid: 11006 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 23.5,-45.5 + parent: 2 + - type: PointLight + radius: 8 - uid: 22813 components: - type: Transform @@ -164950,13 +163209,6 @@ entities: parent: 2 - proto: PoweredSmallLight entities: - - uid: 22828 - components: - - type: Transform - pos: 5.5,-41.5 - parent: 2 - - type: PointLight - energy: 0.3 - uid: 22829 components: - type: Transform @@ -166410,6 +164662,27 @@ entities: ent: 21031 - type: ApcPowerReceiver powerLoad: 0 +- proto: Present + entities: + - uid: 2158 + components: + - type: Transform + pos: 14.656987,-45.18875 + parent: 2 +- proto: PresentRandom + entities: + - uid: 1652 + components: + - type: Transform + pos: 13.403819,-32.54757 + parent: 2 +- proto: PresentRandomCash + entities: + - uid: 9076 + components: + - type: Transform + pos: 6.9956303,-45.438923 + parent: 2 - proto: Protolathe entities: - uid: 23030 @@ -166583,18 +164856,6 @@ entities: - type: Transform pos: -2.5,-30.5 parent: 2 -- proto: PumpkinLantern - entities: - - uid: 23050 - components: - - type: Transform - pos: 3.419942,-43.388287 - parent: 2 - - uid: 23051 - components: - - type: Transform - pos: 3.482442,-45.34277 - parent: 2 - proto: PumpkinLanternLarge entities: - uid: 23052 @@ -166602,88 +164863,8 @@ entities: - type: Transform pos: -56.506046,18.64497 parent: 2 - - uid: 23053 - components: - - type: Transform - pos: 13.513108,-44.357708 - parent: 2 - - uid: 23054 - components: - - type: Transform - pos: -35.726757,-16.306 - parent: 2 - - uid: 23055 - components: - - type: Transform - pos: -32.133007,-30.412136 - parent: 2 - - uid: 23056 - components: - - type: Transform - pos: -34.142567,-22.536106 - parent: 2 - - uid: 23057 - components: - - type: Transform - pos: -29.792034,-22.52047 - parent: 2 - - uid: 23058 - components: - - type: Transform - pos: -34.498695,-48.43196 - parent: 2 - proto: PumpkinLanternSmall entities: - - uid: 23059 - components: - - type: Transform - pos: 16.503548,-47.50025 - parent: 2 - - uid: 23060 - components: - - type: Transform - pos: 9.497821,-47.53152 - parent: 2 - - uid: 23061 - components: - - type: Transform - pos: 27.509418,-25.24576 - parent: 2 - - uid: 23062 - components: - - type: Transform - pos: 27.493793,-30.389957 - parent: 2 - - uid: 23063 - components: - - type: Transform - pos: 16.565723,-43.560284 - parent: 2 - - uid: 23064 - components: - - type: Transform - pos: 12.549579,-43.435192 - parent: 2 - - uid: 23065 - components: - - type: Transform - pos: 23.685589,-43.37265 - parent: 2 - - uid: 23066 - components: - - type: Transform - pos: 23.716839,-45.483494 - parent: 2 - - uid: 23067 - components: - - type: Transform - pos: -32.073284,-20.479357 - parent: 2 - - uid: 23068 - components: - - type: Transform - pos: -32.12026,-26.254463 - parent: 2 - uid: 23069 components: - type: Transform @@ -166694,11 +164875,6 @@ entities: - type: Transform pos: 28.493607,18.693375 parent: 2 - - uid: 23071 - components: - - type: Transform - pos: 59.522564,-10.208857 - parent: 2 - uid: 23072 components: - type: Transform @@ -170379,11 +168555,6 @@ entities: - type: Transform pos: 18.5,-15.5 parent: 2 - - uid: 23698 - components: - - type: Transform - pos: 22.5,-37.5 - parent: 2 - uid: 23699 components: - type: Transform @@ -171832,10 +170003,16 @@ entities: parent: 2 - proto: Recycler entities: - - uid: 23955 + - uid: 10908 components: - type: Transform - rot: 1.5707963267948966 rad + rot: -1.5707963267948966 rad + pos: 0.5,48.5 + parent: 2 + - uid: 10989 + components: + - type: Transform + rot: -1.5707963267948966 rad pos: 41.5,0.5 parent: 2 - proto: ReinforcedGirder @@ -176944,12 +175121,6 @@ entities: rot: 3.141592653589793 rad pos: 25.5,-31.5 parent: 2 - - uid: 24849 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 24.5,-31.5 - parent: 2 - uid: 24850 components: - type: Transform @@ -177466,6 +175637,12 @@ entities: parent: 2 - proto: ShuttleConsoleCircuitboard entities: + - uid: 10910 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 72.748665,6.560524 + parent: 2 - uid: 24935 components: - type: Transform @@ -177528,8 +175705,6 @@ entities: - Pressed: Toggle 24850: - Pressed: Toggle - 24849: - - Pressed: Toggle 24848: - Pressed: Toggle 24841: @@ -179774,6 +177949,16 @@ entities: parent: 2 - proto: SMESBasic entities: + - uid: 10997 + components: + - type: Transform + pos: 59.5,21.5 + parent: 2 + - uid: 10998 + components: + - type: Transform + pos: 59.5,17.5 + parent: 2 - uid: 25211 components: - type: MetaData @@ -179859,18 +178044,6 @@ entities: - type: Transform pos: -66.5,-82.5 parent: 2 -- proto: SmesBroken - entities: - - uid: 25224 - components: - - type: Transform - pos: 59.5,21.5 - parent: 2 - - uid: 25225 - components: - - type: Transform - pos: 59.5,17.5 - parent: 2 - proto: SMESMachineCircuitboard entities: - uid: 25226 @@ -181330,6 +179503,16 @@ entities: parent: 2 - proto: SpawnMobPenguin entities: + - uid: 9083 + components: + - type: Transform + pos: 5.5,-44.5 + parent: 2 + - uid: 11005 + components: + - type: Transform + pos: 18.5,-44.5 + parent: 2 - uid: 25478 components: - type: Transform @@ -182430,54 +180613,6 @@ entities: parent: 2 - proto: SpiderWeb entities: - - uid: 25666 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 8.5,-44.5 - parent: 2 - - uid: 25667 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 11.5,-45.5 - parent: 2 - - uid: 25668 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 15.5,-44.5 - parent: 2 - - uid: 25669 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 16.5,-45.5 - parent: 2 - - uid: 25670 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 3.5,-45.5 - parent: 2 - - uid: 25671 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 3.5,-43.5 - parent: 2 - - uid: 25672 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 9.5,-43.5 - parent: 2 - - uid: 25673 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 10.5,-43.5 - parent: 2 - uid: 25674 components: - type: Transform @@ -182917,6 +181052,12 @@ entities: parent: 2 - proto: SteelBench entities: + - uid: 9085 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 24.5,-30.5 + parent: 2 - uid: 25746 components: - type: Transform @@ -183570,6 +181711,89 @@ entities: parent: 2 - proto: SurveillanceCameraCommand entities: + - uid: 11241 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 15.5,-15.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Главный врач кабинет + - uid: 11243 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 21.5,-12.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Главный Врач комната + - uid: 11245 + components: + - type: Transform + pos: 38.5,-40.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Кабиент ГП + - uid: 21000 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -34.5,-47.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Хранилище + - uid: 21001 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -34.5,-50.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: ИИ комп + - uid: 21088 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -26.5,-57.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Капитан + - uid: 21089 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -30.5,-57.5 + parent: 2 + - uid: 22079 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -36.5,9.5 + parent: 2 + - uid: 22084 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -18.5,-43.5 + parent: 2 - uid: 25849 components: - type: Transform @@ -183942,6 +182166,35 @@ entities: id: Магистрат - proto: SurveillanceCameraEngineering entities: + - uid: 11242 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 7.5,-13.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Подстанции станции 1 + - uid: 22080 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 65.5,32.5 + parent: 2 + - uid: 22082 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 76.5,13.5 + parent: 2 + - uid: 22083 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 68.5,23.5 + parent: 2 - uid: 25884 components: - type: Transform @@ -184177,6 +182430,129 @@ entities: id: Дистра 02, N2 - proto: SurveillanceCameraGeneral entities: + - uid: 2286 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 31.5,-35.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Коридор у ГП + - uid: 11111 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,-31.5 + parent: 2 + - uid: 11115 + components: + - type: Transform + pos: -0.5,-12.5 + parent: 2 + - uid: 11244 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 21.5,-41.5 + parent: 2 + - uid: 11246 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 45.5,-12.5 + parent: 2 + - uid: 11252 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 45.5,-16.5 + parent: 2 + - uid: 11289 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 48.5,-12.5 + parent: 2 + - uid: 11290 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 51.5,-14.5 + parent: 2 + - uid: 13657 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 37.5,7.5 + parent: 2 + - uid: 13966 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 39.5,-6.5 + parent: 2 + - uid: 14618 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 39.5,-14.5 + parent: 2 + - uid: 14620 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 39.5,-16.5 + parent: 2 + - uid: 14621 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 35.5,-23.5 + parent: 2 + - uid: 14622 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 38.5,-23.5 + parent: 2 + - uid: 14623 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 41.5,-23.5 + parent: 2 + - uid: 14624 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 45.5,-23.5 + parent: 2 + - uid: 14625 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 57.5,-22.5 + parent: 2 + - uid: 14752 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 72.5,-15.5 + parent: 2 + - uid: 14753 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 95.5,-26.5 + parent: 2 + - uid: 14754 + components: + - type: Transform + pos: 94.5,-40.5 + parent: 2 - uid: 25908 components: - type: Transform @@ -184555,6 +182931,22 @@ entities: id: Суд [2] - proto: SurveillanceCameraMedical entities: + - uid: 11110 + components: + - type: Transform + pos: 6.5,-34.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Мед.Клонёрка2 + - uid: 11634 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 44.5,-6.5 + parent: 2 - uid: 25943 components: - type: Transform @@ -184805,6 +183197,35 @@ entities: parent: 2 - proto: SurveillanceCameraScience entities: + - uid: 11633 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 49.5,-6.5 + parent: 2 + - uid: 19723 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,-60.5 + parent: 2 + - uid: 20997 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-65.5 + parent: 2 + - uid: 20998 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,-69.5 + parent: 2 + - uid: 20999 + components: + - type: Transform + pos: -8.5,-88.5 + parent: 2 - uid: 25967 components: - type: Transform @@ -184934,6 +183355,30 @@ entities: id: РНД центр - proto: SurveillanceCameraSecurity entities: + - uid: 22075 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -42.5,-26.5 + parent: 2 + - uid: 22076 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -44.5,-7.5 + parent: 2 + - uid: 22077 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -40.5,5.5 + parent: 2 + - uid: 22078 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -48.5,9.5 + parent: 2 - uid: 25980 components: - type: Transform @@ -185263,6 +183708,73 @@ entities: id: БригМедик - proto: SurveillanceCameraService entities: + - uid: 11114 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,-24.5 + parent: 2 + - uid: 14860 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 32.5,-50.5 + parent: 2 + - uid: 14883 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 14.5,-55.5 + parent: 2 + - uid: 19387 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 10.5,-56.5 + parent: 2 + - uid: 19691 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,-55.5 + parent: 2 + - uid: 19696 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.5,-58.5 + parent: 2 + - uid: 21443 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -22.5,-36.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService + nameSet: True + id: Бармен1 + - uid: 21444 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -22.5,-34.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService + nameSet: True + id: Бармен2 + - uid: 22085 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 27.5,-1.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService - uid: 26010 components: - type: Transform @@ -185496,6 +184008,23 @@ entities: id: Мусорка - proto: SurveillanceCameraSupply entities: + - uid: 13967 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 19.5,25.5 + parent: 2 + - uid: 14615 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 7.5,30.5 + parent: 2 + - uid: 14617 + components: + - type: Transform + pos: 1.5,9.5 + parent: 2 - uid: 26032 components: - type: Transform @@ -185643,12 +184172,6 @@ entities: id: Reporter 2 - proto: SurvivalKnife entities: - - uid: 26048 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 4.853751,-45.15514 - parent: 2 - uid: 26049 components: - type: Transform @@ -188206,6 +186729,18 @@ entities: parent: 2 - proto: TableWood entities: + - uid: 54 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 23.5,-28.5 + parent: 2 + - uid: 9084 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 23.5,-27.5 + parent: 2 - uid: 26492 components: - type: Transform @@ -189107,6 +187642,26 @@ entities: - type: Transform pos: 22.5,-87.5 parent: 2 +- proto: TapeRecorder + entities: + - uid: 10619 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.84468,-45.43318 + parent: 2 + - uid: 10620 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.389748,-61.384888 + parent: 2 + - uid: 11101 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -15.46006,-57.538464 + parent: 2 - proto: TargetClown entities: - uid: 26660 @@ -189387,36 +187942,6 @@ entities: parent: 2 - proto: TintedWindow entities: - - uid: 26697 - components: - - type: Transform - pos: -30.5,-15.5 - parent: 2 - - uid: 26698 - components: - - type: Transform - pos: -31.5,-15.5 - parent: 2 - - uid: 26699 - components: - - type: Transform - pos: -33.5,-15.5 - parent: 2 - - uid: 26700 - components: - - type: Transform - pos: -29.5,-15.5 - parent: 2 - - uid: 26701 - components: - - type: Transform - pos: -32.5,-15.5 - parent: 2 - - uid: 26702 - components: - - type: Transform - pos: -28.5,-15.5 - parent: 2 - uid: 26703 components: - type: Transform @@ -189629,166 +188154,6 @@ entities: - type: Transform pos: 96.5,31.5 parent: 2 - - uid: 26744 - components: - - type: Transform - pos: -35.5,-19.5 - parent: 2 - - uid: 26745 - components: - - type: Transform - pos: -35.5,-20.5 - parent: 2 - - uid: 26746 - components: - - type: Transform - pos: -35.5,-21.5 - parent: 2 - - uid: 26747 - components: - - type: Transform - pos: -35.5,-22.5 - parent: 2 - - uid: 26748 - components: - - type: Transform - pos: -35.5,-23.5 - parent: 2 - - uid: 26749 - components: - - type: Transform - pos: -35.5,-24.5 - parent: 2 - - uid: 26750 - components: - - type: Transform - pos: -35.5,-27.5 - parent: 2 - - uid: 26751 - components: - - type: Transform - pos: -35.5,-28.5 - parent: 2 - - uid: 26752 - components: - - type: Transform - pos: -35.5,-29.5 - parent: 2 - - uid: 26753 - components: - - type: Transform - pos: -35.5,-30.5 - parent: 2 - - uid: 26754 - components: - - type: Transform - pos: -33.5,-33.5 - parent: 2 - - uid: 26755 - components: - - type: Transform - pos: -32.5,-33.5 - parent: 2 - - uid: 26756 - components: - - type: Transform - pos: -29.5,-33.5 - parent: 2 - - uid: 26757 - components: - - type: Transform - pos: -28.5,-33.5 - parent: 2 - - uid: 26758 - components: - - type: Transform - pos: -28.5,-31.5 - parent: 2 - - uid: 26759 - components: - - type: Transform - pos: -28.5,-30.5 - parent: 2 - - uid: 26760 - components: - - type: Transform - pos: -28.5,-29.5 - parent: 2 - - uid: 26761 - components: - - type: Transform - pos: -28.5,-28.5 - parent: 2 - - uid: 26762 - components: - - type: Transform - pos: -28.5,-27.5 - parent: 2 - - uid: 26763 - components: - - type: Transform - pos: -28.5,-26.5 - parent: 2 - - uid: 26764 - components: - - type: Transform - pos: -28.5,-25.5 - parent: 2 - - uid: 26765 - components: - - type: Transform - pos: -28.5,-24.5 - parent: 2 - - uid: 26766 - components: - - type: Transform - pos: -28.5,-23.5 - parent: 2 - - uid: 26767 - components: - - type: Transform - pos: -28.5,-22.5 - parent: 2 - - uid: 26768 - components: - - type: Transform - pos: -28.5,-21.5 - parent: 2 - - uid: 26769 - components: - - type: Transform - pos: -28.5,-20.5 - parent: 2 - - uid: 26770 - components: - - type: Transform - pos: -28.5,-19.5 - parent: 2 - - uid: 26771 - components: - - type: Transform - pos: -28.5,-18.5 - parent: 2 - - uid: 26772 - components: - - type: Transform - pos: -28.5,-17.5 - parent: 2 - - uid: 26773 - components: - - type: Transform - pos: -28.5,-16.5 - parent: 2 - - uid: 26774 - components: - - type: Transform - pos: -31.5,-33.5 - parent: 2 - - uid: 26775 - components: - - type: Transform - pos: -30.5,-33.5 - parent: 2 - proto: TobaccoSeeds entities: - uid: 26776 @@ -190463,11 +188828,6 @@ entities: parent: 2 - proto: ToySpawner entities: - - uid: 26877 - components: - - type: Transform - pos: 4.5,-43.5 - parent: 2 - uid: 26878 components: - type: Transform @@ -190683,7 +189043,7 @@ entities: - Left: Forward - Right: Reverse - Middle: Off - 23955: + 10989: - Left: Forward - Right: Reverse - Middle: Off @@ -190863,13 +189223,6 @@ entities: rot: 1.5707963267948966 rad pos: 70.635605,8.597171 parent: 2 -- proto: UniformShortsRed - entities: - - uid: 26920 - components: - - type: Transform - pos: 9.892595,-45.555347 - parent: 2 - proto: Vaccinator entities: - uid: 32672 @@ -191300,6 +189653,11 @@ entities: parent: 2 - proto: VendingMachineMedical entities: + - uid: 11100 + components: + - type: Transform + pos: 20.5,-39.5 + parent: 2 - uid: 26987 components: - type: Transform @@ -191499,11 +189857,6 @@ entities: parent: 2 - proto: VendingMachineViroDrobe entities: - - uid: 27020 - components: - - type: Transform - pos: 20.5,-39.5 - parent: 2 - uid: 32675 components: - type: Transform @@ -191517,12 +189870,6 @@ entities: rot: 3.141592653589793 rad pos: 6.5,31.5 parent: 2 - - uid: 27022 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 20.5,-17.5 - parent: 2 - uid: 27023 components: - type: Transform @@ -191706,11 +190053,6 @@ entities: rot: 1.5707963267948966 rad pos: 20.5,-26.5 parent: 2 - - uid: 27055 - components: - - type: Transform - pos: -35.5,-26.5 - parent: 2 - uid: 27056 components: - type: Transform @@ -215767,6 +214109,48 @@ entities: - type: Transform pos: 10.5,4.5 parent: 32095 +- proto: WarderobePrisonSecureFilled + entities: + - uid: 1639 + components: + - type: Transform + pos: -48.5,-1.5 + parent: 2 + - uid: 9074 + components: + - type: Transform + pos: -46.5,-1.5 + parent: 2 + - uid: 10321 + components: + - type: Transform + pos: -44.5,-1.5 + parent: 2 + - uid: 10322 + components: + - type: Transform + pos: -14.5,-3.5 + parent: 2 + - uid: 10323 + components: + - type: Transform + pos: -9.5,-3.5 + parent: 2 + - uid: 11102 + components: + - type: Transform + pos: -15.5,-5.5 + parent: 2 + - uid: 11103 + components: + - type: Transform + pos: -21.5,-5.5 + parent: 2 + - uid: 11106 + components: + - type: Transform + pos: -8.5,-5.5 + parent: 2 - proto: WardrobeAtmospherics entities: - uid: 31494 @@ -215978,128 +214362,6 @@ entities: - type: Transform pos: -41.5,-63.5 parent: 2 -- proto: WardrobePrisonFilled - entities: - - uid: 10619 - components: - - type: Transform - pos: -44.5,-1.5 - parent: 2 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14673 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 10620 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - uid: 13966 - components: - - type: Transform - pos: -46.5,-1.5 - parent: 2 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14673 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 13967 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - uid: 20997 - components: - - type: Transform - pos: -48.5,-1.5 - parent: 2 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14673 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 21001 - - 21000 - - 20999 - - 20998 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - uid: 31513 - components: - - type: Transform - pos: -21.5,-5.5 - parent: 2 - - uid: 31514 - components: - - type: Transform - pos: -15.5,-5.5 - parent: 2 - - uid: 31515 - components: - - type: Transform - pos: -8.5,-5.5 - parent: 2 - proto: WardrobeSecurityFilled entities: - uid: 31516 @@ -219304,27 +217566,72 @@ entities: parent: 2 - proto: WoodenBench entities: - - uid: 32061 + - uid: 55 components: - type: Transform rot: 3.141592653589793 rad - pos: 9.5,-47.5 + pos: 26.5,-27.5 parent: 2 - - uid: 32062 + - uid: 56 + components: + - type: Transform + pos: 24.5,-28.5 + parent: 2 + - uid: 61 components: - type: Transform rot: 3.141592653589793 rad - pos: 16.5,-47.5 + pos: 18.5,-45.5 parent: 2 - - uid: 32063 + - uid: 62 components: - type: Transform - pos: 9.5,-43.5 + pos: 25.5,-28.5 parent: 2 - - uid: 32064 + - uid: 63 components: - type: Transform - pos: 17.5,-43.5 + pos: 26.5,-28.5 + parent: 2 + - uid: 1637 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 25.5,-27.5 + parent: 2 + - uid: 1638 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 24.5,-27.5 + parent: 2 + - uid: 1649 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,-45.5 + parent: 2 + - uid: 9072 + components: + - type: Transform + pos: 16.5,-43.5 + parent: 2 + - uid: 11099 + components: + - type: Transform + pos: 10.5,-43.5 + parent: 2 + - uid: 32061 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-47.5 + parent: 2 + - uid: 32062 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 16.5,-47.5 parent: 2 - uid: 32065 components: From 68db9d08b04adc8a1ebe4e1157c155ac9d4556bf Mon Sep 17 00:00:00 2001 From: Maxon Date: Sun, 17 Nov 2024 14:53:56 +0000 Subject: [PATCH 13/32] Automatic changelog update --- Resources/Changelog/Changelog220.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/Changelog220.yml b/Resources/Changelog/Changelog220.yml index 87e0a31f43c3fd..159a87270338d6 100644 --- a/Resources/Changelog/Changelog220.yml +++ b/Resources/Changelog/Changelog220.yml @@ -1,13 +1,4 @@ Entries: -- author: MIXnikita - changes: - - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u044B \u0442\u0435\u043A\u0441\ - \u0442\u0443\u0440\u044B \u0441\u0442\u0435\u043D \u0448\u0430\u0442\u0442\u043B\ - \u043E\u0432." - type: Tweak - id: 164 - time: '2024-06-08T13:37:54.0000000+00:00' - url: https://github.com/SerbiaStrong-220/space-station-14/pull/1054 - author: Tyler Gnomeev changes: - message: "\u0426\u0435\u043D\u0430 \u043D\u0430 \u043A\u0440\u0430\u0444\u0442\ @@ -5934,3 +5925,11 @@ id: 667 time: '2024-11-17T14:46:45.0000000+00:00' url: https://github.com/SerbiaStrong-220/space-station-14/pull/2239 +- author: spo9k + changes: + - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u0430 \u043A\u0430\u0440\u0442\ + \u0430 Donuts" + type: Tweak + id: 668 + time: '2024-11-17T14:52:52.0000000+00:00' + url: https://github.com/SerbiaStrong-220/space-station-14/pull/2227 From 60b3ce229c70f621f6effbe2eaa0e5c4099be1ad Mon Sep 17 00:00:00 2001 From: chell4592 <179739134+chell4592@users.noreply.github.com> Date: Mon, 18 Nov 2024 01:12:50 +0300 Subject: [PATCH 14/32] Bombers resprite & added pockets, added armoredbomber to pilot loadout (#2240) --- .../ss220/loadout-groups/security-pilot.ftl | 1 + .../Entities/Clothing/OuterClothing/coats.yml | 8 +++-- .../Entities/Clothing/OuterClothing/suits.yml | 2 +- .../Loadouts/Jobs/Security/security-pilot.yml | 5 +++ .../SS220/Loadouts/loadout_groups.yml | 12 +++++++ .../SS220/Loadouts/role_loadouts.yml | 2 +- .../equipped-OUTERCLOTHING-vox.png | Bin 0 -> 1540 bytes .../secbomber.rsi/equipped-OUTERCLOTHING.png | Bin 1524 -> 1500 bytes .../Armor/secbomber.rsi/icon.png | Bin 678 -> 2098 bytes .../Armor/secbomber.rsi/meta.json | 8 +++-- .../bomber.rsi/equipped-OUTERCLOTHING-vox.png | Bin 0 -> 1393 bytes .../bomber.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 1398 bytes .../OuterClothing/Coats/bomber.rsi/icon.png | Bin 0 -> 2089 bytes .../Coats/bomber.rsi/inhand-left.png | Bin 0 -> 739 bytes .../Coats/bomber.rsi/inhand-right.png | Bin 0 -> 667 bytes .../OuterClothing/Coats/bomber.rsi/meta.json | 30 ++++++++++++++++++ 16 files changed, 62 insertions(+), 6 deletions(-) create mode 100644 Resources/Textures/SS220/Clothing/OuterClothing/Armor/secbomber.rsi/equipped-OUTERCLOTHING-vox.png create mode 100644 Resources/Textures/SS220/Clothing/OuterClothing/Coats/bomber.rsi/equipped-OUTERCLOTHING-vox.png create mode 100644 Resources/Textures/SS220/Clothing/OuterClothing/Coats/bomber.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/SS220/Clothing/OuterClothing/Coats/bomber.rsi/icon.png create mode 100644 Resources/Textures/SS220/Clothing/OuterClothing/Coats/bomber.rsi/inhand-left.png create mode 100644 Resources/Textures/SS220/Clothing/OuterClothing/Coats/bomber.rsi/inhand-right.png create mode 100644 Resources/Textures/SS220/Clothing/OuterClothing/Coats/bomber.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ss220/loadout-groups/security-pilot.ftl b/Resources/Locale/ru-RU/ss220/loadout-groups/security-pilot.ftl index 496dcd2aa13add..3839646c249f21 100644 --- a/Resources/Locale/ru-RU/ss220/loadout-groups/security-pilot.ftl +++ b/Resources/Locale/ru-RU/ss220/loadout-groups/security-pilot.ftl @@ -1,2 +1,3 @@ loadout-group-security-pilot-backpack = Пилот СБ, рюкзак loadout-group-security-pilot-head = Пилот СБ, голова +loadout-group-security-pilot-outerclothing = Пилот СБ, верхняя одежда diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index 95190e4c3ed6c0..c74ba31d657d79 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -4,10 +4,14 @@ name: bomber jacket description: A thick, well-worn WW2 leather bomber jacket. components: +# SS220 resprite begin - type: Sprite - sprite: Clothing/OuterClothing/Coats/bomber.rsi +# sprite: Clothing/OuterClothing/Coats/bomber.rsi + sprite: SS220/Clothing/OuterClothing/Coats/bomber.rsi - type: Clothing - sprite: Clothing/OuterClothing/Coats/bomber.rsi +# sprite: Clothing/OuterClothing/Coats/bomber.rsi + sprite: SS220/Clothing/OuterClothing/Coats/bomber.rsi +# SS220 resprite end - type: entity parent: [ClothingOuterStorageBase, AllowSuitStorageClothing, ClothingOuterArmorBasic] diff --git a/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/suits.yml index 951af6a3563339..5ba106b81ecf75 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/suits.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/suits.yml @@ -1,7 +1,7 @@ # © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt - type: entity - parent: ClothingOuterBase + parent: ClothingOuterStorageBase id: ClothingOuterArmorBobmer name: бронированный бомбер description: Настоящие лётчики носят и бронежилеты, и модные куртки. diff --git a/Resources/Prototypes/SS220/Loadouts/Jobs/Security/security-pilot.yml b/Resources/Prototypes/SS220/Loadouts/Jobs/Security/security-pilot.yml index 6f7e257b052433..a79dd9d60ae6df 100644 --- a/Resources/Prototypes/SS220/Loadouts/Jobs/Security/security-pilot.yml +++ b/Resources/Prototypes/SS220/Loadouts/Jobs/Security/security-pilot.yml @@ -3,3 +3,8 @@ id: PilotCapCap equipment: head: ClothingHeadPilotCapCap +# Outer +- type: loadout + id: SecBomber + equipment: + outerClothing: ClothingOuterArmorBobmer diff --git a/Resources/Prototypes/SS220/Loadouts/loadout_groups.yml b/Resources/Prototypes/SS220/Loadouts/loadout_groups.yml index 553a8c522b3631..18346a6ed19d62 100644 --- a/Resources/Prototypes/SS220/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/SS220/Loadouts/loadout_groups.yml @@ -221,6 +221,18 @@ - SecurityBeret - SecurityHat - PilotCapCap + +- type: loadoutGroup + id: SecurityPilotOuterClothing + name: loadout-group-security-pilot-outerclothing + loadouts: + - ArmorVest + - ArmorVestSlim + - SecurityOfficerWintercoat + - CoatSecurityOvercoat + - SecBomber + - VestArmorSec + - CyberVestSecurity # Пилот (Конец) #! Служба безопасности (Конец) diff --git a/Resources/Prototypes/SS220/Loadouts/role_loadouts.yml b/Resources/Prototypes/SS220/Loadouts/role_loadouts.yml index fcc0dd62fc16a2..3a3232bd07181b 100644 --- a/Resources/Prototypes/SS220/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/SS220/Loadouts/role_loadouts.yml @@ -71,7 +71,7 @@ - SecurityNeck #holster loadout - SecurityJumpsuit - SecurityBackpack - - SecurityOuterClothing + - SecurityPilotOuterClothing - SurvivalSecurity - SecurityShoes - SecurityPDA diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Armor/secbomber.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/SS220/Clothing/OuterClothing/Armor/secbomber.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..9301c98f015c0d6c9493b04662ba1063c8763de1 GIT binary patch literal 1540 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 delta 1506 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 U5L1;rN%^X$C8wL}=B+6G8(}Qwb^rhX delta 654 zcmV;90&)Ga5T*r?B!2;OQb$4nuFf3k0007BNklLQmoc2QmnBx#3F4$ z7NL@D-o)A9Hf5HEhM4TT@tB$a@BQb!SsQvBwjS%l0V~9w0%%7DGK}`Qtkx`rQd|$&;n4hkW0D_?jCPEOe2b{3m?PxZe zxVKx^^ZDFr_W@$#vUcZY1Ut`O;CAFHt9~i-33GvSm?`}DCpY*oj>Webq&_O9iW4s4 z;;LH1h3FLWiGPG{KL_B6U^0oV^fDyLWg0>Va3vJhW}-6F$mF>)Q<&`yjE$-ox zzaLYRV+@Y+Jm%60KIgK+^V=>U@lvUT2h+E(kXk|PnhcNRVj4yO%2m`FQXdrDjZNbD z{2TauJ|Tn*32n z2i|AD=%D0MI=kLhLkJKU8f4WKws*h*$Z8VeJz&hY?m0F9Jv=n`7u|pGa@z*wO#Ki5 zzXBtG{L6{^LmIwSPeJr99O(cDpy~q&HY~ojQJA*Fp6~Rx9KbB omZ0$*3&3)~a-io98~~a$F)(42+{pj{002ovP6tG;LSTXb06HZze*gdg diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Armor/secbomber.rsi/meta.json b/Resources/Textures/SS220/Clothing/OuterClothing/Armor/secbomber.rsi/meta.json index d0fa84dd6b9253..c4325dad943a29 100644 --- a/Resources/Textures/SS220/Clothing/OuterClothing/Armor/secbomber.rsi/meta.json +++ b/Resources/Textures/SS220/Clothing/OuterClothing/Armor/secbomber.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8 and edited by wheremytea (Discord)", + "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", + "copyright": "Sprited by enmer_ (Discord) for SS220", "size": { "x": 32, @@ -14,6 +14,10 @@ { "name": "equipped-OUTERCLOTHING", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 }, { "name": "inhand-left", diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Coats/bomber.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/SS220/Clothing/OuterClothing/Coats/bomber.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..582b77cce2e8f2cf799f9e373dd0485f2e26723c GIT binary patch literal 1393 zcmV-%1&;cOP)7g$oY1=3joRwKm9D!pO6QvH)?EQaRmU-eD>JU zwy?N@o9aAUZ`6bg5arjj98~qz$Y&smFn_23FP_W+=+AJ+&|#X#SXf+PkG}iS7Gblw z#!T}V9Ye>dxx-eM3c`c)<971{fN36&d;p+h=;#7&!V8E2(-xsxu@CV)k z8+sR(*|U}1-rffp!-I~uxA)OHv{0DM!ZLd_6C>Dct~rLWe1G282A==zoBhDSynQp| zkBUG6R+kEF?rx5ED;ruqL$}Asb*)1Sb9ejR;}Z|qW^)bejT%1tyx=?g^-9j>=lk{o zowv*$FGA?EexLweGe|@<`1Zlchyg*@#|7V)TLeE*qVPxB2T(^e+q?+;F|}J}4;Z+i zmk|#iJ?(!-A@|_tIeB>Thaq$sU;6{iCZ7;KG%05T& zfV=`22CSrZfnGLvfnSnExP_hu$phRVAqeC0f-o5h2m?0v9@WT*4c*+Rzvk*5$6$O0X#91oO*om1q9w{UMp9^&3 zvP5um5y&P{ZsC1EVK(b1KH&3%twYOEHIg*6e8zeEVVISs;B4T?_j)e~3BVh0)xcM& zh?M3CCr7vRuJYo^9Nw8dJb&G?_XaMoYB8PYQdljf86N~G{usMQ4j%Xa!XWGc^-7Ly z=w06}XI4#lW{{JBPjt7%u2*tGg9qZI$6Xi{Ogh@fu@q|gjH5n@__p@W?8zX05zm{v z6qRj&Y)k}@ZGdb{1dwfjY)k}@ZGdcCdjb9f3An)-dXuA-00000NkvXXu0mjfB>s#Z literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Coats/bomber.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/SS220/Clothing/OuterClothing/Coats/bomber.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..8af728783aa9549dc53b3aa99daec6b5be957c8a GIT binary patch literal 1398 zcmV-+1&R8JP)N>>^S`xgcb)i+~{zR2(6w z2$w=`Oo{}~g>h23O5jYcaCKD@Qk)^FLf}&5ND<7D!sUSr3#^D7fh)u=C%neRvd$^F zNRvYQHlvmHXV#L(iT48`?TmKbn{VEmzxNcz7_KrhvK5exlmOWZ$VN(lYz1T^B|x?U zvT@}JxF-6-_Qom$pnU%IgIML0#`eZ4)AhngxnUe5iF`$5C%C<_%9fYkfMuNmfO7lO zuK)nMJDW^Z=WuxVTOuVyP2Q-UA+0uDpYmO zBLM)T=YvNNkXL5`K)LrrJAThXWCIwHAB2NPUdNUD`^T|lgc7h`Ex<4x=vt2D)mao5 z@@RK#ysWO^S!*9~3AkRa;>>#N)!SBANQo${R|`Y(gOEgiBmsGKmQmw`cE?7maROb- zDTe8=^3wcBJ+&WY32Qf3l<$6d9H_)rz39pBGa#b`w?*|L@58LX}NQ~g&?wz4-tleA*)Pa}ZYKD(!tNE||xCkX+t6pT4#ez5D zhUs{9x|SpN@X8F+L920scE?6#abP`L_2Rgu*~8sC*xp#hYp)jrM}NIq7?B_30_~1H zB;O?=a)u8jfFHr~(!4@~0C=4zQm9l$Yj* zlmUPzzdlFr#Ti*Z*0#ER3|5KrK;a2AOb6wVj&Uxk#I?Stt#IG{{EY~I>b*Ggegb$7 z;7O>)O82U@satg6uR%g*_oB)85S7$xnoW#r@1YOI8 z&ME$RDGr2AgJc1IxI~;wk=XJ>+D~EyLZ`w1Bd+{~NJ@Zg1!N;7K(+$1acKy+@#-s5 zH90i#Z2{AY;}UIl{8 zKPdsVQa0nh-%r%QIgw}?y;@+`%hjPWJ~u&>1R)pDwVW4v9)zu1L-hx~Xz?^)m<}q7!*ZWlU0@+U2+M0? z*YZMJVTuV*DEhL151WgI(u6F4qP`UTAfaRxe7JmC2#OH%x`~h=L;&UKz?XqR2?-Zr z6$2M2_;UhKSscVMMN_kcT!6AK#<@UP^3tT?mqji>lb{HaOo9pk6yMFGd2|fJbQplK zIRn!G$)Jvwm*y2dNz2x{LhHKleZbz{Q?xra_V%7mJ$5ew(hCp^&4goP<{6WM~^+D`kar5ViorbQmR0)Jj>_YMczE#9hQhNb+1aV01vMm9oMI zoAgdlwgR$|5+GXv*+>bHt$=K#1jtrEHc|p)DT{hz=8 z_usWS*|SDQPKZ<}6eBatCM$SD@*Oc0JjFoZZ}1xKHNPw>6j2A{d(b;cQE>`I_+HMI zC*@gY6EyEuk_=C=O269+&)<>FxO4A!FvKwic)rGhS-feilQRbd zHaC!MqXR{>j)9HOLwY{}47gc|g#2!oMt;QY2(YRU*6ZXYUUc&J zF&)~z#{sCV#S-!{U@UHT$b~4Smw+^a1sM=6+Dg4FYGp;fSfJVT5)fvBoQ;=A6IfE> z1sl)1`kBh<4;jKWN)`0%e9pu0J~8nw1=d7LtN{kBsSy>1;3^xA6PO0DmIR&{)(5rl z3}-LB8>&K7sW!kat|c(-Jy6gy3@MQh1v4~Z=LI(j66V~bgGId_2MmSENTl&DUI30k zbjiI@SS&<_N0dkp&1RSkFvwZSaSTD(Q*{)sr4Uwwu?WqmQxM8-*CO^*dy1B1F`6Yc z{rV=JE|!_?*Jpq}O;Q+>qM;FrA}IvZsc|5ss*&VW98;%|Iu)tL`}OAt95`B}>#^;~ z2TpDY!pw<)tkU3#$YqxVB^L+vb^$@sa(5eGTBem{;NUVhKm{HxgFdr9Cku=|fbKq+ z$lE0!DX=pfpjr=YC-i>7i)6`zLw_{#{vY~)?e{pL2g^!3NsogCvl4~nWKemi^pS%8 zm#^Nvy9Q7{985J?49!#U5t_)X2bdPXye$tz?pG)V$7Gmh*z(qNR2rRQ=1y!hqK9%U z=8r6yQ>W(dJ5xc8-u%Py;|)90l50;5UDsyKnW$fI;QMs%+N!E83#7Ldvm+bws`Cy=hBfXmpn`;^1uR zo1W_%PY1dag+&GVzg}D2PDNLr7~NFUd^WRg-PbkI84DBVAFpYCX7ThfI|?fz%5UmN z;Z@$O0`HZEr@m~sG#y=ZxjD{P-L$NvwYsx&#rD?a(kgqoo>r^1c; zTXfQHpOe_Sq@ti}SqzoXcJ|yCt{aoeF5cAo3dcva@HG-xE%Xgj{Lv9VY*ykEN3L~O zX4W-DIO>er%&mKtZoSezwoNy0@tP+6;h$DplT5#4jA)v0wdD;9^6ghAk238qIm!;L z(qOYItMZQ-mb0&ejh&i{<9-V>UmbL5fBxmJb33c!Kd~l#xM%5~@3z*xa`?Ka&06bv za-}N$W6ecfTg>&W3)aNO4@#pyeYLG_*0Ie|D@U!W&B{zyw9UM*E$*}Mz0Y;U&8^p- z|NK%%JYT;ha?0(nDI3#nAmi&f+vM@Fo3v(QW7+m0+mqkg*K_8zhJ!B<;ddf)?<8b~ hJv}&jQ0};{5kpS4yic7vt&)G{8R^-kT`v}{`WIUq<|+UH literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Coats/bomber.rsi/inhand-left.png b/Resources/Textures/SS220/Clothing/OuterClothing/Coats/bomber.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..6517621b359fd5b9255253dadcf826020315a391 GIT binary patch literal 739 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wk0|V1k zPZ!6KiaBp**=OH&kZ7Nu?X~iNb76oucTi88)AE{zch_!AscA^#=A2T;$lqAg;Iv?Z z;$McPZ*Mq=zmMg~wVfK!)6<*kB*<2+5z`*>PyBeaA)==!=)k&Pyfd9u2^jTe%ZV8i}&nb zZTntv-E8$PJkK~;n13`m^=nv9_=%a* zxFq}<50rli_`|-hW?w?_VzU(Ff$*=tMnf=w(%fGYIUuP*yN={sC9cF(s-c3ZJmtkFz zoJ0NZTWktHd8K1bZ#FLezJJn@zjObnue8s6bi#1)3^N5s)x~C(vpB2O?bpX{byG^n zN@r)2@?m_unZe&$#rq& ztSMz$OBTzxJF_Gof1F|QulAUIFypFFcNyM?^6@EtZ{*_@`r68uok)59vTNhUD&q+& zbTaz`bE2iqNtT3}#`4>tAI5vzro>G!*Jl~dH3R}T9fui zG4t`C7vM>1*=Mdk_tDIiOvnD$`^Vd@&@$F<%HQwG#<0U7^|`&m`jaP%8{jedhiSdU WR;HJl$5sMU8-u5-pUXO@geCx4oF$_G literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Coats/bomber.rsi/meta.json b/Resources/Textures/SS220/Clothing/OuterClothing/Coats/bomber.rsi/meta.json new file mode 100644 index 00000000000000..23030f89953d02 --- /dev/null +++ b/Resources/Textures/SS220/Clothing/OuterClothing/Coats/bomber.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", + "copyright": "Sprited by enmer_ (Discord) for SS220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From e9e01216e1057e66be5e427853e6bab31b69bc4e Mon Sep 17 00:00:00 2001 From: Ady4ik <141335742+Ady4ik@users.noreply.github.com> Date: Mon, 18 Nov 2024 01:39:13 +0300 Subject: [PATCH 15/32] Fix SM garbage and nearby garbage (#2234) * Fix SM gargage * comm * Update Resources/Prototypes/GameRules/variation.yml Co-authored-by: Kirus59 <145689588+Kirus59@users.noreply.github.com> * Update Content.Server/GameTicking/Rules/VariationPass/Components/EntitySpawnVariationPassComponent.cs Co-authored-by: Kirus59 <145689588+Kirus59@users.noreply.github.com> * PR fixes * UTF fix * Boom * Bebra * Fix boom again * Fix boom againv2 --------- Co-authored-by: Kirus59 <145689588+Kirus59@users.noreply.github.com> --- .../EntitySpawnVariationPassComponent.cs | 9 +++++++++ .../EntitySpawnVariationPassSystem.cs | 19 +++++++++++++++++++ Resources/Prototypes/GameRules/variation.yml | 5 +++++ 3 files changed, 33 insertions(+) diff --git a/Content.Server/GameTicking/Rules/VariationPass/Components/EntitySpawnVariationPassComponent.cs b/Content.Server/GameTicking/Rules/VariationPass/Components/EntitySpawnVariationPassComponent.cs index f7ddd7ce9dd064..05bcd9a4eef9e0 100644 --- a/Content.Server/GameTicking/Rules/VariationPass/Components/EntitySpawnVariationPassComponent.cs +++ b/Content.Server/GameTicking/Rules/VariationPass/Components/EntitySpawnVariationPassComponent.cs @@ -1,5 +1,6 @@ using Content.Shared.Random; using Content.Shared.Storage; +using Content.Shared.Whitelist; using Robust.Shared.Prototypes; namespace Content.Server.GameTicking.Rules.VariationPass.Components; @@ -24,4 +25,12 @@ public sealed partial class EntitySpawnVariationPassComponent : Component /// [DataField(required: true)] public List Entities = default!; + + // SS220 Fix SM begin + /// + /// A blacklis of entities that will block spawn of garbage in their vicinity + /// + [DataField] + public EntityWhitelist? Blacklist = new(); + // SS220 Fix SM end } diff --git a/Content.Server/GameTicking/Rules/VariationPass/EntitySpawnVariationPassSystem.cs b/Content.Server/GameTicking/Rules/VariationPass/EntitySpawnVariationPassSystem.cs index 7247bd98aa0b37..0fd0ea2c8fe511 100644 --- a/Content.Server/GameTicking/Rules/VariationPass/EntitySpawnVariationPassSystem.cs +++ b/Content.Server/GameTicking/Rules/VariationPass/EntitySpawnVariationPassSystem.cs @@ -1,12 +1,18 @@ using Content.Server.GameTicking.Rules.VariationPass.Components; using Content.Shared.Storage; using Robust.Shared.Random; +using Content.Shared.Whitelist; namespace Content.Server.GameTicking.Rules.VariationPass; /// public sealed class EntitySpawnVariationPassSystem : VariationPassSystem { + // SS220 SM garbage fix begin + [Dependency] private readonly EntityLookupSystem _lookupSystem = default!; + [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; + private const float Range = 3f; // Range to check SM nearby + // SS220 SM garbage fix end protected override void ApplyVariation(Entity ent, ref StationVariationPassEvent args) { var totalTiles = Stations.GetTileCount(args.Station); @@ -19,6 +25,19 @@ protected override void ApplyVariation(Entity if (!TryFindRandomTileOnStation(args.Station, out _, out _, out var coords)) continue; + // SS220 SM garbage fix begin + var listTakedEntites = _lookupSystem.GetEntitiesInRange(coords, Range); + bool isCanSpawn = true; + + foreach (var checkedTakedEntities in listTakedEntites) + { + if (_whitelistSystem.IsBlacklistPass(ent.Comp.Blacklist, checkedTakedEntities)) + isCanSpawn = false; + } + if (!isCanSpawn) + continue; + // SS220 SM garbage fix end + var ents = EntitySpawnCollection.GetSpawns(ent.Comp.Entities, Random); foreach (var spawn in ents) { diff --git a/Resources/Prototypes/GameRules/variation.yml b/Resources/Prototypes/GameRules/variation.yml index 093a832d72f816..c660f70c785151 100644 --- a/Resources/Prototypes/GameRules/variation.yml +++ b/Resources/Prototypes/GameRules/variation.yml @@ -46,6 +46,11 @@ tilesPerEntityStdDev: 4 entities: - id: RandomSpawner + # SS220 Fix SM garbage begin + blacklist: + components: + - SuperMatter + # SS220 Fix SM garbage end - type: weightedRandomFillSolution id: RandomFillTrashPuddle From c3c1aaa78b8c7bddfa8af7e3752a7def1983f86e Mon Sep 17 00:00:00 2001 From: Maxon Date: Sun, 17 Nov 2024 22:40:17 +0000 Subject: [PATCH 16/32] Automatic changelog update --- Resources/Changelog/Changelog220.yml | 29 ++++++++++------------------ 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/Resources/Changelog/Changelog220.yml b/Resources/Changelog/Changelog220.yml index 159a87270338d6..6b0c93b26d642b 100644 --- a/Resources/Changelog/Changelog220.yml +++ b/Resources/Changelog/Changelog220.yml @@ -1,23 +1,4 @@ Entries: -- author: Tyler Gnomeev - changes: - - message: "\u0426\u0435\u043D\u0430 \u043D\u0430 \u043A\u0440\u0430\u0444\u0442\ - \ \u0430\u0432\u0442\u043E\u0438\u043D\u0436\u0435\u043A\u0442\u043E\u0440\u043E\ - \u0432 \u0443\u0432\u0435\u043B\u0438\u0447\u0435\u043D\u0430, \u0437\u0430\u043D\ - \u0438\u043C\u0430\u044E\u0442 \u0431\u043E\u043B\u044C\u0448\u0435 \u043C\u0435\ - \u0441\u0442\u0430" - type: Tweak - - message: "\u0421\u043A\u0430\u0444\u0430\u043D\u0434\u0440\u0430\u043C \u0441\u043E\ - \ \u0432\u043A\u043B\u044E\u0447\u0435\u043D\u043D\u044B\u043C \u0448\u043B\u0435\ - \u043C\u043E\u043C \u0438 \u043F\u0440\u043E\u0442\u0438\u0432\u043E\u0443\u0434\ - \u0430\u0440\u043D\u043E\u0439 \u0431\u0440\u043E\u043D\u0435 \u0421\u0411 \u0434\ - \u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0437\u0430\u0449\u0438\u0442\ - \u0430 \u043E\u0442 \u0430\u0432\u0442\u043E\u0438\u043D\u044A\u043A\u0442\u043E\ - \u0440\u043E\u0432" - type: Add - id: 165 - time: '2024-06-08T13:39:22.0000000+00:00' - url: https://github.com/SerbiaStrong-220/space-station-14/pull/1097 - author: MiraHell changes: - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043E \u0433\u043E\ @@ -5933,3 +5914,13 @@ id: 668 time: '2024-11-17T14:52:52.0000000+00:00' url: https://github.com/SerbiaStrong-220/space-station-14/pull/2227 +- author: Ady4 + changes: + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0430 \u043F\u043E\ + \u043B\u043E\u043C\u043A\u0430 \u0434\u0432\u0438\u0433\u0430\u0442\u0435\u043B\ + \u044F \u0441\u0443\u043F\u0435\u0440-\u043C\u0430\u0442\u0435\u0440\u0438\u0438\ + \ \u0438\u0437-\u0437\u0430 \u043C\u0443\u0441\u043E\u0440\u0430!" + type: Fix + id: 669 + time: '2024-11-17T22:39:13.0000000+00:00' + url: https://github.com/SerbiaStrong-220/space-station-14/pull/2234 From 72dfa8b67a40980ac6748e4024f0fb52ca67959b Mon Sep 17 00:00:00 2001 From: Svarshik <96281939+lexaSvarshik@users.noreply.github.com> Date: Mon, 18 Nov 2024 03:52:10 +0500 Subject: [PATCH 17/32] More ammo recipies to lathes (#2173) --- .../guns/ammunition/magazines/magnum.ftl | 2 + .../guns/ammunition/magazines/pistol.ftl | 2 + .../Entities/Structures/Machines/lathe.yml | 32 +++++++ Resources/Prototypes/Research/arsenal.yml | 8 ++ .../Guns/Ammunition/Magazines/magnum.yml | 14 +++ .../Guns/Ammunition/Magazines/pistol.yml | 14 +++ .../SS220/Recipes/Lathes/security.yml | 92 +++++++++++++++++++ 7 files changed, 164 insertions(+) create mode 100644 Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/guns/ammunition/magazines/magnum.ftl create mode 100644 Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl create mode 100644 Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/guns/ammunition/magazines/magnum.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/guns/ammunition/magazines/magnum.ftl new file mode 100644 index 00000000000000..e67874154cd07a --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/guns/ammunition/magazines/magnum.ftl @@ -0,0 +1,2 @@ +ent-MagazineMagnumIncendiary = пистолетный магазин (.45 магнум зажигательные) + .desc = { ent-BaseMagazineMagnum.desc } diff --git a/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl new file mode 100644 index 00000000000000..1e496df02756c2 --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/prototypes/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl @@ -0,0 +1,2 @@ +ent-MagazinePistolSubMachineGunIncendiary = магазин ПП (.35 авто зажигательные) + .desc = { ent-BaseMagazinePistolSubMachineGun.desc } diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 47ac9dd7ac1c38..65887f518b2f52 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -231,6 +231,15 @@ - RiotShield - SpeedLoaderMagnum - SpeedLoaderMagnumEmpty + #ss220 more recipies begin + - SpeedLoaderLightRifle + - MagazineBoxCaselessRifle + - MagazinePistolCaselessRifle + - MagazineMagnumEmpty + - MagazineMagnum + - MagazinePistolHighCapacityEmpty + - MagazinePistolHighCapacity + #ss220 more recipies end - type: BlueprintReceiver whitelist: tags: @@ -405,6 +414,12 @@ - WeaponEnergyCrossbow #SS220 Energy Crossbow - WeaponTaser #SS220 taserback - ClothingEyesThermalGlassesSecurity #SS220 Thermals + #ss220 more recipies begin + - MagazineMagnumIncendiary + - MagazineMagnumUranium + - MagazinePistolSubMachineGunIncendiary + - MagazinePistolSubMachineGunUranium + #ss220 more recipies end - type: entity id: ProtolatheHyperConvection @@ -803,6 +818,12 @@ - WeaponDisablerPractice - WeaponLaserCarbinePractice - Zipties + #ss220 more recipies begin + - SpeedLoaderLightRifle + - MagazineMagnumEmpty + - MagazineMagnum + - MagazineMagnumRubber + #ss220 more recipies end dynamicRecipes: - BoxBeanbag - BoxShotgunIncendiary @@ -858,6 +879,12 @@ - WeaponEnergyCrossbow #SS220 Energy Crossbow - WeaponTaser #SS220 taserback - ClothingEyesThermalGlassesSecurity #SS220 Thermals + #ss220 more recipies begin + - MagazineMagnumUranium + - MagazineMagnumIncendiary + - MagazinePistolSubMachineGunUranium + - MagazinePistolSubMachineGunIncendiary + #ss220 more recipies end - type: MaterialStorage whitelist: tags: @@ -924,6 +951,11 @@ - SpeedLoaderMagnum - SpeedLoaderMagnumRubber #SS220 missing rubber fix - SpeedLoaderMagnumEmpty + #ss220 more recipies begin + - MagazinePistolCaselessRifle + - MagazineBoxCaselessRifle + - SpeedLoaderLightRifle + #ss220 more recipies end - type: MaterialStorage whitelist: tags: diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index ced2301dd93aee..918a838303f006 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -34,6 +34,10 @@ - MagazineBoxMagnumIncendiary - MagazineBoxLightRifleIncendiary - MagazineBoxRifleIncendiary + #ss220 more recipies begin + - MagazineMagnumIncendiary + - MagazinePistolSubMachineGunIncendiary + #ss220 more recipies begin - type: technology id: WeaponizedLaserManipulation @@ -81,6 +85,10 @@ - MagazineBoxLightRifleUranium - MagazineBoxRifleUranium - BoxShotgunUranium + #ss220 more recipies begin + - MagazineMagnumUranium + - MagazinePistolSubMachineGunUranium + #ss220 more recipies end - type: technology id: AdvancedRiotControl diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml index 99d966949a4c5b..cb7b2a1d2512d4 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml @@ -1,3 +1,17 @@ +#Svarshik's missing mags +- type: entity + id: MagazineMagnumIncendiary + name: pistol magazine (.45 magnum incendiary) + parent: BaseMagazineMagnum + components: + - type: BallisticAmmoProvider + proto: CartridgeMagnumIncendiary + - type: Sprite + layers: + - state: red + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + - type: entity id: MagazineMagnumSubMachineGunSP-91-RC name: "SP-91-RC magazine (.45 magnum)" diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml new file mode 100644 index 00000000000000..63d98bf3ed4bb4 --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml @@ -0,0 +1,14 @@ +#Svarshik's missing mags +- type: entity + id: MagazinePistolSubMachineGunIncendiary + name: SMG magazine (.35 auto incendiary) + parent: BaseMagazinePistolSubMachineGun + components: + - type: BallisticAmmoProvider + proto: CartridgePistolIncendiary + - type: Sprite + layers: + - state: red + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/SS220/Recipes/Lathes/security.yml b/Resources/Prototypes/SS220/Recipes/Lathes/security.yml index 5db1d2477038b5..28cce1ad954acf 100644 --- a/Resources/Prototypes/SS220/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/SS220/Recipes/Lathes/security.yml @@ -78,3 +78,95 @@ materials: Steel: 175 Plastic: 300 + +#Svarshik's missing mags +- type: latheRecipe + parent: BaseAmmoRecipe + id: SpeedLoaderLightRifle + result: SpeedLoaderLightRifle + materials: + Steel: 75 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineBoxCaselessRifle + result: MagazineBoxCaselessRifle + materials: + Steel: 600 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazinePistolCaselessRifle + result: MagazinePistolCaselessRifle + materials: + Steel: 135 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazinePistolSubMachineGunIncendiary + result: MagazinePistolSubMachineGunIncendiary + materials: + Steel: 275 + Plastic: 25 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazinePistolSubMachineGunUranium + result: MagazinePistolSubMachineGunUranium + materials: + Steel: 25 + Plastic: 300 + Uranium: 300 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineMagnumEmpty + result: MagazineMagnumEmpty + materials: + Steel: 60 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineMagnum + result: MagazineMagnum + materials: + Steel: 200 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineMagnumIncendiary + result: MagazineMagnumIncendiary + materials: + Steel: 180 + Plastic: 25 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineMagnumUranium + result: MagazineMagnumUranium + materials: + Steel: 60 + Plastic: 150 + Uranium: 120 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazineMagnumRubber + result: MagazineMagnumRubber + materials: + Steel: 180 + Plastic: 150 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazinePistolHighCapacityEmpty + result: MagazinePistolHighCapacityEmpty + materials: + Steel: 30 + +- type: latheRecipe + parent: BaseAmmoRecipe + id: MagazinePistolHighCapacity + result: MagazinePistolHighCapacity + materials: + Steel: 240 From 02af9f586d4fa2675b6c7b56da960d2eee25543e Mon Sep 17 00:00:00 2001 From: Maxon Date: Sun, 17 Nov 2024 22:53:14 +0000 Subject: [PATCH 18/32] Automatic changelog update --- Resources/Changelog/Changelog220.yml | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog220.yml b/Resources/Changelog/Changelog220.yml index 6b0c93b26d642b..90c486570689f7 100644 --- a/Resources/Changelog/Changelog220.yml +++ b/Resources/Changelog/Changelog220.yml @@ -1,12 +1,4 @@ Entries: -- author: MiraHell - changes: - - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043E \u0433\u043E\ - \u0440\u0435\u043D\u0438\u0435" - type: Fix - id: 166 - time: '2024-06-08T13:55:23.0000000+00:00' - url: https://github.com/SerbiaStrong-220/space-station-14/pull/1078 - author: Okroshka changes: - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u044B \u0441\u043F\u0440\u0430\ @@ -5924,3 +5916,23 @@ id: 669 time: '2024-11-17T22:39:13.0000000+00:00' url: https://github.com/SerbiaStrong-220/space-station-14/pull/2234 +- author: Svarshik + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043A\u0440\u0430\ + \u0444\u0442 .25 \u0431\u0435\u0437\u0433\u0438\u043B\u044C\u0437\u043E\u0432\ + \u044B\u0445 \u0438 .35 \u0430\u0432\u0442\u043E\u043F\u0438\u0441\u0442\u043E\ + \u043B\u0435\u0442\u043D\u044B\u0445 \u043C\u0430\u0433\u0430\u0437\u0438\u043D\ + \u043E\u0432 \u0432 \u0435\u043C\u0430\u0433\u043D\u0443\u0442\u044B\u0439 \u0430\ + \u0432\u0442\u043E\u043B\u0430\u0442!" + type: Add + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u043A\u0440\u0430\u0444\ + \u0442 \u0441\u043F\u0438\u0434\u043B\u043E\u0430\u0434\u0435\u0440\u0430 .30" + type: Add + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0440\u0435\u0446\ + \u0435\u043F\u0442\u044B \u043D\u0435\u043A\u043E\u0442\u043E\u0440\u044B\u0445\ + \ \u043D\u0435\u0434\u043E\u0441\u0442\u0430\u044E\u0449\u0438\u0445 \u043C\u0430\ + \u0433\u0430\u0437\u0438\u043D\u043E\u0432" + type: Add + id: 670 + time: '2024-11-17T22:52:10.0000000+00:00' + url: https://github.com/SerbiaStrong-220/space-station-14/pull/2173 From ce96d870b677ee64c25644e86915f84b5f9c6119 Mon Sep 17 00:00:00 2001 From: Svarshik <96281939+lexaSvarshik@users.noreply.github.com> Date: Tue, 19 Nov 2024 11:49:10 +0500 Subject: [PATCH 19/32] Update smgs.yml (#2260) --- .../Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 9ea6dce5b39a2e..9e63cd45aaf83f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -153,8 +153,8 @@ selectedMode: Burst soundGunshot: path: /Audio/Weapons/Guns/Gunshots/atreides.ogg -# availableModes: #ss220 gunmodes -# - Burst #ss220 gunmodes + availableModes: + - Burst shotsPerBurst: 3 burstCooldown: 0.25 - type: ItemSlots From 2b7435212233f63a3e6689c51676092efb81ded9 Mon Sep 17 00:00:00 2001 From: Maxon Date: Tue, 19 Nov 2024 06:50:15 +0000 Subject: [PATCH 20/32] Automatic changelog update --- Resources/Changelog/Changelog220.yml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/Resources/Changelog/Changelog220.yml b/Resources/Changelog/Changelog220.yml index 90c486570689f7..f7111d45782ea9 100644 --- a/Resources/Changelog/Changelog220.yml +++ b/Resources/Changelog/Changelog220.yml @@ -1,14 +1,4 @@ Entries: -- author: Okroshka - changes: - - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u044B \u0441\u043F\u0440\u0430\ - \u0439\u0442\u044B \u0432\u043E\u0434\u043E\u043B\u0430\u0437\u043A\u0438 \u0421\ - \u0442\u0430\u0440\u0448\u0435\u0433\u043E \u0418\u043D\u0436\u0435\u043D\u0435\ - \u0440\u0430." - type: Tweak - id: 167 - time: '2024-06-09T13:27:42.0000000+00:00' - url: https://github.com/SerbiaStrong-220/space-station-14/pull/1095 - author: Kemran changes: - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0444\u0443\u0440\ @@ -5936,3 +5926,15 @@ id: 670 time: '2024-11-17T22:52:10.0000000+00:00' url: https://github.com/SerbiaStrong-220/space-station-14/pull/2173 +- author: lexaSvarshik + changes: + - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D \u0440\u0435\u0436\u0438\u043C\ + \ \u043E\u0433\u043D\u044F \u0443 \u0414\u0440\u043E\u0437\u0434\u0430 \u043D\ + \u0430 \u0441\u0442\u0440\u0435\u043B\u044C\u0431\u0443 \u043E\u0447\u0435\u0440\ + \u0435\u0434\u044F\u043C\u0438. \u0414\u041F\u0421 \u043E\u0441\u0442\u0430\u043B\ + \u0441\u044F \u043D\u0430 \u043F\u0440\u0435\u0436\u043D\u0435\u043C \u0443\u0440\ + \u043E\u0432\u043D\u0435." + type: Tweak + id: 671 + time: '2024-11-19T06:49:11.0000000+00:00' + url: https://github.com/SerbiaStrong-220/space-station-14/pull/2260 From c0797ad09963aebdda17c3683e90f8cf61c491db Mon Sep 17 00:00:00 2001 From: chell4592 <179739134+chell4592@users.noreply.github.com> Date: Tue, 19 Nov 2024 09:57:55 +0300 Subject: [PATCH 21/32] reptilian (#2259) --- .../welding-gas.rsi/equipped-MASK-reptilian.png | Bin 0 -> 673 bytes .../Clothing/Mask/welding-gas.rsi/meta.json | 6 +++++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Clothing/Mask/welding-gas.rsi/equipped-MASK-reptilian.png diff --git a/Resources/Textures/Clothing/Mask/welding-gas.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/welding-gas.rsi/equipped-MASK-reptilian.png new file mode 100644 index 0000000000000000000000000000000000000000..c7f5fa9ee2d949193f6ed654df5027f936b3605c GIT binary patch literal 673 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-HD>U~=?yaSW-L z^Y+&M?As0^>>u*IP6la6II%aI3l}r_Zxxih?b*hsdU)o7lhxbx_%Z@kC~8GoM^85V zBrrW-!nAMl6Rahd%zJ%y!9wTm*}Bf_opm1Tsi{Z5TmOA#O}h8{x))C#+BOI*T6O#F zsnWN5cCPzf7aM)_uZ}pY8rniWn+{olTOc@^XHn5b#3%}$JMi4PV8G^9p8nDhRP z<_wOF+tw!eKRy2P$^AQb805qERq*V&ao>IU<%03RDlK4G@eTZv?!u+>*nt8L_z`yT&K{?4h`BH+XU zC;o-a++?}@?YHYD)~|opIbJqlXvn>7eUk6yHeE)AE+rEwUd}sd9YFV3-ra9_Zl}*A zmpI;bBiV>~Ik%^UA6^LL=Pg!K3~u%4D%OjiJC~8+-c+vx(}nc(KR*`ctt>h=qo%sDbKi5tE+vK=KUU=CE?Dg Date: Tue, 19 Nov 2024 06:58:59 +0000 Subject: [PATCH 22/32] Automatic changelog update --- Resources/Changelog/Changelog220.yml | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/Resources/Changelog/Changelog220.yml b/Resources/Changelog/Changelog220.yml index f7111d45782ea9..95195e2723593c 100644 --- a/Resources/Changelog/Changelog220.yml +++ b/Resources/Changelog/Changelog220.yml @@ -1,19 +1,4 @@ Entries: -- author: Kemran - changes: - - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0444\u0443\u0440\ - \u0430\u0436\u043A\u0430 \u0413\u0421\u0411 \u0432 \u0435\u0433\u043E \u043A\ - \u043E\u043C\u043E\u0434 \u0438 \u043B\u043E\u0434\u0430\u0443\u0442." - type: Add - - message: "\u0423\u0431\u0440\u0430\u043D\u044B \u043F\u043E\u044F\u0441\u0430\ - \ \u043E\u0445\u0440\u0430\u043D\u044B \u0438\u0437 \u0441\u0442\u0430\u0440\ - \u0442\u043E\u0432\u043E\u0433\u043E \u0441\u043D\u0430\u0440\u044F\u0436\u0435\ - \u043D\u0438\u044F \u0443 \u0413\u0421\u0411 \u0438 \u0412\u0430\u0440\u0434\ - \u0435\u043D\u0430." - type: Remove - id: 168 - time: '2024-06-09T13:40:05.0000000+00:00' - url: https://github.com/SerbiaStrong-220/space-station-14/pull/1102 - author: Kemran changes: - message: "\u0423\u0431\u0440\u0430\u043D\u0430 \u043B\u043E\u0442\u0435\u0440\u0435\ @@ -5938,3 +5923,14 @@ id: 671 time: '2024-11-19T06:49:11.0000000+00:00' url: https://github.com/SerbiaStrong-220/space-station-14/pull/2260 +- author: dinazewwr + changes: + - message: "\u0421\u0432\u0430\u0440\u043E\u0447\u043D\u044B\u0439 \u043F\u0440\u043E\ + \u0442\u0438\u0432\u043E\u0433\u0430\u0437 \u0431\u043E\u043B\u044C\u0448\u0435\ + \ \u043D\u0435 \u043E\u0442\u0440\u0435\u0437\u0430\u0435\u0442 \u043D\u043E\ + \u0441\u044B \u0431\u0435\u0434\u043D\u044B\u043C \u0443\u043D\u0430\u0442\u0445\ + \u0430\u043C!" + type: Fix + id: 672 + time: '2024-11-19T06:57:55.0000000+00:00' + url: https://github.com/SerbiaStrong-220/space-station-14/pull/2259 From 14a95393f490bd54aabc84759799ea5f7e9996d6 Mon Sep 17 00:00:00 2001 From: Svarshik <96281939+lexaSvarshik@users.noreply.github.com> Date: Wed, 20 Nov 2024 01:12:56 +0500 Subject: [PATCH 23/32] pistol magnum mags new sprite + sprite fix (#2262) --- .../Guns/Ammunition/Magazines/magnum.yml | 9 ++++ .../Guns/Ammunition/Magazines/pistol.yml | 2 +- .../Guns/Ammunition/Magazines/magnum.yml | 1 + .../Magazine/Magnum/magnum.rsi/base.png | Bin 0 -> 284 bytes .../Magazine/Magnum/magnum.rsi/mag-1.png | Bin 0 -> 150 bytes .../Magazine/Magnum/magnum.rsi/mag-2.png | Bin 0 -> 157 bytes .../Magazine/Magnum/magnum.rsi/mag-3.png | Bin 0 -> 159 bytes .../Magazine/Magnum/magnum.rsi/mag-4.png | Bin 0 -> 162 bytes .../Magazine/Magnum/magnum.rsi/mag-5.png | Bin 0 -> 163 bytes .../Magazine/Magnum/magnum.rsi/meta.json | 47 ++++++++++++++++++ .../Magazine/Magnum/magnum.rsi/piercing.png | Bin 0 -> 297 bytes .../Magazine/Magnum/magnum.rsi/practice.png | Bin 0 -> 312 bytes .../Magazine/Magnum/magnum.rsi/red-icon.png | Bin 0 -> 333 bytes .../Magazine/Magnum/magnum.rsi/red.png | Bin 0 -> 304 bytes .../Magazine/Magnum/magnum.rsi/rubber.png | Bin 0 -> 311 bytes .../Magazine/Magnum/magnum.rsi/uranium.png | Bin 0 -> 310 bytes 16 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum.rsi/base.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum.rsi/mag-1.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum.rsi/mag-2.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum.rsi/mag-3.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum.rsi/mag-4.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum.rsi/mag-5.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum.rsi/meta.json create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum.rsi/piercing.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum.rsi/practice.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum.rsi/red-icon.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum.rsi/red.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum.rsi/rubber.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum.rsi/uranium.png diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml index 9cacf8d2219d45..36ece2c574a49f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml @@ -7,6 +7,15 @@ - type: Tag tags: - MagazineMagnum + #ss220 magnum pistol mag new sprite begin + - type: Sprite + sprite: SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + #ss220 magnum pistol mag new sprite end - type: BallisticAmmoProvider mayTransfer: true whitelist: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml index 6eb2908b5cfa3e..4bcf286a448bf6 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml @@ -27,7 +27,7 @@ map: ["enum.GunVisualLayers.Mag"] - type: MagazineVisuals magState: mag - steps: 5 + steps: 6 #ss220 sprite fix zeroVisible: false - type: Appearance diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml index cb7b2a1d2512d4..53dfba6a3d9d9d 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml @@ -11,6 +11,7 @@ - state: red map: ["enum.GunVisualLayers.Base"] - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] - type: entity id: MagazineMagnumSubMachineGunSP-91-RC diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum.rsi/base.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..83d851ac61228811f4fe9dfdff8d23bbe0b4f705 GIT binary patch literal 284 zcmV+%0ptFOP)Px#)=5M`R9J=Wk}(RxFc?Ok;-H;Ms6!VCbnfQl;2|6xyny0iN_!S}2NwlVXTei+ zt*fmClQcz(d0X<6pU3wF91h37(=&M_qqwNMf81}{`vxWg0KN!WEf=M`B+W`za%gJK13#ScGFfs(Q3dBtexA%v)%2f-MC%k@m2=UOQ! i3#cyC6>vBlU*`#7SwzgjG&(i_0000&z;f2n!=|HcvjcQvOsJUGU@=&b5(#v2Fv>TdtPUS5}GacuRe4OL&W rR?V{IayzI2*4EP$XaM3YkOW#1%FlfJ^OVOxvl%>H{an^LB{Ts5?L;;H literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum.rsi/mag-2.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum.rsi/mag-2.png new file mode 100644 index 0000000000000000000000000000000000000000..8c1d20f415d778af376a7b307231740738baface GIT binary patch literal 157 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R};hrvzArY;~ z2@&z;f2n!=|HcvjcQvOsJUGU@=&b5(#v2Fv>TdtPUS5}GacuRe4OL&W zR?V{I+R!BXcU#2egBoDXJxzfITy7xF5(b9syMk@g;sj%XRxo(F`njxgN@xNAxG^~v literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum.rsi/mag-3.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum.rsi/mag-3.png new file mode 100644 index 0000000000000000000000000000000000000000..60ddb6d74d4706f376d21f4615e93396c267d81d GIT binary patch literal 159 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}k)AG&ArY;~ z2@&z;f2n!=|HcvjcQvOsJUGU@=&b5(#v2Fv>TdtPUS5}GacuRe4OL&W zR?V{I+R!BXcU#2egBlCCC3yb@8gRKC)PR^H&A_loM}%|H{!6QXmN0m_`njxgN@xNA DDE~Rd literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum.rsi/mag-4.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum.rsi/mag-4.png new file mode 100644 index 0000000000000000000000000000000000000000..88e25634d513c2e26c85984d94bff6745f3ad4dc GIT binary patch literal 162 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}F`h1tArY;~ z2@&z;f2n!=|HcvjcQvOsJUGU@=&b5(#v2Fv>TdtPUS5}GacuRe4OL&W zR?V{I+R!BXcU#2egBlCCC3ycavMxSo&*gSd18h`)Fav{FpjeN4>$(h}Jq(_%elF{r G5}E+pGdfQI literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum.rsi/mag-5.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum.rsi/mag-5.png new file mode 100644 index 0000000000000000000000000000000000000000..128854d5a712bd4342031f3ea41cd74b683ea02c GIT binary patch literal 163 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}v7RoDArY;~ z2@&z;f2n!=|HcvjcQvOsJUGU@=&b5(#v2Fv>TdtPUS5}GacuRe4OL&W zR?V{I+R!BXcU#2egBlCCC3ycavMxSozaYWnhx!PC{x JWt~$(698QLJtqJF literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum.rsi/meta.json b/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum.rsi/meta.json new file mode 100644 index 00000000000000..308d6474627ecc --- /dev/null +++ b/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum.rsi/meta.json @@ -0,0 +1,47 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", + "copyright": "made by blackvwolf (Discord) for ss220 ", + "states": [ + { + "name": "base" + }, + { + "name": "practice" + }, + { + "name": "red" + }, + { + "name": "red-icon" + }, + { + "name": "rubber" + }, + { + "name": "uranium" + }, + { + "name": "piercing" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "mag-4" + }, + { + "name": "mag-5" + } + ] +} diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum.rsi/piercing.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum.rsi/piercing.png new file mode 100644 index 0000000000000000000000000000000000000000..5a664fa987e05b0078d44645e386b4a78fbb1288 GIT binary patch literal 297 zcmV+^0oMMBP)Px#<4Ht8R9J=Wk}(RxFc?Ok;-HyIs6!VCbaoLZ2PaP;ogBP?;$fto#ofV0LDX6B z6kX$}tp$@<5it)kBq2YK?+bW5o`0w2@<_#9U3PxGoUP|ITm%3D88MxVb7#wRl@l`& zauxvCZ1=hSVm^D6F`7|-M_{*IKM573USZvtin}_H5lVGR?}vjv%XDS@AKpr!3Y-Os z@w;MGLDliYuU1f1{9sYRC*p@+tf0#H!LWi)#czY|flfeESPAISeQ%ACu@FMHngS_h v>3tZs0XUuxWLajFg0X<Px#@<~KNR9J=Wl{*T;KomufpF#%(8MH{F0c#7v%0h4pmKJV6aWO$_OP648VWS`_ z*a>dJbP`*m0cR!=3C`&@{-$Z1ySeM%Sn4*-b4VPA{|D&-6oJe`c6Wt4Vg;|Odwt2d!nsZVHk<~CbFMLM`{J#yabcJO9%<@*pT zfg~^%c#Yo_tqPKkAJSSuQt^XE1>cAt(pW)~@q=Oo--;g;{{@TkiIQ`sk-JCEYyOgU z`9@#&>nJ85gb0cSfs`_GUai&uI2`x*zOR*nvViJBT>*>5@^c>W085R*u-6m-0000< KMNUMnLSTZ7?|s?; literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum.rsi/red-icon.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum.rsi/red-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..19bdddbde9b3e3fc233fb9bde5795d55070dc616 GIT binary patch literal 333 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T&z;f2n!=|HcvjcQvOsJUGU@=&b5#My^x4B6R0ZR6bBp`#ilZdCw}I z)#2;aPUUQpRZvhlDIhM|qGXqODn#U8^X}=Kv(7v9F(*8@u+doK&z?CsbNUXl&d?}y zXuImm!@khEOF+SrE8*b!1q$t<_s*SaNxU>=r3X zO0;E(1ZV?kj}E3N7JKHy0XRD!-v7s)z4*}Q$iB}u|{|( literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum.rsi/red.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum.rsi/red.png new file mode 100644 index 0000000000000000000000000000000000000000..dafea5b5c9a07ce48085854af577a7264cb10b2d GIT binary patch literal 304 zcmV-00nh%4P)Px#>PbXFR9J=WlrajzFc?Ok;-H;M(7{0|bP$Jbx(Ip*M+YyUcmppX?OEI%x>OK# zau7U4*ScD*n4}dc=55VSejeW!3I>DW->K+aa$GOTI=@}d%KK_M0syvXGoMXUXB$6A ziOC3Q3jplGed>F)Ts+E1?WpDvh{ElQ(6iJhlsj`=FR?`%$LVIyC!+xyKahS8xe_P> zZGq?bby2FI==hPx#@kvBMR9J=Wl`RXxP#8v!BB;Y4ml-t3z-%*#_#=!4qs5OOBlEY|4HgBz^3ZCR z1r4*hIq=@QiHP^K-Iu*PJkN!J!C?4zGCD6gjb;#ce)f*a`*J!00A*2S(C>xLX6`&B zCL^RR0I*zbLeJCj=vhW;M>dJTdbM~Fib}mhxihEH49cR4i4sTy zZGmX~x+qnUcKqQ$O__PRBS!!L002ov JPDHLkV1fx;hJgS8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum.rsi/uranium.png b/Resources/Textures/SS220/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum.rsi/uranium.png new file mode 100644 index 0000000000000000000000000000000000000000..df21bae2abe3e8cc74253a5354f5cb79e7225f2b GIT binary patch literal 310 zcmV-60m=S}P)Px#@JU2LR9J=Wm9Y-NKpclZV&Im_VIUz*EEb!Hh=eNsQdtc5(0H7$VOva1HSKTrJyXJx=>fZVzK<32ey_;rEk*M{{R3007*qo IM6N<$g5s@+J^%m! literal 0 HcmV?d00001 From a777bc34f164c8821ebe04beea9f2403000b7228 Mon Sep 17 00:00:00 2001 From: Maxon Date: Tue, 19 Nov 2024 20:14:00 +0000 Subject: [PATCH 24/32] Automatic changelog update --- Resources/Changelog/Changelog220.yml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/Resources/Changelog/Changelog220.yml b/Resources/Changelog/Changelog220.yml index 95195e2723593c..a09e0cfa79e712 100644 --- a/Resources/Changelog/Changelog220.yml +++ b/Resources/Changelog/Changelog220.yml @@ -1,14 +1,4 @@ Entries: -- author: Kemran - changes: - - message: "\u0423\u0431\u0440\u0430\u043D\u0430 \u043B\u043E\u0442\u0435\u0440\u0435\ - \u044F \u0440\u043E\u043B\u0435\u0439 \u0443 \u0442\u0430\u0440\u0430\u043D\u0442\ - \u0443\u043B\u043E\u0432, \u043A\u0430\u0440\u043F\u043E\u0432, \u0441\u043B\ - \u0430\u0439\u043C\u043E\u0432, \u0445\u043B\u0435\u0431\u0430\u043A\u0438." - type: Remove - id: 169 - time: '2024-06-09T13:40:23.0000000+00:00' - url: https://github.com/SerbiaStrong-220/space-station-14/pull/1100 - author: Nonne changes: - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u043E 13 \u043D\u043E\ @@ -5934,3 +5924,14 @@ id: 672 time: '2024-11-19T06:57:55.0000000+00:00' url: https://github.com/SerbiaStrong-220/space-station-14/pull/2259 +- author: blackvwolf + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0443\u043D\u0438\ + \u043A\u0430\u043B\u044C\u043D\u044B\u0435 \u0441\u043F\u0440\u0430\u0439\u0442\ + \u044B \u0434\u043B\u044F \u043F\u0438\u0441\u0442\u043E\u043B\u0435\u0442\u043D\ + \u044B\u0445 \u043C\u0430\u0433\u0430\u0437\u0438\u043D\u043E\u0432 .45 \u043C\ + \u0430\u0433\u043D\u0443\u043C!" + type: Add + id: 673 + time: '2024-11-19T20:12:56.0000000+00:00' + url: https://github.com/SerbiaStrong-220/space-station-14/pull/2262 From f9218600b111f14f22046613410e94525ebb1d7f Mon Sep 17 00:00:00 2001 From: Svarshik <96281939+lexaSvarshik@users.noreply.github.com> Date: Wed, 20 Nov 2024 01:14:17 +0500 Subject: [PATCH 25/32] trashcan label fix (#2264) --- .../Prototypes/SS220/Entities/Structures/Storage/trashcan.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Resources/Prototypes/SS220/Entities/Structures/Storage/trashcan.yml b/Resources/Prototypes/SS220/Entities/Structures/Storage/trashcan.yml index 6e57131e28aabe..22e2052498be1b 100644 --- a/Resources/Prototypes/SS220/Entities/Structures/Storage/trashcan.yml +++ b/Resources/Prototypes/SS220/Entities/Structures/Storage/trashcan.yml @@ -15,6 +15,10 @@ map: ["enum.StorageVisualLayers.Base"] - state: closed map: ["enum.StorageVisualLayers.Door"] + - state: paper + sprite: Structures/Storage/Crates/labels.rsi + map: ["enum.PaperLabelVisuals.Layer"] + offset: "-0.350, 0.230" - type: Construction graph: TrashCan node: TrashCan From 000f9b07f1d0b695d107dd537a8ea0150d14a773 Mon Sep 17 00:00:00 2001 From: Svarshik <96281939+lexaSvarshik@users.noreply.github.com> Date: Wed, 20 Nov 2024 03:34:41 +0500 Subject: [PATCH 26/32] acidifier and raffle hiddendesc fix (#2263) --- .../ru-RU/corvax/hidden-description/hiddenDescription.ftl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Locale/ru-RU/corvax/hidden-description/hiddenDescription.ftl b/Resources/Locale/ru-RU/corvax/hidden-description/hiddenDescription.ftl index 653196134dcb27..ca2e82cc9a74ef 100644 --- a/Resources/Locale/ru-RU/corvax/hidden-description/hiddenDescription.ftl +++ b/Resources/Locale/ru-RU/corvax/hidden-description/hiddenDescription.ftl @@ -79,8 +79,8 @@ corvax-hidden-desc-ScramImplanter-research = [color=#D381C9]Это имплан corvax-hidden-desc-DnaScramblerImplanter-research = [color=#D381C9]Это имплантер ДНК-миксера. Позволяет пользователю один раз произвольно изменить свою внешность и имя.[/color] corvax-hidden-desc-MicroBombImplanter-research = [color=#D381C9]Это имплант микробомбы. Он детонирует при смерти владельца.[/color] corvax-hidden-desc-MacroBombImplanter-research = [color=#D381C9]Это имплант макробомбы. Создаёт большой взрыв при смерти пользователя после запрограммированного обратного отсчета.[/color] -corvax-hidden-desc-DeathRattleImplanter-research = [color=#D381C9]Это имплант посмертного растворителя. Растворяет носителя и всё снаряжение при его смерти.[/color] -corvax-hidden-desc-DeathAcidifierImplanter-research = [color=#D381C9]Это имплант предсмертного хрипа. Сообщает в неизвестный радиоканал о жизненных показателях носителя.[/color] +corvax-hidden-desc-DeathAcidifierImplanter-research = [color=#D381C9]Это имплант посмертного растворителя. Растворяет носителя и всё снаряжение при его смерти.[/color] +corvax-hidden-desc-DeathRattleImplanter-research = [color=#D381C9]Это имплант предсмертного хрипа. Сообщает в неизвестный радиоканал о жизненных показателях носителя.[/color] corvax-hidden-desc-SadTromboneImplanter-syndicate = [color=#e31735]Это имплантер грустного тромбона. Проиграет грустную мелодию при смерти.[/color] corvax-hidden-desc-LightImplanter-syndicate = [color=#e31735]Это имплантер света. Позволит коже слабо светиться по желанию.[/color] @@ -95,8 +95,8 @@ corvax-hidden-desc-ScramImplanter-syndicate = [color=#e31735]Это имплан corvax-hidden-desc-DnaScramblerImplanter-syndicate = [color=#e31735]Это имплантер ДНК-миксера. Вызовет хаотичную неконтролируемую телепортацию, которая поможет сбежать.[/color] corvax-hidden-desc-MicroBombImplanter-syndicate = [color=#e31735]Это имплант микробомбы. Взорвётся в момент смерти, дав последний шанс отомстить убийце.[/color] corvax-hidden-desc-MacroBombImplanter-syndicate = [color=#e31735]Это имплант макробомбы. Создаст большой взрыв с задержкой после смерти. Позволит уйти на тот свет красиво.[/color] -corvax-hidden-desc-DeathRattleImplanter-syndicate = [color=#e31735]Это имплант посмертного растворителя. Уничтожит тело и все улики при смерти.[/color] -corvax-hidden-desc-DeathAcidifierImplanter-syndicate = [color=#e31735]Это имплант предсмертного хрипа. Сообщит в радиоканал Синдиката, если носитель окажется в критическом состоянии или погибнет.[/color] +corvax-hidden-desc-DeathAcidifierImplanter-syndicate = [color=#e31735]Это имплант посмертного растворителя. Уничтожит тело и все улики при смерти.[/color] +corvax-hidden-desc-DeathRattleImplanter-syndicate = [color=#e31735]Это имплант предсмертного хрипа. Сообщит в радиоканал Синдиката, если носитель окажется в критическом состоянии или погибнет.[/color] corvax-hidden-desc-Emag-syndicate = [color=#e31735]Универсальное хакерское устройство синдиката. Знаковый EMAG.[/color] corvax-hidden-desc-Emag-research = [color=#D381C9]Интересная модификация стандартной ID карты, работающая, как электронная отмычка.[/color] From 91969a15f1f4b6fd3885d3451f6231e1b05e8f96 Mon Sep 17 00:00:00 2001 From: chell4592 <179739134+chell4592@users.noreply.github.com> Date: Wed, 20 Nov 2024 23:07:09 +0300 Subject: [PATCH 27/32] Broadsword by WMT (#2261) --- .../Locale/ru-RU/ss220/weapons/sword.ftl | 2 ++ .../SS220/Entities/Clothing/Back/backpack.yml | 2 +- .../SS220/Entities/Clothing/Head/hats.yml | 4 +-- .../Entities/Clothing/OuterClothing/coats.yml | 4 +-- .../Clothing/Uniforms/Jumpsuit/jumpsuits.yml | 4 +-- .../Entities/Objects/Weapons/Melee/sword.yml | 33 ++++++++++++++++++ .../Melee/broadsword.rsi/equipped-BELT.png | Bin 0 -> 554 bytes .../Weapons/Melee/broadsword.rsi/icon.png | Bin 0 -> 628 bytes .../Melee/broadsword.rsi/inhand-left.png | Bin 0 -> 948 bytes .../Melee/broadsword.rsi/inhand-right.png | Bin 0 -> 1486 bytes .../Weapons/Melee/broadsword.rsi/meta.json | 26 ++++++++++++++ 11 files changed, 68 insertions(+), 7 deletions(-) create mode 100644 Resources/Textures/SS220/Objects/Weapons/Melee/broadsword.rsi/equipped-BELT.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Melee/broadsword.rsi/icon.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Melee/broadsword.rsi/inhand-left.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Melee/broadsword.rsi/inhand-right.png create mode 100644 Resources/Textures/SS220/Objects/Weapons/Melee/broadsword.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ss220/weapons/sword.ftl b/Resources/Locale/ru-RU/ss220/weapons/sword.ftl index 9a5eaf4a4db093..8fb314020da881 100644 --- a/Resources/Locale/ru-RU/ss220/weapons/sword.ftl +++ b/Resources/Locale/ru-RU/ss220/weapons/sword.ftl @@ -6,3 +6,5 @@ ent-Rapier = рапира ent-RapierAlt = рапира .desc = { ent-Rapier.desc } .suffix = 15 проникающего урона +ent-Broadsword = палаш + .desc = Эхо прошлого на службе новой войны. diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Back/backpack.yml b/Resources/Prototypes/SS220/Entities/Clothing/Back/backpack.yml index 454fb8a08629ba..bd1c51bde4a7a8 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Back/backpack.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Back/backpack.yml @@ -16,7 +16,7 @@ id: ClothingBackpackArmy name: army backpack description: Solid satchel with sleeping bag. Helps you survive long marches. - suffix: HOCebent + suffix: Ebent, HOCebent components: - type: Sprite sprite: SS220/Clothing/Back/Backpacks/armybackpack.rsi diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/SS220/Entities/Clothing/Head/hats.yml index 188ec940408915..1bf11c47dc490e 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Head/hats.yml @@ -583,7 +583,7 @@ id: ClothingHeadKiver name: kiver description: The headdress of a soldier of the Kingdom's great army. - suffix: HOCebent + suffix: Ebent, HOCebent components: - type: Sprite sprite: SS220/Clothing/Head/Hats/kiver.rsi @@ -598,7 +598,7 @@ id: ClothingHeadPithHelmet name: pith helmet description: Army helmet of the army of the River Republic. - suffix: HOCebent + suffix: Ebent, HOCebent components: - type: Sprite sprite: SS220/Clothing/Head/Hats/pith_helmet.rsi diff --git a/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/coats.yml index 3bb083646c4ee8..670891a8f1f9be 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/coats.yml @@ -221,7 +221,7 @@ id: ClothingOuterCoatBluetunic name: blue army jacket description: The jacket of the line infantry of the great army of the Kingdom. - suffix: HOCebent + suffix: Ebent, HOCebent components: - type: Sprite sprite: SS220/Clothing/OuterClothing/Coats/bluetunic.rsi @@ -233,7 +233,7 @@ id: ClothingOuterCoatRedtunic name: red army jaket description: The scarlet infantry jacket of the River Republic. - suffix: HOCebent + suffix: Ebent, HOCebent components: - type: Sprite sprite: SS220/Clothing/OuterClothing/Coats/redtunic.rsi diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpsuit/jumpsuits.yml b/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpsuit/jumpsuits.yml index 221b6702205c3b..49d9d34bd30856 100644 --- a/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpsuit/jumpsuits.yml +++ b/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Jumpsuit/jumpsuits.yml @@ -553,7 +553,7 @@ id: ClothingUniformBluesoldier name: kingdom army shirt description: The clothing of a soldier of the great army of the kingdom. - suffix: HOCebent + suffix: Ebent, HOCebent components: - type: Sprite sprite: SS220/Clothing/Uniforms/Jumpsuit/bluesoldier.rsi @@ -565,7 +565,7 @@ id: ClothingUniformRedsoldier name: republican army shirt description: The clothing of a soldier of the army of the River Republic. - suffix: HOCebent + suffix: Ebent, HOCebent components: - type: Sprite sprite: SS220/Clothing/Uniforms/Jumpsuit/redsoldier.rsi diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/sword.yml index 5e78b0d98ea591..30dd314ce762b8 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/sword.yml @@ -151,3 +151,36 @@ # slots: # - Back # - suitStorage + +# WMT ebent start +- type: entity + parent: BaseItem + id: Broadsword + name: broadsword + description: Echoes of the past in the service of a new war. + suffix: Ebent, HOCebent + components: + - type: EmitSoundOnLand + sound: + path: /Audio/SS220/Effects/Drop/sword.ogg + params: + volume: 2 + - type: Sprite + sprite: SS220/Objects/Weapons/Melee/broadsword.rsi + state: icon + - type: MeleeWeapon + wideAnimationRotation: -135 + damage: + types: + Slash: 40 + soundHit: + path: /Audio/Weapons/bladeslice.ogg + - type: Item + size: Normal + sprite: SS220/Objects/Weapons/Melee/broadsword.rsi + - type: Clothing + sprite: SS220/Objects/Weapons/Melee/broadsword.rsi + quickEquip: true + slots: + - Belt +# WMT ebent end diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/broadsword.rsi/equipped-BELT.png b/Resources/Textures/SS220/Objects/Weapons/Melee/broadsword.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..28a5e4f54bfcd8f622ba308eb24caaf3209bcd97 GIT binary patch literal 554 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zPkFjHhE&XX zd&|+ADNum@!^U8pxlxWAQZDi(1t?a06#k*;va9m#gQfismL86?-s*CHVe{P6B26s9 zoGMW*4tKma++B8gvaVB1`Mqt2{ypUkE{P)Y~6^4uN*-Nks zUi^LB=l0*}tI~AWJ?(x|wQrhNf$jX;+YWzq)1EmsEPu<6TapEgqdOAd8TcM&bw<-B$^KgFVdQ&MBb@01|-m5dZ)H literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/broadsword.rsi/icon.png b/Resources/Textures/SS220/Objects/Weapons/Melee/broadsword.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..7d3c36fe511c071ccb115134e6925230e2a9f307 GIT binary patch literal 628 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/broadsword.rsi/meta.json b/Resources/Textures/SS220/Objects/Weapons/Melee/broadsword.rsi/meta.json new file mode 100644 index 00000000000000..8a330c9dafc543 --- /dev/null +++ b/Resources/Textures/SS220/Objects/Weapons/Melee/broadsword.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:𝘽𝙚𝙡𝙖𝙮#7441, resprited by okroshka59 (Discord) to SS220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} From a8a4b67a0e35d016eac08829f4487561424e9746 Mon Sep 17 00:00:00 2001 From: Maxon Date: Wed, 20 Nov 2024 20:08:13 +0000 Subject: [PATCH 28/32] Automatic changelog update --- Resources/Changelog/Changelog220.yml | 38 +++++++++++++--------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/Resources/Changelog/Changelog220.yml b/Resources/Changelog/Changelog220.yml index a09e0cfa79e712..2555c44c8ba9cd 100644 --- a/Resources/Changelog/Changelog220.yml +++ b/Resources/Changelog/Changelog220.yml @@ -1,25 +1,4 @@ Entries: -- author: Nonne - changes: - - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u043E 13 \u043D\u043E\ - \u0432\u044B\u0445 \u0433\u043E\u043B\u043E\u0441\u043E\u0432! \u041C\u043E\u0439\ - \u0440\u0430 \u0411\u0440\u0430\u0443\u043D, \u0420\u043E\u0431\u0435\u0440\ - \ \u041C\u0430\u043A\u041A\u0440\u0438\u0434\u0438, \u0422\u0440\u0438\u0434\ - \u043E\u0433\u043D\u0430\u0439\u0442, \u0422\u0440\u0438\u0434\u043E\u0433\u043D\ - \u0430\u0439\u0442 \u0420\u0430\u0434\u0438\u043E, \u0411\u043E\u0440\u0438\u0441\ - \ \u041F\u0435\u0442\u0440\u043E\u0432, \u041A\u0430\u0440\u0438\u043D\u0430\ - \ \u041F\u0435\u0442\u0440\u043E\u0432\u0430, \u041A\u0430\u0442\u044F \u0421\ - \u043C\u0438\u0440\u043D\u043E\u0432\u0430, \u0421\u0435\u043C\u0451\u043D \u0411\ - \u0430\u0431\u0443\u0440\u0438\u043D, \u041B\u0435\u0439\u0442\u0435\u043D\u0430\ - \u043D\u0442 \u0422\u0438\u0445\u043E\u043D\u043E\u0432, \u0416\u0435\u043D\u0449\ - \u0438\u043D\u0430 \u043A\u043E\u043C\u0430\u043D\u0434\u0438\u0440, \u041B\u043E\ - \u0440\u0434 \u0425\u0430\u0440\u043A\u043E\u043D, \u0421\u0435\u0440\u0430\u043D\ - \u0430 \u0438 \u0423\u0442\u0435\u0440 \u0421\u0432\u0435\u0442\u043E\u043D\u043E\ - \u0441\u043D\u044B\u0439." - type: Add - id: 170 - time: '2024-06-09T15:01:03.0000000+00:00' - url: https://github.com/SerbiaStrong-220/space-station-14/pull/1103 - author: NightmareStalker changes: - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0442\u0435\u043C\u043D\ @@ -5935,3 +5914,20 @@ id: 673 time: '2024-11-19T20:12:56.0000000+00:00' url: https://github.com/SerbiaStrong-220/space-station-14/pull/2262 +- author: chell4592 + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u043E \u0432\u0435\u0441\ + \u0435\u043B\u044C\u0435!" + type: Add + - message: "\u0423\u0431\u0440\u0430\u043D\u043E \u0432\u0435\u0441\u0435\u043B\u044C\ + \u0435!" + type: Remove + - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u043E \u0432\u0435\u0441\u0435\ + \u043B\u044C\u0435!" + type: Tweak + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043E \u0432\u0435\ + \u0441\u0435\u043B\u044C\u0435!" + type: Fix + id: 674 + time: '2024-11-20T20:07:09.0000000+00:00' + url: https://github.com/SerbiaStrong-220/space-station-14/pull/2261 From 582b5b3166bd543b8fa6014a289dfaaa324cdb66 Mon Sep 17 00:00:00 2001 From: 21Melkuu <79728504+21Melkuu@users.noreply.github.com> Date: Sat, 23 Nov 2024 16:53:40 +0300 Subject: [PATCH 29/32] AddMechToClothing (#2265) --- .../EntitySystems/MechGrabberSystem.cs | 3 +- .../Mech/Systems/MechEquipmentSystem.cs | 7 +- Content.Server/Mech/Systems/MechSystem.cs | 41 +++++- .../SS220/MechClothing/MechClothingSystem.cs | 127 ++++++++++++++++++ .../Mech/Components/MechComponent.cs | 7 + .../Mech/EntitySystems/SharedMechSystem.cs | 74 ++++++++-- Content.Shared/Mech/SharedMech.cs | 9 ++ .../MechClothing/MechClothingComponent.cs | 52 +++++++ .../SS220/MechRobot/MechRobotComponent.cs | 10 ++ .../ss220/clothing/OuterClothing/armor.ftl | 8 +- Resources/Locale/ru-RU/ss220/mech/mech.ftl | 8 ++ .../Catalog/Fills/Lockers/heads.yml | 1 + .../Objects/Specific/Mech/mecha_equipment.yml | 2 +- .../Entities/Objects/Specific/Mech/mechs.yml | 1 + Resources/Prototypes/SS220/Actions/mech.yml | 27 ++++ .../Clothing/OuterClothing/mechClothing.yml | 55 ++++++++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 6279 bytes .../Armor/mech_loader.rsi/icon.png | Bin 0 -> 3052 bytes .../Armor/mech_loader.rsi/inhand-left.png | Bin 0 -> 4042 bytes .../Armor/mech_loader.rsi/inhand-right.png | Bin 0 -> 4105 bytes .../Armor/mech_loader.rsi/meta.json | 26 ++++ .../Actions/actions_mecha.rsi/mech_grab.png | Bin 0 -> 3413 bytes .../Actions/actions_mecha.rsi/meta.json | 14 ++ 23 files changed, 457 insertions(+), 15 deletions(-) create mode 100644 Content.Server/SS220/MechClothing/MechClothingSystem.cs create mode 100644 Content.Shared/SS220/MechClothing/MechClothingComponent.cs create mode 100644 Content.Shared/SS220/MechRobot/MechRobotComponent.cs create mode 100644 Resources/Locale/ru-RU/ss220/mech/mech.ftl create mode 100644 Resources/Prototypes/SS220/Actions/mech.yml create mode 100644 Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/mechClothing.yml create mode 100644 Resources/Textures/SS220/Clothing/OuterClothing/Armor/mech_loader.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/SS220/Clothing/OuterClothing/Armor/mech_loader.rsi/icon.png create mode 100644 Resources/Textures/SS220/Clothing/OuterClothing/Armor/mech_loader.rsi/inhand-left.png create mode 100644 Resources/Textures/SS220/Clothing/OuterClothing/Armor/mech_loader.rsi/inhand-right.png create mode 100644 Resources/Textures/SS220/Clothing/OuterClothing/Armor/mech_loader.rsi/meta.json create mode 100644 Resources/Textures/SS220/Interface/Actions/actions_mecha.rsi/mech_grab.png create mode 100644 Resources/Textures/SS220/Interface/Actions/actions_mecha.rsi/meta.json diff --git a/Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs b/Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs index c41341ec33eac5..533dad4eb675f7 100644 --- a/Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs +++ b/Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs @@ -139,7 +139,8 @@ private void OnInteract(EntityUid uid, MechGrabberComponent component, UserActiv if (TryComp(target, out var physics) && physics.BodyType == BodyType.Static || HasComp(target) || - HasComp(target)) + HasComp(target) || + HasComp(target)) //SS220 Ripley in ripley fix (AddMechToClothing) { return; } diff --git a/Content.Server/Mech/Systems/MechEquipmentSystem.cs b/Content.Server/Mech/Systems/MechEquipmentSystem.cs index f9fe5e464135bc..e4cfac2d24f4f8 100644 --- a/Content.Server/Mech/Systems/MechEquipmentSystem.cs +++ b/Content.Server/Mech/Systems/MechEquipmentSystem.cs @@ -36,8 +36,11 @@ private void OnUsed(EntityUid uid, MechEquipmentComponent component, AfterIntera if (mechComp.Broken) return; - if (args.User == mechComp.PilotSlot.ContainedEntity) - return; + //SS220-AddMechToClothing-start + //Why does this check exist if it cannot be called? + // if (args.User == mechComp.PilotSlot.ContainedEntity) + // return; + //SS220-AddMechToClothing-end if (mechComp.EquipmentContainer.ContainedEntities.Count >= mechComp.MaxEquipmentAmount) return; diff --git a/Content.Server/Mech/Systems/MechSystem.cs b/Content.Server/Mech/Systems/MechSystem.cs index 9da96a76f8e910..36e4e5863b1877 100644 --- a/Content.Server/Mech/Systems/MechSystem.cs +++ b/Content.Server/Mech/Systems/MechSystem.cs @@ -23,6 +23,7 @@ using Robust.Shared.Containers; using Robust.Shared.Player; using Content.Shared.Whitelist; +using Content.Shared.SS220.MechRobot; //SS220-AddMechToClothing namespace Content.Server.Mech.Systems; @@ -50,6 +51,7 @@ public override void Initialize() SubscribeLocalEvent(OnMapInit); SubscribeLocalEvent>(OnAlternativeVerb); SubscribeLocalEvent(OnOpenUi); + SubscribeLocalEvent(OnOpenClothingUi); //SS220-AddMechToClothing SubscribeLocalEvent(OnRemoveBattery); SubscribeLocalEvent(OnMechEntry); SubscribeLocalEvent(OnMechExit); @@ -163,6 +165,14 @@ private void OnOpenUi(EntityUid uid, MechComponent component, MechOpenUiEvent ar ToggleMechUi(uid, component); } + //SS220-AddMechToClothing-start + private void OnOpenClothingUi(Entity ent, ref MechClothingOpenUiEvent args) + { + args.Handled = true; + ToggleMechClothingUi(ent.Owner, args.Performer, ent.Comp); + } + //SS220-AddMechToClothing-end + private void OnToolUseAttempt(EntityUid uid, MechPilotComponent component, ref ToolUserAttemptUseEvent args) { if (args.Target == component.Mech) @@ -174,6 +184,11 @@ private void OnAlternativeVerb(EntityUid uid, MechComponent component, GetVerbsE if (!args.CanAccess || !args.CanInteract || component.Broken) return; + //SS220-AddMechToClothing-start + if (!TryComp(uid, out var _)) + return; + //SS220-AddMechToClothing-end + if (CanInsert(uid, args.User, component)) { var enterVerb = new AlternativeVerb @@ -197,8 +212,13 @@ private void OnAlternativeVerb(EntityUid uid, MechComponent component, GetVerbsE args.Verbs.Add(enterVerb); args.Verbs.Add(openUiVerb); } - else if (!IsEmpty(component)) + else if (!IsEmpty(component, uid)) //SS220-AddMechToClothing { + //SS220-AddMechToClothing-start + if (!TryComp(uid, out var _)) + return; + //SS220-AddMechToClothing-end + var ejectVerb = new AlternativeVerb { Text = Loc.GetString("mech-verb-exit"), @@ -229,6 +249,11 @@ private void OnMechEntry(EntityUid uid, MechComponent component, MechEntryEvent if (args.Cancelled || args.Handled) return; + //SS220-AddMechToClothing-start + if (!TryComp(uid, out var _)) + return; + //SS220-AddMechToClothing-end + if (_whitelistSystem.IsWhitelistFail(component.PilotWhitelist, args.User)) { _popup.PopupEntity(Loc.GetString("mech-no-enter", ("item", uid)), args.User); @@ -280,6 +305,20 @@ private void ToggleMechUi(EntityUid uid, MechComponent? component = null, Entity UpdateUserInterface(uid, component); } + //SS220-AddMechToClothing-start + private void ToggleMechClothingUi(EntityUid entOwner, EntityUid argsPerformer, MechComponent? entComp = null) + { + if (!Resolve(entOwner, ref entComp)) + return; + + if (!TryComp(argsPerformer, out var actor)) + return; + + _ui.TryToggleUi(entOwner, MechUiKey.Key, actor.PlayerSession); + UpdateUserInterface(entOwner, entComp); + } + //SS220-AddMechToClothing-end + private void ReceiveEquipmentUiMesssages(EntityUid uid, MechComponent component, T args) where T : MechEquipmentUiMessage { var ev = new MechEquipmentUiMessageRelayEvent(args); diff --git a/Content.Server/SS220/MechClothing/MechClothingSystem.cs b/Content.Server/SS220/MechClothing/MechClothingSystem.cs new file mode 100644 index 00000000000000..231c9f026425b7 --- /dev/null +++ b/Content.Server/SS220/MechClothing/MechClothingSystem.cs @@ -0,0 +1,127 @@ +// © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt +using Content.Server.Interaction; +using Content.Server.Mech.Equipment.Components; +using Content.Server.Mech.Systems; +using Content.Server.Popups; +using Content.Shared.DoAfter; +using Content.Shared.Mech; +using Content.Shared.Mech.Components; +using Content.Shared.Mech.Equipment.Components; +using Content.Shared.Mobs.Components; +using Content.Shared.Wall; +using Robust.Shared.Audio.Systems; +using Robust.Shared.Containers; +using Robust.Shared.Physics; +using Robust.Shared.Physics.Components; +using Content.Shared.SS220.MechClothing; + +namespace Content.Server.SS220.MechClothing; + +/// +/// This handles placing containers in claw when the player uses an action, copies part of the logic MechGrabberSystem +/// +public sealed class MechClothingSystem : EntitySystem +{ + [Dependency] private readonly InteractionSystem _interaction = default!; + [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; + [Dependency] private readonly SharedContainerSystem _container = default!; + [Dependency] private readonly MechSystem _mech = default!; + [Dependency] private readonly PopupSystem _popup = default!; + /// + public override void Initialize() + { + SubscribeLocalEvent(OnInteract); + SubscribeLocalEvent(OnStartUp); + SubscribeLocalEvent(OnMechGrab); + } + + private void OnStartUp(Entity ent, ref ComponentStartup args) + { + ent.Comp.ItemContainer = _container.EnsureContainer(ent.Owner, "item-container"); + } + + private void OnInteract(Entity ent, ref MechClothingGrabEvent args) + { + if (!ent.Comp.CurrentEquipmentUid.HasValue) + { + _popup.PopupEntity(Loc.GetString("mech-no-equipment-selected"),ent.Owner,ent.Owner); + return; + } + + if (args.Handled) + return; + + if (args.Target == args.Performer || ent.Comp.DoAfter != null) + return; + + if (TryComp(args.Target, out var physics) && physics.BodyType == BodyType.Static || + HasComp(args.Target) || + HasComp(args.Target) || + HasComp(args.Target)) + return; + + if (Transform(args.Target).Anchored) + return; + + if (ent.Comp.ItemContainer.ContainedEntities.Count >= ent.Comp.MaxContents) + return; + + if (!TryComp(ent.Comp.MechUid, out var mech)) + return; + + if (mech.Energy + ent.Comp.GrabEnergyDelta < 0) + { + _popup.PopupEntity(Loc.GetString("mech-not-enough-energy"), ent.Owner, ent.Owner); + return; + } + + if (!_interaction.InRangeUnobstructed(args.Performer, args.Target)) + return; + + args.Handled = true; + ent.Comp.AudioStream = _audio.PlayPvs(ent.Comp.GrabSound, ent.Owner)?.Entity; + var doAfterArgs = new DoAfterArgs( + EntityManager, + args.Performer, + ent.Comp.GrabDelay, + new GrabberDoAfterEvent(), + ent.Owner, + target: args.Target, + used: ent.Owner) + { + BreakOnMove = true + }; + + _doAfter.TryStartDoAfter(doAfterArgs, out ent.Comp.DoAfter); + } + + private void OnMechGrab(Entity ent, ref GrabberDoAfterEvent args) + { + if (!TryComp(ent.Comp.CurrentEquipmentUid, out var equipmentComponent) || + equipmentComponent.EquipmentOwner == null) + return; + + ent.Comp.DoAfter = null; + + if (args.Cancelled) + { + ent.Comp.AudioStream = _audio.Stop(ent.Comp.AudioStream); + return; + } + + if (args.Handled || args.Args.Target == null) + return; + + if (!_mech.TryChangeEnergy(equipmentComponent.EquipmentOwner.Value, ent.Comp.GrabEnergyDelta)) + return; + + if(!TryComp(ent.Comp.CurrentEquipmentUid, out var mechGrabberComp)) + return; + + _container.Insert(args.Args.Target.Value, mechGrabberComp.ItemContainer); + _mech.UpdateUserInterface(equipmentComponent.EquipmentOwner.Value); + + args.Handled = true; + } +} diff --git a/Content.Shared/Mech/Components/MechComponent.cs b/Content.Shared/Mech/Components/MechComponent.cs index ba380492bc93db..b2df929b0b363c 100644 --- a/Content.Shared/Mech/Components/MechComponent.cs +++ b/Content.Shared/Mech/Components/MechComponent.cs @@ -144,6 +144,10 @@ public sealed partial class MechComponent : Component public EntProtoId MechUiAction = "ActionMechOpenUI"; [DataField] public EntProtoId MechEjectAction = "ActionMechEject"; + [DataField] + public EntProtoId MechClothingUiAction= "ActionMechClothingOpenUI"; //SS220-AddMechToClothing + [DataField] + public EntProtoId MechClothingGrabAction= "ActionMechClothingGrab"; //SS220-AddMechToClothing #endregion #region Visualizer States @@ -158,4 +162,7 @@ public sealed partial class MechComponent : Component [DataField] public EntityUid? MechCycleActionEntity; [DataField] public EntityUid? MechUiActionEntity; [DataField] public EntityUid? MechEjectActionEntity; + [DataField] public EntityUid? MechClothingUiActionEntity; //SS220-AddMechToClothing + [DataField] public EntityUid? MechClothingGrabActionEntity; //SS220-AddMechToClothing + } diff --git a/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs b/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs index 2ec48085c47dd7..0a711f8904a5ed 100644 --- a/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs +++ b/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs @@ -20,6 +20,9 @@ using Robust.Shared.Network; using Robust.Shared.Serialization; using Robust.Shared.Timing; +using Content.Shared.Clothing; //SS220-AddMechToClothing +using Content.Shared.SS220.MechClothing; //SS220-AddMechToClothing +using Content.Shared.SS220.MechRobot; //SS220-AddMechToClothing namespace Content.Shared.Mech.EntitySystems; @@ -43,6 +46,8 @@ public abstract class SharedMechSystem : EntitySystem /// public override void Initialize() { + SubscribeLocalEvent(OnEquip); //SS220 AddMechToClothing + SubscribeLocalEvent(OnUnequip); //SS220 AddMechToClothing SubscribeLocalEvent(OnToggleEquipmentAction); SubscribeLocalEvent(OnEjectPilotEvent); SubscribeLocalEvent(RelayInteractionEvent); @@ -56,13 +61,40 @@ public override void Initialize() SubscribeLocalEvent(OnCanAttackFromContainer); SubscribeLocalEvent(OnAttackAttempt); } + //SS220-AddMechToClothing-start + /// + /// Responsible for logic if mech is clothing + /// + private void OnEquip(Entity ent, ref ClothingGotEquippedEvent args) + { + EnsureComp(args.Wearer, out var compMechClothing); + + compMechClothing.MechUid = ent.Owner; + _actions.AddAction(args.Wearer, ref ent.Comp.MechCycleActionEntity, ent.Comp.MechCycleAction, ent.Owner); + _actions.AddAction(args.Wearer, ref ent.Comp.MechClothingUiActionEntity, ent.Comp.MechClothingUiAction, ent.Owner); + _actions.AddAction(args.Wearer, ref ent.Comp.MechClothingGrabActionEntity, ent.Comp.MechClothingGrabAction); + } + /// + /// Responsible for logic if mech is clothing + /// + private void OnUnequip(Entity ent, ref ClothingGotUnequippedEvent args) + { + if (_net.IsClient) + return; + + RemComp(args.Wearer); + + _actions.RemoveProvidedActions(args.Wearer, ent.Owner); + _actions.RemoveAction(args.Wearer, ent.Comp.MechClothingGrabActionEntity); + } + //SS220-AddMechToClothing-end private void OnToggleEquipmentAction(EntityUid uid, MechComponent component, MechToggleEquipmentEvent args) { if (args.Handled) return; args.Handled = true; - CycleEquipment(uid); + CycleEquipment(uid, pilotCloth: args.Performer); //SS220-AddMechToClothing } private void OnEjectPilotEvent(EntityUid uid, MechComponent component, MechEjectPilotEvent args) @@ -88,15 +120,21 @@ private void RelayInteractionEvent(EntityUid uid, MechComponent component, UserA RaiseLocalEvent(component.CurrentSelectedEquipment.Value, args); } } - + //SS220-AddMechToClothing-start + /// + /// Separates mech-robot and mech-clothing + /// private void OnStartup(EntityUid uid, MechComponent component, ComponentStartup args) { - component.PilotSlot = _container.EnsureContainer(uid, component.PilotSlotId); component.EquipmentContainer = _container.EnsureContainer(uid, component.EquipmentContainerId); component.BatterySlot = _container.EnsureContainer(uid, component.BatterySlotId); + + if (TryComp(uid, out var _)) + component.PilotSlot = _container.EnsureContainer(uid, component.PilotSlotId); + UpdateAppearance(uid, component); } - + //SS220-AddMechToClothing-end private void OnDestruction(EntityUid uid, MechComponent component, DestructionEventArgs args) { BreakMech(uid, component); @@ -170,7 +208,8 @@ public virtual void BreakMech(EntityUid uid, MechComponent? component = null) /// /// /// - public void CycleEquipment(EntityUid uid, MechComponent? component = null) + /// If you are using mech clothing, then the required parameter is the uid of the person wearing this mech. + public void CycleEquipment(EntityUid uid, MechComponent? component = null, EntityUid? pilotCloth = null) //SS220-AddMechToClothing { if (!Resolve(uid, ref component)) return; @@ -196,6 +235,11 @@ public void CycleEquipment(EntityUid uid, MechComponent? component = null) if (_net.IsServer) _popup.PopupEntity(popupString, uid); + //SS220-AddMechToClothing-start + if (pilotCloth.HasValue && TryComp(pilotCloth.Value, out var mechPilotComp)) + mechPilotComp.CurrentEquipmentUid = component.CurrentSelectedEquipment; + //SS220-AddMechToClothing-end + Dirty(uid, component); } @@ -316,11 +360,18 @@ public void SetIntegrity(EntityUid uid, FixedPoint2 value, MechComponent? compon /// Checks if the pilot is present /// /// + /// /// Whether or not the pilot is present - public bool IsEmpty(MechComponent component) + + //SS220-AddMechToClothing-start + public bool IsEmpty(MechComponent component, EntityUid uid) { - return component.PilotSlot.ContainedEntity == null; + if (TryComp(uid, out var _)) + return component.PilotSlot.ContainedEntity == null; + + return true; } + //SS220-AddMechToClothing-end /// /// Checks if an entity can be inserted into the mech. @@ -334,7 +385,7 @@ public bool CanInsert(EntityUid uid, EntityUid toInsert, MechComponent? componen if (!Resolve(uid, ref component)) return false; - return IsEmpty(component) && _actionBlocker.CanMove(toInsert); + return IsEmpty(component, uid) && _actionBlocker.CanMove(toInsert); //SS220-AddMechToClothing } /// @@ -423,7 +474,7 @@ private void UpdateAppearance(EntityUid uid, MechComponent? component = null, if (!Resolve(uid, ref component, ref appearance, false)) return; - _appearance.SetData(uid, MechVisuals.Open, IsEmpty(component), appearance); + _appearance.SetData(uid, MechVisuals.Open, IsEmpty(component, uid), appearance); //SS220-AddMechToClothing _appearance.SetData(uid, MechVisuals.Broken, component.Broken, appearance); } @@ -446,6 +497,11 @@ private void OnCanDragDrop(EntityUid uid, MechComponent component, ref CanDropTa { args.Handled = true; + //SS220-AddMechToClothing-start + if (!TryComp(uid, out var _)) + return; + //SS220-AddMechToClothing-end + args.CanDrop |= !component.Broken && CanInsert(uid, args.Dragged, component); } diff --git a/Content.Shared/Mech/SharedMech.cs b/Content.Shared/Mech/SharedMech.cs index 94af4453d48466..8beebe34a08200 100644 --- a/Content.Shared/Mech/SharedMech.cs +++ b/Content.Shared/Mech/SharedMech.cs @@ -60,3 +60,12 @@ public sealed partial class MechOpenUiEvent : InstantActionEvent public sealed partial class MechEjectPilotEvent : InstantActionEvent { } +//SS220-AddMechToClothing-start +public sealed partial class MechClothingOpenUiEvent : InstantActionEvent +{ +} + +public sealed partial class MechClothingGrabEvent : EntityTargetActionEvent +{ +} +//SS220-AddMechToClothing-end diff --git a/Content.Shared/SS220/MechClothing/MechClothingComponent.cs b/Content.Shared/SS220/MechClothing/MechClothingComponent.cs new file mode 100644 index 00000000000000..e2d9d819722ecd --- /dev/null +++ b/Content.Shared/SS220/MechClothing/MechClothingComponent.cs @@ -0,0 +1,52 @@ +// © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt +using Content.Shared.DoAfter; +using Robust.Shared.Audio; +using Robust.Shared.Containers; + +namespace Content.Shared.SS220.MechClothing; + +/// +/// This handles placing containers in claw when the player uses an action, copies part of the logic MechGrabberComponent +/// +[RegisterComponent, AutoGenerateComponentState] +public sealed partial class MechClothingComponent : Component +{ + /// + /// The change in energy after each grab. + /// + [DataField("grabEnergyDelta")] + public float GrabEnergyDelta = -30; + + /// + /// How long does it take to grab something? + /// + [DataField("grabDelay")] + public float GrabDelay = 2.5f; + + /// + /// The maximum amount of items that can be fit in this grabber + /// + [DataField("maxContents")] + public int MaxContents = 10; + + /// + /// The sound played when a mech is grabbing something + /// + [DataField("grabSound")] + public SoundSpecifier GrabSound = new SoundPathSpecifier("/Audio/Mecha/sound_mecha_hydraulic.ogg"); + + public EntityUid? AudioStream; + + [ViewVariables(VVAccess.ReadWrite)] + public Container ItemContainer = default!; + + [DataField, ViewVariables(VVAccess.ReadOnly)] + public DoAfterId? DoAfter; + + [ViewVariables] + public EntityUid MechUid; + + [ViewVariables, AutoNetworkedField] + public EntityUid? CurrentEquipmentUid; + +} diff --git a/Content.Shared/SS220/MechRobot/MechRobotComponent.cs b/Content.Shared/SS220/MechRobot/MechRobotComponent.cs new file mode 100644 index 00000000000000..2b6e3a762e79a8 --- /dev/null +++ b/Content.Shared/SS220/MechRobot/MechRobotComponent.cs @@ -0,0 +1,10 @@ +// © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt +namespace Content.Shared.SS220.MechRobot; + +/// +/// This is used for to determine the mech like a big mechanism +/// +[RegisterComponent] +public sealed partial class MechRobotComponent : Component +{ +} diff --git a/Resources/Locale/ru-RU/ss220/clothing/OuterClothing/armor.ftl b/Resources/Locale/ru-RU/ss220/clothing/OuterClothing/armor.ftl index 1f8048a9d57e50..16b12e9f90b37f 100644 --- a/Resources/Locale/ru-RU/ss220/clothing/OuterClothing/armor.ftl +++ b/Resources/Locale/ru-RU/ss220/clothing/OuterClothing/armor.ftl @@ -2,4 +2,10 @@ ent-ClothingOuterArmorCentcomNavalCarapace = флотский панцирь .desc = Панцирь, который носят офицеры Командования флота. ent-ClothingOuterReactiveArmor = экспериментальная реактивная броня - .desc = Новейший прототип брони, основанный на ядре аномалии. Ходят слухи, что учёные NT разрабатывают более стабильную и многозадачную версию. \ No newline at end of file + .desc = Новейший прототип брони, основанный на ядре аномалии. Ходят слухи, что учёные NT разрабатывают более стабильную и многозадачную версию. + +ent-ClothingOuterMechLoader = экзоскелет класса погрузчик + .desc = Усиливает физические возможности пользователя, позволяя легко поднимать тяжести и снижая риск травм. + +ent-ClothingOuterMechLoaderFull = экзоскелет класса погрузчик + .desc = Усиливает физические возможности пользователя, позволяя легко поднимать тяжести и снижая риск травм. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss220/mech/mech.ftl b/Resources/Locale/ru-RU/ss220/mech/mech.ftl new file mode 100644 index 00000000000000..4fdd50e848839e --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/mech/mech.ftl @@ -0,0 +1,8 @@ +ent-ActionMechClothingGrab = Поднять груз + .desc = Поднимает указанный груз. + +ent-ActionMechClothingOpenUI = Панель управления + .desc = Открывает панель управления экзоскелета. + +mech-no-equipment-selected = нет выбранного снаряжения +mech-not-enough-energy = недостаточно энергии \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 7234b1e059f1e4..f3a1065fce2531 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -24,6 +24,7 @@ - id: ClothingWristWatchGold # SS220 Wrist Watch - id: GlassCaseEngravedKnuckledusterFilled # SS220 New Qm highrisk - id: AstroNavCartridge + - id: ClothingOuterMechLoaderFull # SS220 AddMechToClothing - id: DeviceCalculator # SS220 Calculator - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mecha_equipment.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mecha_equipment.yml index a97ca0f017b4d9..6dbfca375f2a23 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mecha_equipment.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mecha_equipment.yml @@ -37,7 +37,7 @@ - type: Sprite state: mecha_clamp_small - type: MechGrabber - maxContents: 4 + maxContents: 2 #SS220-AddMechToClothing grabDelay: 3 grabEnergyDelta: -20 - type: Tag diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml index 4c4e44c28cd29e..c395e57c892500 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml @@ -5,6 +5,7 @@ components: - type: MobMover - type: Mech + - type: MechRobot #SS220-AddMechToClothing - type: MechAir - type: AirFilter # everything except oxygen and nitrogen diff --git a/Resources/Prototypes/SS220/Actions/mech.yml b/Resources/Prototypes/SS220/Actions/mech.yml new file mode 100644 index 00000000000000..56f923f3d6c693 --- /dev/null +++ b/Resources/Prototypes/SS220/Actions/mech.yml @@ -0,0 +1,27 @@ +- type: entity + id: ActionMechClothingOpenUI + name: Control Panel + description: Opens the control panel for the mech + components: + - type: InstantAction + itemIconStyle: NoItem + icon: + sprite: Interface/Actions/actions_mecha.rsi + state: mech_view_stats + event: !type:MechClothingOpenUiEvent + useDelay: 1 + +- type: entity + id: ActionMechClothingGrab + name: Lift cargo + description: Load the cargo into the mech + components: + - type: EntityTargetAction + itemIconStyle: NoItem + icon: + sprite: SS220/Interface/Actions/actions_mecha.rsi + state: mech_grab + event: !type:MechClothingGrabEvent + useDelay: 1 + checkCanInteract: false + priority: -10 \ No newline at end of file diff --git a/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/mechClothing.yml b/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/mechClothing.yml new file mode 100644 index 00000000000000..d8c530a2ed7784 --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/mechClothing.yml @@ -0,0 +1,55 @@ +- type: entity + parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing] + id: ClothingOuterMechLoader + name: loader class exoskeleton + description: Enhances the user's physical capabilities, making it easy to lift heavy objects and reducing the risk of injury. + components: + - type: Sprite + sprite: SS220/Clothing/OuterClothing/Armor/mech_loader.rsi + - type: Clothing + sprite: SS220/Clothing/OuterClothing/Armor/mech_loader.rsi + equipDelay: 2 + unequipDelay: 2 + - type: Armor + modifiers: + coefficients: + Blunt: 0.85 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.85 + Caustic: 0.85 + - type: Mech + maxEquipmentAmount: 2 + airtight: true + equipmentWhitelist: + tags: + - SmallMech + - type: WiresPanel + - type: HeldSpeedModifier + - type: GroupExamine + - type: ContainerContainer + containers: + mech-equipment-container: !type:Container + mech-battery-slot: !type:ContainerSlot + - type: UserInterface + interfaces: + enum.MechUiKey.Key: + type: MechBoundUserInterface + - type: DoAfter + - type: ClothingSpeedModifier + walkModifier: 0.75 + sprintModifier: 0.75 + +- type: entity + parent: ClothingOuterMechLoader + id: ClothingOuterMechLoaderFull + suffix: Full + components: + - type: ContainerFill + containers: + mech-battery-slot: + - PowerCellHigh + - type: Mech + startingEquipment: + - MechEquipmentGrabberSmall + - MechEquipmentGrabberSmall \ No newline at end of file diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Armor/mech_loader.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/SS220/Clothing/OuterClothing/Armor/mech_loader.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..087b2fdf8b7defe5153518e5a3d39ed3c963242d GIT binary patch literal 6279 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Armor/mech_loader.rsi/icon.png b/Resources/Textures/SS220/Clothing/OuterClothing/Armor/mech_loader.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e12f8bea2acf8cc0861e641a295c5fa6cc37682b GIT binary patch literal 3052 zcmcImX;>528XgoWDk>BdxauXwmPMIlCVK(_A)zc1K!^gOmC4K`OeKp+ScE88QB**w zh=LYz2Lz!Og$k%>T~GuUWD_mg>aErV6-BGIbi&r&`?Nm(xp|&R&YAhn`@P@$y>m|1 zhXnaf827Jn002zz_Y;SbzZBzTZbp9Vl9FBkfC-lni9)#0ots11~eQqkr^{-Rvj$Exy_HdfK4G1Eo5FB75HNaXbnR4p#=3D=PF^c9gH12(D*VE7Qff)i z4YpO9+qp3%{;Lo9dtu?0uVj=xO#U1-(bi>nHK&F8oZZ6m!B zchgel+qvaDl%3buPwYXGq*yIiQ*AQ7+NWyan&(s8C#C@P=YoIh4fAXul^m<_i_`(Y zcx&Tj0&M@<4gky$LK>lukOT@)wUUMy^`#{$HDojZxO*mQ5OgW7r^s*xp%PMiYEM!r z1SX`0vn7y3Bf?_{za%XlmJ}pKla``RG2zJ=VBx^ zv<4R=dR$0lKnxZL!yp5aLa>0v5ir@aA*KL=216yJ6);4Pd|0p=Bjn3JBvc|1_^Wh! zM1|u1Vj-0zMI#7IfXVngCLcvW83scj4`U%9!iLBx59T0z7LS3-u>oG>da)XfGm2qc zKj>UcjglB6f(l>`A7Zj#5`)jL2 z!bn6EW8xSa!a%-^&j3lob3qvb@j*Gn=b$JTW1|pCrTm#!q>fcMc0fHLsE~KKyKI3HdgSUyl zQSZZe4z5p#!Aa2fG=DHmr!BO>n!(o4|F>&@c7516UZkguJ=F~<;f*LpH1Qa=6pM+&xEz;(T#g(Dc?gRM z^5hr;l(E^Q(U_17GvKHt`yetUIXwKBAN79Ju(HqHt> zbw2W?k4>7lS9QCv%)5wk|BWna$(q9-bxF(@nk^<2>W9~wgk_U%oxaxfSw;yfZ(rv# zq&EHL4@VwYKAM}N@egY5dHdUno}SCcxZVL5R5wm6&N|@~9bCT?h)!Xrwyt{@?u*cxw~ltb=KJI z!s!#jeyS*Xb{$Z7{+`y&JyG=FSn$=j#lM0e=wd~#QvFcdd%nHyNWYL~cspTIdEdN- z-_F|hx`eiz-d{g+SJg6aL4x~HP4>x6b-~@87DYAxfh|P8?r$M{O>4@N`^p_RGBh(9 zDqp1&o5~Jm-gVG_XDU^m7E`^VdJ8W#38f|`vcq|ARCZ=t@sgv;t|RP}W?B<%pvQFX}R+ISku+;EC5*(;rOb;awdn&fny@2HE)m_Eyz za_fwynG6PrG)rT5+QF6ygF zhjEej6YjWwnrKtA)(<};R{9-qi}H8ODXXZ+X}q^(U0d6N_6|PB)3d_xZl!0H65a0T zka-#2a@pKoWp;CvyFHM7N4`9;bVh!lY`fzHY_q|GZty5Hl}@>MsLpf4**(RF4&_d4 zV@Xsu#)yB}T4Xx;@~Ww`IsVHc^W+t=*Qc0-S-DYxwzf8)xU@8^Lw4912yEGBFytQl$1D2g^Z?dk5ZT{QoR6hel+bG6yY^f4`4@QWpW)4gOOcpwd;?ru=#jK-VaH9fo8%Ydm3497 ze!kPQ-CJhJXXY$>632xWHaM%o>jH#Nn|FA1w%SwS6PGSqkNI&roA0><+>}P2>Wx!Ka>7G LLE>`n=r8{OT(g$o literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Armor/mech_loader.rsi/inhand-left.png b/Resources/Textures/SS220/Clothing/OuterClothing/Armor/mech_loader.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..a52e817a6c511e392762fba9fc2a58f686af96aa GIT binary patch literal 4042 zcmcIn30MwW!>Ax0%oP|(G9d{N5er>KMXeUC z7ExCbFRzE`wYE0O%bari!8e1~DIJC;E2@nQ|2XSYlGCj8fnfN`Nt;!Jr>kDwPZa0KdEy zOKlM+qWaCZ4GyU&oalVxn$b5pN_Xkl;_&!|VC**KvhCr@73e31(yZt1OAJG%)X#SC z4LzoK*fZ0yqIiySu50&24UgA0NWIRoiqOkz=S9zJj@_1aA+PjyRqa4+zC-r7{7q@w zQUQ10lyc98Cg<$S>aqudlP|J(-kT#FeG(xa}X>8!CsrY2`kUgmZ&u1Ql>Ld4ZP7^?Ve zX^&M)&hig<&(DqMd+B`iz*9|*30!ZTc*uc?d%r*2lJ#2dak-f=tP6Dx8Yv$br?3|K zXHD?@V);F^()g)c6Oy69%f!ZgtX}&{1Xh48l7I5@r6v&z}6c4hRMdCg&i ztq@DHoZVK?SalSrq)Y@T^cO)GS0Dt%Qh%<9FOW({f;^Zj;lL6Omk)78G65{(@xb;U zHto%XYh^L2(e1wICpkOGVlm1%ob>c`|8%}TWlH4GVv%xS9*4(+Xar=QX|Nzx$YA#A zu%IH$n29u6NXh^*77>(6waD3Yq-`najdrsJb308mVH_)BRFkgN zIgW7%9ib--7Bh|I+OftY%0iiwsCSsQfBlvNnp(Bm?xV|C^m@Asvn3>rPNSWWF41Pq zOe4XGA!@;6N4}s^$y8Me z`b{DYIF)W5#yD)>L#Pl7A!qYo9v^~*5KpM#N@aYB3>J@o`7#)8gQ_W<)Xua+1rV1D z@n8+imGQ+gSo9W@mK=^)kPm`!Os1twdW0s7)FX)m$7o1ogZ47Wl$4G#(T?fp_^nZ> z)v|Dd*@74_B3vbB(<%6qBrX#RQ7Mm)NFXgA5kf+tKnkIRNDEzpY7d3Zrej@d|5kk(5AD2tyGOB;pAONP=S+1jBq3mGC8)07g2Zi8PUPpCY=> zR+*@9+M<9@a0xAeLSm7Y3rP?GAChQs9)t>oLKx@6C@zsO-SEb9hZO~#pP8iQB1V&PfsFfqwf)8n|Cv%wWK2^LXk+<@?-SQd1w5TA&oF~%D{-25PE77 zCbOKaHBoxdu1(NFfr!zlBQb=@os(w3+b5HqQT99in31&ivxK8O3}y7fMDVkW06su%i$EN0!=)fF&V@M1nqcIDa4?k(djkFi#9& zQY{bCY6U__iozI#Auu1~X~hzWF&>~Q|t6<8$F!=o=R=csx~r5Gi};>cFMY%KOd_^`Y@Hz zr-A)^_&uYR=}cxn^+!(xW`MLN-sy(a@ru57F-!Y>kAAS<7zqR2uO|9F$j|Gs3jiEz z!c_{5bPbIEmD&q~{5(Xs?Iz0qxV{pzs^;jkp|sK3v*L9wHE2d6(u)7=_U^?H6V z)wuWb>RW=9@sa5KAaQ2CWASc}2vhNTdHMOR4@>5(%os8&4c-x*xMk({lLGWbeGYlv z%k$1^X{j0!H+`6DZu3t)>K*onyIvb`RE+}r0K+Ga`@0*Ldme?dSC<0@R{dvA#$MNk zaD`cTKRnOf<4X?tF~;_43AxV z`dD+o))JS>l!StzUX@>!l>9rO&o;hPGrYg1YD->5#j$E9-PJXlVvgkGCdMZ%o}wDQ z!lC-tOXWbeW_ZrYQz2sm>Vk(g9RKC-wSOBnaL*(!)wFJ7ejV`o^}X(HZnCCV7p6H+ zw>|dU^wJiSaaxQblPx;Ad!&@I&Zx%&Fo4=+_8z5&+6U3-3py<(KS zBGPuGd`@WO*(rrPpno+ks=^qHPrrC|&OtHj^w4FjqN1Y5b(}FwrhKL0T`)0%)+S58ID-)2bNx-SPP? z{hz;F&CPt0Iw0_(+r}3CzPg1A>XKWQA9?ZYUQRHw^I?kWY`R!`XIo3;od+iuKhBTW tdU?kOe0lw*>)~e?CX{b`%=zY2R+Hd!mu1;IMlt^?hKGz(l?EsL^*=(((dz&J literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Armor/mech_loader.rsi/inhand-right.png b/Resources/Textures/SS220/Clothing/OuterClothing/Armor/mech_loader.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..bf9393a82a5cfffd28e707846e92df9a4035f73b GIT binary patch literal 4105 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Interface/Actions/actions_mecha.rsi/meta.json b/Resources/Textures/SS220/Interface/Actions/actions_mecha.rsi/meta.json new file mode 100644 index 00000000000000..1dc042950a0726 --- /dev/null +++ b/Resources/Textures/SS220/Interface/Actions/actions_mecha.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", + "copyright": "Made by pulnet (Discord) for SS220", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "mech_grab" + } + ] + } \ No newline at end of file From 8840340a412e05b4d305fad029fe8eba0e19861c Mon Sep 17 00:00:00 2001 From: cherborr <87541461+cherborr@users.noreply.github.com> Date: Sat, 23 Nov 2024 19:43:41 +0300 Subject: [PATCH 30/32] RevenantFix (#2267) * RevenantFix * addComments --- .../Revenant/EntitySystems/RevenantSystem.Abilities.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs index b89c6ad010fa83..221239e3041864 100644 --- a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs +++ b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs @@ -30,6 +30,7 @@ using Robust.Shared.Utility; using Robust.Shared.Map.Components; using Content.Shared.Whitelist; +using Content.Server.NPC.HTN; namespace Content.Server.Revenant.EntitySystems; @@ -73,7 +74,8 @@ private void OnInteract(EntityUid uid, RevenantComponent component, UserActivate return; } - if (!HasComp(target) || !HasComp(target) || HasComp(target)) + if (!HasComp(target) || !HasComp(target) || HasComp(target) + || HasComp(target)) // ss220 rev cant harvest NPC return; args.Handled = true; From 84a6ca200e24b065665409ff6627985bc4fbf115 Mon Sep 17 00:00:00 2001 From: ReeZer2 <63300653+ReeZer2@users.noreply.github.com> Date: Sat, 23 Nov 2024 18:45:47 +0200 Subject: [PATCH 31/32] FIX: Interaction without hands (#2228) * FIX: Interaction without hands * fix commit --- .../Interaction/Components/InteractionPopupComponent.cs | 5 +++++ Content.Shared/Interaction/InteractionPopupSystem.cs | 6 ++++++ .../Entities/Structures/Doors/Shutter/shutters.yml | 1 + 3 files changed, 12 insertions(+) diff --git a/Content.Shared/Interaction/Components/InteractionPopupComponent.cs b/Content.Shared/Interaction/Components/InteractionPopupComponent.cs index 4ef5a1d18083d7..475d7498d760c0 100644 --- a/Content.Shared/Interaction/Components/InteractionPopupComponent.cs +++ b/Content.Shared/Interaction/Components/InteractionPopupComponent.cs @@ -82,4 +82,9 @@ public sealed partial class InteractionPopupComponent : Component /// [DataField] public bool OnActivate; + + //ss220 interact w/o hands fix start + [DataField] + public bool NeedHands; + //ss220 interact w/o hands fix end } diff --git a/Content.Shared/Interaction/InteractionPopupSystem.cs b/Content.Shared/Interaction/InteractionPopupSystem.cs index 20c079dfd8c8d0..8b562ecdf97098 100644 --- a/Content.Shared/Interaction/InteractionPopupSystem.cs +++ b/Content.Shared/Interaction/InteractionPopupSystem.cs @@ -1,4 +1,5 @@ using Content.Shared.Bed.Sleep; +using Content.Shared.Hands.Components; using Content.Shared.IdentityManagement; using Content.Shared.Interaction.Components; using Content.Shared.Interaction.Events; @@ -69,6 +70,11 @@ private void SharedInteract( return; } + //ss220 interact w/o hands fix start + if (component.NeedHands && !HasComp(user)) + return; + //ss220 interact w/o hands fix end + args.Handled = true; var curTime = _gameTiming.CurTime; diff --git a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml index d3c7f702217faf..c6761524a9659a 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml @@ -102,6 +102,7 @@ messagePerceivedByOthers: comp-window-knock interactSuccessSound: path: /Audio/Effects/glass_knock.ogg + needHands: true - type: BlockWeather - type: entity From 0f0ea4c963b24d2babd2d51049f0fc48e7550e69 Mon Sep 17 00:00:00 2001 From: cherborr <87541461+cherborr@users.noreply.github.com> Date: Sun, 24 Nov 2024 00:51:07 +0300 Subject: [PATCH 32/32] addBackShield (#2233) --- .../Blocking/BlockingSystem.User.cs | 9 ++++++ Content.Shared/Blocking/BlockingSystem.cs | 30 +++++++++++++++++++ .../Blocking/Components/BlockingComponent.cs | 10 +++++++ 3 files changed, 49 insertions(+) diff --git a/Content.Shared/Blocking/BlockingSystem.User.cs b/Content.Shared/Blocking/BlockingSystem.User.cs index aa892c815c39a5..dc3d63281d1099 100644 --- a/Content.Shared/Blocking/BlockingSystem.User.cs +++ b/Content.Shared/Blocking/BlockingSystem.User.cs @@ -1,5 +1,6 @@ using Content.Shared.Damage; using Content.Shared.Damage.Prototypes; +using Content.Shared.Inventory; using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; using Robust.Shared.Containers; @@ -10,6 +11,7 @@ public sealed partial class BlockingSystem { [Dependency] private readonly DamageableSystem _damageable = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private readonly InventorySystem _inventory = default!; // SS220 equip shield on back private void InitializeUser() { SubscribeLocalEvent(OnUserDamageModified); @@ -52,6 +54,13 @@ private void OnUserDamageModified(EntityUid uid, BlockingUserComponent component if (!TryComp(component.BlockingItem, out var dmgComp)) return; + // SS220 equip shield on back begin + if (_inventory.TryGetContainingSlot(component.BlockingItem.Value, out var slotDefinition) && blocking.AvaliableSlots.TryGetValue(slotDefinition.SlotFlags, out var coef)) + { + blockFraction *= coef; + } + // SS220 equip shield on back end + blockFraction = Math.Clamp(blockFraction, 0, 1); _damageable.TryChangeDamage(component.BlockingItem, blockFraction * args.OriginalDamage); diff --git a/Content.Shared/Blocking/BlockingSystem.cs b/Content.Shared/Blocking/BlockingSystem.cs index a31b075479b315..9015b296955f4b 100644 --- a/Content.Shared/Blocking/BlockingSystem.cs +++ b/Content.Shared/Blocking/BlockingSystem.cs @@ -23,6 +23,7 @@ using Robust.Shared.Timing; using Robust.Shared.Utility; using Content.Shared.Weapons.Reflect; +using Content.Shared.Inventory.Events; namespace Content.Shared.Blocking; @@ -49,6 +50,11 @@ public override void Initialize() SubscribeLocalEvent(OnUnequip); SubscribeLocalEvent(OnDrop); + // SS220 equip shield on back begin + SubscribeLocalEvent(OnGotEquip); + SubscribeLocalEvent(OnGotUnequipped); + // SS220 equip shield on back end + SubscribeLocalEvent(OnGetActions); SubscribeLocalEvent(OnToggleAction); @@ -93,6 +99,30 @@ private void OnEquip(EntityUid uid, BlockingComponent component, GotEquippedHand } } + // SS220 equip shield on back begin + private void OnGotEquip(EntityUid uid, BlockingComponent component, GotEquippedEvent args) + { + + if (!component.AvaliableSlots.ContainsKey(args.SlotFlags)) + return; + + component.User = args.Equipee; + Dirty(uid, component); + + if (TryComp(args.Equipee, out var physicsComponent) && physicsComponent.BodyType != BodyType.Static) + { + var userComp = EnsureComp(args.Equipee); + userComp.BlockingItem = uid; + userComp.OriginalBodyType = physicsComponent.BodyType; + } + } + + private void OnGotUnequipped(EntityUid uid, BlockingComponent component, GotUnequippedEvent args) + { + StopBlockingHelper(uid, component, args.Equipee); + } + // SS220 equip shield on back end + private void OnUnequip(EntityUid uid, BlockingComponent component, GotUnequippedHandEvent args) { StopBlockingHelper(uid, component, args.User); diff --git a/Content.Shared/Blocking/Components/BlockingComponent.cs b/Content.Shared/Blocking/Components/BlockingComponent.cs index f869c20679d2ef..f55e5a7a254a72 100644 --- a/Content.Shared/Blocking/Components/BlockingComponent.cs +++ b/Content.Shared/Blocking/Components/BlockingComponent.cs @@ -1,4 +1,5 @@ using Content.Shared.Damage; +using Content.Shared.Inventory; using Robust.Shared.Audio; using Robust.Shared.GameStates; using Robust.Shared.Physics.Collision.Shapes; @@ -76,4 +77,13 @@ public sealed partial class BlockingComponent : Component /// [DataField("activeBlockFraction"), ViewVariables(VVAccess.ReadWrite)] public float ActiveBlockFraction = 1.0f; + + // SS220 equip shield on back begin + /// + /// The list of slots that supported a shield protection + /// and second arg it's protection efficiency of this slots + /// + [DataField] + public Dictionary AvaliableSlots = new(); + // SS220 equip shield on back end }