juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge hotfix into master (#37001)

Browse Source
This commit is contained in:
ScarKy0
2025-04-28 11:47:56 +02:00
committed by GitHub
parent 973ad71f5c 4509821f0e
commit 14ddd8b4cd
17 changed files with 88 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Server/Objectives/Systems/KillPersonConditionSystem.cs
View File

@@ -39,8 +39,7 @@ public sealed class KillPersonConditionSystem : EntitySystem
return 1f;
var targetDead = _mind.IsCharacterDeadIc(mind);
var targetMarooned = !_emergencyShuttle.IsTargetEscaping(target) &&
_emergencyShuttle.ShuttlesLeft;
var targetOnShuttle = _emergencyShuttle.IsTargetEscaping(mind.OwnedEntity.Value);
if (!_config.GetCVar(CCVars.EmergencyShuttleEnabled) && requireMaroon)
{
requireDead = true;
@@ -50,8 +49,17 @@ public sealed class KillPersonConditionSystem : EntitySystem
if (requireDead && !targetDead)
return 0f;
if (requireMaroon) // if evac is still here and target hasn't boarded, show 50% to give you an indicator that you are doing good
return targetMarooned ? 1f : _emergencyShuttle.EmergencyShuttleArrived ? 0.5f : 0f;
// Always failed if the target needs to be marooned and the shuttle hasn't even arrived yet
if (requireMaroon && !_emergencyShuttle.EmergencyShuttleArrived)
return 0f;
// If the shuttle hasn't left, give 50% progress if the target isn't on the shuttle as a "almost there!"
if (requireMaroon && !_emergencyShuttle.ShuttlesLeft)
return targetOnShuttle ? 0f : 0.5f;
// If the shuttle has already left, and the target isn't on it, 100%
if (requireMaroon && _emergencyShuttle.ShuttlesLeft)
return targetOnShuttle ? 0f : 1f;
return 1f; // Good job you did it woohoo
}

13
Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
View File

@@ -648,18 +648,11 @@ public sealed partial class EmergencyShuttleSystem : EntitySystem
if (!EmergencyShuttleArrived)
return false;
// check each emergency shuttle
// check if target is on an emergency shuttle
var xform = Transform(target);
foreach (var stationData in EntityQuery<StationEmergencyShuttleComponent>())
{
if (stationData.EmergencyShuttle == null)
continue;
if (IsOnGrid(xform, stationData.EmergencyShuttle.Value))
{
return true;
}
}
if (HasComp<EmergencyShuttleComponent>(xform.GridUid))
return true;
return false;
}

2
Resources/Locale/en-US/objectives/conditions/kill-person.ftl
View File

@@ -1,3 +1,3 @@
objective-condition-kill-person-title = Kill or maroon {$targetName}, {CAPITALIZE($job)}
objective-condition-kill-maroon-title = Kill and maroon {$targetName}, {CAPITALIZE($job)}
objective-condition-maroon-person-title = Maroon {$targetName}, {CAPITALIZE($job)}
objective-condition-maroon-person-title = Prevent {$targetName}, {CAPITALIZE($job)} from reaching CentComm.

6
Resources/Prototypes/Objectives/traitor.yml
View File

@@ -83,7 +83,7 @@
- type: entity
parent: [BaseTraitorObjective, BaseKillObjective]
id: KillRandomPersonObjective
description: Do it however you like, just make sure they don't make it to centcomm.
description: Do it however you like, just make sure they don't get off the station.
components:
- type: Objective
difficulty: 1.75
@@ -91,11 +91,13 @@
- type: TargetObjective
title: objective-condition-maroon-person-title
- type: PickRandomPerson
- type: KillPersonCondition
requireMaroon: true
- type: entity
parent: [BaseTraitorObjective, BaseKillObjective]
id: KillRandomHeadObjective
description: We need this head gone and you probably know why. Make sure they don't make it to centcomm, even if they're dead. Good luck, agent.
description: We need this head gone and you probably know why. Make sure they don't make it to CentComm, even if they're dead. Good luck, agent.
components:
- type: Objective
# technically its still possible for KillRandomPersonObjective to roll a head but this is guaranteed, so higher difficulty

163
Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/meta.json
View File

