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

Nanotrasen Harrier-class Exploration Cruiser #3185

Merged
merged 64 commits into from
Oct 5, 2024
Merged
Show file tree
Hide file tree
Changes from 59 commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
7e5fede
draft 1
Apogee-dev May 2, 2024
e068ffa
draft 2
Apogee-dev May 9, 2024
57fd2ad
another draft
Apogee-dev May 9, 2024
bc7db4c
another draft
Apogee-dev May 23, 2024
2ae4b0c
another draft
Apogee-dev May 25, 2024
33f4434
the pipes sing to me when i sleep
Apogee-dev Jun 8, 2024
9b2adef
firelocks and shutters
Apogee-dev Jun 8, 2024
484e2cb
floor tile updates
Apogee-dev Jun 8, 2024
6804284
Merge remote-tracking branch 'upstream/master' into osprey-replacement
Apogee-dev Jun 8, 2024
a6a72fd
another draft
Apogee-dev Jun 12, 2024
bf27dcf
disposals and wallmounts
Apogee-dev Jul 6, 2024
7506578
fixed duplicate pipes
Apogee-dev Jul 6, 2024
3993d90
stop yelling at me
Apogee-dev Jul 6, 2024
41ae9f8
changes blast door names. again.
Apogee-dev Jul 6, 2024
1d83ea1
Merge remote-tracking branch 'upstream/master' into osprey-replacement
Apogee-dev Jul 6, 2024
d249678
guncloset fix
Apogee-dev Jul 6, 2024
2778fb6
brig door fix
Apogee-dev Jul 9, 2024
d132052
Merge remote-tracking branch 'upstream/master' into osprey-replacement
Apogee-dev Aug 30, 2024
5817a47
decals and intercoms
Apogee-dev Aug 31, 2024
e2aae7a
nanotasen
Apogee-dev Aug 31, 2024
c6c47b6
actually removes the ships it replaces
Apogee-dev Aug 31, 2024
3079ef8
description update
Apogee-dev Aug 31, 2024
1170f65
WRONG TAGGER
Apogee-dev Aug 31, 2024
2b74320
review fixes
Apogee-dev Aug 31, 2024
5c0b50c
engine vent button
Apogee-dev Aug 31, 2024
d7eb825
stop yelling about doors
Apogee-dev Aug 31, 2024
49da250
forgor igniter
Apogee-dev Aug 31, 2024
433fd79
forgot to give vigi a belt
Apogee-dev Aug 31, 2024
7e67eab
cameras
Apogee-dev Aug 31, 2024
fdef008
engine fixes
Apogee-dev Aug 31, 2024
b745785
handrails
Apogee-dev Aug 31, 2024
c12a6a9
wiring oopsie
Apogee-dev Aug 31, 2024
ee2eac8
makes armory less soul crushingly dark
Apogee-dev Aug 31, 2024
e10be0f
belt fixes
Apogee-dev Aug 31, 2024
52dc686
unbottlenecks medbay
Apogee-dev Aug 31, 2024
341ca17
more filing cabinet tweaks
Apogee-dev Aug 31, 2024
9d37078
cell charger go
Apogee-dev Aug 31, 2024
1d9c22d
evidenz
Apogee-dev Aug 31, 2024
b8306dd
armory access
Apogee-dev Aug 31, 2024
40e3503
the flashening
Apogee-dev Aug 31, 2024
fc89559
access fixes
Apogee-dev Aug 31, 2024
8bc441d
stamp
Apogee-dev Aug 31, 2024
675638a
champagne
Apogee-dev Aug 31, 2024
a81f751
janitor outfit
Apogee-dev Sep 1, 2024
e29d40e
cargo area tweaks
Apogee-dev Sep 1, 2024
a5fb131
disposal fix
Apogee-dev Sep 1, 2024
3475726
purge board
Apogee-dev Sep 1, 2024
5118ae1
tank?
Apogee-dev Sep 1, 2024
9ab5721
mixer fix
Apogee-dev Sep 1, 2024
33487f4
more atmos tweaks
Apogee-dev Sep 1, 2024
d17029b
public airlocks
Apogee-dev Sep 1, 2024
18f70ca
viewscreens
Apogee-dev Sep 1, 2024
7d93aca
puppy
Apogee-dev Sep 1, 2024
0dceec5
the quartermastering
Apogee-dev Sep 1, 2024
854b779
breakfast
Apogee-dev Sep 1, 2024
71a2598
no CQC
Apogee-dev Sep 1, 2024
5084e8d
engine fixes
Apogee-dev Sep 5, 2024
5e120d3
sec desk window
Apogee-dev Sep 5, 2024
0ed062b
Merge remote-tracking branch 'upstream/master' into osprey-replacement
Apogee-dev Sep 14, 2024
94bc860
Merge remote-tracking branch 'upstream/master' into osprey-replacement
Apogee-dev Sep 26, 2024
d6b9da3
faction fix
Apogee-dev Sep 26, 2024
99fb282
path fixes
Apogee-dev Sep 26, 2024
39e2e82
Merge remote-tracking branch 'upstream/master' into osprey-replacement
Apogee-dev Oct 5, 2024
52a2ca6
fixing paths
Apogee-dev Oct 5, 2024
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
75 changes: 75 additions & 0 deletions _maps/configs/nanotrasen_harrier.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
{
Apogee-dev marked this conversation as resolved.
Show resolved Hide resolved
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Harrier-class Exploration Cruiser",
"prefix": "NTSV",
"namelists": [
"NANOTRASEN",
"SPACE",
"MYTHOLOGICAL",
"WEAPONS"
],
"map_short_name": "Harrier-class",
"map_path": "_maps/shuttles/nanotrasen/nanotrasen_harrier.dmm",
"description": "Originally an advanced ICW-era command cruiser, the surviving Harriers have been refurbished as exploration and \"reclamation\" ships in the post-ICW era. Large, well-rounded, and boasting excellent crew accomodations, Harriers are exceedingly popular with Nanotrasen crews in spite of their lack of specialized equipment.",
"tags": ["Generalist"],
"limit": 1,
"starting_funds": 4000,
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/nanotrasen/captain",
"officer": true,
"slots": 1
},
"First Officer": {
"outfit": "/datum/outfit/job/nanotrasen/hop",
"officer": true,
"slots": 1
},
"Supply Director": {
"outfit": "/datum/outfit/job/nanotrasen/quartermaster",
"officer":true,
"slots": 1
},
"Internal Affairs Agent": {
"outfit": "/datum/outfit/job/nanotrasen/lawyer/corporaterepresentative",
"slots": 1
},
"Security Officer": {
"outfit": "/datum/outfit/job/nanotrasen/security",
"slots": 1
},
"Medical Doctor": {
"outfit": "/datum/outfit/job/nanotrasen/doctor",
"slots": 1
},
"Paramedic": {
"outfit": "/datum/outfit/job/nanotrasen/paramedic",
"slots": 1
},
"Engineer": {
"outfit": "/datum/outfit/job/nanotrasen/engineer",
"slots": 1
},
"Atmospheric Technician": {
"outfit": "/datum/outfit/job/nanotrasen/atmos",
"slots": 1
},
"Cargo Technician": {
"outfit": "/datum/outfit/job/nanotrasen/cargo_tech",
"slots": 1
},
"Cook": {
"outfit": "/datum/outfit/job/independent/cook",
"slots": 1
},
"Janitor": {
"outfit": "/datum/outfit/job/nanotrasen/janitor",
"slots": 1
},
"Assistant": {
"outfit": "/datum/outfit/job/nanotrasen/assistant",
"slots": 2
}
},
"enabled": true
}
75 changes: 0 additions & 75 deletions _maps/configs/nanotrasen_osprey.json

This file was deleted.

64 changes: 0 additions & 64 deletions _maps/configs/nanotrasen_skipper.json

This file was deleted.

Loading
Loading