конец ошибкам

Lost-Paradise-Project · Aug 17, 2024 · a715f14 · a715f14
1 parent d0fe49a
commit a715f14
Show file tree

Hide file tree

Showing 398 changed files with 6,311 additions and 1,472 deletions.
diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs
@@ -225,6 +225,7 @@ private void SpawnPlayer(ICommonSession player, HumanoidCharacterProfile charact
                     Loc.GetString(
                         "latejoin-arrival-announcement",
                     ("character", MetaData(mob).EntityName),
+                    ("gender", character.Gender), // Corvax-LastnameGender
                     ("job", CultureInfo.CurrentCulture.TextInfo.ToTitleCase(jobName))
                     ), Loc.GetString("latejoin-arrival-sender"),
                     playDefaultSound: false);

diff --git a/Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-fun.ftl b/Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-fun.ftl
diff --git a/Resources/Locale/ru-RU/deltav/prototypes/catalog/cargo/cargo-fun.ftl b/Resources/Locale/ru-RU/deltav/prototypes/catalog/cargo/cargo-fun.ftl
diff --git a/Resources/Locale/ru-RU/deltav/prototypes/catalog/fills/crates/fun-crates.ftl b/Resources/Locale/ru-RU/deltav/prototypes/catalog/fills/crates/fun-crates.ftl
@@ -1,2 +1,2 @@
-ent-CrateFunBBGun = Ящик с страйкбольный пистолет
+ent-CrateFunBBGun = Ящик со страйкбольным пистолетом
     .desc = Содержит 1 страйкбольный пистолет и 2 коробки с шариками.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/catalog/fills/crates/fun.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/catalog/fills/crates/fun.ftl
@@ -1,4 +1,2 @@
-ent-CrateFunBBGun = { ent-CrateGenericSteel }
-    .desc = { ent-CrateGenericSteel.desc }
-ent-CrateCapGunSet = Коробка пистоля с патронами
+ent-CrateCapGunSet = Коробка пистоля с патронами
     .desc = Коробка, наполненная забавным, оружием, которые наверняка развлекут охрану, а воздух будет пахнуть серой.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/markers/warp_point.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/markers/warp_point.ftl
@@ -88,6 +88,7 @@ ent-WarpPointCryo = { ent-WarpPoint }
     .desc = { ent-WarpPoint.desc }
 ent-WarpPointChapel = { ent-WarpPoint }
     .suffix = Церковь
+    .desc = { ent-WarpPoint.desc }
 ent-WarpPointLibrary = { ent-WarpPoint }
     .suffix = Библиотека
     .desc = { ent-WarpPoint.desc }

diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/objectives/paradox_anomaly.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/objectives/paradox_anomaly.ftl
@@ -1,5 +1,5 @@
-ent-BaseParadoxAnomalyObjective = { ent-BaseTerminatorObjective }
-    .desc = { ent-BaseTerminatorObjective.desc }
+ent-BaseParadoxAnomalyObjective = { ent-BaseObjective }
+    .desc = { ent-BaseObjective.desc }
 ent-ParadoxAnomalyKillObjective = { ent-BaseParadoxAnomalyObjective }
     .desc = This universe doesn't have room for both of us.
 ent-ParadoxAnomalyFriendObjective = { ent-BaseParadoxAnomalyObjective }

diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -1136,4 +1136,3 @@
     - state: senior
   - type: PresetIdCard
     job: SeniorOfficer
-
diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -313,10 +313,10 @@
     - Write
     - Pen
   - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
+    sprite: Objects/Misc/pens.rsi
     state: pen
   - type: Item
-    sprite: Objects/Misc/bureaucracy.rsi
+    sprite: Objects/Misc/pens.rsi
     heldPrefix: pen
     size: Tiny
   - type: PhysicalComposition
@@ -363,7 +363,7 @@
     - WriteIgnoreStamps
     - Pickaxe
   - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
+    sprite: Objects/Misc/pens.rsi
     state: overpriced_pen
   - type: MeleeWeapon
     wideAnimationRotation: -45
@@ -378,7 +378,7 @@
     useSound:
       collection: Screwdriver
   - type: Item
-    sprite: Objects/Misc/bureaucracy.rsi
+    sprite: Objects/Misc/pens.rsi
     heldPrefix: overpriced_pen
     size: Tiny
 
