atmos changes + senior roles

Content.Server/Access/Systems/PresetIdCardSystem.cs

@@ -2,6 +2,7 @@
 using Content.Server.GameTicking;
 using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
+using Content.Shared.Access.Components; // Emberfall
 using Content.Shared.Access.Systems;
 using Content.Shared.Roles;
 using Content.Shared.StatusIcon;
@@ -79,10 +80,17 @@ private void SetupIdAccess(EntityUid uid, PresetIdCardComponent id, bool extende
 
         _accessSystem.SetAccessToJob(uid, job, extended);
 
-        _cardSystem.TryChangeJobTitle(uid, job.LocalizedName);
+        // Begin Emberfall
+        var card = Comp<IdCardComponent>(uid);
+
+        if (card.JobTitle == null)
+            _cardSystem.TryChangeJobTitle(uid, job.LocalizedName);
+        // End Emberfall
+
         _cardSystem.TryChangeJobDepartment(uid, job);
 
-        if (_prototypeManager.TryIndex(job.Icon, out var jobIcon))
+        if (card.JobIcon == "JobIconUnknown" && // Emberfall - Only set the icon if we're not overwriting it
+            _prototypeManager.TryIndex(job.Icon, out var jobIcon))
             _cardSystem.TryChangeJobIcon(uid, jobIcon);
     }
 }

Content.Server/Station/Systems/StationSpawningSystem.cs

