fix

IPC Under for vulps E_sword
TypoChel1 · Jun 6, 2024 · 7de5b36 · 7de5b36
1 parent 8fde974
commit 7de5b36
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 22 deletions.
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
@@ -42,14 +42,14 @@
       - map: [ "enum.HumanoidVisualLayers.LArm" ]
       - map: [ "enum.HumanoidVisualLayers.RLeg" ]
       - map: [ "enum.HumanoidVisualLayers.LLeg" ]
-      - map: [ "underpants" ]
-      - map: [ "undershirt" ]
-      - map: [ "socks" ]
-      - map: [ "jumpsuit" ]
       - map: ["enum.HumanoidVisualLayers.LFoot"]
       - map: ["enum.HumanoidVisualLayers.RFoot"]
       - map: ["enum.HumanoidVisualLayers.LHand"]
       - map: ["enum.HumanoidVisualLayers.RHand"]
+      - map: [ "underpants" ]
+      - map: [ "undershirt" ]
+      - map: [ "socks" ]
+      - map: [ "jumpsuit" ]
       - map: [ "enum.HumanoidVisualLayers.Handcuffs" ]
         color: "#ffffff"
         sprite: Objects/Misc/handcuffs.rsi

diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml
@@ -44,11 +44,14 @@
         sprite: DeltaV/Mobs/Customization/Vulpkanin/masking_helpers.rsi
         state: female_full
         visible: false
-      - map: [ "jumpsuit" ]
       - map: [ "enum.HumanoidVisualLayers.LHand" ]
       - map: [ "enum.HumanoidVisualLayers.RHand" ]
       - map: [ "enum.HumanoidVisualLayers.LFoot" ]
       - map: [ "enum.HumanoidVisualLayers.RFoot" ]
+      - map: ["socks"]
+      - map: ["underpants"]
+      - map: ["undershirt"]
+      - map: [ "jumpsuit" ]
       - map: [ "enum.HumanoidVisualLayers.Handcuffs" ]
         color: "#ffffff"
         sprite: Objects/Misc/handcuffs.rsi

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -55,7 +55,7 @@
         Blunt: 4.5
   - type: Item
     size: Small
-    sprite: Objects/Weapons/Melee/e_sword.rsi
+    sprite: Objects/Weapons/Melee/e_sword-inhands.rsi
   - type: UseDelay
     delay: 1.0
   - type: PointLight

diff --git a/Resources/Prototypes/Stray/Entities/Mobs/Species/ipc.yml b/Resources/Prototypes/Stray/Entities/Mobs/Species/ipc.yml
@@ -58,6 +58,8 @@
     # endregion Organic
     # The important nessessities
     - type: MovementSpeedModifier
+      baseWalkSpeed : 0.5
+      baseSprintSpeed : 5.5
     - type: Body
       prototype: IPC
       requiredLegs: 2
@@ -87,14 +89,14 @@
         sprite: Mobs/Customization/masking_helpers.rsi
         state: unisex_full
         visible: false
-      - map: ["socks"]
-      - map: ["underpants"]
-      - map: ["undershirt"]
-      - map: ["jumpsuit"]
       - map: ["enum.HumanoidVisualLayers.LFoot"]
       - map: ["enum.HumanoidVisualLayers.RFoot"]
       - map: ["enum.HumanoidVisualLayers.LHand"]
       - map: ["enum.HumanoidVisualLayers.RHand"]
+      - map: ["socks"]
+      - map: ["underpants"]
+      - map: ["undershirt"]
+      - map: ["jumpsuit"]
       - map: [ "gloves" ]
       - map: [ "shoes" ]
       - map: [ "ears" ]
@@ -156,7 +158,7 @@
       specificHeat: 46
       coldDamage:
         types:
-          Heat: -2
+          Heat: -0.01
       heatDamage:
         types:
           Heat: 4
@@ -176,8 +178,8 @@
     - type: Barotrauma
       damage:
         types:
-          Heat: 0.3 # IPCs can't radiate well, they rely on air cooling
-          Blunt: 0.1
+          Heat: 0.15 # IPCs can't radiate well, they rely on air cooling
+          Blunt: 0.01
     - type: SlowOnDamage
       speedModifierThresholds:
         70: 0.6
@@ -215,11 +217,12 @@
       damageCap: 200
       damage:
         types:
-          Heat: -0.15
+          Heat: -0.2
     - type: ContainerContainer
       containers:
         cell_slot: !type:ContainerSlot { }
         part-container: !type:Container
+        key_slots: !type:Container
     - type: PowerCellSlot
       cellSlotId: cell_slot
       fitsInCharger: true
@@ -247,6 +250,26 @@
       wattage: 0.2
       blinkingBehaviourId: blinking
       radiatingBehaviourId: radiating
+    - type: Headset
+    - type: EncryptionKeyHolder
+      keySlots: 4
+      examineWhileLocked: true
+      keysExtractionMethod: Cutting
+    - type: IntrinsicRadioReceiver
+    - type: IntrinsicRadioTransmitter
+      channels:
+        - Binary
+        - Common
+        - Command
+        - Engineering
+        - Medical
+        - Science
+        - Security
+        - Service
+        - CentCom
+        - Syndicate
+        - Freelance
+    - type: LockedWiresPanel
 
 
 - type: entity

diff --git a/Resources/Prototypes/Stray/InventoryTemplates/ipc_inventory_template.yml b/Resources/Prototypes/Stray/InventoryTemplates/ipc_inventory_template.yml
@@ -34,13 +34,6 @@
       uiWindowPos: 0,2
       strippingWindowPos: 0,1
       displayName: Neck
-    - name: ears
-      slotTexture: ears
-      slotFlags: EARS
-      stripTime: 3
-      uiWindowPos: 2,2
-      strippingWindowPos: 2,0
-      displayName: Ears
     - name: head
       slotTexture: head
       slotFlags: HEAD

diff --git a/Resources/Prototypes/Stray/Species/ipc.yml b/Resources/Prototypes/Stray/Species/ipc.yml
@@ -1,7 +1,7 @@
 - type: species
   id: IPC
   name: species-name-ipc
-  roundStart: false
+  roundStart: true
   prototype: MobIPC
   sprites: MobIPCSprites
   defaultSkinTone: "#ffffff"