forked from space-wizards/space-station-14
-
-
Notifications
You must be signed in to change notification settings - Fork 90
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #902 from Darkmajia/item-capitalisation
general custom content consistency pass
- Loading branch information
Showing
31 changed files
with
78 additions
and
56 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
Resources/Locale/en-US/_Goobstation/Heretic/guidebook/guides.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
2 changes: 1 addition & 1 deletion
2
Resources/Locale/en-US/_Goobstation/Heretic/store/heretic/categories.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
Resources/Locale/en-US/_Impstation/reagents/meta/consumable/drink/soda.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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? |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 23 additions & 0 deletions
23
Resources/Prototypes/_Impstation/Entities/Objects/Consumable/Food/soup.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Battery/raygun.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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. | ||
|
2 changes: 1 addition & 1 deletion
2
Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Melee/graypipe.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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. | ||
|
2 changes: 1 addition & 1 deletion
2
Resources/Prototypes/_Impstation/Markers/Spawners/Conditional/timed.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.