Skip to content
Closed
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Content.IntegrationTests/Tests/CargoTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public sealed class CargoTest
private static readonly HashSet<ProtoId<CargoProductPrototype>> Ignored =
[
// This is ignored because it is explicitly intended to be able to sell for more than it costs.
new("FunCrateGambling")
new("PlushiePearcatCrate")
];

[Test]
Expand Down
55 changes: 0 additions & 55 deletions Content.Server/StationEvents/Components/CargoGiftsRuleComponent.cs

This file was deleted.

100 changes: 0 additions & 100 deletions Content.Server/StationEvents/Events/CargoGiftsRule.cs

This file was deleted.

6 changes: 3 additions & 3 deletions Resources/Maps/_Goobstation/Nonstations/ghostbar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6460,21 +6460,21 @@ entities:
- type: Transform
pos: 14.5,22.5
parent: 4
- proto: CrateFunInstrumentsKeyedPercussion
- proto: CratePlushiePearcat
entities:
- uid: 1203
components:
- type: Transform
pos: 18.5,6.5
parent: 4
- proto: CrateFunInstrumentsSpecial
- proto: CratePlushiePearcat
entities:
- uid: 945
components:
- type: Transform
pos: 19.5,6.5
parent: 4
- proto: CrateFunInstrumentsVariety
- proto: CratePlushiePearcat
entities:
- uid: 1082
components:
Expand Down
4 changes: 2 additions & 2 deletions Resources/Migrations/eeMigration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ LockableButtonBrig: LockableButtonSecurity
SignDirectionalICU: SignDirectionalIcu

# 2024-06-08
CrateFunPlushie: CrateFunToyBox
CrateFunLizardPlushieBulk: CrateFunToyBox
CrateFunPlushie: null
CrateFunLizardPlushieBulk: null

# 2024-08-22 - Frontier Mail - Add more to these when they come up as mapped. Part of the Frontier Mail port, blame Tortuga.
MailNFPAI: null
Expand Down
2 changes: 1 addition & 1 deletion Resources/Migrations/migration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ TorsoBorgJanitor: TorsoBorg
PresentRandomAsh: PresentRandomCoal

# 2024-11-19
CrateCrewMonitoringBoards: CrateCrewMonitoring
CrateCrewMonitoringBoards: null

# 2024-12-01
DungeonMasterCircuitBoard: GameMasterCircuitBoard
Expand Down
11 changes: 11 additions & 0 deletions Resources/Migrations/tempCrescentMigration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,14 @@ Shovel: CrescentShovel
Pickaxe: CrescentPickaxe
trayScanner: CrescenttrayScanner
JawsOfLife: CrescentJawsOfLife

CrateEngineeringToolbox: null
CrateHydroponicsSeeds: null
CrateHydroponicsTools: null
CrateFoodBarSupply: null
CrateFunInstrumentsKeyedPercussion: null
CrateFunInstrumentsSpecial: null
CrateFunInstrumentsVariety: null
CrateFunToyBox: null
CrateHydroponicsSeedsExotic: null
CrateServiceJanitorialSupplies: null
117 changes: 0 additions & 117 deletions Resources/Prototypes/Body/Parts/gingerbread.yml

This file was deleted.

50 changes: 0 additions & 50 deletions Resources/Prototypes/Body/Prototypes/gingerbread.yml

This file was deleted.

Loading
Loading