Skip to content

Commit

Permalink
Small mapping fix #3cl1ps3 (#1226)
Browse files Browse the repository at this point in the history
* EclipseStatonAdded

* Eclipse, Parallax and PuddleFix

* PostMapInitTest add new map

* Latejoin spawn added

* Add more SpawnPoint on map and Fix assist SpawnPoint icons

* Eclipse in pool Add
  • Loading branch information
UrPrice authored Jun 28, 2024
1 parent c1dc619 commit e67d2f7
Show file tree
Hide file tree
Showing 17 changed files with 293,454 additions and 1 deletion.
1 change: 1 addition & 0 deletions Content.IntegrationTests/Tests/PostMapInitTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ public sealed class PostMapInitTest
"Frankenstein",
"Nox",
"Axioma",
"Eclipse",
"SS220_syndicate",
"SS220_CentComm",

Expand Down
9,306 changes: 9,306 additions & 0 deletions Resources/Maps/SS220/Shuttles/emergency/emergency_eclipse.yml

Large diffs are not rendered by default.

283,866 changes: 283,866 additions & 0 deletions Resources/Maps/SS220/eclipse.yml

Large diffs are not rendered by default.

24 changes: 24 additions & 0 deletions Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,12 @@
components:
- type: SpawnPoint
job_id: TechnicalAssistant
# ss220 spawner icon fix begin
- type: Sprite
layers:
- state: green
- state: technicalassistant
# ss220 spawner icon fix end

- type: entity
id: SpawnPointMedicalIntern
Expand All @@ -104,6 +110,12 @@
components:
- type: SpawnPoint
job_id: MedicalIntern
# ss220 spawner icon fix begin
- type: Sprite
layers:
- state: green
- state: medicalintern
# ss220 spawner icon fix end

- type: entity
id: SpawnPointSecurityCadet
Expand All @@ -124,6 +136,12 @@
components:
- type: SpawnPoint
job_id: ResearchAssistant
# ss220 spawner icon fix begin
- type: Sprite
layers:
- state: green
- state: researchassistant
# ss220 spawner icon fix end

- type: entity
id: SpawnPointServiceWorker
Expand All @@ -132,6 +150,12 @@
components:
- type: SpawnPoint
job_id: ServiceWorker
# ss220 spawner icon fix begin
- type: Sprite
layers:
- state: green
- state: serviceworker
# ss220 spawner icon fix end

- type: entity
id: SpawnPointBartender
Expand Down
103 changes: 103 additions & 0 deletions Resources/Prototypes/SS220/Entities/Effects/puddle.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
- type: entity
id: PuddleSpaceUp
parent: PuddleTemporary
suffix: SpaceUp
components:
- type: SolutionContainerManager
solutions:
puddle:
maxVol: 1000
reagents:
- ReagentId: SpaceUp
Quantity: 15

- type: entity
id: PuddlePowerGame
parent: PuddleTemporary
suffix: PowerGame
components:
- type: SolutionContainerManager
solutions:
puddle:
maxVol: 1000
reagents:
- ReagentId: PwrGame
Quantity: 15

- type: entity
id: PuddleFourteenLoko
parent: PuddleTemporary
suffix: FourteenLoko
components:
- type: SolutionContainerManager
solutions:
puddle:
maxVol: 1000
reagents:
- ReagentId: FourteenLoko
Quantity: 15

- type: entity
id: PuddleLemonLime
parent: PuddleTemporary
suffix: LemonLime
components:
- type: SolutionContainerManager
solutions:
puddle:
maxVol: 1000
reagents:
- ReagentId: LemonLime
Quantity: 15

- type: entity
id: PuddleSolDry
parent: PuddleTemporary
suffix: SolDry
components:
- type: SolutionContainerManager
solutions:
puddle:
maxVol: 1000
reagents:
- ReagentId: SolDry
Quantity: 15

- type: entity
id: PuddleIcedTea
parent: PuddleTemporary
suffix: IcedTea
components:
- type: SolutionContainerManager
solutions:
puddle:
maxVol: 1000
reagents:
- ReagentId: IcedTea
Quantity: 15

- type: entity
id: PuddleRootBeer
parent: PuddleTemporary
suffix: RootBeer
components:
- type: SolutionContainerManager
solutions:
puddle:
maxVol: 1000
reagents:
- ReagentId: RootBeer
Quantity: 15

- type: entity
id: PuddleCola
parent: PuddleTemporary
suffix: Cola
components:
- type: SolutionContainerManager
solutions:
puddle:
maxVol: 1000
reagents:
- ReagentId: Cola
Quantity: 15
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
- type: entity
id: RandomPuddleSoda
name: random soda puddle spawner
parent: MarkerBase
placement:
mode: AlignTileAny
components:
- type: Sprite
layers:
- state: red
- sprite: Fluids/puddle.rsi
state: splat0
- type: RandomSpawner
prototypes:
- PuddleSpaceUp
- PuddlePowerGame
- PuddleFourteenLoko
- PuddleLemonLime
- PuddleSolDry
- PuddleIcedTea
- PuddleRootBeer
- PuddleCola
chance: 0.8
offset: 0.0
1 change: 1 addition & 0 deletions Resources/Prototypes/SS220/Maps/Pools/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
- Frankenstein
- Nox
- Axioma
- Eclipse
85 changes: 85 additions & 0 deletions Resources/Prototypes/SS220/Maps/eclipse.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
# © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt

