diff --git a/Content.Shared/GameTicking/SharedGameTicker.cs b/Content.Shared/GameTicking/SharedGameTicker.cs index 52911d98a5..8002a8d936 100644 --- a/Content.Shared/GameTicking/SharedGameTicker.cs +++ b/Content.Shared/GameTicking/SharedGameTicker.cs @@ -15,9 +15,9 @@ namespace Content.Shared.GameTicking // But this is easier, and at least it isn't hardcoded. //TODO: Move these, they really belong in StationJobsSystem or a cvar. [ValidatePrototypeId] - public const string FallbackOverflowJob = "Adventurer"; + public const string FallbackOverflowJob = "CP14Adventurer"; - public const string FallbackOverflowJobName = "job-name-adventurer"; + public const string FallbackOverflowJobName = "cp14-job-name-adventurer"; // TODO network. // Probably most useful for replays, round end info, and probably things like lobby menus. diff --git a/Resources/Locale/en-US/_CP14/job/department.ftl b/Resources/Locale/en-US/_CP14/job/department.ftl new file mode 100644 index 0000000000..40994a378d --- /dev/null +++ b/Resources/Locale/en-US/_CP14/job/department.ftl @@ -0,0 +1,5 @@ +department-CP14Free = Free civilians +department-CP14Free-desc = Individuals who are not burdened by contracts and work for the government, but do not receive free assistance from it either. Find your own way of earning a living. + +department-CP14Command = Officers of the Law +department-CP14Command-desc = Persons working directly for government officials. Bound by a magical contract, they cannot act against the interests of the state. \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/job/job.ftl b/Resources/Locale/en-US/_CP14/job/job.ftl new file mode 100644 index 0000000000..a08501e62c --- /dev/null +++ b/Resources/Locale/en-US/_CP14/job/job.ftl @@ -0,0 +1,5 @@ +cp14-job-name-adventurer = Adventurer +cp14-job-desc-adventurer = A hunter of thrills, riches and fame, constantly risking his life. Search for valuables in dangerous places and sell them to the settlement. + +cp14-job-name-alchemist = Alchemist +cp14-job-desc-alchemist = A scientist of sorts, exploring the nature of substances. Create poisons and medicines from numerous natural plants and ingredients and sell them to the settlement. \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/job/supervisors.ftl b/Resources/Locale/en-US/_CP14/job/supervisors.ftl new file mode 100644 index 0000000000..ee82393418 --- /dev/null +++ b/Resources/Locale/en-US/_CP14/job/supervisors.ftl @@ -0,0 +1 @@ +cp14-job-supervisors-command = all authority figures \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/jobs/job-names.ftl b/Resources/Locale/en-US/_CP14/jobs/job-names.ftl deleted file mode 100644 index f9171b71be..0000000000 --- a/Resources/Locale/en-US/_CP14/jobs/job-names.ftl +++ /dev/null @@ -1 +0,0 @@ -job-name-adventurer = Adventurer \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/job/department.ftl b/Resources/Locale/ru-RU/_CP14/job/department.ftl new file mode 100644 index 0000000000..b986d3e38e --- /dev/null +++ b/Resources/Locale/ru-RU/_CP14/job/department.ftl @@ -0,0 +1,5 @@ +department-CP14Free = Свободные гражданские +department-CP14Free-desc = Лица, не обремененные контрактами и работой на государство, но и не получающие от него бесплатной помощи. Найдите свой способ заработка. + +department-CP14Command = Служители закона +department-CP14Command-desc = Лица, напрямую работающие на представителей власти. Связанные магическим контрактом, они не могут действовать против интересов государства. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/job/job.ftl b/Resources/Locale/ru-RU/_CP14/job/job.ftl new file mode 100644 index 0000000000..ed42e09684 --- /dev/null +++ b/Resources/Locale/ru-RU/_CP14/job/job.ftl @@ -0,0 +1,5 @@ +cp14-job-name-adventurer = Авантюрист +cp14-job-desc-adventurer = Охотник за острыми эмоциями, богатствами и славой, постоянно рискующий своей жизнью. Ищите ценности в опасных местах, и продавайте их поселению. + +cp14-job-name-alchemist = Алхимик +cp14-job-desc-alchemist = В своем роде ученый, исследующий природу веществ. Создавайте яды и лекарства, из многочисленных природных растений и ингредиентов, и продавайте их поселению. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/job/supervisors.ftl b/Resources/Locale/ru-RU/_CP14/job/supervisors.ftl new file mode 100644 index 0000000000..ec1f7bb9ec --- /dev/null +++ b/Resources/Locale/ru-RU/_CP14/job/supervisors.ftl @@ -0,0 +1 @@ +cp14-job-supervisors-command = всем представителям власти \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/jobs/job-names.ftl b/Resources/Locale/ru-RU/_CP14/jobs/job-names.ftl deleted file mode 100644 index c8712652ef..0000000000 --- a/Resources/Locale/ru-RU/_CP14/jobs/job-names.ftl +++ /dev/null @@ -1 +0,0 @@ -job-name-adventurer = Авантюрист \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 9be98be950..349fdbb020 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -2,6 +2,7 @@ id: Cargo description: department-Cargo-description color: "#A46106" + editorHidden: true roles: - CargoTechnician - Quartermaster @@ -11,6 +12,7 @@ id: Civilian description: department-Civilian-description color: "#9FED58" + editorHidden: true weight: -10 roles: - Bartender @@ -36,6 +38,7 @@ id: Command description: department-Command-description color: "#334E6D" + editorHidden: true roles: - Captain - CentralCommandOfficial @@ -52,6 +55,7 @@ id: Engineering description: department-Engineering-description color: "#EFB341" + editorHidden: true roles: - AtmosphericTechnician - ChiefEngineer @@ -62,6 +66,7 @@ id: Medical description: department-Medical-description color: "#52B4E9" + editorHidden: true roles: - Chemist - ChiefMedicalOfficer @@ -74,6 +79,7 @@ id: Security description: department-Security-description color: "#DE3A3A" + editorHidden: true weight: 20 roles: - HeadOfSecurity @@ -86,6 +92,7 @@ id: Science description: department-Science-description color: "#D381C9" + editorHidden: true roles: - ResearchDirector - Scientist @@ -95,6 +102,7 @@ id: Specific description: department-Specific-description color: "#9FED58" + editorHidden: true weight: 10 roles: - Boxer diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/herbal_gather.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/herbal_gather.yml index e8d9a5013b..587d1c4d77 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/herbal_gather.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/herbal_gather.yml @@ -2,6 +2,8 @@ id: CP14RandomSpawnerGatherGloodgrass name: bloodgrass spawner parent: MarkerBase + categories: + - Spawner components: - type: Sprite layers: @@ -21,6 +23,8 @@ id: CP14RandomSpawnerGatherAgaricShroom name: agaric shroom spawner parent: MarkerBase + categories: + - Spawner components: - type: Sprite layers: diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/misc.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/misc.yml index 3e9c908355..a5ea9598ef 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/misc.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/misc.yml @@ -2,6 +2,8 @@ id: CP14RandomDirtLootSpawner name: dirt spawner parent: CP14DirtEffect + categories: + - Spawner components: - type: RandomSpawner prototypes: diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml index a0ed6949dc..7ca3ec48c6 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml @@ -2,6 +2,8 @@ id: CP14SpawnPointAdventurer parent: SpawnPointJobBase name: adventurer + categories: + - Spawner components: - type: SpawnPoint job_id: Adventurer diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml index b399771438..1b6dbbc404 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml @@ -233,7 +233,6 @@ save: false abstract: true components: - - type: Flashable # Organs - type: StatusEffects allowed: @@ -252,6 +251,7 @@ - Muted - Pacified - StaminaModifier + - Flashed - type: Blindable - type: Bloodstream bloodReagent: CP14Blood diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/heater.yml b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/heater.yml index 977192b3e7..6f6b2bbfa1 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/heater.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/heater.yml @@ -73,6 +73,8 @@ name: alchemy furnace parent: CP14BaseFireplace description: A furnace fueled by wood, coal, or any other burning material. Handy for heating your alchemical potions. + categories: + - Debug components: - type: Sprite sprite: _CP14/Structures/Specific/Alchemy/alchemy_furnace.rsi diff --git a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml index 5bec1b9e89..9394489437 100644 --- a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml @@ -1,5 +1,5 @@ - type: roleLoadout - id: JobAdventurer + id: CP14JobAdventurer groups: - CP14TestHead - CP14TestEyes diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Free/adventurer.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Free/adventurer.yml new file mode 100644 index 0000000000..8acd766742 --- /dev/null +++ b/Resources/Prototypes/_CP14/Roles/Jobs/Free/adventurer.yml @@ -0,0 +1,20 @@ +- type: job + id: CP14Adventurer + name: cp14-job-name-adventurer + description: cp14-job-desc-adventurer + playTimeTracker: CP14JobAdventurer + startingGear: CP14TestGear + icon: "CP14JobIconAdventurer" + supervisors: cp14-job-supervisors-command + +- type: job + id: CP14Alchemist + name: cp14-job-name-alchemist + description: cp14-job-desc-alchemist + playTimeTracker: CP14JobAlchemist + startingGear: CP14TestGear + icon: "CP14JobIconAlchemist" + supervisors: cp14-job-supervisors-command + +- type: startingGear + id: CP14TestGear \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/adventurer.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/adventurer.yml deleted file mode 100644 index 836afd6035..0000000000 --- a/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/adventurer.yml +++ /dev/null @@ -1,11 +0,0 @@ -- type: job - id: Adventurer - name: job-name-adventurer - description: job-description-adventurer - playTimeTracker: JobAdventurer - startingGear: CP14TestGear - icon: "JobIconCargoTechnician" #TODO replace - supervisors: job-supervisors-everyone - -- type: startingGear - id: CP14TestGear \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/departments.yml b/Resources/Prototypes/_CP14/Roles/Jobs/departments.yml index 42cca28645..28aa2a5fe4 100644 --- a/Resources/Prototypes/_CP14/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/_CP14/Roles/Jobs/departments.yml @@ -1,6 +1,12 @@ - type: department - id: Mercenary - description: department-Mercenary-description - color: "#e6a447" + id: CP14Free + description: department-CP14Free-desc + color: "#429976" roles: - - Adventurer \ No newline at end of file + - CP14Adventurer + - CP14Alchemist + +- type: department + id: CP14Command + description: department-CP14Command-desc + color: "#fadb3e" diff --git a/Resources/Prototypes/_CP14/Roles/play_time_tracker.yml b/Resources/Prototypes/_CP14/Roles/play_time_tracker.yml index a1d931818a..25e1f15288 100644 --- a/Resources/Prototypes/_CP14/Roles/play_time_tracker.yml +++ b/Resources/Prototypes/_CP14/Roles/play_time_tracker.yml @@ -1,4 +1,7 @@ # Jobs - type: playTimeTracker - id: JobAdventurer \ No newline at end of file + id: CP14JobAdventurer + +- type: playTimeTracker + id: CP14JobAlchemmist \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/StatusEffects/job.yml b/Resources/Prototypes/_CP14/StatusEffects/job.yml new file mode 100644 index 0000000000..481b8201bb --- /dev/null +++ b/Resources/Prototypes/_CP14/StatusEffects/job.yml @@ -0,0 +1,20 @@ +- type: statusIcon + id: CP14JobIcon + abstract: true + priority: 1 + locationPreference: Right + isShaded: true + +- type: statusIcon + parent: CP14JobIcon + id: CP14JobIconAdventurer + icon: + sprite: /Textures/_CP14/Interface/Misc/job_icons.rsi + state: Adventurer + +- type: statusIcon + parent: CP14JobIcon + id: CP14JobIconAlchemist + icon: + sprite: /Textures/_CP14/Interface/Misc/job_icons.rsi + state: Alchemist \ No newline at end of file diff --git a/Resources/Textures/_CP14/Interface/Misc/job_icons.rsi/Adventurer.png b/Resources/Textures/_CP14/Interface/Misc/job_icons.rsi/Adventurer.png new file mode 100644 index 0000000000..f5ea7f800c Binary files /dev/null and b/Resources/Textures/_CP14/Interface/Misc/job_icons.rsi/Adventurer.png differ diff --git a/Resources/Textures/_CP14/Interface/Misc/job_icons.rsi/Alchemist.png b/Resources/Textures/_CP14/Interface/Misc/job_icons.rsi/Alchemist.png new file mode 100644 index 0000000000..57edab2487 Binary files /dev/null and b/Resources/Textures/_CP14/Interface/Misc/job_icons.rsi/Alchemist.png differ diff --git a/Resources/Textures/_CP14/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/_CP14/Interface/Misc/job_icons.rsi/meta.json new file mode 100644 index 0000000000..4c92b4c040 --- /dev/null +++ b/Resources/Textures/_CP14/Interface/Misc/job_icons.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 9, + "y": 9 + }, + "license": "All rights reserved for the CrystallPunk14 project only", + "copyright": "Created by TheShuEd (Github) for CrystallPunk14", + "states": [ + { + "name": "Adventurer" + }, + { + "name": "Alchemist" + } + ] +} \ No newline at end of file