diff --git a/Resources/Locale/en-US/deltav/job/job-names.ftl b/Resources/Locale/en-US/deltav/job/job-names.ftl index 622254ff1c1..051cacc60c8 100644 --- a/Resources/Locale/en-US/deltav/job/job-names.ftl +++ b/Resources/Locale/en-US/deltav/job/job-names.ftl @@ -6,6 +6,31 @@ job-name-lawyer = Attorney job-name-courier = Courier job-name-security-borg = Security Cyborg +# Alternate job names +job-name-tourist = Tourist +job-name-off-duty = Off-Duty Crew +job-name-student = Student +job-name-mixologist = Mixologist +job-name-baker = Baker +job-name-butcher = Butcher +job-name-pizzaiolo = Pizzaiolo +job-name-practical-nurse = Practical Nurse +job-name-resident = Resident +job-name-clinician = Clinician +job-name-life-support-tech = Life Support Technician +job-name-plasma-scientist = Plasma Scientist +job-name-electrician = Electrician +job-name-mechanic = Mechanic +job-name-deck-worker = Deck Worker +job-name-inventory-associate = Inventory Associate +job-name-prospector = Prospector +job-name-excavator = Excavator +job-name-lab-tech = Lab Technician +job-name-xenoarch = Xenoarchaeologist +job-name-roboticist = Roboticist +job-name-jester = Jester +job-name-fool = Fool + # Role timers JobMedicalBorg = Medical Cyborg JobCourier = Courier diff --git a/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl b/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl index 2e32ac21a50..05ee30a8207 100644 --- a/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl @@ -20,6 +20,11 @@ loadout-group-mime-neck = Mime neck loadout-group-musician-neck = Musician neck +loadout-group-passenger-id-delta = Passenger PDA +loadout-group-bartender-id-delta = Bartender PDA +loadout-group-chef-id-delta = Chef PDA +loadout-group-clown-id-delta = Clown PDA + loadout-group-serviceworker-head = Service Worker head loadout-group-serviceworker-jumpsuit = Service Worker jumpsuit @@ -27,6 +32,8 @@ loadout-group-serviceworker-jumpsuit = Service Worker jumpsuit loadout-group-cargo-technician-neck = Cargo Technician neck +loadout-group-cargo-id-delta = Cargo Technician PDA + loadout-group-courier-head = Courier head loadout-group-courier-neck = Courier neck loadout-group-courier-jumpsuit = Courier jumpsuit @@ -40,6 +47,8 @@ loadout-group-mail-carrier-outerclothing = Mail Carrier outer clothing loadout-group-salvage-specialist-neck = Salvage Specialist neck +loadout-group-salvage-id-delta = Salvage Specialist PDA + # Medical loadout-group-chemist-gloves = Chemist gloves loadout-group-chemist-shoes = Chemist shoes @@ -47,6 +56,8 @@ loadout-group-chemist-neck = Chemist neck loadout-group-medical-doctor-neck = Medical Doctor neck +loadout-group-medical-intern-id-delta = Medical Intern PDA + # Miscellaneous loadout-group-scarfs = Scarf @@ -63,6 +74,8 @@ loadout-group-station-engineer-neck = Station Engineer neck loadout-group-atmospheric-technician-neck = Atmospheric Technician neck +loadout-group-atmos-id-delta = Atmospheric Technician PDA + # Security loadout-group-head-of-security-shoes = Head of Security shoes diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml index 04e82ef7e62..4a81303f1a8 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml @@ -199,3 +199,238 @@ - type: Icon sprite: DeltaV/Objects/Devices/pda.rsi state: pda-mailcarrier + +## Alternate Job Titles + +# Passenger + +- type: entity + parent: PassengerPDA + id: VisitorPDA + name: visitor PDA + description: If you hold onto this, it can be a fun souvenier when you get to... wherever you're going! + components: + - type: Pda + id: VisitorIDCard + +- type: entity + parent: PassengerPDA + id: TouristPDA + name: tourist PDA + description: You came to the station for a relaxing vacation. Bon voyage! + components: + - type: Pda + id: TouristIDCard + +- type: entity + parent: PassengerPDA + id: OffDutyCrewPDA + name: off-duty crew PDA + description: You saved your PTO to come here with zero responsibility. Surely they won't need your help while you're here? + components: + - type: Pda + id: OffDutyCrewIDCard + +- type: entity + parent: PassengerPDA + id: StudentPDA + name: student PDA + description: Whether you came here to study various aspects of space architecture, unfathomably hot burn chambers, psionic activity, or are just on spring break, you're a real space student now. + components: + - type: Pda + id: StudentIDCard + +# Bartender + +- type: entity + parent: BartenderPDA + id: MixologistPDA + name: mixologist PDA + description: There are those who tend the bar, and then there are those who synthesize intoxicating art. + components: + - type: Pda + id: MixologistIDCard + +# Chef + +- type: entity + parent: ChefPDA + id: BakerPDA + name: baker PDA + description: For those about to loaf, we salute you. + components: + - type: Pda + id: BakerIDCard + +- type: entity + parent: ChefPDA + id: ButcherPDA + name: butcher PDA + description: It's as fearsome of a job title as you want it to be. + components: + - type: Pda + id: ButcherIDCard + +- type: entity + parent: ChefPDA + id: PizzaioloPDA + name: pizzaiolo PDA + description: Hey paesanos! It's a-time to cook-a-da-pizza! + components: + - type: Pda + id: PizzaioloIDCard + +# Medical Intern + +- type: entity + parent: MedicalInternPDA + id: PracticalNursePDA + name: practical nurse PDA + description: For those who practically nurse people to good health. + components: + - type: Pda + id: PracticalNurseIDCard + +- type: entity + parent: MedicalInternPDA + id: ResidentPDA + name: resident PDA + description: No, it's for training your way up the medical ladder. Not evil. + components: + - type: Pda + id: ResidentIDCard + +# Medical Doctor + +- type: entity + parent: MedicalPDA + id: ClinicianPDA + name: clinician PDA + description: Why do you have to be so clinical about everything!? + components: + - type: Pda + id: ClinicianIDCard + +# Atmospherics Technician + +- type: entity + parent: AtmosPDA + id: LifeSupportTechPDA + name: life support technician PDA + components: + - type: Pda + id: LifeSupportTechIDCard + +- type: entity + parent: AtmosPDA + id: PlasmaScientistPDA + name: plasma scientist PDA + components: + - type: Pda + id: PlasmaScientistIDCard + +# Station Engineer + +- type: entity + parent: EngineerPDA + id: ElectricianPDA + name: electrician PDA + description: Where do they get the batteries for these things? + components: + - type: Pda + id: ElectricianIDCard + +- type: entity + parent: EngineerPDA + id: MechanicPDA + name: mechanic PDA + description: We love wrenches! + components: + - type: Pda + id: MechanicIDCard + +# Cargo Technician + +- type: entity + parent: CargoPDA + id: DeckWorkerPDA + name: deck worker PDA + description: Ideally you're not just swabbing it. + components: + - type: Pda + id: DeckWorkerIDCard + +- type: entity + parent: CargoPDA + id: InventoryAssociatePDA + name: inventory associate PDA + components: + - type: Pda + id: InventoryAssociateIDCard + +# Salvage Technician + +- type: entity + parent: SalvagePDA + id: ProspectorPDA + name: prospector PDA + components: + - type: Pda + id: ProspectorIDCard + +- type: entity + parent: SalvagePDA + id: ExcavatorPDA + name: excavator PDA + components: + - type: Pda + id: ExcavatorIDCard + +# Scientist + +- type: entity + parent: SciencePDA + id: LabTechPDA + name: lab technician PDA + description: Part of it is melted after a close interaction with a hotplate. + components: + - type: Pda + id: LabTechIDCard + +- type: entity + parent: SciencePDA + id: XenoarchPDA + name: xenoarchaeologist PDA + components: + - type: Pda + id: XenoarchIDCard + +- type: entity + parent: SciencePDA + id: RoboticistPDA + name: roboticist PDA + description: Surprisingly, it doesn't talk to you. + components: + - type: Pda + id: RoboticistIDCard + state: pda-roboticist + +# Clown + +- type: entity + parent: ClownPDA + id: JesterPDA + name: jester PDA + description: Doesn't actually jingle when you move. + components: + - type: Pda + id: JesterIDCard + +- type: entity + parent: ClownPDA + id: FoolPDA + name: fool PDA + description: Found alone on a hill. + components: + - type: Pda + id: FoolIDCard diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml index 4992a9e180c..da206587138 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml @@ -49,3 +49,219 @@ state: nyanomailcarrier - type: PresetIdCard jobName: Courier + +## Alternate Job Titles + +# Passenger + +- type: entity + parent: PassengerIDCard + id: VisitorIDCard + name: visitor ID card + components: + - type: PresetIdCard + virtualJobName: job-name-visitor + +- type: entity + parent: PassengerIDCard + id: TouristIDCard + name: tourist ID card + components: + - type: PresetIdCard + virtualJobName: job-name-tourist + +- type: entity + parent: PassengerIDCard + id: OffDutyCrewIDCard + name: off-duty crew ID card + components: + - type: PresetIdCard + virtualJobName: job-name-off-duty + +- type: entity + parent: PassengerIDCard + id: StudentIDCard + name: student ID card + components: + - type: PresetIdCard + virtualJobName: job-name-student + +# Bartender + +- type: entity + parent: BartenderIDCard + id: MixologistIDCard + name: mixologist ID card + components: + - type: PresetIdCard + virtualJobName: job-name-mixologist + +# Chef + +- type: entity + parent: ChefIDCard + id: BakerIDCard + name: baker ID card + components: + - type: PresetIdCard + virtualJobName: job-name-baker + +- type: entity + parent: ChefIDCard + id: ButcherIDCard + name: butcher ID card + components: + - type: PresetIdCard + virtualJobName: job-name-butcher + +- type: entity + parent: ChefIDCard + id: PizzaioloIDCard + name: pizzaiolo ID card + components: + - type: PresetIdCard + virtualJobName: job-name-pizzaiolo + +# Medical Intern + +- type: entity + parent: MedicalInternIDCard + id: PracticalNurseIDCard + name: practical nurse ID card + components: + - type: PresetIdCard + virtualJobName: job-name-practical-nurse + +- type: entity + parent: MedicalInternIDCard + id: ResidentIDCard + name: resident ID card + components: + - type: PresetIdCard + virtualJobName: job-name-resident + +# Medical Doctor + +- type: entity + parent: MedicalIDCard + id: ClinicianIDCard + name: clinician ID card + components: + - type: PresetIdCard + virtualJobName: job-name-clinician + +# Atmospheric Technician + +- type: entity + parent: AtmosIDCard + id: LifeSupportTechIDCard + name: life support technician ID card + components: + - type: PresetIdCard + virtualJobName: job-name-life-support-tech + +- type: entity + parent: AtmosIDCard + id: PlasmaScientistIDCard + name: plasma scientist ID card + components: + - type: PresetIdCard + virtualJobName: job-name-plasma-scientist + +# Station Engineer + +- type: entity + parent: EngineeringIDCard + id: ElectricianIDCard + name: electrician ID card + components: + - type: PresetIdCard + virtualJobName: job-name-electrician + +- type: entity + parent: EngineeringIDCard + id: MechanicIDCard + name: mechanic ID card + components: + - type: PresetIdCard + virtualJobName: job-name-mechanic + +# Cargo Technician + +- type: entity + parent: CargoIDCard + id: DeckWorkerIDCard + name: deck worker ID card + components: + - type: PresetIdCard + virtualJobName: job-name-deck-worker + +- type: entity + parent: CargoIDCard + id: InventoryAssociateIDCard + name: inventory associate ID card + components: + - type: PresetIdCard + virtualJobName: job-name-inventory-associate + +# Salvage Specialist + +- type: entity + parent: SalvageIDCard + id: ProspectorIDCard + name: prospector ID card + components: + - type: PresetIdCard + virtualJobName: job-name-prospector + +- type: entity + parent: SalvageIDCard + id: ExcavatorIDCard + name: excavator ID card + components: + - type: PresetIdCard + virtualJobName: job-name-excavator + +# Scientist + +- type: entity + parent: ResearchIDCard + id: LabTechIDCard + name: lab technician ID card + components: + - type: PresetIdCard + virtualJobName: job-name-lab-tech + +- type: entity + parent: ResearchIDCard + id: XenoarchIDCard + name: xenoarchaeologist ID card + components: + - type: PresetIdCard + virtualJobName: job-name-xenoarch + +- type: entity + parent: ResearchIDCard + id: RoboticistIDCard + name: roboticist ID card + components: + - type: PresetIdCard + virtualJobName: job-name-roboticist + +# Clown + +- type: entity + parent: ClownIDCard + id: JesterIDCard + name: jester ID card + components: + - type: PresetIdCard + virtualJobName: job-name-jester + +- type: entity + parent: ClownIDCard + id: FoolIDCard + name: fool ID card + components: + - type: PresetIdCard + virtualJobName: job-name-fool diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Cargo/cargo_technician.yml new file mode 100644 index 00000000000..b6cc588da0f --- /dev/null +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Cargo/cargo_technician.yml @@ -0,0 +1,27 @@ +# PDA +- type: loadout + id: CargoPDA + equipment: CargoPDA + +- type: startingGear + id: CargoPDA + equipment: + id: CargoPDA + +- type: loadout + id: DeckWorkerPDA + equipment: DeckWorkerPDA + +- type: startingGear + id: DeckWorkerPDA + equipment: + id: DeckWorkerPDA + +- type: loadout + id: InventoryAssociatePDA + equipment: InventoryAssociatePDA + +- type: startingGear + id: InventoryAssociatePDA + equipment: + id: InventoryAssociatePDA diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Cargo/salvage_technician.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Cargo/salvage_technician.yml new file mode 100644 index 00000000000..fb1b0b7a3a9 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Cargo/salvage_technician.yml @@ -0,0 +1,27 @@ +# PDA +- type: loadout + id: SalvagePDA + equipment: SalvagePDA + +- type: startingGear + id: SalvagePDA + equipment: + id: SalvagePDA + +- type: loadout + id: ProspectorPDA + equipment: ProspectorPDA + +- type: startingGear + id: ProspectorPDA + equipment: + id: ProspectorPDA + +- type: loadout + id: ExcavatorPDA + equipment: ExcavatorPDA + +- type: startingGear + id: ExcavatorPDA + equipment: + id: ExcavatorPDA diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/bartender.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/bartender.yml new file mode 100644 index 00000000000..c3668d7f407 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/bartender.yml @@ -0,0 +1,18 @@ +# PDA +- type: loadout + id: BartenderPDA + equipment: BartenderPDA + +- type: startingGear + id: BartenderPDA + equipment: + id: BartenderPDA + +- type: loadout + id: MixologistPDA + equipment: MixologistPDA + +- type: startingGear + id: MixologistPDA + equipment: + id: MixologistPDA diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/chef.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/chef.yml new file mode 100644 index 00000000000..9c9b3cf4c27 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/chef.yml @@ -0,0 +1,36 @@ +# PDA +- type: loadout + id: ChefPDA + equipment: ChefPDA + +- type: startingGear + id: ChefPDA + equipment: + id: ChefPDA + +- type: loadout + id: BakerPDA + equipment: BakerPDA + +- type: startingGear + id: BakerPDA + equipment: + id: BakerPDA + +- type: loadout + id: ButcherPDA + equipment: ButcherPDA + +- type: startingGear + id: ButcherPDA + equipment: + id: ButcherPDA + +- type: loadout + id: PizzaioloPDA + equipment: PizzaioloPDA + +- type: startingGear + id: PizzaioloPDA + equipment: + id: PizzaioloPDA diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/clown.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/clown.yml new file mode 100644 index 00000000000..6be67037c54 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/clown.yml @@ -0,0 +1,27 @@ +# PDA +- type: loadout + id: ClownPDA + equipment: ClownPDA + +- type: startingGear + id: ClownPDA + equipment: + id: ClownPDA + +- type: loadout + id: JesterPDA + equipment: JesterPDA + +- type: startingGear + id: JesterPDA + equipment: + id: JesterPDA + +- type: loadout + id: FoolPDA + equipment: FoolPDA + +- type: startingGear + id: FoolPDA + equipment: + id: FoolPDA diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/passenger.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/passenger.yml new file mode 100644 index 00000000000..ea1e9b61ad5 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/passenger.yml @@ -0,0 +1,45 @@ +# PDA +- type: loadout + id: PassengerPDA + equipment: PassengerPDA + +- type: startingGear + id: PassengerPDA + equipment: + id: PassengerPDA + +- type: loadout + id: VisitorPDA + equipment: VisitorPDA + +- type: startingGear + id: VisitorPDA + equipment: + id: VisitorPDA + +- type: loadout + id: TouristPDA + equipment: TouristPDA + +- type: startingGear + id: TouristPDA + equipment: + id: TouristPDA + +- type: loadout + id: OffDutyCrewPDA + equipment: OffDutyCrewPDA + +- type: startingGear + id: OffDutyCrewPDA + equipment: + id: OffDutyCrewPDA + +- type: loadout + id: StudentPDA + equipment: StudentPDA + +- type: startingGear + id: StudentPDA + equipment: + id: StudentPDA diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Engineering/atmospheric_technician.yml new file mode 100644 index 00000000000..1a3f84047a2 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Engineering/atmospheric_technician.yml @@ -0,0 +1,27 @@ +# PDA +- type: loadout + id: AtmosPDA + equipment: AtmosPDA + +- type: startingGear + id: AtmosPDA + equipment: + id: AtmosPDA + +- type: loadout + id: LifeSupportTechPDA + equipment: LifeSupportTechPDA + +- type: startingGear + id: LifeSupportTechPDA + equipment: + id: LifeSupportTechPDA + +- type: loadout + id: PlasmaScientistPDA + equipment: PlasmaScientistPDA + +- type: startingGear + id: PlasmaScientistPDA + equipment: + id: PlasmaScientistPDA diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Engineering/station_engineer.yml new file mode 100644 index 00000000000..2017f82b674 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Engineering/station_engineer.yml @@ -0,0 +1,18 @@ +# PDA +- type: loadout + id: ElectricianPDA + equipment: ElectricianPDA + +- type: startingGear + id: ElectricianPDA + equipment: + id: ElectricianPDA + +- type: loadout + id: MechanicPDA + equipment: MechanicPDA + +- type: startingGear + id: MechanicPDA + equipment: + id: MechanicPDA diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/medical_doctor.yml new file mode 100644 index 00000000000..72412b15339 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/medical_doctor.yml @@ -0,0 +1,9 @@ +# PDA +- type: loadout + id: ClinicianPDA + equipment: ClinicianPDA + +- type: startingGear + id: ClinicianPDA + equipment: + id: ClinicianPDA diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/medical_intern.yml new file mode 100644 index 00000000000..99343781dc9 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/medical_intern.yml @@ -0,0 +1,27 @@ +# PDA +- type: loadout + id: MedicalInternPDA + equipment: MedicalInternPDA + +- type: startingGear + id: MedicalInternPDA + equipment: + id: MedicalInternPDA + +- type: loadout + id: PracticalNursePDA + equipment: PracticalNursePDA + +- type: startingGear + id: PracticalNursePDA + equipment: + id: PracticalNursePDA + +- type: loadout + id: ResidentPDA + equipment: ResidentPDA + +- type: startingGear + id: ResidentPDA + equipment: + id: ResidentPDA diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Science/scientist.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Science/scientist.yml new file mode 100644 index 00000000000..8d27e1b6631 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Science/scientist.yml @@ -0,0 +1,27 @@ +# PDA +- type: loadout + id: LabTechPDA + equipment: LabTechPDA + +- type: startingGear + id: LabTechPDA + equipment: + id: LabTechPDA + +- type: loadout + id: XenoarchPDA + equipment: XenoarchPDA + +- type: startingGear + id: XenoarchPDA + equipment: + id: XenoarchPDA + +- type: loadout + id: RoboticistPDA + equipment: RoboticistPDA + +- type: startingGear + id: RoboticistPDA + equipment: + id: RoboticistPDA diff --git a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml index 35c2f139da0..ec6b03ca4ee 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml @@ -201,6 +201,74 @@ loadouts: - ProsecutorNeck +# PDAs +- type: loadoutGroup + id: PassengerPDADelta + name: loadout-group-passenger-id-delta + loadouts: + - PassengerPDA + - VisitorPDA + - TouristPDA + - OffDutyCrewPDA + - StudentPDA + +- type: loadoutGroup + id: BartenderPDADelta + name: loadout-group-bartender-id-delta + loadouts: + - BartenderPDA + - MixologistPDA + +- type: loadoutGroup + id: ChefPDADelta + name: loadout-group-chef-id-delta + loadouts: + - ChefPDA + - BakerPDA + - ButcherPDA + - PizzaioloPDA + +- type: loadoutGroup + id: MedicalInternPDADelta + name: loadout-group-medical-intern-id-delta + loadouts: + - MedicalInternPDA + - PracticalNursePDA + - ResidentPDA + +- type: loadoutGroup + id: AtmosPDADelta + name: loadout-group-atmos-id-delta + loadouts: + - AtmosPDA + - LifeSupportTechPDA + - PlasmaScientistPDA + +- type: loadoutGroup + id: CargoPDADelta + name: loadout-group-cargo-id-delta + loadouts: + - CargoPDA + - DeckWorkerPDA + - InventoryAssociatePDA + +- type: loadoutGroup + id: SalvagePDADelta + name: loadout-group-salvage-id-delta + loadouts: + - SalvagePDA + - ProspectorPDA + - ExcavatorPDA + +- type: loadoutGroup + id: ClownPDADelta + name: loadout-group-clown-id-delta + loadouts: + - ClownPDA + - JesterPDA + - FoolPDA + +# Misc - type: loadoutGroup id: Scarfs name: loadout-group-scarfs diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 0a8e503d50d..8ba44881af3 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -777,7 +777,7 @@ - type: entity parent: BasePDA id: AtmosPDA - name: atmos PDA + name: atmospheric technician PDA # DeltaV - was "atmos PDA" description: Still smells like plasma. components: - type: Pda diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 4efed746a00..dea95fc4716 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -871,6 +871,8 @@ loadouts: - StationEngineerPDA - SeniorEngineerPDA + - ElectricianPDA # DeltaV + - MechanicPDA # DeltaV - type: loadoutGroup # DeltaV id: AtmosphericTechnicianNeck @@ -1031,6 +1033,9 @@ loadouts: - ScientistPDA - SeniorResearcherPDA + - LabTechPDA # DeltaV + - XenoarchPDA # DeltaV + - RoboticistPDA # DeltaV - type: loadoutGroup id: ResearchAssistantJumpsuit @@ -1348,6 +1353,7 @@ loadouts: - MedicalDoctorPDA - SeniorPhysicianPDA + - ClinicianPDA # DeltaV - type: loadoutGroup id: MedicalGloves diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index c785aa57c67..cac84ac8e3c 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -34,6 +34,7 @@ - PassengerFace - PassengerGloves - PassengerOuterClothing + - PassengerPDADelta # DeltaV - PassengerShoes - Glasses - Trinkets @@ -47,6 +48,7 @@ - BartenderJumpsuit - CommonBackpack - BartenderOuterClothing + - BartenderPDADelta # DeltaV #- Glasses - Trinkets @@ -68,6 +70,7 @@ - ChefJumpsuit - CommonBackpack - ChefOuterClothing + - ChefPDADelta # DeltaV - Glasses - Trinkets @@ -133,6 +136,7 @@ - ClownJumpsuit - ClownBackpack - ClownOuterClothing + - ClownPDADelta # DeltaV - ClownShoes - Glasses - Trinkets @@ -181,6 +185,7 @@ - CargoTechnicianJumpsuit - CargoTechnicianBackpack - CargoTechnicianOuterClothing + - CargoPDADelta # DeltaV - CargoTechnicianShoes - Glasses - Trinkets @@ -191,6 +196,7 @@ - SalvageSpecialistNeck # DeltaV - SalvageSpecialistBackpack - SalvageSpecialistOuterClothing + - SalvagePDADelta # DeltaV - SalvageSpecialistShoes - Glasses - Trinkets @@ -234,6 +240,7 @@ - AtmosphericTechnicianJumpsuit - AtmosphericTechnicianBackpack - AtmosphericTechnicianOuterClothing + - AtmosPDADelta # DeltaV - AtmosphericTechnicianShoes - Trinkets @@ -367,6 +374,7 @@ groups: - MedicalInternJumpsuit - MedicalBackpack + - MedicalInternPDADelta # DeltaV - Glasses - Trinkets diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/Misc/identification_cards.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/Misc/identification_cards.yml index c0107881687..df612426687 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/Misc/identification_cards.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/Misc/identification_cards.yml @@ -48,7 +48,7 @@ - sprite: DeltaV/Objects/Misc/id_cards.rsi state: nyanomailcarrier - type: PresetIdCard - jobName: MailCarrier + virtualJobName: job-name-mail-carrier # DeltaV - type: entity parent: IDCardStandard diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml index ba06a4cd2e6..1ff07c319c3 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml @@ -16,6 +16,6 @@ - type: startingGear id: CargoTechGear equipment: - id: CargoPDA + #id: CargoPDA # DeltaV: different PDAs in loadouts ears: ClothingHeadsetCargo pocket1: AppraisalTool diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml index 4dc695d2794..ec793d4f52e 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml @@ -23,5 +23,5 @@ id: SalvageSpecialistGear equipment: jumpsuit: ClothingUniformJumpsuitSalvageSpecialist - id: SalvagePDA + #id: SalvagePDA # DeltaV: different PDAs in loadouts ears: ClothingHeadsetCargo diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml b/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml index b43f929d694..5c4e2edfeae 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml @@ -12,5 +12,5 @@ - type: startingGear id: PassengerGear equipment: - id: PassengerPDA + #id: PassengerPDA # DeltaV: different PDAs in loadouts ears: ClothingHeadsetGrey diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml index b94fff539e6..0e41aa5edc0 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml @@ -23,5 +23,5 @@ id: BartenderGear equipment: shoes: ClothingShoesColorBlack - id: BartenderPDA + #id: BartenderPDA # DeltaV - different PDAs in loadouts ears: ClothingHeadsetService diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml index e9d800823c1..f4305262310 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml @@ -26,6 +26,6 @@ id: ChefGear equipment: shoes: ClothingShoesColorBlack - id: ChefPDA + #id: ChefPDA # DeltaV: different PDAs in loadouts ears: ClothingHeadsetService belt: ClothingBeltChefFilled diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml index 7d7f877dab3..6cd8ff655c9 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml @@ -36,5 +36,5 @@ mask: ClothingMaskClown pocket1: BikeHorn pocket2: ClownRecorder - id: ClownPDA + #id: ClownPDA # DeltaV: different PDAs in loadouts ears: ClothingHeadsetService diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml index 07d4b6e7320..ef969f9b844 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml @@ -21,6 +21,6 @@ id: AtmosphericTechnicianGear equipment: eyes: ClothingEyesGlassesMeson - id: AtmosPDA + #id: AtmosPDA # DeltaV: different PDAs in loadouts belt: ClothingBeltUtilityEngineering ears: ClothingHeadsetEngineering diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml index d2cb87df530..f379445049a 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml @@ -22,7 +22,7 @@ id: MedicalInternGear equipment: shoes: ClothingShoesColorWhite - id: MedicalInternPDA + # id: MedicalInternPDA # DeltaV: different PDAs in loadouts ears: ClothingHeadsetMedical belt: ClothingBeltMedicalFilled pocket2: BookMedicalReferenceBook