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

Valor-Class Field Care Crusier #2144

Merged
merged 58 commits into from
Feb 4, 2024
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
351bbd3
bwoomp
meemofcourse Jul 7, 2023
895859e
Merge remote-tracking branch 'upstream/master' into inteqmed
meemofcourse Jul 7, 2023
12b3996
aaaaaarrggghh
meemofcourse Jul 7, 2023
77d3ab7
gaaargh
meemofcourse Jul 7, 2023
14fa097
Merge branch 'shiptest-ss13:master' into inteqmed
meemofcourse Jul 8, 2023
e9676e7
stuff
meemofcourse Jul 8, 2023
6febead
oops
meemofcourse Jul 8, 2023
faca6d1
Merge branch 'master' into inteqmed
meemofcourse Jul 8, 2023
5fac897
addresses review
meemofcourse Jul 8, 2023
e2eb0fb
where the fuck do i find ship tags
meemofcourse Jul 8, 2023
152ac20
addresses review 2
meemofcourse Jul 9, 2023
823d5f7
gouuugh
meemofcourse Jul 14, 2023
8dc45d2
ambulance
meemofcourse Jul 14, 2023
ed8ab84
Merge branch 'master' into inteqmed
meemofcourse Jul 14, 2023
ed5e664
addresses review
meemofcourse Jul 19, 2023
289a417
Update inteq_valor.dmm
meemofcourse Jul 21, 2023
945f3a9
more reviews
meemofcourse Jul 22, 2023
3f8d725
area passthrough
meemofcourse Jul 30, 2023
8afe57f
Merge remote-tracking branch 'upstream/master' into inteqmed
meemofcourse Aug 31, 2023
2175b07
Update inteq_valor.dmm
meemofcourse Aug 31, 2023
202917e
woop woop
meemofcourse Sep 1, 2023
38e35bd
Merge branch 'master' into inteqmed
meemofcourse Sep 1, 2023
39dce1a
Merge branch 'master' into inteqmed
meemofcourse Sep 21, 2023
4808622
Merge remote-tracking branch 'upstream/master' into inteqmed
meemofcourse Oct 15, 2023
4305617
fix paths
meemofcourse Oct 15, 2023
ce7267a
Merge remote-tracking branch 'upstream/master' into inteqmed
meemofcourse Oct 22, 2023
8431d97
Merge branch 'master' into inteqmed
meemofcourse Oct 22, 2023
6a0e3aa
minor updates
meemofcourse Oct 22, 2023
43a0132
ERIKA STRIKES AGAIN
meemofcourse Oct 22, 2023
7810a29
Merge branch 'master' into inteqmed
meemofcourse Oct 30, 2023
9f9157d
Merge branch 'master' into inteqmed
meemofcourse Nov 6, 2023
4940c13
Merge branch 'master' into inteqmed
meemofcourse Nov 14, 2023
a03db68
ough
meemofcourse Nov 14, 2023
b52cdc8
sigh
meemofcourse Nov 14, 2023
46ac7dc
Merge branch 'master' into inteqmed
meemofcourse Nov 14, 2023
2be9bcf
oops
meemofcourse Nov 17, 2023
403fbe2
Merge branch 'master' into inteqmed
meemofcourse Dec 6, 2023
3cd8adc
Merge branch 'master' into inteqmed
meemofcourse Dec 13, 2023
594495a
Update inteq_valor.dmm
meemofcourse Dec 20, 2023
f722e1b
Merge branch 'master' into inteqmed
meemofcourse Dec 20, 2023
154d5c7
Update chief_medical_officer.dm
meemofcourse Dec 20, 2023
9d10a47
Merge branch 'inteqmed' of https://github.com/meemofcourse/Shiptest i…
meemofcourse Dec 20, 2023
4cf2f56
big sex found
meemofcourse Jan 1, 2024
1b134f2
Merge branch 'master' into inteqmed
meemofcourse Jan 12, 2024
f6457c4
address zevo review
meemofcourse Jan 12, 2024
b36e0b9
Merge branch 'inteqmed' of https://github.com/meemofcourse/Shiptest i…
meemofcourse Jan 12, 2024
3e837f8
Update inteq_valor.dmm
meemofcourse Jan 12, 2024
cf8174d
Update inteq_haste.dmm
meemofcourse Jan 12, 2024
c862911
Update inteq_valor.dmm
meemofcourse Jan 12, 2024
e3ca3e8
Merge remote-tracking branch 'upstream/master' into inteqmed
meemofcourse Jan 18, 2024
71653e0
maptainer stealth fixes
meemofcourse Jan 18, 2024
e36229a
OH RIGHT THE AMBULANCE
meemofcourse Jan 18, 2024
d6dee5a
using apogee as a chisel
meemofcourse Jan 18, 2024
31abb65
fly properly please
meemofcourse Jan 24, 2024
afa818d
Update inteq_valor.dmm
meemofcourse Jan 27, 2024
1b85f00
relay, access, basic kits for corpsmen
meemofcourse Jan 28, 2024
0545fd5
Merge branch 'master' into inteqmed
meemofcourse Jan 28, 2024
1b08ae2
Update inteq_haste.dmm
meemofcourse Feb 1, 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
40 changes: 40 additions & 0 deletions _maps/configs/inteq_valor.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Valor-Class Field Care Cruiser",
"prefix": "IRMV",
"description": "The Valor is the dedicated medical vessel of the Inteq fleet, suitable for treatment both for Inteq combat casualties, or paid treatment of outsiders. It's equipped with high-end medical equipment and a small ambulance for patient transport for this purpose.",
"tags": ["Medical", "Subshuttle"],
"namelists": [
"MYTHOLOGICAL",
"NATURAL",
"INTEQ"
],
"map_short_name": "Valor-class",
"map_path": "_maps/shuttles/shiptest/inteq_valor.dmm",
"limit": 1,
"job_slots": {
"Vanguard": {
"outfit": "/datum/outfit/job/captain/inteq",
"officer": true,
"slots": 1
},
"Honorable Corpsman": {
"outfit": "/datum/outfit/job/cmo/inteq",
"officer": true,
"slots": 1
},
"Corpsman": {
"outfit": "/datum/outfit/job/paramedic/inteq",
"slots": 3
},
"Enforcer": {
"outfit": "/datum/outfit/job/security/inteq/naked",
"slots": 2
},
"Recruit": {
"outfit": "/datum/outfit/job/assistant/inteq",
"slots": 2
}
},
"enabled": true
}
Loading
Loading