latejoin и ipc (DeltaV-Station#32)

* latejoin Signed-off-by: GeneralGaws <[email protected]> * ipcfix1 Signed-off-by: GeneralGaws <[email protected]> * пропавшая текстура Signed-off-by: GeneralGaws <[email protected]> * Update ipc.yml Signed-off-by: GeneralGaws <[email protected]> * Update ipc.yml Signed-off-by: GeneralGaws <[email protected]> * Update ipc.yml Signed-off-by: GeneralGaws <[email protected]> * Create metabolizer.ftl Signed-off-by: GeneralGaws <[email protected]> * Update ipc.yml Signed-off-by: GeneralGaws <[email protected]> * Update ipc.yml Signed-off-by: GeneralGaws <[email protected]> * Update speech_emotes.yml Signed-off-by: GeneralGaws <[email protected]> * Update speech_emote_sounds.yml Signed-off-by: GeneralGaws <[email protected]> * Update speech_emotes.yml Signed-off-by: GeneralGaws <[email protected]> * Update ipc.yml Signed-off-by: GeneralGaws <[email protected]> * Update speech_emotes.yml Signed-off-by: GeneralGaws <[email protected]> * Update cargo_vending.yml Signed-off-by: GeneralGaws <[email protected]> * Update speech_emote_sounds.yml Signed-off-by: GeneralGaws <[email protected]> * Update speech_emotes.yml Signed-off-by: GeneralGaws <[email protected]> * Update ipc.yml Signed-off-by: GeneralGaws <[email protected]> --------- Signed-off-by: GeneralGaws <[email protected]>
TypoChel1 · May 20, 2024 · 157c09b · 157c09b
1 parent 18513e4
commit 157c09b
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 57 deletions.
diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs
@@ -243,6 +243,7 @@ private void SpawnPlayer(ICommonSession player,
                 _chatSystem.DispatchStationAnnouncement(station,
                     Loc.GetString("latejoin-arrival-announcement",
                         ("character", MetaData(mob).EntityName),
+                        ("gender", character.Gender), // Corvax
                         ("job", CultureInfo.CurrentCulture.TextInfo.ToTitleCase(jobName))),
                     Loc.GetString("latejoin-arrival-sender"),
                     playDefaultSound: false);

diff --git a/Resources/Locale/ru-RU/stray/metabolizer.ftl b/Resources/Locale/ru-RU/stray/metabolizer.ftl
@@ -0,0 +1 @@
+metabolizer-type-ipc = IPC
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
@@ -43,7 +43,7 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockAutoDrobeFilled
-  cost: 1700 # DeltaV
+  cost: 1900 # DeltaV
   category: cargoproduct-category-name-service
   group: market
 

diff --git a/Resources/Prototypes/Stray/Body/Organs/ipc.yml b/Resources/Prototypes/Stray/Body/Organs/ipc.yml
@@ -28,7 +28,7 @@
       state: brain
     - type: Organ
     - type: Metabolizer
-      updateFrequency: 1.5
+      updateInterval: 1.5
       maxReagents: 2
       metabolizerTypes: [IPC]
       removeEmpty: true
@@ -115,4 +115,4 @@
   components:
     - type: Sprite
       state: ears
-    - type: Organ
+    - type: Organ
diff --git a/Resources/Prototypes/Stray/Body/Parts/ipc.yml b/Resources/Prototypes/Stray/Body/Parts/ipc.yml
@@ -5,7 +5,7 @@
   abstract: true
   components:
     - type: Sprite
-      sprite: Mobs/Species/IPCs/parts.rsi
+      sprite: Stray/Mobs/Species/IPCs/parts.rsi
     - type: Damageable
       damageContainer: Biological
     - type: BodyPart
@@ -21,16 +21,16 @@
   components:
     - type: Sprite
       state: "head"
-      sprite: Mobs/Species/IPCs/parts.rsi
+      sprite: Stray/Mobs/Species/IPCs/parts.rsi
     - type: Icon
       state: "head"
-      sprite: Mobs/Species/IPCs/parts.rsi
+      sprite: Stray/Mobs/Species/IPCs/parts.rsi
     - type: BodyPart
       partType: Head
       vital: true
     - type: Input
       context: "ghost"
-      sprite: Mobs/Species/IPCs/parts.rsi
+      sprite: Stray/Mobs/Species/IPCs/parts.rsi
     - type: MovementSpeedModifier
       baseWalkSpeed: 0
       baseSprintSpeed: 0
@@ -47,10 +47,10 @@
   components:
     - type: Sprite
       state: "chest"
-      sprite: Mobs/Species/IPCs/parts.rsi
+      sprite: Stray/Mobs/Species/IPCs/parts.rsi
     - type: Icon
       state: "chest"
-      sprite: Mobs/Species/IPCs/parts.rsi
+      sprite: Stray/Mobs/Species/IPCs/parts.rsi
     - type: BodyPart
       partType: Torso
 
@@ -61,10 +61,10 @@
   components:
     - type: Sprite
       state: "l_arm"
-      sprite: Mobs/Species/IPCs/parts.rsi
+      sprite: Stray/Mobs/Species/IPCs/parts.rsi
     - type: Icon
       state: "l_arm"
-      sprite: Mobs/Species/IPCs/parts.rsi
+      sprite: Stray/Mobs/Species/IPCs/parts.rsi
     - type: BodyPart
       partType: Arm
       symmetry: Left
@@ -76,10 +76,10 @@
   components:
     - type: Sprite
       state: "r_arm"
-      sprite: Mobs/Species/IPCs/parts.rsi
+      sprite: Stray/Mobs/Species/IPCs/parts.rsi
     - type: Icon
       state: "r_arm"
-      sprite: Mobs/Species/IPCs/parts.rsi
+      sprite: Stray/Mobs/Species/IPCs/parts.rsi
     - type: BodyPart
       partType: Arm
       symmetry: Right
@@ -91,10 +91,10 @@
   components:
     - type: Sprite
       state: "l_hand"
-      sprite: Mobs/Species/IPCs/parts.rsi
+      sprite: Stray/Mobs/Species/IPCs/parts.rsi
     - type: Icon
       state: "l_hand"
-      sprite: Mobs/Species/IPCs/parts.rsi
+      sprite: Stray/Mobs/Species/IPCs/parts.rsi
     - type: BodyPart
       partType: Hand
       symmetry: Left
@@ -106,10 +106,10 @@
   components:
     - type: Sprite
       state: "r_hand"
-      sprite: Mobs/Species/IPCs/parts.rsi
+      sprite: Stray/Mobs/Species/IPCs/parts.rsi
     - type: Icon
       state: "r_hand"
-      sprite: Mobs/Species/IPCs/parts.rsi
+      sprite: Stray/Mobs/Species/IPCs/parts.rsi
     - type: BodyPart
       partType: Hand
       symmetry: Right
@@ -121,10 +121,10 @@
   components:
     - type: Sprite
       state: "l_leg"
-      sprite: Mobs/Species/IPCs/parts.rsi
+      sprite: Stray/Mobs/Species/IPCs/parts.rsi
     - type: Icon
       state: "l_leg"
-      sprite: Mobs/Species/IPCs/parts.rsi
+      sprite: Stray/Mobs/Species/IPCs/parts.rsi
     - type: BodyPart
       partType: Leg
       symmetry: Left
@@ -137,10 +137,10 @@
   components:
     - type: Sprite
       state: "r_leg"
-      sprite: Mobs/Species/IPCs/parts.rsi
+      sprite: Stray/Mobs/Species/IPCs/parts.rsi
     - type: Icon
       state: "r_leg"
-      sprite: Mobs/Species/IPCs/parts.rsi
+      sprite: Stray/Mobs/Species/IPCs/parts.rsi
     - type: BodyPart
       partType: Leg
       symmetry: Right
@@ -153,10 +153,10 @@
   components:
     - type: Sprite
       state: "l_foot"
-      sprite: Mobs/Species/IPCs/parts.rsi
+      sprite: Stray/Mobs/Species/IPCs/parts.rsi
     - type: Icon
       state: "l_foot"
-      sprite: Mobs/Species/IPCs/parts.rsi
+      sprite: Stray/Mobs/Species/IPCs/parts.rsi
     - type: BodyPart
       partType: Foot
       symmetry: Left
@@ -168,10 +168,10 @@
   components:
     - type: Sprite
       state: "r_foot"
-      sprite: Mobs/Species/IPCs/parts.rsi
+      sprite: Stray/Mobs/Species/IPCs/parts.rsi
     - type: Icon
       state: "r_foot"
-      sprite: Mobs/Species/IPCs/parts.rsi
+      sprite: Stray/Mobs/Species/IPCs/parts.rsi
     - type: BodyPart
       partType: Foot
       symmetry: Right
diff --git a/Resources/Prototypes/Stray/Entities/Mobs/Species/ipc.yml b/Resources/Prototypes/Stray/Entities/Mobs/Species/ipc.yml
@@ -66,8 +66,8 @@
     - type: Damageable
       damageContainer: IPC
       damageModifierSet: Metallic
-    - type: Icon
-      sprite: Stray/Mobs/Species/IPC/parts.rsi
+    - type: Sprite
+      sprite: Stray/Mobs/Species/IPCs/parts.rsi
       state: full
     # Damage and speed
     - type: Bloodstream
@@ -96,7 +96,7 @@
           Heat: -0.25
           Asphyxiation: -10
     - type: Repairable
-      fuelcost: 5 # cause most of the fuel is used how long its turned on for
+      fuelCost: 5 # cause most of the fuel is used how long its turned on for
       doAfterDelay: 7
       damage:
         types:

diff --git a/Resources/Prototypes/Stray/Species/ipc.yml b/Resources/Prototypes/Stray/Species/ipc.yml
@@ -10,7 +10,8 @@
   skinColoration: Hues
   maleFirstNames: names_ai
   femaleFirstNames: names_ai
-  lastNames: names_ai
+  maleLastNames: names_ai
+  femaleLastNames: names_ai
   sexes:
     - Unsexed
 

diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml
@@ -460,13 +460,7 @@
       path: /Audio/Effects/beep1.ogg
       params:
         variation: 0.125
-    Beep:
-      collection: IPCBeeps
-    Boop:
-      collection: IPCBoops
-    Whirr:
-      collection: IPCWhirrs
     Honk:
       collection: BikeHorn
       params:
-        variation: 0.125
+        variation: 0.125
diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml
@@ -711,24 +711,3 @@
     - пинг.
     - пинг!
     # Corvax-Localization-End
-
-- type: emote
-  id: Boop
-  category: Vocal
-  chatMessages: [boops]
-  chatTriggers:
-    - boop
-    - boops
-    - boops.
-    - boops!
-    - буп
-
-- type: emote
-  id: Whirr
-  category: Vocal
-  chatMessages: [whirrs]
-  chatTriggers:
-    - whirr
-    - whirrs
-    - whirrs.
-    - whirrs!
diff --git a/Resources/Textures/Stray/Mobs/Customization/IPC/ipc_screens.rsi/eyesangry.png b/Resources/Textures/Stray/Mobs/Customization/IPC/ipc_screens.rsi/eyesangry.png