From bf1b0d03aede161d62aedfc9166589335a5d7c4c Mon Sep 17 00:00:00 2001 From: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> Date: Thu, 19 Dec 2024 17:51:33 -0400 Subject: [PATCH 01/11] v237.3.0 (#1354) the robust toolbox updater!! https://github.com/space-wizards/RobustToolbox/blob/v237.3.0/RELEASE-NOTES.md --- RobustToolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RobustToolbox b/RobustToolbox index 92b0e7f1a8..9c30fdf5fd 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 92b0e7f1a853979a1361ed24d2fb5ffc11f43f66 +Subproject commit 9c30fdf5fd7261ea424f80478c2746e2001326e8 From 3c1ed56ed3122866b32249006496c37be825c82a Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Thu, 19 Dec 2024 17:52:31 -0500 Subject: [PATCH 02/11] Hotfix Saltern (#1359) # Description Small maintenance to do. Bridge needed FixGridAtmos done, and a single light in dorms needed wiring. # Changelog :cl: - fix: Fixed the Saltern bridge being a hard vacuum at roundstart. --- Resources/Maps/saltern.yml | 2178 +++++++++++++++++++----------------- 1 file changed, 1166 insertions(+), 1012 deletions(-) diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml index adb89e1009..e88865dc9b 100644 --- a/Resources/Maps/saltern.yml +++ b/Resources/Maps/saltern.yml @@ -278,23 +278,25 @@ entities: -5,-4: 0: 61695 -4,-3: - 0: 47871 + 0: 14591 -4,-2: - 0: 12731 - 1: 49152 + 0: 703 + 1: 57344 + -5,-3: + 0: 57975 -5,-2: - 0: 47935 - -5,-1: - 0: 65528 + 0: 61422 -4,-1: + 1: 14 0: 61056 - 1: 12 + -5,-1: + 0: 32760 -4,0: 0: 61695 -3,-4: - 0: 54527 + 0: 24063 -3,-3: - 0: 3581 + 0: 3549 -3,-2: 0: 247 1: 28672 @@ -306,9 +308,9 @@ entities: -3,0: 0: 61695 -2,-4: - 0: 53503 + 0: 57599 -2,-3: - 0: 65529 + 0: 65294 -2,-2: 0: 65520 -2,-1: @@ -318,9 +320,9 @@ entities: -2,0: 0: 63487 -1,-4: - 0: 53503 + 0: 53759 -1,-3: - 0: 48124 + 0: 48108 -1,-2: 0: 65520 -1,-1: @@ -330,7 +332,7 @@ entities: -1,0: 0: 61695 0,-4: - 0: 52991 + 0: 20222 0,-3: 0: 56573 0,-2: @@ -350,13 +352,13 @@ entities: -4,3: 0: 61424 -5,3: - 0: 16241 + 0: 32577 -4,4: 0: 61070 -3,1: - 0: 41215 + 0: 53503 -3,2: - 0: 65450 + 0: 65421 -3,3: 0: 64988 -3,4: @@ -372,9 +374,9 @@ entities: -1,1: 0: 58623 -1,2: - 0: 16142 + 0: 65294 -1,3: - 0: 3003 + 0: 4095 -1,4: 0: 4095 0,0: @@ -384,7 +386,7 @@ entities: 0,2: 0: 56797 0,3: - 0: 52701 + 0: 19933 0,-5: 0: 65263 1,-4: @@ -408,7 +410,7 @@ entities: 2,-1: 0: 65535 2,-5: - 0: 30511 + 0: 30479 2,0: 0: 61695 3,-4: @@ -420,7 +422,7 @@ entities: 3,-1: 0: 64985 3,-5: - 0: 65295 + 0: 65359 3,0: 0: 61661 4,-4: @@ -515,43 +517,44 @@ entities: -1,5: 0: 58623 0,6: - 0: 51711 + 0: 36351 -1,6: 0: 3822 0,7: - 0: 65503 + 0: 65279 -1,7: - 0: 61166 + 0: 41967 0,8: - 0: 15 - 2: 3840 + 0: 65535 1,5: 0: 53439 1,6: - 0: 7421 + 0: 3581 1,7: - 0: 65503 + 0: 4369 + 2: 17484 1,8: - 0: 15 - 2: 40704 + 0: 4369 + 2: 17476 2,5: 0: 53367 2,6: 0: 1405 2,7: - 0: 4915 - 2: 34944 - 2,8: - 2: 36 + 2: 7 3,5: - 0: 4181 + 0: 4210 + 2: 32768 3,6: - 0: 4881 + 0: 13073 + 2: 8 + 3,7: + 2: 4 4,5: 0: 273 - 2: 17476 + 2: 29764 -8,0: - 0: 61678 + 0: 61550 -9,0: 0: 64413 -8,1: @@ -569,32 +572,34 @@ entities: -8,4: 0: 477 2: 49152 + -8,-1: + 0: 26208 -7,0: - 0: 64671 + 0: 63487 -7,1: 0: 40191 -7,2: 0: 49087 -7,3: - 0: 20472 - -7,4: - 0: 58983 + 0: 53240 -7,-1: - 0: 52732 + 0: 65407 + -7,4: + 0: 61039 -6,0: - 0: 62363 + 0: 61678 -6,1: - 0: 5119 + 0: 5115 -6,2: 0: 6007 -6,3: - 0: 4092 - -6,-1: - 0: 48051 + 0: 65436 -6,4: - 0: 61567 + 0: 65151 + -6,-1: + 0: 61152 -5,4: - 0: 30527 + 0: 30310 4,-5: 0: 61152 5,-4: @@ -639,7 +644,7 @@ entities: 0: 65524 0,-9: 0: 52416 - 2: 275 + 2: 273 1,-8: 0: 65488 1,-7: @@ -664,91 +669,88 @@ entities: 3,-6: 0: 64733 4,-8: - 0: 39299 + 0: 4483 2: 17484 4,-7: - 0: 65289 - 2: 4 + 0: 65281 + 2: 12 4,-6: 0: 61152 4,-9: - 2: 17476 - 0: 34952 + 2: 16384 + 0: 32768 5,-8: 2: 21855 - 0: 43680 + 0: 160 5,-7: - 2: 5 - 0: 63242 + 2: 15 + 0: 63232 5,-9: - 2: 21845 - 0: 43690 + 2: 20480 + 0: 40960 5,-6: 0: 26214 6,-8: 2: 21855 - 0: 43680 + 0: 160 6,-7: - 2: 5 - 0: 56586 + 2: 15 + 0: 56576 6,-6: 0: 61919 6,-9: - 2: 21845 - 0: 43690 + 2: 20480 + 0: 40960 7,-8: - 2: 4383 - 0: 8736 + 2: 21855 + 0: 160 7,-7: - 2: 8749 - 0: 2 + 2: 8751 7,-5: - 0: 36614 + 0: 36846 7,-9: - 2: 4369 - 0: 8738 + 2: 20767 + 0: 40960 7,-6: - 2: 1570 + 2: 3618 8,-8: - 2: 1 + 2: 21855 + 0: 160 8,-7: 2: 15 - 0: 65280 8,-6: - 0: 13119 - 2: 2048 + 2: 3840 8,-5: - 0: 3891 + 0: 4016 -4,5: 0: 238 -4,6: 0: 255 2: 61440 + -5,5: + 0: 58982 -5,6: 0: 238 2: 61440 - -4,7: - 2: 2289 - -5,7: - 2: 240 -3,5: 0: 3295 -3,6: 0: 255 - 2: 12288 + 2: 61440 -3,7: - 2: 8816 + 2: 51406 -3,8: - 2: 3086 + 2: 14 + 0: 52224 -2,5: 0: 52701 -2,6: - 0: 63743 + 0: 59647 -2,7: - 0: 255 + 0: 61166 -1,8: - 0: 8 - 2: 36640 + 0: 34952 + 2: 13104 -9,4: 0: 7400 -8,5: @@ -764,32 +766,36 @@ entities: 2: 43695 0: 21840 -8,7: - 2: 242 + 2: 2039 -9,7: - 2: 240 + 2: 28671 -7,6: - 2: 62465 + 2: 63249 0: 14 -7,7: 2: 16 -7,5: 0: 1038 + 2: 4352 -6,5: - 0: 65319 + 0: 65327 -6,6: 0: 255 - -6,7: - 2: 240 - -5,5: - 0: 26215 + 2: 61440 + -3,9: + 0: 12 + 2: 3584 -2,8: - 2: 7967 + 0: 30560 + -2,9: + 0: 7 + 2: 3840 -1,9: - 2: 142 + 2: 405 0,9: - 2: 15 + 2: 240 4,6: - 2: 4 + 2: 550 0: 34816 5,5: 0: 30583 @@ -801,32 +807,26 @@ entities: 0: 255 2: 53248 6,6: - 2: 35049 + 2: 35561 7,5: 0: 36063 2: 4096 7,6: 2: 53196 - 7,7: - 2: 12 8,4: 0: 4351 2: 57344 8,5: 0: 272 - 3: 17472 + 4: 17472 8,6: - 2: 65521 - 8,7: - 2: 15 + 2: 4081 1,9: - 2: 15 - 2,9: - 2: 1 + 2: 18 9,0: 0: 65102 9,1: - 0: 3839 + 0: 3838 9,2: 0: 61917 9,3: @@ -855,10 +855,10 @@ entities: 0: 53759 11,2: 0: 4319 - 4: 49152 + 3: 49152 11,3: 0: 61457 - 4: 204 + 3: 204 11,-1: 0: 30583 11,4: @@ -870,9 +870,9 @@ entities: 0: 28791 12,2: 0: 119 - 4: 28672 + 3: 28672 12,3: - 4: 119 + 3: 119 0: 61440 12,-1: 0: 29311 @@ -901,9 +901,9 @@ entities: 14,2: 0: 15235 14,3: - 2: 32760 + 2: 65528 14,4: - 2: 28979 + 2: 62455 15,0: 0: 56797 15,1: @@ -911,14 +911,14 @@ entities: 15,2: 0: 3548 15,3: - 2: 28671 + 2: 32767 15,4: - 2: 8754 + 2: 12850 15,-1: - 0: 52428 + 0: 52701 16,0: 0: 13116 - 4: 52416 + 3: 52416 16,1: 0: 65484 16,2: @@ -936,22 +936,29 @@ entities: 9,-2: 0: 58999 9,-5: - 0: 18176 + 0: 18288 10,-4: 0: 65024 + 2: 8 10,-3: 0: 65520 10,-2: 0: 63743 + 10,-5: + 2: 34956 11,-4: 0: 13056 - 2: 128 + 2: 2184 11,-3: 0: 43946 11,-2: 0: 30250 + 11,-5: + 0: 32776 + 2: 17968 12,-4: - 2: 1265 + 0: 7 + 2: 1272 12,-3: 0: 65535 12,-2: @@ -993,16 +1000,15 @@ entities: -1,-6: 0: 30065 -8,-8: - 0: 52227 - 2: 8712 + 0: 35331 + 2: 8 -8,-9: 0: 12288 - 2: 35056 + 2: 35064 -9,-8: - 0: 65356 - 2: 1 + 0: 56653 -8,-7: - 0: 63740 + 0: 63742 -9,-7: 0: 46079 -8,-6: @@ -1041,7 +1047,7 @@ entities: 0: 61440 2: 34 -6,-7: - 0: 36494 + 0: 52878 -6,-4: 0: 62463 -5,-9: @@ -1051,27 +1057,23 @@ entities: 0: 34952 2: 800 -8,-3: - 0: 65039 + 0: 3663 -9,-3: 0: 56797 -8,-2: - 0: 60942 + 0: 59119 -9,-2: - 0: 56829 + 0: 57309 -9,-1: - 0: 56797 - -8,-1: - 0: 3808 - -7,-3: - 0: 64907 + 0: 56781 -7,-2: - 0: 57293 + 0: 65262 + -7,-3: + 0: 44782 -6,-3: - 0: 63291 + 0: 41915 -6,-2: - 0: 30583 - -5,-3: - 0: 28791 + 0: 61166 -12,0: 0: 3855 -13,0: @@ -1133,16 +1135,15 @@ entities: -10,-5: 2: 32776 12,-5: - 2: 61440 - 0: 127 + 0: 62079 + 13,-4: + 2: 2808 13,-3: 0: 48059 13,-2: 0: 63243 - 13,-4: - 2: 2280 13,-5: - 2: 35304 + 2: 39912 14,-4: 2: 1039 14,-3: @@ -1151,56 +1152,59 @@ entities: 14,-2: 0: 65283 14,-1: - 0: 2047 + 0: 4095 14,-5: - 2: 17476 + 2: 17600 15,-4: 2: 8739 15,-3: 2: 62066 15,-2: - 0: 4352 + 0: 7424 2: 206 15,-5: - 2: 8704 + 2: 8721 16,-3: 2: 61440 16,-2: 2: 255 + 0: 3840 16,-1: 0: 53247 + 8,-9: + 2: 24143 + 0: 41120 + 9,-8: + 2: 15 9,-7: 2: 15 - 0: 65280 9,-6: - 0: 15 2: 3840 + 10,-8: + 2: 55703 10,-7: - 2: 7 - 0: 65280 + 2: 8743 + 0: 34816 10,-6: - 0: 15 - 2: 34560 - 10,-8: - 2: 34816 + 2: 50978 + 0: 8 + 10,-9: + 2: 40847 + 11,-8: + 2: 54 + 0: 2048 11,-7: - 0: 65534 + 0: 64988 11,-6: - 0: 61183 - 10,-5: - 2: 8 - 11,-8: - 2: 52 - 0: 59392 - 11,-5: - 2: 33840 - 0: 8 + 0: 3293 + 11,-9: + 2: 49921 12,-8: - 0: 65392 + 0: 12144 12,-7: - 0: 65535 + 0: 63743 12,-6: - 0: 65535 + 0: 24568 20,-1: 2: 256 19,-1: @@ -1209,36 +1213,48 @@ entities: 2: 16179 19,0: 2: 39118 + 0: 17441 20,1: 2: 14135 19,1: 2: 39321 + 0: 17476 20,2: 2: 29495 19,2: 2: 53179 + 0: 8260 20,3: 2: 35 19,3: 2: 4095 + 12,-9: + 2: 61440 13,-8: - 2: 34913 - 0: 12288 + 2: 35043 13,-7: - 0: 65395 + 0: 64849 13,-6: - 0: 13183 + 0: 349 2: 32768 + 13,-9: + 2: 4096 + 14,-8: + 2: 6144 14,-7: - 2: 26213 + 2: 8739 14,-6: - 2: 17766 - 14,-8: - 2: 17476 - 14,-9: - 2: 17476 + 2: 4898 + 15,-8: + 2: 4352 + 15,-7: + 2: 4369 + 15,-6: + 2: 4369 -11,5: 2: 35916 + -11,7: + 2: 35840 -10,5: 2: 39296 0: 17488 @@ -1247,10 +1263,15 @@ entities: -10,6: 0: 21569 2: 35230 + -10,7: + 2: 4040 + -11,8: + 2: 34952 -10,4: 0: 61152 - -10,7: - 2: 192 + -9,8: + 0: 2827 + 2: 25844 0,-12: 2: 79 0: 12288 @@ -1268,7 +1289,7 @@ entities: 0: 255 2: 36864 -1,-9: - 2: 3513 + 2: 3257 1,-12: 2: 4375 1,-11: @@ -1287,46 +1308,51 @@ entities: 2: 18240 3,-9: 2: 1396 - 4,-10: - 2: 17408 - 0: 34816 - 5,-10: - 2: 22000 - 0: 43520 - 6,-10: - 2: 22000 - 0: 43520 + 7,-12: + 2: 7455 + 7,-11: + 2: 7453 7,-10: - 2: 4592 - 0: 8704 + 2: 4381 + 8,-12: + 2: 20303 + 8,-11: + 2: 20303 8,-10: - 2: 240 + 2: 20047 + 0: 40960 9,5: 5: 4368 - 4: 17472 + 3: 17472 9,6: - 2: 8176 + 2: 12272 10,5: - 4: 4368 + 3: 4368 6: 17472 10,6: 2: 4080 11,5: - 4: 21840 + 3: 21840 11,6: - 2: 4080 + 2: 61424 + 11,7: + 2: 12 12,5: 2: 65535 12,6: - 2: 255 + 2: 65535 + 12,7: + 2: 15 13,5: 2: 55705 13,6: - 2: 127 + 2: 16383 + 13,7: + 2: 1 + 14,5: + 2: 30591 14,6: 2: 7 - 14,5: - 2: 17484 15,5: 2: 35 -4,-10: @@ -1341,7 +1367,6 @@ entities: 0: 34944 -2,-10: 0: 1019 - 2: 16384 -2,-11: 2: 544 0: 2176 @@ -1349,19 +1374,21 @@ entities: 2: 61696 17,-2: 2: 3327 + 0: 768 17,-1: 0: 4369 - 2: 52416 + 2: 52428 17,0: - 0: 17921 + 0: 19969 2: 8 - 4: 4368 + 3: 4368 18,-3: 2: 4096 18,-2: - 2: 63477 + 2: 59381 18,-1: 2: 15358 + 0: 33792 18,0: 2: 65399 19,-2: @@ -1379,30 +1406,89 @@ entities: 2: 2190 18,3: 2: 40959 + 12,-10: + 2: 61440 + 11,-10: + 2: 61440 + 13,-10: + 2: 7936 14,-10: - 2: 17520 + 2: 256 + 9,-12: + 2: 1807 + 9,-11: + 2: 1799 9,-10: - 2: 16 + 2: 7 + 9,-9: + 2: 3855 + 10,-12: + 2: 4369 + 10,-11: + 2: 4369 + 10,-10: + 2: 4369 + -12,-8: + 2: 64170 + -13,-8: + 2: 64170 + -12,-7: + 2: 64170 + -13,-7: + 2: 64170 + -12,-9: + 2: 61440 -11,-8: - 2: 60074 + 2: 64170 -11,-7: - 2: 2730 + 2: 64170 + -11,-9: + 2: 61440 -10,-8: - 2: 12846 - 0: 34816 + 2: 12834 + 0: 34828 -10,-7: - 2: 8738 + 2: 12834 0: 34952 + -10,-9: + 2: 13288 + 0: 32768 -10,-6: 2: 57378 0: 8 -9,-9: - 2: 4600 - 0: 49152 + 0: 61440 + 2: 248 + -13,-9: + 2: 61440 + -11,-10: + 2: 8 + -10,-10: + 2: 63631 + -10,-12: + 2: 59592 + -9,-12: + 2: 63743 + -10,-11: + 2: 34952 + -9,-11: + 2: 63736 -9,-10: - 2: 63728 + 2: 63736 + -9,-13: + 2: 61440 + -8,-12: + 2: 63743 + -8,-11: + 2: 63736 -8,-10: - 2: 28784 + 2: 63736 + -8,-13: + 2: 29696 + -7,-12: + 2: 1808 + -7,-11: + 2: 240 -6,-11: 2: 8192 -6,-10: @@ -1412,9 +1498,53 @@ entities: -14,2: 0: 3598 -14,-3: - 0: 3272 + 0: 3276 -13,-4: 0: 4096 + -11,9: + 2: 35980 + -11,10: + 2: 51336 + -10,8: + 2: 497 + 0: 3084 + -10,9: + 2: 449 + 0: 3084 + -10,10: + 2: 4593 + 0: 3084 + -10,11: + 2: 227 + -9,9: + 0: 2827 + 2: 21748 + -9,10: + 0: 2827 + 2: 58612 + -9,11: + 2: 254 + -8,8: + 0: 1799 + 2: 112 + -8,9: + 0: 1799 + 2: 4208 + -8,10: + 0: 1799 + 2: 112 + -8,11: + 2: 48 + -15,-8: + 2: 34944 + -14,-8: + 2: 64443 + -15,-7: + 2: 136 + -14,-7: + 2: 64443 + -14,-9: + 2: 61440 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -1465,7 +1595,7 @@ entities: temperature: 293.15 moles: - 0 - - 6666.982 + - 0 - 0 - 0 - 0 @@ -1480,7 +1610,7 @@ entities: temperature: 293.15 moles: - 0 - - 0 + - 6666.982 - 0 - 0 - 0 @@ -1534,55 +1664,55 @@ entities: color: '#FFFFFFFF' id: Arrows decals: - 552: -12,-30 + 446: -12,-30 - node: color: '#FFFFFFFF' id: Arrows decals: - 489: 20,17 - 504: 20,17 - 508: 20,27 - 553: -12,-29 + 383: 20,17 + 398: 20,17 + 402: 20,27 + 447: -12,-29 - node: angle: 3.141592653589793 rad color: '#FFFFFFFF' id: Arrows decals: - 505: 22,17 - 509: 22,27 + 399: 22,17 + 403: 22,27 - node: color: '#C3C3C3FF' id: Bot decals: - 904: -35,-24 - 909: -32,-32 - 910: -31,-32 + 757: -35,-24 + 762: -32,-32 + 763: -31,-32 - node: color: '#FFFFFFFF' id: Bot decals: - 483: -35,6 - 484: -30,11 - 514: -3,-31 - 760: 31,8 - 761: 31,9 + 377: -35,6 + 378: -30,11 + 408: -3,-31 + 613: 31,8 + 614: 31,9 - node: zIndex: 1 color: '#FFFFFFFF' id: Bot decals: - 607: 20,7 - 608: 21,7 - 609: 22,7 - 681: -7,-26 - 682: -6,-26 + 481: 20,7 + 482: 21,7 + 483: 22,7 + 550: -7,-26 + 551: -6,-26 - node: angle: 3.141592653589793 rad color: '#FFFFFFFF' id: Bot decals: - 506: 20,17 - 507: 22,17 + 400: 20,17 + 401: 22,17 - node: color: '#FFFFFFFF' id: BotRight @@ -1593,688 +1723,688 @@ entities: color: '#C3C3C3FF' id: Box decals: - 922: -33,-29 - 923: -33,-28 + 775: -33,-29 + 776: -33,-28 - node: zIndex: 2 color: '#FFFFFFFF' id: BrickTileDarkCornerNe decals: - 687: -9,-28 + 556: -9,-28 - node: zIndex: 2 color: '#FFFFFFFF' id: BrickTileDarkCornerNw decals: - 688: -10,-28 + 557: -10,-28 - node: zIndex: 2 color: '#FFFFFFFF' id: BrickTileDarkCornerSe decals: - 686: -9,-30 + 555: -9,-30 - node: zIndex: 2 color: '#FFFFFFFF' id: BrickTileDarkCornerSw decals: - 685: -10,-30 + 554: -10,-30 - node: color: '#FFFFFFFF' id: BrickTileDarkInnerSe decals: - 759: -11,20 + 612: -11,20 - node: zIndex: 1 color: '#FFFFFFFF' id: BrickTileDarkInnerSe decals: - 619: 6,17 + 488: 6,17 - node: color: '#FFFFFFFF' id: BrickTileDarkLineE decals: - 661: 0,-25 - 883: -1,29 - 884: -1,28 + 530: 0,-25 + 736: -1,29 + 737: -1,28 - node: zIndex: 2 color: '#FFFFFFFF' id: BrickTileDarkLineE decals: - 689: -9,-29 + 558: -9,-29 - node: color: '#FFFFFFFF' id: BrickTileDarkLineN decals: - 656: -6,-23 - 657: -5,-23 - 658: -4,-23 - 881: 3,30 - 882: 4,30 + 525: -6,-23 + 526: -5,-23 + 527: -4,-23 + 734: 3,30 + 735: 4,30 - node: zIndex: 2 color: '#FFFFFFFF' id: BrickTileDarkLineN decals: - 696: 12,-14 - 697: 13,-14 - 698: 14,-14 - 699: 15,-14 + 565: 12,-14 + 566: 13,-14 + 567: 14,-14 + 568: 15,-14 - node: color: '#FFFFFFFF' id: BrickTileDarkLineS decals: - 756: -8,20 - 757: -9,20 - 758: -10,20 + 609: -8,20 + 610: -9,20 + 611: -10,20 - node: zIndex: 1 color: '#FFFFFFFF' id: BrickTileDarkLineS decals: - 615: 10,17 - 616: 9,17 - 617: 8,17 - 618: 7,17 + 484: 10,17 + 485: 9,17 + 486: 8,17 + 487: 7,17 - node: zIndex: 2 color: '#FFFFFFFF' id: BrickTileDarkLineS decals: - 700: 12,-18 - 701: 13,-18 - 702: 14,-18 - 703: 15,-18 + 569: 12,-18 + 570: 13,-18 + 571: 14,-18 + 572: 15,-18 - node: color: '#FFFFFFFF' id: BrickTileDarkLineW decals: - 662: -2,-25 + 531: -2,-25 - node: zIndex: 2 color: '#FFFFFFFF' id: BrickTileDarkLineW decals: - 690: -10,-29 + 559: -10,-29 - node: zIndex: 2 color: '#D381C9FF' id: BrickTileSteelCornerNe decals: - 684: -6,-26 + 553: -6,-26 - node: color: '#D381C9FF' id: BrickTileSteelCornerNw decals: - 670: -4,-26 + 539: -4,-26 - node: color: '#D381C9FF' id: BrickTileSteelCornerSe decals: - 676: -8,-24 + 545: -8,-24 - node: color: '#D381C9E5' id: BrickTileSteelCornerSw decals: - 543: -12,-32 + 437: -12,-32 - node: color: '#FFFFFFFF' id: BrickTileSteelCornerSw decals: - 772: 25,19 + 625: 25,19 - node: zIndex: 1 color: '#FFFFFFFF' id: BrickTileSteelEndE decals: - 594: -36,-11 - 595: -41,-11 - 596: -47,-11 + 468: -36,-11 + 469: -41,-11 + 470: -47,-11 - node: zIndex: 1 color: '#FFFFFFFF' id: BrickTileSteelEndW decals: - 591: -50,-11 - 592: -43,-11 - 593: -38,-11 + 465: -50,-11 + 466: -43,-11 + 467: -38,-11 - node: color: '#C3C3C3FF' id: BrickTileSteelInnerNe decals: - 898: -34,-32 - 927: -35,-27 + 751: -34,-32 + 780: -35,-27 - node: color: '#D381C9E5' id: BrickTileSteelInnerNe decals: - 547: -10,-26 + 441: -10,-26 - node: color: '#D381C9FF' id: BrickTileSteelInnerNe decals: - 660: -6,-27 - 675: 0,-29 - 680: -13,-19 + 529: -6,-27 + 544: 0,-29 + 549: -13,-19 - node: color: '#D381C9FF' id: BrickTileSteelInnerNw decals: - 669: -4,-27 - 671: -3,-26 + 538: -4,-27 + 540: -3,-26 - node: color: '#C3C3C3FF' id: BrickTileSteelInnerSe decals: - 908: -34,-30 - 918: -36,-28 - 919: -33,-30 + 761: -34,-30 + 771: -36,-28 + 772: -33,-30 - node: color: '#D381C9E5' id: BrickTileSteelInnerSe decals: - 537: -18,-28 - 540: -7,-33 + 431: -18,-28 + 434: -7,-33 - node: color: '#D381C9FF' id: BrickTileSteelInnerSe decals: - 672: 0,-26 - 677: -8,-23 + 541: 0,-26 + 546: -8,-23 - node: color: '#C3C3C3FF' id: BrickTileSteelInnerSw decals: - 885: -34,-28 + 738: -34,-28 - node: color: '#D381C9E5' id: BrickTileSteelInnerSw decals: - 519: -12,-20 - 544: -12,-31 + 413: -12,-20 + 438: -12,-31 - node: color: '#C3C3C3FF' id: BrickTileSteelLineE decals: - 895: -33,-29 - 896: -33,-28 - 897: -34,-31 - 902: -35,-26 - 903: -35,-25 - 906: -33,-30 - 917: -36,-29 - 926: -36,-30 + 748: -33,-29 + 749: -33,-28 + 750: -34,-31 + 755: -35,-26 + 756: -35,-25 + 759: -33,-30 + 770: -36,-29 + 779: -36,-30 - node: color: '#D381C9FF' id: BrickTileSteelLineE decals: - 673: 0,-27 - 674: 0,-28 + 542: 0,-27 + 543: 0,-28 - node: zIndex: 1 color: '#FFFFFFFF' id: BrickTileSteelLineE decals: - 605: -36,-9 + 479: -36,-9 - node: color: '#C3C3C3FF' id: BrickTileSteelLineN decals: - 893: -37,-24 - 894: -36,-24 - 899: -33,-32 - 900: -33,-27 - 901: -34,-27 + 746: -37,-24 + 747: -36,-24 + 752: -33,-32 + 753: -33,-27 + 754: -34,-27 - node: color: '#D381C9E5' id: BrickTileSteelLineN decals: - 521: -8,-19 - 522: -9,-19 - 523: -10,-19 - 524: -11,-19 - 546: -9,-26 + 415: -8,-19 + 416: -9,-19 + 417: -10,-19 + 418: -11,-19 + 440: -9,-26 - node: color: '#D381C9FF' id: BrickTileSteelLineN decals: - 659: -8,-26 - 679: -12,-19 + 528: -8,-26 + 548: -12,-19 - node: zIndex: 2 color: '#D381C9FF' id: BrickTileSteelLineN decals: - 683: -7,-26 + 552: -7,-26 - node: color: '#FFFFFFFF' id: BrickTileSteelLineN decals: - 515: -11,-24 + 409: -11,-24 - node: zIndex: 1 color: '#FFFFFFFF' id: BrickTileSteelLineN decals: - 597: -49,-11 - 598: -48,-11 - 599: -42,-11 - 600: -37,-11 + 471: -49,-11 + 472: -48,-11 + 473: -42,-11 + 474: -37,-11 - node: color: '#C3C3C3FF' id: BrickTileSteelLineS decals: - 888: -33,-33 - 907: -33,-30 - 911: -34,-33 - 916: -37,-30 - 924: -35,-28 - 925: -36,-30 + 741: -33,-33 + 760: -33,-30 + 764: -34,-33 + 769: -37,-30 + 777: -35,-28 + 778: -36,-30 - node: color: '#D381C9E5' id: BrickTileSteelLineS decals: - 520: -13,-20 - 533: -17,-28 - 534: -16,-28 - 535: -15,-28 - 536: -14,-28 - 538: -5,-33 - 539: -6,-33 - 542: -11,-32 - 545: -13,-31 + 414: -13,-20 + 427: -17,-28 + 428: -16,-28 + 429: -15,-28 + 430: -14,-28 + 432: -5,-33 + 433: -6,-33 + 436: -11,-32 + 439: -13,-31 - node: color: '#D381C9FF' id: BrickTileSteelLineS decals: - 678: -9,-24 + 547: -9,-24 - node: color: '#FFFFFFFF' id: BrickTileSteelLineS decals: - 629: 57,5 - 630: 56,5 - 769: 26,19 - 770: 27,19 - 771: 28,19 + 498: 57,5 + 499: 56,5 + 622: 26,19 + 623: 27,19 + 624: 28,19 - node: zIndex: 1 color: '#FFFFFFFF' id: BrickTileSteelLineS decals: - 601: -48,-11 - 602: -49,-11 - 603: -42,-11 - 604: -37,-11 + 475: -48,-11 + 476: -49,-11 + 477: -42,-11 + 478: -37,-11 - node: color: '#C3C3C3FF' id: BrickTileSteelLineW decals: - 886: -34,-29 - 887: -34,-32 - 889: -37,-27 - 890: -37,-26 - 891: -37,-25 - 892: -37,-24 - 905: -34,-30 - 915: -37,-28 + 739: -34,-29 + 740: -34,-32 + 742: -37,-27 + 743: -37,-26 + 744: -37,-25 + 745: -37,-24 + 758: -34,-30 + 768: -37,-28 - node: color: '#D381C9E5' id: BrickTileSteelLineW decals: - 516: -12,-23 - 517: -12,-22 - 518: -12,-21 + 410: -12,-23 + 411: -12,-22 + 412: -12,-21 - node: color: '#FFFFFFFF' id: BrickTileSteelLineW decals: - 773: 25,20 - 774: 25,21 + 626: 25,20 + 627: 25,21 - node: zIndex: 1 color: '#FFFFFFFF' id: BrickTileSteelLineW decals: - 606: -38,-9 + 480: -38,-9 - node: color: '#689F54FF' id: BrickTileWhiteCornerNe decals: - 957: -21,-5 + 791: -21,-5 - node: color: '#689F54FF' id: BrickTileWhiteCornerNw decals: - 958: -23,-5 + 792: -23,-5 - node: zIndex: 2 color: '#EFB34196' id: BrickTileWhiteCornerSe decals: - 736: -8,7 + 592: -8,7 - node: zIndex: 2 color: '#52B4E996' id: BrickTileWhiteCornerSw decals: - 726: 7,-18 + 588: 7,-18 - node: color: '#A4610696' id: BrickTileWhiteCornerSw decals: - 779: 18,15 + 632: 18,15 - node: zIndex: 2 color: '#EFB34196' id: BrickTileWhiteCornerSw decals: - 737: -14,7 + 593: -14,7 - node: color: '#52B4E996' id: BrickTileWhiteEndE decals: - 643: 49,-12 + 512: 49,-12 - node: color: '#9FED5896' id: BrickTileWhiteEndE decals: - 639: 52,-10 + 508: 52,-10 - node: color: '#A4610696' id: BrickTileWhiteEndE decals: - 646: 52,-8 + 515: 52,-8 - node: color: '#D381C996' id: BrickTileWhiteEndE decals: - 642: 52,-12 + 511: 52,-12 - node: color: '#D4D4D496' id: BrickTileWhiteEndE decals: - 638: 49,-10 + 507: 49,-10 - node: color: '#EFB34196' id: BrickTileWhiteEndE decals: - 631: 49,-8 + 500: 49,-8 - node: color: '#334E6DC8' id: BrickTileWhiteEndN decals: - 633: 57,-8 + 502: 57,-8 - node: color: '#DE3A3A96' id: BrickTileWhiteEndN decals: - 636: 57,-11 + 505: 57,-11 - node: color: '#334E6DC8' id: BrickTileWhiteEndS decals: - 634: 57,-9 + 503: 57,-9 - node: color: '#DE3A3A96' id: BrickTileWhiteEndS decals: - 635: 57,-12 + 504: 57,-12 - node: color: '#52B4E996' id: BrickTileWhiteEndW decals: - 644: 48,-12 + 513: 48,-12 - node: color: '#9FED5896' id: BrickTileWhiteEndW decals: - 640: 51,-10 + 509: 51,-10 - node: color: '#A4610696' id: BrickTileWhiteEndW decals: - 645: 51,-8 + 514: 51,-8 - node: color: '#D381C996' id: BrickTileWhiteEndW decals: - 641: 51,-12 + 510: 51,-12 - node: color: '#D4D4D496' id: BrickTileWhiteEndW decals: - 637: 48,-10 + 506: 48,-10 - node: color: '#EFB34196' id: BrickTileWhiteEndW decals: - 632: 48,-8 + 501: 48,-8 - node: zIndex: 2 color: '#52B4E996' id: BrickTileWhiteInnerSe decals: - 712: 19,-13 + 581: 19,-13 - node: color: '#A4610696' id: BrickTileWhiteInnerSe decals: - 777: 22,15 + 630: 22,15 - node: zIndex: 2 color: '#52B4E996' id: BrickTileWhiteInnerSw decals: - 711: 17,-13 + 580: 17,-13 - node: color: '#A4610696' id: BrickTileWhiteInnerSw decals: - 778: 19,15 + 631: 19,15 - node: zIndex: 2 color: '#FFFFFFFF' id: BrickTileWhiteInnerSw decals: - 707: 20,-18 + 576: 20,-18 - node: zIndex: 2 color: '#52B4E996' id: BrickTileWhiteLineE decals: - 709: 19,-14 + 578: 19,-14 - node: color: '#689F54FF' id: BrickTileWhiteLineE decals: - 955: -21,-8 - 956: -21,-7 + 789: -21,-8 + 790: -21,-7 - node: zIndex: 2 color: '#EFB34196' id: BrickTileWhiteLineE decals: - 738: -8,8 + 594: -8,8 - node: color: '#689F54FF' id: BrickTileWhiteLineN decals: - 959: -22,-5 + 793: -22,-5 - node: color: '#A4610696' id: BrickTileWhiteLineN decals: - 765: 26,10 - 766: 27,10 + 618: 26,10 + 619: 27,10 - node: zIndex: 2 color: '#52B4E996' id: BrickTileWhiteLineS decals: - 720: 8,-18 - 721: 9,-18 - 727: 10,-18 + 582: 8,-18 + 583: 9,-18 + 589: 10,-18 - node: color: '#A4610696' id: BrickTileWhiteLineS decals: - 767: 26,8 - 768: 27,8 - 775: 24,15 - 776: 23,15 - 782: 26,15 - 783: 27,15 - 784: 28,15 + 620: 26,8 + 621: 27,8 + 628: 24,15 + 629: 23,15 + 635: 26,15 + 636: 27,15 + 637: 28,15 - node: zIndex: 2 color: '#EFB34196' id: BrickTileWhiteLineS decals: - 734: -9,7 - 735: -13,7 + 590: -9,7 + 591: -13,7 - node: zIndex: 2 color: '#FFFFFFFF' id: BrickTileWhiteLineS decals: - 704: 17,-18 - 705: 18,-18 - 706: 19,-18 + 573: 17,-18 + 574: 18,-18 + 575: 19,-18 - node: zIndex: 2 color: '#52B4E996' id: BrickTileWhiteLineW decals: - 710: 17,-14 - 722: 7,-17 - 723: 7,-16 - 724: 7,-15 - 725: 7,-14 + 579: 17,-14 + 584: 7,-17 + 585: 7,-16 + 586: 7,-15 + 587: 7,-14 - node: color: '#689F54FF' id: BrickTileWhiteLineW decals: - 952: -23,-7 - 953: -23,-6 - 960: -23,-8 + 787: -23,-7 + 788: -23,-6 + 794: -23,-8 - node: color: '#A4610696' id: BrickTileWhiteLineW decals: - 780: 18,16 - 781: 18,17 + 633: 18,16 + 634: 18,17 - node: color: '#EFB34196' id: BrickTileWhiteLineW decals: - 789: 48,-6 - 790: 48,-5 - 791: 48,-4 - 792: 48,-3 + 642: 48,-6 + 643: 48,-5 + 644: 48,-4 + 645: 48,-3 - node: zIndex: 2 color: '#EFB34196' id: BrickTileWhiteLineW decals: - 739: -14,8 + 595: -14,8 - node: color: '#FFFFFFFF' id: Caution decals: - 655: 58,-5 + 524: 58,-5 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' id: Caution decals: - 116: 53,2 + 81: 53,2 - node: color: '#52B4E996' id: CheckerNWSE decals: - 376: 21,-8 - 377: 21,-7 - 378: 21,-6 - 379: 21,-5 - 380: 22,-8 - 381: 22,-7 - 382: 22,-6 - 383: 22,-5 - 384: 23,-8 - 385: 23,-7 - 386: 23,-6 - 387: 23,-5 - 388: 24,-8 - 389: 24,-7 - 390: 24,-6 - 391: 24,-5 + 270: 21,-8 + 271: 21,-7 + 272: 21,-6 + 273: 21,-5 + 274: 22,-8 + 275: 22,-7 + 276: 22,-6 + 277: 22,-5 + 278: 23,-8 + 279: 23,-7 + 280: 23,-6 + 281: 23,-5 + 282: 24,-8 + 283: 24,-7 + 284: 24,-6 + 285: 24,-5 - node: color: '#D381C996' id: CheckerNWSE decals: - 439: -3,-23 + 333: -3,-23 - node: color: '#D4D4D428' id: CheckerNWSE decals: - 448: -40,4 - 449: -40,5 - 450: -40,6 - 451: -36,4 - 452: -36,5 - 453: -36,6 - 464: -37,0 - 465: -37,1 - 466: -37,2 - 467: -37,8 - 468: -37,9 - 469: -37,10 - 485: -37,-8 - 486: -37,-7 - 487: -37,-6 - 488: -37,-5 + 342: -40,4 + 343: -40,5 + 344: -40,6 + 345: -36,4 + 346: -36,5 + 347: -36,6 + 358: -37,0 + 359: -37,1 + 360: -37,2 + 361: -37,8 + 362: -37,9 + 363: -37,10 + 379: -37,-8 + 380: -37,-7 + 381: -37,-6 + 382: -37,-5 - node: color: '#FFFFFFFF' id: Delivery decals: - 541: -8,-33 - 664: -1,-31 + 435: -8,-33 + 533: -1,-31 - node: color: '#FFFFFFFF' id: DirtHeavy decals: - 294: -16,10 - 295: -17,11 + 259: -16,10 + 260: -17,11 - node: cleanable: True color: '#FFFFFFFF' id: DirtHeavy decals: - 499: -24,-25 + 393: -24,-25 - node: cleanable: True zIndex: 2 color: '#FFFFFFFF' id: DirtHeavy decals: - 744: -20,10 - 748: -20,9 - 749: -18,9 + 597: -20,10 + 601: -20,9 + 602: -18,9 - node: cleanable: True zIndex: 2 color: '#FFFFFFFF' id: DirtHeavyMonotile decals: - 747: -20,8 + 600: -20,8 - node: color: '#FFFFFFFF' id: DirtLight decals: - 298: -18,10 - 299: -17,9 + 263: -18,10 + 264: -17,9 - node: cleanable: True color: '#FFFFFFFF' @@ -2306,42 +2436,42 @@ entities: 69: 34,-5 70: 33,0 71: 7,5 - 118: 52,1 - 119: 53,3 - 120: 57,4 - 121: 45,5 - 122: 35,2 - 470: -40,0 - 471: -36,1 - 472: -38,7 - 473: -40,8 - 474: -38,-4 - 475: -36,-8 - 476: -24,-9 - 477: -24,3 - 478: -25,2 - 479: -7,3 - 481: -36,8 - 482: -38,9 - 490: -23,-24 - 491: -25,-23 - 492: -23,-22 - 493: -25,-25 - 494: -24,-24 - 495: -24,-22 + 83: 52,1 + 84: 53,3 + 85: 57,4 + 86: 45,5 + 87: 35,2 + 364: -40,0 + 365: -36,1 + 366: -38,7 + 367: -40,8 + 368: -38,-4 + 369: -36,-8 + 370: -24,-9 + 371: -24,3 + 372: -25,2 + 373: -7,3 + 375: -36,8 + 376: -38,9 + 384: -23,-24 + 385: -25,-23 + 386: -23,-22 + 387: -25,-25 + 388: -24,-24 + 389: -24,-22 - node: cleanable: True zIndex: 2 color: '#FFFFFFFF' id: DirtLight decals: - 745: -19,9 + 598: -19,9 - node: color: '#FFFFFFFF' id: DirtMedium decals: - 296: -17,10 - 297: -18,8 + 261: -17,10 + 262: -18,8 - node: cleanable: True color: '#FFFFFFFF' @@ -2350,68 +2480,68 @@ entities: 43: 26,17 44: 24,17 65: 37,6 - 117: 53,1 - 480: -35,8 - 496: -23,-25 - 497: -25,-22 - 498: -25,-24 + 82: 53,1 + 374: -35,8 + 390: -23,-25 + 391: -25,-22 + 392: -25,-24 - node: cleanable: True zIndex: 2 color: '#FFFFFFFF' id: DirtMedium decals: - 743: -19,10 - 746: -19,8 + 596: -19,10 + 599: -19,8 - node: color: '#52B4E996' id: FullTileOverlayGreyscale decals: - 132: 13,-7 - 407: 10,-7 - 408: 9,-7 - 423: 10,-10 - 424: 10,-9 - 425: 9,-10 - 426: 10,-11 - 427: 11,-10 + 97: 13,-7 + 301: 10,-7 + 302: 9,-7 + 317: 10,-10 + 318: 10,-9 + 319: 9,-10 + 320: 10,-11 + 321: 11,-10 - node: zIndex: 2 color: '#52B4E996' id: FullTileOverlayGreyscale decals: - 691: 9,-3 - 692: 9,-2 - 693: 10,-2 - 694: 8,-2 - 695: 9,-1 + 560: 9,-3 + 561: 9,-2 + 562: 10,-2 + 563: 8,-2 + 564: 9,-1 - node: color: '#EFB34196' id: FullTileOverlayGreyscale decals: - 213: 36,3 - 214: 36,4 - 215: 36,5 - 300: 30,3 + 178: 36,3 + 179: 36,4 + 180: 36,5 + 265: 30,3 - node: color: '#52B4E996' id: HalfTileOverlayGreyscale decals: - 123: 19,-5 - 124: 18,-5 - 125: 17,-5 - 126: 16,-5 - 127: 15,-5 - 128: 14,-5 - 152: 6,1 - 153: 7,1 - 154: 8,1 - 155: 9,1 - 156: 10,1 - 157: 11,1 - 409: 9,-8 - 410: 10,-8 - 411: 11,-8 + 88: 19,-5 + 89: 18,-5 + 90: 17,-5 + 91: 16,-5 + 92: 15,-5 + 93: 14,-5 + 117: 6,1 + 118: 7,1 + 119: 8,1 + 120: 9,1 + 121: 10,1 + 122: 11,1 + 303: 9,-8 + 304: 10,-8 + 305: 11,-8 - node: color: '#A4610696' id: HalfTileOverlayGreyscale @@ -2424,105 +2554,105 @@ entities: color: '#BD575DFF' id: HalfTileOverlayGreyscale decals: - 1016: -9,17 - 1017: -8,17 - 1018: -7,17 - 1045: -11,11 - 1046: -12,11 - 1047: -13,11 + 808: -9,17 + 809: -8,17 + 810: -7,17 + 820: -11,11 + 821: -12,11 + 822: -13,11 - node: color: '#DE3A3A96' id: HalfTileOverlayGreyscale decals: - 168: 0,5 - 169: -1,5 - 170: -2,5 - 171: -4,5 - 172: -3,5 - 173: -7,5 - 174: -8,5 - 175: -9,5 - 176: -10,5 - 177: -11,5 - 178: -12,5 - 179: -13,5 - 180: -14,5 - 181: -15,5 - 182: -16,5 - 183: -17,5 - 184: -18,5 + 133: 0,5 + 134: -1,5 + 135: -2,5 + 136: -4,5 + 137: -3,5 + 138: -7,5 + 139: -8,5 + 140: -9,5 + 141: -10,5 + 142: -11,5 + 143: -12,5 + 144: -13,5 + 145: -14,5 + 146: -15,5 + 147: -16,5 + 148: -17,5 + 149: -18,5 - node: color: '#EFB34196' id: HalfTileOverlayGreyscale decals: 27: 30,-2 - 223: 49,5 - 224: 48,5 - 225: 47,5 - 226: 46,5 - 227: 45,5 - 232: 43,9 - 234: 42,9 - 239: 41,6 - 240: 40,6 - 241: 39,6 - 242: 38,6 + 188: 49,5 + 189: 48,5 + 190: 47,5 + 191: 46,5 + 192: 45,5 + 197: 43,9 + 199: 42,9 + 204: 41,6 + 205: 40,6 + 206: 39,6 + 207: 38,6 - node: color: '#FFD886FF' id: HalfTileOverlayGreyscale decals: - 141: 19,1 - 142: 18,1 - 143: 17,1 - 144: 16,1 - 145: 15,1 - 146: 14,1 + 106: 19,1 + 107: 18,1 + 108: 17,1 + 109: 16,1 + 110: 15,1 + 111: 14,1 - node: color: '#334E6DC8' id: HalfTileOverlayGreyscale180 decals: - 166: 5,30 + 131: 5,30 - node: color: '#52B4E996' id: HalfTileOverlayGreyscale180 decals: - 401: 11,-6 - 402: 10,-6 - 403: 9,-6 - 404: 8,-6 - 405: 7,-6 - 406: 6,-6 - 416: 11,-12 - 417: 10,-12 - 418: 9,-12 - 433: 15,-12 - 434: 16,-12 + 295: 11,-6 + 296: 10,-6 + 297: 9,-6 + 298: 8,-6 + 299: 7,-6 + 300: 6,-6 + 310: 11,-12 + 311: 10,-12 + 312: 9,-12 + 327: 15,-12 + 328: 16,-12 - node: color: '#BD575DFF' id: HalfTileOverlayGreyscale180 decals: - 1004: -7,10 - 1005: -8,10 - 1006: -9,10 - 1042: -11,10 - 1043: -12,10 - 1044: -13,10 + 798: -7,10 + 799: -8,10 + 800: -9,10 + 817: -11,10 + 818: -12,10 + 819: -13,10 - node: color: '#DE3A3A96' id: HalfTileOverlayGreyscale180 decals: - 203: -13,13 - 204: -14,13 - 205: -15,13 + 168: -13,13 + 169: -14,13 + 170: -15,13 - node: color: '#EFB34196' id: HalfTileOverlayGreyscale180 decals: - 161: 34,-5 - 162: 33,-5 - 163: 32,-5 - 164: 31,-5 - 165: 30,-5 + 126: 34,-5 + 127: 33,-5 + 128: 32,-5 + 129: 31,-5 + 130: 30,-5 - node: color: '#334E6DC8' id: HalfTileOverlayGreyscale270 @@ -2531,31 +2661,31 @@ entities: 6: 0,24 7: 0,25 8: 0,26 - 270: 1,16 - 271: 1,17 - 272: 1,18 - 273: 1,19 - 274: 1,20 - 275: 1,21 - 276: 6,7 - 277: 6,8 - 278: 6,9 - 279: 6,10 - 280: 6,11 + 235: 1,16 + 236: 1,17 + 237: 1,18 + 238: 1,19 + 239: 1,20 + 240: 1,21 + 241: 6,7 + 242: 6,8 + 243: 6,9 + 244: 6,10 + 245: 6,11 - node: color: '#52B4E996' id: HalfTileOverlayGreyscale270 decals: - 130: 14,-6 - 131: 14,-7 - 419: 6,-12 - 420: 6,-11 - 421: 6,-9 - 422: 6,-8 - 428: 14,-8 - 429: 14,-9 - 430: 14,-10 - 431: 14,-11 + 95: 14,-6 + 96: 14,-7 + 313: 6,-12 + 314: 6,-11 + 315: 6,-9 + 316: 6,-8 + 322: 14,-8 + 323: 14,-9 + 324: 14,-10 + 325: 14,-11 - node: color: '#A4610696' id: HalfTileOverlayGreyscale270 @@ -2564,18 +2694,18 @@ entities: 10: 12,10 11: 12,11 12: 12,12 - 189: 12,6 - 190: 12,7 + 154: 12,6 + 155: 12,7 - node: color: '#BD575DFF' id: HalfTileOverlayGreyscale270 decals: - 1010: -10,11 - 1011: -10,12 - 1012: -10,13 - 1013: -10,14 - 1014: -10,15 - 1015: -10,16 + 802: -10,11 + 803: -10,12 + 804: -10,13 + 805: -10,14 + 806: -10,15 + 807: -10,16 - node: color: '#DE3A3A96' id: HalfTileOverlayGreyscale270 @@ -2598,53 +2728,53 @@ entities: 25: 29,-2 29: 31,-1 30: 31,0 - 207: 31,6 - 216: 37,2 - 217: 37,3 - 218: 37,4 - 219: 37,5 - 220: 37,6 - 236: 42,8 - 237: 42,7 - 628: 55,2 + 172: 31,6 + 181: 37,2 + 182: 37,3 + 183: 37,4 + 184: 37,5 + 185: 37,6 + 201: 42,8 + 202: 42,7 + 497: 55,2 - node: color: '#FFD886FF' id: HalfTileOverlayGreyscale270 decals: - 148: 14,0 - 149: 14,-1 - 150: 14,-2 - 151: 14,-3 + 113: 14,0 + 114: 14,-1 + 115: 14,-2 + 116: 14,-3 - node: color: '#334E6DC8' id: HalfTileOverlayGreyscale90 decals: - 264: 5,16 - 265: 5,17 - 266: 5,18 - 267: 5,19 - 268: 5,20 - 269: 5,21 - 281: 10,7 - 282: 10,8 - 283: 10,9 - 284: 10,10 - 285: 10,11 + 229: 5,16 + 230: 5,17 + 231: 5,18 + 232: 5,19 + 233: 5,20 + 234: 5,21 + 246: 10,7 + 247: 10,8 + 248: 10,9 + 249: 10,10 + 250: 10,11 - node: color: '#52B4E996' id: HalfTileOverlayGreyscale90 decals: - 133: 12,-6 - 134: 12,-5 - 135: 12,-4 - 136: 12,-3 - 137: 12,-2 - 138: 12,-1 - 139: 12,0 - 140: 12,1 - 413: 12,-9 - 414: 12,-10 - 801: 12,-11 + 98: 12,-6 + 99: 12,-5 + 100: 12,-4 + 101: 12,-3 + 102: 12,-2 + 103: 12,-1 + 104: 12,0 + 105: 12,1 + 307: 12,-9 + 308: 12,-10 + 654: 12,-11 - node: color: '#A4610696' id: HalfTileOverlayGreyscale90 @@ -2652,39 +2782,39 @@ entities: 38: 16,11 39: 16,10 40: 16,9 - 191: 16,7 - 192: 16,6 - 193: 24,13 - 194: 24,12 - 195: 24,11 - 196: 24,10 - 197: 24,9 - 198: 24,8 + 156: 16,7 + 157: 16,6 + 158: 24,13 + 159: 24,12 + 160: 24,11 + 161: 24,10 + 162: 24,9 + 163: 24,8 - node: color: '#BD575DFF' id: HalfTileOverlayGreyscale90 decals: - 964: -5,8 - 1019: -6,16 - 1020: -6,15 - 1026: -5,12 + 797: -5,8 + 811: -6,16 + 812: -6,15 + 816: -5,12 - node: color: '#C05B60FF' id: HalfTileOverlayGreyscale90 decals: - 1096: -5,13 - 1097: -5,11 - 1109: -5,10 + 845: -5,13 + 846: -5,11 + 858: -5,10 - node: color: '#DE3A3A96' id: HalfTileOverlayGreyscale90 decals: 76: -5,6 77: -5,7 - 199: -12,13 - 200: -12,14 - 201: -12,15 - 202: -12,16 + 164: -12,13 + 165: -12,14 + 166: -12,15 + 167: -12,16 - node: color: '#EFB34196' id: HalfTileOverlayGreyscale90 @@ -2695,91 +2825,91 @@ entities: 34: 35,-2 35: 35,-1 36: 35,0 - 208: 35,2 - 209: 35,3 - 210: 35,4 - 211: 35,5 - 212: 35,6 - 221: 50,5 - 229: 44,6 - 245: 29,3 - 246: 29,4 - 247: 29,5 - 248: 29,6 + 173: 35,2 + 174: 35,3 + 175: 35,4 + 176: 35,5 + 177: 35,6 + 186: 50,5 + 194: 44,6 + 210: 29,3 + 211: 29,4 + 212: 29,5 + 213: 29,6 - node: color: '#FFFFFFFF' id: MiniTileDarkLineN decals: - 513: -16,-25 + 407: -16,-25 - node: color: '#D381C9E5' id: MiniTileSteelCornerSe decals: - 525: -14,-23 + 419: -14,-23 - node: color: '#D381C9E5' id: MiniTileSteelCornerSw decals: - 531: -18,-24 + 425: -18,-24 - node: color: '#D381C9E5' id: MiniTileSteelInnerSe decals: - 526: -15,-23 + 420: -15,-23 - node: color: '#D381C9E5' id: MiniTileSteelInnerSw decals: - 532: -17,-24 + 426: -17,-24 - node: color: '#D381C9E5' id: MiniTileSteelLineE decals: - 527: -14,-22 + 421: -14,-22 - node: color: '#D381C9E5' id: MiniTileSteelLineW decals: - 528: -18,-21 - 529: -18,-22 - 530: -18,-23 + 422: -18,-21 + 423: -18,-22 + 424: -18,-23 - node: color: '#FFFFFFFF' id: MiniTileSteelLineW decals: - 1069: -5,-13 - 1070: -5,-12 + 825: -5,-13 + 826: -5,-12 - node: color: '#3AB3DA99' id: MiniTileWhiteInnerSe decals: - 583: -51,-12 - 584: -44,-12 + 457: -51,-12 + 458: -44,-12 - node: color: '#3AB3DA99' id: MiniTileWhiteInnerSw decals: - 582: -46,-12 - 585: -53,-12 - 588: -39,-12 + 456: -46,-12 + 459: -53,-12 + 462: -39,-12 - node: color: '#3AB3DA99' id: MiniTileWhiteLineS decals: - 574: -50,-12 - 575: -49,-12 - 576: -48,-12 - 577: -47,-12 - 578: -43,-12 - 579: -42,-12 - 580: -41,-12 - 581: -40,-12 + 448: -50,-12 + 449: -49,-12 + 450: -48,-12 + 451: -47,-12 + 452: -43,-12 + 453: -42,-12 + 454: -41,-12 + 455: -40,-12 - node: color: '#3AB3DA99' id: MiniTileWhiteLineW decals: - 586: -54,-11 - 587: -54,-10 + 460: -54,-11 + 461: -54,-10 - node: color: '#334E6DC8' id: QuarterTileOverlayGreyscale @@ -2791,39 +2921,39 @@ entities: color: '#52B4E996' id: QuarterTileOverlayGreyscale decals: - 158: 12,1 + 123: 12,1 - node: color: '#D4D4D428' id: QuarterTileOverlayGreyscale decals: - 459: -36,3 - 460: -37,3 - 461: -38,3 - 462: -39,3 - 463: -40,3 + 353: -36,3 + 354: -37,3 + 355: -38,3 + 356: -39,3 + 357: -40,3 - node: color: '#DE3A3A96' id: QuarterTileOverlayGreyscale decals: - 186: 1,5 - 187: -6,5 + 151: 1,5 + 152: -6,5 - node: color: '#EFB34196' id: QuarterTileOverlayGreyscale decals: 28: 31,-2 - 222: 50,5 - 233: 44,9 - 238: 42,6 - 627: 55,1 + 187: 50,5 + 198: 44,9 + 203: 42,6 + 496: 55,1 - node: color: '#52B4E996' id: QuarterTileOverlayGreyscale180 decals: - 435: 19,-11 - 436: 19,-10 - 437: 19,-9 - 438: 19,-8 + 329: 19,-11 + 330: 19,-10 + 331: 19,-9 + 332: 19,-8 - node: color: '#A4610696' id: QuarterTileOverlayGreyscale180 @@ -2833,551 +2963,551 @@ entities: color: '#D4D4D428' id: QuarterTileOverlayGreyscale180 decals: - 454: -37,7 - 455: -38,7 - 456: -39,7 - 457: -40,7 - 458: -36,7 + 348: -37,7 + 349: -38,7 + 350: -39,7 + 351: -40,7 + 352: -36,7 - node: color: '#EFB34196' id: QuarterTileOverlayGreyscale180 decals: - 159: 29,-5 - 230: 44,7 + 124: 29,-5 + 195: 44,7 - node: color: '#52B4E996' id: QuarterTileOverlayGreyscale270 decals: - 129: 14,-5 - 400: 12,-6 + 94: 14,-5 + 294: 12,-6 - node: color: '#C05B60FF' id: QuarterTileOverlayGreyscale270 decals: - 1108: -6,10 + 857: -6,10 - node: color: '#DE3A3A96' id: QuarterTileOverlayGreyscale270 decals: - 206: -12,13 + 171: -12,13 - node: color: '#EFB34196' id: QuarterTileOverlayGreyscale270 decals: - 160: 35,-5 - 235: 42,9 - 626: 55,3 + 125: 35,-5 + 200: 42,9 + 495: 55,3 - node: color: '#FFD886FF' id: QuarterTileOverlayGreyscale270 decals: - 147: 14,1 + 112: 14,1 - node: color: '#334E6DC8' id: QuarterTileOverlayGreyscale90 decals: 3: 4,24 4: 4,25 - 167: 4,23 + 132: 4,23 - node: color: '#A4610696' id: QuarterTileOverlayGreyscale90 decals: 13: 12,12 - 392: 16,5 - 393: 17,5 - 394: 18,5 - 395: 19,5 - 396: 20,5 - 397: 21,5 - 398: 22,5 - 399: 23,5 + 286: 16,5 + 287: 17,5 + 288: 18,5 + 289: 19,5 + 290: 20,5 + 291: 21,5 + 292: 22,5 + 293: 23,5 - node: color: '#DE3A3A96' id: QuarterTileOverlayGreyscale90 decals: - 185: -19,5 - 188: -5,5 + 150: -19,5 + 153: -5,5 - node: color: '#EFB34196' id: QuarterTileOverlayGreyscale90 decals: 26: 29,-2 - 228: 44,5 - 231: 44,9 - 243: 37,6 - 244: 50,4 - 249: 28,6 - 250: 27,6 - 251: 26,6 - 252: 25,6 + 193: 44,5 + 196: 44,9 + 208: 37,6 + 209: 50,4 + 214: 28,6 + 215: 27,6 + 216: 26,6 + 217: 25,6 - node: color: '#8F6CFFAD' id: Rust decals: - 934: -31,-3 - 935: -30,-3 - 936: -30,0 - 937: -31,0 - 938: -31,1 - 939: -30,1 + 781: -31,-3 + 782: -30,-3 + 783: -30,0 + 784: -31,0 + 785: -31,1 + 786: -30,1 - node: color: '#FFFFFFFF' id: StandClear decals: - 502: 21,24 - 589: -52,-12 - 590: -45,-12 - 663: 1,-30 + 396: 21,24 + 463: -52,-12 + 464: -45,-12 + 532: 1,-30 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' id: StandClear decals: - 263: 60,2 + 228: 60,2 - node: color: '#BD575DFF' id: ThreeQuarterTileOverlayGreyscale decals: - 1023: -10,17 - 1049: -14,11 + 815: -10,17 + 824: -14,11 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale180 decals: - 415: 12,-12 + 309: 12,-12 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale270 decals: - 432: 14,-12 + 326: 14,-12 - node: color: '#BD575DFF' id: ThreeQuarterTileOverlayGreyscale270 decals: - 1009: -10,10 - 1048: -14,10 + 801: -10,10 + 823: -14,10 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale90 decals: - 412: 12,-8 + 306: 12,-8 - node: color: '#BD575DFF' id: ThreeQuarterTileOverlayGreyscale90 decals: - 1021: -5,14 - 1022: -6,17 + 813: -5,14 + 814: -6,17 - node: color: '#FF0000FF' id: WarnBox decals: - 842: 69,2 + 695: 69,2 - node: color: '#FFFFFFFF' id: WarnBox decals: - 375: -26,24 + 269: -26,24 - node: color: '#FF0000FF' id: WarnCornerNE decals: - 845: 68,3 + 698: 68,3 - node: color: '#FFFFFFFF' id: WarnCornerNE decals: - 793: -41,-6 + 646: -41,-6 - node: color: '#FF0000FF' id: WarnCornerNW decals: - 846: 66,3 + 699: 66,3 - node: color: '#FFFFFFFF' id: WarnCornerNW decals: - 794: -43,-6 + 647: -43,-6 - node: color: '#FF0000FF' id: WarnCornerSE decals: - 844: 68,1 + 697: 68,1 - node: color: '#FFFFFFFF' id: WarnCornerSE decals: - 795: -41,-4 + 648: -41,-4 - node: color: '#FF0000FF' id: WarnCornerSW decals: - 843: 66,1 + 696: 66,1 - node: color: '#FFFFFFFF' id: WarnCornerSW decals: - 796: -43,-4 + 649: -43,-4 - node: color: '#FFFFFFFF' id: WarnEndE decals: - 800: 12,-12 + 653: 12,-12 - node: color: '#FF0000FF' id: WarnEndN decals: - 841: 70,3 + 694: 70,3 - node: color: '#FF0000FF' id: WarnEndS decals: - 840: 70,2 + 693: 70,2 - node: color: '#FFFFFFFF' id: WarnEndW decals: - 799: 11,-12 + 652: 11,-12 - node: color: '#C3C3C3FF' id: WarnLineE decals: - 914: -36,-33 + 767: -36,-33 - node: color: '#FF0000FF' id: WarnLineE decals: - 814: 60,7 - 815: 60,6 - 847: 68,2 + 667: 60,7 + 668: 60,6 + 700: 68,2 - node: color: '#FFFFFFFF' id: WarnLineE decals: - 548: -15,-30 - 549: -15,-31 - 647: 54,-4 - 648: 54,-5 - 649: 54,-6 - 803: 57,7 - 804: 57,6 - 805: 57,8 - 806: 57,5 - 807: 57,4 - 808: 57,3 - 809: 57,2 - 810: 57,1 - 811: 57,0 - 961: -21,-6 + 442: -15,-30 + 443: -15,-31 + 516: 54,-4 + 517: 54,-5 + 518: 54,-6 + 656: 57,7 + 657: 57,6 + 658: 57,8 + 659: 57,5 + 660: 57,4 + 661: 57,3 + 662: 57,2 + 663: 57,1 + 664: 57,0 + 795: -21,-6 - node: color: '#FF0000FF' id: WarnLineN decals: - 835: 62,0 - 836: 63,0 - 837: 63,5 - 838: 62,5 - 839: 67,1 + 688: 62,0 + 689: 63,0 + 690: 63,5 + 691: 62,5 + 692: 67,1 - node: color: '#FFFFFFFF' id: WarnLineN decals: - 510: 20,26 - 511: 21,26 - 512: 22,26 - 650: 56,-4 - 651: 57,-4 - 652: 58,-4 - 653: 59,-4 - 654: 60,-4 - 665: -3,-29 - 666: -2,-29 - 667: -1,-29 - 668: 0,-29 - 797: -42,-4 - 850: 70,5 + 404: 20,26 + 405: 21,26 + 406: 22,26 + 519: 56,-4 + 520: 57,-4 + 521: 58,-4 + 522: 59,-4 + 523: 60,-4 + 534: -3,-29 + 535: -2,-29 + 536: -1,-29 + 537: 0,-29 + 650: -42,-4 + 703: 70,5 - node: color: '#C3C3C3FF' id: WarnLineS decals: - 912: -34,-33 - 913: -36,-33 - 920: -37,-30 - 921: -37,-29 + 765: -34,-33 + 766: -36,-33 + 773: -37,-30 + 774: -37,-29 - node: color: '#FF0000FF' id: WarnLineS decals: - 816: 62,10 - 817: 62,8 - 818: 62,9 - 819: 62,7 - 820: 62,6 - 821: 62,5 - 822: 62,4 - 823: 62,3 - 824: 62,2 - 825: 62,1 - 826: 62,0 - 827: 62,-1 - 828: 62,-2 - 829: 62,-3 - 830: 62,-4 - 848: 66,2 + 669: 62,10 + 670: 62,8 + 671: 62,9 + 672: 62,7 + 673: 62,6 + 674: 62,5 + 675: 62,4 + 676: 62,3 + 677: 62,2 + 678: 62,1 + 679: 62,0 + 680: 62,-1 + 681: 62,-2 + 682: 62,-3 + 683: 62,-4 + 701: 66,2 - node: color: '#FFFFFFFF' id: WarnLineS decals: - 550: -17,-31 - 551: -17,-30 - 752: -15,18 - 753: -15,19 - 754: -15,20 - 755: -15,21 - 812: 59,7 - 813: 59,6 - 962: -19,-6 + 444: -17,-31 + 445: -17,-30 + 605: -15,18 + 606: -15,19 + 607: -15,20 + 608: -15,21 + 665: 59,7 + 666: 59,6 + 796: -19,-6 - node: color: '#FF0000FF' id: WarnLineW decals: - 831: 62,4 - 832: 63,4 - 833: 63,-1 - 834: 62,-1 - 849: 67,3 + 684: 62,4 + 685: 63,4 + 686: 63,-1 + 687: 62,-1 + 702: 67,3 - node: color: '#FFFFFFFF' id: WarnLineW decals: - 500: 21,24 - 501: 22,24 - 503: 20,24 - 798: -42,-6 + 394: 21,24 + 395: 22,24 + 397: 20,24 + 651: -42,-6 - node: angle: -1.5707963267948966 rad color: '#FFFFFFFF' id: WarningLine decals: - 440: -40,0 - 441: -40,1 - 442: -40,2 - 443: -40,8 - 444: -40,9 - 445: -40,10 + 334: -40,0 + 335: -40,1 + 336: -40,2 + 337: -40,8 + 338: -40,9 + 339: -40,10 - node: color: '#FFFFFFFF' id: WarningLine decals: - 253: 46,7 - 254: 47,7 - 255: 48,7 - 256: 49,7 - 257: 50,7 - 286: 8,7 - 290: 7,7 - 291: 9,7 + 218: 46,7 + 219: 47,7 + 220: 48,7 + 221: 49,7 + 222: 50,7 + 251: 8,7 + 255: 7,7 + 256: 9,7 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' id: WarningLine decals: - 113: 53,1 - 114: 53,2 - 115: 53,3 - 258: 60,0 - 259: 60,1 - 260: 60,2 - 261: 60,3 - 262: 60,4 - 372: -1,16 - 373: -1,17 - 374: -1,18 + 78: 53,1 + 79: 53,2 + 80: 53,3 + 223: 60,0 + 224: 60,1 + 225: 60,2 + 226: 60,3 + 227: 60,4 + 266: -1,16 + 267: -1,17 + 268: -1,18 - node: angle: 3.141592653589793 rad color: '#FFFFFFFF' id: WarningLine decals: - 287: 8,11 + 252: 8,11 - node: angle: -1.5707963267948966 rad color: '#FFFFFFFF' id: WarningLineCorner decals: - 446: -40,3 + 340: -40,3 - node: color: '#FFFFFFFF' id: WarningLineCorner decals: - 293: 6,7 + 258: 6,7 - node: angle: 3.141592653589793 rad color: '#FFFFFFFF' id: WarningLineCorner decals: - 288: 9,11 + 253: 9,11 - node: angle: -1.5707963267948966 rad color: '#FFFFFFFF' id: WarningLineCornerFlipped decals: - 447: -40,7 + 341: -40,7 - node: color: '#FFFFFFFF' id: WarningLineCornerFlipped decals: - 292: 10,7 + 257: 10,7 - node: angle: 3.141592653589793 rad color: '#FFFFFFFF' id: WarningLineCornerFlipped decals: - 289: 7,11 + 254: 7,11 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerNe decals: - 852: 0,1 - 1081: -18,-11 - 1095: 0,14 + 705: 0,1 + 830: -18,-11 + 844: 0,14 - node: zIndex: 1 color: '#FFFFFFFF' id: WoodTrimThinCornerNe decals: - 625: -4,-6 + 494: -4,-6 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerNw decals: - 851: -10,1 - 1080: -21,-11 - 1094: -4,14 + 704: -10,1 + 829: -21,-11 + 843: -4,14 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerSe decals: - 853: 0,-7 - 1082: -18,-13 - 1098: 0,10 + 706: 0,-7 + 831: -18,-13 + 847: 0,10 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerSw decals: - 855: -10,-2 - 1083: -21,-13 - 1093: -4,10 + 708: -10,-2 + 832: -21,-13 + 842: -4,10 - node: zIndex: 2 color: '#FFFFFFFF' id: WoodTrimThinCornerSw decals: - 750: -37,19 + 603: -37,19 - node: color: '#FFFFFFFF' id: WoodTrimThinInnerSw decals: - 854: -8,-2 + 707: -8,-2 - node: color: '#FFFFFFFF' id: WoodTrimThinLineE decals: - 867: 0,0 - 868: 0,-1 - 869: 0,-2 - 870: 0,-3 - 871: 0,-5 - 872: 0,-4 - 873: 0,-6 - 1084: -18,-12 - 1101: 0,11 - 1102: 0,12 - 1103: 0,13 + 720: 0,0 + 721: 0,-1 + 722: 0,-2 + 723: 0,-3 + 724: 0,-5 + 725: 0,-4 + 726: 0,-6 + 833: -18,-12 + 850: 0,11 + 851: 0,12 + 852: 0,13 - node: zIndex: 1 color: '#FFFFFFFF' id: WoodTrimThinLineE decals: - 624: -4,-7 - 762: 27,10 - 763: 27,9 - 764: 27,8 + 493: -4,-7 + 615: 27,10 + 616: 27,9 + 617: 27,8 - node: zIndex: 2 color: '#FFFFFFFF' id: WoodTrimThinLineE decals: - 708: 20,-12 + 577: 20,-12 - node: color: '#FFFFFFFF' id: WoodTrimThinLineN decals: - 858: -8,1 - 859: -9,1 - 860: -7,1 - 861: -6,1 - 862: -5,1 - 863: -4,1 - 864: -3,1 - 865: -2,1 - 866: -1,1 - 1085: -19,-11 - 1086: -20,-11 - 1104: -1,14 - 1105: -2,14 - 1106: -3,14 + 711: -8,1 + 712: -9,1 + 713: -7,1 + 714: -6,1 + 715: -5,1 + 716: -4,1 + 717: -3,1 + 718: -2,1 + 719: -1,1 + 834: -19,-11 + 835: -20,-11 + 853: -1,14 + 854: -2,14 + 855: -3,14 - node: zIndex: 1 color: '#FFFFFFFF' id: WoodTrimThinLineN decals: - 620: -8,-6 - 621: -7,-6 - 622: -6,-6 - 623: -5,-6 + 489: -8,-6 + 490: -7,-6 + 491: -6,-6 + 492: -5,-6 - node: color: '#FFFFFFFF' id: WoodTrimThinLineS decals: - 785: 37,0 - 786: 38,0 - 787: 39,0 - 788: 40,0 - 874: -1,-7 - 875: -2,-7 - 876: -3,-7 - 880: -9,-2 - 1088: -20,-13 - 1089: -19,-13 - 1099: -1,10 - 1100: -2,10 - 1107: -3,10 + 638: 37,0 + 639: 38,0 + 640: 39,0 + 641: 40,0 + 727: -1,-7 + 728: -2,-7 + 729: -3,-7 + 733: -9,-2 + 837: -20,-13 + 838: -19,-13 + 848: -1,10 + 849: -2,10 + 856: -3,10 - node: zIndex: 2 color: '#FFFFFFFF' id: WoodTrimThinLineS decals: - 751: -36,19 + 604: -36,19 - node: color: '#FFFFFFFF' id: WoodTrimThinLineW decals: - 856: -10,-1 - 857: -10,0 - 877: -8,-5 - 878: -8,-4 - 879: -8,-3 - 1078: -14,-12 - 1079: -14,-11 - 1087: -21,-12 - 1090: -4,13 - 1091: -4,12 - 1092: -4,11 + 709: -10,-1 + 710: -10,0 + 730: -8,-5 + 731: -8,-4 + 732: -8,-3 + 827: -14,-12 + 828: -14,-11 + 836: -21,-12 + 839: -4,13 + 840: -4,12 + 841: -4,11 - node: color: '#FFFF00FF' id: radiation decals: - 802: 59,7 + 655: 59,7 - type: OccluderTree - type: SpreaderGrid - type: Shuttle @@ -3390,6 +3520,7 @@ entities: - type: MetaData - type: Transform - type: Map + mapPaused: True - type: PhysicsMap - type: GridTree - type: MovedGrids @@ -4121,7 +4252,7 @@ entities: pos: 3.5,22.5 parent: 31 - type: Door - secondsUntilStateChange: -17127.416 + secondsUntilStateChange: -17204.738 state: Opening - type: DeviceLinkSource lastSignals: @@ -7743,6 +7874,26 @@ entities: - type: Transform pos: -23.5,-13.5 parent: 31 + - uid: 420 + components: + - type: Transform + pos: -30.5,0.5 + parent: 31 + - uid: 421 + components: + - type: Transform + pos: -30.5,-0.5 + parent: 31 + - uid: 422 + components: + - type: Transform + pos: -32.5,-9.5 + parent: 31 + - uid: 437 + components: + - type: Transform + pos: -32.5,-10.5 + parent: 31 - uid: 528 components: - type: Transform @@ -78820,6 +78971,9 @@ entities: rot: 1.5707963267948966 rad pos: 50.5,-24.5 parent: 31 + - type: DeviceLinkSink + links: + - 1234 - uid: 8689 components: - type: Transform From 48413d6a435de700197a4f6ceb1290d61f5130b4 Mon Sep 17 00:00:00 2001 From: SimpleStation Changelogs Date: Thu, 19 Dec 2024 22:52:59 +0000 Subject: [PATCH 03/11] Automatic Changelog Update (#1359) --- Resources/Changelog/Changelog.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 96e64517ca..7976a09bbe 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -8713,3 +8713,10 @@ Entries: id: 6583 time: '2024-12-18T01:32:32.0000000+00:00' url: https://github.com/Simple-Station/Einstein-Engines/pull/1357 +- author: VMSolidus + changes: + - type: Fix + message: Fixed the Saltern bridge being a hard vacuum at roundstart. + id: 6584 + time: '2024-12-19T22:52:32.0000000+00:00' + url: https://github.com/Simple-Station/Einstein-Engines/pull/1359 From 452b9113f61790e8258b95904361de5ed34a034f Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sat, 21 Dec 2024 13:02:27 -0500 Subject: [PATCH 04/11] Loadouts Debloating (Colorable Items) (#1364) # Description This PR cuts down significantly on Loadouts bloat by removing all specific color versions of colorable items from the loadouts. I left the original items untouched for compatibility reasons since certain things in the game still need to be able to spawn a "Blue jumpsuit" etc. Additionally, to help aid in clarity for players, I've added localizations for all the generic colorable items so that they have (colorable) in the loadout names, so that players can tell which items have the option without needing to click into the customize button on every item.

Media

![image](https://github.com/user-attachments/assets/7ab30002-c7d4-4eeb-b018-45a9fda80ae6)

# Changelog :cl: - add: Added labels to all generic colorable items in loadouts, so that players can see which items have custom colors as customization options. - remove: Removed all 'specific color' variants of colorable items from Loadouts, such as "Blue Jumpsuit" when a colorable jumpsuit exists. --- .../Locale/en-US/loadouts/generic/back.ftl | 3 + .../en-US/loadouts/{ => generic}/eyes.ftl | 2 + .../Locale/en-US/loadouts/generic/hands.ftl | 1 + .../Locale/en-US/loadouts/generic/head.ftl | 12 + .../en-US/loadouts/{ => generic}/items.ftl | 7 + .../Locale/en-US/loadouts/generic/neck.ftl | 4 + .../en-US/loadouts/generic/outerClothing.ftl | 11 + .../en-US/loadouts/{ => generic}/shoes.ftl | 6 + .../Locale/en-US/loadouts/generic/uniform.ftl | 12 + Resources/Locale/en-US/loadouts/head.ftl | 2 - .../jobs/engineering/uncategorized.ftl | 1 + .../en-US/loadouts/jobs/heads/captain.ftl | 3 + .../loadouts/jobs/heads/headOfPersonnel.ftl | 2 + .../jobs/logistics/salvageSpecialist.ftl | 14 + Resources/Locale/en-US/loadouts/neck.ftl | 0 .../Locale/en-US/loadouts/outerClothing.ftl | 5 - Resources/Locale/en-US/loadouts/uniform.ftl | 1 - .../Generic/gloveGroup.yml | 18 - .../CharacterItemGroups/Generic/headGroup.yml | 54 -- .../Generic/itemGroups.yml | 56 -- .../CharacterItemGroups/Generic/neckGroup.yml | 26 - .../CharacterItemGroups/Generic/shoeGroup.yml | 20 - .../Entities/Clothing/Head/soft.yml | 4 +- .../Prototypes/Loadouts/Generic/hands.yml | 99 ---- .../Prototypes/Loadouts/Generic/head.yml | 351 ------------ .../Prototypes/Loadouts/Generic/neck.yml | 214 -------- .../Prototypes/Loadouts/Generic/shoes.yml | 112 ---- .../Prototypes/Loadouts/Generic/uniform.yml | 515 ------------------ 28 files changed, 80 insertions(+), 1475 deletions(-) create mode 100644 Resources/Locale/en-US/loadouts/generic/back.ftl rename Resources/Locale/en-US/loadouts/{ => generic}/eyes.ftl (84%) create mode 100644 Resources/Locale/en-US/loadouts/generic/hands.ftl create mode 100644 Resources/Locale/en-US/loadouts/generic/head.ftl rename Resources/Locale/en-US/loadouts/{ => generic}/items.ftl (91%) create mode 100644 Resources/Locale/en-US/loadouts/generic/neck.ftl create mode 100644 Resources/Locale/en-US/loadouts/generic/outerClothing.ftl rename Resources/Locale/en-US/loadouts/{ => generic}/shoes.ftl (83%) create mode 100644 Resources/Locale/en-US/loadouts/generic/uniform.ftl delete mode 100644 Resources/Locale/en-US/loadouts/head.ftl create mode 100644 Resources/Locale/en-US/loadouts/jobs/engineering/uncategorized.ftl create mode 100644 Resources/Locale/en-US/loadouts/jobs/logistics/salvageSpecialist.ftl delete mode 100644 Resources/Locale/en-US/loadouts/neck.ftl delete mode 100644 Resources/Locale/en-US/loadouts/outerClothing.ftl delete mode 100644 Resources/Locale/en-US/loadouts/uniform.ftl diff --git a/Resources/Locale/en-US/loadouts/generic/back.ftl b/Resources/Locale/en-US/loadouts/generic/back.ftl new file mode 100644 index 0000000000..2925981849 --- /dev/null +++ b/Resources/Locale/en-US/loadouts/generic/back.ftl @@ -0,0 +1,3 @@ +loadout-name-LoadoutBackpack = grey backpack (colorable) +loadout-name-LoadoutBackpackDuffel = grey duffelbag (colorable) +loadout-name-LoadoutBackpackSatchel = grey satchel (colorable) diff --git a/Resources/Locale/en-US/loadouts/eyes.ftl b/Resources/Locale/en-US/loadouts/generic/eyes.ftl similarity index 84% rename from Resources/Locale/en-US/loadouts/eyes.ftl rename to Resources/Locale/en-US/loadouts/generic/eyes.ftl index 93c4d9faa6..4d34519047 100644 --- a/Resources/Locale/en-US/loadouts/eyes.ftl +++ b/Resources/Locale/en-US/loadouts/generic/eyes.ftl @@ -3,3 +3,5 @@ loadout-description-LoadoutEyesBlindfold = Why would you want this? loadout-name-LoadoutItemBlindfoldFake = "blind"fold loadout-description-LoadoutItemBlindfoldFake = This product may not work as advertised. + +loadout-name-LoadoutEyesGlasses = glasses (colorable) diff --git a/Resources/Locale/en-US/loadouts/generic/hands.ftl b/Resources/Locale/en-US/loadouts/generic/hands.ftl new file mode 100644 index 0000000000..d9df439ce5 --- /dev/null +++ b/Resources/Locale/en-US/loadouts/generic/hands.ftl @@ -0,0 +1 @@ +loadout-name-LoadoutHandsColorWhite = gloves (colorable) diff --git a/Resources/Locale/en-US/loadouts/generic/head.ftl b/Resources/Locale/en-US/loadouts/generic/head.ftl new file mode 100644 index 0000000000..efd13b0084 --- /dev/null +++ b/Resources/Locale/en-US/loadouts/generic/head.ftl @@ -0,0 +1,12 @@ +loadout-description-LoadoutHeadBeaverHat = Gentlemen. +loadout-description-LoadoutHeadTophat = A stylish black tophat. + +loadout-name-LoadoutHeadFedoraWhite = fedora (colorable) +loadout-name-LoadoutHeadHatCowboyWhite = cowboy hat (colorable) +loadout-name-LoadoutHeadHatMimesoft = baseball cap (colorable) +loadout-name-LoadoutHeadHatMimesoftFlipped = baseball cap (colorable, flipped) +loadout-name-LoadoutHeadHijabColorable = hijab (colorable) +loadout-name-LoadoutHeadTurbanColorable = turban (colorable) +loadout-name-LoadoutHeadKippahColorable = kippah (colorable) +loadout-name-LoadoutHeadTinfoil = tinfoil hat (colorable) +loadout-name-LoadoutHeadHatCowboyBountyHunter = bounty hunter hat (colorable) diff --git a/Resources/Locale/en-US/loadouts/items.ftl b/Resources/Locale/en-US/loadouts/generic/items.ftl similarity index 91% rename from Resources/Locale/en-US/loadouts/items.ftl rename to Resources/Locale/en-US/loadouts/generic/items.ftl index c2ec9a1c84..ac52b8be22 100644 --- a/Resources/Locale/en-US/loadouts/items.ftl +++ b/Resources/Locale/en-US/loadouts/generic/items.ftl @@ -35,3 +35,10 @@ loadout-name-LoadoutItemBoxSurvivalSecurity = survival box (security) loadout-name-LoadoutItemBoxSurvivalBrigmedic = survival box (corpsman) loadout-name-LoadoutItemBoxSurvivalMedical = survival box (medical) loadout-name-LoadoutItemBoxHug = box of hugs (clown) + +loadout-name-LoadoutItemLighter = lighter (colorable) +loadout-name-LoadoutItemLighterCheap = cheap lighter (colorable) +loadout-name-LoadoutItemLighterFlippo = flippo lighter (colorable) +loadout-name-LoadoutItemDrinkShinyFlask = shiny flask (colorable) +loadout-name-LoadoutItemDrinkLithiumFlask = lithium flask (colorable) +loadout-name-LoadoutItemDrinkVacuumFlask = vacuum flask (colorable) diff --git a/Resources/Locale/en-US/loadouts/generic/neck.ftl b/Resources/Locale/en-US/loadouts/generic/neck.ftl new file mode 100644 index 0000000000..8a9abb7666 --- /dev/null +++ b/Resources/Locale/en-US/loadouts/generic/neck.ftl @@ -0,0 +1,4 @@ +loadout-name-LoadoutNeckOldMantle = old mantle (colorable) +loadout-name-LoadoutNeckUnathiMantle = unathi mantle (colorable) +loadout-name-LoadoutNeckTieWhite = suit tie (colorable) +loadout-name-LoadoutNeckBedsheetWhite = bedsheet (colorable) diff --git a/Resources/Locale/en-US/loadouts/generic/outerClothing.ftl b/Resources/Locale/en-US/loadouts/generic/outerClothing.ftl new file mode 100644 index 0000000000..e312968b8e --- /dev/null +++ b/Resources/Locale/en-US/loadouts/generic/outerClothing.ftl @@ -0,0 +1,11 @@ +loadout-description-LoadoutOuterGhostSheet = Spooky... +loadout-description-LoadoutOuterCoatBomberjacket = A sleek bomber jacket. +loadout-description-LoadoutOuterCoatHoodieBlack = A warm hoodie. +loadout-description-LoadoutOuterCoatHoodieGrey = A warm hoodie. +loadout-description-LoadoutOuterCoatWinterCoat = For keeping nice and snug. + +loadout-name-LoadoutOuterCoatHoodieGrey = grey hoodie (colorable) +loadout-name-LoadoutOuterCoatWinterCoat = winter coat (colorable) +loadout-name-LoadoutOuterCoatHyenhSweater = sweater (colorable) +loadout-name-LoadoutOuterWinterCoatLong = long winter coat (colorable) +loadout-name-LoadoutOuterCoatMNKWhiteHoodie = MNK hoodie (colorable) diff --git a/Resources/Locale/en-US/loadouts/shoes.ftl b/Resources/Locale/en-US/loadouts/generic/shoes.ftl similarity index 83% rename from Resources/Locale/en-US/loadouts/shoes.ftl rename to Resources/Locale/en-US/loadouts/generic/shoes.ftl index 79a8dd9c43..15631952f7 100644 --- a/Resources/Locale/en-US/loadouts/shoes.ftl +++ b/Resources/Locale/en-US/loadouts/generic/shoes.ftl @@ -8,3 +8,9 @@ loadout-description-LoadoutShoesRed = Embrace the spirit of exploration with the loadout-description-LoadoutShoesWhite = Elevate your style with these pristine white shoes, a symbol of innovation and progress. loadout-description-LoadoutShoesYellow = Light up the space station with these radiant yellow shoes, bringing a burst of energy to your every step. loadout-description-LoadoutShoesSlippersDuck = Quack up your downtime with these adorable duck slippers that waddle the line between comfort and quirkiness. + +loadout-name-LoadoutShoesWhite = shoes (colorable) +loadout-name-LoadoutShoesBootsCowboyWhite = cowboy boots (colorable) +loadout-name-LoadoutShoesBootsCowboyFancy = fancy cowboy boots (colorable) +loadout-name-LoadoutShoesMiscWhite = misc shoes (colorable) +loadout-name-LoadoutShoesClothWrap = cloth foot wraps (colorable) diff --git a/Resources/Locale/en-US/loadouts/generic/uniform.ftl b/Resources/Locale/en-US/loadouts/generic/uniform.ftl new file mode 100644 index 0000000000..fa4eccbdb1 --- /dev/null +++ b/Resources/Locale/en-US/loadouts/generic/uniform.ftl @@ -0,0 +1,12 @@ +loadout-description-LoadoutUniformAncientJumpsuit = The legend of the Greytide. + +loadout-name-LoadoutUniformJumpsuitColorWhite = jumpsuit (colorable) +loadout-name-LoadoutUniformJumpskirtColorWhite = jumpskirt (colorable) +loadout-name-LoadoutUniformMartialGi = gi (colorable) +loadout-name-LoadoutClothingJumpsuitKimono = kimono (colorable) +loadout-name-LoadoutClothingMNKOfficeSkirt = MNK office skirt (colorable) +loadout-name-LoadoutClothingMNKUnderGarment = MNK under garment (colorable) +loadout-name-LoadoutClothingMNKGymBra = MNK gym bra (colorable) +loadout-name-LoadoutClothingJumpsuitSuitWhite = business suit (colorable) +loadout-name-LoadoutClothingJumpsuitSuitWhiteAlt = business suit (alt, colorable) +loadout-name-LoadoutClothingJumpsuitSuitWhiteMob = mob suit (colorable) diff --git a/Resources/Locale/en-US/loadouts/head.ftl b/Resources/Locale/en-US/loadouts/head.ftl deleted file mode 100644 index be10f7d2fd..0000000000 --- a/Resources/Locale/en-US/loadouts/head.ftl +++ /dev/null @@ -1,2 +0,0 @@ -loadout-description-LoadoutHeadBeaverHat = Gentlemen. -loadout-description-LoadoutHeadTophat = A stylish black tophat. diff --git a/Resources/Locale/en-US/loadouts/jobs/engineering/uncategorized.ftl b/Resources/Locale/en-US/loadouts/jobs/engineering/uncategorized.ftl new file mode 100644 index 0000000000..1831174bd4 --- /dev/null +++ b/Resources/Locale/en-US/loadouts/jobs/engineering/uncategorized.ftl @@ -0,0 +1 @@ +loadout-name-LoadoutEngineeringHeadHardhatWhite = hardhat (colorable) diff --git a/Resources/Locale/en-US/loadouts/jobs/heads/captain.ftl b/Resources/Locale/en-US/loadouts/jobs/heads/captain.ftl index 27069b6ff8..1cb2a61599 100644 --- a/Resources/Locale/en-US/loadouts/jobs/heads/captain.ftl +++ b/Resources/Locale/en-US/loadouts/jobs/heads/captain.ftl @@ -10,3 +10,6 @@ loadout-description-LoadoutCommandCapHatCapcap = The Captain's cap, pretty nice. loadout-description-LoadoutCommandCapHatBeret = The Captain's beret, very nice. loadout-description-LoadoutCommandCapMaskGas = Why would the captain need this? I don't know, but it looks cool. loadout-description-LoadoutCommandCapItemDrinkFlask = The finest of flasks, for the finest of drinks. + +loadout-name-LoadoutCaptainDrinkFlask = captain's drink flask (colorable) +loadout-name-LoadoutCaptainGlovesInspection = inspection gloves (colorable) diff --git a/Resources/Locale/en-US/loadouts/jobs/heads/headOfPersonnel.ftl b/Resources/Locale/en-US/loadouts/jobs/heads/headOfPersonnel.ftl index 8dc606f65d..5c717e9583 100644 --- a/Resources/Locale/en-US/loadouts/jobs/heads/headOfPersonnel.ftl +++ b/Resources/Locale/en-US/loadouts/jobs/heads/headOfPersonnel.ftl @@ -2,3 +2,5 @@ loadout-description-LoadoutCommandHOPNeckMantle = To show who has the authority loadout-description-LoadoutCommandHOPNeckCloak = To really show who has the authority around here. loadout-description-LoadoutCommandHOPBackIan = A backpack that looks like Ian, how cute! loadout-description-LoadoutCommandHOPHatCap = The HOP's cap, pretty nice. + +loadout-name-LoadoutHeadOfPersonnelGlovesInspection = inspection gloves (colorable) diff --git a/Resources/Locale/en-US/loadouts/jobs/logistics/salvageSpecialist.ftl b/Resources/Locale/en-US/loadouts/jobs/logistics/salvageSpecialist.ftl new file mode 100644 index 0000000000..973c2f2371 --- /dev/null +++ b/Resources/Locale/en-US/loadouts/jobs/logistics/salvageSpecialist.ftl @@ -0,0 +1,14 @@ +loadout-name-LoadoutSalvageBackpackBackpack = salvage backpack (colorable) +loadout-name-LoadoutSalvageBackpackSatchel = salvage satchel (colorable) +loadout-name-LoadoutSalvageBackpackDuffel = salvage duffelbag (colorable) +loadout-name-LoadoutSalvageBeltMilitaryWebbing = military webbing (colorable) +loadout-name-LoadoutSalvageWeaponsCombatKnife = combat knife (colorable) +loadout-name-LoadoutSalvageWeaponsKitchenKnife = kitchen knife (colorable) +loadout-name-LoadoutSalvageWeaponsSurvivalKnife = survival knife (colorable) +loadout-name-LoadoutSalvageWeaponsKukriKnife = kukri (colorable) +loadout-name-LoadoutSalvageWeaponsCleaver = cleaver (colorable) +loadout-name-LoadoutSalvageWeaponsThrowingKnife = throwing knives (x3, colorable) +loadout-name-LoadoutSalvageWeaponsMachete = machete (colorable) +loadout-name-LoadoutSalvageWeaponsCutlass = cutlass (colorable) +loadout-name-LoadoutSalvageWeaponsKatana = katana (colorable) +loadout-name-LoadoutSalvageWeaponsWakizashi = wakizashi (colorable) diff --git a/Resources/Locale/en-US/loadouts/neck.ftl b/Resources/Locale/en-US/loadouts/neck.ftl deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/Resources/Locale/en-US/loadouts/outerClothing.ftl b/Resources/Locale/en-US/loadouts/outerClothing.ftl deleted file mode 100644 index 7dc09f552e..0000000000 --- a/Resources/Locale/en-US/loadouts/outerClothing.ftl +++ /dev/null @@ -1,5 +0,0 @@ -loadout-description-LoadoutOuterGhostSheet = Spooky... -loadout-description-LoadoutOuterCoatBomberjacket = A sleek bomber jacket. -loadout-description-LoadoutOuterCoatHoodieBlack = A warm hoodie. -loadout-description-LoadoutOuterCoatHoodieGrey = A warm hoodie. -loadout-description-LoadoutOuterCoatWinterCoat = For keeping nice and snug. diff --git a/Resources/Locale/en-US/loadouts/uniform.ftl b/Resources/Locale/en-US/loadouts/uniform.ftl deleted file mode 100644 index b32bd92b3a..0000000000 --- a/Resources/Locale/en-US/loadouts/uniform.ftl +++ /dev/null @@ -1 +0,0 @@ -loadout-description-LoadoutUniformAncientJumpsuit = The legend of the Greytide. diff --git a/Resources/Prototypes/CharacterItemGroups/Generic/gloveGroup.yml b/Resources/Prototypes/CharacterItemGroups/Generic/gloveGroup.yml index e8ec6f3d25..f712e18e24 100644 --- a/Resources/Prototypes/CharacterItemGroups/Generic/gloveGroup.yml +++ b/Resources/Prototypes/CharacterItemGroups/Generic/gloveGroup.yml @@ -1,24 +1,6 @@ - type: characterItemGroup id: LoadoutGloves items: - - type: loadout - id: LoadoutHandsColorPurple - - type: loadout - id: LoadoutHandsColorRed - - type: loadout - id: LoadoutHandsColorBlack - - type: loadout - id: LoadoutHandsColorBlue - - type: loadout - id: LoadoutHandsColorBrown - - type: loadout - id: LoadoutHandsColorGray - - type: loadout - id: LoadoutHandsColorGreen - - type: loadout - id: LoadoutHandsColorLightBrown - - type: loadout - id: LoadoutHandsColorOrange - type: loadout id: LoadoutHandsColorWhite - type: loadout diff --git a/Resources/Prototypes/CharacterItemGroups/Generic/headGroup.yml b/Resources/Prototypes/CharacterItemGroups/Generic/headGroup.yml index d5ba07f580..e6bd267b1d 100644 --- a/Resources/Prototypes/CharacterItemGroups/Generic/headGroup.yml +++ b/Resources/Prototypes/CharacterItemGroups/Generic/headGroup.yml @@ -5,28 +5,12 @@ id: LoadoutHeadBeaverHat - type: loadout id: LoadoutHeadTophat - - type: loadout - id: LoadoutHeadFedoraBlack - - type: loadout - id: LoadoutHeadFedoraBrown - - type: loadout - id: LoadoutHeadFedoraGrey - - type: loadout - id: LoadoutHeadFedoraChoc - type: loadout id: LoadoutHeadFedoraWhite - type: loadout id: LoadoutHeadFlatBlack - type: loadout id: LoadoutHeadFlatBrown - - type: loadout - id: LoadoutHeadHatCowboyBrown - - type: loadout - id: LoadoutHeadHatCowboyBlack - - type: loadout - id: LoadoutHeadHatCowboyGrey - - type: loadout - id: LoadoutHeadHatCowboyRed - type: loadout id: LoadoutHeadHatCowboyWhite - type: loadout @@ -37,42 +21,14 @@ id: LoadoutHeadBellhop - type: loadout id: LoadoutHeadPoppy - - type: loadout - id: LoadoutHeadHatBluesoft - - type: loadout - id: LoadoutHeadHatBluesoftFlipped - type: loadout id: LoadoutHeadHatCorpsoft - type: loadout id: LoadoutHeadHatCorpsoftFlipped - - type: loadout - id: LoadoutHeadHatGreensoft - - type: loadout - id: LoadoutHeadHatGreensoftFlipped - - type: loadout - id: LoadoutHeadHatGreysoft - - type: loadout - id: LoadoutHeadHatGreysoftFlipped - type: loadout id: LoadoutHeadHatMimesoft - type: loadout id: LoadoutHeadHatMimesoftFlipped - - type: loadout - id: LoadoutHeadHatOrangesoft - - type: loadout - id: LoadoutHeadHatOrangesoftFlipped - - type: loadout - id: LoadoutHeadHatPurplesoft - - type: loadout - id: LoadoutHeadHatPurplesoftFlipped - - type: loadout - id: LoadoutHeadHatRedsoft - - type: loadout - id: LoadoutHeadHatRedsoftFlipped - - type: loadout - id: LoadoutHeadHatYellowsoft - - type: loadout - id: LoadoutHeadHatYellowsoftFlipped - type: loadout id: LoadoutHeadBandBlack - type: loadout @@ -107,16 +63,6 @@ id: LoadoutHeadBeret - type: loadout id: LoadoutHeadBeretFrench - - type: loadout - id: LoadoutHeadCowboyBrown - - type: loadout - id: LoadoutHeadCowboyBlack - - type: loadout - id: LoadoutHeadCowboyWhite - - type: loadout - id: LoadoutHeadCowboyGrey - - type: loadout - id: LoadoutHeadCowboyRed - type: loadout id: LoadoutHeadHijabColorable - type: loadout diff --git a/Resources/Prototypes/CharacterItemGroups/Generic/itemGroups.yml b/Resources/Prototypes/CharacterItemGroups/Generic/itemGroups.yml index 66b7d32ea7..dcf9bbec8a 100644 --- a/Resources/Prototypes/CharacterItemGroups/Generic/itemGroups.yml +++ b/Resources/Prototypes/CharacterItemGroups/Generic/itemGroups.yml @@ -7,66 +7,10 @@ items: - type: loadout id: LoadoutUniformAncientJumpsuit - - type: loadout - id: LoadoutUniformJumpsuitColorBlack - - type: loadout - id: LoadoutUniformJumpskirtColorBlack - - type: loadout - id: LoadoutUniformJumpsuitColorBlue - - type: loadout - id: LoadoutUniformJumpskirtColorBlue - - type: loadout - id: LoadoutUniformJumpsuitColorBrown - - type: loadout - id: LoadoutUniformJumpskirtColorBrown - - type: loadout - id: LoadoutUniformJumpsuitColorDarkBlue - - type: loadout - id: LoadoutUniformJumpskirtColorDarkBlue - - type: loadout - id: LoadoutUniformJumpsuitColorDarkGreen - - type: loadout - id: LoadoutUniformJumpskirtColorDarkGreen - - type: loadout - id: LoadoutUniformJumpsuitColorGreen - - type: loadout - id: LoadoutUniformJumpskirtColorGreen - - type: loadout - id: LoadoutUniformJumpsuitColorLightBrown - - type: loadout - id: LoadoutUniformJumpskirtColorLightBrown - - type: loadout - id: LoadoutUniformJumpsuitColorMaroon - - type: loadout - id: LoadoutUniformJumpskirtColorMaroon - - type: loadout - id: LoadoutUniformJumpsuitColorOrange - - type: loadout - id: LoadoutUniformJumpskirtColorOrange - - type: loadout - id: LoadoutUniformJumpsuitColorPink - - type: loadout - id: LoadoutUniformJumpskirtColorPink - - type: loadout - id: LoadoutUniformJumpsuitColorPurple - - type: loadout - id: LoadoutUniformJumpskirtColorPurple - - type: loadout - id: LoadoutUniformJumpsuitColorRed - - type: loadout - id: LoadoutUniformJumpskirtColorRed - - type: loadout - id: LoadoutUniformJumpsuitColorTeal - - type: loadout - id: LoadoutUniformJumpskirtColorTeal - type: loadout id: LoadoutUniformJumpsuitColorWhite - type: loadout id: LoadoutUniformJumpskirtColorWhite - - type: loadout - id: LoadoutUniformJumpsuitColorYellow - - type: loadout - id: LoadoutUniformJumpskirtColorYellow - type: loadout id: LoadoutUniformJumpsuitFlannel - type: loadout diff --git a/Resources/Prototypes/CharacterItemGroups/Generic/neckGroup.yml b/Resources/Prototypes/CharacterItemGroups/Generic/neckGroup.yml index 2a7add033e..ef3f40891a 100644 --- a/Resources/Prototypes/CharacterItemGroups/Generic/neckGroup.yml +++ b/Resources/Prototypes/CharacterItemGroups/Generic/neckGroup.yml @@ -25,16 +25,8 @@ id: LoadoutNeckScarfStripedPurple - type: loadout id: LoadoutNeckScarfStripedZebra - - type: loadout - id: LoadoutNeckTieRed - type: loadout id: LoadoutNeckTieWhite - - type: loadout - id: LoadoutNeckTieBlack - - type: loadout - id: LoadoutNeckTieBlue - - type: loadout - id: LoadoutNeckTieGreen - type: loadout id: LoadoutItemsPrideLGBTPin - type: loadout @@ -53,29 +45,11 @@ id: LoadoutItemsPridePansexualPin - type: loadout id: LoadoutItemsPrideTransPin - - type: loadout - id: LoadoutNeckBedsheetBlack - - type: loadout - id: LoadoutNeckBedsheetBlue - - type: loadout - id: LoadoutNeckBedsheetBrown - type: loadout id: LoadoutNeckBedsheetCosmos - - type: loadout - id: LoadoutNeckBedsheetGreen - - type: loadout - id: LoadoutNeckBedsheetGrey - - type: loadout - id: LoadoutNeckBedsheetOrange - - type: loadout - id: LoadoutNeckBedsheetPurple - type: loadout id: LoadoutNeckBedsheetRainbow - - type: loadout - id: LoadoutNeckBedsheetRed - type: loadout id: LoadoutNeckBedsheetWhite - - type: loadout - id: LoadoutNeckBedsheetYellow - type: loadout id: LoadoutNeckBedsheetNT diff --git a/Resources/Prototypes/CharacterItemGroups/Generic/shoeGroup.yml b/Resources/Prototypes/CharacterItemGroups/Generic/shoeGroup.yml index e3b71e7977..ea56881c55 100644 --- a/Resources/Prototypes/CharacterItemGroups/Generic/shoeGroup.yml +++ b/Resources/Prototypes/CharacterItemGroups/Generic/shoeGroup.yml @@ -1,24 +1,8 @@ - type: characterItemGroup id: LoadoutShoes items: - - type: loadout - id: LoadoutShoesBlack - - type: loadout - id: LoadoutShoesBlue - - type: loadout - id: LoadoutShoesBrown - - type: loadout - id: LoadoutShoesGreen - - type: loadout - id: LoadoutShoesOrange - - type: loadout - id: LoadoutShoesPurple - - type: loadout - id: LoadoutShoesRed - type: loadout id: LoadoutShoesWhite - - type: loadout - id: LoadoutShoesYellow - type: loadout id: LoadoutShoesGeta - type: loadout @@ -29,10 +13,6 @@ id: LoadoutShoesBootsLaceup - type: loadout id: LoadoutShoesBootsWinter - - type: loadout - id: LoadoutShoesBootsCowboyBrown - - type: loadout - id: LoadoutShoesBootsCowboyBlack - type: loadout id: LoadoutShoesBootsCowboyWhite - type: loadout diff --git a/Resources/Prototypes/Entities/Clothing/Head/soft.yml b/Resources/Prototypes/Entities/Clothing/Head/soft.yml index 163d9937f2..60a175e7de 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/soft.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/soft.yml @@ -167,7 +167,7 @@ - type: entity parent: ClothingHeadHeadHatBaseFlippable id: ClothingHeadHatMimesoft - name: mime cap + name: baseball cap description: "It's a baseball hat in a tasteless white colour." components: - type: Sprite @@ -178,7 +178,7 @@ - type: entity parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatMimesoft] id: ClothingHeadHatMimesoftFlipped - name: mime cap + name: baseball cap - type: entity parent: ClothingHeadHeadHatBaseFlippable diff --git a/Resources/Prototypes/Loadouts/Generic/hands.yml b/Resources/Prototypes/Loadouts/Generic/hands.yml index 524a6de918..830dcd7bee 100644 --- a/Resources/Prototypes/Loadouts/Generic/hands.yml +++ b/Resources/Prototypes/Loadouts/Generic/hands.yml @@ -1,102 +1,3 @@ -- type: loadout - id: LoadoutHandsColorPurple - category: Hands - cost: 0 - exclusive: true - items: - - ClothingHandsGlovesColorPurple - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutGloves - -- type: loadout - id: LoadoutHandsColorRed - category: Hands - cost: 0 - exclusive: true - items: - - ClothingHandsGlovesColorRed - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutGloves - -- type: loadout - id: LoadoutHandsColorBlack - category: Hands - cost: 0 - exclusive: true - items: - - ClothingHandsGlovesColorBlack - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutGloves - -- type: loadout - id: LoadoutHandsColorBlue - category: Hands - cost: 0 - exclusive: true - items: - - ClothingHandsGlovesColorBlue - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutGloves - -- type: loadout - id: LoadoutHandsColorBrown - category: Hands - cost: 0 - exclusive: true - items: - - ClothingHandsGlovesColorBrown - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutGloves - -- type: loadout - id: LoadoutHandsColorGray - category: Hands - cost: 0 - exclusive: true - items: - - ClothingHandsGlovesColorGray - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutGloves - -- type: loadout - id: LoadoutHandsColorGreen - category: Hands - cost: 0 - exclusive: true - items: - - ClothingHandsGlovesColorGreen - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutGloves - -- type: loadout - id: LoadoutHandsColorLightBrown - category: Hands - cost: 0 - exclusive: true - items: - - ClothingHandsGlovesColorLightBrown - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutGloves - -- type: loadout - id: LoadoutHandsColorOrange - category: Hands - cost: 0 - exclusive: true - items: - - ClothingHandsGlovesColorOrange - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutGloves - - type: loadout id: LoadoutHandsColorWhite category: Hands diff --git a/Resources/Prototypes/Loadouts/Generic/head.yml b/Resources/Prototypes/Loadouts/Generic/head.yml index b8d3c8c7ac..c48ad846e1 100644 --- a/Resources/Prototypes/Loadouts/Generic/head.yml +++ b/Resources/Prototypes/Loadouts/Generic/head.yml @@ -25,58 +25,6 @@ - !type:CharacterItemGroupRequirement group: LoadoutHead -- type: loadout - id: LoadoutHeadFedoraBlack - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadHatFedoraBlack - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadFedoraBrown - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadHatFedoraBrown - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadFedoraGrey - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadHatFedoraGrey - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadFedoraChoc - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadHatFedoraChoc - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - - type: loadout id: LoadoutHeadFedoraWhite category: Head @@ -115,50 +63,6 @@ - !type:CharacterItemGroupRequirement group: LoadoutHead -- type: loadout - id: LoadoutHeadHatCowboyBrown - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadHatCowboyBrown - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatCowboyBlack - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadHatCowboyBlack - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatCowboyGrey - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadHatCowboyGrey - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatCowboyRed - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadHatCowboyRed - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - - type: loadout id: LoadoutHeadHatCowboyWhite category: Head @@ -219,36 +123,6 @@ group: LoadoutHead # Color Hats -- type: loadout - id: LoadoutHeadHatBluesoft - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatBluesoft - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatBluesoftFlipped - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatBluesoftFlipped - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - - type: loadout id: LoadoutHeadHatCorpsoft category: Head @@ -271,58 +145,6 @@ - !type:CharacterItemGroupRequirement group: LoadoutHead -- type: loadout - id: LoadoutHeadHatGreensoft - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatGreensoft - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatGreensoftFlipped - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatGreensoftFlipped - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatGreysoft - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatGreysoft - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatGreysoftFlipped - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatGreysoftFlipped - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - - type: loadout id: LoadoutHeadHatMimesoft category: Head @@ -347,118 +169,6 @@ - !type:CharacterItemGroupRequirement group: LoadoutHead -- type: loadout - id: LoadoutHeadHatOrangesoft - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatOrangesoft - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatOrangesoftFlipped - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatOrangesoftFlipped - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatPurplesoft - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatPurplesoft - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatPurplesoftFlipped - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatPurplesoftFlipped - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatRedsoft - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatRedsoft - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatRedsoftFlipped - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatRedsoftFlipped - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatYellowsoft - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatYellowsoft - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatYellowsoftFlipped - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatYellowsoftFlipped - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - # Headbands - type: loadout id: LoadoutHeadBandBlack @@ -686,67 +396,6 @@ - !type:CharacterItemGroupRequirement group: LoadoutHead -# Cowboy hats -- type: loadout - id: LoadoutHeadCowboyBrown - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadHatCowboyBrown - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadCowboyBlack - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadHatCowboyBlack - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadCowboyWhite - category: Head - cost: 1 - exclusive: true - customColorTint: true - items: - - ClothingHeadHatCowboyWhite - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadCowboyGrey - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadHatCowboyGrey - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadCowboyRed - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadHatCowboyRed - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - - type: loadout id: LoadoutHeadHijabColorable category: Head diff --git a/Resources/Prototypes/Loadouts/Generic/neck.yml b/Resources/Prototypes/Loadouts/Generic/neck.yml index 30f65770b1..c18c33984f 100644 --- a/Resources/Prototypes/Loadouts/Generic/neck.yml +++ b/Resources/Prototypes/Loadouts/Generic/neck.yml @@ -147,18 +147,6 @@ group: LoadoutNeck # Ties -- type: loadout - id: LoadoutNeckTieRed - category: Neck - cost: 0 - exclusive: true - canBeHeirloom: true - items: - - ClothingNeckTieRed - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - - type: loadout id: LoadoutNeckTieWhite category: Neck @@ -172,42 +160,6 @@ - !type:CharacterItemGroupRequirement group: LoadoutNeck -- type: loadout - id: LoadoutNeckTieBlack - category: Neck - cost: 0 - exclusive: true - canBeHeirloom: true - items: - - ClothingNeckTieBlack - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - -- type: loadout - id: LoadoutNeckTieBlue - category: Neck - cost: 0 - exclusive: true - canBeHeirloom: true - items: - - ClothingNeckTieBlue - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - -- type: loadout - id: LoadoutNeckTieGreen - category: Neck - cost: 0 - exclusive: true - canBeHeirloom: true - items: - - ClothingNeckTieGreen - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - #Pride Accessories - type: loadout id: LoadoutItemsPrideLGBTPin @@ -309,60 +261,6 @@ group: LoadoutNeck # Bedsheets -- type: loadout - id: LoadoutNeckBedsheetBlack - category: Neck - cost: 1 - exclusive: true - items: - - BedsheetBlack - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutNeckBedsheetBlue - category: Neck - cost: 1 - exclusive: true - items: - - BedsheetBlue - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutNeckBedsheetBrown - category: Neck - cost: 1 - exclusive: true - items: - - BedsheetBrown - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - - type: loadout id: LoadoutNeckBedsheetCosmos category: Neck @@ -382,80 +280,6 @@ departments: - Command -- type: loadout - id: LoadoutNeckBedsheetGreen - category: Neck - cost: 1 - exclusive: true - items: - - BedsheetGreen - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutNeckBedsheetGrey - category: Neck - cost: 1 - exclusive: true - items: - - BedsheetGrey - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutNeckBedsheetOrange - category: Neck - cost: 1 - exclusive: true - items: - - BedsheetOrange - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - Logistics - - !type:CharacterJobRequirement - inverted: true - jobs: - - HeadOfPersonnel # Need to blacklist HoP and not command so other heads can wear this bedsheet - -- type: loadout - id: LoadoutNeckBedsheetPurple - category: Neck - cost: 1 - exclusive: true - items: - - BedsheetPurple - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - Epistemics - - !type:CharacterJobRequirement - inverted: true - jobs: - - HeadOfPersonnel # Need to blacklist HoP and not command so other heads can wear this bedsheet - - type: loadout id: LoadoutNeckBedsheetRainbow category: Neck @@ -474,25 +298,6 @@ departments: - Command -- type: loadout - id: LoadoutNeckBedsheetRed - category: Neck - cost: 1 - exclusive: true - items: - - BedsheetRed - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - Security - - !type:CharacterJobRequirement - inverted: true - jobs: - - HeadOfPersonnel # Need to blacklist HoP and not command so other heads can wear this bedsheet - - type: loadout id: LoadoutNeckBedsheetWhite category: Neck @@ -512,25 +317,6 @@ departments: - Command -- type: loadout - id: LoadoutNeckBedsheetYellow - category: Neck - cost: 1 - exclusive: true - items: - - BedsheetYellow - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - Engineering - - !type:CharacterJobRequirement - inverted: true - jobs: - - HeadOfPersonnel # Need to blacklist HoP and not command so other heads can wear this bedsheet - - type: loadout id: LoadoutNeckBedsheetNT category: Neck diff --git a/Resources/Prototypes/Loadouts/Generic/shoes.yml b/Resources/Prototypes/Loadouts/Generic/shoes.yml index 08f2275325..fb8487981b 100644 --- a/Resources/Prototypes/Loadouts/Generic/shoes.yml +++ b/Resources/Prototypes/Loadouts/Generic/shoes.yml @@ -1,81 +1,4 @@ # Colored -- type: loadout - id: LoadoutShoesBlack - category: Shoes - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutShoes - items: - - ClothingShoesColorBlack - -- type: loadout - id: LoadoutShoesBlue - category: Shoes - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutShoes - items: - - ClothingShoesColorBlue - -- type: loadout - id: LoadoutShoesBrown - category: Shoes - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutShoes - items: - - ClothingShoesColorBrown - -- type: loadout - id: LoadoutShoesGreen - category: Shoes - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutShoes - items: - - ClothingShoesColorGreen - -- type: loadout - id: LoadoutShoesOrange - category: Shoes - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutShoes - items: - - ClothingShoesColorOrange - -- type: loadout - id: LoadoutShoesPurple - category: Shoes - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutShoes - items: - - ClothingShoesColorPurple - -- type: loadout - id: LoadoutShoesRed - category: Shoes - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutShoes - items: - - ClothingShoesColorRed - - type: loadout id: LoadoutShoesWhite category: Shoes @@ -88,17 +11,6 @@ items: - ClothingShoesColorWhite -- type: loadout - id: LoadoutShoesYellow - category: Shoes - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutShoes - items: - - ClothingShoesColorYellow - - type: loadout id: LoadoutShoesGeta category: Shoes @@ -166,30 +78,6 @@ items: - ClothingShoesBootsWinter -- type: loadout - id: LoadoutShoesBootsCowboyBrown - category: Shoes - cost: 1 - exclusive: true - canBeHeirloom: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutShoes - items: - - ClothingShoesBootsCowboyBrown - -- type: loadout - id: LoadoutShoesBootsCowboyBlack - category: Shoes - cost: 1 - exclusive: true - canBeHeirloom: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutShoes - items: - - ClothingShoesBootsCowboyBlack - - type: loadout id: LoadoutShoesBootsCowboyWhite category: Shoes diff --git a/Resources/Prototypes/Loadouts/Generic/uniform.yml b/Resources/Prototypes/Loadouts/Generic/uniform.yml index da16bcc10e..960f70b54c 100644 --- a/Resources/Prototypes/Loadouts/Generic/uniform.yml +++ b/Resources/Prototypes/Loadouts/Generic/uniform.yml @@ -16,229 +16,6 @@ # Colored jumpsuits # Someone please alphabetically order these... - -- type: loadout - id: LoadoutUniformJumpsuitColorBlack - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorBlack - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - Security - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorBlack - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorBlack - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - Security - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpsuitColorBlue - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorBlue - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Medical - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorBlue - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorBlue - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Medical - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpsuitColorGreen - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorGreen - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorGreen - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorGreen - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpsuitColorOrange - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorOrange - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorOrange - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorOrange - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpsuitColorPink - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorPink - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorPink - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorPink - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpsuitColorRed - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorRed - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - Security - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorRed - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorRed - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - Security - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - - type: loadout id: LoadoutUniformJumpsuitColorWhite category: Uniform @@ -281,298 +58,6 @@ departments: - Command -- type: loadout - id: LoadoutUniformJumpsuitColorYellow - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorYellow - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - Engineering - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorYellow - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorYellow - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - Engineering - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpsuitColorDarkBlue - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorDarkBlue - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorDarkBlue - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorDarkBlue - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpsuitColorTeal - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorTeal - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorTeal - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorTeal - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpsuitColorPurple - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorPurple - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - Epistemics - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorPurple - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorPurple - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - Epistemics - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpsuitColorDarkGreen - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorDarkGreen - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorDarkGreen - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorDarkGreen - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpsuitColorLightBrown - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorLightBrown - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorLightBrown - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorLightBrown - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpsuitColorBrown - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorBrown - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorBrown - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorBrown - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpsuitColorMaroon - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorMaroon - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorMaroon - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorMaroon - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - - type: loadout id: LoadoutUniformJumpsuitFlannel category: Uniform From cd5a6f8b5743904dbecbf04e5d70614e4444d149 Mon Sep 17 00:00:00 2001 From: SimpleStation Changelogs Date: Sat, 21 Dec 2024 18:02:53 +0000 Subject: [PATCH 05/11] Automatic Changelog Update (#1364) --- Resources/Changelog/Changelog.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 7976a09bbe..6e1c948c5a 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -8720,3 +8720,16 @@ Entries: id: 6584 time: '2024-12-19T22:52:32.0000000+00:00' url: https://github.com/Simple-Station/Einstein-Engines/pull/1359 +- author: VMSolidus + changes: + - type: Add + message: >- + Added labels to all generic colorable items in loadouts, so that players + can see which items have custom colors as customization options. + - type: Remove + message: >- + Removed all 'specific color' variants of colorable items from Loadouts, + such as "Blue Jumpsuit" when a colorable jumpsuit exists. + id: 6585 + time: '2024-12-21T18:02:28.0000000+00:00' + url: https://github.com/Simple-Station/Einstein-Engines/pull/1364 From 0674895a3b6a84c2761eb13c7b5f35bc826fe19c Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sat, 21 Dec 2024 14:25:13 -0500 Subject: [PATCH 06/11] More Colorable Items (#1365) # Description This PR adds even more colorable items to loadouts, this time making entirely new whitescale versions of existing items that did not have one previously. This replaces several more options for items that had a whole bunch of specific color entries with a single item that can take any color.

Media

![image](https://github.com/user-attachments/assets/31438bf7-6ca3-45d2-bf10-af5db5f6e4c4)

# Changelog :cl: - add: Added colorable variants of fingerless gloves, headbands, berets, hairflowers, cloth masks, and the neck gaiter. --- Resources/Locale/en-US/forensics/fibers.ftl | 1 + .../Locale/en-US/loadouts/generic/hands.ftl | 1 + .../Locale/en-US/loadouts/generic/head.ftl | 3 + .../Locale/en-US/loadouts/generic/mask.ftl | 3 + .../CharacterItemGroups/Generic/headGroup.yml | 20 +-- .../CharacterItemGroups/Generic/maskGroup.yml | 20 +-- .../Entities/Clothing/Hands/gloves.yml | 14 ++ .../Entities/Clothing/Head/bandanas.yml | 5 + .../Entities/Clothing/Head/hats.yml | 11 ++ .../Entities/Clothing/Masks/bandanas.yml | 11 ++ .../Entities/Clothing/Masks/masks.yml | 10 ++ .../Objects/Consumable/Food/produce.yml | 8 ++ .../Prototypes/Loadouts/Generic/hands.yml | 5 +- .../Prototypes/Loadouts/Generic/head.yml | 134 +++--------------- .../Prototypes/Loadouts/Generic/mask.yml | 123 +--------------- .../fingerlesswhite.rsi/equipped-HAND.png | Bin 0 -> 499 bytes .../Hands/Gloves/fingerlesswhite.rsi/icon.png | Bin 0 -> 553 bytes .../fingerlesswhite.rsi/inhand-left.png | Bin 0 -> 475 bytes .../fingerlesswhite.rsi/inhand-right.png | Bin 0 -> 480 bytes .../Gloves/fingerlesswhite.rsi/meta.json | 26 ++++ .../white.rsi/equipped-HELMET-vox.png | Bin 0 -> 598 bytes .../Bandanas/white.rsi/equipped-HELMET.png | Bin 0 -> 581 bytes .../Bandanas/white.rsi/equipped-MASK-vox.png | Bin 0 -> 586 bytes .../Head/Bandanas/white.rsi/equipped-MASK.png | Bin 0 -> 528 bytes .../Clothing/Head/Bandanas/white.rsi/icon.png | Bin 0 -> 527 bytes .../Head/Bandanas/white.rsi/icon_mask.png | Bin 0 -> 497 bytes .../Head/Bandanas/white.rsi/inhand-left.png | Bin 0 -> 538 bytes .../Head/Bandanas/white.rsi/inhand-right.png | Bin 0 -> 542 bytes .../Head/Bandanas/white.rsi/meta.json | 41 ++++++ .../Hats/beretwhite.rsi/equipped-HELMET.png | Bin 0 -> 897 bytes .../Head/Hats/beretwhite.rsi/icon.png | Bin 0 -> 630 bytes .../Head/Hats/beretwhite.rsi/inhand-left.png | Bin 0 -> 873 bytes .../Head/Hats/beretwhite.rsi/inhand-right.png | Bin 0 -> 879 bytes .../Head/Hats/beretwhite.rsi/meta.json | 26 ++++ .../equipped-MASK-reptilian.png | Bin 0 -> 551 bytes .../neckgaiterwhite.rsi/equipped-MASK-vox.png | Bin 0 -> 588 bytes .../neckgaiterwhite.rsi/equipped-MASK.png | Bin 0 -> 539 bytes .../Mask/neckgaiterwhite.rsi/icon.png | Bin 0 -> 492 bytes .../Mask/neckgaiterwhite.rsi/inhand-left.png | Bin 0 -> 540 bytes .../Mask/neckgaiterwhite.rsi/inhand-right.png | Bin 0 -> 545 bytes .../Mask/neckgaiterwhite.rsi/meta.json | 34 +++++ .../Hydroponics/poppywhite.rsi/dead.png | Bin 0 -> 827 bytes .../poppywhite.rsi/equipped-HELMET.png | Bin 0 -> 470 bytes .../Hydroponics/poppywhite.rsi/harvest.png | Bin 0 -> 1001 bytes .../Hydroponics/poppywhite.rsi/meta.json | 36 +++++ .../Hydroponics/poppywhite.rsi/produce.png | Bin 0 -> 538 bytes .../Hydroponics/poppywhite.rsi/seed.png | Bin 0 -> 393 bytes .../Hydroponics/poppywhite.rsi/stage-1.png | Bin 0 -> 658 bytes .../Hydroponics/poppywhite.rsi/stage-2.png | Bin 0 -> 682 bytes .../Hydroponics/poppywhite.rsi/stage-3.png | Bin 0 -> 727 bytes 50 files changed, 264 insertions(+), 268 deletions(-) create mode 100644 Resources/Locale/en-US/loadouts/generic/mask.ftl create mode 100644 Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi/equipped-HAND.png create mode 100644 Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Head/Bandanas/white.rsi/equipped-HELMET-vox.png create mode 100644 Resources/Textures/Clothing/Head/Bandanas/white.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Bandanas/white.rsi/equipped-MASK-vox.png create mode 100644 Resources/Textures/Clothing/Head/Bandanas/white.rsi/equipped-MASK.png create mode 100644 Resources/Textures/Clothing/Head/Bandanas/white.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Bandanas/white.rsi/icon_mask.png create mode 100644 Resources/Textures/Clothing/Head/Bandanas/white.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Bandanas/white.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Bandanas/white.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Head/Hats/beretwhite.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Hats/beretwhite.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Hats/beretwhite.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Hats/beretwhite.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Hats/beretwhite.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/equipped-MASK-reptilian.png create mode 100644 Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/equipped-MASK-vox.png create mode 100644 Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/equipped-MASK.png create mode 100644 Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/meta.json create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/dead.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/harvest.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/meta.json create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/produce.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/seed.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/stage-1.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/stage-2.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/stage-3.png diff --git a/Resources/Locale/en-US/forensics/fibers.ftl b/Resources/Locale/en-US/forensics/fibers.ftl index c95b292c96..a625847fc2 100644 --- a/Resources/Locale/en-US/forensics/fibers.ftl +++ b/Resources/Locale/en-US/forensics/fibers.ftl @@ -23,3 +23,4 @@ fibers-white = white fibers-yellow = yellow fibers-regal-blue = regal blue fibers-olive = olive +fibers-dyed = dyed fibers \ No newline at end of file diff --git a/Resources/Locale/en-US/loadouts/generic/hands.ftl b/Resources/Locale/en-US/loadouts/generic/hands.ftl index d9df439ce5..3ceed69d17 100644 --- a/Resources/Locale/en-US/loadouts/generic/hands.ftl +++ b/Resources/Locale/en-US/loadouts/generic/hands.ftl @@ -1 +1,2 @@ loadout-name-LoadoutHandsColorWhite = gloves (colorable) +loadout-name-LoadoutHandsGlovesFingerlessWhite = fingerless gloves (colorable) \ No newline at end of file diff --git a/Resources/Locale/en-US/loadouts/generic/head.ftl b/Resources/Locale/en-US/loadouts/generic/head.ftl index efd13b0084..d2a6d51128 100644 --- a/Resources/Locale/en-US/loadouts/generic/head.ftl +++ b/Resources/Locale/en-US/loadouts/generic/head.ftl @@ -10,3 +10,6 @@ loadout-name-LoadoutHeadTurbanColorable = turban (colorable) loadout-name-LoadoutHeadKippahColorable = kippah (colorable) loadout-name-LoadoutHeadTinfoil = tinfoil hat (colorable) loadout-name-LoadoutHeadHatCowboyBountyHunter = bounty hunter hat (colorable) +loadout-name-LoadoutHeadBandWhite = headband (colorable) +loadout-name-LoadoutHeadBeretWhite = beret (colorable) +loadout-name-LoadoutHeadPoppyWhite = hair flower (colorable) \ No newline at end of file diff --git a/Resources/Locale/en-US/loadouts/generic/mask.ftl b/Resources/Locale/en-US/loadouts/generic/mask.ftl new file mode 100644 index 0000000000..79ebf9b288 --- /dev/null +++ b/Resources/Locale/en-US/loadouts/generic/mask.ftl @@ -0,0 +1,3 @@ +loadout-name-LoadoutMaskBandWhite = cloth mask (colorable) +loadout-name-LoadoutMaskNeckGaiterWhite = neck gaiter (colorable) +loadout-name-LoadoutMaskSterile = sterile mask (colorable) \ No newline at end of file diff --git a/Resources/Prototypes/CharacterItemGroups/Generic/headGroup.yml b/Resources/Prototypes/CharacterItemGroups/Generic/headGroup.yml index e6bd267b1d..26f93d6531 100644 --- a/Resources/Prototypes/CharacterItemGroups/Generic/headGroup.yml +++ b/Resources/Prototypes/CharacterItemGroups/Generic/headGroup.yml @@ -21,6 +21,8 @@ id: LoadoutHeadBellhop - type: loadout id: LoadoutHeadPoppy + - type: loadout + id: LoadoutHeadPoppyWhite - type: loadout id: LoadoutHeadHatCorpsoft - type: loadout @@ -30,21 +32,9 @@ - type: loadout id: LoadoutHeadHatMimesoftFlipped - type: loadout - id: LoadoutHeadBandBlack - - type: loadout - id: LoadoutHeadBandBlue - - type: loadout - id: LoadoutHeadBandGold - - type: loadout - id: LoadoutHeadBandGreen - - type: loadout - id: LoadoutHeadBandGrey - - type: loadout - id: LoadoutHeadBandRed + id: LoadoutHeadBandWhite - type: loadout id: LoadoutHeadBandSkull - - type: loadout - id: LoadoutHeadBandMerc - type: loadout id: LoadoutHeadBandBrown - type: loadout @@ -60,9 +50,7 @@ - type: loadout id: LoadoutHeadBrownFlatcap - type: loadout - id: LoadoutHeadBeret - - type: loadout - id: LoadoutHeadBeretFrench + id: LoadoutHeadBeretWhite - type: loadout id: LoadoutHeadHijabColorable - type: loadout diff --git a/Resources/Prototypes/CharacterItemGroups/Generic/maskGroup.yml b/Resources/Prototypes/CharacterItemGroups/Generic/maskGroup.yml index ffe37fc042..fe78d84c9e 100644 --- a/Resources/Prototypes/CharacterItemGroups/Generic/maskGroup.yml +++ b/Resources/Prototypes/CharacterItemGroups/Generic/maskGroup.yml @@ -7,25 +7,9 @@ id: LoadoutMaskMuzzle - type: loadout id: LoadoutMaskGas - - type: loadout - id: LoadoutMaskBandBlack - - type: loadout - id: LoadoutMaskBandBlue - - type: loadout - id: LoadoutMaskBandGold - - type: loadout - id: LoadoutMaskBandGreen - - type: loadout - id: LoadoutMaskBandGrey - - type: loadout - id: LoadoutMaskBandRed - type: loadout id: LoadoutMaskBandSkull - type: loadout - id: LoadoutMaskBandMerc - - type: loadout - id: LoadoutMaskBandBrown - - type: loadout - id: LoadoutMaskNeckGaiter + id: LoadoutMaskBandWhite - type: loadout - id: LoadoutMaskNeckGaiterRed + id: LoadoutMaskNeckGaiterWhite diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml index 2abe1f0a80..fdec523202 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml @@ -300,6 +300,20 @@ fiberMaterial: fibers-synthetic fiberColor: fibers-black +- type: entity + parent: ClothingHandsButcherable + id: ClothingHandsGlovesFingerlessWhite + name: fingerless gloves + description: Plain gloves without fingertips. + components: + - type: Sprite + sprite: Clothing/Hands/Gloves/fingerlesswhite.rsi + - type: Clothing + sprite: Clothing/Hands/Gloves/fingerlesswhite.rsi + - type: Fiber + fiberMaterial: fibers-synthetic + fiberColor: fibers-dyed + - type: entity parent: ClothingHandsBase id: ClothingHandsGlovesFingerlessInsulated diff --git a/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml b/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml index 51a56f1f1d..29a99ce644 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml @@ -24,6 +24,11 @@ tags: - Bandana +- type: entity + parent: [ClothingHeadBandBase, ClothingMaskBandWhite] + id: ClothingHeadBandWhite + name: bandana + - type: entity parent: [ClothingHeadBandBase, ClothingMaskBandBlack] id: ClothingHeadBandBlack diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 5b5d281362..fe590c5562 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -25,6 +25,17 @@ - HamsterWearable - WhitelistChameleon +- type: entity + parent: ClothingHeadHatBeret + id: ClothingHeadHatBeretWhite + name: beret + description: A beret, an artists favorite headwear. + components: + - type: Sprite + sprite: Clothing/Head/Hats/beretwhite.rsi + - type: Clothing + sprite: Clothing/Head/Hats/beretwhite.rsi + - type: entity parent: ClothingHeadBase id: ClothingHeadHatBeretFrench diff --git a/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml b/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml index f5ad2fb6c8..f1f7ebc4cc 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml @@ -30,6 +30,17 @@ - Snout hideOnToggle: true +- type: entity + parent: ClothingMaskBandanaBase + id: ClothingMaskBandWhite + name: bandana + description: A bandana to make you look cool. + components: + - type: Sprite + sprite: Clothing/Head/Bandanas/white.rsi + - type: Clothing + sprite: Clothing/Head/Bandanas/white.rsi + - type: entity parent: ClothingMaskBandanaBase id: ClothingMaskBandBlack diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index c470605bb7..383e32e99d 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -562,6 +562,16 @@ - WhitelistChameleon - IPCMaskWearable # Estacao Pirata - IPCs +- type: entity + parent: ClothingMaskNeckGaiter + id: ClothingMaskNeckGaiterWhite + name: neck gaiter + components: + - type: Sprite + sprite: Clothing/Mask/neckgaiterwhite.rsi + - type: Clothing + sprite: Clothing/Mask/neckgaiterwhite.rsi + - type: entity parent: ClothingMaskNeckGaiter id: ClothingMaskNeckGaiterRed diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 3bf253f773..f9bd17860c 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -1249,6 +1249,14 @@ tags: - Flower # TODO add "RedFlower" or "Poppy" tag, when other color flowers will be +- type: entity + name: hairflower + id: FoodPoppyWhite + parent: FoodPoppy + components: + - type: Sprite + sprite: Objects/Specific/Hydroponics/poppywhite.rsi + - type: entity name: lily parent: FoodPoppy diff --git a/Resources/Prototypes/Loadouts/Generic/hands.yml b/Resources/Prototypes/Loadouts/Generic/hands.yml index 830dcd7bee..2a35910a17 100644 --- a/Resources/Prototypes/Loadouts/Generic/hands.yml +++ b/Resources/Prototypes/Loadouts/Generic/hands.yml @@ -61,12 +61,13 @@ group: LoadoutGloves - type: loadout - id: LoadoutHandsGlovesFingerless + id: LoadoutHandsGlovesFingerlessWhite category: Hands cost: 0 exclusive: true + customColorTint: true items: - - ClothingHandsGlovesFingerless + - ClothingHandsGlovesFingerlessWhite requirements: - !type:CharacterItemGroupRequirement group: LoadoutGloves diff --git a/Resources/Prototypes/Loadouts/Generic/head.yml b/Resources/Prototypes/Loadouts/Generic/head.yml index c48ad846e1..3efef2fac4 100644 --- a/Resources/Prototypes/Loadouts/Generic/head.yml +++ b/Resources/Prototypes/Loadouts/Generic/head.yml @@ -122,6 +122,18 @@ - !type:CharacterItemGroupRequirement group: LoadoutHead +- type: loadout + id: LoadoutHeadPoppyWhite + category: Head + cost: 0 + exclusive: true + customColorTint: true + items: + - FoodPoppyWhite + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHead + # Color Hats - type: loadout id: LoadoutHeadHatCorpsoft @@ -171,83 +183,13 @@ # Headbands - type: loadout - id: LoadoutHeadBandBlack - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadBandBlack - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadBandBlue - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadBandBlue - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadBandGold - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadBandGold - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadBandGreen - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadBandGreen - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadBandGrey - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadBandGrey - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadBandRed + id: LoadoutHeadBandWhite category: Head cost: 0 exclusive: true + customColorTint: true items: - - ClothingHeadBandRed + - ClothingHeadBandWhite requirements: - !type:CharacterItemGroupRequirement group: LoadoutHead @@ -264,36 +206,6 @@ - !type:CharacterItemGroupRequirement group: LoadoutHead -- type: loadout - id: LoadoutHeadBandMerc - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadBandMerc - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadBandBrown - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadBandBrown - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - - type: loadout id: LoadoutHeadFishCap category: Head @@ -375,23 +287,13 @@ # Berets - type: loadout - id: LoadoutHeadBeret - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadHatBeret - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadBeretFrench + id: LoadoutHeadBeretWhite category: Head cost: 1 exclusive: true + customColorTint: true items: - - ClothingHeadHatBeretFrench + - ClothingHeadHatBeretWhite requirements: - !type:CharacterItemGroupRequirement group: LoadoutHead diff --git a/Resources/Prototypes/Loadouts/Generic/mask.yml b/Resources/Prototypes/Loadouts/Generic/mask.yml index 3d3754c6f7..6445071d54 100644 --- a/Resources/Prototypes/Loadouts/Generic/mask.yml +++ b/Resources/Prototypes/Loadouts/Generic/mask.yml @@ -3,6 +3,7 @@ category: Mask cost: 0 exclusive: true + customColorTint: true items: - ClothingMaskSterile requirements: @@ -34,83 +35,13 @@ # Maskbands - type: loadout - id: LoadoutMaskBandBlack + id: LoadoutMaskBandWhite category: Mask cost: 0 exclusive: true + customColorTint: true items: - - ClothingMaskBandBlack - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutMasks - -- type: loadout - id: LoadoutMaskBandBlue - category: Mask - cost: 0 - exclusive: true - items: - - ClothingMaskBandBlue - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutMasks - -- type: loadout - id: LoadoutMaskBandGold - category: Mask - cost: 0 - exclusive: true - items: - - ClothingMaskBandGold - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutMasks - -- type: loadout - id: LoadoutMaskBandGreen - category: Mask - cost: 0 - exclusive: true - items: - - ClothingMaskBandGreen - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutMasks - -- type: loadout - id: LoadoutMaskBandGrey - category: Mask - cost: 0 - exclusive: true - items: - - ClothingMaskBandGrey - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutMasks - -- type: loadout - id: LoadoutMaskBandRed - category: Mask - cost: 0 - exclusive: true - items: - - ClothingMaskBandRed + - ClothingMaskBandWhite requirements: - !type:CharacterItemGroupRequirement group: LoadoutMasks @@ -127,55 +58,15 @@ - !type:CharacterItemGroupRequirement group: LoadoutMasks -- type: loadout - id: LoadoutMaskBandMerc - category: Mask - cost: 1 - exclusive: true - items: - - ClothingMaskBandMerc - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutMasks - -- type: loadout - id: LoadoutMaskBandBrown - category: Mask - cost: 0 - exclusive: true - items: - - ClothingMaskBandBrown - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutMasks - # Gaiters - type: loadout - id: LoadoutMaskNeckGaiter - category: Mask - cost: 1 - exclusive: true - items: - - ClothingMaskNeckGaiter - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutMasks - -- type: loadout - id: LoadoutMaskNeckGaiterRed + id: LoadoutMaskNeckGaiterWhite category: Mask cost: 1 exclusive: true + customColorTint: true items: - - ClothingMaskNeckGaiterRed + - ClothingMaskNeckGaiterWhite requirements: - !type:CharacterItemGroupRequirement group: LoadoutMasks diff --git a/Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi/equipped-HAND.png new file mode 100644 index 0000000000000000000000000000000000000000..36170c46610bcde9f03c4c3b2638d2816f425d52 GIT binary patch literal 499 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}z9y@mI(7}T@uV4TF|366VSN{PZ#aa^N7Yr2n&+vO2UocRBv%n*= zn1O-sFbFdq&tH)O6qG1&jVKAuPb(=;EJ|evNX*PD(erZ+Q83jr)H6)l8pH!svn@5k zGtJXei-7}VEQ1syD+42tb$b#xJG%x_k zN|#)oa)qOf8^|p4ba4!caDRKvk*`64$0abM`oHmPP7RBNZi_o-|J3$4nS5JFUs!>G zQ=q|)*=uW}=xUzjpP3E5*Yy<4kK2CfC&QZg6LcF=&hg8uJ1_`=)v*X{&}ZztmA1ut xj(#oY4yKB7g@ib!Ng3rHcDv^@FuurFNMe@yZtr}%=utJuHJ+}1F6*2UngE6f0m>W-C|M7r*h_-^g8zd7gOoS3 z8&HU|z$3Dlfr0NZ2s0kfUy%Y7lqhkHC<)F_D=AMbN@WO0%*-p%^K%VRFx4~EGfdhV z!~;~bEj7Y3&C^qhfdj~4WsqWIWncudynt95$_DvBgOM35&IDu|GBPm;0O=?o&TMA^ zi)R7ZAdmpWApI~J%~A$n7))SiU;(NyFfuk^TmUf@q=R(<#H1-eHV7~Q&0zwo46?KU zvY@&Q4GciC(j}LtT;XWr1~Qj;x;Tbd_`jXV$k$-N!JO&%|9?vK3^!q6`-I05Qzq+5 z{cf*I_`>9J=d3$lxI(Al8fk;M32B1jMT{M~#+=75y~@0Fi{a)Z4pZL{-)yBTpC<2Y zWmFEW^t74DH~7Wy?JvWzUn0BarZ{kd-0tb>=d#Wz Gp$P!zBbqS) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..7fc12be332e32e8df39f858acced9788d91f2468 GIT binary patch literal 475 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0h2Ka=y&X_S{)v8rMUeT&c>OhLQB*-uL|9^(-r+9&C88{0(B8wRq_zr_G z*AN9$JwrXiq^&_bKsDP^BRtbQJ+&A( zfE-o^DMnTXMj*=zh^3)ykc%}KnZe>rK(-+x6N3PdjsoJ$b{4RB7LW}B2|x_e52Mj6 zWdQnl0y_f>P=$e!u>s=(h^ZhQtP3C}O#!k&fC*?06If-Cr3H`$)n#a40Fsq1xjf|x zM;kYgnda%@7!u+B_L?JCg98uC!5RPUqu6aaBo!S4ro5ZXqFa2scaJ1P0~13)J?oxZ z^N(GcZ>3*PznXvGj_LioyP1JO1gu7$<(#}vW04zwV^w)YRdbc+3?|iv b?~P|fbP0l+XkKhr(>u literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..b2046039fab02bb84a217df4484b3befc8fe322c GIT binary patch literal 480 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0h2Ka=y&X_S{)v8rMUeT&c>OhLQB*-uL|9^(-r+9&C88{0(B8wRq_zr_G z*AN9$JwrXiq^&_bKsDP^BRtbQJ+&A( zfE-o^DMnTXMj*=zh^3)ykc%}KnZe>rK(-+x6N3PdjsoJ$b{4RB7LW}B2|x_e52Mj6 zWdQnl0y_f>P=$e!u>s=(h^ZhQtP3C}O#!k&fC*?06If-Cr3H`$)n#a40Fsq1xjf|x zM;kYgneFM~7!u+B_L?JKg8~oh#aqASqjo!JYW-vp?wuLAQA7W3<4<5{2r@W)(RbMX z>g3~`ZmlIJxeN;1bKgnLxT~=9?xh7)FU=SlI2aU|7&`W`^E97j{oARxwc(fNjp{1q kzmo%`=GwDk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0(2Ka=yR#jCkTC`~0x^>5n9ow;E$E{npKq@sKECN#OB|(0{|G|Jk%A45@ zD8yOd5n0T@z;^_M8K-LVNdpBXN?apKg7ec#$`gxH83GbB^GfvmTtgI0^$hh4lePx& z0M%?ujqptK^weVD0CHFvq!?Kl7=bJ=AeM%*K|au6WCn{f0ojI(Obh}*Itqw0+gZTk zSwJ=j@RTz$ya0L>Mx$BE0F;`*&cFgxX<%e*z__0NEhG1T>cktTM>b z0?2~uGBhv%$;xu{JPj|C8%1Mi2)g|c|r`9G9PTRNZ401Od6?8Imd^G!3?9K1{ zjxur!FLTbX& zvW$a$=ToOet@fDCR&b5)aHM%-T4GxsM@`7iox1lpJA2r|-Mvc$pj;I4fPI>xbHs~4ulfjsKz>gTe~DWM4f DR2s0{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Bandanas/white.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..62de52505ab560d3b48833d1b06015303504b1bf GIT binary patch literal 581 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0(2Ka=yR#jCkTC`~0x^>5n9ow;E$E{npKq@sKECN#OB|(0{|G|Jk%A45@ zD8yOd5n0T@z;_sg8IR|$NC65;l(KW=8CT$Jk z0jk-S8sVAd>8ZuQ0pzeUNHMZ9FalX#Kr9VqgM6UD$P5-|0!MXrq(i9*Y1ek#4Fo9JDSy}*D zP+f)w1|V7KlFL)BaI|p)nFl;w977`9-%dL%bXbAI)v@RQ|C4)Ntd2gvvd#EzL5z#q zb>>J(t@uyLjE2+RrUx9_wD;naDK1O=Ei}9*-TAuZIq&2{VZ8yzUe8@1mV1D?(oJ}^ z*6S}kvKys8_!yj&=aN|cw4|v~pv8gHkz)#w%4A)WGpB@o&59o;n`5SXOfOJa(5ZI8 zx8eKWzi$s*UGseHsy&A!<|@W-Td%;-y!&zO_Pggh7t3CJJAHD$kN@7Qe^34qwo_tJ j3~&-)Qf2usKIId`xrMO@+GDb9K>qS{^>bP0l+XkKu^_D= literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Bandanas/white.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..b47625c11d1962e4c801fecd0d9bbd360d45340e GIT binary patch literal 586 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`031o(uwR#jDP*sx*7j2Xv{9b2?$(W+IecI?;zl-&10E*eO2lmz(&|AzpE zd(C?zfnuBm9+AZi417mGm~pB$pESs@64!{5;QX|b^2DN4hJeJ(yb?V>*AN9$JwrXi zq^&_bKsDP^BRtbQJ+&A(fE-o^DMnTXMj*=zh^3)ykS{bCnZe>rK(-+x6N3PdjsoJ$ zb{4RB7LW}BJmriGFMytf(P)-30Hr3dGq3QV0J5OE3=IrGvNGNrTW-j`0(zO@pr?ytNQC>_X{Y%PEAX)NDn9-He@FJ?utPSJ zwzY>%eSWBElduKjResKc>p4}_rS&g!b`+oU$>-Km<+!xT|IQ0*Gc%5+zyEI@Q};Vy z(fCyJ30GW$^BZ%6A|;#WPn*lRFZP@rxX!8xN_b?Jvw7r5VKHfZmW z+3vi#iBsh4!+HF5?7tWsqBp262rlKZE@YbdDxJqYTIfRF>JyWX@dQS&1Z{s2$?1~F msPo$Tpexu+MS*>~E57oT3g#Yp?WO7m@|dTqpUXO@geCw>TBUse literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Bandanas/white.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/equipped-MASK.png new file mode 100644 index 0000000000000000000000000000000000000000..8b592ff678e810cf7b2ea5533844f9d91b7acb80 GIT binary patch literal 528 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}zR#jCUJ9ccwj2Sz2>;Q^+<%+%sQmiFGe!>5NfZ_KxzF?pLXMsm# zF#`kNVGw3Kp1&dmC@4|l8c`CQpH@>myuy_`b4FU;3 z4AKvy(JW;E`h5aB0}D`vfswHR;{u4OARVj=ASO)#vO$0eXbuxtWss!>kOkFcXkY-6 zl`gqFgnp|vd$@?2>=c6iOK)~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Bandanas/white.rsi/icon.png b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..a471b2b6ec3c296d21ff06fab14063e0b5e15921 GIT binary patch literal 527 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikt0(?STtE#HHy1EuET6E#Ug&jL~0EL^4ZY%{-Y$ZW{!T&*kVe|ea`+*{y z1s;*b3=DjSL74G){)!Z!phSslL`iUdT1k0gQ7S_~VrE{6o}X)of~lUNo?+6~AReHa zZK)BSX`Y^13>-iXD}xjxD+42tb$b#xJ zG%x_kN|#)oa)qOf8_4YQba4!^@P8Y4QK&(I=hm`+|Ml7V^f&KX_x#a8%?%UN-ZJi2 z{CF;bbNLV4}|fgW6+BE4CW3 zC{N>PzEsN7&dlNz6j*3cwfpg^N6V)2cJ9uWitkYJo!++2>3OiaYR_b&uuAhD`K6cp ej5j|JZo6h?=P8(e!T4V?$d#V1elF{r5}E)CD~j&` literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Bandanas/white.rsi/icon_mask.png b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/icon_mask.png new file mode 100644 index 0000000000000000000000000000000000000000..f7ffc9c4a36526379ce6b531418574b4e1d60db6 GIT binary patch literal 497 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikt0(?STtE#Gw9XqyY(V`0%F05O(4k*kobv_(Ov6Te*1^)*DhRyqz><5Z) z7I;J!GcfQS24TkI`72U@f)XXJ5hcO-X(i=}MX3w{iJ5sNdVa1U3Z{C7dWK0`gLr^y zwxvdRrg?g5F>nAmtPE0&tPG4mmKP99L)jqLYcMi{#hHL?Lq;YB0U#X(#F_0ZVDT&< z8w3)77^ELYqgl!T^#25Q1{RSYP${;V1QVG}YG&QozfS+Hg8nbY z%XSS#FZ+|3r|f*n5E8oj70-l_eOoM#wP)RHV9D4uD}nLwj*C1+&)8GbI3sFy?P0b! zq%OyBEb#!NTT2bUg5YNko}KJX!M=WR@(eC|2MmPteGlCG3UY_1tDnm{r-UW|i%)y% literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Bandanas/white.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..8a0b841c1c41885ee75e8f51ac87dbe3b96db0eb GIT binary patch literal 538 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`211o(uwrlce{Hq{pv6#xaMDIXLAsVfQc3;zHAKZAqT$}d1ZXMsm#F#`kN zVGw3Kp1&dmC@4|l8c`CQpH@c zG@7LhKz~nQXJ7%UFfcMUU|aw(6{Lf80mP&!KsE?40nK3os|>QV0J5OE3=IrGveG4& zr(EG^;|4Mpdb&7vi>j)>}G4w-Y@xHH^CQ%BtkP>LxjnfP?^tM#qEp+;PeCIq&qn;?6m|Q}(*pliLfmE%MrzJ=i0A qtEtAigtag#lgm$I!GRxJ6V9=x^y*zY`@?e{$l;!@elF{r5}E+>C5oy5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Bandanas/white.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..e959b046eca7b83f1466d626b3937d3ba10ad646 GIT binary patch literal 542 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`211o(uwrlce{Hq{pv6#xaMDIXLAsVfQc3;zHAKZAqT$}d1ZXMsm#F#`kN zVGw3Kp1&dmC@4|l8c`CQpH@c zG@7LhKz~nQXJ7%UFfcMUU|aw(6{Lf80mP&!KsE?40nK3os|>QV0J5OE3=IrGveG4& zr(EG^;|4O9db&7%-*=cl{>*-G&NTXHd8YdP1D(DzV=SbFnp_KvR7%7eZGRtC vOq_68-T6?0_w@FbgOR_O1soFoL|wSW9mcJ9DZM}v6n6}su6{1-oD!M>S|f?5q$_l%JNFlghxL zaenGVTaUvIGDqWsmuiU$T6b8atnd?aah35F=}uUYnU+^ileG(`lyjJTqTDu_^3`(Al!_(y=ueSx1bIB!*trj6YGa zrs&?IHB(owsr0KmoZuJlSvdEZMpA^63};6`fGcO}jVs}tR+?gyw&<09=-=^=Wv58d z)B`6rHgK7oSSSC7x2`<<>GI`!mMmZ?*>7>~xP-tBRw>itKkdrq9OHaY&$jN%wEaQs z&+I(cZ{6}i&|m{^Ow4wZRQ?@z7~AIa+?*17(m(jb^TzMSRm*e?O1QtQt=wyRz3>;q zl9j8UNKW=8CT$Jk0jlXqjqptK^weVD0CHFvq!?Kl z7=bJ=AeM%*K?z5Lkr^z`1Y{dBGBF4M=_nx1Y-a(BX93wD;3>(-@B)~=U^JSg3_$%8 z*cn)WDh-T`4Hy?dO#S~KteIiYnWd}@yS@TbA;Wr47srqY_qWp=`3@`au=Hv^{BOT* zx`mLNsZ(yhwRqDs*;e6c|C9q2Hi<{Y{rRjY;u2cU^`zAB%<-p7uX^xabC=`2oO$t< z-r?=?8XfB|)mYD9N&UOKnXtrgGzHd=0CJj~NpFDJ}$-+_^}0c^^b ad%vaC!*eemP1}A2j#2FZ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/beretwhite.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beretwhite.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f4d7a07d370034eef1be0965b87c855cf0b8de30 GIT binary patch literal 630 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijA1AIbUXUv!}Z{EB)bLPyNHEYR|B`a2}Shj50qD6})O`0@q+O(dYp1!`m zwzjsWrlzj0uDZIqnwpwbt5!{zFk#J_H5C;V9UUDF4GjwxENE$InKESx&{U5(CmVs3 zbV-n3@PC|uLEVJg6sU}|z$3Dlfq`2Xgc%uT&5-~KN|d-plmzFem6RtIr7{F0X6BXX z`MHKDnCcno876HF;sL7JmKx!i=IN=$zyaj2GDtD9GB5&JUO+4jWrIRQgOM35&IDu| zGBPm;0O=?o&TMA^i)R7ZAmAy<$nXLfa4;IpQU;*Z1a<}%ph^QHV*|zo5K}=mvMzv_ z1oArwFagbF0;>$Nv;eZ8x(p2rK(cp>y`tDPM0Nm~3q4&NLoEE?_Fd#Vq`>2Pn=#c{ zLby=t|Nn($(ZV;9l6uzf_J4Y3a*#%R5m$7bIKzfuBYjJbhFcPwR!#rzC~+Vw$uYX1 zsf_9RER(|i0>NusrzY`l`IaTYYQ_|?$RhS>S|f?5q$_l%JNFlghxL zaenGVYmdVYGRO8W>*Ci^DibK=h?uL>p)aG_<+>r@7S~#<88N?_)ObC+x)(o)D)_K5 zqO_p!+SP-h0xa?h>-7A(^nxD!pXAgXaFF}>-yeGSkKZkC2+%b;nGi~{o0bRd{2JH z#CYa)p<8Va*RjnqwK7T$kv84;{Noe9?#>S|f?5q$_l%JNFlghxL zaenGVYmdVYGRO8W>*Ci^DibK=h?uL>p)aG_<+>r@7S~#<88N?_)ObC+x)(o)D)_K5 zqO_p!+SP-h0xa?h>-7A(^nxD!pXAgXaFF}>-yeGSkKZkC2+%b;nGi~{k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}z*3`Ca-MS|`w|MsKML;ph@8^nu6l+P4U+{k*VEDa_FBmAmS>O>_ z%)r1c48n{Iv*t(u1tm&cBT9nv(@M${i&7Z^5;OBk^!!{y6ioFD^$e4?2JryZY)g&s zO!M^AV&DK7%OJ(b%D@O@c>%FBlnrvZ1|u_AoC(M_WMpCx0Mb!FoY~F-7S95*LBLaz zk>LfRrukDJj^i^M1K3cH< zU&8~AZNC{G>b?#M$l?E;dv{vsky&rk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}z=H*wcU%!3g#MzNC$w0ABr!3rn6l+P4U+{k*VEDa_FBmAmS>O>_ z%)r1c48n{Iv*t(u1tm&cBT9nv(@M${i&7Z^5;OBk^!!{y6ioFD^$e4?2JryZY)g&s zO!M^AV&DK7%OJ(b%D@O@c>%FBlnrvZ1|u_AoC(M_WMpCx0Mb!FoY~F-7S95*LBLaz zk>Lf>c%i`Cx8hl|ypA!macajvM>6RgRpAur)i^_@Y`#tl!v0>5x!2MVwi#uuoh!V279W;+Q?&C6Zrjm-;{9BIS zY%`9Q>-)~MH&b@j;}uSa%?cyre!ORS%$zMb!=&c8g6Rv#mwO`_CU9npB}A6JYhCcC raq`oDNAI4`bmX2Qw#DJ+_6HVnR}Jhu4o_dw4f3X^tDnm{r-UW|;UA}w literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/equipped-MASK.png new file mode 100644 index 0000000000000000000000000000000000000000..3512302b5fc99179b5b48b9464cf1f968a12f9fa GIT binary patch literal 539 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0(2Ka=yX6F`f-MXiywq^G0Mdg+CJ-w5GGV9}aUItR^B|(0{|G|Jk%A45@ zD8yOd5n0T@z%2~Ij105pNB{*TN?apKg7ec#$`gxH83GbB^GfvmTtgI0^$hh4lePx& z0M%?ujqptK^weVD0CHFvq!?Kl7=bJ=AeM%*K|au6WCn{f0ojI(Obh}*Itqw0+gZTk zSwJ=jcuF!dya0L>Mx$BE0F;`*&cFgxX<%e*z__0NEhG1T>cktTM>b z0?2~uGBhv%$=)sYielFg*#Tru^K@|xiEw{A&5^IwfWw9T)%(BwZx-m)WqX_G`JCA^ zHRZ)**#&kkP477q;=0byO}O(scIv)#zA1Y7UOzVd`NVnWGv^J%diyh*zj=EoI4U%< zG_nY>#0xL@z+f=@ZTJq!@AbPM+>X<`|Hi3t(aUFW+1JyK(4?ox-2fA59Ys p?pDUk=QB8Su4y*JfP=T2qQZ|aiF1*k(_#&Bt*5J>%Q~loCICg_mEiyY literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/icon.png b/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..af3948b8f4226d280c66a46c923561ad963bebac GIT binary patch literal 492 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikt0(?STJ39NTsvD+Gowa-S!NrSL0)=^f{=ETGY$ZW{!T&*kVe|ea`+*{y z1s;*b3=DjSL74G){)!Z!phSslL`iUdT1k0gQ7S_~VrE{6o}X)of~lUNo?+6~AReHa zZK)BSX`Y^13>-iXD}xjxD+42tb$b#xJ zG%x_kN|#)oa)qOf8_3M|ba4!^@P9kOk*~pkgGGGl|Non~RdrYNiucd;X13O3*}}i= z!q3PCMWIl2&ZfgVG=n?lh$M4KF!jEeXp$shsekCDH`6YG3=7qIu2tTQVp02~6wlPK t>fS$=eW9ReJ;$D@!lBE<^m7hoyk!#GBb3vYx+enU1W#8#mvv4FO#u00b+-Tj literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..65acefa0c34c41f4ab2d9a2c3bdda682b28c1a37 GIT binary patch literal 540 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}zR#i82boMV^ymI&MgFvw*R%Y5jinS!jFZe$YF#O)e7Yr2OEbxdd zW?%FBlnrvZ1|u_AoC(M_WMpCx0Mb!FoY~F-7S95*K_CH$ zLHc1dnxzatzfWLiU;(NyFfuk^TmUf@q=R(<#H1-eHV7~Q&0zwo46?KUvY@&Q4GciC z(j}LtT;XWr1~TV+x;TbJxWAp|$k(DEz{2?R|Lp50H?X%!E&7<`bKUjQ7SX+>FZm}r zFgY`E_DtuxQKh{0vE^Y+uBg~s>6eZbwz1~w2B$4}U}3KqblcF+xHF;mw5+2eV_0N^ zrupU{Rze;L9tw?$2g_Nlv-cd<(`Qt_H&G#y$?p!IipR7D;c_O9O{x!$yk%(0;j}2U sUeNIGwf~-_@811=S{A>rfo1Q1hR$R5ZZT`Z;y}*!boFyt=akR{01H5kVgLXD literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..2f39874647c465fbdad4c9df010c7ccbf2026d5d GIT binary patch literal 545 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}zR#i82boMV^ymI&MgFvw*R%Y5jinS!jFZe$YF#O)e7Yr2OEbxdd zW?%FBlnrvZ1|u_AoC(M_WMpCx0Mb!FoY~F-7S95*K_CH$ zLHc1dnxzatzfWLiU;(NyFfuk^TmUf@q=R(<#H1-eHV7~Q&0zwo46?KUvY@&Q4GciC z(j}LtT;XWr1~Qj;x;TbJxWAp|$aPeK$HnyPzw~uYy^C91UM`zbIa~hBj|qAImV6T8 z(#QyKaC{uxR4cBQc&t0R=x1XL^e*fMtbF&2trbxF(+Pk%tyYB_L-P6_2Wt~$(696J`lEDA~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/meta.json b/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/meta.json new file mode 100644 index 0000000000..4da74959dd --- /dev/null +++ b/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by belay5 (Discord) | equipped-MASK-vox sprited by PuroSlavKing (Github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "equipped-MASK-vox", + "directions": 4 + }, + { + "name": "equipped-MASK-reptilian", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/dead.png new file mode 100644 index 0000000000000000000000000000000000000000..849b4242b4e3c9a12566fd21cea480d2edd732bc GIT binary patch literal 827 zcmV-B1H}A^P)EX>4Tx04R}tkv&MmKpe$i)0T=<9NIy}AwzYtAS&XhRVYG*P%E_RU~=gfG-*gu zTpR`0f`cE6RRR-^Y&AJOTXAz?I(iR~x|0C+YRJ z7CQp^w}Ff6wx;X>mpj0~lOdb3EBR>(g#z$?M&FbJBDX;An%7%vAEysMhPq1K00)P_ zXpyqlyS%%nv$ucGwEFu2_@8oila(vO00006VoOIv0RI600RN!9r;`8x010qNS#tmY z3ljhU3ljkVnw%H_000McNliru<^lv09wU)0#f$&|02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{009$8L_t(o!|j$a&ch%Kg&$QV-zf)R^GUL0;{xrr~3 z$#-I+ONr8|zy2f;TD9?lkP@E#>Dd7MdYG+0gb)${#26tWP*u}BYwvx^Yu9zDnQ*Q? zi{JOjTATX5PvbbI!z&LVJXF0*!dknTh^a+p7zTLn0RTjV7$cl>|DJ!XNCyCB(X}Kl zHN<0#AR-XaY|ypcajAhnSDjlkC(*67dKX;v)n*n>!kny002ovPDHLk FV1iQyX|(_V literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..221e35fbc39d3ffa3d90cb151af9263e973d8d23 GIT binary patch literal 470 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}zUb}Yf|NsA+Hf?(K>J?B-=F!B9K#H{_$S)Wu{-5FZHojn>0B3-L15RjOeSEA?V8lqsTXQ*eGv^9tasAgMg zglC$krxpVT$XEs`Mpgz!Aj=DgrJ-z)%QYC8!QxCnwjm=Eg8-0@0^-be7O;30kPQL} zKn&6kqtPs70Q!9bI|B<)g@KW=0pkLQsURJ!3m_&<0kT1W31|)zSY?o<1&{^RWoTdk zl9evGJmm^U8#j;{>FMGa65;;#njzN#1p$|frZa!fx8#XP)s<t2fqepVZna0_Hrpfq75V)0|2uL+B|NJb4880x TCocFD0J6~2)z4*}Q$iB}hO%&V literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/harvest.png new file mode 100644 index 0000000000000000000000000000000000000000..99ad68a5d28f795cbac14694e99e691819006533 GIT binary patch literal 1001 zcmVEX>4Tx04R}tkv&MmKpe$i)0T=<9NIy}AwzYtAS&XhRVYG*P%E_RU~=gfG-*gu zTpR`0f`cE6RRR-^Y&AJOTXAz?I(iR~x|0C+YRJ z7CQp^w}Ff6wx;X>mpj0~lOdb3EBR>(g#z$?M&FbJBDX;An%7%vAEysMhPq1K00)P_ zXpyqlyS%%nv$ucGwEFu2_@8oila(vO00006VoOIv0RI600RN!9r;`8x010qNS#tmY z3ljhU3ljkVnw%H_000McNliru<^lv09uv3p^&kKM02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{00F^CL_t(o!|jwYOT$nUg};<`bTWnNAUJfCQl}C+xO6P| z16)*!Ao&GO`4PpX(9K=iMeLHHR2NZkEGQI_LbG*D;W?y9leEPoP3n>ZA$iFo=iYP9 zeGn1v^_qCE*TlMYP)Je90j3iJfStVTc`kK(Qep+T$qjRcoXY}Wm@@$6TsBk@nXu$v zKVzm7gPpvLoXcXEGv3ZFx!v9K6cW^qOjrdD_X`;2%qimZ<%3SAL$O%o`~1qYw_hp$ zSwuDrxlQU*g;MtsfZ=e+bAsg!z zI8YYzts?Xjoz`f;-RI5neq&DFj8ToHaJjoy5ombTaGwENnFO~*eoMAeK#CM8QpAK` X$G`Cmy<|(700000NkvXXu0mjftS-bE literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/meta.json new file mode 100644 index 0000000000..b49b49cc85 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/meta.json @@ -0,0 +1,36 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, equipped-HELMET taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/produce.png new file mode 100644 index 0000000000000000000000000000000000000000..84caa94b9a1038b823d051116be281cfaddbf281 GIT binary patch literal 538 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil21AIbU|NZ-S>gCZIV? zV3k3Z7C;tMm!W|HNLIS!@{}taZQMX+ucwP+h=u>#en-Be3LGwijywK$+ADNInDWaN}yKn1v!SORR+gT8o#-sy^)_y!SLgPpVLq8|Mp`} z`_oGw;O>wD_{u)n6E)D1IdHGV;s8$Q2&!(i>@ zkJUZ>2M;k6?cGN(gb6ADnU3sxkmdKEyEX>4Tx04R}tkv&MmKpe$i)0T=<9NIy}AwzYtAS&XhRVYG*P%E_RU~=gfG-*gu zTpR`0f`cE6RRR-^Y&AJOTXAz?I(iR~x|0C+YRJ z7CQp^w}Ff6wx;X>mpj0~lOdb3EBR>(g#z$?M&FbJBDX;An%7%vAEysMhPq1K00)P_ zXpyqlyS%%nv$ucGwEFu2_@8oila(vO00006VoOIv0RI600RN!9r;`8x010qNS#tmY z3ljhU3ljkVnw%H_000McNliru<^lv09Rl`gh7kY&02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{003%9L_t(o!((6=1*2dTjDk@x3Pu5`pn>6k>O8Ce)H05V z98I&&9b=%DBS>>V4g=iM*^j8>2&RFKQPLgohJk@W1Q8YVb-)w`Mihr2^XUnwnG49u shRBI=;2hDwFur+#8UO$Q literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/stage-2.png new file mode 100644 index 0000000000000000000000000000000000000000..090715f6a01b29d7f7088ae6ade018166d980af5 GIT binary patch literal 682 zcmV;b0#*HqP)EX>4Tx04R}tkv&MmKpe$i)0T=<9NIy}AwzYtAS&XhRVYG*P%E_RU~=gfG-*gu zTpR`0f`cE6RRR-^Y&AJOTXAz?I(iR~x|0C+YRJ z7CQp^w}Ff6wx;X>mpj0~lOdb3EBR>(g#z$?M&FbJBDX;An%7%vAEysMhPq1K00)P_ zXpyqlyS%%nv$ucGwEFu2_@8oila(vO00006VoOIv0RI600RN!9r;`8x010qNS#tmY z3ljhU3ljkVnw%H_000McNliru<^lv09TWn+Ge7_U02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{004qXL_t(o!|ju?5r7~N1P^Mk8v8M$2#PRc##)FBEyCCy z-V8OAXZX>%%}8MRy9Wp%gnXI^nU+yBS9q;M+E!>J>IDMIqiL^~@YX5n1P%bh6-8fx z8SWu+Klk1Q(>3hcfztHQ?$@sbH0#!O>;ZxZ$vKO58cvnHS^G_!PYC%NC*24v8|*+} Q`Tzg`07*qoM6N<$f;8VDiU0rr literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/stage-3.png new file mode 100644 index 0000000000000000000000000000000000000000..edcd8617dc7cc32e437cc7ca19614ddf09bccdbe GIT binary patch literal 727 zcmV;|0x127P)EX>4Tx04R}tkv&MmKpe$i)0T=<9NIy}AwzYtAS&XhRVYG*P%E_RU~=gfG-*gu zTpR`0f`cE6RRR-^Y&AJOTXAz?I(iR~x|0C+YRJ z7CQp^w}Ff6wx;X>mpj0~lOdb3EBR>(g#z$?M&FbJBDX;An%7%vAEysMhPq1K00)P_ zXpyqlyS%%nv$ucGwEFu2_@8oila(vO00006VoOIv0RI600RN!9r;`8x010qNS#tmY z3ljhU3ljkVnw%H_000McNliru<^lv09WXw=*O34K02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{006H^L_t(o!|ju?4FWL?MSn8GO~W`ybT>qXptHm*sa!Hd z>g-?&I1~aDIV*_-epPaX{e0g648!<$oVLK}a**vzM{cg?waqCp=*n+0Lj+1F@q`Fg z2o?Yt!1DMO+G_gQOQ;tpr_ZAW&c*M})qNy;wtqhXGOu~L{a=LoOdKFDlWqdtn^z)F ziCRD*;u{1UCH|awu43sP$$F0^#wgmxPW2L|z5SufXBft>a|70hL{Sky|9}7h002ov JPDHLkV1j6+H~atq literal 0 HcmV?d00001 From cc1e52c47c7b27b8da9be5da701580efe42590ca Mon Sep 17 00:00:00 2001 From: SimpleStation Changelogs Date: Sat, 21 Dec 2024 19:25:39 +0000 Subject: [PATCH 07/11] Automatic Changelog Update (#1365) --- Resources/Changelog/Changelog.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 6e1c948c5a..2f706fe2c3 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -8733,3 +8733,12 @@ Entries: id: 6585 time: '2024-12-21T18:02:28.0000000+00:00' url: https://github.com/Simple-Station/Einstein-Engines/pull/1364 +- author: VMSolidus + changes: + - type: Add + message: >- + Added colorable variants of fingerless gloves, headbands, berets, + hairflowers, cloth masks, and the neck gaiter. + id: 6586 + time: '2024-12-21T19:25:13.0000000+00:00' + url: https://github.com/Simple-Station/Einstein-Engines/pull/1365 From 35c95a5da3ccb7d23620eaa1aad43022be3d6673 Mon Sep 17 00:00:00 2001 From: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Date: Sat, 21 Dec 2024 13:49:49 -0800 Subject: [PATCH 08/11] Make the EE Logo Match the Banner (#1361) # Description Light mode logo --- Resources/Textures/Logo/logo.png | Bin 20730 -> 18981 bytes .../Textures/Logo/source/EE_logo-light.svg | 218 +++++++++++++++--- Resources/Textures/Logo/source/EE_logo.svg | 50 ++++ 3 files changed, 236 insertions(+), 32 deletions(-) create mode 100644 Resources/Textures/Logo/source/EE_logo.svg diff --git a/Resources/Textures/Logo/logo.png b/Resources/Textures/Logo/logo.png index 60aa041cced24eaaeb08e42a084579f69d6afd75..f06485e27f1f38073b1a45eab03c352b4a471d62 100644 GIT binary patch literal 18981 zcmYg&cT^Ma^YtbK2t|4mP5|Us1e9wE%`$tYVB+u@%yEAuY?wv`TiIMgVQf5*B0B-2&XqW;32>&Mt3?;(9 zQFoAd;NM8Rbu4`W;C9%*7fAo3b~OH8UEcWUit zueX`apU~5Gbd;|k1$X;C#R~EIJ@hklG=S<%i09gaX*(+TUS4!p{JGG6XY#OOqPsOX zC}(Hs?5I-i<)5#?+gp_vp+Y2ObfC;OGFf|LxCSED`-b;KVOU)Et#5^45il4`@eMlw z0{voA1;F3|iAVqfNpygKpirj4kNZ1}Q0NasS^7(YsqAtQ1oN7Y-NQU{@C)PawN)5? z*}M3g2q~+AM%n;bLw`^!$RAjGby&5pNcEmg#Vk4u_(e%_1bB0KD|$;!!L^akWH_NJ zzW9Sb1HvJ-L}3)wKT5r%Mxfv+Ru2+H(SglCb9h@yZ!c(FmNS{NM91qFKW98wiH_`` zM%dV*)%=d{`lD>^ojaSTS2o)xW1%MsTlXM3B&GuImb(m2^olA>9K*#HijqtR?(77{ zrE%|c(^TqkOMeh`oz~GwBTD+9%JmK94ju%}3}y)q&wU?-RD5rdP6~tj0 zDfr<*pi*i)x6iqmnoya^2k_f8C5hNV9ZhvT=C~4$%vIj__Zp_gbm})W6;sLYaGwoO zodvxM3XKhNh*sx!K)PJSoe*GTS#(v%foUT68`1{@c)s*7A0GkzzTOF$_L zi=t3?8$(91KJqwo#dHREHjc4eKyq@R-&ybr(LQT8kn^X|?Vy=2$JCy|1XU8sC z`gv@upBnuZUStVd*VZtX#jfWNo@_M+e5)_;#`v)M?@1WsDzyKhzO#mrt^q_f6I79& z7|YURyfxg4(}AvA)f_!6_O?AWsvoam?jLzr^{D;@k1`H!OFbx&kSzCl##laP#yF7K z*LkuwXjyH|HXO_kSZ@>3w)a*I|6HaA{g0CiH+ z`ghP8+ZP$NdGbCyMCOg~<7Z0P&lN`%2Q>ff67n^d3?``t(p;5B-4A1AH#Xg@VZXn) zcax;|S5=YS{uSR75R;V0?tgm%-y-18#c8d&oOhxFXI$u9*Yz!9VN@D=5NR1pyoCK6=AIc;Rdbw8?kSb#ea{;j_oFkW`G6?n;S^Rvy!&kHKsi3n zK85cT#j92hR0OiJOI<&-I&twtM3e9^6OysB+Zp#Y0LLTBw4mUsnBpOH+HYKiIZUVD zt}i<7;8zsh$@g@j_FsYJJmiXCX0q=`2G|gN#26`6BuTR!2>mk2$sk_S*n5m<)kei9!zwSQ|wMAa*0Jpvvm{ z|GOz;=CBglw=1W_F(~8+;ad$o_A)h+7!w*Eh*}_F@d!AFyo>Hqel4)6_NOhO0mx?9 zGhXO_D;=cmj86S3wy&%o0ZO3HZn*D4CRfnP;I z|6BFr8W0qQ?d1po{29_ufJ&0O2hXvi%NWLy1D~9yRNEk%1YWFe&FaN_?b|>7=aEC{ zEO(E-g$F6mbaae;*#eZoHog3v1phN!6;{o;j|GXCTJ}fax0aB;zvxW8@o?8!Y-)T6 z_y`AcDK*6Exi9s+gD=05hj(mRWz{{><>Zmny*%Pm8sAb1q(&PQc@~C&j&7~JOkB4j z`gd5mNdDyg_lT(%YE(K~N_4N0MYm@*;X3)aCMu28`6T7mKQ$jRmVI#q%cp2%?=8g( z$p>{@WlaZ-Pk-wvVd9KWViJ`5m1a7}M{T1#IWDJSmEws1+b$0of(~2+WeQ9sgMGdS zXsU5$vZr+r7r%{w1LSAo4`--opIMvi|Yeht~9uov)Kc zD#B#^L-)oBg)a&r3f^)ZrBkv0K{*GNCY3i6NJS{uY3G4mA9X};uWFX?6Qb?nQk^1? zyi4%T_w!m2lh>%#50khN9$S~y<#yJ4*pj{di3oRqAS(wov@Z zH6B?q^NwT0=tsNK13OoV1NRcNlsb9i9lEh4jjtTco$F?qwsw^|F8qpaYEtW#_PX>O z@!Y*Q?|`4vtRYfE%KwWE)%5I=(C5^5ZG~s4z?3_}B^I%;U>jB^FpXQ9wxtp+)5+}^ z=;c8^nP~^I(}~RXDn-8-!Hx z_}f3q4)*+ghkKvOy~(&uq_p@)itt}Jb4-uS5{Ai&hW!1p-Md94NE?|(|Mr&KVE;4C zWpiG*_t)Y+QtJC(ulQt+cHL@UDu0oWupI9(+a{)Zt8QG9+F~wrtSV%g*0Ce+kubNV zLzs$>83Hs=l2j87)5-UYBr&n<@u$`Id_GJjmF7IsdCpnRFdNI&AN|NQh3<@rxqj8? z8I<|XN16CIrKKwoA4k6mnWdd7KHw~wSe#}j%??GbW?E9h9}F!X#A%qSnTtBzRgegW zch$kc^zF16TCSEK-rUkAP5qr|lcZCot92i%q}=w0ui$#mMZ#$$V^1O-<^nD&k0i(A z(F;H0%6e~PW$@J!Pn96i_J`OKok<2r-nPIn z&o;-G)Z6SCw=7=YQKc*6q?P+>j1;4fa8FjteCOq75Y&odRDkN`@@=*NKKxCI9|NCob6<3sEbG(y)iWx*>;NS#Xh8&?Vx z`i_y5ey8iS4V2zlejG;`9=qT~w&u32t06@FAGq}c#a+yAU9T87du$=gyP;}!SsT6T z)Aw;ZW2&C<9fw1x@9?V#K!c^kdq02v4}VDvRUFLMOnvh` zXJq)$Kx!VU7NGkerlG>*BpF^l5vzc#KDV&^JQe$ANg^WSv?P|0waHG&EAY$i%BDtK zA(P(^vY3BakHLm0%+NUmNkfmnIA45IOMl4Az_OgY*|d^eL%|gT z-ZCXyz3w8NP_}Nvi!$z163JAZ%(vV$0<=$f_e0XSbuy1mOBr8WMu=#)b4GWI!XzOG z?oeM4FpacJfPGFI89Qw{pTwZuZ>#;BJ1%dx<$(sWg{wZ!A7Zh+V0Jz~ZBstc-doq} z{pY~sb3AT$Z@ksfOna8b5Z7nR%R-)!W<|fnZTjtPnpVj(owC-rr~IkkY5Pso?;CTg z-_Y%r(CD_Quwg4%WqSJ2#(4DgN15s4D=PJ*^#a#)z7`%Jmu!s`rW?>I@6lq=+Wokd zw<{y{j`)Z{jO+(djjNEE8$%srE}T=6}vG-SPir!T;FtZ&m+M=of z{(UaUAY1Fu6R0%K5^)2ukD!dGdM2?}u_MF069WP{kf=e+4R@bnF$4?#$UuV}lSY^I zVX#+8j?k2hVcXr4(#PZmC&*RC7?w4zj=*FtBC`sEpBuEs?q}&ns;xjZB#aV6Anw(M zueo?HftQh3p%RJkiYYZKv;N(fw&@kmJh1%!f8v4K{g1ePl1E9o=ez2qkq8Z@V z0L9B95Nqtn_T%8OJh^nP6xjlYCwaoa-)7j z1iTbI0H^u9IQ86T3`D#)iLVPjmwAzC#6YP?xbOcqSv7!;aK3F`LO+QJ36z}YEZ!r6 za{Op>rQO9|a?32A1_uQN$!>n+vJAoajOAHArx>Fmm^7Z5|27(Z4Q*ro@u!m=U)WYW zgD?~^`KisnnFuFD%x15g@8;AqZhWmG!WTaG#+EEn_uz%d;n}{AFsuou!Gn6=br?qr zR6lNyFB{D|nW+jN?j>XNo+e3<`+50mJI_k4=vT(6j4kxEG?>DM{5u|96Zzc1SRxOS z#|8AH962&xqERW7_t}^QH;+b#ZK1Hqt;wN-R){GXB9_qZ5r~HoQ0J~bK9z$uEacG& z1o{or+zz>zHBW29_y zuDr`#x4G(O9SbT;OXu!M%w%-&59Y04aD#XIPf-j#xmbNe z6Rf%{`JV(Va`nj-M;YOAXF3Z4Po9TXs}78~(aa zBKH&%j7Am|iHV8YP{!e#Qnr^g@b-hCi;F`x2)mtvgZ#v^j^T7ZiNNCxy>-fLOdp4T z<*UKUzvCwjzST@BVM4+Whig4wO!o9BT|~CyVQ@e`j9lR=*> zBfpBV`KINrx}K=e9(n=bY>lD0{o!-Y;Byb;4F;o|!cs7naB`An@#n8F;LmX|*A~LZh|LBET+Y+zF zz@SrpTTJE}329bs9YaA-_rdKvR(xPl`4UfHkW*|uBqErlQS46G_FLrV+wKLQ=q=$3 z@vtfa4klLC7yAEblMg@a4m9pRuyn*d)*EvnGn)9#6x0-Vgux<)oNRqcm<78+$Ex&>6;E8RaW=w_AKQW zSmZ);2Q#!i1q-EI*EL$D@plb4Vohw9_>e(9`(|jNY-B@NjB~w~?~#%W^1{PorZ32* z#m<$atVFGBEZDgs@GuFHWVC^d=Iy46FU#3}8zan0lJ6R-9UEuRWk&E8Vw zpT%nB)dOGSdF}gMM-4@}XzT>tbUFW|utZ z`Ln3)-?Oow86}1tfY-l&#)0^?6&khz<`~GqRN}QhO35f>s}q?nr!SeJ@qkJp;X=YmFSkrGnO$rohf&WK9wGCr6!4bU*8d*iFWxcBqpRlSRrhcPP4gfh zJ022l0eL}&@K55Q*bGeODJH)^G-)yCE4e3M*W@`w`_Iz37{G7>=lmEJ8BcEAv@Ed6 zyJ9NPj9#;f#A1(l?rDP!ey>=ZuWJI1B|Fb8NHb7H0(1k4jhG0uwen3n zLUAf*LW&^?54|M9lk!K+adD=(riLlCuAi7U<>3 zB2ReS56eK>?BeMa@5dC#m(JKBE(-r}?2~`=g|ClFo}P(bz3U8bP%zrGVYF)?+w{Go zs4-w^hL|vDr!p0YI#Qm-YuPZS;5&DN)LOsU<0i zMMmO5otxz7_YE0g;0fAd{@99+^cd~7)1X_F9dYrv;AGV2HE-N=nWym33#TCeR@BXZ zWySy*a}v=~i-*H#R@m#;uV2tA^Lg`vO*gH}#`0_}b<=x36X6*tJ-91~oPmT{mgglpEjSUGNsk466(wqT1;RSWoEEg14K6>XZ~5rrecw z>Y8`&C8-o%O_B&@3kq`nQ28db+?Z_~MdABVvt;U2TJKoz8Ty0w-HW}c-|Cg8PEwk2n2)$^1`KU-vLN}b~N0p-3nEk@!L%$LIK zYF(8um=1hJJY6$biGFkKky(Ly9`g4xG=fD!Gm?9(tegvs&{yd8-z`gWyJJ$zY$ri$Z#sVoz03o?PdSDYdf%p3>;>Or z(|eD;*g}sJBK{EVQG*-jS})9KIxk+GmkAEC>PbKa+JB3+Hf-mVt}F!iKrw6{Ij3JV zE1(D;L??{wFZty&qB1%b8IPxU8NssC^VV+BvI=f43{R;2os;P*#KVh!YuC{#w9@V) zhkjJVgPu|ag2?J5pD^bj#_sROUAhCO;LO_(7KU2(6rv1@b5`%K^w;Q7ZQ}&%<(~-H=pbLN#gi(cJJ(p3a@af zp9NXn)#y&mnt#LeoNfzq;#N2~TG-xpmLdW62%2{RIij788F_maBy_Bt7*azc*Ya@A z7=(yL%x8rb$D5Q&7;$`&pMgqPC3~!TFW#$3e2#EU7SBTfMU43UuAj>vt{(&+ZoSuL zv)`Hkb@#}B&=*x_9h?i}00*BvYlZQej67Ny{B$YCOOLvKeC z`xk>lk9)~srqst_YZ_}bYk{SxcLNqO*i<}$3P^xa`yT6hHL2}uU|Q`HGNiRX4%jH%YUb-2r zntqxUULU;OH<&Ezx6b_c7ona#btij(DGfOL@*Yp-_4yMin~n_`f=~|#B;OK5sd&uq zzv^3uK3OFYW==Yk&Uyl4su=bf&BCS)v$b#H#2>@#fJCQfWbC8p71-R9s08zrKbuNb z3zIu+Q)6JA>f5gmT83=TW{Q0G?rY~I1RJRkLyDqS!1C^iPGokXMu7M3Tun@F(d>bi zWKBd@^`^U70y~8$B1g*^#2q&YejB)Ipp@SIAh@$ve*U`*VXp)IgZV2@O9tDw?yFt7 zw%ASo1LF{eiBDQwy{qg1?G%B}>m|c^NgOdTapnAOOPm+4HdXv}UUv=sAQ(3&`hb~W z%F*8e(7oe&YdSdemB7rR7Cesq|MdcN8XSLmq!O6Lv87}ft)e%4SPL(_<2K)}d?KXc z+Fke4&X^S8xJHI>wiB2l#*oYQjPHtow)dBw(jqIbf90u%G!9(2M-hs*yq~TIG?Nak zfVd(|&vy4N&SG{`NmV@ND|hHRb%X-+(JSKDum3#8t_Tg^lP=2{6eWUOWB{y@Ht&9` zZxgaK_y-CEb*u|TnE&FeQR=Y1LhD03vkVdtlDJ>h57{ZkVGc~?glknhq1etBaZ92< z^VK)#o^d0-{3XX>XdM}=!)Qj@oa;rEv;jDfNL!>6=%YX z5*$%`ekaIhu|RgQh-0lX(lmo0kVs-YPEL;@lJED1blkEUaGVphm8Zcw(4GEVA2D;! z=d3RL%W-DaauKFHHKd}VgiS@JV=lZlcx`_E@u*X_t!f%~wKcrZ+Os<;yZchJ>$1x? zN1nA-TnP>?ehhM;T(D!W8jCG<;l6uPQ%>$?0XzmTX&AHW7mw$_ zQvYQ+Rk+RH2gWu^X@^bngm&R;Rt5bxTRo5y@Q@v3+XWUKR~pNod^V@E)Z(=@!e-Oo zEc1*b;7Y*QZ9&8zeePiciWP(a>c9)KVreFRengJuT|T?|{7LtxvzI^2Vk}4^mbjnY zz)HvyJ)Fhb=(FD-53&-HY~@IOmF^@G-?kma=AC^7Zu8?Va`h)cD69n`^1j)98Ay73 znmbt^G|rrGnM;+!Nu^DlFXOdojYNsguX@vpg%2k@@-sN&?p|s+oXU!(YG*Og#P*RQ z{@hONynzQ2O)VY%bmb*;Lxy+`NDql}NF#bPLVi{QqQ@J)9;-^dcM^wJZx4f(tYz^5 zWw{7_<21wm%fJB@Y+*YO$%$J$+eP7xauiPu1-OOHlZwyey>vre$@KKUf5SSaZyONi z`e%b%7hjihCv)vzXonrUI1%m`${<=-ZrJjz2}F#PLq?%RY~s&D1s_M4d&0N?=dVbk zPr_hK-Rnm&|X1W(<-FesWCCp!t5AJr$|%AS2X z`Hl$#O+|FMhtK{>@f~(Tu3c&lzQD@4NO{#BaDMhczY0yJf>LKb1!g?~^ZlZI7kp0h z#e_ZmD+}htqY4~>@1}8I>1dW@f5aQUK+2Cg)s-W9dtq`4)#BvAw^ks6k!KVa7Uv~= zh+9lMF3g6Y900>4yCD4d`YW^ORU$9k>0JKnJo@g>s;_JRr1WotS>DSf4zlfha4mQ$O)HcvwO~*xV}XaAed?m*foQjxWK%_lR*Qy26@tPyPjRChWU4cgQ?7E z;T@XAX&C4E-`|;k_#ZqL#s1J9`v$w>`%?~g>O6j@r4K;vL4A@f+pgm7gly9mmB8Wb za7|3hGLSlVP)h~<$0y-M)rmgBlV+6HBajUU)-Y*%jD8n_$cY}wBJ$6en&Z{lEem2+r%v$o?%7QQJajsym&oyofa{0%wZ+OBSNHPWlxJjg(_rClS@)f1@ zLbvdV;ZqCv%rg?in+UiR*Ns{`Sta+$Z!#@^4((|eHFUE`+Gt>mhFH3Hc_f% zr1xwb%KL(H%%XlSbf94Mgk^M+`7{QMk5Gct;sg=URN6Z8s=s4WMq58hQ`YC-fLu9;dGlwET>v?AK38#Ls`pZl>cf_6)cE z-lD&Rr4%wr-%P4&sselSAB85y$uaBp_1j`-gv=Fdhdr-QyeP%5G9nQnw$iQO1}mgK zhLrmAQ=k^Q{Z5)q!>(GbOjU)y71(xfJOle7yap0O1rNi&Q@`;&iuCs$Ka)8cwD#oD zrKyflFVNJ;JGV>kUZE@b@+o8z}{+U+UbEQ&dvTl}HrPiSCqh=&M+#-nMk(0ugm zfGN)<{~DMnFhw6B%hxF*%1+Ah@zYr-NTv1sqUGAU9`@w&9w?a3GDX1`Io|pQBwOWD z9&AmP&TF{dzg09i%vXp=34e8GG^_3?9r@!TNkIHb#Li4-`=tZh&(G?59@qNcMppuf z#}er}If0@tH>ZQI4P{R7;-^S1I;)aR`}VN~grL#)$qbS^{0~vn^J5ls;$l0HAE0mz zEFN8tOZz&f1kYH*Vq^)vog=-JS5GG3TP^Yj8{u_W!s~16rB-m_V)(?KWytw2wqJ zm$mEJv4HGv?Yof!$6-UxX&F(4?WDI{mdZAJ1QRuYb5+Xy@f`_q@gYVW(!y286^%9o zhd$g8dkovNO4%tQ#+gdy2hPw82@~*>s94tks-OYkjOoApjqJ4G-_`;{d_bd1XKN^v zM3=^KvLH^{hzl&vBp&Zhk3%l64& zDnsmS>DiOV_~p)Lp8Hm_JN zzu~Zn`|__co`;svG1?r_tYSLmudLpAf^4D-rF>iM+rUS{r<4=_wV}O~S=r-*-`}jd z*58nUln7q(EqjoGj)(|c8yElxV=+N-hM+L;1#^*)wX~a(#<{e&?x~~KdAU0XmW?CC zKy`zcRrnx!G7+X!QQ$|D9e$zrPq=Rf3=R)A)p3`eMvwR25nRY@i}oz}?+Y~zctcdy z#uQud0*GigW{D>q>480ohh_R(5jH$hb=SVKCQ*_93p^_&6Su$jwmx|oY!bLqMBB4R zlp_MpMcLB8wDS}Wbk~v)zY+63uMv~@9!kpY3&rJN906u4JUm@DozM3hF>-QQ&Nt+u zgEfHIgl+inw&-gvfNxz`+i&5w#ne)3j8)7IvMVaZ;ZME<(3s$@_3F)K=7)=~1dH*Q z;A2(rfM|xPG_xgnu{(Cj6VOV4txo(!<7&L6f?ls)5U>#oS77mR>UdTx{C$q!+yD?n zG3M2RX3-}2LJd^yI1DDg!#5|vAGA#7qw8lvEIddw%Kn0!_mRnW)@Xre@O|WQKR$IA z#&h5HL>VG@ey@dot@7OxH86GOf)U16?9$wWP>{tluE;z35pY%i(?C6m0$o)R+Gl^h z3v{7g*46NaCp>T^k*3Y~xjgSqJ#_G!`o{bS)qoTMz9OKzM>Hj#g?-LVqWi^cQx`pv zzqNY&-oB?#@bn&|7|2{&?r>|Hy2)4$Wgh_k3{jj@9!!{2eAAzhd`3GfOe?Z@mb3`h zn6oF15ElV$+0^FS(ey|g$W@bxm%pbI$YqfxpWa$}Ednm5`pWs#yq(shlL3}s3mz=7 zCLJTWZUwUeHWU082P_n?jEuUW2Z%OMVW%JS%f|XqOAVOYy+! zhBMU^d)UT?RLRy~;)<#l#ke1ubEI~(-S!DEd-@!7Myc(z=nWCe#heimn z2aN+u`%@wmKDrP!D!VG=2KfUve%r3=&n=I;a@?EzV z3cEL5Ui_IcG9sC`f_`$j{!4}Y`)$R+^HBLDs7hJI=z!Cy8SV;lOo-nOPMOfA2>A1_ z#}IR^RhsH`@+(QJ2Y%R<1|)vRAa^D3^%I`m(l!Q25iGXo=UJlG6Up!7XDkCf%xve! z`UFR#5!O)_s1u66OFKB*pw}{>A1FIe;uFUjz{8LzQjzHyF7)E17b67G8?;ul4dn&! zU3nAvwii~|-TZ9EuSPK{v64HZ^^pyfw)79&7k)D)=BS=i^!>PaNj3eo^<+OZ@uVnF z*rm{0TyGd-b@WoU&no6)gT+%(t#g!TV_9G!dU;Q&|1475;*8=Dcg&=Iy96xh4(@1W0>YsJyL{GnhcAcwkchG(DN&MuC}l=Z4;O-=E_ zjitwiRmsVU4GFgo@-+PCKg{tR_$0C=XmtWN+>qnhn_z>K!&a|K5^<;sAr=(C`*za$ z^iwuG@%O03H2kHT-uVNl-bQQax!%mO4~f;;nSUHIna3^L7-T*T#>8A7g4E2)9{Wz}^_49pn+5^Kdh90Zj}Q>?xHeg_xY+nKgwn>yAOc@rkA z<7EX_vM5&2w(FFD!MZ6e$?;vXB&T~)?{XETa_cAk{uL=8^!_M@fYK2QLQDBiu&N(* zx1Co8Z7D{4%VWSqAr=t!mc0oR^4U(KcD>9Q3?A#h)v+n(P={YQN>f? z$oxCqzi6asL2M`?G$YgS0p!8Efpo&p+MT8QL|=Wnsy5)a0w_9YO$JL=#H862&%U`L z1h#w0%Fg2S8E*x!Pb!>{V=>v*qY(<}73xI++3>>f}@SIS9hvly4 zM%*1Y%jTdvDRp6yJ*z#-d!DWnt+EGs*qb{Z>r1r=9f*qE7z3-g`CrDSgbo5lhsjur zseQ*BusES2YZ=6&DE+4WS&>fHx_>NDewn*nxi{CRVz1% zwSl}cNmSJpfwV6HctHAUXN^Lkl+X;Y(WO1UI6tco>DM!_w(9>hXwew*TksXd-k7c@ z^(x1y_gE0M=Img!p{L9ONP!KtL=W;HjAaLdZc*SD+uaU$I&OsxS@ICJ>_{xbKXJS# z7#&%$($14M$Z&;xk3TY8hAorV(Gkc{tlduNYK9*eK1)!^P@ME50E6$bmIDei3P;y$ zxafS`=~m=vbDmjL>tP)wpQ=P`c{>UzOtf}R#y^j(g*x^{Q5h5}#2vV<7@STb&DBad zDrK1Y6?&TtzK--;)|Pb1ijGv|YF9hVxekm+77$*(B|-FVm-nzLeyf)1Lc$2qBS1Tc7AzWlE zkZq^CWGyQ@8BKKBwvW@S@jAQtdB`>v@imSXFRfFUjR^HZAb!%4AlYxiAxEj&qr8EQ z%+?>cwgscvJBfRO&D(+6DQIW8f9IL`s{@H;7^kg!1%4u9qCigL{>NJc18n%Ey~2-M zLSn)>k_;flOrm0s8+-6gxuysPD!vq5>|WplGR=pQ+BA9Q>US}1L)xcfd-iiTld8Lp_z+- zKWJKnP}e%OTLa^+9GvxXnfoq1idTS)loT&!r{|d2oC~Pd1s-M8jxtbvuAu%2Mc^Ba z-D$3l@fy%e!UkUszBcdU_Rn@y%1bgQa>Lh-VhK^XBb?&F=fbv#!*`Hl;zV@~1c!5P zUbCCXi@fG~&BfCq)BVFXaDV$O7LH;)QAl44N@#43iAZB#sC2VpG^;Rr3Gd}W$h_K@ zB7!6uYRFb$J%2Rmx{#aQN*`LN^}Y_52XcB@zDtcJqC2*BsySGbp%405^yYL0p^8$@ zZSZh`pu43om`@z^^QOwd{(hrDz&!JiWns2`>S_ZpwyS6!GqISZ`DzrC)7Tsp>BLyd z4ROtr_Mu7VGkz5w4!tBybjyGgdyO(IJvO$_J!xz1re^lLbt$~NJg9i!3kq2pahPZn zuA#Yie7JUh&BfCmubrwz&p>{_XKflkPZJ_e(E^VF{`pPbZ%LA!P0U(3?C?%oCIboa z@$iry+y$_(DTFsiZqDLS;U9A1Cg)$qXaKIzl< zu(i*0S*u*hcgXmvv9^2J=<4Trn@YTe`serP{WqHfR3klV4SY6S>~>!2(T)6xu^8~$ z6S)D4kAf8WLQO3(_pPe5c6LT?ohD9<B+PGjND1l zWcudtO#0$U5y;n&ac7DPlyh&kkZFd~(L8JZ>UCueza_!JnP)Bw z*T)y^AsZGvsZ(15nccC1ShM(B@~=8tLqq$2;pf$EaN0##iZ@manh~%>k6xS^ndc=$ zjF4T==U=!!MP^UPXcUKxIe_Ty0i-P+jS9D>gl-l6#tGw3NkDxRZ7J^NY^+z@_pK$w zFX~yx*y=cG=zM3765YmGKg7MHDh-;mw0`!01F97^n0)K|ZrLM*h4+;zenO5rekq4a!r|rYWj>`F zmk4jAM=C0O?}@6#$tLdo@-tHKq`pu(V!u$tzn1;kLa(iF9OvD(iqvGjbFL=_9(?j^t7#?b!$>E{8Xcc>Z zNbM^^g{SE(z+KeC4<{^l-8Wza=Q4v-1^||^4QTT@Rr0`}Acgre^Ci;}4-(&d$G|FG zL`Xco)xTBvWo?a}Qn@Ai4O?J__U+)r)m5da(^`Eys`<*ZM%kzx+}2lo7uAC$w2tjd z@&t@z=$m&0@(W#oQjN}*Gwgl@a1fTd%{>F|qk^zWs9r*5M>uT@G#I@f)+xYed-eDU zG+`S*VF0g;uHzZNqaV{{!nW%PzTRyKWA+v}GF=Nrd?~%iB>=AT z4kX6%Q|1PgN$S}wk!XZ`#3aF_)+F1dWK(5V*FubL+EM3jEuU`MCKldkthrkK`}$6J zriso6pX4!!s&2*u_r<0-{P4@)GioSwJ3yM{YU_*n+LkL=792owM93=9jwdJrLe6Nv zueY%t`93A!kpW0?ND`tydA21PpF_iDFf#bDv>;*5_-S9xh_{QRRH=68^Zn{&IhD!8 z&>RT|A|F=D-BQ-@uOQ5IRgtE{$J%*L0}H+hbM9nL2m5J1r>Abp4UD4WS@J2-L)p@k z^D<-SrLj781$B&CB3XJes~n-5>D}_L&pPp9`WJeDF{MNk!HHA6SQ)Ho#bwGSFP*Nu zbG*d$anayYq;9GZPgo%tI~Tm3p5`V=^moVmg7!0;HbLmC?Sq5z;6-VqL7xq4=#WCP zlB3No?S**Zo=DOgDAU%DhoAtmqq~jxfxR=#UN&41nnSeS)!f~A$U6Fj*f`ye1FX3e zo=NyN0X9_+a5z3Ee0EI6agrO887UHKy^WlnR3#qwm%l*>@uPdC2^eYBRb@MDApqnx zmhvXPL!&&r)3NR|_{a*>u{o*1UUfZMX%h7qQUc}RNu{c!vP)IAeL3`QL6*H(9nZPt z#2hGQ*EN@AtfMWibCUA!QV;sroVeh}_R=3FusBWoKDJBL);a0On%^+G)0h8Y%vpYB z%bAlsdME|~F9_fOoOd+M4dWjiCkYE5>Q1?YY5V~;WbX49rY_v~yB-r($({OQ=-u5V%kpq5mi#SyR$_O3Kmnw=0|AjyQ>kqw z0ttR{+7J)C_L_HiX36xP_as}cA34vuf+zhW$u`u8~US}fMputW{GD8DZMZk=- zJHbac)-)Q|uJS!M%at+r^RLy|&7Pt#;i)YP2~9HA5A|V|CoaQ&gnn*H#Sc;k86x;; zD(Q=Zfj<(eeZO!*8P5-h@Y%+_MQWHoLAV=(uw_f4P|pQH0%G%{d}V{t-Mq{D&R6;| zP4`wZbc+%qGR)n=T6%05s33wG#j$Hkjz$E*dJl*|hC+w{0~M9Ql1!i=u~1e@8#h-I zvZE|&kMA%y#Bpv{=!%gRDJKvzF~C}&j;cn29fu#j1SY)>U5O^vaILs~6bBOm1o!_4 z#g=d$df@QGXThXLjVuR02pHutLnN{_F_0eF}{=WXG$SmQb zrbKg|Xu@-eW`4osvWwVXrv?1o+9G$8%eH2puJec5U@FIE=Dt7Hy)S%EBtRh(5-r#QmZArRL++q6N@ zNc6<2tDgw${rhMUYySoZG{tiw)sqlGpuaxy(lVE~<%x3<*O?-Xu1J=vr3Q@B{=AAKrglRUN{h z;+{8slFqF<@-@)nNfx(hf_2_xOD`C@?bk#DnCH4@E+-Hn^M9b~hf z@09kHyG?yLjY_s;?UuR;2Y23fT&m=H_OO@}jWB+oOj`&P0B!3N4%kVUaB(&^R&|%L zgc!O7WM69OEq0^`TN4;H#2(gzyBK2ZZ#k;jc}5XZP3=766UOMW7wJF8>m*&9ec9P0 zk6b?m>m1Bs9%|HahMFJvQY*~G3PGIa*{e{rqfelxl=xk80mcB%iJ@x^HR*)AJ{QW} zRZ6qQ_WUGzv|${7{q^H`Xjr(uTW|HwEr}sb1Q(~~c+m#Bm-ycWE{S6T?ezZ{~ z4zh=PTdlS4MBIvnp}L-7@=AeK!RE_#4>lh`%zHiw8>)i9_ilaJVLo^AGZ7!OMji!i zPUJdJPa4{+Up)`ox-D6+`F{Gaj=cx%E(P7jHy$#)8M$I7g82R8tfRIqVJFVL_~z-q zDTg7!qtMX%joBoB?tWP)dHdl10^0{9_!7LSb&&b-O$5mj1IInc+>Jp0fKJD7JBQx_ zeAO&C;ke^?-m}hXL4M_}oy#?Uq6317v^?* zcoBMPu*0%~x4-#~-1oqPY}mN5=w6#0G{)5nXFo5)4Y+IbTNz!0v+lg0rwEI(ZThS{ zFZAT2Lg;x2O9Ot4_w$Ya&$Wi1Aay< zATi8*U(N5D@NuoiiHnct+!s9GuH7r1=XC*07r|=#Hv*8s1qc`i80oqIHv?Y>{vj(k z;;=(`%Nt+MrQiCtUBh}WFP9rrev-%EjIlx8-QApi>M5Lf!eS;(oXFaB>oiFnD?k{Q zK=WCDEAsg(hG~HVIv=~TGSEK(rvoQt1ur@8Tvn`H$?vYa!9LR<7~mm4IoXskJ%~av zZ{A#a>1w8lJXL0nAM|kfM*J6?+(d17j4mF4THYL6@ z6j`|B&z=|fAJF00)x|-V0B;60xzOgM$&)zij5Bz_^Pa=Zo}RWI8rNzhN!r0jM8$IAQB>^$H1qp? zA`ti=(BT*j0RZ?ca4gy-0ASAS*?jt=AK^ov_#``bl-H$KK+lYQIPdJUdG1-yV9Jy! z&F;SnxEeh}F<@8#N}wWzP{J01)HU$>{8i+4f`GvS21qboD zPkfw@Ui=wL1Qr}Lp9{`Ek29Zs8ns%}SGXJ91^FuUVx+kM)M_;nnV?iUS*S3DKp;d> zUY`83q7Q)HDe?gU9gfiw0Dzsqi-4Oj77;o8&_npwPkoY)e)=;UH2*+e@zM)8<)jl^ z1qc5Gd;$1B3Pap7BeLt0B*|<4jPO!KdJ1qQthozY1p>hqfv_@AK&N9g1puHQcp>ly z;Lxn_(1RCp#ijqrl*yBuU0Vl!fL@2-UeEE89}!0}gN?yd0LB8** zV5`=PfPhZGXbS+qTHrarjTj=(g#7)$e*^yktZs7Ok^n?eL?cOvM3kHVQba_esQoKD z1%Wphm=j-!Fds-j$76R00KnsTM8LsnH0l2vEds4Dh;|3^syT|Hv@d{J<10;kRZ;Uh zwSQ$_fUqt=z&OC}5&+O5a29$}(X);6yMTWOeuy^v+l54nKyFGzaip69h0zL-uKeS= z0PULp0+CBhhyet2I(DZ30IUIC0342v;;#iB*oFJ;#1Mcu)=hy~jW2}}^{;XP$T|dJ z?30TE`F@xZFrf3Xy9FS_V`lf&v6| zHl8X07%fwp+Y&LgZ`l9pc zp4P>$uepv@t5+AKm$Ic5fSWhBX+9VL0iBMqCIB}B@5^?kb#-yU3(x0*7oN}k4?WCp zuf2|2Zo8cwJ9kzG0BPa>kH7^uaNij``_v;D92_8yBjP9`iu5*)BBD4ViiC4a4cQ=RBqT|LM$({>=zO+c@HjboU^B2VsFP-vj8M; z0eaGqHvtpe6DCZU!0D%+!s(};f|Qb_%U5vMJ@<0wz4!9KLl4tvG@7~qPy_?Vm^cOm z3>#z30x+>3@OS8C$`-bB!OnpJmM&Y)W6PHD*wSSzS+*r7Ckud!Zs26}Vy4;l2u8L(Q6jmWRy(;4na>`nr-I* z^V026cv>0)0y+ibNdSBp1RhG04|f44Jaw-V5b)F@n7;u5;~4)RMPU)-0DYRu00000 LNkvXXu0mjfCCwzV literal 20730 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

kg8u4k?Czcul8*14ZyPEhhsmG~* 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 hV&MpUPQm4M!fmN8K}2>DkZuS9UBFnIzA - - - diff --git a/Resources/Textures/Logo/source/EE_logo.svg b/Resources/Textures/Logo/source/EE_logo.svg new file mode 100644 index 0000000000..236919fe2f --- /dev/null +++ b/Resources/Textures/Logo/source/EE_logo.svg @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 311b86e012ac7d40363b5027ab51b09c9d2285e2 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sun, 22 Dec 2024 05:26:41 -0500 Subject: [PATCH 09/11] Loadout Modular Functions (And Loadout Pets) (#1366) # Description This PR implements a reflection based system for applying functions directly to entities spawned by loadouts. In order to provide an "Example" use of this system, I have created a "LoadoutMakeFollower" function, which can be applied to a loadout entity that happens to be an NPC with the Follower blackboard, making it follow the player who purchased that loadout. Basically. Pet mouse. The pet mouse will follow its owner. Yes I actually have tested this ingame, and it works great. The longest part about coding this was me spending almost 30 minutes straight wondering why the mouse wasn't following my character, until I remembered that I had to make a special "Pet" mouse variant that had the right HTN root task. This could be extended to other things. I happen to know that Nuclear14 wanted something like this for a Pet Dog.

Media

![image](https://github.com/user-attachments/assets/a18b026b-07a3-4ad7-8cce-4ea4dc4c3036)

# Changelog :cl: - add: Loadouts can now apply modular functions to items upon spawning in. - add: A new LoadoutMakeFollower function, which lets you buy NPC followers in loadouts. - add: added Pet Mice, Cockroach, Mothroach, and Hamster to Loadouts. All of which use the new LoadoutMakeFollower function. Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> --- .../Systems/LoadoutSystem.Functions.cs | 30 ++++++++++ .../Clothing/Systems/LoadoutSystem.cs | 5 +- .../Loadouts/Prototypes/LoadoutPrototype.cs | 16 +++++ .../Locale/en-US/loadouts/generic/items.ftl | 5 ++ .../Locale/en-US/loadouts/itemgroups.ftl | 1 + .../Generic/miscItemGroups.yml | 13 ++++ .../Prototypes/Entities/Mobs/NPCs/animals.yml | 60 +++++++++++++++++++ .../Prototypes/Loadouts/Generic/items.yml | 53 ++++++++++++++++ 8 files changed, 182 insertions(+), 1 deletion(-) create mode 100644 Content.Server/Clothing/Systems/LoadoutSystem.Functions.cs diff --git a/Content.Server/Clothing/Systems/LoadoutSystem.Functions.cs b/Content.Server/Clothing/Systems/LoadoutSystem.Functions.cs new file mode 100644 index 0000000000..99ca8b15c2 --- /dev/null +++ b/Content.Server/Clothing/Systems/LoadoutSystem.Functions.cs @@ -0,0 +1,30 @@ +using JetBrains.Annotations; +using Robust.Shared.Serialization.Manager; +using Content.Shared.Clothing.Loadouts.Prototypes; +using Content.Server.NPC.Components; +using Content.Server.NPC.Systems; +using Content.Server.NPC.HTN; +using Content.Server.NPC; +using Robust.Shared.Map; +using System.Numerics; + +namespace Content.Server.Clothing.Systems; + +[UsedImplicitly] +public sealed partial class LoadoutMakeFollower : LoadoutFunction +{ + public override void OnPlayerSpawn(EntityUid character, + EntityUid loadoutEntity, + IComponentFactory factory, + IEntityManager entityManager, + ISerializationManager serializationManager) + { + var npc = entityManager.System(); + var htn = entityManager.System(); + if (!entityManager.TryGetComponent(loadoutEntity, out var hTNComponent)) + return; + + npc.SetBlackboard(loadoutEntity, NPCBlackboard.FollowTarget, new EntityCoordinates(character, Vector2.Zero), hTNComponent); + htn.Replan(hTNComponent); + } +} diff --git a/Content.Server/Clothing/Systems/LoadoutSystem.cs b/Content.Server/Clothing/Systems/LoadoutSystem.cs index 1527db0be8..4c357c5864 100644 --- a/Content.Server/Clothing/Systems/LoadoutSystem.cs +++ b/Content.Server/Clothing/Systems/LoadoutSystem.cs @@ -13,7 +13,6 @@ using Content.Shared.Storage; using Content.Shared.Storage.EntitySystems; using Content.Shared.Traits.Assorted.Components; -using Content.Shared.Whitelist; using Robust.Shared.Configuration; using Robust.Shared.Prototypes; using Robust.Shared.Random; @@ -33,6 +32,7 @@ public sealed class LoadoutSystem : EntitySystem [Dependency] private readonly IPrototypeManager _protoMan = default!; [Dependency] private readonly ISerializationManager _serialization = default!; [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private readonly IComponentFactory _componentFactory = default!; public override void Initialize() @@ -103,6 +103,9 @@ public void ApplyCharacterLoadout( comp.Owner = loadout.Item1; EntityManager.AddComponent(loadout.Item1, comp); } + + foreach (var function in loadoutProto.Functions) + function.OnPlayerSpawn(uid, loadout.Item1, _componentFactory, EntityManager, _serialization); } diff --git a/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutPrototype.cs b/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutPrototype.cs index 38a356b1e0..ecb3c3fd6c 100644 --- a/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutPrototype.cs +++ b/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutPrototype.cs @@ -1,5 +1,6 @@ using Content.Shared.Customization.Systems; using Robust.Shared.Prototypes; +using Robust.Shared.Serialization.Manager; namespace Content.Shared.Clothing.Loadouts.Prototypes; @@ -45,4 +46,19 @@ public sealed partial class LoadoutPrototype : IPrototype [DataField] public string GuideEntry { get; } = ""; + + [DataField(serverOnly: true)] + public LoadoutFunction[] Functions { get; private set; } = Array.Empty(); +} + +/// This serves as a hook for loadout functions to modify one or more entities upon spawning in. +[ImplicitDataDefinitionForInheritors] +public abstract partial class LoadoutFunction +{ + public abstract void OnPlayerSpawn( + EntityUid character, + EntityUid loadoutEntity, + IComponentFactory factory, + IEntityManager entityManager, + ISerializationManager serializationManager); } diff --git a/Resources/Locale/en-US/loadouts/generic/items.ftl b/Resources/Locale/en-US/loadouts/generic/items.ftl index ac52b8be22..37ca4f91fe 100644 --- a/Resources/Locale/en-US/loadouts/generic/items.ftl +++ b/Resources/Locale/en-US/loadouts/generic/items.ftl @@ -42,3 +42,8 @@ loadout-name-LoadoutItemLighterFlippo = flippo lighter (colorable) loadout-name-LoadoutItemDrinkShinyFlask = shiny flask (colorable) loadout-name-LoadoutItemDrinkLithiumFlask = lithium flask (colorable) loadout-name-LoadoutItemDrinkVacuumFlask = vacuum flask (colorable) + +loadout-name-LoadoutItemPetMouse = pet mouse +loadout-name-LoadoutItemPetHamster = pet hamster +loadout-name-LoadoutItemPetMothroach = pet mothroach +loadout-name-LoadoutItemPetCockroach = pet cockroach diff --git a/Resources/Locale/en-US/loadouts/itemgroups.ftl b/Resources/Locale/en-US/loadouts/itemgroups.ftl index b6221e8585..8af87679c4 100644 --- a/Resources/Locale/en-US/loadouts/itemgroups.ftl +++ b/Resources/Locale/en-US/loadouts/itemgroups.ftl @@ -17,6 +17,7 @@ character-item-group-LoadoutInstrumentsAny = Musical Instruments (Non-Musician) character-item-group-LoadoutSmokes = Smokeables character-item-group-LoadoutBoxKits = Survival Kits character-item-group-LoadoutWritables = Writing Tools +character-item-group-LoadoutPets = Pets # Job Specific Template character-item-group-LoadoutJOBBackpacks = JOB Backpacks diff --git a/Resources/Prototypes/CharacterItemGroups/Generic/miscItemGroups.yml b/Resources/Prototypes/CharacterItemGroups/Generic/miscItemGroups.yml index 3cad4423f5..cc1e82ceb6 100644 --- a/Resources/Prototypes/CharacterItemGroups/Generic/miscItemGroups.yml +++ b/Resources/Prototypes/CharacterItemGroups/Generic/miscItemGroups.yml @@ -121,3 +121,16 @@ id: LoadoutBookRandom - type: loadout id: LoadoutPen + +- type: characterItemGroup + id: LoadoutPets + maxItems: 1 + items: + - type: loadout + id: LoadoutItemPetMouse + - type: loadout + id: LoadoutItemPetHamster + - type: loadout + id: LoadoutItemPetMothroach + - type: loadout + id: LoadoutItemPetCockroach diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 6e369389a9..1ee20cdcb6 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -404,6 +404,21 @@ speaks: [Hissing] understands: [Hissing] +- type: entity + parent: MobCockroach + id: MobCockroachPet + components: + - type: HTN + rootTask: + task: FollowCompound + blackboard: + IdleRange: !type:Single + 1.5 + FollowCloseRange: !type:Single + 1.0 + FollowRange: !type:Single + 2.0 + - type: entity name: glockroach parent: MobCockroach @@ -575,6 +590,21 @@ enum.SurgeryUIKey.Key: type: SurgeryBui +- type: entity + parent: MobMothroach + id: MobMothroachPet + components: + - type: HTN + rootTask: + task: FollowCompound + blackboard: + IdleRange: !type:Single + 1.5 + FollowCloseRange: !type:Single + 1.0 + FollowRange: !type:Single + 2.0 + # Note that the mallard duck is actually a male drake mallard, with the brown duck being the female variant of the same species, however ss14 lacks sex specific textures # The white duck is more akin to a pekin or call duck. @@ -1769,6 +1799,21 @@ enum.SurgeryUIKey.Key: type: SurgeryBui +- type: entity + parent: MobMouse + id: MobMousePet + components: + - type: HTN + rootTask: + task: FollowCompound + blackboard: + IdleRange: !type:Single + 1.5 + FollowCloseRange: !type:Single + 1.0 + FollowRange: !type:Single + 2.0 + - type: entity parent: MobMouse suffix: Dead @@ -3418,6 +3463,21 @@ sprite: Mobs/Effects/onfire.rsi normalState: Mouse_burning +- type: entity + parent: MobHamster + id: MobHamsterPet + components: + - type: HTN + rootTask: + task: FollowCompound + blackboard: + IdleRange: !type:Single + 1.5 + FollowCloseRange: !type:Single + 1.0 + FollowRange: !type:Single + 2.0 + - type: entity name: pig parent: SimpleMobBase diff --git a/Resources/Prototypes/Loadouts/Generic/items.yml b/Resources/Prototypes/Loadouts/Generic/items.yml index dafe7c9ffa..2c42955c08 100644 --- a/Resources/Prototypes/Loadouts/Generic/items.yml +++ b/Resources/Prototypes/Loadouts/Generic/items.yml @@ -766,3 +766,56 @@ customColorTint: true items: - DrinkVacuumFlask + +# Pets +- type: loadout + id: LoadoutItemPetMouse + category: Items + cost: 2 + canBeHeirloom: true + items: + - MobMousePet + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutPets + functions: + - !type:LoadoutMakeFollower + +- type: loadout + id: LoadoutItemPetHamster + category: Items + cost: 2 + canBeHeirloom: true + items: + - MobHamsterPet + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutPets + functions: + - !type:LoadoutMakeFollower + +- type: loadout + id: LoadoutItemPetMothroach + category: Items + cost: 2 + canBeHeirloom: true + items: + - MobMothroachPet + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutPets + functions: + - !type:LoadoutMakeFollower + +- type: loadout + id: LoadoutItemPetCockroach + category: Items + cost: 2 + canBeHeirloom: true + items: + - MobCockroachPet + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutPets + functions: + - !type:LoadoutMakeFollower From 18a751d5c3d53cd4ff36728dd585ada37e9175b9 Mon Sep 17 00:00:00 2001 From: SimpleStation Changelogs Date: Sun, 22 Dec 2024 10:27:04 +0000 Subject: [PATCH 10/11] Automatic Changelog Update (#1366) --- Resources/Changelog/Changelog.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 2f706fe2c3..186a28f65b 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -8742,3 +8742,18 @@ Entries: id: 6586 time: '2024-12-21T19:25:13.0000000+00:00' url: https://github.com/Simple-Station/Einstein-Engines/pull/1365 +- author: VMSolidus + changes: + - type: Add + message: Loadouts can now apply modular functions to items upon spawning in. + - type: Add + message: >- + A new LoadoutMakeFollower function, which lets you buy NPC followers in + loadouts. + - type: Add + message: >- + added Pet Mice, Cockroach, Mothroach, and Hamster to Loadouts. All of + which use the new LoadoutMakeFollower function. + id: 6587 + time: '2024-12-22T10:26:41.0000000+00:00' + url: https://github.com/Simple-Station/Einstein-Engines/pull/1366 From 69f4ad8766fe8ea3e47a786d31b341398850b670 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sun, 22 Dec 2024 12:57:58 -0500 Subject: [PATCH 11/11] Update RobustToolbox --- RobustToolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RobustToolbox b/RobustToolbox index 9c30fdf5fd..92b0e7f1a8 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 9c30fdf5fd7261ea424f80478c2746e2001326e8 +Subproject commit 92b0e7f1a853979a1361ed24d2fb5ffc11f43f66