Skip to content

Commit

Permalink
camper price fix, DeadDrop compromise
Browse files Browse the repository at this point in the history
  • Loading branch information
whatston3 committed Oct 15, 2024
1 parent 0e2968a commit 5de8231
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 5 deletions.
17 changes: 13 additions & 4 deletions Content.Server/_NF/Smuggling/DeadDropSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -195,12 +195,21 @@ private void OnStationShutdown(EntityUid stationUid, StationDeadDropComponent co

public void CompromiseDeadDrop(EntityUid uid, DeadDropComponent _)
{
//Get our station: FIXME - check lifecycle on entities before adding another drop.
// Remove the dead drop.
RemComp<DeadDropComponent>(uid);

// Get our station: FIXME - check lifecycle on entities before adding another drop.
var station = _station.GetOwningStation(uid);

//Remove the dead drop.
RemComp<DeadDropComponent>(uid);
//Find a new potential dead drop to spawn.
// If station is terminating, or if we aren't on one, nothing to do here.
if (station == null ||
!station.Value.Valid ||
MetaData(station.Value).EntityLifeStage >= EntityLifeStage.Terminating)
{
return;
}

// Find a new potential dead drop to spawn.
var deadDropQuery = EntityManager.EntityQueryEnumerator<PotentialDeadDropComponent>();
List<(EntityUid ent, PotentialDeadDropComponent comp)> potentialDeadDrops = new();
while (deadDropQuery.MoveNext(out var ent, out var potentialDeadDrop))
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_NF/Shipyard/camper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
id: Camper
name: SSS Camper
description: A personal camper shuttle for those who prefer to live in emptiness of space.
price: 12000
price: 17000 # Appraises at 15770, 10% markup to get tests passing - TODO: fix this
category: Small
group: Shipyard
shuttlePath: /Maps/_NF/Shuttles/camper.yml
Expand Down

0 comments on commit 5de8231

Please sign in to comment.