Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Submarine Station #123

Closed
wants to merge 69 commits into from
Closed
Show file tree
Hide file tree
Changes from 60 commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
923935e
hospital and benches
rosieposieeee Oct 5, 2023
95e62b1
tweaks based on feedback
rosieposieeee Oct 5, 2023
d0307e1
bridge and sec
rosieposieeee Oct 5, 2023
e4b28aa
lawman
rosieposieeee Oct 5, 2023
74b9b87
light work
rosieposieeee Oct 5, 2023
6977d13
singulo
rosieposieeee Oct 5, 2023
31fc354
finishing layout
rosieposieeee Oct 6, 2023
f46e93d
begin decalling
rosieposieeee Oct 6, 2023
b1fea1a
telecomms
rosieposieeee Oct 6, 2023
f023f09
so many fucking decals
rosieposieeee Oct 6, 2023
7f2a341
startin doors
rosieposieeee Oct 6, 2023
52015bb
submarine (real)
rosieposieeee Oct 6, 2023
c18e028
Merge remote-tracking branch 'upstream/master' into hospitalmap
rosieposieeee Oct 6, 2023
2bf8a26
one BILLION lights.
rosieposieeee Oct 6, 2023
08b81e1
flowers out the wazoo
rosieposieeee Oct 6, 2023
fbe413b
popoposters
rosieposieeee Oct 6, 2023
ec066b2
fire alarms maybe
rosieposieeee Oct 6, 2023
bb9bd6f
prototype file
rosieposieeee Oct 6, 2023
ea9d9a3
become a station ya doink
rosieposieeee Oct 6, 2023
b5871f8
shit wrong folder
rosieposieeee Oct 6, 2023
c66448b
it continues
rosieposieeee Oct 7, 2023
c0fb322
one hundred BILLION pipe's
rosieposieeee Oct 7, 2023
0719e9b
sensors placed
rosieposieeee Oct 7, 2023
a1bc781
linking shit pt 1
rosieposieeee Oct 7, 2023
24a6c1d
linking pt 2
rosieposieeee Oct 7, 2023
7cc6fce
Merge remote-tracking branch 'upstream/master' into hospitalmap
rosieposieeee Oct 7, 2023
4f1d6c0
jobs
rosieposieeee Oct 7, 2023
876bc51
emergency lights
rosieposieeee Oct 7, 2023
abbbd79
pool time baby
rosieposieeee Oct 7, 2023
8495989
get bar tile'd
rosieposieeee Oct 7, 2023
23970b7
unfollowed cringe
rosieposieeee Oct 7, 2023
52fe665
everything BUT the grime
rosieposieeee Oct 8, 2023
ae8b410
maints pt 1
rosieposieeee Oct 8, 2023
7ea1699
gussying halls pt1
rosieposieeee Oct 8, 2023
f173454
Merge remote-tracking branch 'upstream/master' into hospitalmap
rosieposieeee Oct 10, 2023
2956222
training bomb room
rosieposieeee Oct 10, 2023
0f6053e
Merge remote-tracking branch 'upstream/master' into hospitalmap
rosieposieeee Oct 10, 2023
dd0afbb
new checklist and labyrinth tweaks
rosieposieeee Oct 10, 2023
eeba580
singluo and logistics tweaks
rosieposieeee Oct 10, 2023
5d02e36
more singulo area changes
rosieposieeee Oct 10, 2023
7bacb1d
make all the lights normal type
rosieposieeee Oct 10, 2023
997819a
more labyrinth stuff
rosieposieeee Oct 10, 2023
1cbffad
Merge remote-tracking branch 'upstream/master' into hospitalmap
rosieposieeee Oct 11, 2023
3e85257
Merge remote-tracking branch 'upstream/master' into hospitalmap
rosieposieeee Oct 12, 2023
da9baeb
movin biz, decals a lil
rosieposieeee Oct 12, 2023
c619af1
grammed up the grouse
rosieposieeee Oct 12, 2023
ff39160
spawns points
rosieposieeee Oct 12, 2023
49a2bfd
changes based on feedback
rosieposieeee Oct 12, 2023
7a712ca
Merge remote-tracking branch 'upstream/master' into hospitalmap
rosieposieeee Oct 13, 2023
843543f
tweaks
rosieposieeee Oct 13, 2023
a514ac6
more tweaks
rosieposieeee Oct 13, 2023
d35bbe0
moved solars
rosieposieeee Oct 13, 2023
8bcd748
de-plasmaglass atmos
rosieposieeee Oct 13, 2023
cebbfe7
Merge remote-tracking branch 'upstream/master' into hospitalmap
rosieposieeee Oct 13, 2023
de3ca44
para airlocks and ssu's
rosieposieeee Oct 13, 2023
5127e38
Merge remote-tracking branch 'upstream/master' into hospitalmap
rosieposieeee Oct 14, 2023
74029d7
Merge remote-tracking branch 'upstream/master' into hospitalmap
rosieposieeee Oct 15, 2023
889f04c
assorted stuff
rosieposieeee Oct 15, 2023
9603c73
Merge remote-tracking branch 'upstream/master' into hospitalmap
rosieposieeee Oct 16, 2023
42a2203
infinite tweaks
rosieposieeee Oct 16, 2023
2abd7f0
remove benches in preparation for merging
rosieposieeee Oct 23, 2023
cc746bb
Merge remote-tracking branch 'upstream/master' into hospitalmap
rosieposieeee Oct 23, 2023
61fcc68
changes based on velcros review
rosieposieeee Oct 23, 2023
921a3b8
more touchups
rosieposieeee Oct 23, 2023
8d25b1b
beacon colors changed
rosieposieeee Oct 23, 2023
87cd4a1
remove rest of the spawns
rosieposieeee Oct 23, 2023
c378ac5
Merge remote-tracking branch 'upstream/master' into hospitalmap
rosieposieeee Oct 26, 2023
855c2f5
more tweaks based on review
rosieposieeee Oct 26, 2023
a89b9ed
Merge branch 'master' into hospitalmap
Colin-Tel Nov 6, 2023
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
228,279 changes: 228,279 additions & 0 deletions Resources/Maps/submarine.yml

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Resources/Prototypes/Maps/Pools/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@
# DeltaV
- Pebble
- Edge
- Submarine
72 changes: 72 additions & 0 deletions Resources/Prototypes/Maps/submarine.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
- type: gameMap
id: Submarine
mapName: 'Submarine'
mapPath: /Maps/submarine.yml
minPlayers: 35
maxPlayers: 100
stations:
Submarine:
stationProto: StandardNanotrasenStation
components:
- type: StationNameSetup
mapNameTemplate: '{0} Submarine {1}'
nameGenerator:
!type:NanotrasenNameGenerator
prefixCreator: '14'
- type: StationEmergencyShuttle
emergencyShuttlePath: /Maps/Shuttles/emergency_courser.yml
- type: StationJobs
overflowJobs:
- Passenger
availableJobs:
#service
Captain: [ 1, 1 ]
HeadOfPersonnel: [ 1, 1 ]
Bartender: [ 2, 3 ]
Botanist: [ 2, 3 ]
Boxer: [ 1, 2 ]
Chef: [ 2, 4 ]
Clown: [ 1, 1 ]
Lawyer: [ 2, 2 ]
Reporter: [ 0, 1 ]
Musician: [ 1, 1 ]
Janitor: [ 1, 3 ]
Mime: [ 1, 1 ]
Zookeeper: [ 1, 2 ]
ServiceWorker: [ 2, 3 ]
#engineering
ChiefEngineer: [ 1, 1 ]
AtmosphericTechnician: [ 2, 3 ]
StationEngineer: [ 3, 5 ]
TechnicalAssistant: [ 2, 5 ]
#medical
ChiefMedicalOfficer: [ 1, 1 ]
Chemist: [ 1, 2 ]
Paramedic: [ 3, 3 ]
Psychologist: [ 1, 2 ]
MedicalDoctor: [ 3, 6 ]
MedicalIntern: [ 2, 4 ]
BorgMedical: [ 1, 2 ]
#science
ResearchDirector: [ 1, 1 ]
Chaplain: [ 1, 1 ]
ForensicMantis: [ 1, 1 ]
Scientist: [ 2, 4 ]
ResearchAssistant: [ 2, 4 ]
Borg: [ 2, 3 ]
#security
HeadOfSecurity: [ 1, 1 ]
Warden: [ 1, 1 ]
Detective: [ 1, 1 ]
SecurityOfficer: [ 3, 5 ]
SecurityCadet: [ 2, 5 ]
Prisoner: [ 1, 3 ]
PrisonGuard: [ 1, 2 ]
#supply
Quartermaster: [ 1, 1 ]
MailCarrier: [ 1, 2 ]
SalvageSpecialist: [ 2, 4 ]
CargoTechnician: [ 2, 4 ]
#civilian
Passenger: [ -1, -1 ]

257 changes: 257 additions & 0 deletions Resources/Prototypes/SimpleStation14/benches.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,257 @@
# Base benches
- type: entity
name: bench
id: BenchBaseMiddle
suffix: Middle
abstract: true
parent: SeatBase
description: Multiple seats spanning a single object. Truly a marvel of science.
components:
- type: Transform
anchored: true
- type: Rotatable
- type: Sprite
state: middle

# Park benches
- type: entity
name: park bench
id: BenchParkMiddle
parent: BenchBaseMiddle
components:
- type: Sprite
sprite: SimpleStation14/Structures/Furniture/Benches/parkbench_wooden.rsi

- type: entity
id: BenchParkLeft
suffix: Left
parent: BenchParkMiddle
components:
- type: Sprite
state: left

- type: entity
id: BenchParkRight
suffix: Right
parent: BenchParkMiddle
components:
- type: Sprite
state: right

# Bamboo benches
- type: entity
name: park bench
id: BenchParkBambooMiddle
parent: BenchBaseMiddle
components:
- type: Sprite
sprite: SimpleStation14/Structures/Furniture/Benches/parkbench_bamboo.rsi

- type: entity
id: BenchParkBambooLeft
suffix: Left
parent: BenchParkBambooMiddle
components:
- type: Sprite
state: left