- type: gameMap
id: Eclipse
mapName: 'NSS Eclipse'
mapPath: /Maps/SS220/eclipse.yml
minPlayers: 0
stations:
Eclipse:
stationProto: EclipseNanotrasenStation
components:
- type: StationEmergencyShuttle
emergencyShuttlePath: /Maps/SS220/Shuttles/emergency/emergency_eclipse.yml
- type: StationRandomTransform
enableStationRotation: false
maxStationOffset: null
- type: StationNameSetup
mapNameTemplate: '{0} Eclipse {1}'
nameGenerator:
!type:NanotrasenNameGenerator
prefixCreator: '-SS220'
- type: StationJobs
overflowJobs:
- Passenger
availableJobs:
Passenger: [ -1, -1 ]
#Command
Captain: [ 1, 1 ]
IAA: [ 1, 1 ]
BlueShield: [ 1, 1 ]
HeadOfPersonnel: [ 1, 1 ]
#Security
HeadOfSecurity: [ 1, 1 ]
Warden: [ 1, 1 ]
Detective: [ 1, 1 ]
SecurityPilot: [ 2, 2 ]
SecurityOfficer: [ 6, 6 ]
SecurityCadet: [ 3, 3 ]
Brigmedic: [ 1, 1 ]
#Engineering
ChiefEngineer: [ 1, 1 ]
StationEngineer: [ 8, 8 ]
AtmosphericTechnician: [ 3, 3 ]
TechnicalAssistant: [ 3, 3 ]
#Cargo
Quartermaster: [ 1, 1 ]
CargoTechnician: [ 6, 6 ]
SalvageSpecialist: [ 3, 3 ]
#Medical
ChiefMedicalOfficer: [ 1, 1 ]
MedicalDoctor: [ 7, 7 ]
Chemist: [ 2, 2 ]
Psychologist: [ 1, 1 ]
MedicalIntern: [ 5, 5 ]
Paramedic: [ 1, 1 ]
#Science
ResearchDirector: [ 1, 1 ]
Scientist: [ 8, 8 ]
ResearchAssistant: [ 3, 3 ]
Borg: [ 2, 2 ]
#Service
Bartender: [ 2, 2 ]
Botanist: [ 3, 3 ]
Chef: [ 2, 2 ]
Clown: [ 1, 1 ]
Janitor: [ 3, 3 ]
Mime: [ 1, 1 ]
Chaplain: [ 1, 1 ]
Librarian: [ 1, 1 ]
Musician: [ 2, 2 ]
Reporter: [ 2, 2 ]
ServiceWorker: [ 2, 2 ]
Lawyer: [ 2, 2 ]
Zookeeper: [ 1, 1 ]

- type: entity
id: EclipseNanotrasenStation
parent: StandardNanotrasenStation
noSpawn: true
components:
- type: StationMinimap
minimapData: !type:StationMinimapData
mapTexture: SS220/ViewableMaps/eclipse.png
originOffset: -56, -91
mapScale: 6.4
43 changes: 43 additions & 0 deletions Resources/Prototypes/SS220/Parallaxes/eclipse.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
- type: parallax
id: EclipseParallax
layers:
- texture:
!type:ImageParallaxTextureSource
path: "/Textures/SS220/Parallaxes/EclipseBackground_space.png"
slowness: 0.998046875
scale: "1, 1"
- texture:
!type:ImageParallaxTextureSource
path: "/Textures/SS220/Parallaxes/EclipseStars_Background.png"
slowness: 0.97
scale: "1, 1"
- texture:
!type:ImageParallaxTextureSource
path: "/Textures/SS220/Parallaxes/EclipseDust.png"
slowness: 0.98
scale: "1, 1"
scrolling: "-0.02, 0.02"
- texture:
!type:ImageParallaxTextureSource
path: "/Textures/SS220/Parallaxes/EclipseNebulae.png"
slowness: 0.98
scale: "1, 1"
scrolling: "-0.02, 0.02"
- texture:
!type:ImageParallaxTextureSource
path: "/Textures/SS220/Parallaxes/EclipseStars.png"
slowness: 0.94
scale: "1, 1"
- texture:
!type:ImageParallaxTextureSource
path: "/Textures/SS220/Parallaxes/EclipsePlanets.png"
slowness: 0.998046875
scale: "1, 1"
tiled: false
layersLQ:
- texture:
!type:GeneratedParallaxTextureSource
id: ""
configPath: "/Prototypes/Parallaxes/parallax_config.toml"
slowness: 0.875
layersLQUseHQ: false
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
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.
2 changes: 1 addition & 1 deletion Resources/Textures/SS220/Parallaxes/licences.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
AxiomaBackground_space.png, AxiomaBackground_stars.png, AxiomaDust.png, AxiomaStars.png generated from https://deep-fold.itch.io/space-background-generator
AxiomaBackground_space.png, AxiomaBackground_stars.png, AxiomaDust.png, AxiomaStars.png, EclipseBackground_space.png, EclipseDust.png, EclipseNebulae.png, EclipsePlanets.png, EclipseStars.png, EclipseStars_Background.png generated from https://deep-fold.itch.io/space-background-generator

Binary file added Resources/Textures/SS220/ViewableMaps/eclipse.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit e67d2f7

Please sign in to comment.