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

Heron- Class! #1670

Merged
merged 110 commits into from
Oct 15, 2023
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
d5e1e2d
Update jungle_paradise.dmm
spockye Dec 13, 2022
3a0d32e
main files
spockye Jan 6, 2023
b42c026
misc fixes and job changes
spockye Jan 6, 2023
08ca30a
fixes lowercase door
spockye Jan 7, 2023
2a8ae95
Update nanotrasen_heron.dmm
spockye Jan 10, 2023
2429bc0
doubled and unconnected pipes
spockye Jan 10, 2023
6efb980
missing pipe
spockye Jan 10, 2023
76370dd
attempts to fix pipes
spockye Jan 10, 2023
f978dbf
fixes piping error
spockye Jan 10, 2023
5475b42
Merge branch 'master' into Nanotrasen_capital_1
spockye Jan 12, 2023
baff85d
poster revolution
spockye Jan 13, 2023
da81307
misc fixes and changes
spockye Jan 14, 2023
a89d124
majorly updates the Crew area
spockye Jan 15, 2023
0acdf3a
misc fixes
spockye Jan 15, 2023
7e39821
Merge branch 'master' into Nanotrasen_capital_1
spockye Jan 16, 2023
1829c47
Merge branch 'master' into Nanotrasen_capital_1
spockye Jan 18, 2023
c80e5ec
Merge remote-tracking branch 'upstream/master' into Nanotrasen_capital_1
spockye Jan 19, 2023
2b6ffe8
fixes Piping (thanks Karl)
spockye Jan 19, 2023
d37fd82
misc changes
spockye Feb 1, 2023
04f46f6
subshuttles the subshuttle
spockye Feb 3, 2023
aa0f928
Merge remote-tracking branch 'upstream/master' into Nanotrasen_capital_1
spockye Mar 10, 2023
bdb0b4e
fixes conflict
spockye Mar 10, 2023
85f55af
Merge branch 'master' into Nanotrasen_capital_1
spockye Apr 24, 2023
e610f20
Merge branch 'master' into Nanotrasen_capital_1
spockye May 8, 2023
61c7710
misc fixes and changes
spockye May 9, 2023
4a70061
internal dock possible fix
spockye May 9, 2023
638d403
misc updates
spockye May 11, 2023
14c9fc9
Merge remote-tracking branch 'upstream/master' into Nanotrasen_capital_1
spockye May 19, 2023
c252cb9
misc changes
spockye May 20, 2023
8830b1e
oopsies
spockye May 20, 2023
08f9f8e
FIXES the subshuttle
spockye May 20, 2023
a57b375
access locks the AI core
spockye May 20, 2023
ae16860
fixes hos locker
spockye May 20, 2023
d3f2479
misc changes
spockye May 20, 2023
8d642cf
switches some windoors around
spockye May 20, 2023
a3707b8
moves the buttons on the subshuttle
spockye May 20, 2023
1a34f76
misc additions and changes
spockye May 20, 2023
30375cd
misc fixes
spockye May 20, 2023
233b1df
changes and fixes
spockye May 20, 2023
f10bffd
slightly changes the kitchen
spockye May 20, 2023
ec105bf
decal changes
spockye May 20, 2023
b72ee1b
removes the bounty console
spockye May 20, 2023
7ae071b
misc small fixes
spockye May 21, 2023
f3060be
Merge branch 'master' into Nanotrasen_capital_1
spockye May 21, 2023
c775d1c
more jannie gear
spockye May 22, 2023
29af008
Merge branch 'Nanotrasen_capital_1' of https://github.com/spockye/Shi…
spockye May 22, 2023
b563dd9
adds a proper comms setup.
spockye May 23, 2023
0560a7b
removes all-in-one
spockye May 23, 2023
fd8470d
oops
spockye May 23, 2023
26262ca
BAD iconstate edit removal
spockye May 23, 2023
a0f6dab
Merge branch 'master' into Nanotrasen_capital_1
spockye May 23, 2023
6f86ec3
Merge remote-tracking branch 'upstream/master' into Nanotrasen_capital_1
spockye May 23, 2023
1598fb8
Merge branch 'master' into Nanotrasen_capital_1
spockye May 25, 2023
25a61f9
Merge branch 'Nanotrasen_capital_1' of https://github.com/spockye/Shi…
spockye May 25, 2023
4932515
Merge branch 'Nanotrasen_capital_1' of https://github.com/spockye/Shi…
spockye May 25, 2023
c473151
conflict fix
spockye May 25, 2023
37ae330
Update nanotrasen_heron.dmm
Erikafox May 26, 2023
b34a7cb
Merge branch 'Nanotrasen_capital_1' of https://github.com/spockye/Shi…
Erikafox May 26, 2023
2849f83
atmos fixes (no recycle loop for now)
spockye May 26, 2023
5a8ec7b
adds a camera to tcomms
spockye May 26, 2023
f7095c9
Merge branch 'master' into Nanotrasen_capital_1
spockye May 27, 2023
42c4e32
Merge branch 'master' into Nanotrasen_capital_1
spockye May 29, 2023
834e174
fixes some illegal floors
spockye May 29, 2023
8684062
Merge branch 'Nanotrasen_capital_1' of https://github.com/spockye/Shi…
spockye May 29, 2023
cfc8714
misc decal fixes
spockye May 29, 2023
2730cda
misc atmos fixes
spockye May 29, 2023
ee96f9a
fixes illegal floors on the subshuttle
spockye May 29, 2023
de3e29e
gives AI core robotics access
spockye May 29, 2023
6ed6d4b
removes a bee plushieeee
spockye May 29, 2023
86b7058
moves a poster
spockye May 29, 2023
1b2b6df
Merge branch 'master' into Nanotrasen_capital_1
spockye Jun 18, 2023
b201fbf
Merge remote-tracking branch 'upstream/master' into Nanotrasen_capital_1
spockye Jul 23, 2023
6b0af36
Update nanotrasen_heron.dmm
spockye Jul 23, 2023
67e782c
Update nanotrasen_heron.dmm
spockye Jul 23, 2023
395a5fb
how about you script deez
spockye Jul 23, 2023
bc6688b
fixes wallmounts
spockye Jul 23, 2023
099c811
more fixes
spockye Jul 23, 2023
72402af
fixes the subshuttle
spockye Jul 23, 2023
2d4a375
Merge branch 'master' into Nanotrasen_capital_1
spockye Jul 23, 2023
c3fb1ed
misc fixes
spockye Jul 26, 2023
c2488b1
more misc fixes
spockye Jul 26, 2023
6f2a273
more fixes
spockye Jul 26, 2023
faebff5
fixed air injectors starting off
spockye Jul 26, 2023
1b78c67
Update nanotrasen_heron.dmm
spockye Jul 26, 2023
b508751
Misc changes
spockye Aug 2, 2023
f95d1fb
more job cuttings
spockye Aug 2, 2023
d8601cf
re-adds ERT slots
spockye Aug 2, 2023
9af4893
fixes and adds more extinguishers
spockye Aug 2, 2023
584b37a
Merge remote-tracking branch 'upstream/master' into Nanotrasen_capital_1
spockye Aug 11, 2023
8445645
Merge remote-tracking branch 'upstream/master' into Nanotrasen_capital_1
spockye Aug 29, 2023
1f41a98
misc fixes
spockye Aug 29, 2023
2cbe446
fixes robotics role
spockye Aug 29, 2023
e0f4dd2
Merge branch 'master' into Nanotrasen_capital_1
spockye Aug 30, 2023
46ef5df
Bunch of review related fixes
spockye Aug 31, 2023
a0b6435
Merge remote-tracking branch 'upstream/master' into Nanotrasen_capital_1
spockye Sep 1, 2023
dea2f9d
missing lightswitches
spockye Sep 1, 2023
ef570ed
Merge remote-tracking branch 'upstream/master' into Nanotrasen_capital_1
spockye Sep 6, 2023
37fa1db
fixes misc stuffs
spockye Sep 6, 2023
e904f17
TEMP BRIDGE REMAKE
spockye Sep 8, 2023
b1ea834
misc bridge oopsies
spockye Sep 9, 2023
3d60baa
more misc bridge oopsies
spockye Sep 9, 2023
18e4936
Merge remote-tracking branch 'upstream/master' into Nanotrasen_capital_1
spockye Sep 15, 2023
effd068
fixed missing helm
spockye Sep 15, 2023
958d0ec
Merge remote-tracking branch 'upstream/master' into Nanotrasen_capital_1
spockye Sep 16, 2023
db811fb
Merge remote-tracking branch 'upstream/master' into Nanotrasen_capital_1
spockye Sep 17, 2023
cbc97e6
misc updates and fixes
spockye Sep 17, 2023
0bde552
pilot shemags
spockye Sep 17, 2023
e566278
Merge remote-tracking branch 'upstream/master' into Nanotrasen_capital_1
spockye Oct 3, 2023
4ac55c1
adds Description (thanks Meem :)))) )
spockye Oct 3, 2023
6a055f3
Merge branch 'master' into Nanotrasen_capital_1
goober3 Oct 15, 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
68 changes: 68 additions & 0 deletions _maps/configs/heron.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
{
spockye marked this conversation as resolved.
Show resolved Hide resolved
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"prefix": "NTSV",
"namelists": ["WEAPONS"],
"map_name": "Heron-Class Dreadnaught",
"map_short_name": "Heron-class",
"map_path": "_maps/shuttles/shiptest/nanotrasen_heron.dmm",
"map_id": "nanotrasen_heron",
"limit": 1,
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/captain/nt/heron",
"officer": true,
"slots": 1
},
"First Officer": {
"outfit": "/datum/outfit/job/head_of_personnel/nt",
"officer": true,
"slots": 1
},
"Head of Security": {
"outfit": "/datum/outfit/job/hos/nanotrasen",
"officer": true,
"slots": 1
},
"Pilot": {
"outfit": "/datum/outfit/job/cargo_tech/pilot/heron",
"officer": true,
"slots": 2
},
"Security Officer": {
"outfit": "/datum/outfit/job/security/nanotrasen",
"slots": 1
},
"ERT Officer":{
"outfit": "/datum/outfit/job/security/nanotrasen/ert",
"slots": 6
spockye marked this conversation as resolved.
Show resolved Hide resolved
},
"Mech Pilot":{
"outfit": "/datum/outfit/job/security/nanotrasen/mech_pilot",
"slots": 1
},
"Engine Technician": {
"outfit": "/datum/outfit/job/engineer/nt",
"slots": 2
},
"Roboticist": {
"outfit":"/datum/outfit/job/roboticist/mechatronicengineer",
"slots": 1
},
"paramedic":{
"outfit": "/datum/outfit/job/paramedic",
"slots": 1
},
"Medical Doctor":{
"outfit": "/datum/outfit/job/doctor",
"slots": 1
},

"Atmospheric Technician": 1,
"Quartermaster": 1,
"Cargo Technician": 1,
"Cook": 1,
"Janitor": 1

},
"enabled": true
spockye marked this conversation as resolved.
Show resolved Hide resolved
}
Loading