Merge branch 'Lost-Paradise-Project:master' into master

Lost-Paradise-Project · Sep 10, 2024 · d62eb14 · d62eb14
2 parents 2345ca6 + da83271
commit d62eb14
Show file tree

Hide file tree

Showing 17 changed files with 810 additions and 760 deletions.
diff --git a/Resources/Changelog/ChangelogLPP.yml b/Resources/Changelog/ChangelogLPP.yml
@@ -229,3 +229,20 @@ Entries:
   id: 26
   time: '2024-09-09T14:43:02.0000000+00:00'
   url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/115
+- author: Ko4ergaPunk
+  changes: []
+  id: 27
+  time: '2024-09-10T06:03:37.0000000+00:00'
+  url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/118
+- author: Ko4ergaPunk
+  changes: []
+  id: 28
+  time: '2024-09-10T06:03:56.0000000+00:00'
+  url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/119
+- author: Ko4erga
+  changes:
+    - type: Tweak
+      message: Перерисованы люди.
+  id: 29
+  time: '2024-09-10T06:18:21.0000000+00:00'
+  url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/117
diff --git a/Resources/Maps/_LostParadise/LP_Normandy.yml b/Resources/Maps/_LostParadise/LP_Normandy.yml
@@ -69366,11 +69366,6 @@ entities:
     - type: Transform
       pos: 76.5,6.5
       parent: 2
-  - uid: 12339
-    components:
-    - type: Transform
-      pos: 70.5,-12.5
-      parent: 2
 - proto: LPPBedDoubleDown
   entities:
   - uid: 7067
@@ -69608,6 +69603,13 @@ entities:
     - type: Transform
       pos: 92.67146,-44.59236
       parent: 2
+- proto: LPPBrasMat
+  entities:
+  - uid: 16013
+    components:
+    - type: Transform
+      pos: 73.5,-8.5
+      parent: 2
 - proto: LPPCapComputerComms
   entities:
   - uid: 7112
@@ -69853,6 +69855,13 @@ entities:
     - type: Transform
       pos: 103.5,-43.5
       parent: 2
+- proto: LPPErpMachine
+  entities:
+  - uid: 12339
+    components:
+    - type: Transform
+      pos: 70.5,-12.5
+      parent: 2
 - proto: LPPFancyTableMnochrome
   entities:
   - uid: 12916
@@ -70141,6 +70150,13 @@ entities:
     - type: Transform
       pos: -7.5,-4.5
       parent: 2
+- proto: LPPNascaMat
+  entities:
+  - uid: 16012
+    components:
+    - type: Transform
+      pos: 71.5,-8.5
+      parent: 2
 - proto: LPPRCDFAPAmmo
   entities:
   - uid: 7188
@@ -70374,6 +70390,13 @@ entities:
     - type: Transform
       pos: 93.65657,-45.31111
       parent: 2
+- proto: LPPUnderpantsMat
+  entities:
+  - uid: 16014
+    components:
+    - type: Transform
+      pos: 72.5,-8.5
+      parent: 2
 - proto: LunchboxEpistemicsFilledRandom
   entities:
   - uid: 14587