@@ -235,9 +235,11 @@ public void SetPdaAndIdCardData(EntityUid entity, string characterName, JobProto
             return;
 
         _cardSystem.TryChangeFullName(cardId, characterName, card);
-        _cardSystem.TryChangeJobTitle(cardId, jobPrototype.LocalizedName, card);
+        if (card.JobTitle == null) // Emberfall
+            _cardSystem.TryChangeJobTitle(cardId, jobPrototype.LocalizedName, card);
 
-        if (_prototypeManager.TryIndex(jobPrototype.Icon, out var jobIcon))
+        if (card.JobIcon == "JobIconUnknown" && // Emberfall
+            _prototypeManager.TryIndex(jobPrototype.Icon, out var jobIcon))
             _cardSystem.TryChangeJobIcon(cardId, jobIcon, card);
 
         var extendedAccess = false;

Content.Server/StationRecords/Systems/StationRecordsSystem.cs

@@ -148,12 +148,18 @@ public void CreateGeneralRecord(
             return;
         }
 
+        // Before creating the record, we'll get the job information either from the ID card or prototype
+        var (jobTitle, jobIcon) = idUid is { } uid && _idCard.TryFindIdCard(uid, out var card)
+            ? (Loc.GetString(card.Comp.JobTitle ?? string.Empty), card.Comp.JobIcon)
+            : (Loc.GetString(jobPrototype.LocalizedName), jobPrototype.Icon);
+
+
         var record = new GeneralStationRecord()
         {
             Name = name,
             Age = age,
-            JobTitle = jobPrototype.LocalizedName,
-            JobIcon = jobPrototype.Icon,
+            JobTitle = jobTitle, // Emberfall
+            JobIcon = jobIcon, // Emberfall
             JobPrototype = jobId,
             Species = species,
             Gender = gender,

Resources/Locale/en-US/_emberfall/atmos/gases.ftl

@@ -0,0 +1 @@
+plasma-smell = Something smells pungent!

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

@@ -0,0 +1,4 @@
+job-name-senior-physician = Senior Physician
+job-name-senior-researcher = Senior Researcher
+job-name-senior-engineer = Senior Engineer
+job-name-senior-officer = Senior Officer

Resources/Locale/en-US/disease/miasma.ftl

@@ -1,4 +1,4 @@
-ammonia-smell = Something smells pungent!
+ammonia-smell = Something smells foul!
 
 ## Perishable
 

Resources/Prototypes/Atmospherics/gases.yml

@@ -34,8 +34,8 @@
   specificHeat: 200
   heatCapacityRatio: 1.7
   molarMass: 120
-  gasOverlaySprite: /Textures/Effects/atmospherics.rsi
-  gasOverlayState: plasma
+#  gasOverlaySprite: /Textures/Effects/atmospherics.rsi # Emberfall
+#  gasOverlayState: plasma
   color: FF3300
   reagent: Plasma
   pricePerMole: 0
@@ -70,8 +70,8 @@
   specificHeat: 20
   heatCapacityRatio: 1.4
   molarMass: 44
-  gasOverlaySprite: /Textures/Effects/atmospherics.rsi
-  gasOverlayState: miasma
+#  gasOverlaySprite: /Textures/Effects/atmospherics.rsi # Emberfall
+#  gasOverlayState: miasma
   gasMolesVisible: 2
   gasVisbilityFactor: 3.5
   color: 56941E

Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml

@@ -759,6 +759,11 @@
     layers:
     - state: default
     - state: idseniorengineer
+  - type: IdCard # Emberfall
+    jobTitle: job-name-senior-engineer
+    jobIcon: JobIconSeniorEngineer
+  - type: PresetIdCard # Emberfall
+    job: SeniorEngineer
 
 - type: entity
   parent: ResearchIDCard
@@ -769,6 +774,9 @@
     layers:
     - state: default
     - state: idseniorresearcher
+  - type: IdCard # Emberfall
+    jobTitle: job-name-senior-researcher
+    jobIcon: JobIconSeniorResearcher
 
 - type: entity
   parent: MedicalIDCard
@@ -779,6 +787,9 @@
     layers:
     - state: default
     - state: idseniorphysician
+  - type: IdCard # Emberfall
+    jobTitle: job-name-senior-physician
+    jobIcon: JobIconSeniorPhysician
 
 - type: entity
   parent: SecurityIDCard
@@ -789,6 +800,9 @@
     layers:
     - state: default
     - state: idseniorofficer
+  - type: IdCard # Emberfall
+    jobTitle: job-name-senior-officer
+    jobIcon: JobIconSeniorOfficer
 
 - type: entity
   parent: IDCardStandard

Resources/Prototypes/Maps/amber.yml

@@ -30,7 +30,7 @@
             Reporter: [ 1, 1 ]
             #engineering
             ChiefEngineer: [ 1, 1 ]
-            AtmosphericTechnician: [ 2, 2 ]
+#            AtmosphericTechnician: [ 2, 2 ]
             StationEngineer: [ 2, 4 ]
             TechnicalAssistant: [ 1, 1 ]
             #medical

Resources/Prototypes/Maps/bagel.yml

@@ -30,7 +30,7 @@
             ServiceWorker: [ 2, 2 ]
             #engineering
             ChiefEngineer: [ 1, 1 ]
-            AtmosphericTechnician: [ 3, 3 ]
+#            AtmosphericTechnician: [ 3, 3 ]
             StationEngineer: [ 4, 4 ]
             TechnicalAssistant: [ 4, 4 ]
             #medical

Resources/Prototypes/Maps/box.yml

@@ -28,7 +28,7 @@
             ServiceWorker: [ 2, 2 ]
             #engineering
             ChiefEngineer: [ 1, 1 ]
-            AtmosphericTechnician: [ 3, 3 ]
+#            AtmosphericTechnician: [ 3, 3 ]
             StationEngineer: [ 5, 5 ]
             TechnicalAssistant: [ 4, 4 ]
             #medical

Resources/Prototypes/Maps/cog.yml

@@ -28,10 +28,10 @@
             Reporter: [ 2, 2 ]
             Librarian: [ 1, 1 ]
             ServiceWorker: [ 3, 3 ]
-            Zookeeper: [ 1, 1 ] 
+            Zookeeper: [ 1, 1 ]
             #engineering
             ChiefEngineer: [ 1, 1 ]
-            AtmosphericTechnician: [ 3, 3 ]
+#            AtmosphericTechnician: [ 3, 3 ]
             StationEngineer: [ 4, 4 ]
             TechnicalAssistant: [ 3, 3 ]
             #medical

Resources/Prototypes/Maps/core.yml

@@ -32,7 +32,7 @@
             #engineering
             ChiefEngineer: [ 1, 1 ]
             StationEngineer: [ 4, 4 ]
-            AtmosphericTechnician: [ 2, 2 ]
+#            AtmosphericTechnician: [ 2, 2 ]
             TechnicalAssistant: [ 2, 2 ]
             #medical
             ChiefMedicalOfficer: [ 1, 1 ]

Resources/Prototypes/Maps/elkridge.yml

@@ -32,7 +32,7 @@
             ServiceWorker: [ 2, 2 ]
             #engineering
             ChiefEngineer: [ 1, 1 ]
-            AtmosphericTechnician: [ 2, 2 ]
+#            AtmosphericTechnician: [ 2, 2 ]
             StationEngineer: [ 3, 4 ]
             TechnicalAssistant: [ 2, 2 ]
             #medical

Resources/Prototypes/Maps/fland.yml

@@ -30,7 +30,7 @@
             ServiceWorker: [ 2, 2 ]
             #engineering
             ChiefEngineer: [ 1, 1 ]
-            AtmosphericTechnician: [ 3, 3 ]
+#            AtmosphericTechnician: [ 3, 3 ]
             StationEngineer: [ 5, 5 ]
             TechnicalAssistant: [ 4, 4 ]
             #medical

Resources/Prototypes/Maps/gate.yml

@@ -30,7 +30,7 @@
             Reporter: [ 2, 2 ]
             #engineering
             ChiefEngineer: [ 1, 1 ]
-            AtmosphericTechnician: [ 3, 3 ]
+#            AtmosphericTechnician: [ 3, 3 ]
             StationEngineer: [ 4, 4 ]
             TechnicalAssistant: [ 4, 4 ]
             #medical

Resources/Prototypes/Maps/loop.yml

@@ -30,7 +30,7 @@
             ServiceWorker: [ 3, 3 ]
             #engineering
             ChiefEngineer: [ 1, 1 ]
-            AtmosphericTechnician: [ 3, 3 ]
+#            AtmosphericTechnician: [ 3, 3 ]
             StationEngineer: [ 5, 5 ]
             TechnicalAssistant: [ 5, 5 ]
             #medical

Resources/Prototypes/Maps/marathon.yml

@@ -29,7 +29,7 @@
             ServiceWorker: [ 2, 2 ]
             #engineering
             ChiefEngineer: [ 1, 1 ]
-            AtmosphericTechnician: [ 3, 3 ]
+#            AtmosphericTechnician: [ 3, 3 ]
             StationEngineer: [ 4, 4 ]
             TechnicalAssistant: [ 3, 3 ]
             #medical

Resources/Prototypes/Maps/meta.yml

@@ -29,7 +29,7 @@
             Reporter: [ 2, 2 ]
             #engineering
             ChiefEngineer: [ 1, 1 ]
-            AtmosphericTechnician: [ 3, 3 ]
+#            AtmosphericTechnician: [ 3, 3 ]
             StationEngineer: [ 6, 8 ]
             TechnicalAssistant: [ 6, 8 ]
             #medical

Resources/Prototypes/Maps/oasis.yml

@@ -30,7 +30,7 @@
             Reporter: [ 1, 1 ]
             #engineering
             ChiefEngineer: [ 1, 1 ]
-            AtmosphericTechnician: [ 3, 3 ]
+#            AtmosphericTechnician: [ 3, 3 ]
             StationEngineer: [ 5, 5 ]
             TechnicalAssistant: [ 4, 4 ]
             #medical

Resources/Prototypes/Maps/omega.yml

@@ -29,7 +29,7 @@
             ServiceWorker: [ 2, 2 ]
             #engineering
             ChiefEngineer: [ 1, 1 ]
-            AtmosphericTechnician: [ 2, 2 ]
+#            AtmosphericTechnician: [ 2, 2 ]
             StationEngineer: [ 3, 3 ]
             TechnicalAssistant: [ 2, 2 ]
             #medical

Resources/Prototypes/Maps/packed.yml

@@ -29,7 +29,7 @@
             ServiceWorker: [ 2, 2 ]
             #engineering
             ChiefEngineer: [ 1, 1 ]
-            AtmosphericTechnician: [ 2, 2 ]
+#            AtmosphericTechnician: [ 2, 2 ]
             StationEngineer: [ 4, 4 ]
             TechnicalAssistant: [ 3, 3 ]
             #medical

Resources/Prototypes/Maps/reach.yml

@@ -29,7 +29,7 @@
             Chemist: [ 1, 1 ]
             Janitor: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            AtmosphericTechnician: [ 1, 1 ]
+#            AtmosphericTechnician: [ 1, 1 ]
             StationEngineer: [ 1, 2 ]
             Scientist: [ 1, 1 ]
             Passenger: [ -1, -1 ]

Resources/Prototypes/Maps/saltern.yml

@@ -28,7 +28,7 @@
             ServiceWorker: [ 2, 2 ]
             #engineering
             ChiefEngineer: [ 1, 1 ]
-            AtmosphericTechnician: [ 2, 2 ]
+#            AtmosphericTechnician: [ 2, 2 ]
             StationEngineer: [ 4, 4 ]
             TechnicalAssistant: [ 4, 4 ]
             #medical

Resources/Prototypes/Maps/train.yml

@@ -32,7 +32,7 @@
             Detective: [ 1, 1 ]
             #engineering
             ChiefEngineer: [ 1, 1 ]
-            AtmosphericTechnician: [ 2, 2 ]
+#            AtmosphericTechnician: [ 2, 2 ]
             StationEngineer: [ 4, 4 ]
             TechnicalAssistant: [ 3, 3 ]
             #medical

Resources/Prototypes/Reagents/gases.yml

@@ -95,6 +95,15 @@
             min: 1.5
         clear: True
         time: 5
+      - !type:PopupMessage # Emberfall - colorless, smells pungent
+        type: Local
+        visualType: Medium
+        messages: [ "plasma-smell" ]
+        probability: 0.8
+        conditions:
+        - !type:ReagentThreshold
+          reagent: Plasma
+          min: 0.1
   reactiveEffects:
     Flammable:
       methods: [ Touch ]

Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml

@@ -3,6 +3,7 @@
   name: job-name-atmostech
   description: job-description-atmostech
   playTimeTracker: JobAtmosphericTechnician
+  setPreference: false # Emberfall
   requirements:
     - !type:DepartmentTimeRequirement
       department: Engineering

Resources/Prototypes/StatusIcon/job.yml

@@ -411,31 +411,31 @@
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: SeniorPhysician
-  allowSelection: false
+  allowSelection: true # Emberfall
 
 - type: jobIcon
   parent: JobIcon
   id: JobIconSeniorOfficer
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: SeniorOfficer
-  allowSelection: false
+  allowSelection: true # Emberfall
 
 - type: jobIcon
   parent: JobIcon
   id: JobIconSeniorEngineer
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: SeniorEngineer
-  allowSelection: false
+  allowSelection: true # Emberfall
 
 - type: jobIcon
   parent: JobIcon
   id: JobIconSeniorResearcher
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: SeniorResearcher
-  allowSelection: false
+  allowSelection: true # Emberfall
 
 - type: jobIcon
   parent: JobIcon

Resources/Prototypes/_Emberfall/Roles/Jobs/Engineering/senior_engineer.yml

@@ -0,0 +1,10 @@
+# yes this needs to exist for the preset even if we're not actually using it as a job, its stupid
+- type: job
+  id: SeniorEngineer
+  playTimeTracker: JobSeniorEngineer
+  access:
+  - Maintenance
+  - Engineering
+  - External
+  - Atmospherics
+

Resources/Prototypes/_Emberfall/Roles/play_time_trackers.yml

@@ -0,0 +1,2 @@
+- type: playTimeTracker # no its not ever used, but needs to exist
+  id: JobSeniorEngineer