Skip to content
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Content.IntegrationTests/Tests/PostMapInitTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ public sealed class PostMapInitTest
"Shoukou",
"Banana",
"Crux",
"Freighter",
"EventGlacierVacation",
"EventCharonEpsilon",
"EventSyndcommEpilogue",
Expand Down
1 change: 1 addition & 0 deletions Content.IntegrationTests/Tests/Power/StationPowerTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public sealed class StationPowerTests
"Byoin",
"Train",
"Crux",
"Freighter",
// end starcup
];

Expand Down
2,632 changes: 2,632 additions & 0 deletions Resources/Maps/_starcup/Shuttles/cargo_freighter.yml

Large diffs are not rendered by default.

7,068 changes: 7,068 additions & 0 deletions Resources/Maps/_starcup/Shuttles/emergency_freighter.yml

Large diffs are not rendered by default.

84,234 changes: 84,234 additions & 0 deletions Resources/Maps/_starcup/freighter.yml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
- PosterContrabandExoAcid
- PosterContrabandExoRun
- PosterContrabandExoChomp
- PosterContrabandHawkmoonAd
- PosterLegitNanotrasenLogo
- PosterLegit50thAnniversaryVintageReprint
- PosterLegitNTTGC
Expand Down Expand Up @@ -130,4 +131,5 @@
- PosterContrabandWaffleCorp
- PosterContrabandGreyTide
- PosterContrabandSyndicateRecruitment
- PosterLegitHawkmoonAd
chance: 1
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,47 @@
sprite: _starcup/Structures/Wallmounts/posters.rsi
state: poster-electra-torn

- type: entity
parent: PosterBase
id: PosterLegitHawkmoonAd
name: "Hawkmoon Acquisitions"
description: "A poster advertising the logistics and supply services of Hawkmoon Acquisitions."
components:
- type: Sprite
sprite: _starcup/Structures/Wallmounts/posters.rsi
state: poster-hawkmoon-ad

- type: entity
parent: PosterBase
id: PosterLegitHawkmoonAdTattered
name: "Hawkmoon Acquisitions"
suffix: Tattered
description: "A poster advertising the logistics and supply services of Hawkmoon Acquisitions. It's torn and faded."
components:
- type: Sprite
sprite: _starcup/Structures/Wallmounts/posters.rsi
state: poster-hawkmoon-ad-torn

- type: entity
parent: PosterBase
id: PosterContrabandHawkmoonAd
name: "Annihilation"
description: "A poster depicting an enormous laser destroying a moon. Allegedly what Hawkmoon has done in pursuit of more FTL lanes, but it may just be an ad for a cool movie."
components:
- type: Sprite
sprite: _starcup/Structures/Wallmounts/posters.rsi
state: poster-hawkmoon-ad-evil

- type: entity
parent: PosterBase
id: PosterLegitTrimaranBlueprint
name: "Trimaran Freighter"
description: "A blueprint for Hawkmoon Acquisitions's \"Trimaran\" class of freighters, intended for long-term crew habitation."
components:
- type: Sprite
sprite: _starcup/Structures/Wallmounts/posters.rsi
state: poster-trimaran-blueprint

