Merge pull request #172 from frosty-dev/fixiki

Фиксики

Content.Shared/_Amour/RoleplayInfo/SharedRoleplaySystem.cs

@@ -1,7 +1,5 @@
 using System.Linq;
 using Content.Shared._Amour.HumanoidAppearanceExtension;
-using Content.Shared.Examine;
-using Content.Shared.Humanoid;
 
 namespace Content.Shared._Amour.RoleplayInfo;
 
@@ -15,10 +13,12 @@ public abstract class SharedRoleplaySystem : EntitySystem
     private void OnHumanoidLoading(EntityUid uid, RoleplayInfoComponent component, HumanoidAppearanceLoadingEvent args)
     {
         component.Data = new List<RoleplayInfo>(args.Profile.RoleplayInfoData.Select(p => p.Value));
-        if (component.Data.Count == 0)
+        if (component.Data.Count < 2)
         {
-            var erp = new RoleplayInfo(name: "erp", roleplaySelection: RoleplaySelection.No);
+            var erpField = component.Data.Find((x) => { return x.Name.ToLower() == "erp"; });
-            var noncon = new RoleplayInfo(name: "noncon", roleplaySelection: RoleplaySelection.No);
+            var erp = new RoleplayInfo(name: "erp", roleplaySelection: erpField != null ? erpField.RoleplaySelection : RoleplaySelection.No);
+            var nonconField = component.Data.Find((x) => { return x.Name.ToLower() == "noncon"; });
+            var noncon = new RoleplayInfo(name: "noncon", roleplaySelection: nonconField != null ? nonconField.RoleplaySelection : RoleplaySelection.No);
             component.Data = new List<RoleplayInfo> { erp, noncon };
         }
     }

Resources/Locale/ru-RU/guidebook/chemistry/effects.ftl

@@ -322,7 +322,7 @@ reagent-effect-guidebook-missing =
        *[other] cause
     } an unknown effect as nobody has written this effect yet
 
