Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Content.IntegrationTests/Tests/Round/JobTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public sealed class JobTest
{
private static readonly ProtoId<JobPrototype> Passenger = "Contractor"; // Frontier: use job prototypes that exist
private static readonly ProtoId<JobPrototype> Engineer = "Prisoner"; // Frontier
private static readonly ProtoId<JobPrototype> Captain = "StationRepresentative"; // Frontier
private static readonly ProtoId<JobPrototype> Captain = "JobShareholderCCTC"; // Frontier

private static string _map = "JobTestMap";

Expand Down
5 changes: 4 additions & 1 deletion Content.Shared/Access/Components/IdCardConsoleComponent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public WriteToTargetIdMessage(string fullName, string jobTitle, List<ProtoId<Acc
//"Salvage",
"Security",
"Service",
"StationTrafficController", // Frontier
//"StationTrafficController", // Frontier
//"USSP", // Mono
//"USSPHigh", // Mono
//"USSPCommand", // Mono
Expand All @@ -93,6 +93,9 @@ public WriteToTargetIdMessage(string fullName, string jobTitle, List<ProtoId<Acc
"Mieyo", // Mono
"MieyoSecurity", // Mono
"MieyoLiason", // Mono
"CCTC", // Mono
"CCTCSecurity", // Mono
"CCTCExecutive", // Mono
};

[Serializable, NetSerializable]
Expand Down
5 changes: 4 additions & 1 deletion Resources/Locale/en-US/_Mono/job/department.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@ department-PMC = Private Military Contractors

department-UnionOfSovietSocialistPlanets = Union of Soviet Socialist Planets
department-UnionOfSovietSocialistPlanets-description = Serve the glorious Union in space against TSFMC and PDV forces.
department-Medical = Creon-Centennial Medical Associates

department-MieyoManufacturingConcern = Mieyo Manufacturing Concern
department-MieyoManufacturingConcern-description = Work under the MMC industrial conglomerate, and make as much as you can for the company.

department-Medical = Medical Dispatch
department-CreonCentennialTradeCharter = Creon-Centennial Trade Charter
department-CreonCentennialTradeCharter-description = Work for the Creon-Centennial Trade Charter. Monopolize the sector, and extract as much value for the royal executive board.

department-Viper = Viper Group
7 changes: 6 additions & 1 deletion Resources/Locale/en-US/_Mono/job/job-description.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ job-description-ussp-sergeant = Lead the ranks in battle, enforce standards, and
job-description-ussp-rifleman = Serve the Union far from home. Follow your superiors, stand by your comrades, and endure where others would break.

# MARK: MD
job-description-md-medic = Traverse the space to provide life-saving care aboard a medical vessel. Stabilize crew with medicine, synthesize medicine, and revive the fallen. ensure the unrecoverable deceased are respectfully secured in the morgue and cloned.
job-description-md-medic = Traverse the space to provide life-saving care aboard a medical vessel. Stabilize crew with advanced medicine and revive the fallen, for a cost.

# MARK: TSF
job-description-tsf-engineer = Maintain the integrity of the flagship, get laughed at for not being a real soldier.
Expand All @@ -18,6 +18,11 @@ job-description-vg-infanteer = Follow the orders from above. Complete contracts.
job-description-vg-lieutenant = Direct the infanteer detachments. Ensure standards are maintained. Attain prosperity and wealth.
job-description-vg-commander = Lead the Vipers to glory and wealth. Forge new business relations. Show the sector that your fangs have not dulled.

# MARK: CCTC
job-description-cctc-servicetech = Develop the sector's industrial capability to please the nobilitat.
job-description-cctc-justice = Obey the Marshall's, and by extension, the nobilitat's will. Put down threats to the safety and security of the trade charter.
job-description-cctc-marshall = Use the wealth of assets at your disposal to secure and defend the Nobilitat's interests. Ensure all industrial and military operations run smoothly.
job-description-cctc-shareholder = Enjoy the fruits of your employee's labor. Ensure plenty of profit is being made, and make sure the few people richer than you are happy. Try not to get assassinated by the people you've indirectly screwed over.
# MARK: MMC
job-description-mmc-liason = Ensure profits for your corporate managers, keep your employees in line, and ensure the protection MMC assets in the sector.
job-description-mmc-security = Protect MMC assets and employees in the area from any threats.
Expand Down
10 changes: 8 additions & 2 deletions Resources/Locale/en-US/_Mono/job/job-names.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ job-supervisors-ussp-commissars = the Commissar
job-supervisors-ussp-sergeant = the Serzhants

# MARK: MD
job-name-md-medic = Emergency Responder
job-name-md-medic = CCTC Emergency Responder

# MARK: TSF
job-name-tsf-engineer = TSFMC Engineer
Expand All @@ -21,7 +21,13 @@ job-name-vg-infanteer = VG Infanteer
job-name-vg-lieutenant = VG Lieutenant
job-name-vg-commander = VG Commander

# MARK: USSP
# MARK: CCTC
job-name-cctc-justice = CCTC Judge
job-name-cctc-servicetech = CCTC Service Tech
job-name-cctc-marshall = CCTC Marshall
job-name-cctc-shareholder = CCTC Shareholder

# MARK: MMC
job-name-mmc-liason = MMC Corporate Liason
job-name-mmc-security = MMC Corporate Security
job-name-mmc-employee = MMC Employee
Expand Down
4 changes: 4 additions & 0 deletions Resources/Locale/en-US/_Mono/prototypes/access/accesses.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,7 @@ id-card-access-level-vg-command = Viper Group Command
id-card-access-level-mieyo = Mieyo
id-card-access-level-mieyo-security = Mieyo Security
id-card-access-level-mieyo-liason = Mieyo Liason

id-card-access-level-cctc = CCTC
id-card-access-level-cctc-security = CCTC Security
id-card-access-level-cctc-executive = CCTC Executive
5 changes: 3 additions & 2 deletions Resources/Locale/en-US/_Mono/rank/ranks.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,9 @@ mmc-asset-security-senior = Senior Asset Security
mmc-liason = Corporate Liason

### CC/MD ranks
cc-judge = Jdg.
cctc-justice = Jdg.
cc-stc = STC
cc-overseer = Overseer
cctc-marshall = Marshall
cctc-shareholder = Nbl.
md-doc = Director Of Care
md-medic = ER.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ghost-role-information-emotional-support-rules = You are an [color=lightpink][bo
You are absolutely [color=red]NOT[/color] allowed to remember, say, the name, appearance, etc. of your previous character.

ghost-role-information-clippy-name = Clippy
ghost-role-information-clippy-description = The Station Representative's loyal worker, smells like cardboard and papers.
ghost-role-information-clippy-description = The late Station Representative's loyal worker, smells like cardboard and papers.

ghost-role-information-clugg-name = Clugg
ghost-role-information-clugg-description = Ugg! Clugg love eat meat. Find new home off space rock, make big hunt.
Expand Down
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/_NF/job/department.ftl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Below: Department name - should match department.ID, may collide with upstream definitions
department-Antag = Phaethon Dynasty Imperial Vanguard
department-Command = Central Command
department-Frontier = Colossus Frontier Colonization
department-Frontier = Creon-Centennial Trade Charter
department-Security = TSF Marine Corps Detachment
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/_NF/job/job-description.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ job-description-contractor = Fulfill your own goals out in Colossus space.
job-description-deputy = Hunt down PD Imperials and enemies of the TSF, enforce the Colonel's law, and bring order to chaos in the sector.
job-description-nf-detective = Investigate crime scenes using forensic tools, ensure that the guilty party is found, and have a couple smokes.
job-description-ertmailcarrier = Nothing stops the mail.
job-description-doc = Provide guidance and direction for shift medics and work to safeguard the health of TSF colonial personnel.
job-description-doc = Oversee the work of the charter's medical personnel. Ensure proper "generosity" is collected from those who are saved.
job-description-mercenary = Execute the bidding of anyone- for the right price. Enjoy being unbound from the confines of the law.
job-description-pilot = Pilot spaceships from point A to B, outmaneuver enemies, dodge asteroids and other ships.
job-description-pdv-infiltrator = You are an infiltration expert of the Imperial Vanguard, deceive and cause chaos from behind the frontline. You answer to the Denasvar and above.
Expand Down
10 changes: 5 additions & 5 deletions Resources/Locale/en-US/_NF/job/job-names.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ job-name-pirate-first-mate = PDV Asvaran
job-name-pdv-denasvar = PDV Denasvar
job-name-pdv-tarkhan = PDV Tarkhan
job-name-tsf-marsoc = TSFMC MARSOC Operative
job-name-security-guard = Judge
job-name-security-guard = CCTC Judge
job-name-sheriff = TSFMC Colonel
job-name-stc = Station Traffic Controller
job-name-sr = Overseer
job-name-stc = CCTC Shareholder
job-name-sr = CCTC Marshall
job-name-pal = Public Affairs Liaison
job-name-doc = Director of Care
job-name-doc = CCTC Claims Manager

# Job titles
job-title-ert-mail-carrier = ERT Mail Carrier
Expand All @@ -35,7 +35,7 @@ JobPirateCaptain = PDV Grand Vizier
JobPirateFirstMate = PDV Asvaran
JobPirateBoatswain = PDV Denasvar
JobSecurityGuard = Judge
JobSTC = Station Traffic Controller
JobSTC = CCTC Shareholder

# Upstream Removed
job-name-senior-engineer = Senior Engineer
Expand Down
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/_NF/job/job-supervisors.ftl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
job-supervisors-sr = the Overseer
job-supervisors-sr = the Marshall
job-supervisors-sheriff = the Colonel
job-supervisors-bailiff = the Captain
job-supervisors-sergeant = the Fireteam Leaders
Expand Down
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/_NF/lobby/lobby.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ frontier-lobby-station-subtext = Wake up from cryosleep to become captain, find
frontier-lobby-crew-title = Crew
frontier-lobby-crew-subtext = Start your round aboard a ship amongst a crew that is looking for new crewmembers to give them a helping hand, whether you are a new or seasoned pilot!

frontier-lobby-frontier-subtext = Main hub for many space pioneers.
frontier-lobby-frontier-subtext = Foremost asset of the Creon-Centennial Trade Charter.
frontier-lobby-frontier-description = Awaken from cryosleep here to:
- Start your own crew and become captain
- Find a crew to join
Expand Down
6 changes: 3 additions & 3 deletions Resources/Locale/en-US/_NF/paper/stamp-component.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ stamp-component-signee-name = {$user}

stamp-component-stamped-name-doctor = Doctor
stamp-component-stamped-name-engineer = Engineer
stamp-component-stamped-name-doc = Director of Care
stamp-component-stamped-name-doc = Claims Manager
stamp-component-stamped-name-pal = Public Affairs Liaison
stamp-component-stamped-name-stc = Station Traffic Controller
stamp-component-stamped-name-sr = Station Representative
stamp-component-stamped-name-stc = Shareholder
stamp-component-stamped-name-sr = Marshall
stamp-component-stamped-name-bailiff = Bailiff
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/_NF/prototypes/access/accesses.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ id-card-access-level-frontier = TSF
id-card-access-level-pilot = Pilot
id-card-access-level-mail = Mail
id-card-access-level-mercenary = Mercenary
id-card-access-level-stc = Station Traffic Controller
id-card-access-level-stc = CCTC Shareholder
id-card-access-level-sergeant = TSFMC Fireteam Leader
id-card-access-level-bailiff = TSFMC Command
id-card-access-level-pirate = PDV
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/_NF/tips.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ nf-tips-dataset-90 = If you see a person who's fallen SSD, make sure to drag the
nf-tips-dataset-91 = Watch out for food trucks such as the Skipper or the McCargo - they can offer delicious food for a reasonable price!
nf-tips-dataset-92 = Meals cooked by chefs are more filling, more flavorful, and in some cases can even boost your movement speed for a short time!
nf-tips-dataset-93 = Each ID card can have a shuttle attached to it. If you need to purchase an additional shuttle, you can ask your local SR for another ID!
nf-tips-dataset-94 = The Station Representative can rename your shuttle! Usually it's enough to hand your ID and ask them to do it.
nf-tips-dataset-94 = Industrial factions usually have a lot of benefits to keeping them around... assuming you keep good relations with them.
nf-tips-dataset-95 = If your ship has a big crew, use specific radio keys (check the AstroVend) or HandiComms to talk with your crewmates.
nf-tips-dataset-96 = HandiComms work on multiple frequencies, and across extremely long distances.
nf-tips-dataset-97 = Before joining an ongoing round, you can see the list of ships looking for crew! Maybe some of them have jobs you would prefer?
Expand Down
4 changes: 2 additions & 2 deletions Resources/Locale/en-US/headset/headset-component.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ chat-radio-command = TSF Command
chat-radio-engineering = Engineering
chat-radio-medical = Medical
chat-radio-science = Science
chat-radio-security = Colonial Security
chat-radio-service = Colonial Staff
chat-radio-security = Centennial Security
chat-radio-service = Creon-Centennial
chat-radio-supply = Supply
chat-radio-syndicate = Syndicate
chat-radio-freelance = Vanguard
Expand Down
10 changes: 5 additions & 5 deletions Resources/Locale/en-US/job/job-names.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ job-name-research-assistant = Research Assistant
job-name-rd = Research Director
job-name-psychologist = Psychologist
job-name-intern = Medical Intern
job-name-doctor = Medical Doctor
job-name-doctor = CCTC Emergency Responder
job-name-paramedic = Paramedic
job-name-cmo = Chief Medical Officer
job-name-chemist = Chemist
Expand All @@ -18,7 +18,7 @@ job-name-engineer = Station Engineer
job-name-atmostech = Atmospheric Technician
job-name-hop = Head of Personnel
job-name-captain = Captain
job-name-serviceworker = Service Worker
job-name-serviceworker = CCTC Service Tech
job-name-centcomoff = CentComm Official
job-name-cburn = Centcomm Quarantine Officer
job-name-deathsquad = Centcomm Agent
Expand Down Expand Up @@ -89,8 +89,8 @@ JobERTJanitor = ERT Janitor
JobERTLeader = ERT Leader
JobERTMedical = ERT Medical
JobERTSecurity = ERT Security
# Frontier: Head of Personnel<Station Representative
JobHeadOfPersonnel = Station Representative
# Mono: Head of Personnel<Station Representative
JobHeadOfPersonnel = Marshall
# Mono: Head of Security<TSFMC Colonel
JobHeadOfSecurity = TSFMC Colonel
JobJanitor = Janitor
Expand All @@ -114,7 +114,7 @@ JobScientist = Scientist
JobSecurityCadet = Cadet
# Mono: Security Officer<TSFMC Corporal
JobSecurityOfficer = TSFMC Corporal
JobServiceWorker = Service Worker
JobServiceWorker = CCTC Service Tech
JobStationAi = Station AI
JobStationEngineer = Station Engineer
JobTechnicalAssistant = Technical Assistant
Expand Down
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/nyanotrasen/nyano-jobs.ftl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
job-name-mail-carrier = Mail Carrier
# job-name-prisoner defined in main job-names.ftl
job-name-service-worker = Service Worker
job-name-service-worker = CCTC service tech
job-name-guard = Prison Guard

job-description-mail-carrier = Deliver mail across the Colossus Sector. Stay neutral to conflicts.
Expand Down
4 changes: 2 additions & 2 deletions Resources/Locale/en-US/prototypes/access/accesses.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ id-card-access-level-captain = Captain
id-card-access-level-cryogenics = Cryogenics
id-card-access-level-emergency-shuttle-repeal = E.Shuttle Repeal All

id-card-access-level-head-of-personnel = Station Representative
id-card-access-level-head-of-personnel = Marshall
id-card-access-level-head-of-security = Colonel
id-card-access-level-security = Security
id-card-access-level-armory = Armory
Expand All @@ -17,7 +17,7 @@ id-card-access-level-atmospherics = Atmospherics
id-card-access-level-research-director = Research Director
id-card-access-level-research = Research

id-card-access-level-chief-medical-officer = Chief Medical Officer
id-card-access-level-chief-medical-officer = Claims Manager
id-card-access-level-medical = Medical
id-card-access-level-chemistry = Chemistry
id-card-access-level-paramedic = Paramedic
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/Fills/Boxes/general.yml
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@
amount: 4

- type: entity
name: colonial staff encryption key box
name: creon-centennial staff encryption key box
parent: BoxEncryptionKeyPassenger
id: BoxEncryptionKeyService
components:
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
- type: entity
id: SpawnPointServiceWorker
parent: SpawnPointJobBase
name: service worker
name: CCTC service tech
categories: [ HideSpawnMenu ] # Frontier
components:
- type: SpawnPoint
Expand Down Expand Up @@ -646,4 +646,4 @@
- type: Sprite
layers:
- state: green
- state: zookeeper
- state: zookeeper
Original file line number Diff line number Diff line change
Expand Up @@ -188,9 +188,9 @@
- type: entity
parent: EncryptionKey
id: EncryptionKeySecurity
name: colonial security encryption key # mono
name: centennial security encryption key # mono
categories: [ DoNotMap ] # Frontier
description: An encryption key used by Colonial security. # Mono
description: An encryption key used by Creon-Centennial security. # Mono
components:
- type: EncryptionKey
channels:
Expand All @@ -204,9 +204,9 @@
- type: entity
parent: [EncryptionKey, RecyclableItemDeviceTiny]
id: EncryptionKeyService
name: colonial staff encryption key # Mono
name: creon-centennial staff encryption key # Mono
categories: [ DoNotMap ] # Frontier
description: An encryption key used by the service staff, tasked with keeping the station full, happy and clean.
description: An encryption key used by Creon-Centennial employees.
components:
- type: EncryptionKey
channels:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Objects/Devices/pda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@
- type: entity
parent: BasePDA
id: ServiceWorkerPDA
name: service worker PDA
name: CCTC service tech PDA
description: Why isn't it gray?
components:
- type: Pda
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
- type: entity
parent: PassengerIDCard
id: ServiceWorkerIDCard
name: service worker ID card
name: service tech ID card
components:
- type: PresetIdCard
job: ServiceWorker
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -892,7 +892,7 @@
price: 750

- type: entity
name: NT energy shotgun
name: CAW-DEW "Hierarchy" energy shotgun
parent: [BaseWeaponBattery, BaseGunWieldable]
id: WeaponEnergyShotgun
description: A one-of-a-kind prototype energy weapon that uses various shotgun configurations. It offers the possibility of both lethal and non-lethal shots, making it a versatile weapon.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
- type: entity
id: SpawnPointCCServiceWorker
parent: SpawnPointJobBase
name: valet
name: CCTC service tech
components:
- type: SpawnPoint
job_id: CCServiceWorker
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
parent: IDCardStandard
id: CCServiceWorkerIDCard #Mono
categories: [ HideSpawnMenu ] # Frontier
name: colossus sector service ID card
description: An identification card belonging to a service worker in the Colossus Sector.
name: CCTC service tech ID card
description: An identification card belonging to a CCTC service tech in the Colossus Sector.
components:
- type: Sprite
layers:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
- type: entity
parent: BasePDA
id: CCServiceWorkerPDA
name: colossus sector service PDA
description: A personal digital assistant belonging to a service worker in the Colossus Sector.
name: CCTC service tech PDA
description: A personal digital assistant belonging to a CCTC service tech in the Colossus Sector.
components:
- type: Pda
id: CCServiceWorkerNFIDCard # Frontier: CCServiceWorkerIDCard<CCServiceWorkerNFIDCard
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
weight: 90 # Frontier
displayWeight: 30 # Frontier
assignedCompany: Colonial
setPreference: false # Mono
canBeAntag: false
access:
- External # Frontier
Expand Down
Loading
Loading