# rebrands
- type: entity
parent: PosterLegitHereForYourSafety
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/_starcup/Maps/Pools/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@
- Banana
- Shoukou
- Crux
- Freighter
75 changes: 75 additions & 0 deletions Resources/Prototypes/_starcup/Maps/freighter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
- type: gameMap
id: Freighter
mapName: 'Freighter'
mapPath: /Maps/_starcup/freighter.yml
minPlayers: 0
maxPlayers: 30
stations:
Freighter:
stationProto: StandardNanotrasenStation
components:
- type: StationEmergencyShuttle
emergencyShuttlePath: /Maps/_starcup/Shuttles/emergency_freighter.yml
- type: StationCargoShuttle
path: /Maps/_starcup/Shuttles/cargo_freighter.yml
- type: StationNameSetup
mapNameTemplate: '{0} Trimaran-Class Freighter {1}'
nameGenerator:
!type:SyndicateNameGenerator
prefixCreator: '-SC-HWKM'
- type: StationJobs
availableJobs: # roundstart is # of beds, latejoin is at most one more
# command
Captain: [ 1, 1 ]
HeadOfSecurity: [ 1, 1 ]
HeadOfPersonnel: [ 1, 1 ]
ChiefMedicalOfficer: [ 1, 1 ]
ChiefEngineer: [ 1, 1 ]
Quartermaster: [ 1, 1 ]
ResearchDirector: [ 1, 1 ]
AdministrativeAssistant: [ 1, 1 ]
StationAi: [ 1, 1 ]
# service
Reporter: [ 1, 1 ]
Janitor: [ 1, 2 ]
Bartender: [ 1, 2 ]
Botanist: [ 1, 2 ]
Chef: [ 1 , 2 ]
Musician: [ 1, 1 ]
Clown: [ 1, 1 ]
Mime: [ 1, 1 ]
Lawyer: [ 1, 1 ]
Librarian: [ 1, 1 ]
Chaplain: [ 1, 1 ]
ServiceWorker: [ 1, 2 ]
Boxer: [ 1, 1 ]
# engineering
AtmosphericTechnician: [ 1, 2 ]
StationEngineer: [ 2, 3 ]
TechnicalAssistant: [ 1, 2 ]
# medical
Chemist: [ 1, 1 ]
Psychologist: [ 1, 1 ]
Paramedic: [ 1, 1 ]
MedicalDoctor: [ 2, 3 ]
MedicalIntern: [ 1, 2 ]
# science
Roboticist: [ 1, 1 ]
Scientist: [ 2, 3 ]
ResearchAssistant: [ 1, 2 ]
# silicon
Borg: [ 2, 3 ]
# security
Warden: [ 1, 1 ]
Detective: [ 1, 1 ]
SecurityOfficer: [ 2, 3 ]
SecurityCadet: [ 1, 2 ]
Brigmedic: [ 1, 1 ]
Prisoner: [ 2, 2 ]
# supply
SalvageSpecialist: [ 1, 2 ]
CargoTechnician: [ 2, 3 ]
Courier: [ 1, 2 ]
CargoAssistant: [ 1, 2 ]
# civilian
Passenger: [ -1, -1 ]
46 changes: 46 additions & 0 deletions Resources/Prototypes/_starcup/Parallaxes/freighter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
- type: parallax
id: TrimaranFreighter
layers:
- texture:
!type:ImageParallaxTextureSource
path: "/Textures/_starcup/Parallaxes/FreighterBase.png"
scale: "1, 1"
- texture:
!type:ImageParallaxTextureSource
path: "/Textures/_starcup/Parallaxes/FreighterDust.png"
slowness: 0.994
scale: "1, 1"
scrolling: "0.000, -0.004"
- texture:
!type:ImageParallaxTextureSource
path: "/Textures/_starcup/Parallaxes/FreighterStars.png"
slowness: 0.993
scale: "1, 1"
scrolling: "0.000, -0.005"
#- texture:
# !type:ImageParallaxTextureSource
# path: "/Textures/_starcup/Parallaxes/FreighterNebulae.png"
# slowness: 0.990
# scale: "1, 1"
# scrolling: "0.000, -0.005"
- texture:
!type:ImageParallaxTextureSource
path: "/Textures/Parallaxes/debris_large.png"
slowness: 0.970
scale: "0.5, 0.5"
scrolling: "-0.005, -0.02"
worldHomePosition: "25, -100"
- texture:
!type:ImageParallaxTextureSource
path: "/Textures/Parallaxes/debris_small.png"
slowness: 0.950
scale: "0.4, 0.4"
scrolling: "0.005, -0.02"
worldHomePosition: "-25, -100"
layersLQ:
- texture:
!type:ImageParallaxTextureSource
path: "/Textures/_starcup/Parallaxes/FreighterLQ.png"
slowness: 0.995
scale: "1, 1"
layersLQUseHQ: false
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
preload: false
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
preload: false
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions Resources/Textures/_starcup/Parallaxes/FreighterLQ.png.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
preload: false
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
preload: false
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
preload: false
1 change: 1 addition & 0 deletions Resources/Textures/_starcup/Parallaxes/licences.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
All Freighter images generated by https://github.com/Deep-Fold/PixelSpace by Deep-Fold. Terms of use on linked Github.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "poster-ppe-blue1 and poster-ppe-pink1 by little_meow_meow (meson taken from https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da), electra and vacation posters by Psymbiote",
"copyright": "poster-ppe-blue1 and poster-ppe-pink1 by little_meow_meow (meson taken from https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da), electra and vacation posters by Psymbiote, hawkmoon and trimaran posters by foxcurl (Github)",
"size": {
"x": 32,
"y": 32
Expand All @@ -19,6 +19,18 @@
{
"name": "poster-electra-torn"
},
{
"name": "poster-hawkmoon-ad"
},
{
"name": "poster-hawkmoon-ad-evil"
},
{
"name": "poster-hawkmoon-ad-torn"
},
{
"name": "poster-trimaran-blueprint"
},
{
"name": "postervacation_legit"
}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading