Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Исправление ошибок #11

Merged
merged 4 commits into from
Aug 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions Content.Server/GameTicking/GameTicker.Spawning.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ent-CrateFunBBGun = Ящик с страйкбольный пистолет
ent-CrateFunBBGun = Ящик со страйкбольным пистолетом
.desc = Содержит 1 страйкбольный пистолет и 2 коробки с шариками.
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
ent-CrateFunBBGun = { ent-CrateGenericSteel }
.desc = { ent-CrateGenericSteel.desc }
ent-CrateCapGunSet = Коробка пистоля с патронами
ent-CrateCapGunSet = Коробка пистоля с патронами
.desc = Коробка, наполненная забавным, оружием, которые наверняка развлекут охрану, а воздух будет пахнуть серой.
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
Original file line number Diff line number Diff line change
@@ -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 }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1136,4 +1136,3 @@
- state: senior
- type: PresetIdCard
job: SeniorOfficer

16 changes: 8 additions & 8 deletions Resources/Prototypes/Entities/Objects/Misc/paper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -378,7 +378,7 @@
useSound:
collection: Screwdriver
- type: Item
sprite: Objects/Misc/bureaucracy.rsi
sprite: Objects/Misc/pens.rsi
heldPrefix: overpriced_pen
size: Tiny

Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading
Loading