From 1df7e9ebef7f0ab9fe7ac61d4afe3c0752604b1a Mon Sep 17 00:00:00 2001 From: keekee38 Date: Wed, 15 Jan 2025 19:03:46 -0500 Subject: [PATCH 1/2] *waves* --- Resources/Locale/en-US/_DV/phrases/common.ftl | 13 +++- .../Locale/en-US/_DV/phrases/species.ftl | 2 +- .../Locale/en-US/_DV/phrases/subjects.ftl | 14 +++- .../_DV/QuickPhrases/Common/actions.yml | 70 +++++++++++++++++ .../_DV/QuickPhrases/Common/commands.yml | 75 ++++--------------- .../_DV/QuickPhrases/Common/numbers.yml | 6 ++ .../_DV/QuickPhrases/Common/qualitative.yml | 15 ++++ .../_DV/QuickPhrases/Common/questions.yml | 5 ++ .../_DV/QuickPhrases/Species/animals.yml | 11 +-- .../_DV/QuickPhrases/Species/crew.yml | 5 ++ .../_DV/QuickPhrases/Subjects/command.yml | 12 ++- .../_DV/QuickPhrases/Subjects/engineering.yml | 20 +++++ .../_DV/QuickPhrases/Subjects/epistemics.yml | 17 ++++- .../_DV/QuickPhrases/Subjects/generic.yml | 20 +++++ .../_DV/QuickPhrases/Subjects/logistics.yml | 5 ++ .../Prototypes/_DV/QuickPhrases/jobs.yml | 38 +++++++++- .../Prototypes/_DV/QuickPhrases/locations.yml | 18 ++++- 17 files changed, 267 insertions(+), 79 deletions(-) create mode 100644 Resources/Prototypes/_DV/QuickPhrases/Common/actions.yml diff --git a/Resources/Locale/en-US/_DV/phrases/common.ftl b/Resources/Locale/en-US/_DV/phrases/common.ftl index 8f1da4d93f2..33b27b0f84f 100644 --- a/Resources/Locale/en-US/_DV/phrases/common.ftl +++ b/Resources/Locale/en-US/_DV/phrases/common.ftl @@ -12,7 +12,7 @@ phrase-give-me = Give phrase-need = I need phrase-want = I want phrase-cant = I can't -phrase-show-me = Show +phrase-show = Show phrase-help = Help phrase-attack = Attack phrase-break = Break @@ -23,7 +23,7 @@ phrase-go-away = Go away phrase-leave = Leave phrase-stay = Stay phrase-come-here = Come here -phrase-take-this = Take this +phrase-take = Take phrase-go-to = Go to phrase-do-not = Do not phrase-wait = Wait @@ -94,3 +94,12 @@ phrase-i-am = I am phrase-you-are = You are phrase-mine = Mine phrase-yours = Yours +phrase-on = On +phrase-off = Off +phrase-day = day +phrase-which = Which +phrase-not = Not +phrase-call = Call +phrase-this = This +phrase-actiondrink = Drink +phrase-know = Know diff --git a/Resources/Locale/en-US/_DV/phrases/species.ftl b/Resources/Locale/en-US/_DV/phrases/species.ftl index 29f21cf7b32..fef94615ead 100644 --- a/Resources/Locale/en-US/_DV/phrases/species.ftl +++ b/Resources/Locale/en-US/_DV/phrases/species.ftl @@ -8,7 +8,6 @@ phrase-species-mouse = mouse phrase-species-mothroach = mothroach phrase-species-cockroach = cockroach phrase-species-spider = spider -phrase-species-tarantula = tarantula phrase-species-bird = bird phrase-species-parrot = parrot phrase-species-snake = snake @@ -40,3 +39,4 @@ phrase-species-ghost = ghost phrase-species-pest = pest phrase-species-insect = insect phrase-species-pet = pet +phrase-species-chicken = chicken diff --git a/Resources/Locale/en-US/_DV/phrases/subjects.ftl b/Resources/Locale/en-US/_DV/phrases/subjects.ftl index 5033b5ddfc5..eec52101db7 100644 --- a/Resources/Locale/en-US/_DV/phrases/subjects.ftl +++ b/Resources/Locale/en-US/_DV/phrases/subjects.ftl @@ -41,6 +41,7 @@ phrase-wood = wood phrase-cloth = cloth phrase-cardboard = cardboard phrase-gold = gold +phrase-glass = glass phrase-silver = silver phrase-bluespace = bluespace phrase-access = access @@ -72,6 +73,7 @@ phrase-teg = TEG phrase-tesla = tesla phrase-tritium = tritium phrase-magboots = magboots +phrase-holofan = holofan phrase-anomaly = anomaly phrase-ape = A.P.E. phrase-anomaly-vessel = anomaly vessel @@ -84,7 +86,7 @@ phrase-research-console = R&D computer phrase-oracle = Oracle phrase-sophie = Sophie phrase-glimmer = glimmer -phrase-psionics = psionics +phrase-psionic = psionic phrase-lotophagol-oil = lotophagol oil phrase-mindbreak-phase = mindbreak phrase-protolathe = protolathe @@ -198,6 +200,16 @@ phrase-box = box phrase-locker = locker phrase-machine = machine phrase-blood = blood +phrase-nukedisk = nuclear disk +phrase-pinpointer = pinpointer +phrase-law = law +phrase-chassis = chassis +phrase-engi-on = on +phrase-engi-off = off +phrase-gas-analyzer = gas analyzer +phrase-planetside = planetside +phrase-holopad = holopad +phrase-upgrade = upgrade # colors phrase-color-red = red diff --git a/Resources/Prototypes/_DV/QuickPhrases/Common/actions.yml b/Resources/Prototypes/_DV/QuickPhrases/Common/actions.yml new file mode 100644 index 00000000000..2a8dc43a1e0 --- /dev/null +++ b/Resources/Prototypes/_DV/QuickPhrases/Common/actions.yml @@ -0,0 +1,70 @@ +- type: quickPhrase + id: BaseActionPhrase + parent: BaseCommonPhrase + group: Actions + abstract: true + +- type: quickPhrase + id: CallPhrase + parent: BaseActionPhrase + text: phrase-call + +- type: quickPhrase + id: DrinkActionPhrase + parent: BaseActionPhrase + text: phrase-actiondrink + +- type: quickPhrase + id: ShowMePhrase + parent: BaseActionPhrase + text: phrase-show + +- type: quickPhrase + id: HelpPhrase + parent: BaseActionPhrase + text: phrase-help + +- type: quickPhrase + id: AttackPhrase + parent: BaseActionPhrase + text: phrase-attack + +- type: quickPhrase + id: BreakPhrase + parent: BaseActionPhrase + text: phrase-break + +- type: quickPhrase + id: BuildPhrase + parent: BaseActionPhrase + text: phrase-build + +- type: quickPhrase + id: HealPhrase + parent: BaseActionPhrase + text: phrase-heal + +- type: quickPhrase + id: RunPhrase + parent: BaseActionPhrase + text: phrase-run + +- type: quickPhrase + id: GoPhrase + parent: BaseActionPhrase + text: phrase-go + +- type: quickPhrase + id: FixPhrase + parent: BaseActionPhrase + text: phrase-fix + +- type: quickPhrase + id: SwitchPhrase + parent: BaseActionPhrase + text: phrase-switch + +- type: quickPhrase + id: KnowPhrase + parent: BaseActionPhrase + text: phrase-know diff --git a/Resources/Prototypes/_DV/QuickPhrases/Common/commands.yml b/Resources/Prototypes/_DV/QuickPhrases/Common/commands.yml index c56cf6a7ad7..e038a2e18fa 100644 --- a/Resources/Prototypes/_DV/QuickPhrases/Common/commands.yml +++ b/Resources/Prototypes/_DV/QuickPhrases/Common/commands.yml @@ -24,66 +24,16 @@ parent: BaseImperativePhrase text: phrase-cant -- type: quickPhrase - id: ShowMePhrase - parent: BaseImperativePhrase - text: phrase-show-me - -- type: quickPhrase - id: HelpPhrase - parent: BaseImperativePhrase - text: phrase-help - -- type: quickPhrase - id: AttackPhrase - parent: BaseImperativePhrase - text: phrase-attack - -- type: quickPhrase - id: BreakPhrase - parent: BaseImperativePhrase - text: phrase-break - -- type: quickPhrase - id: BuildPhrase - parent: BaseImperativePhrase - text: phrase-build - -- type: quickPhrase - id: HealPhrase - parent: BaseImperativePhrase - text: phrase-heal - -- type: quickPhrase - id: StopPhrase - parent: BaseImperativePhrase - text: phrase-stop - - type: quickPhrase id: GoAwayPhrase parent: BaseImperativePhrase text: phrase-go-away -- type: quickPhrase - id: LeavePhrase - parent: BaseImperativePhrase - text: phrase-leave - -- type: quickPhrase - id: StayPhrase - parent: BaseImperativePhrase - text: phrase-stay - - type: quickPhrase id: ComeHerePhrase parent: BaseImperativePhrase text: phrase-come-here -- type: quickPhrase - id: TakeThisPhrase - parent: BaseImperativePhrase - text: phrase-take-this - - type: quickPhrase id: GoToPhrase parent: BaseImperativePhrase @@ -100,26 +50,31 @@ text: phrase-wait - type: quickPhrase - id: GoPhrase + id: WillPhrase + parent: BaseImperativePhrase + text: phrase-will + +- type: quickPhrase + id: ThisPhrase parent: BaseImperativePhrase - text: phrase-go + text: phrase-this - type: quickPhrase - id: RunPhrase + id: TakePhrase parent: BaseImperativePhrase - text: phrase-run + text: phrase-take - type: quickPhrase - id: FixPhrase + id: LeavePhrase parent: BaseImperativePhrase - text: phrase-fix + text: phrase-leave - type: quickPhrase - id: SwitchPhrase + id: StayPhrase parent: BaseImperativePhrase - text: phrase-switch + text: phrase-stay - type: quickPhrase - id: WillPhrase + id: StopPhrase parent: BaseImperativePhrase - text: phrase-will + text: phrase-stop diff --git a/Resources/Prototypes/_DV/QuickPhrases/Common/numbers.yml b/Resources/Prototypes/_DV/QuickPhrases/Common/numbers.yml index e872d2d3f8f..832cbdfde21 100644 --- a/Resources/Prototypes/_DV/QuickPhrases/Common/numbers.yml +++ b/Resources/Prototypes/_DV/QuickPhrases/Common/numbers.yml @@ -98,3 +98,9 @@ id: SecondPhrase parent: BaseNumberPhrase text: phrase-second + +- type: quickPhrase + id: DayPhrase + parent: BaseNumberPhrase + text: phrase-day + diff --git a/Resources/Prototypes/_DV/QuickPhrases/Common/qualitative.yml b/Resources/Prototypes/_DV/QuickPhrases/Common/qualitative.yml index e81b2ca8ccf..e8a0f80ac58 100644 --- a/Resources/Prototypes/_DV/QuickPhrases/Common/qualitative.yml +++ b/Resources/Prototypes/_DV/QuickPhrases/Common/qualitative.yml @@ -68,3 +68,18 @@ id: BadPhrase parent: BaseQualitativePhrase text: phrase-bad + +- type: quickPhrase + id: OnPhrase + parent: BaseQualitativePhrase + text: phrase-on + +- type: quickPhrase + id: OffPhrase + parent: BaseQualitativePhrase + text: phrase-off + +- type: quickPhrase + id: NotPhrase + parent: BaseQualitativePhrase + text: phrase-not diff --git a/Resources/Prototypes/_DV/QuickPhrases/Common/questions.yml b/Resources/Prototypes/_DV/QuickPhrases/Common/questions.yml index 8869134401a..99d6fdf7c55 100644 --- a/Resources/Prototypes/_DV/QuickPhrases/Common/questions.yml +++ b/Resources/Prototypes/_DV/QuickPhrases/Common/questions.yml @@ -53,3 +53,8 @@ id: ShouldIPhrase parent: BaseQuestionPhrase text: phrase-should-i + +- type: quickPhrase + id: WhichPhrase + parent: BaseQuestionPhrase + text: phrase-which diff --git a/Resources/Prototypes/_DV/QuickPhrases/Species/animals.yml b/Resources/Prototypes/_DV/QuickPhrases/Species/animals.yml index 4468931a272..ee1e5c95401 100644 --- a/Resources/Prototypes/_DV/QuickPhrases/Species/animals.yml +++ b/Resources/Prototypes/_DV/QuickPhrases/Species/animals.yml @@ -54,11 +54,6 @@ parent: BaseAnimalSpeciesPhrase text: phrase-species-spider -- type: quickPhrase - id: SpeciesTarantulaPhrase - parent: BaseAnimalSpeciesPhrase - text: phrase-species-tarantula - - type: quickPhrase id: SpeciesBirdPhrase parent: BaseAnimalSpeciesPhrase @@ -163,3 +158,9 @@ id: SpeciesGoatPhrase parent: BaseAnimalSpeciesPhrase text: phrase-species-goat + +- type: quickPhrase + id: SpeciesChickenPhrase + parent: BaseAnimalSpeciesPhrase + text: phrase-species-chicken + diff --git a/Resources/Prototypes/_DV/QuickPhrases/Species/crew.yml b/Resources/Prototypes/_DV/QuickPhrases/Species/crew.yml index 1f93d7bf46a..a93c664b835 100644 --- a/Resources/Prototypes/_DV/QuickPhrases/Species/crew.yml +++ b/Resources/Prototypes/_DV/QuickPhrases/Species/crew.yml @@ -63,3 +63,8 @@ id: SpeciesVoxPhrase parent: BaseCrewSpeciesPhrase text: species-name-vox + +- type: quickPhrase + id: SpeciesRodentiaPhrase + parent: BaseCrewSpeciesPhrase + text: species-name-rodentia diff --git a/Resources/Prototypes/_DV/QuickPhrases/Subjects/command.yml b/Resources/Prototypes/_DV/QuickPhrases/Subjects/command.yml index 35e958e5c03..e9619cf3358 100644 --- a/Resources/Prototypes/_DV/QuickPhrases/Subjects/command.yml +++ b/Resources/Prototypes/_DV/QuickPhrases/Subjects/command.yml @@ -29,6 +29,16 @@ text: phrase-stamp - type: quickPhrase - id: ImplantPhrase + id: CommandImplantPhrase parent: BaseCommandSubjectPhrase text: phrase-implant + +- type: quickPhrase + id: nukediskPhrase + parent: BaseCommandSubjectPhrase + text: phrase-nukedisk + +- type: quickPhrase + id: pinpointerPhrase + parent: BaseCommandSubjectPhrase + text: phrase-pinpointer diff --git a/Resources/Prototypes/_DV/QuickPhrases/Subjects/engineering.yml b/Resources/Prototypes/_DV/QuickPhrases/Subjects/engineering.yml index 967e0d5d2a9..e254eb76851 100644 --- a/Resources/Prototypes/_DV/QuickPhrases/Subjects/engineering.yml +++ b/Resources/Prototypes/_DV/QuickPhrases/Subjects/engineering.yml @@ -117,3 +117,23 @@ id: MagbootsPhrase parent: BaseEngineeringSubjectPhrase text: phrase-magboots + +- type: quickPhrase + id: HolofanPhrase + parent: BaseEngineeringSubjectPhrase + text: phrase-holofan + +- type: quickPhrase + id: EngiOnPhrase + parent: BaseEngineeringSubjectPhrase + text: phrase-engi-on + +- type: quickPhrase + id: EngiOffPhrase + parent: BaseEngineeringSubjectPhrase + text: phrase-engi-off + +- type: quickPhrase + id: GasAnalyzerPhrase + parent: BaseEngineeringSubjectPhrase + text: phrase-gas-analyzer diff --git a/Resources/Prototypes/_DV/QuickPhrases/Subjects/epistemics.yml b/Resources/Prototypes/_DV/QuickPhrases/Subjects/epistemics.yml index 5b50ef40d8a..b84a6fc0ecb 100644 --- a/Resources/Prototypes/_DV/QuickPhrases/Subjects/epistemics.yml +++ b/Resources/Prototypes/_DV/QuickPhrases/Subjects/epistemics.yml @@ -66,7 +66,7 @@ - type: quickPhrase id: PsionicsPhrase parent: BaseEpistemicsSubjectPhrase - text: phrase-psionics + text: phrase-psionic - type: quickPhrase id: LotophagolOilPhrase @@ -87,3 +87,18 @@ id: CircuitImprinterPhrase parent: BaseEpistemicsSubjectPhrase text: phrase-circuit-imprinter + +- type: quickPhrase + id: EpistemicsBluespacePhrase + parent: BaseEpistemicsSubjectPhrase + text: phrase-bluespace-crystal + +- type: quickPhrase + id: EpiUpgradePhrase + parent: BaseEpistemicsSubjectPhrase + text: phrase-upgrade + +- type: quickPhrase + id: ChassisPhrase + parent: BaseEpistemicsSubjectPhrase + text: phrase-chassis diff --git a/Resources/Prototypes/_DV/QuickPhrases/Subjects/generic.yml b/Resources/Prototypes/_DV/QuickPhrases/Subjects/generic.yml index 256871fc4b3..8d4927ffd7f 100644 --- a/Resources/Prototypes/_DV/QuickPhrases/Subjects/generic.yml +++ b/Resources/Prototypes/_DV/QuickPhrases/Subjects/generic.yml @@ -188,6 +188,21 @@ parent: BaseSubjectPhrase text: phrase-blood +- type: quickPhrase + id: LawPhrase + parent: BaseSubjectPhrase + text: phrase-law + +- type: quickPhrase + id: HolopadPhrase + parent: BaseSubjectPhrase + text: phrase-holopad + +- type: quickPhrase + id: UpgradePhrase + parent: BaseSubjectPhrase + text: phrase-upgrade + # Materials - type: quickPhrase @@ -246,6 +261,11 @@ parent: BaseMaterialPhrase text: phrase-gold +- type: quickPhrase + id: GlassPhrase + parent: BaseMaterialPhrase + text: phrase-glass + - type: quickPhrase id: SilverPhrase parent: BaseMaterialPhrase diff --git a/Resources/Prototypes/_DV/QuickPhrases/Subjects/logistics.yml b/Resources/Prototypes/_DV/QuickPhrases/Subjects/logistics.yml index a5ce44f3260..85a19efd944 100644 --- a/Resources/Prototypes/_DV/QuickPhrases/Subjects/logistics.yml +++ b/Resources/Prototypes/_DV/QuickPhrases/Subjects/logistics.yml @@ -93,6 +93,11 @@ parent: BaseLogisticsSubjectPhrase text: phrase-expedition +- type: quickPhrase + id: PlanetsidePhrase + parent: BaseLogisticsSubjectPhrase + text: phrase-planetside + # Ores - type: quickPhrase diff --git a/Resources/Prototypes/_DV/QuickPhrases/jobs.yml b/Resources/Prototypes/_DV/QuickPhrases/jobs.yml index 71d9f036804..df5dc38820b 100644 --- a/Resources/Prototypes/_DV/QuickPhrases/jobs.yml +++ b/Resources/Prototypes/_DV/QuickPhrases/jobs.yml @@ -64,13 +64,18 @@ - type: quickPhrase parent: BaseCommandJobPhrase - id: HeadOfPersonnelPhrase - text: job-name-hop + id: CentralCommandOfficialPhrase + text: job-name-centcomoff - type: quickPhrase parent: BaseCommandJobPhrase - id: CentralCommandOfficialPhrase - text: job-name-centcomoff + id: AdminAssistantPhrase + text: job-name-admin-assistant + +- type: quickPhrase + parent: BaseCommandJobPhrase + id: StationAIPhrase + text: job-name-station-ai # Engineering @@ -116,6 +121,11 @@ id: ResearchAssistantPhrase text: job-name-research-assistant +- type: quickPhrase + parent: BaseEpistemicsJobPhrase + id: RoboticistPhrase + text: job-name-roboticist + - type: quickPhrase parent: BaseEpistemicsJobPhrase id: BorgPhrase @@ -143,6 +153,11 @@ id: CourierPhrase text: job-name-courier +- type: quickPhrase + parent: BaseLogisticsJobPhrase + id: CargoAssistantPhrase + text: job-name-cargo-assistant + # Justice - type: quickPhrase @@ -192,6 +207,11 @@ id: MedicalInternPhrase text: job-name-intern +- type: quickPhrase + parent: BaseMedicalJobPhrase + id: SurgeonPhrase + text: job-name-surgeon + # Security - type: quickPhrase @@ -256,6 +276,11 @@ id: MusicianPhrase text: job-name-musician +- type: quickPhrase + parent: BaseServiceJobPhrase + id: ServiceWorkerPhrase + text: job-name-serviceworker + - type: quickPhrase parent: BaseServiceJobPhrase id: ClownPhrase @@ -266,6 +291,11 @@ id: MimePhrase text: job-name-mime +- type: quickPhrase + parent: BaseServiceJobPhrase + id: HeadOfPersonnelPhrase + text: job-name-hop + # Wildcard - type: quickPhrase diff --git a/Resources/Prototypes/_DV/QuickPhrases/locations.yml b/Resources/Prototypes/_DV/QuickPhrases/locations.yml index 0f8102514f3..15f6cc7e394 100644 --- a/Resources/Prototypes/_DV/QuickPhrases/locations.yml +++ b/Resources/Prototypes/_DV/QuickPhrases/locations.yml @@ -131,13 +131,18 @@ - type: quickPhrase parent: BaseCommandLocationPhrase - id: LocationHopPhrase - text: station-beacon-hop + id: LocationConferenceRoomPhrase + text: station-beacon-conference-room - type: quickPhrase parent: BaseCommandLocationPhrase - id: LocationConferenceRoomPhrase - text: station-beacon-conference-room + id: LocationAICorePhrase + text: station-beacon-ai-core + +- type: quickPhrase + parent: BaseCommandLocationPhrase + id: LocationAISatPhrase + text: station-beacon-ai-sat # Engineering @@ -433,6 +438,11 @@ id: LocationTheaterPhrase text: station-beacon-theater +- type: quickPhrase + parent: BaseServiceLocationPhrase + id: LocationHopPhrase + text: station-beacon-hop + # Civilian - type: quickPhrase From b2b7003084ef3d1ed0e22165b6a6e968aa618290 Mon Sep 17 00:00:00 2001 From: keekee38 Date: Wed, 15 Jan 2025 19:48:35 -0500 Subject: [PATCH 2/2] hi --- Resources/Prototypes/_DV/QuickPhrases/Subjects/command.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_DV/QuickPhrases/Subjects/command.yml b/Resources/Prototypes/_DV/QuickPhrases/Subjects/command.yml index e9619cf3358..4f099cc89d2 100644 --- a/Resources/Prototypes/_DV/QuickPhrases/Subjects/command.yml +++ b/Resources/Prototypes/_DV/QuickPhrases/Subjects/command.yml @@ -34,11 +34,11 @@ text: phrase-implant - type: quickPhrase - id: nukediskPhrase + id: NukeDiskPhrase parent: BaseCommandSubjectPhrase text: phrase-nukedisk - type: quickPhrase - id: pinpointerPhrase + id: PinpointerPhrase parent: BaseCommandSubjectPhrase text: phrase-pinpointer