Fixes

AdventureTimeSS14 · Oct 14, 2023 · 250d747 · 250d747
1 parent 55289da
commit 250d747
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 51 deletions.
diff --git a/Resources/Maps/corvax_spectrum.yml b/Resources/Maps/corvax_spectrum.yml
@@ -20973,22 +20973,6 @@ entities:
       type: MetaData
     - parent: 24737
       type: Transform
-- proto: ActionToggleJetpack
-  entities:
-  - uid: 24743
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 24737
-      type: Transform
-- proto: ActionToggleLight
-  entities:
-  - uid: 24900
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 24898
-      type: Transform
   #- uid: 36909
   #  components:
   #  - flags: InContainer
@@ -174099,12 +174083,9 @@ entities:
       type: Transform
     - toggleActionEntity: 24744
       type: GasTank
-    - toggleActionEntity: 24743
-      type: Jetpack
     - containers:
         ProvidedActionContainer: !type:Container
           ents:
-          - 24743
           - 24744
       type: ContainerContainer
 - proto: JetpackSecurityFilled
@@ -179834,7 +179815,7 @@ entities:
 
         ████╗░██║╚══██╔══╝       Форма NT-№XXX-MED-PRQ
 
-        ██╔██╗██║░░░██║░░░        	Запрос на производство                                               
+        ██╔██╗██║░░░██║░░░        	Запрос на производство
 
         ██║╚████║░░░██║░░░      лекарственных препаратов
 
@@ -180523,7 +180504,7 @@ entities:
 
         Разрешение на ношение оружия
 
-        Должность: Священник 
+        Должность: Священник
 
         Причина: Быть рукой господа и для защиты божьего дома.
 
@@ -273528,18 +273509,6 @@ entities:
       pos: 36.400997,-24.892822
       parent: 36907
       type: Transform
-  - uid: 24898
-    components:
-    - pos: 27.544739,-1.9702148
-      parent: 36907
-      type: Transform
-    - toggleActionEntity: 24900
-      type: UnpoweredFlashlight
-    - containers:
-        ProvidedActionContainer: !type:Container
-          ents:
-          - 24900
-      type: ContainerContainer
 - proto: WeaponDisabler
   entities:
   - uid: 2331

diff --git a/Resources/Prototypes/ADT/Entities/Structures/Power/industrial.yml b/Resources/Prototypes/ADT/Entities/Structures/Power/industrial.yml
@@ -63,7 +63,7 @@
     - type: WiresPanel
     - type: Wires
       BoardName: wires-board-name-smes
-      LayoutId: SMES
+      layoutId: SMES
     - type: Machine
       board: SMESMachineCircuitboard
     - type: StationInfiniteBatteryTarget

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
@@ -33,7 +33,7 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockClothesFilled
-  cost: 5520
+  cost: 5700
   category: Service
   group: market
 

diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -21,16 +21,17 @@
     - type: Clothing
       sprite: Corvax/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi
 
-- type: entity
-  parent: ClothingUniformSkirtBase
-  id: ClothingUniformJumpskirtLibrarian
-  name: sensible suitskirt
-  description: It's very... sensible.
-  components:
-    - type: Sprite
-      sprite: Corvax/Clothing/Uniforms/Jumpskirt/librarian.rsi
-    - type: Clothing
-      sprite: Corvax/Clothing/Uniforms/Jumpskirt/librarian.rsi
+# TODO xTray Disabled Duplicate ID
+#- type: entity
+#  parent: ClothingUniformSkirtBase
+#  id: ClothingUniformJumpskirtLibrarian
+#  name: sensible suitskirt
+#  description: It's very... sensible.
+#  components:
+#    - type: Sprite
+#      sprite: Corvax/Clothing/Uniforms/Jumpskirt/librarian.rsi
+#    - type: Clothing
+#      sprite: Corvax/Clothing/Uniforms/Jumpskirt/librarian.rsi
 
 - type: entity
   parent: ClothingUniformSkirtBase

diff --git a/Resources/Prototypes/Voice/disease_emotes.yml b/Resources/Prototypes/Voice/disease_emotes.yml
@@ -51,8 +51,3 @@
   id: Snore
   category: Vocal
   chatMessages: [храпит] # Corvax-Localization
-
-- type: emote
-  id: Honk
-  category: Vocal
-  chatMessages: [хонкает] # Corvax-Localization
diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml
@@ -84,7 +84,7 @@
 - type: emote
   id: Honk
   category: Vocal
-  chatMessages: [honks]
+  chatMessages: [хонкает] # Corvax-Localization
 
 - type: emote
   id: Sigh