space-syndicate/space-station-14
1
0
Fork 1
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-02-14 23:14:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

upstreamfix

Browse Source 
1
This commit is contained in:
Dmitry
2026-01-16 20:02:13 +07:00
parent f501ebec66
commit 09db1f5b77
9 changed files with 34 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Server/GameTicking/GameTicker.Player.cs
View File

@@ -136,10 +136,13 @@ namespace Content.Server.GameTicking
_pvsOverride.RemoveSessionOverride(mindId.Value, session);
}
if (_playerGameStatuses.ContainsKey(args.Session.UserId)) // Corvax-Queue: Delete data only if player was in game
// Corvax-Queue-start: Delete data only if player was in game
if (_playerGameStatuses.ContainsKey(args.Session.UserId))
{
_userDb.ClientDisconnected(session);
_adminLogger.Add(LogType.Connection, LogImpact.Low, $"User {args.Session:Player} attached to {(args.Session.AttachedEntity != null ? ToPrettyString(args.Session.AttachedEntity) : "nothing"):entity} disconnected from the game.");
_adminLogger.Add(LogType.Connection, LogImpact.Low, $"User {args.Session:Player} attached to {(args.Session.AttachedEntity != null ? ToPrettyString(args.Session.AttachedEntity) : "nothing"):entity} disconnected from the game.");
}
// Corvax-Queue-end
break;
}
}

2
Resources/Prototypes/Accents/word_replacements.yml
View File

@@ -571,6 +571,8 @@
# chatsan-word-65: chatsan-replacement-65
# chatsan-word-66: chatsan-replacement-66
# chatsan-word-67: chatsan-replacement-67
# chatsan-word-68: chatsan-replacement-68
# chatsan-word-69: chatsan-replacement-69
corvax-chatsan-word-1: corvax-chatsan-replacement-1
corvax-chatsan-word-2: corvax-chatsan-replacement-2
corvax-chatsan-word-3: corvax-chatsan-replacement-3

2
Resources/Prototypes/Corvax/Body/Organs/ipc.yml
View File

@@ -1,6 +1,6 @@
- type: entity
id: OrganIPCBrain
parent: BaseHumanOrganUnGibbable
parent: BaseHumanOrgan
name: brain IPC
description: "The source of incredible, unending intelligence. Honk."
components:

4
Resources/Prototypes/Corvax/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
View File

@@ -1,5 +1,5 @@
- type: entity
parent: DrinkBottleGlassBaseFull
parent: [DrinkVisualsAllFilled, DrinkBottleGlassSmallBaseFull]
id: DrinkCampariBottleFull
name: campari bottle
description: Tincture based on aromatic herbs and citrus fruits. Non-GMO!
@@ -16,4 +16,4 @@
maxFillLevels: 10
fillBaseName: fill-
inHandsMaxFillLevels: 0
- type: Sealable
- type: Appearance

6
Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
View File

@@ -265,9 +265,9 @@
head-vox:
- state: equipped-head-light-vox
shader: unshaded
head-reptilian:
- state: equipped-head-light-reptilian
shader: unshaded
#head-reptilian: # Corvax resprite
#- state: equipped-head-light-reptilian
# shader: unshaded
head-dog:
- state: equipped-head-light-dog
shader: unshaded

4
Resources/Prototypes/Entities/Objects/Fun/toys.yml
View File

@@ -186,6 +186,8 @@
damage:
types:
Blunt: 2
- type: TTS # Corvax-TTS
voice: Meepo
- type: entity
parent: MrChips
@@ -194,6 +196,8 @@
components:
- type: Sprite
sprite: Objects/Fun/mrdips.rsi
- type: TTS # Corvax-TTS
voice: Zibb
- type: entity
parent: BaseItem

5
Resources/Prototypes/Tiles/floors.yml
View File

@@ -1663,14 +1663,15 @@
id: FloorMowedAstroGrass
parent: [ BaseStationTile, FloorGrass ]
name: tiles-mowed-astro-grass
parent: FloorGrass
sprite: /Textures/Corvax/Tiles/mowed_grass.png #Corvax
#Corvax
sprite: /Textures/Corvax/Tiles/mowed_grass.png
variants: 4
placementVariants:
- 1.0
- 1.0
- 1.0
- 1.0
#Corvax
isSubfloor: false
deconstructTools: [ Cutting ]
itemDrop: FloorTileItemMowedAstroGrass

16
Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
View File

@@ -107,6 +107,9 @@
{
"name": "Librarian"
},
{
"name": "MedicalDoctor"
},
{
"name": "MedicalIntern"
},
@@ -126,14 +129,11 @@
"name": "Musician"
},
{
"name": "Pilot"
"name": "Nanotrasen"
},
{
"name": "Ninja"
},
{
"name": "MedicalDoctor"
},
{
"name": "NoId"
},
@@ -177,7 +177,7 @@
"name": "Scientist"
},
{
"name": "IAA"
"name": "SecurityCadet"
},
{
"name": "SecurityOfficer"
@@ -240,13 +240,13 @@
"name": "Zookeeper"
},
{
"name": "Zookeeper"
"name": "Zombie"
},
{
"name": "Nanotrasen"
"name": "IAA"
},
{
"name": "SecurityCadet"
"name": "Pilot"
}
]
}

58
Resources/Textures/Structures/Wallmounts/intercom.rsi/meta.json
View File

@@ -1,6 +1,4 @@
{
"license": "CC-BY-SA-3.0",
"copyright": "Assets taken from baystation 12 at https://github.com/Baystation12/Baystation12/commit/026fb168bc9551f16c65385e941a1d449f13c97f | build and panel modified by K-Dynamic (github)",
"version": 1,
"size": {
"x": 32,
@@ -21,63 +19,17 @@
"name": "build",
"directions": 4
},
{
"name": "panel",
"directions": 4
},
{
"name": "speaker",
"directions": 4
},
{
"name": "unshaded",
"directions": 4,
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
2.0
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
2.0
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
2.0
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
2.0
]
]
"directions": 4
},
{
"name": "panel",
"directions": 4
}
]
}