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

Lost-Paradise-Project · Sep 4, 2024 · 48a6d1d · 48a6d1d
2 parents 3337805 + 5867edb
commit 48a6d1d
Show file tree

Hide file tree

Showing 36 changed files with 2 additions and 1,141 deletions.
diff --git a/Resources/Prototypes/_LostParadise/Entities/Mobs/Cryborgs/MediKitibot.yml b/Resources/Prototypes/_LostParadise/Entities/Mobs/Cryborgs/MediKitibot.yml
@@ -58,9 +58,6 @@
     templateId: borgDutch
   - type: TTS # Corvax-TTS
     voice: Vally
-  - type: FootstepModifier
-    footstepSoundCollection:
-      collection: FootstepHoverBorg
   - type: InteractionPopup
     interactSuccessString: petting-success-generic
     interactFailureString: petting-failure-generic

diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/door_remote.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/door_remote.yml
@@ -1,21 +1,3 @@
-
-- type: entity
-  parent: DoorRemoteDefault
-  id: DoorRemoteCC
-  name: Пульт ЦК
-  suffix: Cenctom
-  components:
-    - type: Sprite
-      layers:
-        - state: door_remotebase
-        - state: door_remotelightscolour
-          color: "#2eba22"
-        - state: door_remotescreencolour
-          color: "#22871a"
-    - type: Access
-      groups:
-        - CentCom
-
 - type: entity
   parent: DoorRemoteDefault
   id: DoorRemoteFull

diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Materials/Sheets/glass.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Materials/Sheets/glass.yml
diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Materials/Sheets/metal.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Materials/Sheets/metal.yml
diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Materials/Sheets/ores.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Materials/Sheets/ores.yml
diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Misc/flatpacks.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Misc/flatpacks.yml
diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Misc/tiles.yml
@@ -34,7 +34,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          path: /Audio/Effects/metal_break1.ogg
           params:
             volume: -8
       - !type:DoActsBehavior
@@ -124,7 +124,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          path: /Audio/Effects/metal_break1.ogg
           params:
             volume: -8
       - !type:DoActsBehavior

diff --git a/Resources/Prototypes/_LostParadise/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_LostParadise/Entities/Structures/Machines/vending_machines.yml
@@ -208,8 +208,6 @@
     normalState: normal-unshaded
     ejectState: eject-unshaded
     denyState: deny-unshaded
-  - type: Advertise
-    pack: LPPPillowVendingMachineeAds
   - type: SpeakOnUIClosed
     pack: GenericVendGoodbyes
   - type: Sprite

diff --git a/Resources/Prototypes/_LostParadise/Entities/Structures/Power/apc.yml b/Resources/Prototypes/_LostParadise/Entities/Structures/Power/apc.yml