]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Cog christmas update (#33344)
authorSpessmann <156740760+Spessmann@users.noreply.github.com>
Sat, 16 Nov 2024 06:29:09 +0000 (22:29 -0800)
committerGitHub <noreply@github.com>
Sat, 16 Nov 2024 06:29:09 +0000 (23:29 -0700)
christmas updoot

Resources/Maps/cog.yml

index 859ee46b1deda56d58a9e6d79490436653322809..833756d3372d7c71c478bb3e35ac8c94da447c0e 100644 (file)
@@ -173,7 +173,7 @@ entities:
           version: 6
         1,-2:
           ind: 1,-2
-          tiles: SgAAAAAASgAAAAAASgAAAAAAgQAAAAAAYAAAAAACYAAAAAADYAAAAAADYAAAAAABgQAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAAgQAAAAAASgAAAAAASgAAAAAASgAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAACYAAAAAACgQAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAACYAAAAAADYAAAAAABYAAAAAACYAAAAAACYAAAAAABYAAAAAAAYAAAAAACYAAAAAACYAAAAAAAYAAAAAADYAAAAAABYAAAAAAAYAAAAAADYAAAAAAAYAAAAAABYAAAAAABYAAAAAACYAAAAAADYAAAAAADYAAAAAABYAAAAAABYAAAAAADYAAAAAADYAAAAAACYAAAAAACYAAAAAACYAAAAAACYAAAAAADYAAAAAACYAAAAAACYAAAAAAAYAAAAAABYAAAAAABYAAAAAADYAAAAAAAYAAAAAABYAAAAAAAYAAAAAABYAAAAAAAYAAAAAADYAAAAAABYAAAAAACYAAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAACYAAAAAADgQAAAAAAYAAAAAABYAAAAAADYAAAAAAAYAAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAABgQAAAAAAYAAAAAACYAAAAAABYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAABgQAAAAAAYAAAAAABYAAAAAACYAAAAAACYAAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAABgQAAAAAAYAAAAAADYAAAAAACYAAAAAADYAAAAAAAYAAAAAADYAAAAAABgQAAAAAAYAAAAAACYAAAAAABYAAAAAABYAAAAAAAgQAAAAAAYAAAAAACYAAAAAACYAAAAAADgQAAAAAAYAAAAAABYAAAAAACYAAAAAABYAAAAAAAYAAAAAACYAAAAAACgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAADYAAAAAACgQAAAAAAYAAAAAACYAAAAAABYAAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAADgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAAYAAAAAADYAAAAAADYAAAAAAAYAAAAAABgQAAAAAAYAAAAAAAYAAAAAACYAAAAAADgQAAAAAAYAAAAAADYAAAAAACYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAADYAAAAAAAYAAAAAADYAAAAAAAYAAAAAADYAAAAAADYAAAAAACYAAAAAADYAAAAAABYAAAAAAAYAAAAAADYAAAAAADYAAAAAADYAAAAAACYAAAAAADYAAAAAADYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAAAYAAAAAACYAAAAAACYAAAAAAAYAAAAAADYAAAAAABYAAAAAAAYAAAAAACYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAAD
+          tiles: SgAAAAAASgAAAAAASgAAAAAAgQAAAAAAYAAAAAACYAAAAAADYAAAAAADYAAAAAABgQAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAAgQAAAAAASgAAAAAASgAAAAAASgAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAACYAAAAAACgQAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAACYAAAAAADYAAAAAABYAAAAAACYAAAAAACYAAAAAABYAAAAAAAYAAAAAACYAAAAAACYAAAAAAAYAAAAAADYAAAAAABYAAAAAAAYAAAAAADYAAAAAAAYAAAAAABYAAAAAABYAAAAAACYAAAAAADYAAAAAADYAAAAAABYAAAAAABYAAAAAADYAAAAAADYAAAAAACYAAAAAACYAAAAAACYAAAAAACYAAAAAADYAAAAAACYAAAAAACYAAAAAAAYAAAAAABYAAAAAABYAAAAAADYAAAAAAAYAAAAAABYAAAAAAAYAAAAAABYAAAAAAAYAAAAAADYAAAAAABYAAAAAACYAAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAACYAAAAAADgQAAAAAAYAAAAAABIwAAAAAAIwAAAAAAYAAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAABgQAAAAAAYAAAAAACYAAAAAABYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAABgQAAAAAAYAAAAAABYAAAAAACYAAAAAACYAAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAABgQAAAAAAYAAAAAADYAAAAAACYAAAAAADYAAAAAAAYAAAAAADYAAAAAABgQAAAAAAYAAAAAACYAAAAAABYAAAAAABYAAAAAAAgQAAAAAAYAAAAAACYAAAAAACYAAAAAADgQAAAAAAYAAAAAABYAAAAAACYAAAAAABYAAAAAAAYAAAAAACYAAAAAACgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAADYAAAAAACgQAAAAAAYAAAAAACYAAAAAABYAAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAADgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAAYAAAAAADYAAAAAADYAAAAAAAYAAAAAABgQAAAAAAYAAAAAAAYAAAAAACYAAAAAADgQAAAAAAYAAAAAADYAAAAAACYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAADYAAAAAAAYAAAAAADYAAAAAAAYAAAAAADYAAAAAADYAAAAAACYAAAAAADYAAAAAABYAAAAAAAYAAAAAADYAAAAAADYAAAAAADYAAAAAACYAAAAAADYAAAAAADYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAAAYAAAAAACYAAAAAACYAAAAAAAYAAAAAADYAAAAAABYAAAAAAAYAAAAAACYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAAD
           version: 6
         1,-1:
           ind: 1,-1
@@ -5708,8 +5708,6 @@ entities:
             761: 16,-26
             762: 17,-26
             763: 18,-26
-            764: 21,-26
-            765: 22,-26
             776: 11,-20
             777: 12,-20
             778: 13,-20
@@ -9215,6 +9213,12 @@ entities:
             id: grasssnow
           decals:
             4352: -46.01974,-50.080185
+        - node:
+            color: '#FFFFFFFF'
+            id: grasssnow
+          decals:
+            10162: 21.08367,-26.059422
+            10163: 21.882736,-26.075739
         - node:
             cleanable: True
             color: '#8600003C'
@@ -19872,8 +19876,7 @@ entities:
   - uid: 28848
     components:
     - type: Transform
-      rot: -12.566370614359172 rad
-      pos: 2.6072965,-1.5317864
+      pos: 2.3982162,-1.3528447
       parent: 12
 - proto: AsteroidRock
   entities:
@@ -76658,6 +76661,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -48.5,27.5
       parent: 12
+  - uid: 17970
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -49.5,38.5
+      parent: 12
   - uid: 18156
     components:
     - type: Transform
@@ -76952,12 +76961,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -52.5,37.5
       parent: 12
-  - uid: 22173
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -49.5,38.5
-      parent: 12
   - uid: 22376
     components:
     - type: Transform
@@ -77738,6 +77741,18 @@ entities:
     - type: Transform
       pos: 0.5,-66.5
       parent: 12
+  - uid: 31688
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 20.408453,-26.829342
+      parent: 12
+  - uid: 31689
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 22.06586,-28.196033
+      parent: 12
   - uid: 32101
     components:
     - type: Transform
@@ -80078,6 +80093,46 @@ entities:
     - type: Transform
       pos: -15.479212,51.570213
       parent: 12
+- proto: ClothingHeadHatSantahat
+  entities:
+  - uid: 31656
+    components:
+    - type: Transform
+      rot: -25.132741228718352 rad
+      pos: -22.599323,38.502403
+      parent: 12
+  - uid: 31657
+    components:
+    - type: Transform
+      rot: -25.132741228718352 rad
+      pos: -41.818073,40.566353
+      parent: 12
+  - uid: 31669
+    components:
+    - type: Transform
+      rot: -25.132741228718352 rad
+      pos: -36.450703,42.555126
+      parent: 12
+  - uid: 31670
+    components:
+    - type: Transform
+      pos: -29.275808,38.740208
+      parent: 12
+  - uid: 31672
+    components:
+    - type: Transform
+      pos: -37.561886,53.522655
+      parent: 12
+  - uid: 31673
+    components:
+    - type: Transform
+      pos: 23.223015,-26.438202
+      parent: 12
+  - uid: 31674
+    components:
+    - type: Transform
+      pos: 21.975492,-27.778383
+      parent: 12
 - proto: ClothingHeadHatSurgcapBlue
   entities:
   - uid: 5726
@@ -80652,6 +80707,37 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+- proto: ClothingOuterSanta
+  entities:
+  - uid: 31654
+    components:
+    - type: Transform
+      rot: -25.132741228718352 rad
+      pos: -21.505573,38.6744
+      parent: 12
+  - uid: 31655
+    components:
+    - type: Transform
+      rot: -25.132741228718352 rad
+      pos: -41.474323,40.472534
+      parent: 12
+  - uid: 31667
+    components:
+    - type: Transform
+      rot: -25.132741228718352 rad
+      pos: -31.513205,38.489803
+      parent: 12
+  - uid: 31668
+    components:
+    - type: Transform
+      rot: -6.217248937900877E-15 rad
+      pos: -39.52883,36.55096
+      parent: 12
+  - uid: 31671
+    components:
+    - type: Transform
+      pos: -37.341736,53.412502
+      parent: 12
 - proto: ClothingOuterStraightjacket
   entities:
   - uid: 19275
@@ -81375,6 +81461,12 @@ entities:
     - type: Transform
       pos: -2.5,-66.5
       parent: 12
+  - uid: 31690
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,-28.5
+      parent: 12
   - uid: 31793
     components:
     - type: Transform
@@ -81925,6 +82017,12 @@ entities:
       parent: 12
 - proto: ComputerSurveillanceCameraMonitor
   entities:
+  - uid: 1116
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -50.5,38.5
+      parent: 12
   - uid: 5803
     components:
     - type: Transform
@@ -81937,12 +82035,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -38.5,55.5
       parent: 12
-  - uid: 17970
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -48.5,38.5
-      parent: 12
   - uid: 20822
     components:
     - type: Transform
@@ -83571,6 +83663,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: -31.5,50.5
       parent: 12
+  - uid: 28862
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -48.5,38.5
+      parent: 12
 - proto: CryogenicSleepUnitSpawnerLateJoin
   entities:
   - uid: 17625
@@ -83712,13 +83810,6 @@ entities:
     - type: Transform
       pos: 3.5,55.5
       parent: 12
-- proto: CutterMachine
-  entities:
-  - uid: 1116
-    components:
-    - type: Transform
-      pos: 13.5,-19.5
-      parent: 12
 - proto: d6Dice
   entities:
   - uid: 929
@@ -95874,6 +95965,13 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+- proto: DrinkGlassWhite
+  entities:
+  - uid: 31687
+    components:
+    - type: Transform
+      pos: 24.274195,-28.126541
+      parent: 12
 - proto: DrinkGoldenCup
   entities:
   - uid: 10942
@@ -102590,6 +102688,13 @@ entities:
     - type: Transform
       pos: -7.8905973,-55.743637
       parent: 12
+- proto: FloraTreeChristmas02
+  entities:
+  - uid: 28861
+    components:
+    - type: Transform
+      pos: 22,-26
+      parent: 12
 - proto: FloraTreeLarge01
   entities:
   - uid: 16656
@@ -102707,6 +102812,20 @@ entities:
     - type: Transform
       pos: -53.30888,54.409172
       parent: 12
+- proto: FoodBakedCookie
+  entities:
+  - uid: 31677
+    components:
+    - type: Transform
+      rot: -6.283185307179586 rad
+      pos: 24.602898,-28.325752
+      parent: 12
+  - uid: 31678
+    components:
+    - type: Transform
+      rot: -6.283185307179586 rad
+      pos: 24.44549,-28.571293
+      parent: 12
 - proto: FoodBanana
   entities:
   - uid: 4201
@@ -102908,6 +103027,13 @@ entities:
     - type: Transform
       pos: 10.45153,-49.457336
       parent: 12
+- proto: FoodCakeChristmas
+  entities:
+  - uid: 22173
+    components:
+    - type: Transform
+      pos: 21.240437,-26.565382
+      parent: 12
 - proto: FoodCakeSuppermatterSlice
   entities:
   - uid: 15371
@@ -103150,6 +103276,11 @@ entities:
     - type: Transform
       pos: 64.56665,50.71139
       parent: 12
+  - uid: 31653
+    components:
+    - type: Transform
+      pos: 21.224129,-26.540905
+      parent: 12
 - proto: FoodPlatePlastic
   entities:
   - uid: 31121
@@ -147121,20 +147252,6 @@ entities:
     - type: Transform
       pos: 12.6497135,57.214436
       parent: 12
-- proto: Intellicard
-  entities:
-  - uid: 28861
-    components:
-    - type: Transform
-      rot: -12.566370614359172 rad
-      pos: -3.43437,-0.48939347
-      parent: 12
-  - uid: 28862
-    components:
-    - type: Transform
-      rot: -12.566370614359172 rad
-      pos: -2.5072865,-0.47896957
-      parent: 12
 - proto: IntercomAll
   entities:
   - uid: 31057
@@ -149276,14 +149393,12 @@ entities:
   - uid: 26865
     components:
     - type: Transform
-      rot: -25.132741228718352 rad
-      pos: 11.935109,-19.492529
+      pos: 13.299763,-19.62316
       parent: 12
   - uid: 26898
     components:
     - type: Transform
-      rot: -25.132741228718352 rad
-      pos: 12.15526,-19.162073
+      pos: 13.706013,-19.320866
       parent: 12
 - proto: MaintenanceFluffSpawner
   entities:
@@ -150620,8 +150735,7 @@ entities:
   - uid: 28854
     components:
     - type: Transform
-      rot: -12.566370614359172 rad
-      pos: 2.3989635,-1.1252534
+      pos: -2.6434512,-0.42511737
       parent: 12
 - proto: NuclearBomb
   entities:
@@ -157210,7 +157324,7 @@ entities:
   - uid: 21893
     components:
     - type: Transform
-      pos: -50.5,38.5
+      pos: 13.5,-19.5
       parent: 12
   - uid: 21933
     components:
@@ -157619,6 +157733,16 @@ entities:
     - type: Transform
       pos: -8.5,-66.5
       parent: 12
+  - uid: 31660
+    components:
+    - type: Transform
+      pos: -41.5,40.5
+      parent: 12
+  - uid: 31661
+    components:
+    - type: Transform
+      pos: -31.5,38.5
+      parent: 12
   - uid: 32108
     components:
     - type: Transform
@@ -157630,13 +157754,12 @@ entities:
   - uid: 9805
     components:
     - type: Transform
-      pos: 12.5489435,-19.523338
+      pos: 12.226846,-19.550192
       parent: 12
   - uid: 9807
     components:
     - type: Transform
-      rot: -37.69911184307754 rad
-      pos: 12.784136,-19.248148
+      pos: 12.581013,-19.393833
       parent: 12
   - uid: 10410
     components:
@@ -171484,7 +171607,7 @@ entities:
   - uid: 30003
     components:
     - type: Transform
-      pos: 11.470346,-19.382376
+      pos: 11.581013,-19.352137
       parent: 12
 - proto: StairDark
   entities:
@@ -174190,7 +174313,8 @@ entities:
   - uid: 21948
     components:
     - type: Transform
-      pos: -50.491573,38.521393
+      rot: -18.84955592153876 rad
+      pos: -49.832508,36.850792
       parent: 12
 - proto: SurveillanceCameraRouterCommand
   entities:
@@ -178577,6 +178701,11 @@ entities:
     - type: Transform
       pos: -14.5,73.5
       parent: 12
+  - uid: 31686
+    components:
+    - type: Transform
+      pos: 24.5,-28.5
+      parent: 12
 - proto: TargetClown
   entities:
   - uid: 22647
@@ -178655,7 +178784,8 @@ entities:
   - uid: 17779
     components:
     - type: Transform
-      pos: -49.732307,36.55419
+      rot: -18.84955592153876 rad
+      pos: -49.624176,36.475533
       parent: 12
 - proto: TegCenter
   entities:
@@ -204221,8 +204351,7 @@ entities:
   - uid: 7197
     components:
     - type: Transform
-      rot: -12.566370614359172 rad
-      pos: 2.2218802,-0.60405827
+      pos: -3.5080347,-0.46681333
       parent: 12
   - uid: 9080
     components: