Skip to content

Commit

Permalink
Merge pull request #902 from Darkmajia/item-capitalisation
Browse files Browse the repository at this point in the history
general custom content consistency pass
  • Loading branch information
hivehum authored Dec 4, 2024
2 parents c96a3a9 + 2e51640 commit 9860d33
Show file tree
Hide file tree
Showing 31 changed files with 78 additions and 56 deletions.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
shipyard-console-menu-title = Shipyard Console
shipyard-console-error = Temporary embargo is in place, try later?
shipyard-console-docking = {$vessel} is en route to the station, eta 60 seconds.
shipyard-console-docking = {$vessel} is en route to the station. ETA: 60 seconds.
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ heretic-manselink-start-target = You feel your mind being pulled somewhere...
heretic-livingheart-notargets = No available targets, visit the rune.
heretic-livingheart-offstation = It's {$state}, off station, {$direction}!
heretic-livingheart-onstation = It's {$state}, {$direction}!
heretic-livingheart-unknown = It's... not in this plain of reality.
heretic-livingheart-unknown = It's... not in this plane of reality.
## speech
heretic-speech-mansusgrasp = R'CH T'H TR'TH!
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
guide-entry-heretics = Heretics
guide-entry-heretics-ash = Ashen Path
guide-entry-heretics-ash = Path of Ash
guide-entry-heretics-flesh = Path of Flesh
guide-entry-heretics-void = Path of Void
guide-entry-heretics-side = Side Knowledge
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
store-heretic-path-ash = Ashen Path
store-heretic-path-ash = Path of Ash
store-heretic-path-lock = Path of Lock
store-heretic-path-flesh = Path of Flesh
store-heretic-path-void = Path of Void
Expand Down
6 changes: 3 additions & 3 deletions Resources/Locale/en-US/_Goobstation/guidebook/ghost-gui.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ ghost-target-window-ghostbar = Ghost Bar
ghost-window-spawn-ghostbar-button = Spawn at Ghost Bar
ghost-window-spawn-ghostbar-button-timer = Spawn at Ghost Bar ({$time}s)
ghost-bar-rules =
YOU CAN NOT BE REVIVED INTO YOUR OLD BODY OR BRAIN ONCE YOU VISIT THE GHOST BAR.
YOU CANNOT BE REVIVED INTO YOUR OLD BODY OR BRAIN ONCE YOU VISIT THE GHOST BAR.
Treat this role, and station, as you would just being a regular Ghost.
Treat this role, and station, as you would just being a regular ghost.
You may talk about all current round events without the need for LOOC, and you remember everything from your previous life.
DO NOT attack others, start fights, or attempt to break the station. If you see anyone doing this, please Ahelp and they will be promptly thrown into space. Also, if you decide to leave the bar, you DO NOT remember anything from being here, or your life before it.
DO NOT attack others, start fights, or attempt to break the station. If you see anyone doing this, please AHelp and they will be promptly thrown into space. Also, if you decide to leave the bar, you DO NOT remember anything from being here, or your life before it.
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ petting-failure-cargorilla = You try to give {THE($target)} a hug, but you strug
petting-success-disgustingpig = You insult {THE($target)}, as it deserves.
petting-failure-disgustingpig = You think about insulting {THE($target)}, but hold your tongue.
petting-success-ray = You Pet {$target}, it wiggles glowing pincers at you happily.
petting-success-ray = You pet {$target}, it wiggles glowing pincers at you happily.
## Petting silicons

Expand Down
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/_Impstation/popup/snail.ftl
Original file line number Diff line number Diff line change
@@ -1 +1 @@
snail-hurt-by-chem-popup = Ouch! Thats not snail friendly.
snail-hurt-by-chem-popup = Ouch! That's not snail friendly.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
reagent-name-uap = U.A.P
reagent-name-uap = U.A.P.
reagent-desc-uap = An unidentified alcoholic product...
reagent-name-theehorsepussy = the horsepussy
Expand Down Expand Up @@ -37,7 +37,7 @@ reagent-desc-bloodier-mary = AH, AH, AHH!
reagent-name-salvagerssoothe = salvager's soothe
reagent-desc-salvagerssoothe = Come home safe, okay? We're counting on you.
reagent-name-donttelldsheriff = don't tell D sherrif
reagent-name-donttelldsheriff = don't tell D sheriff
reagent-desc-donttelldsheriff = If Red Bool gives you wings, this'll give you four wheel drive.
reagent-name-cottonbool = cotton bool
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
reagent-name-kingsoda = king Soda
reagent-name-kingsoda = king soda
reagent-desc-kingsoda = A drink fit for a king. Or a seven year old.
reagent-name-hummingbird = hummingbird's delight
Expand Down
1 change: 0 additions & 1 deletion Resources/Locale/en-US/_NF/reagents/meta/biological.ftl
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@

reagent-name-goblin-blood = goblin blood
reagent-desc-goblin-blood = Liquid as thick as clotting syrup that clings to the edges of a jam jar. The smell is a pungent cocktail of metal and decay. Why would it make you think about jam?
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
- type: entity
name: Syndicate Guard
name: syndicate guard
parent: BaseMobHuman
id: MobRadioGuard
description: "Product of Cybersun Cloning technology, this Syndicate puppet-guard is tasked with protecting the outpost. They will throw their life away to defend their objective."
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: entity
id: CrateNPCLuggage
parent: CrateLivestock
name: Luggage
name: luggage crate
description: A crate containing a chest made of sapient pearwood. It looks hungry...
components:
- type: StorageFill
Expand All @@ -11,7 +11,7 @@
- type: entity
id: CrateNPCCargorilla
parent: CrateLivestock
name: Cargorilla
name: cargorilla crate
description: A crate containing a Very strong cargo technician.
components:
- type: StorageFill
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
- type: entity
parent: ClothingHeadHardsuitWithLightBase
id: ClothingHeadHelmetHardsuitGray
name: A gray's hardsuit helmet.
name: gray hardsuit helmet
description: I wonder what's inside.
components:
- type: Sprite
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
- type: entity
parent: ClothingOuterHardsuitBase
id: ClothingOuterHardsuitGray
name: Gray's hardsuit
name: gray hardsuit
description: I wonder what's inside.
components:
- type: Sprite
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/_Impstation/Entities/Clothing/lens.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: entity
parent: ClothingEyesBase
id: PrescriptionLens
name: perscription lens
name: prescription lens
description: Adaptive lenses that fit inside frames or your face.
components:
- type: Sprite
Expand All @@ -17,7 +17,7 @@
- type: entity
parent: PrescriptionLens
id: PrescriptionLensStrong
name: strong perscription lens
name: strong prescription lens
components:
- type: Sprite
layers:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@
Bloodloss: 5

- type: entity
name: major
name: Major
id: MobBearSpaceMajor
parent: MobSpaceNice
description: Nanotrasen's majority shareholder.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@
- type: entity
parent: DrinkGlass
id: DrinkDontTellGlass
suffix: don't tell D sherrif
suffix: don't tell D sheriff
components:
- type: SolutionContainerManager
solutions:
Expand Down Expand Up @@ -261,7 +261,7 @@
- type: entity
parent: DrinkGlass
id: DrinkUAPGlass
suffix: uap
suffix: U.A.P.
components:
- type: SolutionContainerManager
solutions:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
- type: entity
name: raw finfin meat
name: raw Fin Fin meat
parent: FoodMeatRawBase
id: FoodMeatFinfin
description: A slab of raw finfin. He was your best friend!
description: A slab of raw Fin Fin. He was your best friend!
components:
- type: Sprite
state: finfin
Expand All @@ -25,10 +25,10 @@
defaultTarget: cooked finfin

- type: entity
name: cooked finfin
name: cooked Fin Fin
parent: FoodMeatBase
id: FoodMeatFinfinCooked
description: A cooked piece of finfin. Best used in other recipes.
description: A cooked piece of Fin Fin. Best used in other recipes.
components:
- type: Tag
tags:
Expand All @@ -53,10 +53,10 @@
node: cooked finfin

- type: entity
name: fried finfin
name: fried Fin Fin
parent: FoodMeatBase
id: FoodMeatFinfinFried
description: A juicy hunk of finfin meat, fried to perfection.
description: A juicy hunk of Fin Fin meat, fried to perfection.
components:
- type: Tag
tags:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
- type: entity
name: camel's soup
parent: FoodBowlBase
id: FoodCamelSoup
description: the hospital can't stop me. I will never go. not with the strength I've obtained.
components:
- type: FlavorProfile
flavors:
- cigarettes
- type: Sprite
sprite: _Impstation/Objects/Consumable/Food/bowl.rsi
layers:
- state: bowl
- state: camelsouplit
- type: SolutionContainerManager
solutions:
food:
maxVol: 57
reagents:
- ReagentId: TearGas
Quantity: 40
- ReagentId: ChloralHydrate
Quantity: 17
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: entity
parent: BasePlushie
id: PlushieFinfin
name: fin fin plushie
name: Fin Fin plushie
description: A highly marketable plushie of the adorable dolphin-bird recently discovered on the distant planet Teo. Made artificially rare on purpose.
components:
- type: Sprite
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
- type: entity
parent: BookBase
id: BookKeelBayWorn
name: Keel-Ree's Guide to Medical
name: Keel-Ree's guide to medical
description: This copy seems less than pristine, the margins are filled with illegible notes and some diagrams depicting medibot placements have been scratched out entirely.
components:
- type: Sprite
Expand All @@ -94,7 +94,7 @@
- type: entity
parent: BookBase
id: BookKeelBay
name: Keel-Ree's Guide to Medical
name: Keel-Ree's guide to medical
description: This copy seems to be in pristine condition, lovingly cared for. There are little heart symbols etched into the spine and it smells faintly like a bakery.
components:
- type: Sprite
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
- type: entity
name: Raygun
name: raygun
parent: BaseWeaponBatterySmall
id: WeaponRaygun
description: Pew pew.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
- type: entity
name: P.V.C
name: P.V.C.
parent: BaseSword
id: PVC
description: Percision Velocity Channeler.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
- type: entity
name: Bros Vent Spawner
name: BROS Vent Spawner
id: BrosVentSpawner
parent: MarkerBase
components:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@
- MobXenoRouny

- type: entity
name: Special guy Spawner
name: Special Guy Spawner
id: SpawnMobSpecialGuy
parent: MarkerBase
components:
Expand Down
12 changes: 6 additions & 6 deletions Resources/Prototypes/_Impstation/tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
- type: Tag
id: ConversionKitHB

- type: Tag
id: DionaMinded

- type: Tag
id: MagazineLPistol

Expand All @@ -35,6 +38,9 @@
- type: Tag
id: SecTicket

- type: Tag
id: SGD

- type: Tag
id: ShellShotgunBeanbag

Expand All @@ -55,9 +61,3 @@

- type: Tag
id: WeaponSurvivalRifleUpgradeSMGKit

- type: Tag
id: DionaMinded

- type: Tag
id: SGD
Loading

0 comments on commit 9860d33

Please sign in to comment.