From 415ea0778e7de8b55d49fd7eb28114fade0f2ba9 Mon Sep 17 00:00:00 2001 From: endr_animet <162136802+EndrAnimet@users.noreply.github.com> Date: Tue, 24 Mar 2026 18:58:14 +0400 Subject: [PATCH] someEdits --- .../Locale/ru-RU/_wh40k/job/job-names.ftl | 2 +- .../ru-RU/_wh40k/prototypes/entities.ftl | 4 + Resources/Maps/_WH40K/battlefield40k.yml | 1128 +++++++++-------- .../_WH40K/Catalog/Cargo/products.yml | 4 +- .../Prototypes/_WH40K/Command/node_tree.yml | 6 +- .../Circuitboards/Machine/production.yml | 83 ++ .../Entities/Objects/Devices/servo_skulls.yml | 30 +- .../Entities/Structures/Machines/lathes.yml | 12 + .../_WH40K/Loadouts/Imperium/Guardsman.yml | 15 + .../_WH40K/Loadouts/loadout_groups.yml | 9 +- .../_WH40K/Maps/wh40k_battlefield.yml | 2 +- .../_WH40K/Recipes/Lathe/command_unlocks.yml | 7 +- .../_WH40K/Research/command_unlocks.yml | 4 +- .../Roles/Jobs/Heretics/BandSupplier.yml | 1 + .../_WH40K/Roles/Jobs/Heretics/Guardsman.yml | 2 - .../_WH40K/Roles/Jobs/Heretics/Medic.yml | 2 - .../_WH40K/Roles/Jobs/Heretics/Sergeant.yml | 3 +- .../Roles/Jobs/Heretics/lexmechanic.yml | 12 +- .../_WH40K/Roles/Jobs/Imperium/Colonel.yml | 2 +- .../_WH40K/Roles/Jobs/Imperium/Guardsman.yml | 4 - .../Jobs/Imperium/Mechanicus/lexmechanic.yml | 12 +- .../_WH40K/Roles/Jobs/Imperium/Medic.yml | 2 - .../_WH40K/Roles/Jobs/Imperium/Psyker.yml | 2 - .../_WH40K/Roles/Jobs/Imperium/Sergeant.yml | 3 +- .../Roles/Jobs/Imperium/TitheSupplier.yml | 1 + .../_WH40K/Roles/Jobs/Imperium/VoxScout.yml | 2 +- Resources/Prototypes/_WH40K/radio.yml | 10 +- Resources/Prototypes/_WH40K/tier_profiles.yml | 8 +- Resources/Prototypes/radio_channels.yml | 4 +- 29 files changed, 767 insertions(+), 609 deletions(-) create mode 100644 Resources/Prototypes/_WH40K/Entities/Objects/Devices/Circuitboards/Machine/production.yml diff --git a/Resources/Locale/ru-RU/_wh40k/job/job-names.ftl b/Resources/Locale/ru-RU/_wh40k/job/job-names.ftl index c5d604b6f9af1..f1a02cbf6b412 100644 --- a/Resources/Locale/ru-RU/_wh40k/job/job-names.ftl +++ b/Resources/Locale/ru-RU/_wh40k/job/job-names.ftl @@ -46,4 +46,4 @@ job-name-henginseer = техножрец-отступник job-name-hnovice = аколит тёмного механикума job-name-tithe-supplier = снабженец десятин -job-name-hband-supplier = снабженец банды +job-name-hband-supplier = логистик Муниторума diff --git a/Resources/Locale/ru-RU/_wh40k/prototypes/entities.ftl b/Resources/Locale/ru-RU/_wh40k/prototypes/entities.ftl index 5af1bc56a1d93..27fc35a3762c8 100644 --- a/Resources/Locale/ru-RU/_wh40k/prototypes/entities.ftl +++ b/Resources/Locale/ru-RU/_wh40k/prototypes/entities.ftl @@ -985,3 +985,7 @@ ent-WH40KServoSkullMob = сервочереп .desc = Союзный сервочереп, ожидающий приказа. ent-WH40KServoSkullMeltaMob = сервочереп с мельта-зарядом .desc = Союзный сервочереп, несущий боевой мельта-заряд. + +ent-WH40KAmmoBox10mm = ящик автопатрон (10mm) + +ent-WH40KAmmoBox10mmLong = ящик автопатрон (10mm удлинённые) diff --git a/Resources/Maps/_WH40K/battlefield40k.yml b/Resources/Maps/_WH40K/battlefield40k.yml index bf9fa3db92211..18933275f8dda 100644 --- a/Resources/Maps/_WH40K/battlefield40k.yml +++ b/Resources/Maps/_WH40K/battlefield40k.yml @@ -4,7 +4,7 @@ meta: engineVersion: 274.0.0 forkId: "" forkVersion: "" - time: 03/23/2026 17:49:20 + time: 03/24/2026 14:36:50 entityCount: 17543 maps: - 1 @@ -45898,180 +45898,180 @@ entities: - type: Transform pos: -157.49155,27.465355 parent: 2 - - uid: 2737 + - uid: 2331 components: - type: Transform - parent: 2736 + parent: 2330 - type: Physics canCollide: False - type: InsideEntityStorage - storage: 2736 + storage: 2330 - proto: ClothingHandsGlovesCombatColonel entities: - - uid: 2331 + - uid: 2333 components: - type: Transform - parent: 2330 + parent: 2332 - type: Physics canCollide: False - type: InsideEntityStorage - storage: 2330 + storage: 2332 - proto: ClothingHandsGlovesConducting entities: - - uid: 2338 + - uid: 2340 components: - type: Transform pos: -139.87492,29.949572 parent: 2 - proto: ClothingHandsGlovesTechpriest entities: - - uid: 2339 + - uid: 2341 components: - type: Transform pos: -161.42905,26.496605 parent: 2 - proto: ClothingHeadBandGold entities: - - uid: 2341 + - uid: 2343 components: - type: Transform - parent: 2340 + parent: 2342 - type: Physics canCollide: False - proto: ClothingHeadBandSkull entities: - - uid: 2342 + - uid: 2344 components: - type: Transform pos: -109.498505,69.33563 parent: 2 - proto: ClothingHeadFishCap entities: - - uid: 2343 + - uid: 2345 components: - type: Transform pos: -22.408098,46.983418 parent: 2 - proto: ClothingHeadHatBeaverHat entities: - - uid: 2344 + - uid: 2346 components: - type: Transform pos: -62.49456,68.65342 parent: 2 - proto: ClothingHeadHatBeretBrigmedic entities: - - uid: 2345 + - uid: 2347 components: - type: Transform pos: 48.435112,81.65177 parent: 2 - proto: ClothingHeadHatBeretEngineering entities: - - uid: 2346 + - uid: 2348 components: - type: Transform pos: -54.628094,60.593693 parent: 2 - proto: ClothingHeadHatBeretFrench entities: - - uid: 2347 + - uid: 2349 components: - type: Transform pos: -72.445206,69.6734 parent: 2 - proto: ClothingHeadHatBeretHoS entities: - - uid: 2348 + - uid: 2350 components: - type: Transform pos: 64.38056,30.201275 parent: 2 - proto: ClothingHeadHatBeretMerc entities: - - uid: 2349 + - uid: 2351 components: - type: Transform pos: -61.429886,63.552654 parent: 2 - proto: ClothingHeadHatCapcap entities: - - uid: 2351 + - uid: 2353 components: - type: Transform - parent: 2350 + parent: 2352 - type: Physics canCollide: False - type: InsideEntityStorage - storage: 2350 + storage: 2352 - proto: ClothingHeadHatCone entities: - - uid: 2359 + - uid: 2361 components: - type: Transform pos: -34.515648,52.640465 parent: 2 - - uid: 2360 + - uid: 2362 components: - type: Transform pos: -62.44311,51.43338 parent: 2 - - uid: 2361 + - uid: 2363 components: - type: Transform pos: -34.484398,48.61571 parent: 2 - - uid: 2362 + - uid: 2364 components: - type: Transform pos: -34.31773,47.688625 parent: 2 - - uid: 2363 + - uid: 2365 components: - type: Transform pos: -61.712547,44.707558 parent: 2 - - uid: 2364 + - uid: 2366 components: - type: Transform pos: -62.17228,50.33963 parent: 2 - - uid: 2365 + - uid: 2367 components: - type: Transform pos: -34.421898,43.14587 parent: 2 - - uid: 2366 + - uid: 2368 components: - type: Transform pos: -34.515648,51.53334 parent: 2 - - uid: 2367 + - uid: 2369 components: - type: Transform pos: -62.299103,46.68665 parent: 2 - - uid: 2368 + - uid: 2370 components: - type: Transform pos: -34.546898,44.562534 parent: 2 - - uid: 2369 + - uid: 2371 components: - type: Transform pos: -26.263435,66.73034 parent: 2 - - uid: 2370 + - uid: 2372 components: - type: Transform pos: -27.72177,65.05325 parent: 2 - proto: ClothingHeadHatCorpsoft entities: - - uid: 2372 + - uid: 2374 components: - type: Transform - parent: 2371 + parent: 2373 - type: Clothing inSlot: head inSlotFlag: HEAD @@ -46079,51 +46079,51 @@ entities: canCollide: False - proto: ClothingHeadHatCowboyBrown entities: - - uid: 2374 + - uid: 2376 components: - type: Transform pos: -96.50832,69.460075 parent: 2 - proto: ClothingHeadHatFlowerWreath entities: - - uid: 2375 + - uid: 2377 components: - type: Transform pos: -154.47768,54.34539 parent: 2 - - uid: 2376 + - uid: 2378 components: - type: Transform pos: -113.53825,71.335175 parent: 2 - proto: ClothingHeadHatHardhatOrange entities: - - uid: 2377 + - uid: 2379 components: - type: Transform pos: -66.097984,28.246206 parent: 2 - proto: ClothingHeadHatHardhatWhite entities: - - uid: 2378 + - uid: 2380 components: - type: Transform rot: -1.5707963267948966 rad pos: -139.46774,30.378618 parent: 2 - - uid: 2379 + - uid: 2381 components: - type: Transform pos: -69.578835,45.68414 parent: 2 - proto: ClothingHeadHatHardhatYellow entities: - - uid: 2380 + - uid: 2382 components: - type: Transform pos: 48.40991,27.664154 parent: 2 - - uid: 2381 + - uid: 2383 components: - type: Transform pos: -57.56569,84.69199 @@ -46149,31 +46149,31 @@ entities: ents: - 10 - type: ActionsContainer - - uid: 2382 + - uid: 2384 components: - type: Transform pos: -45.34658,56.576145 parent: 2 - proto: ClothingHeadHatHetmanHat entities: - - uid: 2383 + - uid: 2385 components: - type: Transform pos: 10.548743,72.74873 parent: 2 - proto: ClothingHeadHatHoshat entities: - - uid: 2385 + - uid: 2387 components: - type: Transform - parent: 2384 + parent: 2386 - type: Physics canCollide: False - type: InsideEntityStorage - storage: 2384 + storage: 2386 - proto: ClothingHeadHatPartyYellow entities: - - uid: 2386 + - uid: 2388 components: - type: Transform pos: -121.38899,31.515314 @@ -46201,26 +46201,26 @@ entities: storage: 2304 - proto: ClothingHeadHatStrawHat entities: - - uid: 2387 + - uid: 2389 components: - type: Transform pos: -103.50913,70.325264 parent: 2 - - uid: 2388 + - uid: 2390 components: - type: Transform pos: -38.59504,69.384605 parent: 2 - proto: ClothingHeadHatSyndieMAA entities: - - uid: 2389 + - uid: 2391 components: - type: Transform pos: -101.54344,69.401825 parent: 2 - proto: ClothingHeadHatWelding entities: - - uid: 2390 + - uid: 2392 components: - type: Transform pos: -51.176067,66.6167 @@ -46266,12 +46266,12 @@ entities: playLandSound: True landTime: 78412.226418 thrownTime: 78412.175 - - uid: 2391 + - uid: 2393 components: - type: Transform pos: -48.012386,66.55287 parent: 2 - - uid: 2392 + - uid: 2394 components: - type: Transform pos: -53.41418,66.57415 @@ -46317,33 +46317,33 @@ entities: playLandSound: True landTime: 78412.4042206 thrownTime: 78412.2 - - uid: 2393 + - uid: 2395 components: - type: Transform pos: 130.44183,42.57109 parent: 2 - proto: ClothingHeadHatWeldingMaskFlameBlue entities: - - uid: 2394 + - uid: 2396 components: - type: Transform pos: -56.51141,66.53159 parent: 2 - proto: ClothingHeadHatWeldingMaskPainted entities: - - uid: 2395 + - uid: 2397 components: - type: Transform pos: -42.35764,66.55809 parent: 2 - - uid: 2396 + - uid: 2398 components: - type: Transform pos: -48.751476,56.63463 parent: 2 - proto: ClothingHeadHelmetBombSuit entities: - - uid: 2397 + - uid: 2399 components: - type: Transform rot: 3.141592653589793 rad @@ -46351,7 +46351,7 @@ entities: parent: 2 - proto: ClothingHeadHelmetFlakAdv entities: - - uid: 2398 + - uid: 2400 components: - type: Transform rot: 1.5707963267948966 rad @@ -46359,7 +46359,7 @@ entities: parent: 2 - proto: ClothingHeadHelmetrHeresy entities: - - uid: 2399 + - uid: 2401 components: - type: Transform rot: -1.5707963267948966 rad @@ -46367,7 +46367,7 @@ entities: parent: 2 - proto: ClothingHeadHelmetScrap entities: - - uid: 2400 + - uid: 2402 components: - type: Transform pos: 30.493328,42.62552 @@ -46384,57 +46384,57 @@ entities: storage: 2306 - proto: ClothingHeadScarfChaos entities: - - uid: 2401 + - uid: 2403 components: - type: Transform pos: 145.33215,84.47095 parent: 2 - proto: ClothingHeadVet entities: - - uid: 2402 + - uid: 2404 components: - type: Transform pos: -163.50006,56.65632 parent: 2 - proto: ClothingMaskBreathMedical entities: - - uid: 2403 + - uid: 2405 components: - type: Transform pos: 57.532673,85.598236 parent: 2 - - uid: 2404 + - uid: 2406 components: - type: Transform pos: -71.60906,28.548557 parent: 2 - proto: ClothingMaskBreathMedicalSecurity entities: - - uid: 2405 + - uid: 2407 components: - type: Transform pos: -145.52187,71.41603 parent: 2 - - uid: 2406 + - uid: 2408 components: - type: Transform pos: 57.579723,85.12738 parent: 2 - proto: ClothingMaskGasChaosCultist1 entities: - - uid: 2407 + - uid: 2409 components: - type: Transform pos: 144.55458,87.83629 parent: 2 - proto: ClothingMaskGasExplorer entities: - - uid: 2408 + - uid: 2410 components: - type: Transform pos: -73.47587,28.331831 parent: 2 - - uid: 2409 + - uid: 2411 components: - type: Transform pos: -73.48281,28.609802 @@ -46452,34 +46452,34 @@ entities: canCollide: False - proto: ClothingNeckCloakCapFormal entities: - - uid: 2352 + - uid: 2354 components: - type: Transform - parent: 2350 + parent: 2352 - type: Physics canCollide: False - type: InsideEntityStorage - storage: 2350 + storage: 2352 - proto: ClothingNeckCloakGoliathCloak entities: - - uid: 2410 + - uid: 2412 components: - type: Transform pos: 42.533257,50.181965 parent: 2 - proto: ClothingNeckCloakRd entities: - - uid: 2412 + - uid: 2414 components: - type: Transform - parent: 2411 + parent: 2413 - type: Physics canCollide: False - type: InsideEntityStorage - storage: 2411 + storage: 2413 - proto: ClothingNeckCloakSalvagerSupreme entities: - - uid: 2413 + - uid: 2415 components: - type: Transform rot: -1.5707963267948966 rad @@ -46497,7 +46497,7 @@ entities: storage: 2302 - proto: ClothingNeckEngineermedal entities: - - uid: 2414 + - uid: 2416 components: - type: Transform rot: 1.5707963267948966 rad @@ -46505,35 +46505,35 @@ entities: parent: 2 - proto: ClothingNeckIntersexPin entities: - - uid: 2415 + - uid: 2417 components: - type: Transform pos: -152.51283,98.56388 parent: 2 - proto: ClothingNeckLGBTPin entities: - - uid: 2416 + - uid: 2418 components: - type: Transform pos: 33.513973,50.50978 parent: 2 - proto: ClothingNeckMantleQM entities: - - uid: 2417 + - uid: 2419 components: - type: Transform pos: 37.67528,75.30795 parent: 2 - proto: ClothingNeckMedicalmedal entities: - - uid: 2418 + - uid: 2420 components: - type: Transform pos: -71.24481,28.743137 parent: 2 - proto: ClothingNeckSciencemedal entities: - - uid: 2419 + - uid: 2421 components: - type: MetaData desc: Вручается лучшему работнику слаанешь. @@ -46543,28 +46543,28 @@ entities: parent: 2 - proto: ClothingNeckStoleChaplain entities: - - uid: 2420 + - uid: 2422 components: - type: Transform pos: -94.50712,69.392044 parent: 2 - proto: ClothingOuterArmorScrap entities: - - uid: 2421 + - uid: 2423 components: - type: Transform pos: 30.640097,42.240253 parent: 2 - proto: ClothingOuterHardsuitTechpriest entities: - - uid: 2423 + - uid: 2425 components: - type: Transform - parent: 2422 + parent: 2424 - type: Physics canCollide: False - type: InsideEntityStorage - storage: 2422 + storage: 2424 - proto: ClothingOuterHoodieChaplain entities: - uid: 2235 @@ -46576,110 +46576,110 @@ entities: inSlotFlag: OUTERCLOTHING - type: Physics canCollide: False - - uid: 2425 + - uid: 2427 components: - type: Transform - parent: 2424 + parent: 2426 - type: Physics canCollide: False - proto: ClothingShoesBootsCowboyBlack entities: - - uid: 2427 + - uid: 2429 components: - type: Transform pos: -95.27377,75.76566 parent: 2 - proto: ClothingShoesBootsJack entities: - - uid: 2428 + - uid: 2430 components: - type: Transform pos: -71.15094,78.64804 parent: 2 - proto: ClothingShoesBootsJackFilled entities: - - uid: 2429 + - uid: 2431 components: - type: Transform pos: -43.35083,69.46381 parent: 2 - proto: ClothingShoesBootsMagTechpriest entities: - - uid: 2735 + - uid: 2433 components: - type: Transform - parent: 2734 + parent: 2432 - type: Physics canCollide: False - type: InsideEntityStorage - storage: 2734 + storage: 2432 - proto: ClothingShoesBootsSalvage entities: - - uid: 2430 + - uid: 2434 components: - type: Transform pos: -77.254616,26.785046 parent: 2 - - uid: 2431 + - uid: 2435 components: - type: Transform pos: -161.63354,71.12101 parent: 2 - proto: ClothingShoesBootsWork entities: - - uid: 2432 + - uid: 2436 components: - type: Transform pos: -43.181484,60.34698 parent: 2 - proto: ClothingShoesColorBlack entities: - - uid: 2426 + - uid: 2428 components: - type: Transform - parent: 2424 + parent: 2426 - type: Physics canCollide: False - proto: ClothingShoesSwat entities: - - uid: 2433 + - uid: 2437 components: - type: Transform pos: -159.48363,95.40131 parent: 2 - proto: ClothingUniformJumpskirtBlackElegantDress entities: - - uid: 2435 + - uid: 2439 components: - type: Transform - parent: 2434 + parent: 2438 - type: Clothing inSlot: jumpsuit inSlotFlag: INNERCLOTHING - type: SuitSensor - user: 2434 + user: 2438 - type: Physics canCollide: False - proto: ClothingUniformJumpskirtCapFormalDress entities: - - uid: 2353 + - uid: 2355 components: - type: Transform - parent: 2350 + parent: 2352 - type: Physics canCollide: False - type: InsideEntityStorage - storage: 2350 + storage: 2352 - proto: ClothingUniformJumpskirtHoSAlt entities: - - uid: 2437 + - uid: 2441 components: - type: Transform - parent: 2436 + parent: 2440 - type: Physics canCollide: False - type: InsideEntityStorage - storage: 2436 + storage: 2440 - proto: ClothingUniformJumpskirtJanimaidmini entities: - uid: 769 @@ -46690,39 +46690,39 @@ entities: canCollide: False - type: InsideEntityStorage storage: 767 - - uid: 2439 + - uid: 2443 components: - type: Transform pos: -52.394108,56.70371 parent: 2 - proto: ClothingUniformJumpskirtOldDress entities: - - uid: 2438 + - uid: 2442 components: - type: Transform - parent: 2436 + parent: 2440 - type: Physics canCollide: False - type: InsideEntityStorage - storage: 2436 + storage: 2440 - proto: ClothingUniformJumpsuitBrigmedic entities: - - uid: 2441 + - uid: 2445 components: - type: Transform - parent: 2440 + parent: 2444 - type: Physics canCollide: False - type: InsideEntityStorage - storage: 2440 - - uid: 2442 + storage: 2444 + - uid: 2446 components: - type: Transform - parent: 2440 + parent: 2444 - type: Physics canCollide: False - type: InsideEntityStorage - storage: 2440 + storage: 2444 - proto: ClothingUniformJumpsuitChaplain entities: - uid: 2236 @@ -46736,66 +46736,66 @@ entities: user: 2230 - type: Physics canCollide: False - - uid: 2373 + - uid: 2375 components: - type: Transform - parent: 2371 + parent: 2373 - type: Clothing inSlot: jumpsuit inSlotFlag: INNERCLOTHING - type: SuitSensor - user: 2371 + user: 2373 - type: Physics canCollide: False - proto: ClothingUniformJumpsuitColonel entities: - - uid: 2332 + - uid: 2334 components: - type: Transform - parent: 2330 + parent: 2332 - type: Physics canCollide: False - type: InsideEntityStorage - storage: 2330 + storage: 2332 - proto: ClothingUniformJumpsuitColorBrown entities: - - uid: 2444 + - uid: 2448 components: - type: Transform - parent: 2443 + parent: 2447 - type: Physics canCollide: False - type: InsideEntityStorage - storage: 2443 + storage: 2447 - proto: ClothingUniformJumpsuitHoSParadeMale entities: - - uid: 2446 + - uid: 2450 components: - type: Transform - parent: 2445 + parent: 2449 - type: Physics canCollide: False - type: InsideEntityStorage - storage: 2445 + storage: 2449 - proto: ClothingUniformJumpsuitJester entities: - - uid: 2448 + - uid: 2452 components: - type: Transform - parent: 2447 + parent: 2451 - type: Physics canCollide: False - proto: ClothingUniformJumpsuitJesterAlt entities: - - uid: 2449 + - uid: 2453 components: - type: Transform - parent: 2447 + parent: 2451 - type: Physics canCollide: False - proto: ClothingUniformJumpsuitLoungewear entities: - - uid: 2450 + - uid: 2454 components: - type: Transform rot: -1.5707963267948966 rad @@ -46803,7 +46803,7 @@ entities: parent: 2 - proto: ClothingUniformJumpsuitPrisoner entities: - - uid: 2451 + - uid: 2455 components: - type: Transform rot: -1.5707963267948966 rad @@ -46811,31 +46811,31 @@ entities: parent: 2 - proto: ClothingUniformJumpsuitSecGrey entities: - - uid: 2453 + - uid: 2457 components: - type: Transform - parent: 2452 + parent: 2456 - type: Physics canCollide: False - type: InsideEntityStorage - storage: 2452 - - uid: 2454 + storage: 2456 + - uid: 2458 components: - type: Transform - parent: 2452 + parent: 2456 - type: Physics canCollide: False - type: InsideEntityStorage - storage: 2452 + storage: 2456 - proto: Coal1 entities: - - uid: 2455 + - uid: 2459 components: - type: Transform rot: -1.5707963267948966 rad pos: -62.869083,27.609573 parent: 2 - - uid: 2456 + - uid: 2460 components: - type: Transform rot: 1.5707963267948966 rad @@ -46843,12 +46843,12 @@ entities: parent: 2 - proto: Coal10 entities: - - uid: 2457 + - uid: 2461 components: - type: Transform pos: -56.480114,58.59474 parent: 2 - - uid: 2458 + - uid: 2462 components: - type: Transform rot: 3.141592653589793 rad @@ -46856,329 +46856,329 @@ entities: parent: 2 - proto: Cobweb1 entities: - - uid: 2459 + - uid: 2463 components: - type: Transform pos: -148.5,46.5 parent: 2 - - uid: 2460 + - uid: 2464 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,27.5 parent: 2 - - uid: 2461 + - uid: 2465 components: - type: Transform pos: 35.5,77.5 parent: 2 - - uid: 2462 + - uid: 2466 components: - type: Transform rot: -1.5707963267948966 rad pos: 17.5,59.5 parent: 2 - - uid: 2463 + - uid: 2467 components: - type: Transform pos: 13.5,41.5 parent: 2 - - uid: 2464 + - uid: 2468 components: - type: Transform pos: -7.5,27.5 parent: 2 - - uid: 2465 + - uid: 2469 components: - type: Transform rot: 1.5707963267948966 rad pos: 47.5,49.5 parent: 2 - - uid: 2466 + - uid: 2470 components: - type: Transform rot: 1.5707963267948966 rad pos: -8.5,14.5 parent: 2 - - uid: 2467 + - uid: 2471 components: - type: Transform pos: 62.5,38.5 parent: 2 - - uid: 2468 + - uid: 2472 components: - type: Transform rot: -1.5707963267948966 rad pos: 15.5,77.5 parent: 2 - - uid: 2469 + - uid: 2473 components: - type: Transform rot: 1.5707963267948966 rad pos: -6.5,72.5 parent: 2 - - uid: 2470 + - uid: 2474 components: - type: Transform pos: 29.5,86.5 parent: 2 - - uid: 2471 + - uid: 2475 components: - type: Transform pos: 10.5,53.5 parent: 2 - - uid: 2472 + - uid: 2476 components: - type: Transform rot: 1.5707963267948966 rad pos: -162.5,26.5 parent: 2 - - uid: 2473 + - uid: 2477 components: - type: Transform rot: 1.5707963267948966 rad pos: -155.5,44.5 parent: 2 - - uid: 2474 + - uid: 2478 components: - type: Transform rot: 1.5707963267948966 rad pos: 8.5,18.5 parent: 2 - - uid: 2475 + - uid: 2479 components: - type: Transform pos: -71.5,29.5 parent: 2 - - uid: 2476 + - uid: 2480 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,27.5 parent: 2 - - uid: 2477 + - uid: 2481 components: - type: Transform pos: 47.5,85.5 parent: 2 - - uid: 2478 + - uid: 2482 components: - type: Transform rot: -1.5707963267948966 rad pos: 45.5,55.5 parent: 2 - - uid: 2479 + - uid: 2483 components: - type: Transform rot: -1.5707963267948966 rad pos: -26.5,44.5 parent: 2 - - uid: 2480 + - uid: 2484 components: - type: Transform rot: 1.5707963267948966 rad pos: -30.5,40.5 parent: 2 - - uid: 2481 + - uid: 2485 components: - type: Transform rot: 1.5707963267948966 rad pos: -30.5,49.5 parent: 2 - - uid: 2482 + - uid: 2486 components: - type: Transform pos: -30.5,49.5 parent: 2 - - uid: 2483 + - uid: 2487 components: - type: Transform pos: -29.5,50.5 parent: 2 - - uid: 2484 + - uid: 2488 components: - type: Transform pos: -26.5,48.5 parent: 2 - - uid: 2485 + - uid: 2489 components: - type: Transform rot: -1.5707963267948966 rad pos: -26.5,48.5 parent: 2 - - uid: 2486 + - uid: 2490 components: - type: Transform rot: 3.141592653589793 rad pos: -26.5,46.5 parent: 2 - - uid: 2487 + - uid: 2491 components: - type: Transform rot: 3.141592653589793 rad pos: -27.5,40.5 parent: 2 - - uid: 2488 + - uid: 2492 components: - type: Transform rot: 3.141592653589793 rad pos: -27.5,50.5 parent: 2 - - uid: 2489 + - uid: 2493 components: - type: Transform rot: 1.5707963267948966 rad pos: -27.5,26.5 parent: 2 - - uid: 2490 + - uid: 2494 components: - type: Transform rot: 3.141592653589793 rad pos: -25.5,26.5 parent: 2 - - uid: 2491 + - uid: 2495 components: - type: Transform rot: 1.5707963267948966 rad pos: -23.5,26.5 parent: 2 - - uid: 2492 + - uid: 2496 components: - type: Transform rot: 3.141592653589793 rad pos: -11.5,26.5 parent: 2 - - uid: 2493 + - uid: 2497 components: - type: Transform rot: 3.141592653589793 rad pos: -10.5,28.5 parent: 2 - - uid: 2494 + - uid: 2498 components: - type: Transform rot: 3.141592653589793 rad pos: -9.5,30.5 parent: 2 - - uid: 2495 + - uid: 2499 components: - type: Transform pos: -11.5,33.5 parent: 2 - - uid: 2496 + - uid: 2500 components: - type: Transform rot: -1.5707963267948966 rad pos: -81.5,78.5 parent: 2 - - uid: 2497 + - uid: 2501 components: - type: Transform rot: -1.5707963267948966 rad pos: -81.5,75.5 parent: 2 - - uid: 2498 + - uid: 2502 components: - type: Transform rot: 1.5707963267948966 rad pos: -85.5,73.5 parent: 2 - - uid: 2499 + - uid: 2503 components: - type: Transform pos: -95.5,76.5 parent: 2 - - uid: 2500 + - uid: 2504 components: - type: Transform rot: -1.5707963267948966 rad pos: -94.5,76.5 parent: 2 - - uid: 2501 + - uid: 2505 components: - type: Transform rot: -1.5707963267948966 rad pos: -97.5,76.5 parent: 2 - - uid: 2502 + - uid: 2506 components: - type: Transform rot: -1.5707963267948966 rad pos: -97.5,73.5 parent: 2 - - uid: 2503 + - uid: 2507 components: - type: Transform pos: -101.5,73.5 parent: 2 - - uid: 2504 + - uid: 2508 components: - type: Transform rot: -1.5707963267948966 rad pos: -93.5,71.5 parent: 2 - - uid: 2505 + - uid: 2509 components: - type: Transform pos: -114.5,84.5 parent: 2 - - uid: 2506 + - uid: 2510 components: - type: Transform rot: -1.5707963267948966 rad pos: -102.5,55.5 parent: 2 - - uid: 2507 + - uid: 2511 components: - type: Transform rot: 1.5707963267948966 rad pos: -104.5,50.5 parent: 2 - - uid: 2508 + - uid: 2512 components: - type: Transform rot: 1.5707963267948966 rad pos: -127.5,44.5 parent: 2 - - uid: 2509 + - uid: 2513 components: - type: Transform rot: -1.5707963267948966 rad pos: -124.5,50.5 parent: 2 - - uid: 2510 + - uid: 2514 components: - type: Transform pos: -118.5,36.5 parent: 2 - - uid: 2511 + - uid: 2515 components: - type: Transform pos: -123.5,36.5 parent: 2 - - uid: 2512 + - uid: 2516 components: - type: Transform rot: 3.141592653589793 rad pos: -116.5,30.5 parent: 2 - - uid: 2513 + - uid: 2517 components: - type: Transform rot: 1.5707963267948966 rad pos: -125.5,30.5 parent: 2 - - uid: 2514 + - uid: 2518 components: - type: Transform pos: -102.5,36.5 parent: 2 - - uid: 2515 + - uid: 2519 components: - type: Transform pos: -105.5,44.5 parent: 2 - - uid: 2516 + - uid: 2520 components: - type: Transform rot: 3.141592653589793 rad @@ -47186,261 +47186,261 @@ entities: parent: 2 - proto: Cobweb2 entities: - - uid: 2517 + - uid: 2521 components: - type: Transform pos: 61.5,85.5 parent: 2 - - uid: 2518 + - uid: 2522 components: - type: Transform rot: -1.5707963267948966 rad pos: -156.5,28.5 parent: 2 - - uid: 2519 + - uid: 2523 components: - type: Transform rot: 1.5707963267948966 rad pos: -162.5,31.5 parent: 2 - - uid: 2520 + - uid: 2524 components: - type: Transform rot: 1.5707963267948966 rad pos: -166.5,30.5 parent: 2 - - uid: 2521 + - uid: 2525 components: - type: Transform rot: 1.5707963267948966 rad pos: -30.5,44.5 parent: 2 - - uid: 2522 + - uid: 2526 components: - type: Transform rot: 3.141592653589793 rad pos: -94.5,73.5 parent: 2 - - uid: 2523 + - uid: 2527 components: - type: Transform rot: 3.141592653589793 rad pos: -105.5,69.5 parent: 2 - - uid: 2524 + - uid: 2528 components: - type: Transform rot: -1.5707963267948966 rad pos: -93.5,69.5 parent: 2 - - uid: 2525 + - uid: 2529 components: - type: Transform pos: -109.5,85.5 parent: 2 - proto: colbelt entities: - - uid: 2333 + - uid: 2335 components: - type: Transform - parent: 2330 + parent: 2332 - type: Physics canCollide: False - type: InsideEntityStorage - storage: 2330 + storage: 2332 - proto: ColMarTechAutoGuns entities: - - uid: 2526 + - uid: 2530 components: - type: Transform pos: 144.5,70.5 parent: 2 - - uid: 2527 + - uid: 2531 components: - type: Transform pos: 114.5,80.5 parent: 2 - - uid: 2528 + - uid: 2532 components: - type: Transform pos: 123.5,57.5 parent: 2 - - uid: 2529 + - uid: 2533 components: - type: Transform pos: 123.5,75.5 parent: 2 - - uid: 2530 + - uid: 2534 components: - type: Transform pos: 123.5,80.5 parent: 2 - proto: ColMarTechGuns entities: - - uid: 2531 + - uid: 2535 components: - type: Transform pos: -146.5,38.5 parent: 2 - - uid: 2532 + - uid: 2536 components: - type: Transform pos: -148.5,38.5 parent: 2 - - uid: 2533 + - uid: 2537 components: - type: Transform pos: -148.5,44.5 parent: 2 - - uid: 2534 + - uid: 2538 components: - type: Transform pos: -157.5,35.5 parent: 2 - - uid: 2535 + - uid: 2539 components: - type: Transform pos: -146.5,44.5 parent: 2 - - uid: 2536 + - uid: 2540 components: - type: Transform pos: 123.5,51.5 parent: 2 - - uid: 2537 + - uid: 2541 components: - type: Transform pos: 114.5,75.5 parent: 2 - proto: ColMarTechMunitions entities: - - uid: 2538 + - uid: 2542 components: - type: Transform pos: -156.5,35.5 parent: 2 - proto: ColMarTechSLGear entities: - - uid: 2539 + - uid: 2543 components: - type: Transform pos: 149.5,70.5 parent: 2 - - uid: 2540 + - uid: 2544 components: - type: Transform pos: -143.5,32.5 parent: 2 - proto: Colonelcloak entities: - - uid: 2334 + - uid: 2336 components: - type: Transform - parent: 2330 + parent: 2332 - type: Physics canCollide: False - type: InsideEntityStorage - storage: 2330 + storage: 2332 - proto: ComfyChair entities: - - uid: 2541 + - uid: 2545 components: - type: Transform pos: -161.5,45.5 parent: 2 - proto: ComputerBroken entities: - - uid: 2542 + - uid: 2546 components: - type: Transform pos: -102.5,44.5 parent: 2 - - uid: 2543 + - uid: 2547 components: - type: Transform pos: -103.5,44.5 parent: 2 - - uid: 2544 + - uid: 2548 components: - type: Transform pos: 15.5,59.5 parent: 2 - - uid: 2545 + - uid: 2549 components: - type: Transform pos: -64.5,69.5 parent: 2 - - uid: 2546 + - uid: 2550 components: - type: Transform pos: -48.5,46.5 parent: 2 - - uid: 2547 + - uid: 2551 components: - type: Transform rot: 3.141592653589793 rad pos: -55.5,45.5 parent: 2 - - uid: 2548 + - uid: 2552 components: - type: Transform rot: 3.141592653589793 rad pos: -49.5,53.5 parent: 2 - - uid: 2549 + - uid: 2553 components: - type: Transform rot: 3.141592653589793 rad pos: -64.5,56.5 parent: 2 - - uid: 2550 + - uid: 2554 components: - type: Transform rot: 3.141592653589793 rad pos: 13.5,72.5 parent: 2 - - uid: 2551 + - uid: 2555 components: - type: Transform rot: -1.5707963267948966 rad pos: 66.5,34.5 parent: 2 - - uid: 2552 + - uid: 2556 components: - type: Transform rot: -1.5707963267948966 rad pos: 38.5,57.5 parent: 2 - - uid: 2553 + - uid: 2557 components: - type: Transform pos: -6.5,77.5 parent: 2 - - uid: 2554 + - uid: 2558 components: - type: Transform rot: 3.141592653589793 rad pos: -125.5,66.5 parent: 2 - - uid: 2555 + - uid: 2559 components: - type: Transform rot: 1.5707963267948966 rad pos: 30.5,63.5 parent: 2 - - uid: 2556 + - uid: 2560 components: - type: Transform rot: 1.5707963267948966 rad pos: -158.5,76.5 parent: 2 - - uid: 2557 + - uid: 2561 components: - type: Transform rot: 3.141592653589793 rad pos: -142.5,59.5 parent: 2 - - uid: 2558 + - uid: 2562 components: - type: Transform rot: 1.5707963267948966 rad @@ -47448,36 +47448,36 @@ entities: parent: 2 - proto: ComputerFrame entities: - - uid: 2559 + - uid: 2563 components: - type: Transform rot: -1.5707963267948966 rad pos: -143.5,67.5 parent: 2 - - uid: 2560 + - uid: 2564 components: - type: Transform rot: -1.5707963267948966 rad pos: -157.5,56.5 parent: 2 - - uid: 2561 + - uid: 2565 components: - type: Transform rot: 3.141592653589793 rad pos: -123.5,74.5 parent: 2 - - uid: 2562 + - uid: 2566 components: - type: Transform pos: 13.5,77.5 parent: 2 - - uid: 2563 + - uid: 2567 components: - type: Transform rot: 3.141592653589793 rad pos: 40.5,49.5 parent: 2 - - uid: 2564 + - uid: 2568 components: - type: Transform rot: 1.5707963267948966 rad @@ -47485,7 +47485,7 @@ entities: parent: 2 - proto: ComputerMedicalRecords entities: - - uid: 2565 + - uid: 2569 components: - type: Transform rot: 1.5707963267948966 rad @@ -47493,13 +47493,13 @@ entities: parent: 2 - proto: ComputerSurveillanceCameraMonitor entities: - - uid: 2566 + - uid: 2570 components: - type: Transform rot: 1.5707963267948966 rad pos: -149.5,61.5 parent: 2 - - uid: 2567 + - uid: 2571 components: - type: Transform rot: 1.5707963267948966 rad @@ -47507,765 +47507,765 @@ entities: parent: 2 - proto: ConveyorBelt entities: - - uid: 2568 + - uid: 2572 components: - type: Transform rot: 1.5707963267948966 rad pos: -152.5,45.5 parent: 2 - - uid: 2569 + - uid: 2573 components: - type: Transform rot: 1.5707963267948966 rad pos: -153.5,45.5 parent: 2 - - uid: 2570 + - uid: 2574 components: - type: Transform rot: 3.141592653589793 rad pos: -151.5,46.5 parent: 2 - - uid: 2571 + - uid: 2575 components: - type: Transform rot: 3.141592653589793 rad pos: -151.5,45.5 parent: 2 - - uid: 2572 + - uid: 2576 components: - type: Transform rot: -1.5707963267948966 rad pos: -151.5,47.5 parent: 2 - - uid: 2573 + - uid: 2577 components: - type: Transform rot: -1.5707963267948966 rad pos: -152.5,47.5 parent: 2 - - uid: 2574 + - uid: 2578 components: - type: Transform rot: -1.5707963267948966 rad pos: -153.5,47.5 parent: 2 - - uid: 2575 + - uid: 2579 components: - type: Transform rot: -1.5707963267948966 rad pos: -37.5,51.5 parent: 2 - - uid: 2576 + - uid: 2580 components: - type: Transform rot: -1.5707963267948966 rad pos: -36.5,51.5 parent: 2 - - uid: 2577 + - uid: 2581 components: - type: Transform rot: -1.5707963267948966 rad pos: -38.5,51.5 parent: 2 - - uid: 2578 + - uid: 2582 components: - type: Transform rot: -1.5707963267948966 rad pos: -54.5,51.5 parent: 2 - - uid: 2579 + - uid: 2583 components: - type: Transform rot: -1.5707963267948966 rad pos: -41.5,51.5 parent: 2 - - uid: 2580 + - uid: 2584 components: - type: Transform rot: -1.5707963267948966 rad pos: -42.5,51.5 parent: 2 - - uid: 2581 + - uid: 2585 components: - type: Transform rot: -1.5707963267948966 rad pos: -43.5,51.5 parent: 2 - - uid: 2582 + - uid: 2586 components: - type: Transform rot: -1.5707963267948966 rad pos: -44.5,51.5 parent: 2 - - uid: 2583 + - uid: 2587 components: - type: Transform rot: -1.5707963267948966 rad pos: -42.5,47.5 parent: 2 - - uid: 2584 + - uid: 2588 components: - type: Transform rot: -1.5707963267948966 rad pos: -43.5,47.5 parent: 2 - - uid: 2585 + - uid: 2589 components: - type: Transform rot: -1.5707963267948966 rad pos: -44.5,47.5 parent: 2 - - uid: 2586 + - uid: 2590 components: - type: Transform rot: -1.5707963267948966 rad pos: -41.5,48.5 parent: 2 - - uid: 2587 + - uid: 2591 components: - type: Transform rot: -1.5707963267948966 rad pos: -42.5,48.5 parent: 2 - - uid: 2588 + - uid: 2592 components: - type: Transform rot: -1.5707963267948966 rad pos: -43.5,48.5 parent: 2 - - uid: 2589 + - uid: 2593 components: - type: Transform rot: -1.5707963267948966 rad pos: -44.5,48.5 parent: 2 - - uid: 2590 + - uid: 2594 components: - type: Transform rot: -1.5707963267948966 rad pos: -41.5,52.5 parent: 2 - - uid: 2591 + - uid: 2595 components: - type: Transform rot: -1.5707963267948966 rad pos: -42.5,52.5 parent: 2 - - uid: 2592 + - uid: 2596 components: - type: Transform rot: -1.5707963267948966 rad pos: -43.5,52.5 parent: 2 - - uid: 2593 + - uid: 2597 components: - type: Transform rot: -1.5707963267948966 rad pos: -44.5,52.5 parent: 2 - - uid: 2594 + - uid: 2598 components: - type: Transform rot: -1.5707963267948966 rad pos: -41.5,44.5 parent: 2 - - uid: 2595 + - uid: 2599 components: - type: Transform rot: -1.5707963267948966 rad pos: -42.5,44.5 parent: 2 - - uid: 2596 + - uid: 2600 components: - type: Transform rot: -1.5707963267948966 rad pos: -43.5,44.5 parent: 2 - - uid: 2597 + - uid: 2601 components: - type: Transform rot: -1.5707963267948966 rad pos: -44.5,44.5 parent: 2 - - uid: 2598 + - uid: 2602 components: - type: Transform rot: -1.5707963267948966 rad pos: -41.5,43.5 parent: 2 - - uid: 2599 + - uid: 2603 components: - type: Transform rot: -1.5707963267948966 rad pos: -42.5,43.5 parent: 2 - - uid: 2600 + - uid: 2604 components: - type: Transform rot: -1.5707963267948966 rad pos: -44.5,43.5 parent: 2 - - uid: 2601 + - uid: 2605 components: - type: Transform rot: -1.5707963267948966 rad pos: -55.5,51.5 parent: 2 - - uid: 2602 + - uid: 2606 components: - type: Transform rot: -1.5707963267948966 rad pos: -56.5,51.5 parent: 2 - - uid: 2603 + - uid: 2607 components: - type: Transform rot: -1.5707963267948966 rad pos: -57.5,51.5 parent: 2 - - uid: 2604 + - uid: 2608 components: - type: Transform rot: -1.5707963267948966 rad pos: -54.5,52.5 parent: 2 - - uid: 2605 + - uid: 2609 components: - type: Transform rot: -1.5707963267948966 rad pos: -55.5,52.5 parent: 2 - - uid: 2606 + - uid: 2610 components: - type: Transform rot: -1.5707963267948966 rad pos: -56.5,52.5 parent: 2 - - uid: 2607 + - uid: 2611 components: - type: Transform rot: -1.5707963267948966 rad pos: -57.5,52.5 parent: 2 - - uid: 2608 + - uid: 2612 components: - type: Transform rot: -1.5707963267948966 rad pos: -48.5,52.5 parent: 2 - - uid: 2609 + - uid: 2613 components: - type: Transform rot: -1.5707963267948966 rad pos: -49.5,52.5 parent: 2 - - uid: 2610 + - uid: 2614 components: - type: Transform rot: -1.5707963267948966 rad pos: -50.5,52.5 parent: 2 - - uid: 2611 + - uid: 2615 components: - type: Transform rot: -1.5707963267948966 rad pos: -47.5,51.5 parent: 2 - - uid: 2612 + - uid: 2616 components: - type: Transform rot: -1.5707963267948966 rad pos: -48.5,51.5 parent: 2 - - uid: 2613 + - uid: 2617 components: - type: Transform rot: -1.5707963267948966 rad pos: -49.5,51.5 parent: 2 - - uid: 2614 + - uid: 2618 components: - type: Transform rot: -1.5707963267948966 rad pos: -50.5,51.5 parent: 2 - - uid: 2615 + - uid: 2619 components: - type: Transform rot: -1.5707963267948966 rad pos: -47.5,48.5 parent: 2 - - uid: 2616 + - uid: 2620 components: - type: Transform rot: -1.5707963267948966 rad pos: -48.5,48.5 parent: 2 - - uid: 2617 + - uid: 2621 components: - type: Transform rot: -1.5707963267948966 rad pos: -49.5,48.5 parent: 2 - - uid: 2618 + - uid: 2622 components: - type: Transform rot: -1.5707963267948966 rad pos: -50.5,48.5 parent: 2 - - uid: 2619 + - uid: 2623 components: - type: Transform rot: -1.5707963267948966 rad pos: -47.5,47.5 parent: 2 - - uid: 2620 + - uid: 2624 components: - type: Transform rot: -1.5707963267948966 rad pos: -48.5,47.5 parent: 2 - - uid: 2621 + - uid: 2625 components: - type: Transform rot: -1.5707963267948966 rad pos: -49.5,47.5 parent: 2 - - uid: 2622 + - uid: 2626 components: - type: Transform rot: -1.5707963267948966 rad pos: -50.5,47.5 parent: 2 - - uid: 2623 + - uid: 2627 components: - type: Transform rot: -1.5707963267948966 rad pos: -47.5,44.5 parent: 2 - - uid: 2624 + - uid: 2628 components: - type: Transform rot: -1.5707963267948966 rad pos: -48.5,44.5 parent: 2 - - uid: 2625 + - uid: 2629 components: - type: Transform rot: -1.5707963267948966 rad pos: -49.5,44.5 parent: 2 - - uid: 2626 + - uid: 2630 components: - type: Transform rot: -1.5707963267948966 rad pos: -50.5,44.5 parent: 2 - - uid: 2627 + - uid: 2631 components: - type: Transform rot: -1.5707963267948966 rad pos: -47.5,43.5 parent: 2 - - uid: 2628 + - uid: 2632 components: - type: Transform rot: -1.5707963267948966 rad pos: -48.5,43.5 parent: 2 - - uid: 2629 + - uid: 2633 components: - type: Transform rot: -1.5707963267948966 rad pos: -49.5,43.5 parent: 2 - - uid: 2630 + - uid: 2634 components: - type: Transform rot: -1.5707963267948966 rad pos: -50.5,43.5 parent: 2 - - uid: 2631 + - uid: 2635 components: - type: Transform rot: -1.5707963267948966 rad pos: -54.5,48.5 parent: 2 - - uid: 2632 + - uid: 2636 components: - type: Transform rot: -1.5707963267948966 rad pos: -55.5,48.5 parent: 2 - - uid: 2633 + - uid: 2637 components: - type: Transform rot: -1.5707963267948966 rad pos: -57.5,48.5 parent: 2 - - uid: 2634 + - uid: 2638 components: - type: Transform rot: -1.5707963267948966 rad pos: -54.5,47.5 parent: 2 - - uid: 2635 + - uid: 2639 components: - type: Transform rot: -1.5707963267948966 rad pos: -55.5,47.5 parent: 2 - - uid: 2636 + - uid: 2640 components: - type: Transform rot: -1.5707963267948966 rad pos: -56.5,47.5 parent: 2 - - uid: 2637 + - uid: 2641 components: - type: Transform rot: -1.5707963267948966 rad pos: -57.5,47.5 parent: 2 - - uid: 2638 + - uid: 2642 components: - type: Transform rot: -1.5707963267948966 rad pos: -54.5,44.5 parent: 2 - - uid: 2639 + - uid: 2643 components: - type: Transform rot: -1.5707963267948966 rad pos: -55.5,44.5 parent: 2 - - uid: 2640 + - uid: 2644 components: - type: Transform rot: -1.5707963267948966 rad pos: -56.5,44.5 parent: 2 - - uid: 2641 + - uid: 2645 components: - type: Transform rot: -1.5707963267948966 rad pos: -57.5,44.5 parent: 2 - - uid: 2642 + - uid: 2646 components: - type: Transform rot: -1.5707963267948966 rad pos: -54.5,43.5 parent: 2 - - uid: 2643 + - uid: 2647 components: - type: Transform rot: -1.5707963267948966 rad pos: -55.5,43.5 parent: 2 - - uid: 2644 + - uid: 2648 components: - type: Transform rot: -1.5707963267948966 rad pos: -56.5,43.5 parent: 2 - - uid: 2645 + - uid: 2649 components: - type: Transform rot: -1.5707963267948966 rad pos: -57.5,43.5 parent: 2 - - uid: 2646 + - uid: 2650 components: - type: Transform rot: -1.5707963267948966 rad pos: -36.5,52.5 parent: 2 - - uid: 2647 + - uid: 2651 components: - type: Transform rot: -1.5707963267948966 rad pos: -37.5,52.5 parent: 2 - - uid: 2648 + - uid: 2652 components: - type: Transform rot: -1.5707963267948966 rad pos: -38.5,52.5 parent: 2 - - uid: 2649 + - uid: 2653 components: - type: Transform rot: -1.5707963267948966 rad pos: -36.5,48.5 parent: 2 - - uid: 2650 + - uid: 2654 components: - type: Transform rot: -1.5707963267948966 rad pos: -37.5,48.5 parent: 2 - - uid: 2651 + - uid: 2655 components: - type: Transform rot: -1.5707963267948966 rad pos: -38.5,48.5 parent: 2 - - uid: 2652 + - uid: 2656 components: - type: Transform rot: -1.5707963267948966 rad pos: -36.5,47.5 parent: 2 - - uid: 2653 + - uid: 2657 components: - type: Transform rot: -1.5707963267948966 rad pos: -37.5,47.5 parent: 2 - - uid: 2654 + - uid: 2658 components: - type: Transform rot: -1.5707963267948966 rad pos: -38.5,47.5 parent: 2 - - uid: 2655 + - uid: 2659 components: - type: Transform rot: -1.5707963267948966 rad pos: -36.5,44.5 parent: 2 - - uid: 2656 + - uid: 2660 components: - type: Transform rot: -1.5707963267948966 rad pos: -37.5,44.5 parent: 2 - - uid: 2657 + - uid: 2661 components: - type: Transform rot: -1.5707963267948966 rad pos: -38.5,44.5 parent: 2 - - uid: 2658 + - uid: 2662 components: - type: Transform rot: -1.5707963267948966 rad pos: -36.5,43.5 parent: 2 - - uid: 2659 + - uid: 2663 components: - type: Transform rot: -1.5707963267948966 rad pos: -37.5,43.5 parent: 2 - - uid: 2660 + - uid: 2664 components: - type: Transform rot: -1.5707963267948966 rad pos: -38.5,43.5 parent: 2 - - uid: 2661 + - uid: 2665 components: - type: Transform rot: 3.141592653589793 rad pos: -167.5,64.5 parent: 2 - - uid: 2662 + - uid: 2666 components: - type: Transform rot: 3.141592653589793 rad pos: -168.5,63.5 parent: 2 - - uid: 2663 + - uid: 2667 components: - type: Transform rot: 1.5707963267948966 rad pos: -172.5,63.5 parent: 2 - - uid: 2664 + - uid: 2668 components: - type: Transform rot: 3.141592653589793 rad pos: -166.5,65.5 parent: 2 - - uid: 2665 + - uid: 2669 components: - type: Transform rot: 1.5707963267948966 rad pos: -169.5,63.5 parent: 2 - - uid: 2666 + - uid: 2670 components: - type: Transform rot: 3.141592653589793 rad pos: -173.5,59.5 parent: 2 - - uid: 2667 + - uid: 2671 components: - type: Transform rot: 1.5707963267948966 rad pos: -174.5,59.5 parent: 2 - - uid: 2668 + - uid: 2672 components: - type: Transform rot: 3.141592653589793 rad pos: -174.5,58.5 parent: 2 - - uid: 2669 + - uid: 2673 components: - type: Transform rot: 1.5707963267948966 rad pos: -171.5,63.5 parent: 2 - - uid: 2670 + - uid: 2674 components: - type: Transform rot: 1.5707963267948966 rad pos: -170.5,63.5 parent: 2 - - uid: 2671 + - uid: 2675 components: - type: Transform rot: 1.5707963267948966 rad pos: -176.5,57.5 parent: 2 - - uid: 2672 + - uid: 2676 components: - type: Transform rot: 1.5707963267948966 rad pos: -165.5,68.5 parent: 2 - - uid: 2673 + - uid: 2677 components: - type: Transform rot: 1.5707963267948966 rad pos: -177.5,57.5 parent: 2 - - uid: 2674 + - uid: 2678 components: - type: Transform rot: 1.5707963267948966 rad pos: -166.5,68.5 parent: 2 - - uid: 2675 + - uid: 2679 components: - type: Transform rot: 3.141592653589793 rad pos: -175.5,57.5 parent: 2 - - uid: 2676 + - uid: 2680 components: - type: Transform rot: 1.5707963267948966 rad pos: -175.5,60.5 parent: 2 - - uid: 2677 + - uid: 2681 components: - type: Transform rot: 1.5707963267948966 rad pos: -174.5,60.5 parent: 2 - - uid: 2678 + - uid: 2682 components: - type: Transform rot: 1.5707963267948966 rad pos: -173.5,60.5 parent: 2 - - uid: 2679 + - uid: 2683 components: - type: Transform rot: 3.141592653589793 rad pos: -172.5,60.5 parent: 2 - - uid: 2680 + - uid: 2684 components: - type: Transform rot: 1.5707963267948966 rad pos: -173.5,63.5 parent: 2 - - uid: 2681 + - uid: 2685 components: - type: Transform rot: 3.141592653589793 rad pos: -166.5,67.5 parent: 2 - - uid: 2682 + - uid: 2686 components: - type: Transform rot: 3.141592653589793 rad pos: -170.5,62.5 parent: 2 - - uid: 2683 + - uid: 2687 components: - type: Transform rot: 3.141592653589793 rad pos: -166.5,66.5 parent: 2 - - uid: 2684 + - uid: 2688 components: - type: Transform rot: 1.5707963267948966 rad pos: -168.5,64.5 parent: 2 - - uid: 2685 + - uid: 2689 components: - type: Transform rot: 3.141592653589793 rad pos: -171.5,61.5 parent: 2 - - uid: 2686 + - uid: 2690 components: - type: Transform rot: 1.5707963267948966 rad pos: -171.5,62.5 parent: 2 - - uid: 2687 + - uid: 2691 components: - type: Transform pos: -172.5,65.5 parent: 2 - - uid: 2688 + - uid: 2692 components: - type: Transform pos: -172.5,66.5 parent: 2 - - uid: 2689 + - uid: 2693 components: - type: Transform pos: -172.5,67.5 parent: 2 - - uid: 2690 + - uid: 2694 components: - type: Transform rot: -4.71238898038469 rad pos: -167.5,65.5 parent: 2 - - uid: 2691 + - uid: 2695 components: - type: Transform pos: -172.5,64.5 parent: 2 - - uid: 2692 + - uid: 2696 components: - type: Transform rot: 1.5707963267948966 rad pos: -175.5,58.5 parent: 2 - - uid: 2693 + - uid: 2697 components: - type: Transform rot: 1.5707963267948966 rad pos: -172.5,61.5 parent: 2 - - uid: 2694 + - uid: 2698 components: - type: Transform rot: 1.5707963267948966 rad pos: -163.5,67.5 parent: 2 - - uid: 2695 + - uid: 2699 components: - type: Transform rot: 1.5707963267948966 rad @@ -48273,12 +48273,12 @@ entities: parent: 2 - proto: ConveyorBeltAssembly entities: - - uid: 2696 + - uid: 2700 components: - type: Transform pos: -43.488678,43.492973 parent: 2 - - uid: 2697 + - uid: 2701 components: - type: Transform pos: -41.382298,47.556805 @@ -48286,29 +48286,29 @@ entities: - type: CollisionWake enabled: False - type: Conveyed - - uid: 2698 + - uid: 2702 components: - type: Transform pos: -56.475838,48.619385 parent: 2 - - uid: 2699 + - uid: 2703 components: - type: Transform pos: -47.45583,52.57683 parent: 2 - - uid: 2700 + - uid: 2704 components: - type: Transform pos: -164.02928,70.70755 parent: 2 - - uid: 2701 + - uid: 2705 components: - type: Transform pos: -163.30011,70.7284 parent: 2 - proto: CrateCoffin entities: - - uid: 2702 + - uid: 2706 components: - type: Transform pos: -100.5,76.5 @@ -48321,7 +48321,7 @@ entities: moles: Oxygen: 1.7459903 Nitrogen: 6.568249 - - uid: 2703 + - uid: 2707 components: - type: Transform pos: -97.5,76.5 @@ -48336,147 +48336,147 @@ entities: Nitrogen: 6.568249 - proto: CrateEmptySpawner entities: - - uid: 2704 + - uid: 2708 components: - type: Transform pos: -159.5,67.5 parent: 2 - proto: CrateEngineering entities: - - uid: 2705 + - uid: 2709 components: - type: Transform pos: -144.5,77.5 parent: 2 - - uid: 2706 + - uid: 2710 components: - type: Transform pos: -162.5,26.5 parent: 2 - - uid: 2707 + - uid: 2711 components: - type: Transform pos: -46.5,60.5 parent: 2 - - uid: 2708 + - uid: 2712 components: - type: Transform pos: -65.5,53.5 parent: 2 - - uid: 2709 + - uid: 2713 components: - type: Transform pos: -42.5,68.5 parent: 2 - - uid: 2710 + - uid: 2714 components: - type: Transform pos: -46.5,69.5 parent: 2 - - uid: 2711 + - uid: 2715 components: - type: Transform pos: 11.5,53.5 parent: 2 - - uid: 2712 + - uid: 2716 components: - type: Transform pos: -70.5,47.5 parent: 2 - - uid: 2713 + - uid: 2717 components: - type: Transform pos: 10.5,53.5 parent: 2 - - uid: 2714 + - uid: 2718 components: - type: Transform pos: -70.5,49.5 parent: 2 - - uid: 2715 + - uid: 2719 components: - type: Transform pos: 149.5,82.5 parent: 2 - proto: CrateEngineeringCableLV entities: - - uid: 2716 + - uid: 2720 components: - type: Transform pos: 13.5,53.5 parent: 2 - proto: CrateEngineeringGear entities: - - uid: 2717 + - uid: 2721 components: - type: Transform pos: -42.5,58.5 parent: 2 - - uid: 2718 + - uid: 2722 components: - type: Transform pos: -67.5,56.5 parent: 2 - - uid: 2719 + - uid: 2723 components: - type: Transform pos: -70.5,51.5 parent: 2 - proto: CrateEngineeringSecure entities: - - uid: 2720 + - uid: 2724 components: - type: Transform pos: -143.5,77.5 parent: 2 - proto: CrateFunInstrumentsString entities: - - uid: 2721 + - uid: 2725 components: - type: Transform pos: -146.5,83.5 parent: 2 - proto: CrateGenericSteel entities: - - uid: 2722 + - uid: 2726 components: - type: Transform pos: 11.5,51.5 parent: 2 - proto: CrateLockBoxEngineering entities: - - uid: 2723 + - uid: 2727 components: - type: Transform pos: -45.5,60.5 parent: 2 - proto: CrateMaterialGlass entities: - - uid: 2724 + - uid: 2728 components: - type: Transform pos: -72.5,45.5 parent: 2 - - uid: 2725 + - uid: 2729 components: - type: Transform pos: -145.5,75.5 parent: 2 - - uid: 2726 + - uid: 2730 components: - type: Transform pos: 150.5,81.5 parent: 2 - proto: CrateMaterialPlasteel entities: - - uid: 2727 + - uid: 2731 components: - type: Transform pos: -65.5,51.5 parent: 2 - proto: CrateMaterialPlastic entities: - - uid: 2422 + - uid: 2424 components: - type: Transform pos: -158.5,86.5 @@ -48495,19 +48495,19 @@ entities: showEnts: False occludes: True ents: - - 2423 + - 2425 paper_label: !type:ContainerSlot showEnts: False occludes: True ent: null - - uid: 2728 + - uid: 2732 components: - type: Transform pos: -65.5,47.5 parent: 2 - proto: CrateMaterialRandom entities: - - uid: 2729 + - uid: 2733 components: - type: Transform pos: -101.5,54.5 @@ -48518,34 +48518,34 @@ entities: showEnts: False occludes: True ents: - - 2730 + - 2734 paper_label: !type:ContainerSlot showEnts: False occludes: True ent: null - - uid: 2731 + - uid: 2735 components: - type: Transform pos: -65.5,49.5 parent: 2 - - uid: 2732 + - uid: 2736 components: - type: Transform pos: -147.5,77.5 parent: 2 - proto: CrateMaterialSilver entities: - - uid: 2733 + - uid: 2737 components: - type: Transform pos: -72.5,43.5 parent: 2 - proto: CrateMaterialSteel entities: - - uid: 2734 + - uid: 2330 components: - type: Transform - pos: -158.5,83.5 + pos: -158.5,82.5 parent: 2 - type: EntityStorage air: @@ -48561,15 +48561,15 @@ entities: showEnts: False occludes: True ents: - - 2735 + - 2331 paper_label: !type:ContainerSlot showEnts: False occludes: True ent: null - - uid: 2736 + - uid: 2432 components: - type: Transform - pos: -158.5,82.5 + pos: -158.5,83.5 parent: 2 - type: EntityStorage air: @@ -48585,7 +48585,7 @@ entities: showEnts: False occludes: True ents: - - 2737 + - 2433 paper_label: !type:ContainerSlot showEnts: False occludes: True @@ -48664,7 +48664,7 @@ entities: parent: 2 - proto: CrateMedicalSupplies entities: - - uid: 2440 + - uid: 2444 components: - type: Transform pos: 48.5,85.5 @@ -48675,8 +48675,8 @@ entities: showEnts: False occludes: True ents: - - 2441 - - 2442 + - 2445 + - 2446 paper_label: !type:ContainerSlot showEnts: False occludes: True @@ -48870,7 +48870,7 @@ entities: parent: 2 - proto: CrateScience entities: - - uid: 2411 + - uid: 2413 components: - type: Transform pos: 31.5,57.5 @@ -48889,7 +48889,7 @@ entities: showEnts: False occludes: True ents: - - 2412 + - 2414 paper_label: !type:ContainerSlot showEnts: False occludes: True @@ -50713,17 +50713,17 @@ entities: parent: 2 - proto: Dresser entities: - - uid: 2424 + - uid: 2426 components: - type: Transform pos: -95.5,74.5 parent: 2 - type: Storage storedItems: - 2425: + 2427: position: 0,0 _rotation: South - 2426: + 2428: position: 2,0 _rotation: South - type: ContainerContainer @@ -50732,19 +50732,19 @@ entities: showEnts: False occludes: True ents: - - 2425 - - 2426 - - uid: 2447 + - 2427 + - 2428 + - uid: 2451 components: - type: Transform pos: -4.5,77.5 parent: 2 - type: Storage storedItems: - 2448: + 2452: position: 0,0 _rotation: South - 2449: + 2453: position: 2,0 _rotation: South - type: ContainerContainer @@ -50753,8 +50753,8 @@ entities: showEnts: False occludes: True ents: - - 2448 - - 2449 + - 2452 + - 2453 - uid: 3094 components: - type: Transform @@ -68659,7 +68659,7 @@ entities: parent: 2 - proto: GunSafe entities: - - uid: 2350 + - uid: 2352 components: - type: Transform pos: -79.5,51.5 @@ -68672,14 +68672,14 @@ entities: showEnts: False occludes: True ents: + - 2360 + - 2355 + - 2359 - 2358 - - 2353 - 2357 - - 2356 - - 2355 - - 2351 - - 2352 + - 2353 - 2354 + - 2356 paper_label: !type:ContainerSlot showEnts: False occludes: True @@ -69272,7 +69272,7 @@ entities: showEnts: False occludes: True ent: null - - uid: 2330 + - uid: 2332 components: - type: Transform pos: -160.5,35.5 @@ -69286,20 +69286,20 @@ entities: showEnts: False occludes: True ents: + - 2338 + - 2337 - 2336 - - 2335 - 2334 - - 2332 + - 2335 - 2333 - - 2331 - - 2337 + - 2339 paper_label: !type:ContainerSlot showEnts: False occludes: True ent: null - type: Lock locked: False - - uid: 2436 + - uid: 2440 components: - type: Transform pos: -29.5,50.5 @@ -69312,13 +69312,13 @@ entities: showEnts: False occludes: True ents: - - 2437 - - 2438 + - 2441 + - 2442 paper_label: !type:ContainerSlot showEnts: False occludes: True ent: null - - uid: 2443 + - uid: 2447 components: - type: Transform pos: -6.5,73.5 @@ -69331,7 +69331,7 @@ entities: showEnts: False occludes: True ents: - - 2444 + - 2448 paper_label: !type:ContainerSlot showEnts: False occludes: True @@ -69869,7 +69869,7 @@ entities: showEnts: False occludes: False ent: 2231 - - uid: 2371 + - uid: 2373 components: - type: Transform pos: -105.5,37.5 @@ -69879,7 +69879,7 @@ entities: jumpsuit: !type:ContainerSlot showEnts: False occludes: False - ent: 2373 + ent: 2375 outerClothing: !type:ContainerSlot showEnts: False occludes: False @@ -69899,7 +69899,7 @@ entities: head: !type:ContainerSlot showEnts: False occludes: False - ent: 2372 + ent: 2374 suitstorage: !type:ContainerSlot showEnts: False occludes: False @@ -69908,7 +69908,7 @@ entities: showEnts: False occludes: False ent: null - - uid: 2434 + - uid: 2438 components: - type: Transform pos: -26.5,46.5 @@ -69918,7 +69918,7 @@ entities: jumpsuit: !type:ContainerSlot showEnts: False occludes: False - ent: 2435 + ent: 2439 outerClothing: !type:ContainerSlot showEnts: False occludes: False @@ -81043,14 +81043,14 @@ entities: parent: 2 - proto: SciFlash entities: - - uid: 2335 + - uid: 2337 components: - type: Transform - parent: 2330 + parent: 2332 - type: Physics canCollide: False - type: InsideEntityStorage - storage: 2330 + storage: 2332 - proto: ScrapAirlock1 entities: - uid: 2794 @@ -82046,14 +82046,14 @@ entities: parent: 2 - proto: SheetPlastic10 entities: - - uid: 2730 + - uid: 2734 components: - type: Transform - parent: 2729 + parent: 2733 - type: Physics canCollide: False - type: InsideEntityStorage - storage: 2729 + storage: 2733 - uid: 8381 components: - type: Transform @@ -82637,7 +82637,7 @@ entities: fixtures: {} - proto: ShelfRWood entities: - - uid: 2340 + - uid: 2342 components: - type: Transform pos: -29.5,48.5 @@ -82646,7 +82646,7 @@ entities: locked: False - type: Storage storedItems: - 2341: + 2343: position: 0,0 _rotation: South - type: ContainerContainer @@ -82655,7 +82655,7 @@ entities: showEnts: False occludes: True ents: - - 2341 + - 2343 - type: Fixtures fixtures: {} - proto: ShellShotgunIncendiary @@ -83474,14 +83474,14 @@ entities: parent: 2 - proto: SilverRing entities: - - uid: 2354 + - uid: 2356 components: - type: Transform - parent: 2350 + parent: 2352 - type: Physics canCollide: False - type: InsideEntityStorage - storage: 2350 + storage: 2352 - proto: Sink entities: - uid: 8504 @@ -87234,14 +87234,14 @@ entities: parent: 2 - proto: TreasureCoinGold entities: - - uid: 2355 + - uid: 2357 components: - type: Transform - parent: 2350 + parent: 2352 - type: Physics canCollide: False - type: InsideEntityStorage - storage: 2350 + storage: 2352 - uid: 9135 components: - type: Transform @@ -87249,30 +87249,30 @@ entities: parent: 2 - proto: TreasureCoinSilver entities: - - uid: 2356 + - uid: 2358 components: - type: Transform - parent: 2350 + parent: 2352 - type: Physics canCollide: False - type: InsideEntityStorage - storage: 2350 - - uid: 2357 + storage: 2352 + - uid: 2359 components: - type: Transform - parent: 2350 + parent: 2352 - type: Physics canCollide: False - type: InsideEntityStorage - storage: 2350 - - uid: 2358 + storage: 2352 + - uid: 2360 components: - type: Transform - parent: 2350 + parent: 2352 - type: Physics canCollide: False - type: InsideEntityStorage - storage: 2350 + storage: 2352 - proto: TrenchKnifeChaos entities: - uid: 9136 @@ -87282,14 +87282,14 @@ entities: parent: 2 - proto: Truncheon entities: - - uid: 2336 + - uid: 2338 components: - type: Transform - parent: 2330 + parent: 2332 - type: Physics canCollide: False - type: InsideEntityStorage - storage: 2330 + storage: 2332 - uid: 6249 components: - type: Transform @@ -87395,49 +87395,49 @@ entities: parent: 2 - type: DeviceLinkSource linkedPorts: - 2569: + 2573: - - Left - Reverse - - Right - Forward - - Middle - Off - 2568: + 2572: - - Left - Reverse - - Right - Forward - - Middle - Off - 2571: + 2575: - - Left - Reverse - - Right - Forward - - Middle - Off - 2570: + 2574: - - Left - Reverse - - Right - Forward - - Middle - Off - 2572: + 2576: - - Left - Reverse - - Right - Forward - - Middle - Off - 2573: + 2577: - - Left - Reverse - - Right - Forward - - Middle - Off - 2574: + 2578: - - Left - Reverse - - Right @@ -87458,237 +87458,251 @@ entities: parent: 2 - type: DeviceLinkSource linkedPorts: - 2689: + 2693: - - Left - Reverse - - Right - Forward - - Middle - Off - 2688: + 2692: - - Left - Reverse - - Right - Forward - - Middle - Off - 2687: + 2691: - - Left - Reverse - - Right - Forward - - Middle - Off - 2691: + 2695: - - Left - Reverse - - Right - Forward - - Middle - Off - 2680: + 2684: - - Left - Reverse - - Right - Forward - - Middle - Off - 2663: + 2667: - - Left - Reverse - - Right - Forward - - Middle - Off - 2669: + 2673: - - Left - Reverse - - Right - Forward - - Middle - Off - 2670: + 2674: - - Left - Reverse - - Right - Forward - - Middle - Off - 2665: + 2669: - - Left - Reverse - - Right - Forward - - Middle - Off - 2662: + 2666: - - Left - Reverse - - Right - Forward - - Middle - Off - 2684: + 2688: - - Left - Reverse - - Right - Forward - - Middle - Off - 2661: + 2665: - - Left - Reverse - - Right - Forward - - Middle - Off - 2690: + 2694: - - Left - Reverse - - Right - Forward - - Middle - Off - 2664: + 2668: - - Left - Reverse - - Right - Forward - - Middle - Off - 2683: + 2687: - - Left - Reverse - - Right - Forward - - Middle - Off - 2681: + 2685: - - Left - Reverse - - Right - Forward - - Middle - Off - 2674: + 2678: - - Left - Reverse - - Right - Forward - - Middle - Off - 2672: + 2676: - - Left - Reverse - - Right - Forward - - Middle - Off - 2686: + 2690: - - Left - Reverse - - Right - Forward - - Middle - Off - 2682: + 2686: - - Left - Reverse - - Right - Forward - - Middle - Off - 2685: + 2689: - - Left - Reverse - - Right - Forward - - Middle - Off - 2693: + 2697: - - Left - Reverse - - Right - Forward - - Middle - Off - 2679: + 2683: - - Left - Reverse - - Right - Forward - - Middle - Off - 2678: + 2682: - - Left - Reverse - - Right - Forward - - Middle - Off - 2677: + 2681: - - Left - Reverse - - Right - Forward - - Middle - Off - 2676: + 2680: - - Left - Reverse - - Right - Forward - - Middle - Off - 2666: + 2670: - - Left - Reverse - - Right - Forward - - Middle - Off - 2692: + 2696: - - Left - Reverse - - Right - Forward - - Middle - Off - 2675: + 2679: - - Left - Reverse - - Right - Forward - - Middle - Off - 2671: + 2675: - - Left - Reverse - - Right - Forward - - Middle - Off - 2673: + 2677: - - Left - Reverse - - Right - Forward - - Middle - Off - 2694: + 2698: - - Right - Forward - - Left - Reverse - - Middle - Off - 2695: + 2699: - - Middle - Off - - Right - Forward - - Left - Reverse + 2671: + - - Right + - Forward + - - Middle + - Off + - - Left + - Reverse + 2672: + - - Left + - Reverse + - - Right + - Forward + - - Middle + - Off - proto: UnfinishedMachineFrame entities: - uid: 9142 @@ -126140,7 +126154,7 @@ entities: parent: 2 - proto: WardrobeSecurity entities: - - uid: 2384 + - uid: 2386 components: - type: Transform pos: 66.5,30.5 @@ -126151,12 +126165,12 @@ entities: showEnts: False occludes: True ents: - - 2385 + - 2387 paper_label: !type:ContainerSlot showEnts: False occludes: True ent: null - - uid: 2445 + - uid: 2449 components: - type: Transform pos: 66.5,32.5 @@ -126167,12 +126181,12 @@ entities: showEnts: False occludes: True ents: - - 2446 + - 2450 paper_label: !type:ContainerSlot showEnts: False occludes: True ent: null - - uid: 2452 + - uid: 2456 components: - type: Transform pos: 66.5,31.5 @@ -126183,8 +126197,8 @@ entities: showEnts: False occludes: True ents: - - 2453 - - 2454 + - 2457 + - 2458 paper_label: !type:ContainerSlot showEnts: False occludes: True @@ -126255,14 +126269,14 @@ entities: parent: 2 - proto: WeaponTaser entities: - - uid: 2337 + - uid: 2339 components: - type: Transform - parent: 2330 + parent: 2332 - type: Physics canCollide: False - type: InsideEntityStorage - storage: 2330 + storage: 2332 - proto: WeaponTurretSyndicateBroken entities: - uid: 16595 @@ -127194,25 +127208,21 @@ entities: - uid: 16756 components: - type: Transform - rot: 3.141592653589793 rad pos: -174.5,63.5 parent: 2 - uid: 16757 components: - type: Transform - rot: 3.141592653589793 rad pos: -178.5,57.5 parent: 2 - uid: 16758 components: - type: Transform - rot: 3.141592653589793 rad pos: -176.5,60.5 parent: 2 - uid: 16759 components: - type: Transform - rot: 3.141592653589793 rad pos: -173.5,67.5 parent: 2 - uid: 16760 diff --git a/Resources/Prototypes/_WH40K/Catalog/Cargo/products.yml b/Resources/Prototypes/_WH40K/Catalog/Cargo/products.yml index ea1231a6772c5..ab3b81f905bc6 100644 --- a/Resources/Prototypes/_WH40K/Catalog/Cargo/products.yml +++ b/Resources/Prototypes/_WH40K/Catalog/Cargo/products.yml @@ -433,7 +433,7 @@ icon: sprite: Objects/Devices/pinpointer.rsi state: pinpointer - product: WH40KServoSkullMob + product: WH40KServoSkullMelta cost: 7500 category: cargoproduct-category-name-cargo group: WH40KImperiumMarket @@ -934,7 +934,7 @@ icon: sprite: Objects/Devices/pinpointer.rsi state: pinpointer - product: WH40KServoSkullMob + product: WH40KServoSkullMelta cost: 7500 category: cargoproduct-category-name-cargo group: WH40KHereticsMarket diff --git a/Resources/Prototypes/_WH40K/Command/node_tree.yml b/Resources/Prototypes/_WH40K/Command/node_tree.yml index a37b6399c83c8..dac38ae367ad6 100644 --- a/Resources/Prototypes/_WH40K/Command/node_tree.yml +++ b/Resources/Prototypes/_WH40K/Command/node_tree.yml @@ -351,9 +351,9 @@ titleKey: wh40k-command-node-upgrade-tree-node-eqp-left-2-title descriptionKey: wh40k-command-node-upgrade-tree-node-eqp-left-2-description parents: [eqp_root] - cost: 1 - minBaseLevel: 1 - minRoundTimeSeconds: 0 + cost: 11 + minBaseLevel: 2 + minRoundTimeSeconds: 360 technologyUnlocks: [WH40KEquipmentAuthLeft2] teamCargoProductUnlocks: Imperium: [WH40KImperiumInflatableCoverKit, WH40KImperiumBarricadeBars, WH40KImperiumBarricadeBoarded, WH40KImperiumBarricadeWarhammer, WH40KImperiumBarricadeSandbags, WH40KImperiumBarricadeHedgehog, WH40KImperiumBarbedWire] diff --git a/Resources/Prototypes/_WH40K/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/_WH40K/Entities/Objects/Devices/Circuitboards/Machine/production.yml new file mode 100644 index 0000000000000..f06fd728abe50 --- /dev/null +++ b/Resources/Prototypes/_WH40K/Entities/Objects/Devices/Circuitboards/Machine/production.yml @@ -0,0 +1,83 @@ +- type: entity + id: ProtolatheMachineCircuitboardImperium + parent: BaseMachineCircuitboard + name: protolathe machine board + description: A machine printed circuit board for a protolathe. + components: + - type: Sprite + state: science + - type: MachineBoard + prototype: WH40KProtolatheImperium + stackRequirements: + Manipulator: 4 + tagRequirements: + GlassBeaker: + amount: 2 + defaultPrototype: Beaker + +- type: entity + id: ProtolatheMachineCircuitboardHeretics + parent: BaseMachineCircuitboard + name: protolathe machine board + description: A machine printed circuit board for a protolathe. + components: + - type: Sprite + state: science + - type: MachineBoard + prototype: WH40KProtolatheHeretics + stackRequirements: + Manipulator: 4 + tagRequirements: + GlassBeaker: + amount: 2 + defaultPrototype: Beaker + +- type: entity + id: AutolatheMachineCircuitboardImperium + parent: BaseMachineCircuitboard + name: autolathe machine board + description: A machine printed circuit board for an autolathe. + components: + - type: MachineBoard + prototype: WH40KAutolatheImperium + stackRequirements: + Manipulator: 4 + Glass: 1 + +- type: entity + id: AutolatheMachineCircuitboardHeretics + parent: BaseMachineCircuitboard + name: autolathe machine board + description: A machine printed circuit board for an autolathe. + components: + - type: MachineBoard + prototype: WH40KAutolatheHeretics + stackRequirements: + Manipulator: 4 + Glass: 1 + +- type: entity + id: OreProcessorMachineCircuitboardImperium + parent: BaseMachineCircuitboard + name: ore processor machine board + components: + - type: Sprite + state: supply + - type: MachineBoard + prototype: WH40KOreProcessorImperium + stackRequirements: + Manipulator: 4 + Glass: 1 + +- type: entity + id: OreProcessorMachineCircuitboardHeretics + parent: BaseMachineCircuitboard + name: ore processor machine board + components: + - type: Sprite + state: supply + - type: MachineBoard + prototype: WH40KOreProcessorHeretics + stackRequirements: + Manipulator: 4 + Glass: 1 diff --git a/Resources/Prototypes/_WH40K/Entities/Objects/Devices/servo_skulls.yml b/Resources/Prototypes/_WH40K/Entities/Objects/Devices/servo_skulls.yml index c77b862eb8fff..82d291b61433d 100644 --- a/Resources/Prototypes/_WH40K/Entities/Objects/Devices/servo_skulls.yml +++ b/Resources/Prototypes/_WH40K/Entities/Objects/Devices/servo_skulls.yml @@ -3,25 +3,30 @@ name: servo skull description: A compact servo skull chassis. Deploy it to create a friendly support skull. parent: BaseItem - suffix: WH40K + suffix: WH40K, non-activated components: - type: Sprite sprite: _WH40K/Objects/Devices/servo_skull.rsi state: icon - type: Item - size: Tiny + size: Normal - type: WH40KCombineWithPrototype requiredPrototype: MeltaGrenade resultPrototype: WH40KServoSkullMelta - type: WH40KDeployServoSkull mobPrototype: WH40KServoSkullMob + - type: AmbientSound + range: 10 + volume: -10 + sound: + path: /Audio/Ambience/Objects/portable_scrubber.ogg - type: entity id: WH40KServoSkullMelta name: melta servo skull description: A servo skull rigged with a melta charge. Deploy it and it will hunt nearby enemies for your team. parent: BaseItem - suffix: WH40K + suffix: WH40K, non-activated components: - type: Sprite sprite: _WH40K/Objects/Devices/servo_skull_melta.rsi @@ -30,6 +35,11 @@ size: Tiny - type: WH40KDeployServoSkull mobPrototype: WH40KServoSkullMeltaMob + - type: AmbientSound + range: 10 + volume: -10 + sound: + path: /Audio/Ambience/Objects/portable_scrubber.ogg - type: entity id: WH40KServoSkullMobBase @@ -75,13 +85,18 @@ chargeStopRange: 0.25 hostileDetectionRange: 6 scanInterval: 0.2 + - type: AmbientSound + range: 10 + volume: -10 + sound: + path: /Audio/Ambience/Objects/portable_scrubber.ogg - type: entity id: WH40KServoSkullMob parent: WH40KServoSkullMobBase name: servo skull description: A friendly servo skull awaiting a command. - suffix: WH40K, non-activated + suffix: WH40K components: - type: Sprite drawdepth: Mobs @@ -124,10 +139,15 @@ - timer - type: Explosive explosionType: MicroBomb - totalIntensity: 700 + totalIntensity: 90 intensitySlope: 45 maxIntensity: 10 canCreateVacuum: false - type: TimerTriggerVisuals primingSound: path: /Audio/Items/smoke_grenade_prime.ogg + - type: AmbientSound + range: 10 + volume: -10 + sound: + path: /Audio/Ambience/Objects/portable_scrubber.ogg diff --git a/Resources/Prototypes/_WH40K/Entities/Structures/Machines/lathes.yml b/Resources/Prototypes/_WH40K/Entities/Structures/Machines/lathes.yml index 022d020fab372..d584a24bbba4d 100644 --- a/Resources/Prototypes/_WH40K/Entities/Structures/Machines/lathes.yml +++ b/Resources/Prototypes/_WH40K/Entities/Structures/Machines/lathes.yml @@ -45,6 +45,8 @@ remapQueueToSelectedTierPack: false - type: WH40KResearchTeam teamId: Imperium + - type: Machine + board: AutolatheMachineCircuitboardImperium - type: entity id: WH40KAutolatheHeretics @@ -65,6 +67,8 @@ remapQueueToSelectedTierPack: false - type: WH40KResearchTeam teamId: Heretics + - type: Machine + board: AutolatheMachineCircuitboardHeretics - type: entity id: WH40KProtolathe @@ -119,6 +123,8 @@ remapQueueToSelectedTierPack: false - type: WH40KResearchTeam teamId: Imperium + - type: Machine + board: ProtolatheMachineCircuitboardImperium - type: entity id: WH40KProtolatheHeretics @@ -143,6 +149,8 @@ remapQueueToSelectedTierPack: false - type: WH40KResearchTeam teamId: Heretics + - type: Machine + board: ProtolatheMachineCircuitboardHeretics - type: entity id: WH40KOreProcessor @@ -201,6 +209,8 @@ remapQueueToSelectedTierPack: false - type: WH40KResearchTeam teamId: Imperium + - type: Machine + board: OreProcessorMachineCircuitboardImperium - type: entity id: WH40KOreProcessorHeretics @@ -221,3 +231,5 @@ remapQueueToSelectedTierPack: false - type: WH40KResearchTeam teamId: Heretics + - type: Machine + board: OreProcessorMachineCircuitboardHeretics diff --git a/Resources/Prototypes/_WH40K/Loadouts/Imperium/Guardsman.yml b/Resources/Prototypes/_WH40K/Loadouts/Imperium/Guardsman.yml index 1a1c69e994c9e..1ccf03dc9efb1 100644 --- a/Resources/Prototypes/_WH40K/Loadouts/Imperium/Guardsman.yml +++ b/Resources/Prototypes/_WH40K/Loadouts/Imperium/Guardsman.yml @@ -23,6 +23,11 @@ equipment: head: ClothingHeadHelmetFlakAdvCyan +- type: loadout + id: WH40KLightFlakArmor + equipment: + outerClothing: ClothingOuterArmorFlakVestLight + - type: loadout id: WH40KCyanLightFlakArmor equipment: @@ -38,6 +43,16 @@ equipment: outerClothing: ClothingOuterArmorFlakVestCyan +- type: loadout + id: WH40KFlakArmor + effects: + - !type:GroupLoadoutEffect + proto: WH40KVeteranService + - !type:WH40KMetaLevelLoadoutEffect + requiredLevel: 5 + equipment: + outerClothing: ClothingOuterArmorFlakVest + - type: loadout id: WH40KCyanCombatBoots equipment: diff --git a/Resources/Prototypes/_WH40K/Loadouts/loadout_groups.yml b/Resources/Prototypes/_WH40K/Loadouts/loadout_groups.yml index 61d3cbc29fec3..bb91169dcdbe6 100644 --- a/Resources/Prototypes/_WH40K/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/_WH40K/Loadouts/loadout_groups.yml @@ -22,7 +22,6 @@ - type: loadoutGroup id: TechpriestMask name: loadout-group-techpriest-mask - minLimit: 0 loadouts: - WH40KTechPriestBreather - WH40KTechPriestGasmask @@ -30,8 +29,8 @@ - type: loadoutGroup id: WH40KImperialLineHead name: loadout-group-wh40k-imperial-line-head - minLimit: 0 loadouts: + - FlakHelmet - WH40KBandanaBlack - WH40KBandanaGreen - WH40KBandanaMerc @@ -55,9 +54,11 @@ name: loadout-group-wh40k-imperial-field-outer minLimit: 0 loadouts: + - WH40KLightFlakArmor - WH40KKriegCoat - WH40KCyanLightFlakArmor - WH40KCyanFlakArmor + - WH40KFlakArmor - type: loadoutGroup id: WH40KImperialFieldBelt @@ -170,7 +171,6 @@ loadouts: - WH40KBronzeheart - WH40KSecurityMedal - - WH40KColonelCloak - WH40KGoldMedal - type: loadoutGroup @@ -190,7 +190,6 @@ - WH40KOfficerCoat - WH40KJuniorOfficerJacket - WH40KSeniorOfficerJacket - - WH40KCommissarCoat - type: loadoutGroup id: WH40KImperialCommandHands @@ -198,8 +197,6 @@ minLimit: 0 loadouts: - WH40KBlackGloves - - WH40KCommissarGloves - - WH40KColonelGloves - type: loadoutGroup id: WH40KCommandFieldKit diff --git a/Resources/Prototypes/_WH40K/Maps/wh40k_battlefield.yml b/Resources/Prototypes/_WH40K/Maps/wh40k_battlefield.yml index 04ddf2514b335..6452290b6f6cc 100644 --- a/Resources/Prototypes/_WH40K/Maps/wh40k_battlefield.yml +++ b/Resources/Prototypes/_WH40K/Maps/wh40k_battlefield.yml @@ -31,6 +31,6 @@ HLieutenant: [ 2, 2 ] HMedic: [ 3, 3 ] HSergeant: [ 2, 2 ] - HBandSupplier: [ 2, 2 ] + HBandSupplier: [ 3, 3 ] HTanker: [ 3, 3 ] #HVoxScout: [ 3, 3 ] diff --git a/Resources/Prototypes/_WH40K/Recipes/Lathe/command_unlocks.yml b/Resources/Prototypes/_WH40K/Recipes/Lathe/command_unlocks.yml index 356d768ec6ad2..b7125e725dec5 100644 --- a/Resources/Prototypes/_WH40K/Recipes/Lathe/command_unlocks.yml +++ b/Resources/Prototypes/_WH40K/Recipes/Lathe/command_unlocks.yml @@ -163,12 +163,13 @@ - type: latheRecipe parent: BaseToolRecipe id: WH40KRecipeServoSkull - result: WH40KServoSkullMob + result: WH40KServoSkullMelta materials: Steel: 500 Glass: 100 - Plastic: 100 - Plasma: 100 + Plastic: 250 + Plasma: 200 + Gold: 300 - type: latheRecipe parent: BaseToolRecipe diff --git a/Resources/Prototypes/_WH40K/Research/command_unlocks.yml b/Resources/Prototypes/_WH40K/Research/command_unlocks.yml index 7dd62b6b923d4..af76ad6397ace 100644 --- a/Resources/Prototypes/_WH40K/Research/command_unlocks.yml +++ b/Resources/Prototypes/_WH40K/Research/command_unlocks.yml @@ -335,8 +335,8 @@ state: trench discipline: WH40KEquipment tier: 1 - cost: 5 - researchTimeSeconds: 1 + cost: 5000 + researchTimeSeconds: 135 technologyPrerequisites: - WH40KEquipmentAuthRoot recipeUnlocks: diff --git a/Resources/Prototypes/_WH40K/Roles/Jobs/Heretics/BandSupplier.yml b/Resources/Prototypes/_WH40K/Roles/Jobs/Heretics/BandSupplier.yml index b4d16bbad8847..77bfa4c67aa14 100644 --- a/Resources/Prototypes/_WH40K/Roles/Jobs/Heretics/BandSupplier.yml +++ b/Resources/Prototypes/_WH40K/Roles/Jobs/Heretics/BandSupplier.yml @@ -24,6 +24,7 @@ shoes: ClothingShoesChaosBoots1 belt: chaosbelt2 head: ClothingHeadHelmetFlakCHAOS + ears: ClothingHeadsetVoxBackpackHeretics outerClothing: ClothingOuterArmorChaosVest pocket1: WH40KStandardTacticalMapTablet id: HBandSupplierDogTag diff --git a/Resources/Prototypes/_WH40K/Roles/Jobs/Heretics/Guardsman.yml b/Resources/Prototypes/_WH40K/Roles/Jobs/Heretics/Guardsman.yml index df763e04e8290..63aaebd101651 100644 --- a/Resources/Prototypes/_WH40K/Roles/Jobs/Heretics/Guardsman.yml +++ b/Resources/Prototypes/_WH40K/Roles/Jobs/Heretics/Guardsman.yml @@ -32,6 +32,4 @@ belt: chaosbelt2 head: ClothingHeadHelmetFlakCHAOS outerClothing: ClothingOuterArmorChaosVest - pocket1: WH40KStandardTacticalMapTablet id: HGuardsmanDogTag - diff --git a/Resources/Prototypes/_WH40K/Roles/Jobs/Heretics/Medic.yml b/Resources/Prototypes/_WH40K/Roles/Jobs/Heretics/Medic.yml index 497d21e77b75a..4551b19124801 100644 --- a/Resources/Prototypes/_WH40K/Roles/Jobs/Heretics/Medic.yml +++ b/Resources/Prototypes/_WH40K/Roles/Jobs/Heretics/Medic.yml @@ -26,6 +26,4 @@ belt: chaosbelt2 head: ClothingHeadHelmetFlakCHAOS outerClothing: ClothingOuterArmorFlakVestMed - pocket1: WH40KStandardTacticalMapTablet id: HMedicDogTag - diff --git a/Resources/Prototypes/_WH40K/Roles/Jobs/Heretics/Sergeant.yml b/Resources/Prototypes/_WH40K/Roles/Jobs/Heretics/Sergeant.yml index 399c8742e8e47..63d84983598c4 100644 --- a/Resources/Prototypes/_WH40K/Roles/Jobs/Heretics/Sergeant.yml +++ b/Resources/Prototypes/_WH40K/Roles/Jobs/Heretics/Sergeant.yml @@ -86,6 +86,5 @@ neck: NecklaceChaosCultistReflectWeak head: ClothingHeadHelmetrHeresy outerClothing: ClothingOuterArmorCultistCoat - pocket1: WH40KCommandTacticalMapTablet + pocket1: WH40KStandardTacticalMapTablet id: HSergeantDogTag - diff --git a/Resources/Prototypes/_WH40K/Roles/Jobs/Heretics/lexmechanic.yml b/Resources/Prototypes/_WH40K/Roles/Jobs/Heretics/lexmechanic.yml index 2bad5498b0e3c..25e40ae34ebd6 100644 --- a/Resources/Prototypes/_WH40K/Roles/Jobs/Heretics/lexmechanic.yml +++ b/Resources/Prototypes/_WH40K/Roles/Jobs/Heretics/lexmechanic.yml @@ -4,6 +4,16 @@ description: job-description-hlexmechanic playTimeTracker: JobHLexmechanic startingGear: LexmechanicGear + special: + - !type:AddComponentSpecial + components: + - type: IntrinsicRadioTransmitter + channels: + - Binary1 + - type: ActiveRadio + channels: + - Binary1 + - type: IntrinsicRadioReceiver icon: "JobIconHLexmechanic" supervisors: job-supervisors-ce canBeAntag: false @@ -27,5 +37,5 @@ shoes: ClothingShoesBootsworkTechpriest belt: ClothingBeltUtilityEngineering gloves: ClothingHandsGlovesTechpriest + ears: ClothingHeadsetVoxBackpackHeretics eyes: ClothingEyesHudTechPriest - mask: ClothingMaskGasTechPriest diff --git a/Resources/Prototypes/_WH40K/Roles/Jobs/Imperium/Colonel.yml b/Resources/Prototypes/_WH40K/Roles/Jobs/Imperium/Colonel.yml index e26b0e7fd101c..bcc1695a32086 100644 --- a/Resources/Prototypes/_WH40K/Roles/Jobs/Imperium/Colonel.yml +++ b/Resources/Prototypes/_WH40K/Roles/Jobs/Imperium/Colonel.yml @@ -48,8 +48,8 @@ head: ClothingHeadOfficer belt: colbelt neck: Colonelcloak + outerClothing: ClothingOuterArmorFlakVestGen pocket1: WH40KCommandTacticalMapTablet id: ColonelDogTag inhand: - WHPowerSaberImperial - diff --git a/Resources/Prototypes/_WH40K/Roles/Jobs/Imperium/Guardsman.yml b/Resources/Prototypes/_WH40K/Roles/Jobs/Imperium/Guardsman.yml index 8218b79f6166a..e8eb3c68d1dd0 100644 --- a/Resources/Prototypes/_WH40K/Roles/Jobs/Imperium/Guardsman.yml +++ b/Resources/Prototypes/_WH40K/Roles/Jobs/Imperium/Guardsman.yml @@ -35,8 +35,4 @@ back: ClothingBackpackGuard shoes: ClothingShoesAnkleBoots belt: guardbelt - head: ClothingHeadHelmetFlak - outerClothing: ClothingOuterArmorFlakVestLight - pocket1: WH40KStandardTacticalMapTablet id: GuardsmanDogTag - diff --git a/Resources/Prototypes/_WH40K/Roles/Jobs/Imperium/Mechanicus/lexmechanic.yml b/Resources/Prototypes/_WH40K/Roles/Jobs/Imperium/Mechanicus/lexmechanic.yml index a92c6f74086c5..be5b766abd67a 100644 --- a/Resources/Prototypes/_WH40K/Roles/Jobs/Imperium/Mechanicus/lexmechanic.yml +++ b/Resources/Prototypes/_WH40K/Roles/Jobs/Imperium/Mechanicus/lexmechanic.yml @@ -8,6 +8,16 @@ species: - Human startingGear: LexmechanicGear + special: + - !type:AddComponentSpecial + components: + - type: IntrinsicRadioTransmitter + channels: + - Binary + - type: ActiveRadio + channels: + - Binary + - type: IntrinsicRadioReceiver icon: "JobIconLexmechanic" supervisors: job-supervisors-ce canBeAntag: false @@ -29,6 +39,7 @@ gloves: ClothingHandsGlovesTechpriest eyes: ClothingEyesHudTechPriest mask: ClothingMaskGasTechPriest + ears: ClothingHeadsetVoxBackpackImperium pocket1: WH40KStandardTacticalMapTablet id: LexmechanicDogTag @@ -41,4 +52,3 @@ belt: ClothingBeltUtilityEngineering gloves: ClothingHandsGlovesTechpriest eyes: ClothingEyesHudTechPriest - mask: ClothingMaskGasTechPriest diff --git a/Resources/Prototypes/_WH40K/Roles/Jobs/Imperium/Medic.yml b/Resources/Prototypes/_WH40K/Roles/Jobs/Imperium/Medic.yml index fe918f574d418..540add144a3e0 100644 --- a/Resources/Prototypes/_WH40K/Roles/Jobs/Imperium/Medic.yml +++ b/Resources/Prototypes/_WH40K/Roles/Jobs/Imperium/Medic.yml @@ -25,6 +25,4 @@ belt: guardbelt head: ClothingHeadHelmetFlakMed outerClothing: ClothingOuterArmorFlakVestMed - pocket1: WH40KStandardTacticalMapTablet id: MedicDogTag - diff --git a/Resources/Prototypes/_WH40K/Roles/Jobs/Imperium/Psyker.yml b/Resources/Prototypes/_WH40K/Roles/Jobs/Imperium/Psyker.yml index deb1a1c36284a..d9410a3c611d9 100644 --- a/Resources/Prototypes/_WH40K/Roles/Jobs/Imperium/Psyker.yml +++ b/Resources/Prototypes/_WH40K/Roles/Jobs/Imperium/Psyker.yml @@ -29,6 +29,4 @@ belt: psybelt head: ClothingHeadHelmetPsyker outerClothing: ClothingOuterArmorFlakVestLight - pocket1: WH40KStandardTacticalMapTablet id: GuardsmanDogTag - diff --git a/Resources/Prototypes/_WH40K/Roles/Jobs/Imperium/Sergeant.yml b/Resources/Prototypes/_WH40K/Roles/Jobs/Imperium/Sergeant.yml index 898c416d02b9f..29f71bd3a6e68 100644 --- a/Resources/Prototypes/_WH40K/Roles/Jobs/Imperium/Sergeant.yml +++ b/Resources/Prototypes/_WH40K/Roles/Jobs/Imperium/Sergeant.yml @@ -109,6 +109,5 @@ belt: offbelt head: ClothingHeadOfficer outerClothing: ClothingOuterArmorOfficer - pocket1: WH40KCommandTacticalMapTablet + pocket1: WH40KStandardTacticalMapTablet id: SergeantDogTag - diff --git a/Resources/Prototypes/_WH40K/Roles/Jobs/Imperium/TitheSupplier.yml b/Resources/Prototypes/_WH40K/Roles/Jobs/Imperium/TitheSupplier.yml index cabaf64cb3bc5..b1d12abd32b3b 100644 --- a/Resources/Prototypes/_WH40K/Roles/Jobs/Imperium/TitheSupplier.yml +++ b/Resources/Prototypes/_WH40K/Roles/Jobs/Imperium/TitheSupplier.yml @@ -20,6 +20,7 @@ shoes: ClothingShoesAnkleBoots belt: guardbelt head: ClothingHeadHelmetFlak + ears: ClothingHeadsetVoxBackpackImperium outerClothing: ClothingOuterArmorFlakVestLight pocket1: WH40KStandardTacticalMapTablet id: TitheSupplierDogTag diff --git a/Resources/Prototypes/_WH40K/Roles/Jobs/Imperium/VoxScout.yml b/Resources/Prototypes/_WH40K/Roles/Jobs/Imperium/VoxScout.yml index 0c5c0353ffb1c..211c54470514d 100644 --- a/Resources/Prototypes/_WH40K/Roles/Jobs/Imperium/VoxScout.yml +++ b/Resources/Prototypes/_WH40K/Roles/Jobs/Imperium/VoxScout.yml @@ -32,6 +32,6 @@ belt: guardbelt head: ClothingHeadHelmetFlak outerClothing: ClothingOuterArmorFlakVestLight + pocket1: Binoculars pocket2: WH40KStandardTacticalMapTablet id: GuardsmanDogTag - diff --git a/Resources/Prototypes/_WH40K/radio.yml b/Resources/Prototypes/_WH40K/radio.yml index 0b8c3c2964ff2..d0a67729d7249 100644 --- a/Resources/Prototypes/_WH40K/radio.yml +++ b/Resources/Prototypes/_WH40K/radio.yml @@ -5,7 +5,7 @@ frequency: 1845 color: "#E0FFFF" longRange: true - + - type: radioChannel id: VoxImperium name: chat-radio-vox-imperium @@ -21,3 +21,11 @@ frequency: 2051 color: "#8B3A3A" longRange: true + +- type: radioChannel + id: Binary1 + name: chat-radio-binary + keycode: '1' + frequency: 1010 + color: "#5ed7aa" + longRange: true diff --git a/Resources/Prototypes/_WH40K/tier_profiles.yml b/Resources/Prototypes/_WH40K/tier_profiles.yml index 45a7c9b1a7cc9..6fa09d46ded92 100644 --- a/Resources/Prototypes/_WH40K/tier_profiles.yml +++ b/Resources/Prototypes/_WH40K/tier_profiles.yml @@ -12,10 +12,10 @@ minProcessSecondsTier1: 8 minProcessSecondsTier2: 5 minProcessSecondsTier3: 3 - materialStorageLimitTier0: 10 - materialStorageLimitTier1: 15 - materialStorageLimitTier2: 20 - materialStorageLimitTier3: 30 + materialStorageLimitTier0: 40 + materialStorageLimitTier1: 60 + materialStorageLimitTier2: 90 + materialStorageLimitTier3: 120 - type: wh40kTierLogisticsProfile id: WH40KTierLogisticsStandard diff --git a/Resources/Prototypes/radio_channels.yml b/Resources/Prototypes/radio_channels.yml index 85dbb3d406670..055cba78733bf 100644 --- a/Resources/Prototypes/radio_channels.yml +++ b/Resources/Prototypes/radio_channels.yml @@ -81,7 +81,7 @@ - type: radioChannel id: Binary name: chat-radio-binary - keycode: 'д' + keycode: '0' frequency: 1001 color: "#5ed7aa" # long range since otherwise it'd defeat the point of a handheld radio independent of telecomms @@ -112,4 +112,4 @@ frequency: 2003 color: "#ff2222" # long range since I don't wanna make a special xenoborg telecomm server - longRange: true \ No newline at end of file + longRange: true