@@ -1,133 +1,34 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/32742/commits/44820f5b6e2c864a35bfad448e0a9437f01ad2e2",
"states": [
{
"name": "scrub_off",
"directions": 4
},
{
"name": "scrub_welded",
"directions": 4
},
{
"name": "scrub_on",
"directions": 4,
"delays": [
[
0.10,
0.10,
0.10,
0.10,
0.10,
0.10
],
[
0.10,
0.10,
0.10,
0.10,
0.10,
0.10
],
[
0.10,
0.10,
0.10,
0.10,
0.10,
0.10
],
[
0.10,
0.10,
0.10,
0.10,
0.10,
0.10
]
]
},
{
"name": "scrub_purge",
"directions": 4,
"delays": [
[
0.06,
0.06,
0.06,
0.06,
0.06,
0.06
],
[
0.06,
0.06,
0.06,
0.06,
0.06,
0.06
],
[
0.06,
0.06,
0.06,
0.06,
0.06,
0.06
],
[
0.06,
0.06,
0.06,
0.06,
0.06,
0.06
]
]
},
{
"name": "scrub_wide",
"directions": 4,
"delays": [
[
0.10,
0.10,
0.10,
0.10,
0.10,
0.10
],
[
0.10,
0.10,
0.10,
0.10,
0.10,
0.10
],
[
0.10,
0.10,
0.10,
0.10,
0.10,
0.10
],
[
0.10,
0.10,
0.10,
0.10,
0.10,
0.10
]
]
}
]
"version":1,
"size":{
"x":32,
"y":32
},
"license":"CC-BY-SA-3.0",
"copyright":"Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da",
"states":[
{
"name":"scrub_off",
"directions": 4
},
{
"name":"scrub_welded",
"directions": 4
},
{
"name":"scrub_on",
"directions": 4,
"delays": [[0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08], [0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08], [0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08], [0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08]]
},
{
"name": "scrub_purge",
"directions": 4,
"delays": [[0.2, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04], [0.2, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04], [0.2, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04], [0.2, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04]]
},
{
"name": "scrub_wide",
"directions": 4,
"delays": [[0.2, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04], [0.2, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04], [0.2, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04], [0.2, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04]]
}
]
}

BIN
Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_off.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1002 B

BIN
Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_on.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 20 KiB

BIN
Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_purge.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

BIN
Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_wide.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 11 KiB

136
Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/meta.json
View File

@@ -1,103 +1,37 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/32742/commits/44820f5b6e2c864a35bfad448e0a9437f01ad2e2",
"states": [
{
"name": "vent_passive",
"directions": 4
},
{
"name": "vent_off",
"directions": 4
},
{
"name": "vent_welded",
"directions": 4
},
{
"name": "vent_out",
"directions": 4,
"delays": [
[
0.05,
0.05,
0.05,
0.05,
0.05,
0.05
],
[
0.05,
0.05,
0.05,
0.05,
0.05,
0.05
],
[
0.05,
0.05,
0.05,
0.05,
0.05,
0.05
],
[
0.05,
0.05,
0.05,
0.05,
0.05,
0.05
]
]
},
{
"name": "vent_in",
"directions": 4,
"delays": [
[
0.05,
0.05,
0.05,
0.05,
0.05,
0.05
],
[
0.05,
0.05,
0.05,
0.05,
0.05,
0.05
],
[
0.05,
0.05,
0.05,
0.05,
0.05,
0.05
],
[
0.05,
0.05,
0.05,
0.05,
0.05,
0.05
]
]
},
{
"name": "vent_lockout",
"directions": 4
}
]
"version":1,
"size":{
"x":32,
"y":32
},
"license":"CC-BY-SA-3.0",
"copyright":"Taken from https://github.com/BeeStation/BeeStation-Hornet at commit 4ccd79de285e79e504308bcd6fa5908d6b7685f7",
"states":[
{
"name":"vent_passive",
"directions" : 4
},
{
"name":"vent_off",
"directions" : 4
},
{
"name":"vent_welded",
"directions" : 4
},
{
"name":"vent_out",
"directions" : 4,
"delays":[ [ 0.08, 0.08, 0.08, 0.08 ], [ 0.08, 0.08, 0.08, 0.08 ], [ 0.08, 0.08, 0.08, 0.08 ], [ 0.08, 0.08, 0.08, 0.08 ] ]
},
{
"name":"vent_in",
"directions" : 4,
"delays":[ [ 0.08, 0.08, 0.08, 0.08 ], [ 0.08, 0.08, 0.08, 0.08 ], [ 0.08, 0.08, 0.08, 0.08 ], [ 0.08, 0.08, 0.08, 0.08 ] ]
},
{
"name":"vent_lockout",
"directions" : 4
}
]
}

BIN
Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_in.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_lockout.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_off.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_out.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_passive.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 853 B

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_welded.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

2
RobustToolbox

Submodule RobustToolbox updated: 191d7ab81c...03f8d4d3e0