-#Amour
+# Amour
 reagent-effect-guidebook-sex-change =
     { $chance ->
     [1] Делает

Resources/Locale/ru-RU/medical/components/healing-component.ftl

@@ -1,5 +1,5 @@
 medical-item-finished-using = Вы закончили исцеление с помощью { $item }
 medical-item-cant-use = Нет никаких повреждений, которые вы могли бы залечить с помощью { $item }
 medical-item-stop-bleeding = Оно перестало кровоточить
-#Amour
+# Amour
 medical-item-popup-target = {CAPITALIZE(THE($user))} пытается исцелить тебя с помощью {$item}!

Resources/Locale/ru-RU/medical/components/health-analyzer-component.ftl

@@ -38,5 +38,5 @@ damage-type-cellular = Клеточные
 
 health-analyzer-window-malnutrition = Тяжёлое недоедание
 
-#Amour
+# Amour
 health-analyzer-popup-scan-target = {CAPITALIZE(THE($user))} пытается вас просканировать!

Resources/Locale/ru-RU/reagents/meta/fun.ftl

@@ -20,7 +20,7 @@ reagent-desc-weh = Чистая эссенция игрушки ящера. За
 reagent-name-razorium = разориум
 reagent-desc-razorium = Странное неньютоновское химическое вещество. Образуется при объединении двух лекарств от физических повреждений. При попадании в организм образует миллионы крошечных острых лезвий. Очень острых.
 
-#Amour
+# Amour
 reagent-name-estrogen-plus = Эстроген Плюс
 reagent-desc-estrogen-plus = Эстроген... плюс тестостерон... как это работает?..
 reagent-name-estrogen = Эстроген

Resources/Prototypes/GameRules/events.yml

@@ -75,7 +75,8 @@
   - type: StationEvent
     weight: 5
     duration: 1
-    minimumPlayers: 10
+    earliestStart: 30 # Honk edit
+    minimumPlayers: 30 # Honk from 10 to 30
   - type: RandomEntityStorageSpawnRule
     prototype: MobSkeletonCloset
 
@@ -87,9 +88,9 @@
   - type: StationEvent
     weight: 6.5
     duration: 1
-    earliestStart: 40
+    earliestStart: 60 # Honk from 40 to 60
     reoccurrenceDelay: 20
-    minimumPlayers: 20
+    minimumPlayers: 30 # Honk from 20 to 30
   - type: RandomSpawnRule
     prototype: SpawnPointGhostDragon
 
@@ -115,7 +116,7 @@
     weight: 7.5
     duration: 1
     earliestStart: 45
-    minimumPlayers: 20
+    minimumPlayers: 30 # Honk from 20 to 30
   - type: RandomSpawnRule
     prototype: MobRevenant
 
@@ -181,7 +182,7 @@
     - id: MobMouse2
       prob: 0.02
     - id: MobMouseCancer
-      prob: 0.001
+      prob: 0.01 # Honk from 0.001 to 0.01
     specialEntries:
     - id: SpawnPointGhostRatKing
       prob: 0.001
@@ -322,7 +323,7 @@
     weight: 4
     duration: 1
     earliestStart: 30
-    minimumPlayers: 20
+    minimumPlayers: 30 # Honk from 20 to 30
   - type: RandomSpawnRule
     prototype: SpawnPointGhostTerminator
 
@@ -352,7 +353,7 @@
     startAudio:
       path: /Audio/Announcements/attention.ogg
     startDelay: 10
-    earliestStart: 20
+    earliestStart: 30 # Honk from 20 to 30
     minimumPlayers: 15
     weight: 3
     duration: 60
@@ -375,7 +376,7 @@
     startAudio:
       path: /Audio/Announcements/attention.ogg
     startDelay: 10
-    earliestStart: 20
+    earliestStart: 30 # Honk from 20 to 30
     minimumPlayers: 15
     weight: 3
     duration: 60
@@ -413,8 +414,8 @@
     startAudio:
       path: /Audio/Announcements/attention.ogg
     startDelay: 10
-    earliestStart: 20
+    earliestStart: 30 # Honk from 20 to 30
-    minimumPlayers: 20
+    minimumPlayers: 30 # Honk from 20 to 30
     weight: 1.5
     duration: 60
   - type: VentCrittersRule
@@ -462,7 +463,7 @@
   noSpawn: true
   components:
   - type: StationEvent
-    earliestStart: 35
+    earliestStart: 45 # Honk from 35 to 45
     weight: 4.5
     minimumPlayers: 20
     duration: 1
@@ -498,8 +499,8 @@
   - type: StationEvent
     earliestStart: 30
     weight: 8
-    minimumPlayers: 15
+    minimumPlayers: 20 # Honk from 15 to 20
-    maxOccurrences: 1 # can only happen once per round
+    maxOccurrences: 2 # Honk from 1 to 2
     startAnnouncement: station-event-communication-interception
     startAudio:
       path: /Audio/Announcements/intercept.ogg
@@ -544,7 +545,7 @@
     weight: 3.5
     duration: 1
     earliestStart: 30
-    minimumPlayers: 20
+    minimumPlayers: 30 # Honk from 20 to 30
   - type: ImmovableRodRule
     rodPrototypes:
     - id: ImmovableRodKeepTilesStill
@@ -595,6 +596,7 @@
       weight: 5
     - type: MobReplacementRule
 
+# Honk
 - type: entity
   id: SpaceLawChange
   parent: BaseGameRule
@@ -602,6 +604,6 @@
   components:
   - type: StationEvent
     weight: 5
-    reoccurrenceDelay: 20
+    reoccurrenceDelay: 30
     duration: 1
   - type: SpaceLawChangeRule

Resources/Prototypes/_Honk/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml

@@ -12,7 +12,7 @@
   - type: Sprite
     sprite: _Honk/Objects/Weapons/Guns/Shotguns/pump.rsi
   - type: Clothing
-    sprite: _Honk/Objects/Weapons/Guns/Shotguns/pump.rsi
+    sprite: _Honk/Objects/Weapons/Guns/Shotguns/pump_onbody.rsi
   - type: BallisticAmmoProvider
     proto: ShellShotgunResinShot
     capacity: 6

Resources/Prototypes/_White/Ghosts/custom_ghosts.yml

@@ -499,7 +499,7 @@
   sprite: White/Ghosts/DEN4IK_64-ghost.rsi
   alpha: 0.9
   ghostName: Никелевый камушек
-  ghostDescription: Этот Ниггер имеет талант, знаешь что я тебе за это дам???
+  ghostDescription: Этот камушек имеет талант, знаешь что я тебе за это дам???
 
 #BIG_Zi_348
 - type: customGhost

Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json

@@ -3,7 +3,7 @@
     "license": "CC-BY-NC-4.0",
     "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, bolt-open modified from icon.png by Flareguy",
     "size": {
-        "x": 32,
+        "x": 48,
         "y": 32
     },
     "states": [
@@ -12,14 +12,6 @@
         },
         {
             "name": "bolt-open"
-        },
-        {
-            "name": "equipped-BACKPACK",
-            "directions": 4
-        },
-        {
-            "name": "equipped-SUITSTORAGE",
-            "directions": 4
         }
     ]
-}
+}

Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/meta.json

@@ -3,8 +3,8 @@
     "license": "CC-BY-NC-4.0",
     "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, wield sprites by RiceMar1244",
     "size": {
-        "x": 64,
+        "x": 32,
-        "y": 64
+        "y": 32
     },
     "states": [
         {
@@ -14,14 +14,6 @@
         {
             "name": "inhand-right",
             "directions": 4
-        },
-        {
-            "name": "wielded-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "wielded-inhand-right",
-            "directions": 4
         }
     ]
-}
+}

Resources/Textures/_Honk/Objects/Weapons/Guns/Shotguns/pump_onbody.rsi/meta.json

@@ -0,0 +1,19 @@
+{
+    "version": 1,
+    "license": "CC-BY-NC-4.0",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, bolt-open modified from icon.png by Flareguy",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
+}