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.

Sign up for GitHub

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

Adds custom plasmaman outfit support for ships #2857

Closed
wants to merge 4 commits into from
Closed

Adds custom plasmaman outfit support for ships #2857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2306d94
i think i might explode
meemofcourse Mar 24, 2024
7d4bf10
sigh
meemofcourse Mar 24, 2024
d6cf43d
insanity?
meemofcourse Mar 24, 2024
f319eb7
Merge remote-tracking branch 'upstream/master' into phorid-maint-pr
meemofcourse Apr 18, 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
8 changes: 8 additions & 0 deletions _maps/configs/independent_beluga.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,36 +17,44 @@
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/independent/captain",
"plasmaman_outfit": "/datum/outfit/plasmaman/command",
"officer": true,
"slots": 1
},
"First Officer": {
"outfit": "/datum/outfit/job/independent/hop",
"plasmaman_outfit": "/datum/outfit/plasmaman/hop",
"officer": true,
"slots": 1
},
"Mechanic": {
"outfit": "/datum/outfit/job/independent/engineer",
"plasmaman_outfit": "/datum/outfit/plasmaman/engineering",
"slots": 1
},
"Private Security Officer": {
"outfit": "/datum/outfit/job/inteq/security/beluga",
"plasmaman_outfit": "/datum/outfit/plasmaman/security",
"slots": 2
},
"High-Class Passenger": {
"outfit": "/datum/outfit/job/independent/lawyer",
"plasmaman_outfit": "/datum/outfit/plasmaman/bar",
"slots": 4
},
"Bartender": {
"outfit": "/datum/outfit/job/independent/bartender",
"plasmaman_outfit": "/datum/outfit/plasmaman/bar",
"slots": 1
},
"Janitor": {
"outfit": "/datum/outfit/job/independent/janitor",
"plasmaman_outfit": "/datum/outfit/plasmaman/janitor",
"slots": 1
},
"Assistant": {
"outfit": "/datum/outfit/job/independent/assistant",
"plasmaman_outfit": "/datum/outfit/plasmaman",
"slots": 2
}
},
Expand Down
4 changes: 4 additions & 0 deletions _maps/configs/independent_box.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,22 @@
"job_slots": {
"Chief Medical Officer": {
"outfit": "/datum/outfit/job/independent/cmo",
"plasmaman_outfit": "/datum/outfit/plasmaman/cmo",
"slots": 1
},
"Medical Doctor": {
"outfit": "/datum/outfit/job/independent/doctor",
"plasmaman_outfit": "/datum/outfit/plasmaman/medical",
"slots": 3
},
"Paramedic": {
"outfit": "/datum/outfit/job/independent/paramedic",
"plasmaman_outfit": "/datum/outfit/plasmaman/paramedic",
"slots": 2
},
"Assistant": {
"outfit": "/datum/outfit/job/independent/assistant",
"plasmaman_outfit": "/datum/outfit/plasmaman",
"slots": 3
}
},
Expand Down
5 changes: 5 additions & 0 deletions _maps/configs/independent_boyardee.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,27 @@
"job_slots": {
"Bartender": {
"outfit": "/datum/outfit/job/independent/bartender",
"plasmaman_outfit": "/datum/outfit/plasmaman/bar",
"slots": 1
},
"Cook": {
"outfit": "/datum/outfit/job/independent/cook",
"plasmaman_outfit": "/datum/outfit/plasmaman/chef",
"slots": 3
},
"Botanist": {
"outfit": "/datum/outfit/job/independent/botanist",
"plasmaman_outfit": "/datum/outfit/plasmaman/botany",
"slots": 2
},
"Janitor": {
"outfit": "/datum/outfit/job/independent/janitor",
"plasmaman_outfit": "/datum/outfit/plasmaman/janitor",
"slots": 1
},
"Waiter": {
"outfit": "/datum/outfit/job/independent/assistant/waiter",
"plasmaman_outfit": "/datum/outfit/plasmaman",
"slots": 2
}
},
Expand Down
5 changes: 5 additions & 0 deletions _maps/configs/independent_bubble.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,27 @@
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/independent/captain",
"plasmaman_outfit": "/datum/outfit/plasmaman/command",
"slots": 1
},
"Scientist": {
"outfit": "/datum/outfit/job/independent/scientist",
"plasmaman_outfit": "/datum/outfit/plasmaman/science",
"slots": 1
},
"Station Engineer": {
"outfit": "/datum/outfit/job/independent/engineer",
"plasmaman_outfit": "/datum/outfit/plasmaman/engineering",
"slots": 1
},
"Shaft Miner": {
"outfit": "/datum/outfit/job/independent/miner",
"plasmaman_outfit": "/datum/outfit/plasmaman/mining",
"slots": 1
},
"Assistant": {
"outfit": "/datum/outfit/job/independent/assistant",
"plasmaman_outfit": "/datum/outfit/plasmaman",
"slots": 3
}
},
Expand Down
6 changes: 6 additions & 0 deletions _maps/configs/independent_dwayne.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,27 +20,33 @@
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/independent/captain/western",
"plasmaman_outfit": "/datum/outfit/plasmaman/command",
"officer": true,
"slots": 1
},
"Foreman": {
"outfit": "/datum/outfit/job/independent/quartermaster/western",
"plasmaman_outfit": "/datum/outfit/plasmaman/cargo",
"slots": 1
},
"Ship's Doctor": {
"outfit": "/datum/outfit/job/independent/doctor",
"plasmaman_outfit": "/datum/outfit/plasmaman/medical",
"slots": 1
},
"Ship's Engineer": {
"outfit": "/datum/outfit/job/independent/engineer",
"plasmaman_outfit": "/datum/outfit/plasmaman/engineering",
"slots": 1
},
"Asteroid Miner": {
"outfit": "/datum/outfit/job/independent/miner/hazard",
"plasmaman_outfit": "/datum/outfit/plasmaman/mining",
"slots": 2
},
"Deckhand": {
"outfit": "/datum/outfit/job/independent/assistant",
"plasmaman_outfit": "/datum/outfit/plasmaman",
"slots": 3
}
},
Expand Down
1 change: 1 addition & 0 deletions _maps/configs/independent_junker.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"job_slots": {
"Assistant": {
"outfit": "/datum/outfit/job/assistant",
"plasmaman_outfit": "/datum/outfit/plasmaman",
"slots": 4
}
},
Expand Down
5 changes: 5 additions & 0 deletions _maps/configs/independent_kilo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,28 @@
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/independent/captain/western",
"plasmaman_outfit": "/datum/outfit/plasmaman/command",
"officer": true,
"slots": 1
},
"Ship's Doctor": {
"outfit": "/datum/outfit/job/independent/doctor",
"plasmaman_outfit": "/datum/outfit/plasmaman/medical",
"slots": 1
},
"Ship's Engineer": {
"outfit": "/datum/outfit/job/independent/engineer",
"plasmaman_outfit": "/datum/outfit/plasmaman/engineering",
"slots": 1
},
"Asteroid Miner": {
"outfit": "/datum/outfit/job/independent/miner",
"plasmaman_outfit": "/datum/outfit/plasmaman/mining",
"slots": 1
},
"Deckhand": {
"outfit": "/datum/outfit/job/independent/assistant",
"plasmaman_outfit": "/datum/outfit/plasmaman",
"slots": 1
}
},
Expand Down
12 changes: 12 additions & 0 deletions _maps/configs/independent_lagoon.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,50 +17,62 @@
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/independent/captain",
"plasmaman_outfit": "/datum/outfit/plasmaman/command",
"slots": 1
},
"Cruise Director": {
"outfit": "/datum/outfit/job/independent/hop",
"plasmaman_outfit": "/datum/outfit/plasmaman/hop",
"slots": 1
},
"Security Officer": {
"outfit": "/datum/outfit/job/independent/security",
"plasmaman_outfit": "/datum/outfit/plasmaman/security",
"slots": 2
},
"Medical Doctor": {
"outfit": "/datum/outfit/job/independent/doctor",
"plasmaman_outfit": "/datum/outfit/plasmaman/medical",
"slots": 1
},
"Ship Engineer": {
"outfit": "/datum/outfit/job/independent/atmos",
"plasmaman_outfit": "/datum/outfit/plasmaman/atmospherics",
"slots": 1
},
"Bartender": {
"outfit": "/datum/outfit/job/independent/bartender",
"plasmaman_outfit": "/datum/outfit/plasmaman/bar",
"slots": 1
},
"Cook": {
"outfit": "/datum/outfit/job/independent/cook",
"plasmaman_outfit": "/datum/outfit/plasmaman/chef",
"slots": 1
},
"Botanist": {
"outfit": "/datum/outfit/job/independent/botanist",
"plasmaman_outfit": "/datum/outfit/plasmaman/botany",
"slots": 1
},
"Curator": {
"outfit": "/datum/outfit/job/independent/curator",
"plasmaman_outfit": "/datum/outfit/plasmaman/curator",
"slots": 1
},
"Chaplain": {
"outfit": "/datum/outfit/job/independent/chaplain",
"plasmaman_outfit": "/datum/outfit/plasmaman/chaplain",
"slots": 1
},
"Janitor": {
"outfit": "/datum/outfit/job/independent/janitor",
"plasmaman_outfit": "/datum/outfit/plasmaman/janitor",
"slots": 1
},
"Passenger": {
"outfit": "/datum/outfit/job/independent/assistant/fancy",
"plasmaman_outfit": "/datum/outfit/plasmaman",
"slots": 10
}
},
Expand Down
3 changes: 3 additions & 0 deletions _maps/configs/independent_mudskipper.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,18 @@
"job_slots": {
"Salvage Leader": {
"outfit": "/datum/outfit/job/independent/captain",
"plasmaman_outfit": "/datum/outfit/plasmaman/command",
"officer": true,
"slots": 1
},
"Salvager": {
"outfit": "/datum/outfit/job/independent/engineer/salvage",
"plasmaman_outfit": "/datum/outfit/plasmaman/engineering",
"slots": 2
},
"Salvage Technician": {
"outfit": "/datum/outfit/job/independent/engineer",
"plasmaman_outfit": "/datum/outfit/plasmaman/engineering",
"slots": 1
}
},
Expand Down
6 changes: 6 additions & 0 deletions _maps/configs/independent_rigger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,24 @@
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/independent/captain/western",
"plasmaman_outfit": "/datum/outfit/plasmaman/command",
"officer": true,
"slots": 1
},
"First Mate": {
"outfit": "/datum/outfit/job/independent/hop/western",
"plasmaman_outfit": "/datum/outfit/plasmaman/hop",
"officer": true,
"slots": 1
},
"Ship's Doctor": {
"outfit": "/datum/outfit/job/independent/doctor",
"plasmaman_outfit": "/datum/outfit/plasmaman/medical",
"slots": 1
},
"Machinist's Mate": {
"outfit": "/datum/outfit/job/independent/engineer",
"plasmaman_outfit": "/datum/outfit/plasmaman/engineering",
"slots": 1
},
"Asteroid Miner": {
Expand All @@ -42,10 +46,12 @@
},
"Security Detail": {
"outfit": "/datum/outfit/job/independent/security/western",
"plasmaman_outfit": "/datum/outfit/plasmaman/security",
"slots": 1
},
"Deckhand": {
"outfit": "/datum/outfit/job/independent/assistant",
"plasmaman_outfit": "/datum/outfit/plasmaman",
"slots": 2
}
},
Expand Down
5 changes: 5 additions & 0 deletions _maps/configs/independent_schmiedeberg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,26 +18,31 @@
"job_slots": {
"Chief Pharmacist": {
"outfit": "/datum/outfit/job/independent/cmo/pharma",
"plasmaman_outfit": "/datum/outfit/plasmaman/cmo",
"officer": true,
"slots": 1
},
"Pharmacist": {
"outfit": "/datum/outfit/job/independent/chemist/pharma",
"plasmaman_outfit": "/datum/outfit/plasmaman/chemist",
"officer": false,
"slots": 1
},
"Mixologist": {
"outfit": "/datum/outfit/job/independent/bartender/pharma",
"plasmaman_outfit": "/datum/outfit/plasmaman/bar",
"officer": false,
"slots": 1
},
"Herbalist": {
"outfit": "/datum/outfit/job/independent/botanist/pharma",
"plasmaman_outfit": "/datum/outfit/plasmaman/botany",
"officer": false,
"slots": 2
},
"Pharmacology Student": {
"outfit": "/datum/outfit/job/independent/assistant/pharma",
"plasmaman_outfit": "/datum/outfit/plasmaman",
"officer": false,
"slots": 2
}
Expand Down
6 changes: 6 additions & 0 deletions _maps/configs/independent_shetland.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,28 +18,34 @@
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/independent/captain/cheap",
"plasmaman_outfit": "/datum/outfit/plasmaman/command",
"officer": true,
"slots": 1
},
"First Mate": {
"outfit": "/datum/outfit/job/independent/hop",
"plasmaman_outfit": "/datum/outfit/plasmaman/hop",
"officer": true,
"slots": 1
},
"Medical Doctor": {
"outfit": "/datum/outfit/job/independent/doctor",
"plasmaman_outfit": "/datum/outfit/plasmaman/medical",
"slots": 1
},
"Ship's Engineer": {
"outfit": "/datum/outfit/job/independent/engineer",
"plasmaman_outfit": "/datum/outfit/plasmaman/engineering",
"slots": 2
},
"Asteroid Miner": {
"outfit": "/datum/outfit/job/independent/miner/hazard",
"plasmaman_outfit": "/datum/outfit/plasmaman/mining",
"slots": 1
},
"Security Detail": {
"outfit": "/datum/outfit/job/independent/security/western",
"plasmaman_outfit": "/datum/outfit/plasmaman/security",
"slots": 1
},
"Deckhand": {
Expand Down
Loading
Loading