From 2080c734a7f3d8b3c82d71c5ea6cd3c7d1ed1a4a Mon Sep 17 00:00:00 2001 From: NULL882 Date: Sat, 17 Jan 2026 12:37:26 +0300 Subject: [PATCH] remove scrap tech lore --- Resources/Locale/ru-RU/corvax/lobby/lobby.ftl | 2 +- .../entities/clothing/uniforms/jumpsuits.ftl | 2 - Resources/Maps/_Forge/POI/Bastille.yml | 2099 +++++++++++------ Resources/Maps/_NF/POI/grifty.yml | 10 +- Resources/Maps/_NF/POI/mchobo.yml | 10 +- .../Entities/Clothing/Uniforms/jumpsuits.yml | 12 - .../Structures/Decoration/banners.yml | 11 - .../Structures/Wallmounts/Signs/flags.yml | 10 - .../equipped-INNERCLOTHING-reptilian.png | Bin 2326 -> 0 bytes .../scraptech.rsi/equipped-INNERCLOTHING.png | Bin 2077 -> 0 bytes .../Uniforms/Jumpsuits/scraptech.rsi/icon.png | Bin 878 -> 0 bytes .../Jumpsuits/scraptech.rsi/inhand-left.png | Bin 872 -> 0 bytes .../Jumpsuits/scraptech.rsi/inhand-right.png | Bin 883 -> 0 bytes .../Jumpsuits/scraptech.rsi/meta.json | 30 - 14 files changed, 1360 insertions(+), 826 deletions(-) delete mode 100644 Resources/Prototypes/_Forge/Entities/Structures/Wallmounts/Signs/flags.yml delete mode 100644 Resources/Textures/Forge/Clothing/Uniforms/Jumpsuits/scraptech.rsi/equipped-INNERCLOTHING-reptilian.png delete mode 100644 Resources/Textures/Forge/Clothing/Uniforms/Jumpsuits/scraptech.rsi/equipped-INNERCLOTHING.png delete mode 100644 Resources/Textures/Forge/Clothing/Uniforms/Jumpsuits/scraptech.rsi/icon.png delete mode 100644 Resources/Textures/Forge/Clothing/Uniforms/Jumpsuits/scraptech.rsi/inhand-left.png delete mode 100644 Resources/Textures/Forge/Clothing/Uniforms/Jumpsuits/scraptech.rsi/inhand-right.png delete mode 100644 Resources/Textures/Forge/Clothing/Uniforms/Jumpsuits/scraptech.rsi/meta.json diff --git a/Resources/Locale/ru-RU/corvax/lobby/lobby.ftl b/Resources/Locale/ru-RU/corvax/lobby/lobby.ftl index 245e3ffbed68..9260497c111f 100644 --- a/Resources/Locale/ru-RU/corvax/lobby/lobby.ftl +++ b/Resources/Locale/ru-RU/corvax/lobby/lobby.ftl @@ -13,7 +13,7 @@ frontier-lobby-mercenary-description = Это перевалочный пунк - Взять задание наёмников и обменять их на ценную награду - Собрать команду опытных наёмников что бы вместе выполнять задания frontier-lobby-Bastille-subtext = Транспортное депо "Бастилия" -frontier-lobby-Bastille-description = Это место с очень длинной историей... Сейчас она "легально-куплена" компанией Scrap Tech как база для продажи шаттлов и техобслуживания. +frontier-lobby-Bastille-description = Это место с очень длинной историей... - ### - ### - ### diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl index 2eb51de5503c..600779519226 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl @@ -219,5 +219,3 @@ ent-ClothingUniformJumpsuitFamilyGuy = семейный наряд .desc = Напоминает о времени, когда вы сделали что-то смешное. ent-ClothingUniformSecurityTrooper = униформа патрульного .desc = Официальная униформа, выдаваемая Патрульным Nanotrasen, обычно с ней идёт патрульный автомобиль. -ent-ClothingUniformJumpsuitST = комбинезон Scrap Tech - .desc = Старый, грязный, и проклеенный жёлтой изолентой, но все еще надёжный комбинезон фирменно-оранжевого цвета для утилизации. diff --git a/Resources/Maps/_Forge/POI/Bastille.yml b/Resources/Maps/_Forge/POI/Bastille.yml index 10314135afdf..ef0cca4108a5 100644 --- a/Resources/Maps/_Forge/POI/Bastille.yml +++ b/Resources/Maps/_Forge/POI/Bastille.yml @@ -1,11 +1,11 @@ meta: format: 7 category: Grid - engineVersion: 262.0.0 + engineVersion: 268.1.0 forkId: "" forkVersion: "" - time: 11/23/2025 21:35:31 - entityCount: 8628 + time: 01/17/2026 09:11:37 + entityCount: 8650 maps: [] grids: - 1 @@ -6807,14 +6807,15 @@ entities: -1,1: 0: 15327 0,2: - 0: 2039 + 0: 1015 + 1: 1024 -1,2: 0: 3067 0,3: - 1: 1 + 2: 1 0: 2184 -1,3: - 1: 1230 + 2: 1230 0,-1: 0: 36313 1,0: @@ -6837,7 +6838,7 @@ entities: 0: 13107 2,4: 0: 13107 - 1: 32768 + 2: 32768 2,-1: 0: 36312 3,0: @@ -6847,19 +6848,22 @@ entities: 3,2: 0: 30583 3,-1: - 1: 32768 + 2: 32768 0: 272 4,1: 0: 4880 - 1: 52430 + 2: 52430 -4,1: 0: 65527 -5,1: - 0: 65535 + 0: 61439 + 1: 4096 -4,2: - 0: 30503 + 0: 14119 + 3: 16384 -5,2: - 0: 34831 + 0: 34827 + 1: 4 -4,3: 0: 255 -5,3: @@ -6873,7 +6877,7 @@ entities: -3,-1: 0: 65535 -3,4: - 1: 1 + 2: 1 0: 34952 -3,3: 0: 34824 @@ -6892,53 +6896,53 @@ entities: -1,-1: 0: 36863 -4,-4: - 1: 65535 + 2: 65535 -4,-5: - 1: 65280 + 2: 65280 -5,-4: - 2: 255 + 4: 255 0: 3840 -4,-3: - 1: 4684 + 2: 4684 -4,-2: 0: 65520 -5,-2: 0: 65520 -4,-1: - 2: 64 + 4: 64 0: 8 -3,-4: - 1: 65535 + 2: 65535 -3,-3: - 1: 15 + 2: 15 0: 8736 -3,-2: 0: 32767 -3,-5: - 1: 61440 + 2: 61440 0: 136 -2,-4: - 1: 57343 - 2: 8192 + 2: 57343 + 4: 8192 -2,-3: - 1: 1 + 2: 1 0: 58436 -2,-2: 0: 32767 -2,-5: - 1: 63488 + 2: 63488 0: 514 -1,-4: - 1: 24029 + 2: 24029 -1,-3: - 1: 5 + 2: 5 0: 57344 -1,-2: 0: 20223 -1,-5: - 1: 55132 + 2: 55132 0,-4: - 1: 49 + 2: 49 0,-3: 0: 28672 0,-2: @@ -6954,157 +6958,168 @@ entities: 2,-2: 0: 56544 3,-4: - 1: 12030 + 2: 12030 3,-2: 0: 30578 3,-3: - 1: 2182 + 2: 2182 3,-5: - 1: 49920 + 2: 49920 4,-4: - 1: 257 + 2: 257 4,-3: - 1: 256 + 2: 256 4,-2: - 1: 65520 + 2: 65520 4,-1: - 1: 65480 + 2: 65480 -4,-8: 0: 65399 -5,-8: 0: 57572 - 1: 4369 + 2: 4369 -4,-7: 0: 6 - 1: 17408 + 2: 17408 -4,-6: - 1: 119 - 2: 256 + 2: 119 + 4: 256 -5,-7: - 1: 33281 + 2: 33281 -5,-6: - 2: 51436 + 4: 51436 -5,-5: - 1: 8 + 2: 8 0: 3840 - 2: 61444 + 4: 61444 -3,-8: - 3: 43704 + 5: 43704 0: 21824 -3,-7: 0: 64773 - 3: 10 + 5: 10 -3,-6: - 0: 53245 + 0: 53229 + 1: 16 -3,-9: 0: 13311 - 3: 32768 + 5: 32768 -2,-8: 0: 39321 - 3: 26214 + 5: 26214 -2,-7: 0: 65289 - 3: 6 + 5: 6 -2,-6: 0: 65535 -2,-9: 0: 37119 - 3: 25856 + 5: 25856 -1,-8: - 3: 4369 - 4: 192 - 5: 16384 + 5: 4369 + 6: 192 + 7: 16384 0: 32768 -1,-7: - 3: 1 + 5: 1 0: 4488 - 5: 68 + 7: 68 -1,-6: 0: 7677 -1,-9: - 3: 4096 - 4: 18436 + 5: 4096 + 6: 18436 0: 1105 0,-8: - 4: 35321 + 6: 35257 + 8: 64 0: 4102 - 5: 8192 + 7: 8192 0,-7: 0: 32785 - 5: 4066 + 7: 4066 0,-6: 0: 281 - 5: 3268 + 7: 3268 0,-9: - 4: 39408 + 8: 16 + 6: 39392 0: 26114 1,-8: - 4: 31856 + 6: 31792 + 8: 64 0: 768 1,-7: - 5: 272 - 4: 52416 + 9: 16 + 7: 256 + 6: 52288 + 8: 128 1,-5: - 1: 1079 + 2: 1079 1,-6: - 4: 206 - 1: 8192 + 6: 70 + 8: 136 + 2: 8192 1,-9: - 4: 58340 - 0: 3072 + 6: 58340 + 0: 1024 + 10: 2048 2,-8: - 4: 4594 + 6: 4594 0: 60928 2,-7: - 4: 4368 - 1: 17408 + 6: 4368 + 2: 17408 2,-9: - 4: 31856 + 6: 31856 0: 768 2,-6: - 1: 1252 + 2: 1252 2,-5: - 1: 8 + 2: 8 3,-8: - 4: 5904 + 6: 1808 + 8: 4096 0: 200 3,-9: 0: 37136 - 4: 10912 + 6: 10912 3,-7: - 1: 32768 + 2: 32768 4,-7: - 1: 4352 - 2: 512 + 2: 4352 + 4: 512 4,-6: - 1: 19 - 2: 512 + 2: 19 + 4: 512 -4,-12: - 4: 1 + 6: 1 0: 65092 -4,-13: 0: 4096 - 4: 3840 + 6: 3840 -5,-12: - 4: 8 - 0: 52224 + 6: 8 + 1: 1024 + 0: 51200 -4,-11: 0: 54510 -5,-11: - 0: 49356 - 1: 4369 + 0: 49292 + 1: 64 + 2: 4369 -4,-10: 0: 65457 -5,-10: 0: 52428 - 1: 4369 + 2: 4369 -4,-9: 0: 3007 -5,-9: 0: 3276 - 1: 4369 + 2: 4369 -3,-12: - 4: 34827 + 6: 34827 0: 13056 -3,-11: 0: 28915 @@ -7112,241 +7127,261 @@ entities: 0: 63359 -3,-13: 0: 36864 - 4: 27392 + 6: 27392 -2,-12: - 4: 49563 - 0: 15872 + 6: 33179 + 8: 16384 + 10: 4096 + 0: 3584 + 1: 8192 -2,-11: 0: 61568 - 4: 96 + 6: 96 -2,-10: 0: 61695 -2,-13: - 4: 13056 + 6: 13056 0: 2048 -1,-12: - 4: 63631 + 6: 55439 + 8: 8192 0: 1904 -1,-11: 0: 4112 - 4: 17632 + 6: 17632 -1,-10: 0: 4183 - 4: 17408 + 6: 17408 -1,-13: 0: 8064 0,-12: - 4: 56785 + 6: 7633 + 11: 16384 + 12: 32768 0: 512 0,-11: - 4: 240 + 6: 240 0: 12288 0,-10: 0: 28723 - 4: 8 + 6: 8 0,-13: - 0: 52992 + 1: 16640 + 0: 36352 1,-12: - 4: 61456 - 0: 3852 + 6: 53264 + 8: 8192 + 0: 3848 + 1: 4 1,-11: - 4: 54384 + 6: 54384 0: 8192 1,-10: - 4: 61657 + 6: 61657 0: 550 1,-13: 0: 65280 2,-12: 0: 28699 - 4: 36608 + 6: 36608 2,-11: - 4: 57528 + 6: 57496 + 13: 32 2,-10: - 4: 57891 + 6: 57891 0: 3276 2,-13: - 0: 64256 + 0: 63744 + 1: 512 3,-12: 0: 12295 - 4: 52992 + 6: 52992 3,-11: 0: 259 - 4: 45308 + 6: 12412 + 8: 128 + 13: 32768 3,-10: - 4: 13107 + 6: 13075 + 8: 32 0: 35968 3,-13: - 0: 13056 + 0: 4864 + 3: 8192 4,-10: 0: 65520 4,-9: - 4: 48 + 6: 48 0: 204 4,-5: - 2: 8192 + 4: 8192 4,-11: - 1: 2112 + 2: 2112 5,-10: 0: 12544 5,-9: 0: 247 5,-11: - 1: 128 + 2: 128 6,-11: - 1: 8448 + 2: 8448 6,-10: - 1: 2 + 2: 2 6,-9: - 2: 512 + 4: 512 4,0: - 1: 142 + 2: 142 5,-3: - 1: 256 + 2: 256 5,-2: - 1: 22288 + 2: 22288 5,-1: - 1: 32638 + 2: 32638 5,0: - 1: 65399 + 2: 65399 -7,-4: 0: 3140 - 2: 136 + 4: 136 -7,-5: 0: 19456 - 2: 32768 + 4: 32768 -6,-4: - 2: 255 + 4: 255 0: 3840 -6,-5: - 2: 61440 + 4: 61440 0: 3840 -6,-2: - 2: 8 + 4: 8 0: 2048 -6,-1: - 2: 8 + 4: 8 -7,-8: - 6: 12 + 14: 12 -6,-8: - 6: 1 + 14: 1 0: 512 - 1: 52428 + 2: 52428 -6,-7: - 1: 3212 + 2: 3212 -6,-9: - 1: 52428 - 7: 1 - 5: 256 + 2: 52428 + 15: 1 + 7: 256 -7,-10: 0: 3084 -7,-9: - 7: 12 - 5: 3072 + 15: 12 + 7: 3072 -6,-10: 0: 257 - 1: 52428 + 2: 52428 -6,-12: - 1: 61164 + 2: 61164 -6,-11: 0: 512 - 1: 52428 + 2: 52428 -6,-13: - 1: 34816 + 2: 34816 -5,-13: - 1: 4371 + 2: 4371 4,2: - 1: 142 + 2: 142 5,1: - 1: 65535 + 2: 65535 5,2: - 1: 9805 + 2: 9805 6,1: - 1: 30583 + 2: 30583 6,2: - 1: 198 + 2: 198 6,0: - 1: 49152 + 2: 49152 7,1: 0: 65535 7,2: 0: 15 - 2: 13824 + 4: 13824 7,0: - 2: 1536 + 4: 1536 8,1: 0: 65535 8,2: - 0: 143 + 0: 137 + 16: 6 8,0: 0: 32768 9,1: 0: 63479 9,2: 0: 39 - 2: 128 + 4: 128 9,0: 0: 8192 - 2: 32768 + 4: 32768 -8,0: 0: 62720 -8,1: 0: 65535 -9,0: 0: 50176 - 2: 4096 + 4: 4096 -9,1: 0: 65278 -8,2: 0: 15 -9,2: 0: 14 - 2: 16 + 4: 16 -7,1: 0: 65535 -7,2: - 0: 15 + 0: 7 + 1: 8 -6,1: - 0: 62463 + 0: 50167 + 3: 4096 + 1: 8200 -6,2: - 0: 15 + 0: 7 + 1: 8 -3,-15: - 2: 3200 + 4: 3200 -2,-15: - 2: 256 + 4: 256 -2,-14: 0: 16384 -1,-15: - 2: 52288 + 4: 52288 0,-15: - 2: 4369 + 4: 4369 0,-14: - 2: 1 + 4: 1 4,7: - 1: 3 - 2: 13104 + 2: 3 + 4: 13104 3,7: - 1: 8751 - 2: 52416 + 2: 8751 + 4: 52416 0: 256 4,8: - 1: 3 + 2: 3 -4,7: - 1: 15 - 2: 65520 + 2: 15 + 4: 65520 -5,7: - 1: 8 - 2: 34944 + 2: 8 + 4: 34944 -4,8: - 1: 15 + 2: 15 -3,7: - 1: 65521 + 2: 65521 0: 8 -3,8: - 1: 19469 - 2: 32768 + 2: 19469 + 4: 32768 -3,5: - 2: 32 + 4: 32 0: 52352 -3,6: 0: 52416 @@ -7355,19 +7390,20 @@ entities: -2,6: 0: 57308 -2,7: - 1: 65520 + 2: 65520 -2,8: - 1: 12159 - 2: 53248 + 2: 12159 + 4: 53248 -1,5: 0: 65280 -1,6: 0: 49151 -1,7: - 0: 58984 + 3: 16416 + 0: 42568 -1,8: 0: 6 - 1: 4352 + 2: 4352 0,5: 0: 65280 0,6: @@ -7384,66 +7420,66 @@ entities: 0: 43759 1,8: 0: 2 - 1: 37344 - 2: 28160 + 2: 37344 + 4: 28160 2,5: 0: 30513 - 1: 136 + 2: 136 2,6: 0: 30583 2,7: 0: 16183 3,4: - 1: 4368 + 2: 4368 2,8: - 1: 17528 - 2: 13056 + 2: 17528 + 4: 13056 3,8: - 1: 15 + 2: 15 1,9: - 1: 4369 - 2: 61166 + 2: 4369 + 4: 61166 1,10: - 1: 4369 - 2: 26350 + 2: 4369 + 4: 26350 1,11: - 1: 17 - 2: 2 + 2: 17 + 4: 2 2,9: - 2: 13107 - 1: 17476 + 4: 13107 + 2: 17476 2,10: - 2: 823 + 4: 823 -5,8: - 1: 8 + 2: 8 -3,9: - 1: 17476 - 2: 34952 + 2: 17476 + 4: 34952 -3,10: - 1: 17476 - 2: 34952 + 2: 17476 + 4: 34952 -3,11: - 1: 1092 - 2: 2184 + 2: 1092 + 4: 2184 -2,9: - 2: 65535 + 4: 65535 -2,10: - 2: 65535 + 4: 65535 -2,11: - 2: 4093 - 1: 2 + 4: 4093 + 2: 2 -1,9: - 1: 4369 + 2: 4369 -1,10: - 1: 4369 + 2: 4369 -1,11: - 1: 273 + 2: 273 2,-15: - 2: 4096 + 4: 4096 2,-14: - 2: 115 + 4: 115 -5,-14: - 1: 8192 + 2: 8192 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -7460,6 +7496,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.14996 + moles: + - 20.078888 + - 75.53487 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - volume: 2500 temperature: 293.15 moles: @@ -7475,6 +7526,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 21.6852 + - 81.57766 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - volume: 2500 immutable: True moles: @@ -7535,6 +7601,96 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 0 + - 2300 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 0 + - 6133.6235 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 20.078888 + - 259.53488 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 0 + - 2484 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 0 + - 2116 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 0 + - 2498.72 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - volume: 2500 temperature: 293.15 moles: @@ -7565,6 +7721,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 23.57087 + - 88.67137 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance @@ -8285,23 +8456,6 @@ entities: - type: ContainedSolution containerName: food container: 111 - - uid: 114 - components: - - type: MetaData - name: solution - food - - type: Transform - parent: 113 - - type: Solution - solution: - maxVol: 1 - name: food - reagents: - - data: [] - ReagentId: Fiber - Quantity: 1 - - type: ContainedSolution - containerName: food - container: 113 - uid: 117 components: - type: MetaData @@ -8319,23 +8473,6 @@ entities: - type: ContainedSolution containerName: food container: 116 - - uid: 120 - components: - - type: MetaData - name: solution - food - - type: Transform - parent: 119 - - type: Solution - solution: - maxVol: 1 - name: food - reagents: - - data: [] - ReagentId: Fiber - Quantity: 1 - - type: ContainedSolution - containerName: food - container: 119 - uid: 125 components: - type: MetaData @@ -8638,6 +8775,17 @@ entities: - type: Transform pos: -28.488285,5.5572014 parent: 1 +- proto: ActionToggleLight + entities: + - uid: 119 + mapInit: true + paused: true + components: + - type: Transform + parent: 3657 + - type: Action + originalIconColor: '#FFFFFFFF' + container: 3657 - proto: AdvancedCapacitorStockPart entities: - uid: 162 @@ -8900,6 +9048,11 @@ entities: parent: 1 - proto: AirlockEngineeringGlassLocked entities: + - uid: 113 + components: + - type: Transform + pos: -8.5,-39.5 + parent: 1 - uid: 196 components: - type: Transform @@ -9184,25 +9337,6 @@ entities: - type: Transform pos: -0.5,-50.5 parent: 1 -- proto: AirlockGlass - entities: - - uid: 223 - components: - - type: Transform - pos: -8.5,-39.5 - parent: 1 - - type: Door - canCrush: False - clickOpen: False - bumpOpen: False - canPry: False - - type: AccessReader - access: - - - Wizard - missingComponents: - - Construction - - DoorBolt - - Destructible - proto: AirlockGlassShuttleNfsd entities: - uid: 224 @@ -9330,23 +9464,6 @@ entities: - type: Transform pos: -0.5,-0.5 parent: 1 - - uid: 245 - components: - - type: Transform - pos: -2.5,-39.5 - parent: 1 - - type: AccessReader - access: - - - Wizard - - type: Door - canCrush: False - clickOpen: False - bumpOpen: False - canPry: False - missingComponents: - - DoorBolt - - Destructible - - Construction - uid: 246 components: - type: Transform @@ -9440,7 +9557,7 @@ entities: pos: 13.5,-29.5 parent: 1 - type: Door - secondsUntilStateChange: -18187.58 + secondsUntilStateChange: -19192.207 state: Opening - type: DeviceLinkSource lastSignals: @@ -9452,6 +9569,11 @@ entities: parent: 1 - proto: AirlockMaintEngiLocked entities: + - uid: 114 + components: + - type: Transform + pos: -2.5,-39.5 + parent: 1 - uid: 265 components: - type: Transform @@ -9692,6 +9814,16 @@ entities: canCollide: False - proto: Ash entities: + - uid: 223 + components: + - type: Transform + pos: 0.5,0.5 + parent: 1 + - uid: 245 + components: + - type: Transform + pos: 9.513001,9.648098 + parent: 1 - uid: 305 components: - type: Transform @@ -9732,6 +9864,21 @@ entities: - type: Transform pos: -7.6652374,-25.117588 parent: 1 + - uid: 383 + components: + - type: Transform + pos: 1.59359,27.509956 + parent: 1 + - uid: 384 + components: + - type: Transform + pos: 2.0985959,6.6187034 + parent: 1 + - uid: 8650 + components: + - type: Transform + pos: -9.607754,-7.201764 + parent: 1 - proto: AtmosDeviceFanDirectional entities: - uid: 313 @@ -9857,6 +10004,11 @@ entities: parent: 1 - proto: AtmosFixBlockerMarker entities: + - uid: 120 + components: + - type: Transform + pos: -16.5,-13.5 + parent: 1 - uid: 334 components: - type: Transform @@ -10102,16 +10254,6 @@ entities: - type: Transform pos: -5.5,32.5 parent: 1 - - uid: 383 - components: - - type: Transform - pos: -12.5,-18.5 - parent: 1 - - uid: 384 - components: - - type: Transform - pos: -13.5,-18.5 - parent: 1 - uid: 385 components: - type: Transform @@ -12355,7 +12497,7 @@ entities: - uid: 833 components: - type: Transform - pos: 21.5,-7.5 + pos: -16.5,-14.5 parent: 1 - uid: 834 components: @@ -13225,17 +13367,17 @@ entities: - uid: 1007 components: - type: Transform - pos: 17.5,-9.5 + pos: -16.5,-15.5 parent: 1 - uid: 1008 components: - type: Transform - pos: 18.5,-9.5 + pos: -16.5,-16.5 parent: 1 - uid: 1009 components: - type: Transform - pos: 19.5,-9.5 + pos: -16.5,-17.5 parent: 1 - uid: 1010 components: @@ -13257,6 +13399,226 @@ entities: - type: Transform pos: 16.5,-1.5 parent: 1 + - uid: 1287 + components: + - type: Transform + pos: -17.5,-13.5 + parent: 1 + - uid: 1288 + components: + - type: Transform + pos: -17.5,-14.5 + parent: 1 + - uid: 1289 + components: + - type: Transform + pos: -17.5,-15.5 + parent: 1 + - uid: 1290 + components: + - type: Transform + pos: -17.5,-16.5 + parent: 1 + - uid: 3726 + components: + - type: Transform + pos: -17.5,-17.5 + parent: 1 + - uid: 3728 + components: + - type: Transform + pos: -18.5,-13.5 + parent: 1 + - uid: 3729 + components: + - type: Transform + pos: -18.5,-14.5 + parent: 1 + - uid: 3730 + components: + - type: Transform + pos: -18.5,-15.5 + parent: 1 + - uid: 3731 + components: + - type: Transform + pos: -18.5,-16.5 + parent: 1 + - uid: 3732 + components: + - type: Transform + pos: -18.5,-17.5 + parent: 1 + - uid: 3733 + components: + - type: Transform + pos: -19.5,-13.5 + parent: 1 + - uid: 3927 + components: + - type: Transform + pos: -19.5,-14.5 + parent: 1 + - uid: 3980 + components: + - type: Transform + pos: -19.5,-15.5 + parent: 1 + - uid: 5206 + components: + - type: Transform + pos: -19.5,-16.5 + parent: 1 + - uid: 5528 + components: + - type: Transform + pos: -19.5,-17.5 + parent: 1 + - uid: 5540 + components: + - type: Transform + pos: -20.5,-13.5 + parent: 1 + - uid: 5541 + components: + - type: Transform + pos: -20.5,-14.5 + parent: 1 + - uid: 5546 + components: + - type: Transform + pos: -20.5,-15.5 + parent: 1 + - uid: 5551 + components: + - type: Transform + pos: -20.5,-16.5 + parent: 1 + - uid: 5556 + components: + - type: Transform + pos: -20.5,-17.5 + parent: 1 + - uid: 5569 + components: + - type: Transform + pos: -21.5,-13.5 + parent: 1 + - uid: 5570 + components: + - type: Transform + pos: -21.5,-14.5 + parent: 1 + - uid: 6670 + components: + - type: Transform + pos: -21.5,-15.5 + parent: 1 + - uid: 8629 + components: + - type: Transform + pos: -21.5,-16.5 + parent: 1 + - uid: 8630 + components: + - type: Transform + pos: -21.5,-17.5 + parent: 1 + - uid: 8631 + components: + - type: Transform + pos: -22.5,-13.5 + parent: 1 + - uid: 8632 + components: + - type: Transform + pos: -22.5,-14.5 + parent: 1 + - uid: 8633 + components: + - type: Transform + pos: -22.5,-15.5 + parent: 1 + - uid: 8634 + components: + - type: Transform + pos: -22.5,-16.5 + parent: 1 + - uid: 8635 + components: + - type: Transform + pos: -22.5,-17.5 + parent: 1 + - uid: 8636 + components: + - type: Transform + pos: -23.5,-13.5 + parent: 1 + - uid: 8637 + components: + - type: Transform + pos: -23.5,-14.5 + parent: 1 + - uid: 8638 + components: + - type: Transform + pos: -23.5,-15.5 + parent: 1 + - uid: 8639 + components: + - type: Transform + pos: -23.5,-16.5 + parent: 1 + - uid: 8640 + components: + - type: Transform + pos: -23.5,-17.5 + parent: 1 + - uid: 8641 + components: + - type: Transform + pos: -24.5,-13.5 + parent: 1 + - uid: 8642 + components: + - type: Transform + pos: -24.5,-14.5 + parent: 1 + - uid: 8643 + components: + - type: Transform + pos: -24.5,-15.5 + parent: 1 + - uid: 8644 + components: + - type: Transform + pos: -24.5,-16.5 + parent: 1 + - uid: 8645 + components: + - type: Transform + pos: -24.5,-17.5 + parent: 1 + - uid: 8646 + components: + - type: Transform + pos: -25.5,-17.5 + parent: 1 + - uid: 8647 + components: + - type: Transform + pos: -25.5,-16.5 + parent: 1 + - uid: 8648 + components: + - type: Transform + pos: -25.5,-15.5 + parent: 1 + - uid: 8649 + components: + - type: Transform + pos: -25.5,-14.5 + parent: 1 - proto: AtmosFixInstantPlasmaFireMarker entities: - uid: 1014 @@ -14635,35 +14997,6 @@ entities: - type: Transform pos: -1.5,-44.5 parent: 1 -- proto: BannerScrapTech - entities: - - uid: 1286 - components: - - type: Transform - pos: 2.0985959,6.6187034 - parent: 1 - - type: Pullable - prevFixedRotation: True - - uid: 1287 - components: - - type: Transform - pos: 0.5,0.5 - parent: 1 - - uid: 1288 - components: - - type: Transform - pos: 9.513001,9.648098 - parent: 1 - - uid: 1289 - components: - - type: Transform - pos: 1.59359,27.509956 - parent: 1 - - uid: 1290 - components: - - type: Transform - pos: -9.607754,-7.201764 - parent: 1 - proto: Barricade entities: - uid: 1291 @@ -15061,11 +15394,11 @@ entities: showEnts: False occludes: True ents: - - 1345 - 1348 - - 1346 - - 1347 - 1349 + - 1347 + - 1346 + - 1345 - uid: 1350 components: - type: Transform @@ -15155,8 +15488,8 @@ entities: showEnts: False occludes: True ents: - - 1370 - 1369 + - 1370 - proto: BlastDoor entities: - uid: 1371 @@ -26706,6 +27039,24 @@ entities: - type: Transform pos: -5.5,-44.5 parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14996 + moles: + - 0 + - 200 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - type: ContainerContainer containers: entity_storage: !type:Container @@ -26722,6 +27073,24 @@ entities: - type: Transform pos: -24.559902,8.37172 parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14923 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - uid: 3585 components: - type: Transform @@ -26812,8 +27181,8 @@ entities: immutable: False temperature: 293.14996 moles: - - 0 - - 200 + - 1.7459903 + - 22.568249 - 0 - 0 - 0 @@ -26856,6 +27225,24 @@ entities: - type: Transform pos: 2.5,10.5 parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14923 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - uid: 3592 components: - type: Transform @@ -26866,11 +27253,47 @@ entities: - type: Transform pos: -2.5,-44.5 parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14996 + moles: + - 0 + - 200 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - uid: 3594 components: - type: Transform pos: -19.247402,7.246721 parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14923 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - uid: 3595 components: - type: Transform @@ -26891,6 +27314,24 @@ entities: - type: Transform pos: -6.5,-44.5 parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14923 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - uid: 3599 components: - type: Transform @@ -26979,6 +27420,24 @@ entities: - type: Transform pos: 4.5,-26.5 parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14996 + moles: + - 0 + - 533.3585 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - proto: ClosetRadiationSuit entities: - uid: 3609 @@ -27478,8 +27937,22 @@ entities: - uid: 3657 components: - type: Transform - pos: 3.119566,-30.238003 + pos: 3.059554,-30.319622 parent: 1 + - type: HandheldLight + toggleActionEntity: 119 + - type: ContainerContainer + containers: + cell_slot: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + actions: !type:Container + showEnts: False + occludes: True + ents: + - 119 + - type: ActionsContainer - proto: ClothingHeadHatHardhatYellow entities: - uid: 3658 @@ -27912,50 +28385,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: ClothingUniformJumpsuitST - entities: - - uid: 3726 - components: - - type: Transform - parent: 3725 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 3728 - components: - - type: Transform - parent: 3727 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 3729 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -3.5640268,-1.4770002 - parent: 1 - - uid: 3730 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -10.499191,-38.16998 - parent: 1 - - uid: 3731 - components: - - type: Transform - pos: 7.6873055,-8.212295 - parent: 1 - - uid: 3732 - components: - - type: Transform - pos: 7.7810555,-8.274795 - parent: 1 - - uid: 3733 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 32.781166,6.4914055 - parent: 1 - proto: ClothingUniformJumpsuitWeb entities: - uid: 3696 @@ -28740,16 +29169,34 @@ entities: - type: Transform pos: -20.294277,8.387345 parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14923 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - type: ContainerContainer containers: entity_storage: !type:Container showEnts: False occludes: True ents: - - 2783 - 2786 - - 2784 - 2785 + - 2784 + - 2783 paper_label: !type:ContainerSlot showEnts: False occludes: True @@ -28891,14 +29338,32 @@ entities: - type: Transform pos: -17.497402,8.746721 parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14923 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - type: ContainerContainer containers: entity_storage: !type:Container showEnts: False occludes: True ents: - - 3670 - 3671 + - 3670 paper_label: !type:ContainerSlot showEnts: False occludes: True @@ -28926,8 +29391,8 @@ entities: immutable: False temperature: 293.14923 moles: - - 1.7459903 - - 6.568249 + - 1.8856695 + - 7.0937095 - 0 - 0 - 0 @@ -29050,6 +29515,24 @@ entities: - type: Transform pos: -20.294277,4.762346 parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14923 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - type: ContainerContainer containers: entity_storage: !type:Container @@ -29255,8 +29738,8 @@ entities: immutable: False temperature: 293.14923 moles: - - 1.7459903 - - 6.568249 + - 1.8856695 + - 7.0937095 - 0 - 0 - 0 @@ -29273,12 +29756,12 @@ entities: showEnts: False occludes: True ents: - - 122 - 121 + - 122 paper_label: !type:ContainerSlot showEnts: False occludes: True - ent: 119 + ent: null - type: Pullable prevFixedRotation: True - uid: 1310 @@ -29292,8 +29775,8 @@ entities: immutable: False temperature: 293.14923 moles: - - 1.7459903 - - 6.568249 + - 1.8856695 + - 7.0937095 - 0 - 0 - 0 @@ -29361,19 +29844,37 @@ entities: - type: Transform pos: 0.5,-49.5 parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14923 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - type: ContainerContainer containers: entity_storage: !type:Container showEnts: False occludes: True ents: + - 2287 - 2284 - - 2285 - 2286 - 2288 - 2283 - 2289 - - 2287 + - 2285 paper_label: !type:ContainerSlot showEnts: False occludes: True @@ -29418,23 +29919,41 @@ entities: - type: Transform pos: 6.5,-47.5 parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14923 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - type: ContainerContainer containers: entity_storage: !type:Container showEnts: False occludes: True ents: - - 3692 - 3693 - - 3697 - - 3694 - - 3698 - - 3691 - - 3695 - - 3699 - - 3700 - - 3696 - 3701 + - 3696 + - 3700 + - 3699 + - 3695 + - 3691 + - 3698 + - 3694 + - 3697 + - 3692 paper_label: !type:ContainerSlot showEnts: False occludes: True @@ -29596,7 +30115,7 @@ entities: temperature: 293.14996 moles: - 0 - - 216 + - 217.28 - 0 - 0 - 0 @@ -29613,8 +30132,8 @@ entities: showEnts: False occludes: True ents: - - 3892 - 3893 + - 3892 paper_label: !type:ContainerSlot showEnts: False occludes: True @@ -29657,6 +30176,24 @@ entities: - type: Transform pos: -11.082255,-22.216307 parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14923 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - type: ContainerContainer containers: entity_storage: !type:Container @@ -29706,15 +30243,34 @@ entities: - type: Transform pos: 9.5,-49.5 parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14923 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - type: ContainerContainer containers: entity_storage: !type:Container showEnts: False occludes: True ents: + - 3904 - 3902 + - 6399 - 3903 - - 3904 paper_label: !type:ContainerSlot showEnts: False occludes: True @@ -29938,6 +30494,24 @@ entities: - type: Transform pos: 2.882914,-30.351881 parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14996 + moles: + - 0 + - 200 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - type: ContainerContainer containers: entity_storage: !type:Container @@ -29996,7 +30570,7 @@ entities: temperature: 293.14996 moles: - 0 - - 216 + - 217.28 - 0 - 0 - 0 @@ -30013,16 +30587,15 @@ entities: showEnts: False occludes: True ents: - - 3924 - 3928 - - 3925 - - 3929 - - 3933 - - 3926 - - 3930 - - 3927 - - 3931 - 3932 + - 3931 + - 3930 + - 3926 + - 3933 + - 3929 + - 3925 + - 3924 paper_label: !type:ContainerSlot showEnts: False occludes: True @@ -30076,8 +30649,8 @@ entities: immutable: False temperature: 293.14996 moles: - - 0 - - 200 + - 1.7459903 + - 22.568249 - 0 - 0 - 0 @@ -30146,6 +30719,24 @@ entities: - type: Transform pos: 13.320214,-38.04147 parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14996 + moles: + - 0 + - 200 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - proto: CrateMaterialWood entities: - uid: 3941 @@ -30193,6 +30784,24 @@ entities: - type: Transform pos: 6.5,-30.5 parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14996 + moles: + - 0 + - 200 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - proto: CratePermaEscapeLights entities: - uid: 3944 @@ -30200,11 +30809,47 @@ entities: - type: Transform pos: -22.075527,7.574846 parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14923 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - uid: 3945 components: - type: Transform pos: 2.5,-48.5 parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14923 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - proto: CratePermaEscapeMats entities: - uid: 3946 @@ -30212,16 +30857,34 @@ entities: - type: Transform pos: 0.5,-34.5 parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14996 + moles: + - 0 + - 200 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - type: ContainerContainer containers: entity_storage: !type:Container showEnts: False occludes: True ents: - - 3947 - 3948 - - 3949 - 3950 + - 3949 + - 3947 paper_label: !type:ContainerSlot showEnts: False occludes: True @@ -30251,8 +30914,8 @@ entities: immutable: False temperature: 293.14923 moles: - - 1.7459903 - - 6.568249 + - 1.8856695 + - 7.0937095 - 0 - 0 - 0 @@ -30269,10 +30932,10 @@ entities: showEnts: False occludes: True ents: - - 3955 - 3957 - - 3956 - 3954 + - 3956 + - 3955 paper_label: !type:ContainerSlot showEnts: False occludes: True @@ -30520,8 +31183,8 @@ entities: immutable: False temperature: 293.14923 moles: - - 1.7459903 - - 6.568249 + - 1.8856695 + - 7.0937095 - 0 - 0 - 0 @@ -30639,20 +31302,6 @@ entities: - type: Transform pos: -11.14109,-0.06250006 parent: 1 -- proto: CryogenicSleepUnitSpawner - entities: - - uid: 3980 - components: - - type: Transform - pos: 13.5,11.5 - parent: 1 -- proto: CryogenicSleepUnitSpawnerLateJoin - entities: - - uid: 3981 - components: - - type: Transform - pos: -3.5,-3.5 - parent: 1 - proto: CutterMachine entities: - uid: 3982 @@ -33321,7 +33970,7 @@ entities: - uid: 159 components: - type: Transform - pos: 15.128137,-43.11603 + pos: 15.229331,-43.22257 parent: 1 - type: SolutionContainerManager solutions: null @@ -39651,7 +40300,7 @@ entities: parent: 1 - proto: HospitalCurtains entities: - - uid: 5206 + - uid: 1286 components: - type: Transform pos: 10.5,-32.5 @@ -41689,6 +42338,24 @@ entities: - type: Transform pos: 12.5,-28.5 parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14996 + moles: + - 0 + - 200 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - type: Lock locked: False - type: ContainerContainer @@ -41697,9 +42364,9 @@ entities: showEnts: False occludes: True ents: - - 3649 - 3647 - 3648 + - 3649 paper_label: !type:ContainerSlot showEnts: False occludes: True @@ -41814,6 +42481,24 @@ entities: - type: Transform pos: 15.545783,-42.84768 parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14996 + moles: + - 0 + - 200 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - uid: 5298 components: - type: Transform @@ -41958,6 +42643,11 @@ entities: canCollide: False - proto: MachineCryoSleepPod entities: + - uid: 3981 + components: + - type: Transform + pos: -3.5,-3.5 + parent: 1 - uid: 5312 components: - type: Transform @@ -43568,8 +44258,7 @@ entities: - uid: 5518 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 6.597952,-47.50028 + pos: 6.477769,-47.454884 parent: 1 - proto: NFWeaponShotgunDoubleBarreled entities: @@ -43642,13 +44331,6 @@ entities: rot: -1.5707963267948966 rad pos: -9.563344,5.3785276 parent: 1 -- proto: Omnitool - entities: - - uid: 5528 - components: - - type: Transform - pos: -7.266923,-39.754726 - parent: 1 - proto: OperatingTable entities: - uid: 5529 @@ -43761,12 +44443,6 @@ entities: pos: -5.6999116,-2.21875 parent: 1 - type: Paper - stampState: paper_stamp-qm - stampedBy: - - reapply: False - stampType: RubberStamp - stampedColor: '#497C32FF' - stampedName: Scrap Tech content: Учтите, что 80% цены от проданных вами товаров на нашем транспортном депо считаются "благотворительными пожертвованиями во благо компании" и не могут быть возвращены. - type: SolutionContainerManager solutions: null @@ -44092,55 +44768,6 @@ entities: containers: solution@food: !type:ContainerSlot ent: 50 - - uid: 113 - components: - - type: Transform - pos: -19.406109,-34.258995 - parent: 1 - - type: Paper - content: Я все понимаю, Джинн, но настрой ты уже эту чертову систему откачки азота из 2-го корпуса! На прошлой неделе трое рабочих чуть не задохнулись, а что если-бы об этом узнал Норман или кто-то высокопоставленный? Это будет означать конец для Бастилии! И ты будешь первой, кто лишится работы! Что-ж, мое требование ты поняла. Не забудь так-же включать систему фильтров в начале смены-ты не представляешь, сколько я плачу за добычу этого газа - - type: SolutionContainerManager - solutions: null - containers: - - food - - type: Fixtures - fixtures: - fix1: - shape: !type:PolygonShape - radius: 0.01 - vertices: - - -0.25,-0.25 - - 0.25,-0.25 - - 0.25,0.25 - - -0.25,0.25 - mask: - - Impassable - - HighImpassable - layer: [] - density: 20 - hard: True - restitution: 0.3 - friction: 0.2 - flammable: - shape: !type:PhysShapeCircle - radius: 0.35 - position: 0,0 - mask: - - TableLayer - - HighImpassable - - LowImpassable - - BulletImpassable - - InteractImpassable - - Opaque - layer: [] - density: 1 - hard: False - restitution: 0 - friction: 0.4 - - type: ContainerContainer - containers: - solution@food: !type:ContainerSlot - ent: 114 - uid: 136 components: - type: Transform @@ -44490,15 +45117,6 @@ entities: parent: 1518 - type: Physics canCollide: False - - uid: 3927 - components: - - type: Transform - parent: 3923 - - type: Paper - content: Не каждая закрытая дверь хранит секрет - - type: Physics - canCollide: False - - type: InsideEntityStorage - uid: 4236 components: - type: Transform @@ -44513,32 +45131,6 @@ entities: content: '[bold]Масло[/bold]' - type: Physics canCollide: False - - uid: 5540 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -13.654142,10.529624 - parent: 1 - - type: Paper - content: >- - Последнее время в офисе творится сущий бардак. Постоянно прибегает какой-то делегат из компании, которой продали наш корпус, и говорит о нашем выселении. Затем, буквально через десять секунд прибегает уже Вернар и говорит, что мы продолжаем работу и никуда не переезжаем! Мне, как уборщику, по большому счету и плевать на это. Однако они постоянно то уронят кружку кофе с спешке, то этот-же кофе попадет на документы, а они уже упадут всей стопкой на пол! То, черт побери, эти недотепы грузчики уронят целый поддон с бочками масла, и конечно-же разольют его прямо у моего порога!!! - - - Эх... Просто делай свою работу... - - uid: 5541 - components: - - type: Transform - pos: -30.570473,8.56184 - parent: 1 - - type: Paper - content: >- - Я все понимаю, "мы можем себе позволить" и все в этом роде, но... Зачем ремонтному цеху СТОЛЬКО масла? Последнее время бочки с маслом забили все склады, и пришлось расставлять их в коридорах. Причем если-бы они хотя-бы прибывали в нормальном состоянии... Но нет-буквально вчера при разгрузке одна из бочек упала на одного из грузчиков! Эта огромная лужа масла до сих пор покрывает весь пол. У нас вообще есть уборщик?! Где этот чертов Роберт когда он так нужен?! - - - Я понятия не имею, откуда у Хофмана берутся средства на закупку столь обширных запасов масла, когда он даже нормальные обеды нам обеспечить не может! Этот человек странный. В плохом смысле, странный. - - - Однако, больше всего меня смущает то, что к нам очень часто стал заглядывать Норман, и забирать все эти бочки... Хотя, Норман является нашим единственным поставщиком и его-же ребята нам их привозят. Мне что-то подсказывает, что дело пахнет жареным... маслом - uid: 5542 components: - type: Transform @@ -44565,26 +45157,6 @@ entities: - type: Transform pos: -2.6377032,0.5579493 parent: 1 - - uid: 5546 - components: - - type: Transform - pos: -7.757307,-16.412815 - parent: 1 - - type: Paper - content: >2- - -В̶Н̶И̶М̶А̶Н̶И̶Е̶ - ̶П̶р̶о̶х̶о̶д̶̶ ̶с̶т̶р̶о̶г̶о̶ ̶в̶о̶с̶п̶р̶е̶щ̶ён̶ ̶п̶р̶и̶ ̶л̶ю̶б̶ы̶х̶ ̶о̶б̶с̶т̶о̶я̶т̶е̶л̶ь̶с̶т̶в̶а̶х̶ ̶п̶о̶ ̶п̶р̶и̶ч̶и̶н̶е̶ ̶о̶ц̶е̶п̶л̶е̶н̶и̶я̶ ̶д̶а̶н̶н̶о̶й̶ ̶т̶е̶р̶р̶и̶т̶о̶р̶и̶и̶ ̶р̶е̶ш̶е̶н̶и̶е̶м̶ ̶м̶е̶с̶т̶н̶о̶г̶о̶ ̶с̶у̶д̶а̶ ̶с̶ ̶1̶3̶.̶0̶1̶.̶2̶4̶9̶9̶.̶ - - ̶Н̶а̶х̶о̶ж̶д̶е̶н̶и̶е̶ ̶н̶а̶ ̶о̶ц̶е̶п̶л̶е̶н̶н̶о̶й̶ ̶т̶е̶р̶р̶и̶т̶о̶р̶и̶и̶ ̶б̶у̶д̶е̶т̶ ̶с̶ч̶и̶т̶а̶т̶ь̶с̶я̶ ̶н̶е̶з̶а̶к̶о̶н̶н̶ы̶м̶ ̶п̶р̶о̶н̶и̶к̶н̶о̶в̶е̶н̶и̶е̶м̶ ̶и̶ ̶к̶а̶р̶а̶е̶т̶с̶я̶ ̶з̶а̶к̶о̶н̶о̶м̶.̶ - - - ̶С̶ ̶у̶в̶а̶ж̶е̶н̶и̶е̶м̶,̶ ̶д̶и̶р̶е̶к̶т̶о̶р̶ ̶Т̶р̶а̶н̶с̶п̶о̶р̶т̶н̶о̶г̶о̶ ̶Д̶е̶п̶о̶ ̶"̶Б̶а̶с̶т̶и̶л̶и̶я̶"̶ - - - *ниже криво выведен текст* - - - Бред это всё - uid: 5547 components: - type: Transform @@ -44605,18 +45177,6 @@ entities: - type: Transform pos: 12.521133,7.5174046 parent: 1 - - uid: 5551 - components: - - type: Transform - pos: -13.256543,-44.858284 - parent: 1 - - type: Paper - content: >+ - Слушайте, я учел ваши замечания по поводу отсутствия вентиляции на проекте-в будущем мы ее проведем и сюда, а пока-что пользуйтесь такими небольшими кислородными пунктами, и помните, что мы с Карлом не отвечаем за ваше здоровье! - - - Майкл Биккерель, старший техник "Бастилии" - - uid: 5552 components: - type: Transform @@ -44640,35 +45200,12 @@ entities: rot: 1.5707963267948966 rad pos: 5.3628745,12.158264 parent: 1 - - uid: 5556 - components: - - type: Transform - rot: -3.141592653589793 rad - pos: 12.238566,10.884833 - parent: 1 - - type: Paper - content: >- - Премногоуважаемый Мистер Вернар, скажите пожалуйста-куда нам черт подери девать все эти чертовы бочки?! Скоро платформу будет невозможно покинуть без вызова бригады грузчиков-мы уже ставим бочки почти на ресепшене! - - - Ах да, и сообщите Норману, что его рабочие-дерьма кусок. Они мало того, что постоянно выкидывают бочки со своего шаттла, да так, что те протекают, так они при этом еще и ставят их будто специально мимо поддонов! - - - Возвращаясь к теме-я понимаю, что вы, "светило наше", не будете слушать обычного квартирмейстера, однако если вы и в этот гребаный раз меня не послушаете-то ожидайте проблем! Вы ведь в курсе, что по вашу алчную душу через неделю здесь будет очередная инспекция? Так вот-считайте, что вы уже были ею оштрафованы: В этот раз мы не собираемся убирать "лишние" бочки и оборудование в наши спальни снова! - uid: 5557 components: - type: Transform rot: -1.5707963267948966 rad pos: 13.877515,4.349301 parent: 1 - - uid: 5558 - components: - - type: Transform - pos: 1.7352748,0.5639586 - parent: 1 - - type: Paper - content: > - Слушай, Карл, тебе не кажется, что Бастилия идет ко дну? К нам уже дважды приходила инспекция по "неразглашаемому" поводу! Я не представляю, как Вернар постоянно дает им от ворот-поворот, но мне что-то подсказывает, что нам пора увольняться. Если учитывать еще то, что во втором корпусе произошло с вентиляцией... Как прочтешь это письмо-свяжись со мной через административную линию в штабе. Я, скорее всего, в это время уже буду забирать документы и объясню, что делать тебе. - uid: 5559 components: - type: Transform @@ -44756,71 +45293,6 @@ entities: - type: Transform pos: 5.666833,16.527302 parent: 1 -- proto: PaperCargoInvoice - entities: - - uid: 119 - components: - - type: MetaData - name: 'Заказ #1' - - type: Transform - parent: 118 - - type: Paper - content: >- - Заказ #2743 - - Товар: ящик для вечеринок - - Кол-во: 1 - - Запросил: Карл Киллан - - Причина: День рождения Роберта (Пожалуйста, Алекс, не разглашай информацию об этом заказе до самого празднования, хорошо? :) ) - - Одобрил: Алекс Брайтан (Квартирмейстер) - - type: SolutionContainerManager - solutions: null - containers: - - food - - type: Physics - canCollide: False - - type: Fixtures - fixtures: - fix1: - shape: !type:PolygonShape - radius: 0.01 - vertices: - - -0.25,-0.25 - - 0.25,-0.25 - - 0.25,0.25 - - -0.25,0.25 - mask: - - Impassable - - HighImpassable - layer: [] - density: 20 - hard: True - restitution: 0.3 - friction: 0.2 - flammable: - shape: !type:PhysShapeCircle - radius: 0.35 - position: 0,0 - mask: - - TableLayer - - HighImpassable - - LowImpassable - - BulletImpassable - - InteractImpassable - - Opaque - layer: [] - density: 1 - hard: False - restitution: 0 - friction: 0.4 - - type: ContainerContainer - containers: - solution@food: !type:ContainerSlot - ent: 120 - proto: PaperOffice entities: - uid: 1490 @@ -44869,28 +45341,6 @@ entities: - type: Transform pos: 13.9401655,7.7235856 parent: 1 - - uid: 5569 - components: - - type: Transform - pos: 0.46032578,-23.389824 - parent: 1 - - type: Paper - content: >- - Вы уверены, что введение в эксплуатацию жило-торгового и плазма-добывающего корпуса было хорошей идеей? Последние семь лет моей работы эта платформа только и делает, что идет ко дну! Мы ведь и так концы-с-концами еле как сводим-даже недавно пришлось переоборудовать утилизаторскую под цех переработки мусора! Так вот, возвращаясь к этой "хорошей идее" от Вернара в виде новых двух корпусов. Я ведь заведую производством, и меня не обмануть фальшивой бухгалтерией: Платформа потребляет колоссальное количество энергии для работы, а взамен мы получаем не так что-бы много плазмы! Одна радость-этого "не так что-бы много" хватает для запитки остальной электросети, так что в поставках от Нормана, мы, слава богу не нуждаемся (а с его-то завышенными ценами-и подавно). - - - Я не уверен, что еще долго проработаю здесь. Это место меняет специальности как перчатки! Уже, как мне известно, трижды происходило увольнение почти всех сотрудников, последний раз это было три года назад, тогда это место было огромным ремонтным цехом. Но, после "смены направления", теперь это буровая вышка! Ох-х. Да, пожалуй, через неделю-другую я уволюсь... Однако, пропадать такой талантливый инженер как я не буду, мою кандидатуру уже рассмотрели на другой вышке, пускай там и довольно... необычный подход к найму рабочих, пока-что они отзываются положительно. Я надеюсь, что без меня здесь в первый-же день все не рухнет. - - uid: 5570 - components: - - type: Transform - pos: -1.7394977,30.14311 - parent: 1 - - type: Paper - content: >- - Слушай, Карл, что ты думаешь о небольшом "изменении", которое я приготовил. Буду краток-я решил продать половину нашей платформы компании "Scrap Tech", понятия не имею, зачем им понадобилась Бастилия, но они готовы заплатить крупную сумму за административный и технические корпуса! Это может спасти наш заработок, понизив расходы (как заявили SC-они берут все обслуживание на себя). Единственная печальная новость-нам придеться... попрощаться с несколькими сотрудниками... Полагаю, ты понимаешь, о чем я. Что-ж, от тебя требуется лишь договориться с остальными механиками на перестройку и перенос пары комнат. - - - С уважением, Вернар Хофман - uid: 5571 components: - type: Transform @@ -50124,9 +50574,10 @@ entities: - uid: 6399 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 9.166573,-49.161777 - parent: 1 + parent: 3901 + - type: Physics + canCollide: False + - type: InsideEntityStorage - uid: 6400 components: - type: Transform @@ -51272,17 +51723,10 @@ entities: rot: 3.141592653589793 rad pos: -7.5,-37.5 parent: 1 - - type: DeviceLinkSource - linkedPorts: - 245: - - - Pressed - - Toggle - - - Pressed - - AutoClose missingComponents: - Construction - - Damageable - Destructible + - Damageable - uid: 6564 components: - type: Transform @@ -51483,7 +51927,7 @@ entities: - uid: 6587 components: - type: Transform - pos: 8.501973,-5.2949743 + pos: 8.5,-5.5 parent: 1 - uid: 6588 components: @@ -51496,39 +51940,39 @@ entities: - uid: 6589 components: - type: Transform - pos: -6.499772,1.7179565 + pos: -6.5,1.5 parent: 1 - uid: 6590 components: - type: Transform - pos: -6.498148,20.282095 + pos: -6.5,20.5 parent: 1 - uid: 6591 components: - type: Transform - pos: 7.5005693,20.286724 + pos: 7.5,20.5 parent: 1 - uid: 6592 components: - type: Transform - pos: 8.496686,-5.6996627 + pos: 8.5,-5.5 parent: 1 - proto: SignDirectionalSupply entities: - uid: 6593 components: - type: Transform - pos: 7.4982543,20.724224 + pos: 7.5,20.5 parent: 1 - uid: 6594 components: - type: Transform - pos: -6.496791,20.71728 + pos: -6.5,20.5 parent: 1 - uid: 6595 components: - type: Transform - pos: -6.499772,1.3012898 + pos: -6.5,1.5 parent: 1 - proto: SignDisposalSpace entities: @@ -51671,7 +52115,7 @@ entities: components: - type: Transform rot: 3.141592653589793 rad - pos: -13.74022,-3.501624 + pos: -13.5,-3.5 parent: 1 - uid: 6617 components: @@ -51681,13 +52125,13 @@ entities: - uid: 6618 components: - type: Transform - pos: -12.516175,8.758957 + pos: -12.5,8.5 parent: 1 - uid: 6619 components: - type: Transform rot: 3.141592653589793 rad - pos: -12.518116,8.440978 + pos: -12.5,8.5 parent: 1 - proto: SignRedSeven entities: @@ -51723,7 +52167,7 @@ entities: components: - type: Transform rot: 3.141592653589793 rad - pos: -13.392998,-3.501624 + pos: -13.5,-3.5 parent: 1 - proto: SignRestroom entities: @@ -52036,11 +52480,6 @@ entities: - type: Transform pos: -1.5,22.5 parent: 1 - - uid: 6670 - components: - - type: Transform - pos: 10.5,23.5 - parent: 1 - uid: 6671 components: - type: Transform @@ -52581,6 +53020,29 @@ entities: - type: Transform pos: 33.5,8.5 parent: 1 + - type: Fixtures + fixtures: + fix1: + shape: !type:PolygonShape + radius: 0.01 + vertices: + - -0.25,-0.48 + - 0.25,-0.48 + - 0.25,0.48 + - -0.25,0.48 + mask: + - Impassable + - TableLayer + - LowImpassable + layer: + - BulletImpassable + - Opaque + density: 350 + hard: True + restitution: 0 + friction: 0.4 + - type: PlaceableSurface + isPlaceable: True - type: Lock locked: False - type: EntityStorage @@ -52589,8 +53051,6 @@ entities: immutable: False temperature: 293.14923 moles: - - 1.7459903 - - 6.568249 - 0 - 0 - 0 @@ -52601,13 +53061,10 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 3726 + - 0 + - 0 + open: True + removedMasks: 20 - uid: 5524 components: - type: Transform @@ -52883,6 +53340,24 @@ entities: - type: Transform pos: -17.5,-45.5 parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14923 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - uid: 6769 components: - type: Transform @@ -52921,6 +53396,24 @@ entities: - type: Transform pos: -17.5,-42.5 parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14923 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - uid: 6771 components: - type: Transform @@ -54320,7 +54813,7 @@ entities: - uid: 6999 components: - type: Transform - pos: -22.059902,7.777971 + pos: -22.06102,7.7279034 parent: 1 - proto: ToolboxMechanicalFilled entities: @@ -62526,6 +63019,24 @@ entities: - type: Transform pos: 7.514999,-22.49358 parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14996 + moles: + - 0 + - 200 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - uid: 8553 components: - type: Transform @@ -62616,6 +63127,24 @@ entities: - type: Transform pos: 7.3365455,-26.63987 parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14996 + moles: + - 0 + - 200 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - type: Pullable prevFixedRotation: True - uid: 8559 @@ -62623,6 +63152,24 @@ entities: - type: Transform pos: 7.683799,-23.465075 parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14996 + moles: + - 0 + - 200 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - type: Pullable prevFixedRotation: True - proto: WardrobeSalvage @@ -62637,11 +63184,47 @@ entities: - type: Transform pos: 3.2266903,-44.45894 parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14996 + moles: + - 0 + - 184 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - uid: 8562 components: - type: Transform pos: 3.7266903,-44.61519 parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14996 + moles: + - 0 + - 200 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - uid: 8563 components: - type: Transform @@ -62678,6 +63261,24 @@ entities: - type: Transform pos: 5.482827,-44.389874 parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14996 + moles: + - 0 + - 200 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - type: Pullable prevFixedRotation: True - proto: WardrobeSalvageFilled @@ -62694,7 +63295,7 @@ entities: temperature: 293.14996 moles: - 0 - - 200 + - 216 - 0 - 0 - 0 @@ -62826,14 +63427,35 @@ entities: - type: Transform pos: 34.40851,8.392227 parent: 1 + - type: Fixtures + fixtures: + fix1: + shape: !type:PolygonShape + radius: 0.01 + vertices: + - -0.25,-0.48 + - 0.25,-0.48 + - 0.25,0.48 + - -0.25,0.48 + mask: + - Impassable + - TableLayer + - LowImpassable + layer: + - BulletImpassable + - Opaque + density: 75 + hard: True + restitution: 0 + friction: 0.4 + - type: PlaceableSurface + isPlaceable: True - type: EntityStorage air: volume: 200 immutable: False temperature: 293.14923 moles: - - 1.7459903 - - 6.568249 - 0 - 0 - 0 @@ -62844,17 +63466,10 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 3728 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null + - 0 + - 0 + open: True + removedMasks: 20 - proto: WarningN2 entities: - uid: 8568 @@ -63048,7 +63663,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -55034.5 + secondsUntilStateChange: -56039.125 state: Opening - type: Airlock autoClose: False diff --git a/Resources/Maps/_NF/POI/grifty.yml b/Resources/Maps/_NF/POI/grifty.yml index d0a28e42c412..b95eee3a4f1b 100644 --- a/Resources/Maps/_NF/POI/grifty.yml +++ b/Resources/Maps/_NF/POI/grifty.yml @@ -6,7 +6,7 @@ meta: forkId: "" forkVersion: "" time: 08/04/2025 17:34:24 - entityCount: 899 + entityCount: 898 maps: [] grids: - 1 @@ -2583,14 +2583,6 @@ entities: - 0 - 0 - 0 -- proto: ClothingUniformJumpsuitST - entities: - - uid: 899 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -5.460486,2.551206 - parent: 1 - proto: ComputerSolarControl entities: - uid: 381 diff --git a/Resources/Maps/_NF/POI/mchobo.yml b/Resources/Maps/_NF/POI/mchobo.yml index ff9a20670b41..19576d8bbd52 100644 --- a/Resources/Maps/_NF/POI/mchobo.yml +++ b/Resources/Maps/_NF/POI/mchobo.yml @@ -6,7 +6,7 @@ meta: forkId: "" forkVersion: "" time: 08/04/2025 17:18:02 - entityCount: 1073 + entityCount: 1072 maps: [] grids: - 1 @@ -2903,14 +2903,6 @@ entities: - type: Transform pos: -3.7478323,15.448365 parent: 1 -- proto: ClothingUniformJumpsuitST - entities: - - uid: 419 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -3.3256228,15.629316 - parent: 1 - proto: ComputerTabletopBroken entities: - uid: 420 diff --git a/Resources/Prototypes/_Forge/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_Forge/Entities/Clothing/Uniforms/jumpsuits.yml index 3a2b6548d307..07a9d1782b3f 100644 --- a/Resources/Prototypes/_Forge/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/_Forge/Entities/Clothing/Uniforms/jumpsuits.yml @@ -109,18 +109,6 @@ - type: Clothing sprite: Forge/Clothing/Uniforms/Jumpsuits/engineersynjumpsuit.rsi -- type: entity - parent: ClothingUniformBase - id: ClothingUniformJumpsuitST - name: Scrap Tech jumpsuit - suffix: DT/ST - description: Old and dirty orange salvage jumpsuit with belts and harness system, belong to some crappy company named Scrap Tech. - components: - - type: Sprite - sprite: Forge/Clothing/Uniforms/Jumpsuits/scraptech.rsi - - type: Clothing - sprite: Forge/Clothing/Uniforms/Jumpsuits/scraptech.rsi - - type: entity parent: [ ClothingUniformBase, BaseCentcommContraband ] id: ClothingUniformJumpsuitFormalSpecOper diff --git a/Resources/Prototypes/_Forge/Entities/Structures/Decoration/banners.yml b/Resources/Prototypes/_Forge/Entities/Structures/Decoration/banners.yml index 7a9a5c6d056a..fc269c64c5d5 100644 --- a/Resources/Prototypes/_Forge/Entities/Structures/Decoration/banners.yml +++ b/Resources/Prototypes/_Forge/Entities/Structures/Decoration/banners.yml @@ -1,14 +1,3 @@ -- type: entity - id: BannerScrapTech - parent: BannerBase - name: Scrap Tech banner - suffix: DT/ST - description: A banner displaying some crappy company. He,s covered with dirt and engine fluid. - components: - - type: Sprite - sprite: Forge/Structures/Decoration/banner.rsi - state: banner_scraptech - - type: entity id: BannerTL parent: BannerBase diff --git a/Resources/Prototypes/_Forge/Entities/Structures/Wallmounts/Signs/flags.yml b/Resources/Prototypes/_Forge/Entities/Structures/Wallmounts/Signs/flags.yml deleted file mode 100644 index 8de2637faa3f..000000000000 --- a/Resources/Prototypes/_Forge/Entities/Structures/Wallmounts/Signs/flags.yml +++ /dev/null @@ -1,10 +0,0 @@ -- type: entity - parent: BaseFlag - id: ScrapFlag - name: Scrap Tech Flag - suffix: DT/ST - description: Some piece of light-orange cloth with gray lines, its covered with oil... - components: - - type: Sprite - sprite: Forge/Structures/Wallmounts/flags.rsi - state: scrap_tech diff --git a/Resources/Textures/Forge/Clothing/Uniforms/Jumpsuits/scraptech.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Forge/Clothing/Uniforms/Jumpsuits/scraptech.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 1876cc6c33bf96001c7f2a7489b6f9eb99c5b468..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2326 zcmV+x3F-EUP)EX>4Tx04R}tkv&MmP!xqv(~6~394si}kfAzR5EXHhDi*;)X)CnqVDi#GXws0R zxHt-~1qXi?s}3&Cx;nTDg5VE`vxAeOi|xiA_WmL>ZqU!3o+U?QcR@jJnrEicKj)F$>gel zkz)ZhsE`~#_#gb9ty!F!bd$nypy$Q5KSqJxU7*#l?eAmTZk+)BXW&Zf_-jpI_LKBR zM~fZ-{oBCBbw`u;fXf|V=t-9h$&viDgklkRKcjET0|U1}Xw98l`y8haK$d2;d;=UD z0%Il0UiWx+uzPO*_O$2s0|!)ce0Q6O0{{RAOi4sRRCt{2n?Xz)R~pCvgE4qaXTemd zY8*R`+ziaYQUio0X_Sp*kah)%l!LDvK;3E;DX0}W^pZ%u^w26Or>K$2fkXG;1JNq0 zP1UB#q9&10Ob?dUcpB8f)F#j_ur@G5hRN$;GJ^*wp6A$9s^)hw^XAR>z3-dv&Ad0? z2jJk~;Nalk;NW1781E-B-cQQ4)ry|(u6_0Qbaz#xzn-RZM>|hWwwafZ`{E)KwZKM|0kYhNrZ!MfKbhd-!n*v}x9>ha)@HMLDxz#N<64?l3MM2v}4&#qz zZR@YI(<#RL$+g~{uETxJNG+~mX+PebQn6@L3&RDtj7ZYm=FV4 z-Esrajh_$$0QB>{C-wezWtVk8jQ5k#0k3%+4h1nG227*%@CzUu3YvXJ2fS5t!qC|c z5MnuDw;kg^K^U^+p{EPd{(w&IfetY4z9Dq-v5G-Hx9w9%X@k0rm{ZtM}XT;w;x7#VT;2<5lonjZ;p%U+mkkp1AYFE$eZ4Xl~@NQIp zjC?w!w?&&Y^MO@O;++xlmo69DI1RU-3P@)}gk3TujfK$8<8N=JkuSP%FG;80);gf0 zoi~ja+Ib|TAPVv}WK}~!-bO+SLTKj!0I3a^W!YQ}O63{G8#m$Vc|9_3KNa@vUk=*~ zq1c5#0{~=M2FtSeYUw!sk^GVQYUwywmW3?KmVVV{`>24sOT1}(;-RiD@lZCMaCeEv z_EDjXBrCQZ(CX87eDSb854rzImS3aY=vPfIJ zz`dk~v3?CkADYdWEeFhIL?$tL2LRB z`l;3d05F@H2e7l+x-Tv=F@P-73aXIbTfc*YgM)*EgM)*EgTo(!ingvX-cMRz^IF;iME;E#4IOJX?AO!vdZl=N*?#tneuh#$o$6A|c#8t%7x{Udi z4FGy=!p)RkHDV@47!JUqZFy8vAV7*3>(|U;2-f34A{)WzfY(wYQ)_YzhtUBq64{7( z=fj~O#`-k`NRdhw^)p~~%Z-t!ghFPBV>@znWZv^fs|dqwca}T8dd!DhIRcx`#PqMfZg1FD!j}K*8c97 zG9d=QvMgxp0e17s4mhZ0pq5mt9)ap1xI6WI@ti;eR<+a!9v0zH5CW^>;yJ+_PiY$8 zE>sRMlAf2}e~*+pLdq^cVAYx=MfV$nz^axA=xFE3<@etsrDL>9MXy041up)qAuYQR z4h5mGZd`i%c+K|%m)<^36js-nmfaA4)+}S9r6LC;Chs5|3W7i4g23vpp(|%J_`Ho3 z4T1)rw-Hy)=tc{y3jT;*pk<`*X`y-uUOXp|zxOVMxlB9MQ6m#)ob=$Ych^{Jij0Mk#BOiyqf7mQb%h+8LuzPF{4i07c75nC56!1Lwr~m)}07*qoM6N<$g4=UkdjJ3c diff --git a/Resources/Textures/Forge/Clothing/Uniforms/Jumpsuits/scraptech.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Forge/Clothing/Uniforms/Jumpsuits/scraptech.rsi/equipped-INNERCLOTHING.png deleted file mode 100644 index 7e75948aaa84479cd044d489624b56fd70d2c9ef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2077 zcmV+&2;%pNP)EX>4Tx04R}tkv&MmP!xqv(~6~394si}kfAzR5EXHhDi*;)X)CnqVDi#GXws0R zxHt-~1qXi?s}3&Cx;nTDg5VE`vxAeOi|xiA_WmL>ZqU!3o+U?QcR@jJnrEicKj)F$>gel zkz)ZhsE`~#_#gb9ty!F!bd$nypy$Q5KSqJxU7*#l?eAmTZk+)BXW&Zf_-jpI_LKBR zM~fZ-{oBCBbw`u;fXf|V=t-9h$&viDgklkRKcjET0|U1}Xw98l`y8haK$d2;d;=UD z0%Il0UiWx+uzPO*_O$2s0|!)ce0Q6O0{{R9Q%OWYRCt{2nm!K(p;cVgO7XzTkR?$nB}ga(Nvf6( zMhdt=a*Pa3)YuNj+<|dkhs!;D{E7X}9BHfjEY`jE{QJH4yWhL_=l25)3=9km3=9km z>LV<8NLcWYT4j1M(BF5g{(=5JP5PTz8h3UGq~|>S3z<)Cn!OmDQ9< zOGoNqpudl}c^Ae8O8`IzJP~zbHs!)Ve;@hvx8Irc*WI|YL!b)1q==Bm1-qpgVtF6Q z%>uF}j<(gq2;;+@WW(Ww-DX3~zXsk~rgiyU3+6IGh?0c!r7RMQD|PEP*V8C0c*u0* zpy@=^iR5MhueL=bHw&1EI%(Z>#EjFP4&%d}B+>)eZ8iYFY|4xLt_6TR_}P>ffLtHx zk=xfRyQTrcf`?3vw$kT---p?hmkwHXKQ97)A8j)=+Inh67$5E=v7s_}YZ)>B8bnD# zI zsnB}G^#QrOx?R0qP}2kQyB6fOcQCiKW&!|l?;S)*Qne8!3F4k?h`FUTQ*L{Qx@RLO za;o*`cP)sIRL~_{0swRgmk=MRP<_?CGdNdVaN z*S!jKb_j&yxFdsCNN3i;ahz(ybehyFmsNk=1^@uAtqp+u#hs3rG0eZibi_=*%u2mp zaBtFx`PUHe`_RsDn2wmy&T$C%eTezjz`aQ`%VaWuo0s?e-#m5!0NSk<)w5EsC$lLp za`^%#2TOSL2QWEULM~rWEr~2JeXJDsYUkvAe|Jj>%X$L$03fU{Xtr@(4XDz638GPu0w!1Ci`%AUP{U@|8= zdgy2KfUON&zGy+vy$^0{gO&x|`?!43Ld*0*5B*FY001k=mq*H8r(feWvubU8Z2blX z1_lNO1_lNO1_u8NG+keX1rKqzwW`XL$jw<1>kX=Ie{75gs&qZB9`|70Lje)rbb&alMK)>+1BckevzT9i9_~%RHjR~gqdUj z6VWX0JS+eJF1j5o;xzGUTg1zpd@(u^bz&wdXN}Nkk%6;JueTa`#;3Y*SS8Q(JOha`3TIHqSbMC-YRE| zC^8N3n?(3+3HWB_+tt7^TUzYRRN6(nOqmZr*_1?kK>rXyzX)-t}h zt=@mIF2~FsaG0N8bU_qF0Q$fEYGzYj*zI<(<^vq2VFNs0O*JY)6DQ>~j=0(x^eCqe1M;l9-ilLyH2KS&c1s8BM|=ERMRY00000NkvXX Hu0mjfy5H0T diff --git a/Resources/Textures/Forge/Clothing/Uniforms/Jumpsuits/scraptech.rsi/icon.png b/Resources/Textures/Forge/Clothing/Uniforms/Jumpsuits/scraptech.rsi/icon.png deleted file mode 100644 index 24b82461d7eed62ebcd4becc6f62475286b0cace..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 878 zcmV-!1CjiRP)EX>4Tx04R}tkv&MmP!xqv(~6~394si}kfAzR5EXHhDi*;)X)CnqVDi#GXws0R zxHt-~1qXi?s}3&Cx;nTDg5VE`vxAeOi|xiA_WmL>ZqU!3o+U?QcR@jJnrEicKj)F$>gel zkz)ZhsE`~#_#gb9ty!F!bd$nypy$Q5KSqJxU7*#l?eAmTZk+)BXW&Zf_-jpI_LKBR zM~fZ-{oBCBbw`u;fXf|V=t-9h$&viDgklkRKcjET0|U1}Xw98l`y8haK$d2;d;=UD z0%Il0UiWx+uzPO*_O$2s0|!)ce0Q6O0{{R4q)9|UR9J=Wl(9?0P!NZ|ScRk#sS1ID zk}i!#2&kij8JvoH6@w%c@ZMKG{0IJPaBtLcoq0rHGFJi)+n~sQwd6_B1o9 z0GKjYu&sO~FGFkt4UyvTq65HZw~MB#0BEYpXSWN$;YEjrNJ$x(j8in&>>xC;B1a-Y3vhmCE(cb#ah>2WFPm0eGlA4db?z2cZ3U z`*#MmtZYzp^~hEX>4Tx04R}tkv&MmP!xqv(~6~394si}kfAzR5EXHhDi*;)X)CnqVDi#GXws0R zxHt-~1qXi?s}3&Cx;nTDg5VE`vxAeOi|xiA_WmL>ZqU!3o+U?QcR@jJnrEicKj)F$>gel zkz)ZhsE`~#_#gb9ty!F!bd$nypy$Q5KSqJxU7*#l?eAmTZk+)BXW&Zf_-jpI_LKBR zM~fZ-{oBCBbw`u;fXf|V=t-9h$&viDgklkRKcjET0|U1}Xw98l`y8haK$d2;d;=UD z0%Il0UiWx+uzPO*_O$2s0|!)ce0Q6O0{{R4o=HSORCt{2*|AQ-P#6W^V=IeDB*w+b zft0}D0))YdL^fw$fPvi?;1ytI@CBURG;w9op$m~Xu;2y>p(G5X4y1~T#mWhAlk-jF zwmG-?TkdiI5fKp)5fKp)5&4fwF6CEpDSy@4w(@>sF+wW2l<#^rs-^kwV69pLT+c?- zhi2!6p$s6<>So}2HmVmH-}P*?x|yBITW0M61aB*wc9vexrkzM{jh(j&LCaK&2}8aX$;MFd?)k1qYR)}$oqrw1c^}}0C4|2Ur&ts7>p+< z7V?n}EOuU)eMU%P)JNw03;@t^d%(%j&$TV)g`xeIF4Lzz03074e5?(|69B-&%Uk4q z*m)u%A|fIpA|fJUHdcE~?*%r2*&Z7?fB>UCHf{jy_Sm=q0NnQ2$bx~{9vk@uFxz7z y2e4?}_Snb)Fxz8FJG^Pk_Sncn5Kwz8A{_6l=O7)(RrzuN0000EX>4Tx04R}tkv&MmP!xqv(~6~394si}kfAzR5EXHhDi*;)X)CnqVDi#GXws0R zxHt-~1qXi?s}3&Cx;nTDg5VE`vxAeOi|xiA_WmL>ZqU!3o+U?QcR@jJnrEicKj)F$>gel zkz)ZhsE`~#_#gb9ty!F!bd$nypy$Q5KSqJxU7*#l?eAmTZk+)BXW&Zf_-jpI_LKBR zM~fZ-{oBCBbw`u;fXf|V=t-9h$&viDgklkRKcjET0|U1}Xw98l`y8haK$d2;d;=UD z0%Il0UiWx+uzPO*_O$2s0|!)ce0Q6O0{{R4sYygZRCt{2*|AQ-P#6W^V=IeDB*w+b zfs~ZN1qg#v6WN$~fe!4x0IvWugD>Fhrim+y4qb@Efdw~62qj@4Wgt}(E^y1O(reB) zkw0y7@^jne07OJYL_|bHL_`Dt^ zSUohWTMy2kQ^|WI8vfjt>i~C;CR()x?q9yId3gO0-g^itd4;P9FCG|KjOQt|Y730# zDGZG4)`uO6O5UAkx!p};JWrwBO~)4aH$}}WTtKB<3P#fzGLsAy|4##q)~=T^7IcpK>j=++p^61Kx4x;4hKBE7e4V2S9zSpq5+ARR?7AqfBg002ov JPDHLkV1g>4k}LoK diff --git a/Resources/Textures/Forge/Clothing/Uniforms/Jumpsuits/scraptech.rsi/meta.json b/Resources/Textures/Forge/Clothing/Uniforms/Jumpsuits/scraptech.rsi/meta.json deleted file mode 100644 index d0bfded9a9dc..000000000000 --- a/Resources/Textures/Forge/Clothing/Uniforms/Jumpsuits/scraptech.rsi/meta.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "All sprite,s by MrIzo", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-INNERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-reptilian", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -}