cleaned directories, finished adding custom roles, began implimenting…

… sprites (thanks kite)

Resources/Locale/en-US/job/department-desc.ftl

@@ -1,7 +1,11 @@
 department-Cargo-description = Complete bounties, earn Spessos, and order useful supplies for the crew.
 department-Civilian-description = Perform small helpful tasks to keep the station sane and well catered.
 department-Command-description = Manage the crew and keep them working efficiently.
-department-Maintenance-description = Maintain the stations functionality.
-department-Inmate-description = Serve your sentence, work service jobs or plan an escape.
+#oops no engineering!
+#fuckscience.
 department-Medical-description = Keep the crew healthy.
-department-Security-description = Keep the peace around the station.
+department-Security-description = Keep the peace around the station.
+
+#PS14
+department-Maintenance-description = Maintain the stations functionality.
+department-Inmate-description = Serve your sentence, work service jobs or plan an escape.

Resources/Locale/en-US/job/department.ftl

@@ -1,7 +1,9 @@
 department-Cargo = Cargo
 department-Civilian = Civilian
 department-Command = Command
-department-Maintenance = Maintenance
-department-Inmate = Inmate
 department-Medical = Medical
 department-Security = Security
+
+#PS14
+department-Inmate = Inmate
+department-Maintenance = Maintenance

Resources/Locale/en-US/job/job-description.ftl

@@ -33,7 +33,6 @@ job-description-librarian = Manage the library, give out knowledge to any who se
 job-description-mime = Entertain the crew through non-vocal means, and engage with light rivalry with the clown.
 job-description-musician = Entertain the crew with your unique musical talent, and acquire new instruments to mess around with.
 job-description-passenger = Serve your sentence or attempt to stick it to the man!
-job-description-prisoner = Serve your sentence, work service jobs or plan an escape.
 job-description-psychologist = Provide emotional support to traumatized crew. Currently available on Box, Marathon and Origin Stations.
 job-description-qm = Manage the supplies of the station & the cargo department, keep the salvage specialists working, make sure all orders are fulfilled, and keep the money flowing.
 job-description-rd = Manage the science department, unlocking technologies, acquiring & researching artifacts, and performing experiments.
@@ -46,3 +45,10 @@ job-description-serviceworker = Learn the basics of bartending, cooking, and gro
 job-description-visitor = Enjoy your visit to the station.
 job-description-warden = Keep the prison running, delegate work to the other heads of staff, and exert your will.
 job-description-zookeeper = Put on a joyful display of cute animals and space carps for all the crew to see. Currently available on Gemini Station.
+
+#PS14
+job-description-atmospec = Optimize the station's atmospherics setup, and synthesize rare gases to use or sell.
+job-description-gardener = Grow food for the chef, drugs for 'medbay', and other plants to keep yourself entertained.
+job-description-maintengineer = Keep the station's main engine & solars active, optimize the power network, and make emergency repairs using your hardsuit in spaced areas.
+job-description-prisonchef = Keep other inmates fed with a variety of food items, butcher dead animals to ensure ammonia doesn't leak, and help keep the bar lively.
+job-description-prisoner = Serve your sentence, work service jobs or plan an escape.

Resources/Locale/en-US/job/job-names.ftl

@@ -16,7 +16,7 @@ job-name-cmo = Chief Medical Officer
 job-name-chemist = Chemist
 job-name-technical-assistant = Technical Assistant
 job-name-engineer = Station Engineer
-job-name-atmostech = Atmospheric Specialist
+job-name-atmostech = Atmospheric Technician
 job-name-hop = Head of Personnel
 job-name-serviceworker = Service Worker
 job-name-centcomoff = CentCom Official
@@ -30,8 +30,7 @@ job-name-janitor = Janitor
 job-name-chaplain = Chaplain
 job-name-botanist = Botanist
 job-name-bartender = Bartender
-job-name-passenger = Passenger
-job-name-prisoner = Prisoner
+job-name-passenger = Prisoner
 job-name-salvagespec = Salvage specialist
 job-name-qm = Quartermaster
 job-name-cargotech = Cargo Technician
@@ -47,8 +46,26 @@ job-name-boxer = Boxer
 job-name-zookeeper = Zookeeper
 job-name-visitor = Visitor
 
+#PS14
+job-name-sp-warden = Warden
+job-name-atmospec = Atmospheric Specialist
+job-name-sp-chemist = Chemist
+job-name-sp-psychologist = Psychologist
+job-name-cco = Chief Custodial Officer
+job-name-gardener = Prison Gardener
+job-name-hom = Head of Maintenance
+job-name-infirmary-doctor = Infirmary Doctor
+job-name-inspector = Inspector
+job-name-maintenance-worker = Maintenance Worker
+job-name-maintengineer = Maintenance Engineer
+job-name-md = Medical Director
+job-name-prisonchef = Prison Chef
+job-name-prison-officer = Prison Officer
+job-name-probationary-officer = Probationary Officer
+job-name-prisoner = Prisoner
+
 # Role timers - Make these alphabetical or I cut you
-JobAtmosphericTechnician = Atmospheric Specialist
+JobAtmosphericTechnician = Atmospheric Technician
 JobBartender = Bartender
 JobBorg = Borg
 JobBotanist = Botanist
@@ -80,8 +97,7 @@ JobMedicalIntern = Medical intern
 JobMime = Mime
 JobMusician = Musician
 JobParamedic = Paramedic
-JobPassenger = Passenger
-JobPrisoner = Prisoner
+JobPassenger = Prisoner #PS14
 JobPsychologist = Psychologist
 JobQuartermaster = Quartermaster
 JobReporter = Reporter
@@ -97,3 +113,17 @@ JobTechnicalAssistant = Technical Assistant
 JobVisitor = Visitor
 JobWarden = Warden
 JobZookeeper = Zookeeper
+
+#PS14
+JobSPWarden = Warden
+JobAtmosphericSpecialist = Atmospheric Specialist
+JobChiefCustodialOfficer = Chief Custodial Officer
+JobGardener = Gardener
+JobHeadOfMaintenance = Head Of Maintenance
+JobInspector = Inspector
+JobPrisonChef = Prison Chef
+JobPrisonOfficer = Prison Officer
+JobProbationaryOfficer = Probationary Officer
+JobPrisoner = Prisoner
+JobMaintenanceEngineer = Maintenance Engineer
+JobMaintenanceWorker = Maintenance Worker

Resources/Locale/en-US/job/job-supervisors.ftl

@@ -13,3 +13,6 @@ job-supervisors-security = security officers, the warden, and the head of securi
 job-supervisors-science = scientists, and the research director
 job-supervisors-hire = whoever hires you
 job-supervisors-everyone = absolutely everyone
+
+#SP14
+job-supervisors-warden = the warden

Resources/Prototypes/Entities/Markers/Spawners/jobs.yml

@@ -410,6 +410,20 @@
       - state: green
       - state: chemist
 
+# Inmates
+
+- type: entity
+  id: SpawnPointPrisoner
+  parent: SpawnPointJobBase
+  name: prisoner
+  components:
+  - type: SpawnPoint
+    job_id: Prisoner
+  - type: Sprite
+    layers:
+      - state: green
+      - state: prisoner
+
 # Science
 
 - type: entity

Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml

@@ -0,0 +1,138 @@
+# Greytide Time
+- type: loadoutEffectGroup
+  id: GreyTider
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobPassenger
+      time: 36000 #10 hrs, silly reward for people who play passenger a lot
+
+# Face
+- type: loadout
+  id: PassengerFace
+  equipment: GasMask
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: GreyTider
+
+- type: startingGear
+  id: GasMask
+  equipment:
+    mask: ClothingMaskGas
+
+# Jumpsuits
+# Grey
+- type: loadout
+  id: GreyJumpsuit
+  equipment: GreyJumpsuit
+
+- type: startingGear
+  id: GreyJumpsuit
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitColorGrey
+
+- type: loadout
+  id: GreyJumpskirt
+  equipment: GreyJumpskirt
+
+- type: startingGear
+  id: GreyJumpskirt
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtColorGrey
+
+# Rainbow
+- type: loadout
+  id: RainbowJumpsuit
+  equipment: RainbowJumpsuit
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: GreyTider
+
+- type: startingGear
+  id: RainbowJumpsuit
+  equipment:
+    jumpsuit: ClothingUniformColorRainbow
+
+# Ancient
+- type: loadout
+  id: AncientJumpsuit
+  equipment: AncientJumpsuit
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: GreyTider
+
+- type: startingGear
+  id: AncientJumpsuit
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitAncient
+
+# Back
+- type: loadout
+  id: CommonBackpack
+  equipment: CommonBackpack
+
+- type: startingGear
+  id: CommonBackpack
+  equipment:
+    back: ClothingBackpack
+
+- type: loadout
+  id: CommonSatchel
+  equipment: CommonSatchel
+
+- type: startingGear
+  id: CommonSatchel
+  equipment:
+    back: ClothingBackpackSatchel
+
+- type: loadout
+  id: CommonDuffel
+  equipment: CommonDuffel
+
+- type: startingGear
+  id: CommonDuffel
+  equipment:
+    back: ClothingBackpackDuffel
+
+# Gloves
+- type: loadout
+  id: PassengerGloves
+  equipment: FingerlessInsulatedGloves
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: GreyTider
+
+- type: startingGear
+  id: FingerlessInsulatedGloves
+  equipment:
+    gloves: ClothingHandsGlovesFingerlessInsulated
+
+# Outerclothing
+- type: loadout
+  id: PassengerWintercoat
+  equipment: PassengerWintercoat
+
+- type: startingGear
+  id: PassengerWintercoat
+  equipment:
+    outerClothing: ClothingOuterWinterCoat
+
+# Shoes
+- type: loadout
+  id: BlackShoes
+  equipment: BlackShoes
+
+- type: startingGear
+  id: BlackShoes
+  equipment:
+    shoes: ClothingShoesColorBlack
+
+- type: loadout
+  id: WinterBoots
+  equipment: WinterBoots
+
+- type: startingGear
+  id: WinterBoots
+  equipment:
+    shoes: ClothingShoesBootsWinter