diff --git a/_maps/configs/independent_beluga.json b/_maps/configs/independent_beluga.json index 64230b0dc797..7d46f8a8e291 100644 --- a/_maps/configs/independent_beluga.json +++ b/_maps/configs/independent_beluga.json @@ -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 } }, diff --git a/_maps/configs/independent_box.json b/_maps/configs/independent_box.json index 14133f03f5bb..5840d12d3ae6 100644 --- a/_maps/configs/independent_box.json +++ b/_maps/configs/independent_box.json @@ -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 } }, diff --git a/_maps/configs/independent_boyardee.json b/_maps/configs/independent_boyardee.json index f099b23952e9..bff4cb7b92ed 100644 --- a/_maps/configs/independent_boyardee.json +++ b/_maps/configs/independent_boyardee.json @@ -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 } }, diff --git a/_maps/configs/independent_bubble.json b/_maps/configs/independent_bubble.json index f63aca854e8b..265910cb2197 100644 --- a/_maps/configs/independent_bubble.json +++ b/_maps/configs/independent_bubble.json @@ -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 } }, diff --git a/_maps/configs/independent_dwayne.json b/_maps/configs/independent_dwayne.json index 1cd4a3683f0f..9de6f1899653 100644 --- a/_maps/configs/independent_dwayne.json +++ b/_maps/configs/independent_dwayne.json @@ -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 } }, diff --git a/_maps/configs/independent_junker.json b/_maps/configs/independent_junker.json index bd7807a02bb4..283c9d7eccf3 100644 --- a/_maps/configs/independent_junker.json +++ b/_maps/configs/independent_junker.json @@ -17,6 +17,7 @@ "job_slots": { "Assistant": { "outfit": "/datum/outfit/job/assistant", + "plasmaman_outfit": "/datum/outfit/plasmaman", "slots": 4 } }, diff --git a/_maps/configs/independent_kilo.json b/_maps/configs/independent_kilo.json index b1304f2e78bb..1635c1e3e661 100644 --- a/_maps/configs/independent_kilo.json +++ b/_maps/configs/independent_kilo.json @@ -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 } }, diff --git a/_maps/configs/independent_lagoon.json b/_maps/configs/independent_lagoon.json index 017850eef555..36dea4485fa6 100644 --- a/_maps/configs/independent_lagoon.json +++ b/_maps/configs/independent_lagoon.json @@ -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 } }, diff --git a/_maps/configs/independent_mudskipper.json b/_maps/configs/independent_mudskipper.json index 1dfd48861d13..7418ad84e4bc 100644 --- a/_maps/configs/independent_mudskipper.json +++ b/_maps/configs/independent_mudskipper.json @@ -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 } }, diff --git a/_maps/configs/independent_rigger.json b/_maps/configs/independent_rigger.json index 3550773cc0e4..09f318f24bbd 100644 --- a/_maps/configs/independent_rigger.json +++ b/_maps/configs/independent_rigger.json @@ -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": { @@ -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 } }, diff --git a/_maps/configs/independent_schmiedeberg.json b/_maps/configs/independent_schmiedeberg.json index d7dd360bb1e4..c39fcee936d3 100644 --- a/_maps/configs/independent_schmiedeberg.json +++ b/_maps/configs/independent_schmiedeberg.json @@ -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 } diff --git a/_maps/configs/independent_shetland.json b/_maps/configs/independent_shetland.json index 344f9a99ee50..17d7fcb8d1cf 100644 --- a/_maps/configs/independent_shetland.json +++ b/_maps/configs/independent_shetland.json @@ -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": { diff --git a/_maps/configs/independent_tranquility.json b/_maps/configs/independent_tranquility.json index 07236d5e4568..6cc34b8d5460 100644 --- a/_maps/configs/independent_tranquility.json +++ b/_maps/configs/independent_tranquility.json @@ -18,27 +18,33 @@ "job_slots": { "Captain": { "outfit": "/datum/outfit/job/independent/captain/western", + "plasmaman_outfit": "/datum/outfit/plasmaman/command", "officer": true, "slots": 1 }, "Scholar": { "outfit": "/datum/outfit/job/independent/curator", + "plasmaman_outfit": "/datum/outfit/plasmaman/curator", "slots": 1 }, "Medical Tenant": { "outfit": "/datum/outfit/job/independent/chemist", + "plasmaman_outfit": "/datum/outfit/plasmaman/chemist", "slots": 1 }, "Engineering Tenant": { "outfit": "/datum/outfit/job/independent/engineer", + "plasmaman_outfit": "/datum/outfit/plasmaman/engineering", "slots": 1 }, "Tenant": { "outfit": "/datum/outfit/job/independent/curator/dungeonmaster", + "plasmaman_outfit": "/datum/outfit/plasmaman/curator", "slots": 1 }, "Resident Artist": { "outfit": "/datum/outfit/job/independent/assistant/artist", + "plasmaman_outfit": "/datum/outfit/plasmaman", "slots": 1 } }, diff --git a/_maps/configs/inteq_colossus.json b/_maps/configs/inteq_colossus.json index 29337cb015a2..8cc290c16bf7 100644 --- a/_maps/configs/inteq_colossus.json +++ b/_maps/configs/inteq_colossus.json @@ -19,28 +19,34 @@ "job_slots": { "Vanguard": { "outfit": "/datum/outfit/job/inteq/captain", + "plasmaman_outfit": "/datum/outfit/plasmaman/hos", "officer": true, "slots": 1 }, "Master At Arms": { "outfit": "/datum/outfit/job/inteq/warden", + "plasmaman_outfit": "/datum/outfit/plasmaman/warden", "officer": true, "slots": 1 }, "Artificer": { "outfit": "/datum/outfit/job/inteq/engineer", + "plasmaman_outfit": "/datum/outfit/plasmaman/engineering", "slots": 1 }, "Corpsman": { "outfit": "/datum/outfit/job/inteq/paramedic", + "plasmaman_outfit": "/datum/outfit/plasmaman/paramedic", "slots": 1 }, "Enforcer": { "outfit": "/datum/outfit/job/inteq/security", + "plasmaman_outfit": "/datum/outfit/plasmaman/security", "slots": 3 }, "Recruit": { "outfit": "/datum/outfit/job/inteq/assistant", + "plasmaman_outfit": "/datum/outfit/plasmaman", "slots": 5 } }, diff --git a/_maps/configs/inteq_hound.json b/_maps/configs/inteq_hound.json index cad19884158f..a93102e48656 100644 --- a/_maps/configs/inteq_hound.json +++ b/_maps/configs/inteq_hound.json @@ -18,15 +18,18 @@ "job_slots": { "Vanguard": { "outfit": "/datum/outfit/job/inteq/captain", + "plasmaman_outfit": "/datum/outfit/plasmaman/hos", "officer": true, "slots": 1 }, "Enforcer": { "outfit": "/datum/outfit/job/inteq/security", + "plasmaman_outfit": "/datum/outfit/plasmaman/security", "slots": 3 }, "Recruit": { "outfit": "/datum/outfit/job/inteq/assistant", + "plasmaman_outfit": "/datum/outfit/plasmaman", "slots": 3 } }, diff --git a/_maps/configs/inteq_talos.json b/_maps/configs/inteq_talos.json index e65253ad3239..3082701b7c89 100644 --- a/_maps/configs/inteq_talos.json +++ b/_maps/configs/inteq_talos.json @@ -19,33 +19,40 @@ "job_slots": { "Vanguard": { "outfit": "/datum/outfit/job/inteq/captain", + "plasmaman_outfit": "/datum/outfit/plasmaman/hos", "officer": true, "slots": 1 }, "Master At Arms": { "outfit": "/datum/outfit/job/inteq/warden", + "plasmaman_outfit": "/datum/outfit/plasmaman/warden", "officer": true, "slots": 1 }, "Artificer Class II": { "outfit": "/datum/outfit/job/inteq/ce", + "plasmaman_outfit": "/datum/outfit/plasmaman/ce", "officer": true, "slots": 1 }, "Artificer": { "outfit": "/datum/outfit/job/inteq/engineer", + "plasmaman_outfit": "/datum/outfit/plasmaman/engineering", "slots": 3 }, "Corpsman": { "outfit": "/datum/outfit/job/inteq/paramedic", + "plasmaman_outfit": "/datum/outfit/plasmaman/paramedic", "slots": 2 }, "Enforcer": { "outfit": "/datum/outfit/job/inteq/security", + "plasmaman_outfit": "/datum/outfit/plasmaman/security", "slots": 1 }, "Recruit": { "outfit": "/datum/outfit/job/inteq/assistant", + "plasmaman_outfit": "/datum/outfit/plasmaman", "slots": 4 } }, diff --git a/_maps/configs/inteq_valor.json b/_maps/configs/inteq_valor.json index 92162ac1a5da..7251f57b03af 100644 --- a/_maps/configs/inteq_valor.json +++ b/_maps/configs/inteq_valor.json @@ -15,24 +15,29 @@ "job_slots": { "Vanguard": { "outfit": "/datum/outfit/job/inteq/captain", + "plasmaman_outfit": "/datum/outfit/plasmaman/hos", "officer": true, "slots": 1 }, "Honorable Corpsman": { "outfit": "/datum/outfit/job/inteq/cmo/empty", + "plasmaman_outfit": "/datum/outfit/plasmaman/cmo", "officer": true, "slots": 1 }, "Corpsman": { "outfit": "/datum/outfit/job/inteq/paramedic/empty", + "plasmaman_outfit": "/datum/outfit/plasmaman/paramedic", "slots": 3 }, "Enforcer": { "outfit": "/datum/outfit/job/inteq/security/empty", + "plasmaman_outfit": "/datum/outfit/plasmaman/security", "slots": 2 }, "Recruit": { "outfit": "/datum/outfit/job/inteq/assistant", + "plasmaman_outfit": "/datum/outfit/plasmaman", "slots": 2 } }, diff --git a/_maps/configs/inteq_vaquero.json b/_maps/configs/inteq_vaquero.json index e8d790a526dc..c18ca90cfcbf 100644 --- a/_maps/configs/inteq_vaquero.json +++ b/_maps/configs/inteq_vaquero.json @@ -16,28 +16,34 @@ "job_slots": { "Vanguard": { "outfit": "/datum/outfit/job/inteq/captain", + "plasmaman_outfit": "/datum/outfit/plasmaman/hos", "officer": true, "slots": 1 }, "Master At Arms": { "outfit": "/datum/outfit/job/inteq/warden", + "plasmaman_outfit": "/datum/outfit/plasmaman/warden", "officer": true, "slots": 1 }, "Artificer": { "outfit": "/datum/outfit/job/inteq/engineer", + "plasmaman_outfit": "/datum/outfit/plasmaman/engineering", "slots": 1 }, "Corpsman": { "outfit": "/datum/outfit/job/inteq/paramedic", + "plasmaman_outfit": "/datum/outfit/plasmaman/paramedic", "slots": 1 }, "Enforcer": { "outfit": "/datum/outfit/job/inteq/security", + "plasmaman_outfit": "/datum/outfit/plasmaman/security", "slots": 1 }, "Recruit": { "outfit": "/datum/outfit/job/inteq/assistant", + "plasmaman_outfit": "/datum/outfit/plasmaman", "slots": 2 } }, diff --git a/_maps/configs/minutemen_vela.json b/_maps/configs/minutemen_vela.json index 74746ef5432e..b42637366ed6 100644 --- a/_maps/configs/minutemen_vela.json +++ b/_maps/configs/minutemen_vela.json @@ -16,37 +16,45 @@ "job_slots": { "Captain": { "outfit": "/datum/outfit/job/clip/minutemen/captain", + "plasmaman_outfit": "/datum/outfit/plasmaman/command", "officer": true, "slots": 1 }, "Foreman": { "outfit": "/datum/outfit/job/clip/ce", + "plasmaman_outfit": "/datum/outfit/plasmaman/ce", "officer": true, "slots": 1 }, "First Officer": { "outfit": "/datum/outfit/job/clip/first_officer", + "plasmaman_outfit": "/datum/outfit/plasmaman/hop", "officer": true, "slots": 1 }, "Mech Pilot": { "outfit": "/datum/outfit/job/clip/minutemen/vehicle_pilot", + "plasmaman_outfit": "/datum/outfit/plasmaman/robotics", "slots": 4 }, "Minuteman": { "outfit": "/datum/outfit/job/clip/minutemen/grunt", + "plasmaman_outfit": "/datum/outfit/plasmaman/security", "slots": 2 }, "Engineer": { "outfit": "/datum/outfit/job/clip/mechanic", + "plasmaman_outfit": "/datum/outfit/plasmaman/engineering", "slots": 2 }, "Researcher": { "outfit": "/datum/outfit/job/clip/scientist", + "plasmaman_outfit": "/datum/outfit/plasmaman/science", "slots": 2 }, "Deckhand": { "outfit": "/datum/outfit/job/clip/minutemen/deckhand", + "plasmaman_outfit": "/datum/outfit/plasmaman", "slots": 1 } }, diff --git a/_maps/configs/nanotrasen_delta.json b/_maps/configs/nanotrasen_delta.json index f367497a820e..f09f71bc5579 100644 --- a/_maps/configs/nanotrasen_delta.json +++ b/_maps/configs/nanotrasen_delta.json @@ -20,19 +20,23 @@ "job_slots": { "Captain": { "outfit": "/datum/outfit/job/nanotrasen/captain", + "plasmaman_outfit": "/datum/outfit/plasmaman/command", "officer": true, "slots": 1 }, "Roboticist": { "outfit": "/datum/outfit/job/nanotrasen/roboticist", + "plasmaman_outfit": "/datum/outfit/plasmaman/robotics", "slots": 2 }, "Engineer": { "outfit": "/datum/outfit/job/nanotrasen/engineer", + "plasmaman_outfit": "/datum/outfit/plasmaman/engineering", "slots": 1 }, "Assistant": { "outfit": "/datum/outfit/job/nanotrasen/assistant", + "plasmaman_outfit": "/datum/outfit/plasmaman", "slots": 3 } }, diff --git a/_maps/configs/nanotrasen_gecko.json b/_maps/configs/nanotrasen_gecko.json index 9ba0672f03db..b7fa8ccf9079 100644 --- a/_maps/configs/nanotrasen_gecko.json +++ b/_maps/configs/nanotrasen_gecko.json @@ -19,24 +19,29 @@ "job_slots": { "Captain": { "outfit": "/datum/outfit/job/nanotrasen/captain", + "plasmaman_outfit": "/datum/outfit/plasmaman/command", "officer": true, "slots": 1 }, "Operations Chief": { "outfit": "/datum/outfit/job/nanotrasen/ce", + "plasmaman_outfit": "/datum/outfit/plasmaman/ce", "officer": true, "slots": 1 }, "Engine Technician": { "outfit": "/datum/outfit/job/nanotrasen/engineer", + "plasmaman_outfit": "/datum/outfit/plasmaman/engineering", "slots": 2 }, "Salvage Technician": { "outfit": "/datum/outfit/job/nanotrasen/miner", + "plasmaman_outfit": "/datum/outfit/plasmaman/mining", "slots": 2 }, "Deckhand": { "outfit": "/datum/outfit/job/nanotrasen/assistant", + "plasmaman_outfit": "/datum/outfit/plasmaman", "slots": 4 } }, diff --git a/_maps/configs/nanotrasen_heron.json b/_maps/configs/nanotrasen_heron.json index 80bf87c0cd15..12a9299f59f2 100644 --- a/_maps/configs/nanotrasen_heron.json +++ b/_maps/configs/nanotrasen_heron.json @@ -11,59 +11,72 @@ "job_slots": { "Fleet Captain": { "outfit": "/datum/outfit/job/nanotrasen/captain/centcom", + "plasmaman_outfit": "/datum/outfit/plasmaman/command", "officer": true, "slots": 1 }, "First Officer": { "outfit": "/datum/outfit/job/nanotrasen/hop", + "plasmaman_outfit": "/datum/outfit/plasmaman/hop", "officer": true, "slots": 1 }, "Head of Security": { "outfit": "/datum/outfit/job/nanotrasen/hos", + "plasmaman_outfit": "/datum/outfit/plasmaman/hos", "officer": true, "slots": 1 }, "Pilot": { "outfit": "/datum/outfit/job/nanotrasen/pilot", + "plasmaman_outfit": "/datum/outfit/plasmaman/robotics", "officer": true, "slots": 1 }, "Security Officer": { "outfit": "/datum/outfit/job/nanotrasen/security", + "plasmaman_outfit": "/datum/outfit/plasmaman/security", "slots": 1 }, "ERT Officer":{ "outfit": "/datum/outfit/job/nanotrasen/security/ert", + "plasmaman_outfit": "/datum/outfit/plasmaman/security", "slots": 4 }, "ERT Medical Officer":{ "outfit": "/datum/outfit/job/nanotrasen/security/ert/med", + "plasmaman_outfit": "/datum/outfit/plasmaman/paramedic", "slots": 1 }, "ERT Engineering Officer":{ "outfit": "/datum/outfit/job/nanotrasen/security/ert/engi", + "plasmaman_outfit": "/datum/outfit/plasmaman/engineering", "slots": 1 }, "Mech Pilot":{ "outfit": "/datum/outfit/job/nanotrasen/security/mech_pilot", + "plasmaman_outfit": "/datum/outfit/plasmaman/robotics", "slots": 1 }, "Engine Technician": { "outfit": "/datum/outfit/job/nanotrasen/engineer", + "plasmaman_outfit": "/datum/outfit/plasmaman/engineering", "slots": 1 }, "Chief Engineer":{ "outfit": "/datum/outfit/job/nanotrasen/ce", + "plasmaman_outfit": "/datum/outfit/plasmaman/ce", "officer": true, "slots": 1 }, "Roboticist": { "outfit":"/datum/outfit/job/nanotrasen/roboticist", + "plasmaman_outfit": "/datum/outfit/plasmaman/robotics", "slots": 1 }, "Medical Doctor":{ "outfit": "/datum/outfit/job/nanotrasen/doctor", + "plasmaman_outfit": "/datum/outfit/plasmaman/medical", "slots": 1 }, diff --git a/_maps/configs/nanotrasen_meta.json b/_maps/configs/nanotrasen_meta.json index b4287c3bca3b..00c7b0da9df0 100644 --- a/_maps/configs/nanotrasen_meta.json +++ b/_maps/configs/nanotrasen_meta.json @@ -19,32 +19,39 @@ "job_slots": { "Captain": { "outfit": "/datum/outfit/job/nanotrasen/captain", + "plasmaman_outfit": "/datum/outfit/plasmaman/command", "officer": true, "slots": 1 }, "Quartermaster": { "outfit": "/datum/outfit/job/nanotrasen/quartermaster", + "plasmaman_outfit": "/datum/outfit/plasmaman/cargo", "officer": true, "slots": 1 }, "Medical Doctor": { "outfit": "/datum/outfit/job/nanotrasen/doctor", + "plasmaman_outfit": "/datum/outfit/plasmaman/medical", "slots": 1 }, "Ship Engineer": { "outfit": "/datum/outfit/job/nanotrasen/engineer", + "plasmaman_outfit": "/datum/outfit/plasmaman/engineering", "slots": 1 }, "Shaft Miner": { "outfit": "/datum/outfit/job/nanotrasen/miner", + "plasmaman_outfit": "/datum/outfit/plasmaman/mining", "slots": 1 }, "Cargo Technician": { "outfit": "/datum/outfit/job/cargo_tech", + "plasmaman_outfit": "/datum/outfit/plasmaman/cargo", "slots": 1 }, "Assistant": { "outfit": "/datum/outfit/job/nanotrasen/assistant", + "plasmaman_outfit": "/datum/outfit/plasmaman", "slots": 2 } }, diff --git a/_maps/configs/nanotrasen_mimir.json b/_maps/configs/nanotrasen_mimir.json index db7d8b90d198..5abf7d21da0e 100644 --- a/_maps/configs/nanotrasen_mimir.json +++ b/_maps/configs/nanotrasen_mimir.json @@ -20,19 +20,23 @@ "job_slots": { "Warden": { "outfit": "/datum/outfit/job/nanotrasen/warden", + "plasmaman_outfit": "/datum/outfit/plasmaman/warden", "officer": true, "slots": 1 }, "Facility Security Officer": { "outfit": "/datum/outfit/job/nanotrasen/security", + "plasmaman_outfit": "/datum/outfit/plasmaman/security", "slots": 2 }, "Facility Physician": { "outfit": "/datum/outfit/job/nanotrasen/brig_phys", + "plasmaman_outfit": "/datum/outfit/plasmaman/secmed", "slots": 1 }, "Patient": { "outfit": "/datum/outfit/job/prisoner", + "plasmaman_outfit": "/datum/outfit/plasmaman/prisoner", "slots": 2 } }, diff --git a/_maps/configs/nanotrasen_osprey.json b/_maps/configs/nanotrasen_osprey.json index 7e0804a7f203..b0495d7fb443 100644 --- a/_maps/configs/nanotrasen_osprey.json +++ b/_maps/configs/nanotrasen_osprey.json @@ -17,56 +17,69 @@ "job_slots": { "Captain": { "outfit": "/datum/outfit/job/nanotrasen/captain", + "plasmaman_outfit": "/datum/outfit/plasmaman/command", "officer": true, "slots": 1 }, "First Officer": { "outfit": "/datum/outfit/job/nanotrasen/hop", + "plasmaman_outfit": "/datum/outfit/plasmaman/hop", "officer": true, "slots": 1 }, "Scientist": { "outfit": "/datum/outfit/job/nanotrasen/scientist", + "plasmaman_outfit": "/datum/outfit/plasmaman/science", "slots": 2 }, "Medical Doctor": { "outfit": "/datum/outfit/job/nanotrasen/doctor", + "plasmaman_outfit": "/datum/outfit/plasmaman/medical", "slots": 1 }, "Paramedic": { "outfit": "/datum/outfit/job/nanotrasen/paramedic", + "plasmaman_outfit": "/datum/outfit/plasmaman/paramedic", "slots": 1 }, "Engineer": { "outfit": "/datum/outfit/job/nanotrasen/engineer", + "plasmaman_outfit": "/datum/outfit/plasmaman/engineering", "slots": 1 }, "Atmospheric Technician": { "outfit": "/datum/outfit/job/nanotrasen/atmos", + "plasmaman_outfit": "/datum/outfit/plasmaman/atmospherics", "slots": 1 }, "Quartermaster": { "outfit": "/datum/outfit/job/nanotrasen/quartermaster", + "plasmaman_outfit": "/datum/outfit/plasmaman/cargo", "slots": 1 }, "Cargo Technician": { "outfit": "/datum/outfit/job/nanotrasen/cargo_tech", + "plasmaman_outfit": "/datum/outfit/plasmaman/cargo", "slots": 1 }, "Shaft Miner": { "outfit": "/datum/outfit/job/nanotrasen/miner", + "plasmaman_outfit": "/datum/outfit/plasmaman/mining", "slots": 1 }, "Cook": { "outfit": "/datum/outfit/job/cook", + "plasmaman_outfit": "/datum/outfit/plasmaman/chef", "slots": 1 }, "Janitor": { "outfit": "/datum/outfit/job/janitor", + "plasmaman_outfit": "/datum/outfit/plasmaman/janitor", "slots": 1 }, "Assistant": { "outfit": "/datum/outfit/job/nanotrasen/assistant", + "plasmaman_outfit": "/datum/outfit/plasmaman", "slots": 3 } }, diff --git a/_maps/configs/nanotrasen_ranger.json b/_maps/configs/nanotrasen_ranger.json index b4af3e797d39..a55826560f92 100644 --- a/_maps/configs/nanotrasen_ranger.json +++ b/_maps/configs/nanotrasen_ranger.json @@ -23,23 +23,28 @@ "job_slots": { "LP Lieutenant": { "outfit": "/datum/outfit/job/nanotrasen/captain/lp", + "plasmaman_outfit": "/datum/outfit/plasmaman/command", "officer": true, "slots": 1 }, "LP Engineering Specialist": { "outfit": "/datum/outfit/job/nanotrasen/engineer/lp", + "plasmaman_outfit": "/datum/outfit/plasmaman/ce", "slots": 1 }, "LP Security Specialist": { "outfit": "/datum/outfit/job/nanotrasen/security/lp", + "plasmaman_outfit": "/datum/outfit/plasmaman/hos", "slots": 1 }, "LP Medical Specialist": { "outfit": "/datum/outfit/job/nanotrasen/doctor/lp", + "plasmaman_outfit": "/datum/outfit/plasmaman/cmo", "slots": 1 }, "Intern": { "outfit": "/datum/outfit/job/nanotrasen/assistant", + "plasmaman_outfit": "/datum/outfit/plasmaman", "slots": 1 } }, diff --git a/_maps/configs/nanotrasen_skipper.json b/_maps/configs/nanotrasen_skipper.json index 9ced4c28038c..2bc755c7041e 100644 --- a/_maps/configs/nanotrasen_skipper.json +++ b/_maps/configs/nanotrasen_skipper.json @@ -21,42 +21,55 @@ "job_slots": { "Captain": { "outfit": "/datum/outfit/job/nanotrasen/captain", + "plasmaman_outfit": "/datum/outfit/plasmaman/command", "officer": true, "slots": 1 }, "First Officer": { "outfit": "/datum/outfit/job/nanotrasen/hop", + "plasmaman_outfit": "/datum/outfit/plasmaman/hop", "officer": true, "slots": 1 }, "Internal Affairs Agent": { "outfit": "/datum/outfit/job/nanotrasen/lawyer/corporaterepresentative", + "plasmaman_outfit": "/datum/outfit/plasmaman", "slots" : 1 }, "Medical Doctor": 1, "Engineer": { "outfit": "/datum/outfit/job/nanotrasen/engineer", + "plasmaman_outfit": "/datum/outfit/plasmaman/engineering", "slots": 1 }, "Atmospheric Technician": { "outfit": "/datum/outfit/job/nanotrasen/atmos", + "plasmaman_outfit": "/datum/outfit/plasmaman/atmospherics", "slots": 1 }, - "Shaft Miner": 2, + "Shaft Miner": { + "outfit": "/datum/outfit/job/nanotrasen/miner", + "plasmaman_outfit": "/datum/outfit/plasmaman/mining", + "slots": 2 + }, "Cargo Technician": { - "outfit": "/datum/outfit/job/nanotrasen/cargo_tech", - "slots": 1 + "outfit": "/datum/outfit/job/nanotrasen/cargo_tech", + "plasmaman_outfit": "/datum/outfit/plasmaman/cargo", + "slots": 1 }, "Security Officer": { "outfit": "/datum/outfit/job/nanotrasen/security", + "plasmaman_outfit": "/datum/outfit/plasmaman/security", "slots": 1 }, "Cook": { "outfit": "/datum/outfit/job/cook", + "plasmaman_outfit": "/datum/outfit/plasmaman/chef", "slots": 1 }, "Assistant": { "outfit": "/datum/outfit/job/assistant", + "plasmaman_outfit": "/datum/outfit/plasmaman", "slots": 3 } }, diff --git a/_maps/configs/pirate_ember.json b/_maps/configs/pirate_ember.json index 29a45c64cd6c..b8f58d140427 100644 --- a/_maps/configs/pirate_ember.json +++ b/_maps/configs/pirate_ember.json @@ -19,50 +19,61 @@ "job_slots": { "Captain": { "outfit": "/datum/outfit/job/frontiersmen/captain", + "plasmaman_outfit": "/datum/outfit/plasmaman/command", "officer": true, "slots": 1 }, "Bridge Officer": { "outfit": "/datum/outfit/job/frontiersmen/hop", + "plasmaman_outfit": "/datum/outfit/plasmaman/hop", "officer": true, "slots": 2 }, "Shipswain": { "outfit": "/datum/outfit/job/frontiersmen/hos", + "plasmaman_outfit": "/datum/outfit/plasmaman/hos", "officer": true, "slots": 1 }, "Senior Sapper" :{ "outfit": "/datum/outfit/job/frontiersmen/ce", + "plasmaman_outfit": "/datum/outfit/plasmaman/ce", "officer": true, "slots": 1 }, "Cargo Tech": { "outfit": "/datum/outfit/job/frontiersmen/cargo_tech", + "plasmaman_outfit": "/datum/outfit/plasmaman/cargo", "slots": 2 }, "Aidman": { "outfit": "/datum/outfit/job/frontiersmen/doctor", + "plasmaman_outfit": "/datum/outfit/plasmaman/medical", "slots": 1 }, "Sapper": { "outfit": "/datum/outfit/job/frontiersmen/engineer", + "plasmaman_outfit": "/datum/outfit/plasmaman/engineering", "slots": 2 }, "Atmospheric Technician": { "outfit": "/datum/outfit/job/frontiersmen/atmos", + "plasmaman_outfit": "/datum/outfit/plasmaman/atmospherics", "slots": 1 }, "Steward": { "outfit": "/datum/outfit/job/frontiersmen/cook", + "plasmaman_outfit": "/datum/outfit/plasmaman/chef", "slots": 1 }, "Boarder": { "outfit": "/datum/outfit/job/frontiersmen/security", + "plasmaman_outfit": "/datum/outfit/plasmaman/security", "slots": 3 }, "Rookie": { "outfit": "/datum/outfit/job/frontiersmen/assistant", + "plasmaman_outfit": "/datum/outfit/plasmaman", "slots": 3 } }, diff --git a/_maps/configs/pirate_libertatia.json b/_maps/configs/pirate_libertatia.json index f61e421b0952..ffe2dd8977f0 100644 --- a/_maps/configs/pirate_libertatia.json +++ b/_maps/configs/pirate_libertatia.json @@ -15,28 +15,34 @@ "job_slots": { "Captain": { "outfit": "/datum/outfit/job/independent/captain/pirate", + "plasmaman_outfit": "/datum/outfit/plasmaman/command", "officer": true, "slots": 1 }, "First Mate": { "outfit": "/datum/outfit/job/independent/hop/pirate", + "plasmaman_outfit": "/datum/outfit/plasmaman/hop", "officer": true, "slots": 1 }, "Buccaneer": { "outfit": "/datum/outfit/job/independent/security/pirate", + "plasmaman_outfit": "/datum/outfit/plasmaman/security", "slots": 2 }, "Motorman": { "outfit": "/datum/outfit/job/independent/engineer/pirate", + "plasmaman_outfit": "/datum/outfit/plasmaman/engineering", "slots": 1 }, "Ship's Doctor": { "outfit": "/datum/outfit/job/independent/doctor/pirate", + "plasmaman_outfit": "/datum/outfit/plasmaman/medical", "slots": 1 }, "Deckhand": { "outfit": "/datum/outfit/job/independent/assistant/pirate", + "plasmaman_outfit": "/datum/outfit/plasmaman", "slots": 4 } }, diff --git a/_maps/configs/pirate_noderider.json b/_maps/configs/pirate_noderider.json index 1341a6197635..e369bc495182 100644 --- a/_maps/configs/pirate_noderider.json +++ b/_maps/configs/pirate_noderider.json @@ -18,19 +18,23 @@ "job_slots": { "Command Node": { "outfit": "/datum/outfit/job/independent/captain/pirate/jupiter", + "plasmaman_outfit": "/datum/outfit/plasmaman/command", "officer": true, "slots": 1 }, "Assault Node": { "outfit": "/datum/outfit/job/independent/security/pirate/jupiter", + "plasmaman_outfit": "/datum/outfit/plasmaman/security", "slots": 2 }, "Engineering Node": { "outfit": "/datum/outfit/job/independent/engineer/pirate/jupiter", + "plasmaman_outfit": "/datum/outfit/plasmaman/engineering", "slots": 1 }, "Fodder": { "outfit": "/datum/outfit/job/independent/assistant/pirate/jupiter", + "plasmaman_outfit": "/datum/outfit/plasmaman", "slots": 2 } }, diff --git a/_maps/configs/solgov_chronicle.json b/_maps/configs/solgov_chronicle.json index 9fe11023e376..57728ba9e74c 100644 --- a/_maps/configs/solgov_chronicle.json +++ b/_maps/configs/solgov_chronicle.json @@ -18,28 +18,34 @@ "job_slots": { "Captain": { "outfit": "/datum/outfit/job/solgov/captain", + "plasmaman_outfit": "/datum/outfit/plasmaman/solgov", "officer": true, "slots": 1 }, "Overseer": { "outfit": "/datum/outfit/job/solgov/overseer", + "plasmaman_outfit": "/datum/outfit/plasmaman/hop", "officer": true, "slots": 1 }, "Sonnensöldner": { "outfit": "/datum/outfit/job/solgov/sonnensoldner", + "plasmaman_outfit": "/datum/outfit/plasmaman/security", "slots": 1 }, "Ship Engineer": { "outfit": "/datum/outfit/job/solgov/engineer", + "plasmaman_outfit": "/datum/outfit/plasmaman/engineering", "slots": 2 }, "Field Engineer": { "outfit": "/datum/outfit/job/solgov/miner", + "plasmaman_outfit": "/datum/outfit/plasmaman/mining", "slots": 2 }, "Scribe": { "outfit": "/datum/outfit/job/solgov/assistant", + "plasmaman_outfit": "/datum/outfit/plasmaman", "slots" : 2 } }, diff --git a/_maps/configs/solgov_inkwell.json b/_maps/configs/solgov_inkwell.json index b7ae54a1b6b9..b9bfc95eb364 100644 --- a/_maps/configs/solgov_inkwell.json +++ b/_maps/configs/solgov_inkwell.json @@ -16,32 +16,39 @@ "job_slots": { "Captain": { "outfit": "/datum/outfit/job/solgov/captain", + "plasmaman_outfit": "/datum/outfit/plasmaman/solgov", "officer": true, "slots": 1 }, "Logistics Deck Officer": { "outfit": "/datum/outfit/job/solgov/quartermaster", + "plasmaman_outfit": "/datum/outfit/plasmaman/cargo", "officer": true, "slots": 1 }, "Sonnensöldner": { "outfit": "/datum/outfit/job/solgov/sonnensoldner", + "plasmaman_outfit": "/datum/outfit/plasmaman/security", "slots": 3 }, "Ship Engineer": { "outfit": "/datum/outfit/job/solgov/engineer", + "plasmaman_outfit": "/datum/outfit/plasmaman/engineering", "slots": 2 }, "Field Engineer": { "outfit": "/datum/outfit/job/solgov/miner", + "plasmaman_outfit": "/datum/outfit/plasmaman/mining", "slots": 3 }, "Bureaucrat": { "outfit": "/datum/outfit/job/solgov/bureaucrat", + "plasmaman_outfit": "/datum/outfit/plasmaman/curator", "slots": 2 }, "Scribe": { "outfit": "/datum/outfit/job/solgov/assistant", + "plasmaman_outfit": "/datum/outfit/plasmaman", "slots" : 6 } }, diff --git a/_maps/configs/solgov_paracelsus.json b/_maps/configs/solgov_paracelsus.json index a5eefc5296df..ccd0e547b891 100644 --- a/_maps/configs/solgov_paracelsus.json +++ b/_maps/configs/solgov_paracelsus.json @@ -16,36 +16,44 @@ "job_slots": { "Captain": { "outfit": "/datum/outfit/job/solgov/captain", + "plasmaman_outfit": "/datum/outfit/plasmaman/solgov", "officer": true, "slots": 1 }, "Overseer": { "outfit": "/datum/outfit/job/solgov/overseer", + "plasmaman_outfit": "/datum/outfit/plasmaman/hop", "officer": true, "slots": 1 }, "Medical Doctor": { "outfit": "/datum/outfit/job/solgov/doctor", + "plasmaman_outfit": "/datum/outfit/plasmaman/medical", "slots": 3 }, "Ship Engineer": { "outfit": "/datum/outfit/job/solgov/engineer", + "plasmaman_outfit": "/datum/outfit/plasmaman/engineering", "slots": 1 }, "Psychologist": { "outfit": "/datum/outfit/job/solgov/psychologist", + "plasmaman_outfit": "/datum/outfit/plasmaman/medical", "slots": 1 }, "Field Engineer": { "outfit": "/datum/outfit/job/solgov/miner", + "plasmaman_outfit": "/datum/outfit/plasmaman/mining", "slots": 2 }, "Scribe": { "outfit": "/datum/outfit/job/solgov/assistant", + "plasmaman_outfit": "/datum/outfit/plasmaman", "slots" : 3 }, "Attentive Care Patient": { "outfit": "/datum/outfit/job/solgov/patient", + "plasmaman_outfit": "/datum/outfit/plasmaman", "slots" : 3 } diff --git a/_maps/configs/srm_elder.json b/_maps/configs/srm_elder.json index 82e104096b00..23f59f114b6d 100644 --- a/_maps/configs/srm_elder.json +++ b/_maps/configs/srm_elder.json @@ -19,19 +19,23 @@ "job_slots": { "Hunter Montagne": { "outfit": "/datum/outfit/job/roumain/captain", + "plasmaman_outfit": "/datum/outfit/plasmaman/command", "officer": true, "slots": 1 }, "Hunter Doctor": { "outfit": "/datum/outfit/job/roumain/doctor", + "plasmaman_outfit": "/datum/outfit/plasmaman/medical", "slots": 1 }, "Hunter": { "outfit": "/datum/outfit/job/roumain/security", + "plasmaman_outfit": "/datum/outfit/plasmaman/security", "slots": 3 }, "Shadow": { "outfit": "/datum/outfit/job/roumain/assistant", + "plasmaman_outfit": "/datum/outfit/plasmaman", "slots": 3 } }, diff --git a/_maps/configs/syndicate_aegis.json b/_maps/configs/syndicate_aegis.json index 5946a8e78343..74e1ba550336 100644 --- a/_maps/configs/syndicate_aegis.json +++ b/_maps/configs/syndicate_aegis.json @@ -19,37 +19,44 @@ "job_slots": { "Captain": { "outfit": "/datum/outfit/job/syndicate/captain/suns", + "plasmaman_outfit": "/datum/outfit/plasmaman/command", "officer": true, "slots": 1 }, "Lead Doctor": { "outfit": "/datum/outfit/job/syndicate/cmo/suns", + "plasmaman_outfit": "/datum/outfit/plasmaman/cmo", "slots": 1 }, "Ship Doctor":{ "outfit": "/datum/outfit/job/syndicate/doctor/suns", + "plasmaman_outfit": "/datum/outfit/plasmaman/medical", "slots": 2 }, "Mechanic": { "outfit": "/datum/outfit/job/syndicate/engineer/suns", + "plasmaman_outfit": "/datum/outfit/plasmaman/engineering", "slots": 1 }, "Deck Service Assistant": { "outfit": "/datum/outfit/job/syndicate/botanist/suns", + "plasmaman_outfit": "/datum/outfit/plasmaman/botany", "slots": 2 }, "Ship Psychologist": { "outfit": "/datum/outfit/job/syndicate/psychologist/suns", + "plasmaman_outfit": "/datum/outfit/plasmaman/medical", "slots": 1 }, "Long Term Patient": { "outfit": "/datum/outfit/job/syndicate/patient", + "plasmaman_outfit": "/datum/outfit/plasmaman", "slots": 2 } }, diff --git a/_maps/configs/syndicate_cybersun_kansatsu.json b/_maps/configs/syndicate_cybersun_kansatsu.json index a9c9fcb94349..c1ea5236b1fe 100644 --- a/_maps/configs/syndicate_cybersun_kansatsu.json +++ b/_maps/configs/syndicate_cybersun_kansatsu.json @@ -17,24 +17,29 @@ "job_slots": { "Commander": { "outfit": "/datum/outfit/job/syndicate/captain/cybersun", + "plasmaman_outfit": "/datum/outfit/plasmaman/command", "officer": true, "slots": 1 }, "Intelligence Officer": { "outfit": "/datum/outfit/job/syndicate/head_of_personnel/cybersun", + "plasmaman_outfit": "/datum/outfit/plasmaman/hop", "officer": true, "slots": 1 }, "Engineer": { "outfit": "/datum/outfit/job/syndicate/engineer/cybersun", + "plasmaman_outfit": "/datum/outfit/plasmaman/engineering", "slots": 1 }, "Field Agent": { "outfit": "/datum/outfit/job/syndicate/miner/cybersun", + "plasmaman_outfit": "/datum/outfit/plasmaman/mining", "slots": 2 }, "Junior Agent": { "outfit": "/datum/outfit/job/syndicate/assistant/cybersun", + "plasmaman_outfit": "/datum/outfit/plasmaman", "slots": 2 } }, diff --git a/_maps/configs/syndicate_gorlex_hyena.json b/_maps/configs/syndicate_gorlex_hyena.json index 51b046d114b7..edcce82aa704 100644 --- a/_maps/configs/syndicate_gorlex_hyena.json +++ b/_maps/configs/syndicate_gorlex_hyena.json @@ -19,24 +19,29 @@ "job_slots": { "Captain": { "outfit": "/datum/outfit/job/syndicate/captain/gorlex", + "plasmaman_outfit": "/datum/outfit/plasmaman/command", "officer": true, "slots": 1 }, "Foreman": { "outfit": "/datum/outfit/job/syndicate/ce/gorlex", + "plasmaman_outfit": "/datum/outfit/plasmaman/ce", "officer": true, "slots": 1 }, "Mechanic": { "outfit": "/datum/outfit/job/syndicate/engineer/gorlex", + "plasmaman_outfit": "/datum/outfit/plasmaman/engineering", "slots": 1 }, "Wrecker": { "outfit": "/datum/outfit/job/syndicate/miner/gorlex", + "plasmaman_outfit": "/datum/outfit/plasmaman/mining", "slots": 2 }, "Junior Agent": { "outfit": "/datum/outfit/job/syndicate/assistant/gorlex", + "plasmaman_outfit": "/datum/outfit/plasmaman", "slots": 2 } }, diff --git a/_maps/configs/syndicate_gorlex_komodo.json b/_maps/configs/syndicate_gorlex_komodo.json index 73ce92630014..340ef52ea93b 100644 --- a/_maps/configs/syndicate_gorlex_komodo.json +++ b/_maps/configs/syndicate_gorlex_komodo.json @@ -20,33 +20,40 @@ "job_slots": { "Captain": { "outfit": "/datum/outfit/job/syndicate/captain/gorlex", + "plasmaman_outfit": "/datum/outfit/plasmaman/command", "officer": true, "slots": 1 }, + "Bridge Officer": { + "outfit": "/datum/outfit/job/syndicate/head_of_personnel", + "plasmaman_outfit": "/datum/outfit/plasmaman/hop", + "slots": 1 + }, "Sergeant": { "outfit": "/datum/outfit/job/syndicate/hos/gorlex", + "plasmaman_outfit": "/datum/outfit/plasmaman/hos", "officer": true, "slots": 1 }, "Medic": { "outfit": "/datum/outfit/job/syndicate/doctor/gorlex", + "plasmaman_outfit": "/datum/outfit/plasmaman/medical", "slots": 1 }, "Mechanic": { "outfit": "/datum/outfit/job/syndicate/miner/gorlex", + "plasmaman_outfit": "/datum/outfit/plasmaman/engineering", "slots": 1 }, "Trooper": { "outfit": "/datum/outfit/job/syndicate/security/gorlex", + "plasmaman_outfit": "/datum/outfit/plasmaman/security", "slots": 3 }, "Deck Assistant": { "outfit": "/datum/outfit/job/syndicate/assistant/gorlex", + "plasmaman_outfit": "/datum/outfit/plasmaman", "slots": 2 - }, - "Bridge Officer": { - "outfit": "/datum/outfit/job/syndicate/head_of_personnel", - "slots": 1 } }, "enabled": true diff --git a/_maps/configs/syndicate_litieguai.json b/_maps/configs/syndicate_litieguai.json index 685a53187422..31e9c97e501d 100644 --- a/_maps/configs/syndicate_litieguai.json +++ b/_maps/configs/syndicate_litieguai.json @@ -16,19 +16,23 @@ "job_slots": { "Captain": { "outfit": "/datum/outfit/job/syndicate/captain/cybersun", + "plasmaman_outfit": "/datum/outfit/plasmaman/command", "slots": 1 }, "Medical Director": { "outfit": "/datum/outfit/job/syndicate/cmo", + "plasmaman_outfit": "/datum/outfit/plasmaman/cmo", "officer": true, "slots": 1 }, "Trauma Team Technician": { "outfit": "/datum/outfit/job/syndicate/doctor/cybersun", + "plasmaman_outfit": "/datum/outfit/plasmaman/medical", "slots": 3 }, "Cybersun Medical Intern": { "outfit": "/datum/outfit/job/syndicate/assistant/cybersun", + "plasmaman_outfit": "/datum/outfit/plasmaman", "slots": 3 } }, diff --git a/_maps/configs/syndicate_twinkleshine.json b/_maps/configs/syndicate_twinkleshine.json index ef84cca126f5..d6cfd7fdc263 100644 --- a/_maps/configs/syndicate_twinkleshine.json +++ b/_maps/configs/syndicate_twinkleshine.json @@ -19,41 +19,50 @@ "job_slots": { "Flotilla Admiral": { "outfit": "/datum/outfit/job/syndicate/captain/twink", + "plasmaman_outfit": "/datum/outfit/plasmaman/command", "officer": true, "slots": 1 }, "Lieutenant": { "outfit": "/datum/outfit/job/syndicate/hos/twink", + "plasmaman_outfit": "/datum/outfit/plasmaman/hos", "officer": true, "slots": 1 }, "Redshield Officer": { "outfit": "/datum/outfit/job/syndicate/hos/suns/twink", + "plasmaman_outfit": "/datum/outfit/plasmaman/hos", "officer": true, "slots": 1 }, "Medic": { "outfit": "/datum/outfit/job/syndicate/paramedic/twink", + "plasmaman_outfit": "/datum/outfit/plasmaman/paramedic", "slots": 2 }, "Engineer": { "outfit": "/datum/outfit/job/syndicate/engineer/twink", + "plasmaman_outfit": "/datum/outfit/plasmaman/engineering", "slots": 2 }, "Operative": { "outfit": "/datum/outfit/job/syndicate/security/twink", + "plasmaman_outfit": "/datum/outfit/plasmaman/security", "slots": 5 }, "Bartender": { "outfit": "/datum/outfit/job/syndicate/bartender/twink", + "plasmaman_outfit": "/datum/outfit/plasmaman/bar", "slots": 1 }, "Miner": { "outfit": "/datum/outfit/job/syndicate/miner/twink", + "plasmaman_outfit": "/datum/outfit/plasmaman/mining", "slots": 1 }, "Deck Assistant": { "outfit": "/datum/outfit/job/syndicate/assistant/twink", + "plasmaman_outfit": "/datum/outfit/plasmaman", "slots": 2 } }, diff --git a/_maps/example_ship_config.json b/_maps/example_ship_config.json index 7c34d7bc6841..a04994db0203 100644 --- a/_maps/example_ship_config.json +++ b/_maps/example_ship_config.json @@ -11,11 +11,13 @@ "job_slots": { "The First Slot will always be the 'captain' that the purchaser becomes.": { "outfit": "/datum/outfit/job/captain", + "plasmaman_outfit": "/datum/outfit/plasmaman/captain", "officer": true, "slots": 1 }, "Second Custom Job showing minimum possible arguments": { "outfit": "/datum/outfit/job", + "plasmaman_outfit": "/datum/outfit/plasmaman", "slots": 2 }, "Assistant": 3 diff --git a/_maps/ship_config_schema.json b/_maps/ship_config_schema.json index 2afd8e065170..abebec0b061a 100644 --- a/_maps/ship_config_schema.json +++ b/_maps/ship_config_schema.json @@ -20,7 +20,7 @@ "description": { "title": "Class Description", "type": "string", - "description": "A description of the ship class, currently only shown to admins on the shuttle manipulator, but will likely be shown to players before ship purchase in the future.", + "description": "A description of the ship class, show to admins in the Shuttle Manipulator and to players when purchasing a ship.", "minLength": 250 }, "tags": { @@ -106,6 +106,11 @@ "description": "The name of the outfit that will be placed in this slot. Must be exact, will error if not found in the code.", "pattern": "^/datum/outfit/(.*)$" }, + "plasmaman_outfit": { + "type": "string", + "description": "The name of the outfit that will be placed in this slot used for phorids. Must be exact, will error if not found in the code..", + "pattern": "^/datum/outfit/(.*)$" + }, "officer": { "type": "boolean", "description": "Whether or not this slot is an officer slot. This determines if the job will have a chevron in the manifest, as well as the amount of slots cannot be changed by the crew in-round.", diff --git a/check_regex.yaml b/check_regex.yaml index dc1d4d05e71a..e9270fd73718 100644 --- a/check_regex.yaml +++ b/check_regex.yaml @@ -29,9 +29,9 @@ standards: - exactly: [1, "/area text paths", '"/area'] - exactly: [17, "/datum text paths", '"/datum'] - exactly: [4, "/mob text paths", '"/mob'] - - exactly: [44, "/obj text paths", '"/obj'] + - exactly: [43, "/obj text paths", '"/obj'] - exactly: [0, "/turf text paths", '"/turf'] - - exactly: [117, "text2path uses", "text2path"] + - exactly: [116, "text2path uses", "text2path"] - exactly: [18, "world<< uses", 'world[ \t]*<<'] - exactly: [0, "world.log<< uses", 'world.log[ \t]*<<'] diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index 03720e4d641f..748dc04eb2da 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -214,10 +214,14 @@ SUBSYSTEM_DEF(mapping) slots = value else if(islist(value)) var/datum/outfit/job_outfit = text2path(value["outfit"]) + var/datum/outfit/plasmaman_job_outfit = text2path(value["plasmaman_outfit"]) if(isnull(job_outfit)) stack_trace("Invalid job outfit! [value["outfit"]] on [S.name]'s config! Defaulting to assistant clothing.") job_outfit = /datum/outfit/job/assistant - job_slot = new /datum/job(job, job_outfit) + if(isnull(plasmaman_job_outfit)) + stack_trace("Invalid plasmaman job outfit! [value["plasmaman_outfit"]] on [S.name]'s config! Defaulting to assistant clothing.") + plasmaman_job_outfit = /datum/outfit/plasmaman + job_slot = new /datum/job(job, job_outfit, plasmaman_job_outfit) job_slot.display_order = length(S.job_slots) job_slot.wiki_page = value["wiki_page"] job_slot.officer = value["officer"] diff --git a/code/modules/clothing/outfits/plasmaman.dm b/code/modules/clothing/outfits/plasmaman.dm index ba38a4a9240b..1b9d5213a1fb 100644 --- a/code/modules/clothing/outfits/plasmaman.dm +++ b/code/modules/clothing/outfits/plasmaman.dm @@ -1,3 +1,12 @@ +/datum/outfit/plasmaman + name = "Plasmaman" + + head = /obj/item/clothing/head/helmet/space/plasmaman + uniform = /obj/item/clothing/under/plasmaman + belt = /obj/item/tank/internals/plasmaman/belt/full + mask = /obj/item/clothing/mask/breath + gloves = /obj/item/clothing/gloves/color/plasmaman + /datum/outfit/plasmaman/bar name = "Bartender Plasmaman" @@ -213,7 +222,7 @@ gloves = /obj/item/clothing/gloves/color/plasmaman/clown /datum/outfit/plasmaman/solgov //WS edit sgr - name = "Plasmasolgov" + name = "Plasmaman (Solgov)" head = /obj/item/clothing/head/helmet/space/plasmaman/solgov uniform = /obj/item/clothing/under/plasmaman/solgov gloves = /obj/item/clothing/gloves/color/plasmaman/white diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm index 7a848b9ca330..5b52c84dc2e2 100644 --- a/code/modules/clothing/outfits/standard.dm +++ b/code/modules/clothing/outfits/standard.dm @@ -145,15 +145,6 @@ shoes = /obj/item/clothing/shoes/sandal/marisa head = /obj/item/clothing/head/wizard/marisa -/datum/outfit/plasmaman - name = "Plasmaman" - - head = /obj/item/clothing/head/helmet/space/plasmaman - uniform = /obj/item/clothing/under/plasmaman - r_hand= /obj/item/tank/internals/plasmaman/belt/full - mask = /obj/item/clothing/mask/breath - gloves = /obj/item/clothing/gloves/color/plasmaman - /datum/outfit/centcom/death_commando name = "Death Commando" diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm index 20ad6e089730..9dce8a079c81 100644 --- a/code/modules/jobs/job_types/_job.dm +++ b/code/modules/jobs/job_types/_job.dm @@ -7,6 +7,8 @@ ///The outfit this job will recieve upon joining. var/datum/outfit/job/outfit = null + ///The outfit this job will recieve upon joining, but as a plasmaman + var/datum/outfit/job/plasmaman_outfit = null //Job access. The use of minimal_access or access is determined by a config setting: config.jobs_have_minimal_access var/list/minimal_access = list() //Useful for servers which prefer to only have access given to the places a job absolutely needs (Larger server population) @@ -28,10 +30,11 @@ ///Levels unlocked at roundstart in physiology var/list/roundstart_experience -/datum/job/New(new_name, datum/outfit/new_outfit) +/datum/job/New(new_name, datum/outfit/new_outfit, datum/outfit/new_plasmaman_outfit) if(new_name) name = new_name outfit = new_outfit + plasmaman_outfit = new_plasmaman_outfit register() /datum/job/proc/register() @@ -130,6 +133,8 @@ H.dna.species.before_equip_job(src, H, visualsOnly) if(outfit_override || outfit) + if(isplasmaman(H)) + H.equipOutfit(outfit_override ? outfit_override : plasmaman_outfit, visualsOnly, preference_source) H.equipOutfit(outfit_override ? outfit_override : outfit, visualsOnly, preference_source) H.dna.species.after_equip_job(src, H, visualsOnly) diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm index d3c900c56786..c031a869697d 100644 --- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm +++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm @@ -72,121 +72,6 @@ no_protection = TRUE . = ..() -/datum/species/plasmaman/before_equip_job(datum/job/J, mob/living/carbon/human/H, visualsOnly = FALSE) - var/current_job = J.name - var/datum/outfit/plasmaman/O = new /datum/outfit/plasmaman - switch(current_job) - if("Chaplain") - O = new /datum/outfit/plasmaman/chaplain - - if("Curator") - O = new /datum/outfit/plasmaman/curator - - if("Janitor") - O = new /datum/outfit/plasmaman/janitor - - if("Botanist") - O = new /datum/outfit/plasmaman/botany - - if("Bartender", "Lawyer") - O = new /datum/outfit/plasmaman/bar - - if("Cook") - O = new /datum/outfit/plasmaman/chef - - if("Prisoner") - O = new /datum/outfit/plasmaman/prisoner - - if("Security Officer") - O = new /datum/outfit/plasmaman/security - - if("Brig Physician") - O = new /datum/outfit/plasmaman/secmed - - if("Detective") - O = new /datum/outfit/plasmaman/detective - - if("Warden") - O = new /datum/outfit/plasmaman/warden - - if("Cargo Technician", "Quartermaster") - O = new /datum/outfit/plasmaman/cargo - - if("Shaft Miner") - O = new /datum/outfit/plasmaman/mining - - if("Medical Doctor") - O = new /datum/outfit/plasmaman/medical - - if("Paramedic") - O = new /datum/outfit/plasmaman/paramedic - - if("Chemist") - O = new /datum/outfit/plasmaman/chemist - - if("Geneticist") - O = new /datum/outfit/plasmaman/genetics - - if("Roboticist") - O = new /datum/outfit/plasmaman/robotics - - if("Virologist") - O = new /datum/outfit/plasmaman/viro - - if("Scientist") - O = new /datum/outfit/plasmaman/science - - if("Station Engineer") - O = new /datum/outfit/plasmaman/engineering - - if("Atmospheric Technician") - O = new /datum/outfit/plasmaman/atmospherics - - if("Captain") - O = new /datum/outfit/plasmaman/command - - if("Chief Engineer") - O = new /datum/outfit/plasmaman/ce - - if("Chief Medical Officer") - O = new /datum/outfit/plasmaman/cmo - - if("Head of Security") - O = new /datum/outfit/plasmaman/hos - - if("Research Director") - O = new /datum/outfit/plasmaman/rd - - if("Head of Personnel") - O = new /datum/outfit/plasmaman/hop - - if("Mime") - O = new /datum/outfit/plasmaman/mime - - if("Clown") - O = new /datum/outfit/plasmaman/clown - - if("SolGov Representative") //WS edit sgr - O = new /datum/outfit/plasmaman/solgov - - var/holder //WS Edit Begin - Plasma skirtsuit prefs - switch(H.jumpsuit_style) - if(PREF_SKIRT) - holder = "[O.uniform]/skirt" - if(PREF_GREYSUIT) - O.head = /obj/item/clothing/head/helmet/space/plasmaman - holder = "/obj/item/clothing/under/plasmaman" - else - holder = "[O.uniform]" - - if(text2path(holder)) - O.uniform = text2path(holder) //WS Edit End - - H.equipOutfit(O, visualsOnly) - H.internal = H.get_item_for_held_index(2) - H.update_internals_hud_icon(1) - return 0 - /datum/species/plasmaman/random_name(gender,unique,lastname) if(unique) return random_unique_plasmaman_name()