diff --git a/Resources/Locale/en-US/_emberfall/job/job-description.ftl b/Resources/Locale/en-US/_emberfall/job/job-description.ftl new file mode 100644 index 00000000000..2cf393aa351 --- /dev/null +++ b/Resources/Locale/en-US/_emberfall/job/job-description.ftl @@ -0,0 +1,3 @@ +# Job descriptions. Keep it alphabetical, gang. +job-description-executive-officer = Be the second in command to the CO. Take charge when they go missing. +job-description-pharmacist = Synthesize medications, fulfill prescriptions, and prepare various chemicals for use by the medical team. diff --git a/Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl b/Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl new file mode 100644 index 00000000000..0eecc6e49f4 --- /dev/null +++ b/Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl @@ -0,0 +1,89 @@ +# Rename all the changed jobs's items to their actual names with this one weird trick. Check it out. +# This governs the name for items rather than changing them in the actual yaml. +# The item order is, bedsheet (if applicable) and wearable items first, then more tactile items like the PDA and hardsuit. + +# Commanding Officer +ent-BedsheetCaptain = CO's bedsheet + .desc = It has a Solus Concord symbol on it, and was woven with a revolutionary new kind of thread guaranteed to have 0.01% permeability for most non-chemical substances, popular among most modern Commanding Officers. +ent-ClothingBackpackCaptain = commanding officer's backpack + .desc = It's a special backpack made exclusively for Solus Concord's commanding officers. +ent-ClothingBackpackDuffelCaptain = commanding officer's duffel bag + .desc = A large duffel bag for holding commanding goods. +ent-ClothingBackpackSatchelCaptain = commanding officer's satchel + .desc = An exclusive satchel for Solus Concord's commanding officers. +ent-ClothingHeadHatCaptain = commanding officer's hardhat + .desc = A crown fit for the overseer of a space station. +ent-ClothingHeadHatCapcap = commanding officer cap + .desc = A grand, stylish cap fit for a commanding officer. +ent-ClothingUniformJumpsuitCaptain = commanding officer's jumpsuit + .desc = It's a navy-blue jumpsuit with some gold markings denoting the rank of "CO," whatever that means. +ent-ClothingUniformJumpskirtCaptain = commanding officer's jumpskirt + .desc = It's a navy-blue jumpskirt with some gold markings denoting the rank of "CO," whatever that means. +ent-ClothingUniformJumpsuitCapFormal = commanding officer's formal suit +ent-ClothingUniformJumpskirtCapFormalDress = commanding officer's formal dress +ent-ClothingOuterWinterCap = commanding officer's winter coat +ent-ClothingOuterArmorCaptainCarapace = commanding officer's carapace +ent-ClothingNeckCloakCap = commanding officer's cloak +ent-ClothingNeckCloakCapFormal = commanding officer's formal cloak +ent-ClothingNeckMantleCap = commanding officer's mantle + .desc = A comfortable and chique mantle befitting of only the most experienced CO. +ent-ClothingMaskGasCaptain = + .desc = Solus Concord cut corners and repainted an engineer's gas mask, but don't tell anyone. +ent-ClothingHeadHatHoodWinterCaptain = commanding officer's winter coat hood + .desc = An expensive and tailored hood, to keep the CO's head warm. +ent-ClothingHandsGlovesCaptain = commanding officer gloves +ent-CaptainPDA = commanding officer PDA +ent-RubberStampCaptain = commanding officer's rubber stamp +ent-PenCap = CO's fountain pen + .desc = A luxurious fountain pen for the Commanding Officer. +ent-DrinkFlask = commanding officer's flask + .desc = A metal flask belonging to the commanding officer. +ent-MobFoxRenault = Renault + .desc = The commanding officer's trustworthy fox. +ent-CaptainSabre = A ceremonial weapon belonging to the commanding officer of the station. +ent-ClothingHeadHelmetHardsuitCap = commanding officer's hardsuit helmet + .desc = Special hardsuit helmet, fitted to the Commanding Officer of the station. +ent-ClothingOuterHardsuitCap = commanding officer's armored spacesuit + .desc = A formal armored spacesuit, made for the station's commanding officer. +ent-JetpackCaptain = commanding officer's jetpack +ent-LockerCaptain = commanding officer's locker +# TODO: Add missing items found during testing to this list. +# The goal: don't let there be a mention of captain unless it's in the context of like, pirates or something else. + +# Executive Officer (Former HoP) +ent-BedsheetHOP = XO's bedsheet + .desc = It's decorated with a key emblem. For those rare moments when you can rest and cuddle with your dog without someone screaming for you over the radio. +ent-ClothingUniformJumpsuitHoP = executive officer's jumpsuit +ent-ClothingUniformJumpskirtHoP = executive officer's jumpskirt +ent-ClothingHeadHatHopcap = executive officer's cap + .desc = A grand, stylish executive officer's cap. +# What the fuck is the XO's color scheme? Find out later. +ent-ClothingNeckCloakHop = executive officer's cloak + .desc = A colored cloak with colored shoulders and gold buttons, proving you are the gatekeeper to any airlock on the station. +ent-ClothingNeckMantleHOP = executive officer's mantle + .desc = A good executive officer knows that paper pushing is only half the job... petting your dog and looking fashionable is the other half. +ent-ClothingOuterWinterHoP = executive officer's winter coat +ent-ClothingHeadHatHoodWinterHOP = executive officer's winter coat hood +ent-RubberStampHop = executive officer's rubber stamp +ent-LockerHeadOfPersonnel = executive officer's locker +# TODO: Add missing items found during testing to this list. +# The goal: Most of the XO's stuff will be resprited so they're not just a HoP reskin. +# CSS (Chief Service Supervisor) actually does the intended of the HoP (by managing Service.) + +# Inspector (Inspector Gadget) +ent-ClothingNeckTieDet = inspector's tie +ent-ClothingOuterVestDetective = inspector's vest +ent-ClothingOuterCoatDetective = inspector trenchcoat +ent-RubberStampDetective = inspector's rubber stamp +ent-VendingMachineDetDrobe = InspectDrobe + .desc = A machine for all your detective needs, as long as you need clothes. +ent-LockerDetective = inspector's cabinet +ent-DetectivePDA = inspector PDA +ent-WeaponRevolverInspector = Investigator + .desc = A inspector's best friend. Uses .45 magnum ammo. +# TODO: I actually have no idea if the det has that many items that actually mention the det - there's more items that mention PIs + +# Pharmacist +ent-ClothingUniformJumpsuitChemistry = pharmacist's jumpsuit +ent-ClothingUniformJumpskirtChemistry = pharmacist's jumpskirt +# TODO: Figure out what items can vaguely be "chemistry" and what is actually the pharmacy. What the fuck am I doing, help. diff --git a/Resources/Locale/en-US/_emberfall/job/job-names.ftl b/Resources/Locale/en-US/_emberfall/job/job-names.ftl new file mode 100644 index 00000000000..b1539c7478d --- /dev/null +++ b/Resources/Locale/en-US/_emberfall/job/job-names.ftl @@ -0,0 +1,11 @@ +# Emberfall custom job locale - overwrites upstream files. Make it at least SLIGHTLY alphabetical please. +job-name-commanding-officer = Commanding Officer +job-name-executive-officer = Executive Officer +job-name-inspector = Inspector +job-name-pharmacist = Pharmacist + +# Role timers - same thing as I said earlier. +JobCommandingOfficer = Commanding Officer +JobExecutiveOfficer = Executive Officer +JobInspector = Inspector +JobPharmacist = Pharmacist diff --git a/Resources/Locale/en-US/_emberfall/job/job-supervisors.ftl b/Resources/Locale/en-US/_emberfall/job/job-supervisors.ftl new file mode 100644 index 00000000000..1b5d70d514f --- /dev/null +++ b/Resources/Locale/en-US/_emberfall/job/job-supervisors.ftl @@ -0,0 +1,5 @@ +# Job Supervisors. Keep it alphabetical, gang. +job-supervisors-commanding-officer = the Commanding Officer +job-supervisors-executive-officer = the Executive Officer +job-supervisors-engineering-emberfall = Station Engineers, Senior Engineers, and the Chief Engineer +job-supervisors-medicine-emberfall = Medical Doctors, Paramedics, Pharmacists, and the Chief Medical Officer diff --git a/Resources/Locale/en-US/_emberfall/navmap-beacons/station-beacons.ftl b/Resources/Locale/en-US/_emberfall/navmap-beacons/station-beacons.ftl new file mode 100644 index 00000000000..a745837f019 --- /dev/null +++ b/Resources/Locale/en-US/_emberfall/navmap-beacons/station-beacons.ftl @@ -0,0 +1,4 @@ +# Emberfall Station Beacons (Yippee) +station-beacon-commanding-officer = Commanding Officer +station-beacon-executive-officer = Executive Officer +station-beacon-inspector = Inspector \ No newline at end of file diff --git a/Resources/Locale/en-US/_emberfall/paper/stamp-component.ftl b/Resources/Locale/en-US/_emberfall/paper/stamp-component.ftl new file mode 100644 index 00000000000..ddacdd2dcf7 --- /dev/null +++ b/Resources/Locale/en-US/_emberfall/paper/stamp-component.ftl @@ -0,0 +1,5 @@ +# Stamp Names for Emberfall Jobs +stamp-component-stamped-name-commanding-officer = Commanding Officer +stamp-component-stamped-name-executive-officer = Executive Officer +stamp-component-stamped-name-inspector = Inspector +# Pharmacists don't have a stamp. diff --git a/Resources/Locale/en-US/_emberfall/prototypes/access/accesses.ftl b/Resources/Locale/en-US/_emberfall/prototypes/access/accesses.ftl new file mode 100644 index 00000000000..c0020b4c0e7 --- /dev/null +++ b/Resources/Locale/en-US/_emberfall/prototypes/access/accesses.ftl @@ -0,0 +1,7 @@ +# Accesses for Emberfall Jobs + +# Command +id-card-access-level-commanding-officer = Commanding Officer +id-card-access-level-executive-officer = Executive Officer +id-card-access-level-inspector = Inspector +id-card-access-level-pharmacy = Pharmacy diff --git a/Resources/Prototypes/Access/security.yml b/Resources/Prototypes/Access/security.yml index cfe94dd78af..9f0d4028126 100644 --- a/Resources/Prototypes/Access/security.yml +++ b/Resources/Prototypes/Access/security.yml @@ -16,7 +16,7 @@ - type: accessLevel id: Detective - name: id-card-access-level-detective + name: id-card-access-level-inspector # Emberfall: Detective -> Inspector - type: accessGroup id: Security diff --git a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml index 5552a973f10..7a607e9e0eb 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml @@ -148,18 +148,18 @@ - type: entity parent: DefaultStationBeaconCommand id: DefaultStationBeaconCaptainsQuarters - suffix: Captain's Quarters + suffix: CO's Quarters # Emberfall: Captain -> CO components: - type: NavMapBeacon - defaultText: station-beacon-captain + defaultText: station-beacon-commanding-officer # Emberfall: Captain -> CO - type: entity parent: DefaultStationBeaconCommand id: DefaultStationBeaconHOPOffice - suffix: HOP's Office + suffix: XO's Office # Emberfall: HOP -> XO components: - type: NavMapBeacon - defaultText: station-beacon-hop + defaultText: station-beacon-executive-officer # Emberfall: HOP -> XO - type: entity parent: DefaultStationBeacon @@ -213,10 +213,10 @@ - type: entity parent: DefaultStationBeaconSecurity id: DefaultStationBeaconDetectiveRoom - suffix: Detective's Room + suffix: Inspector's Room # Emberfall: Detective -> Inspector components: - type: NavMapBeacon - defaultText: station-beacon-detective + defaultText: station-beacon-inspector # Emberfall: Detective -> Inspector - type: entity parent: DefaultStationBeaconSecurity diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml index f6889cbce0a..2310c7fb789 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml @@ -306,7 +306,7 @@ - type: entity parent: AirlockCommand id: AirlockCaptainLocked - suffix: Captain, Locked + suffix: CO, Locked # Emberfall: Captain -> CO components: - type: ContainerFill containers: @@ -378,7 +378,7 @@ - type: entity parent: AirlockSecurity id: AirlockDetectiveLocked - suffix: Detective, Locked + suffix: Inspector, Locked # Emberfall: Detective -> Inspector components: - type: ContainerFill containers: @@ -690,7 +690,7 @@ - type: entity parent: AirlockCommandGlass id: AirlockCaptainGlassLocked - suffix: Captain, Locked + suffix: CO, Locked #Emberfall: Captain -> CO components: - type: ContainerFill containers: @@ -762,7 +762,7 @@ - type: entity parent: AirlockSecurityGlass id: AirlockDetectiveGlassLocked - suffix: Detective, Locked + suffix: Inspector, Locked # Emberfall: Detective -> Inspector components: - type: ContainerFill containers: @@ -1041,7 +1041,7 @@ - type: entity parent: AirlockMaintSecLocked id: AirlockMaintDetectiveLocked - suffix: Detective, Locked + suffix: Inspector, Locked # Emberfall: Detective -> Inspector components: - type: ContainerFill containers: @@ -1059,7 +1059,7 @@ - type: entity parent: AirlockMaintCommandLocked id: AirlockMaintCaptainLocked - suffix: Captain, Locked + suffix: CO, Locked # Emberfall: Captain -> CO components: - type: ContainerFill containers: @@ -1252,7 +1252,7 @@ - type: entity parent: HighSecDoor id: HighSecCaptainLocked - suffix: Captain, Locked + suffix: CO, Locked # Emberfall: Captain -> CO components: - type: ContainerFill containers: diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml index db0fc13b977..9e12ed1082f 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml @@ -308,7 +308,7 @@ - type: entity parent: WindoorSecureSecurityLocked id: WindoorSecureDetectiveLocked - suffix: Detective, Locked + suffix: Inspector, Locked # Emberfall: Detective -> Inspector components: - type: ContainerFill containers: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml index 19233ba69a5..70d8c6f10cf 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml @@ -256,7 +256,7 @@ - type: entity id: LockableButtonCaptain - suffix: Captain + suffix: CO # Emberfall: Captain -> CO parent: LockableButton components: - type: AccessReader @@ -264,7 +264,7 @@ - type: entity id: LockableButtonHeadOfPersonnel - suffix: HeadOfPersonnel + suffix: ExecutiveOfficer # Emberfall: HOP -> XO parent: LockableButton components: - type: AccessReader @@ -328,7 +328,7 @@ - type: entity id: LockableButtonDetective - suffix: Detective + suffix: Inspector # Emberfall: Detective -> Inspector parent: LockableButton components: - type: AccessReader diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index a22d334c941..41a14e929e0 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -1,8 +1,8 @@ - type: job id: Captain - name: job-name-captain + name: job-name-commanding-officer # Emberfall: Captain -> CO description: job-description-captain - playTimeTracker: JobCaptain + playTimeTracker: JobCommandingOfficer # Emberfall: Captain -> CO requirements: - !type:DepartmentTimeRequirement department: Engineering diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index f457cfbc496..292cd5c5eac 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -1,8 +1,8 @@ - type: job id: HeadOfPersonnel - name: job-name-hop - description: job-description-hop - playTimeTracker: JobHeadOfPersonnel + name: job-name-executive-officer # Begin Emberfall: HoP -> XO + description: job-description-executive-officer + playTimeTracker: JobExecutiveOfficer # End Emberfall: HoP -> XO requirements: - !type:DepartmentTimeRequirement department: Engineering @@ -19,7 +19,7 @@ weight: 20 startingGear: HoPGear icon: "JobIconHeadOfPersonnel" - supervisors: job-supervisors-captain + supervisors: job-supervisors-commandingofficer canBeAntag: false access: - Command diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml index dec2b6273eb..294fffb9be6 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml @@ -1,8 +1,8 @@ - type: job id: Chemist - name: job-name-chemist - description: job-description-chemist - playTimeTracker: JobChemist + name: job-name-pharmacist # Start Emberfall: Chemist -> Pharmacist + description: job-description-pharmacist + playTimeTracker: JobPharmacist # End Emberfall: Chemist -> Pharmacist requirements: - !type:DepartmentTimeRequirement department: Medical diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml index d6bc23f9ff4..f1c1de21f5c 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml @@ -1,8 +1,8 @@ - type: job id: Detective - name: job-name-detective + name: job-name-inspector # Emberfall: Detective -> Inspector description: job-description-detective - playTimeTracker: JobDetective + playTimeTracker: JobInspector # Emberfall: Detective -> Inspector requirements: - !type:DepartmentTimeRequirement department: Security diff --git a/Resources/Prototypes/_Emberfall/Roles/play_time_trackers.yml b/Resources/Prototypes/_Emberfall/Roles/play_time_trackers.yml new file mode 100644 index 00000000000..175b1283706 --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Roles/play_time_trackers.yml @@ -0,0 +1,13 @@ +# Emberfall Roles Playtime Trackers +# Please keep this alphabetical, gang. +- type: playTimeTracker + id: JobCommandingOfficer + +- type: playTimeTracker + id: JobExecutiveOfficer + +- type: playTimeTracker + id: JobInspector + +- type: playTimeTracker + id: JobPharmacist