@@ -389,7 +389,7 @@
   description: 'A luxurious fountain pen for the captain of the station.'
   components:
   - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
+    sprite: Objects/Misc/pens.rsi
     state: pen_cap
 
 - type: entity
@@ -399,10 +399,10 @@
   description: In an attempt to keep up with the "power" of the cybersun bureaucracy, NT made a replica of cyber pen, in their corporate style.
   components:
   - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
+    sprite: Objects/Misc/pens.rsi
     state: pen_centcom
   - type: Item
-    sprite: Objects/Misc/bureaucracy.rsi
+    sprite: Objects/Misc/pens.rsi
     heldPrefix: pen_centcom
 
 - type: entity
@@ -412,7 +412,7 @@
   description: 'A luxurious fountain pen for the hop of the station.'
   components:
   - type: Sprite
-    sprite: Objects/Misc/bureaucracy.rsi
+    sprite: Objects/Misc/pens.rsi
     state: pen_hop
 
 - type: entity

diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Eyes/Glasses/LPPCASglasses.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Eyes/Glasses/LPPCASglasses.yml
@@ -5,8 +5,8 @@
   description: Чёрно-белые очки.
   components:
   - type: Sprite
-    sprite: _LostParadise/Clothing/Eyes/Glasses/_LostParadiseCASglasses.rsi
+    sprite: _LostParadise/Clothing/Eyes/Glasses/LPPCASglasses.rsi
   - type: Clothing
-    sprite: _LostParadise/Clothing/Eyes/Glasses/_LostParadiseCASglasses.rsi
+    sprite: _LostParadise/Clothing/Eyes/Glasses/LPPCASglasses.rsi
   - type: FlashImmunity
-  - type: EyeProtection
+  - type: EyeProtection
diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Hand/LPPCASTacticalGloves.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Hand/LPPCASTacticalGloves.yml
@@ -5,6 +5,6 @@
   description: Черно-белые тактические перчатки(не изолированы).
   components:
   - type: Sprite
-    sprite: _LostParadise/Clothing/Hands/Gloves/_LostParadise/CASTacticalGloves.rsi
+    sprite: _LostParadise/Clothing/Hands/Gloves/LPPCASTacticalGloves.rsi
   - type: Clothing
-    sprite: _LostParadise/Clothing/Hands/Gloves/_LostParadise/CASTacticalGloves.rsi
+    sprite: _LostParadise/Clothing/Hands/Gloves/LPPCASTacticalGloves.rsi
diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/LPPADJUCap.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/LPPADJUCap.yml
@@ -5,6 +5,6 @@
   description: данную фуражку носят вполне уставшие от рутин работ с бюрократией
   components:
   - type: Sprite
-    sprite: _LostParadise/Clothing/Head/Hats/_LostParadiseADJUCap.rsi
+    sprite: _LostParadise/Clothing/Head/Hats/LPPADJUCap.rsi
   - type: Clothing
-    sprite: _LostParadise/Clothing/Head/Hats/_LostParadiseADJUCap.rsi
+    sprite: _LostParadise/Clothing/Head/Hats/LPPADJUCap.rsi
diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/LPPCASHelmet.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/LPPCASHelmet.yml
@@ -5,13 +5,13 @@
   description: Черно-белый шлем, защищяет точно так же как и обычный просто цвета другие.
   components:
   - type: Sprite
-    sprite: _LostParadise/Clothing/Head/Helmets/_LostParadiseCASHelmet.rsi
+    sprite: _LostParadise/Clothing/Head/Helmets/LPPCASHelmet.rsi
   - type: Clothing
-    sprite: _LostParadise/Clothing/Head/Helmets/_LostParadiseCASHelmet.rsi
+    sprite: _LostParadise/Clothing/Head/Helmets/LPPCASHelmet.rsi
   - type: Armor #Values seem to let the user survive one extra hit if attacked consistently.
     modifiers:
       coefficients:
         Blunt: 0.9
         Slash: 0.9
         Piercing: 0.9
-        Heat: 0.9
+        Heat: 0.9
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1136,4 +1136,3 @@
		- state: senior
		- type: PresetIdCard
		job: SeniorOfficer