- type: entity
id: BenchParkBambooRight
suffix: Right
parent: BenchParkBambooMiddle
components:
- type: Sprite
state: right

# Pews
- type: entity
name: pew
id: BenchPewMiddle
parent: BenchBaseMiddle
components:
- type: Sprite
sprite: SimpleStation14/Structures/Furniture/Benches/pews.rsi

- type: entity
id: BenchPewLeft
suffix: Left
parent: BenchPewMiddle
components:
- type: Sprite
state: left

- type: entity
id: BenchPewRight
suffix: Right
parent: BenchPewMiddle
components:
- type: Sprite
state: right

# Steel benches
- type: entity
name: steel bench
id: BenchSteelMiddle
parent: BenchBaseMiddle
components:
- type: Sprite
sprite: SimpleStation14/Structures/Furniture/Benches/steel_bench.rsi

- type: entity
id: BenchSteelLeft
suffix: Left
parent: BenchSteelMiddle
components:
- type: Sprite
state: left

- type: entity
id: BenchSteelRight
suffix: Right
parent: BenchSteelMiddle
components:
- type: Sprite
state: right

# White steel benches
- type: entity
name: white steel bench
id: BenchSteelWhiteMiddle
parent: BenchBaseMiddle
components:
- type: Sprite
sprite: SimpleStation14/Structures/Furniture/Benches/steel_bench_white.rsi

- type: entity
id: BenchSteelWhiteLeft
suffix: Left
parent: BenchSteelWhiteMiddle
components:
- type: Sprite
state: left

- type: entity
id: BenchSteelWhiteRight
suffix: Right
parent: BenchSteelWhiteMiddle
components:
- type: Sprite
state: right

# Standard sofa
- type: entity
name: sofa
id: BenchSofaMiddle
parent: BenchBaseMiddle
components:
- type: Sprite
sprite: SimpleStation14/Structures/Furniture/Benches/sofa.rsi

- type: entity
id: BenchSofaLeft
suffix: Left
parent: BenchSofaMiddle
components:
- type: Sprite
state: left

- type: entity
id: BenchSofaRight
suffix: Right
parent: BenchSofaMiddle
components:
- type: Sprite
state: right

- type: entity
name: sofa
id: BenchSofaCorner
suffix: Corner
# parent: BenchSofaMiddle
placement:
mode: SnapgridCenter
components:
- type: Transform
anchored: true
- type: Rotatable
- type: Sprite
sprite: SimpleStation14/Structures/Furniture/Benches/sofa.rsi
state: corner
- type: Clickable
- type: InteractionOutline
- type: Physics
bodyType: Dynamic
- type: Pullable
- type: Damageable
damageContainer: Inorganic
damageModifierSet: Metallic
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 50
behaviors:
- !type:DoActsBehavior
acts: ["Destruction"]
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg

# Corp sofa
- type: entity
name: grey sofa
id: BenchSofaCorpMiddle
parent: BenchBaseMiddle
components:
- type: Sprite
sprite: SimpleStation14/Structures/Furniture/Benches/sofa_corp.rsi

- type: entity
id: BenchSofaCorpLeft
suffix: Left
parent: BenchSofaCorpMiddle
components:
- type: Sprite
state: left

- type: entity
id: BenchSofaCorpRight
suffix: Right
parent: BenchSofaCorpMiddle
components:
- type: Sprite
state: right

- type: entity
name: grey sofa
id: BenchSofaCorpCorner
suffix: Corner
# parent: BenchSofaCorpMiddle
placement:
mode: SnapgridCenter
components:
- type: Transform
anchored: true
- type: Rotatable
- type: Sprite
sprite: SimpleStation14/Structures/Furniture/Benches/sofa_corp.rsi
state: corner
- type: Clickable
- type: InteractionOutline
- type: Physics
bodyType: Dynamic
- type: Pullable
- type: Damageable
damageContainer: Inorganic
damageModifierSet: Metallic
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 50
behaviors:
- !type:DoActsBehavior
acts: ["Destruction"]
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metalbreak.ogg
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,23 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from TGStation at https://github.com/lessthnthree/tgstation/blob/2ca948b578cdb46b60d19e029782483b1218004e/icons/obj/sofa.dmi",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "left",
"directions": 4
},
{
"name": "right",
"directions": 4
},
{
"name": "middle",
"directions": 4
}
]
}
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from TGStation at https://github.com/lessthnthree/tgstation/blob/2ca948b578cdb46b60d19e029782483b1218004e/icons/obj/sofa.dmi",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "left",
"directions": 4
},
{
"name": "right",
"directions": 4
},
{
"name": "middle",
"directions": 4
}
]
}
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
Loading