git.smokeofanarchy.ru Git - space-station-14.git/commit

]> git.smokeofanarchy.ru Git - space-station-14.git/commit

projects / space-station-14.git / commit

author	Alpaccalypse <21291379+Alpaccalypse@users.noreply.github.com>
	Thu, 2 Jan 2025 09:46:30 +0000 (09:46 +0000)
committer	GitHub <noreply@github.com>
	Thu, 2 Jan 2025 09:46:30 +0000 (10:46 +0100)
commit	f4e60ff96ede6df28057cab447666e125f1e2ce6
tree	4afe79e5dd7cd58793907779a7a7238cffaad2e7	tree \| snapshot
parent	1bda7393eee79fef598cf80b0c73bc28848ae7d9	commit \| diff

Renamed "Irish Car Bomb" drink to "Irish Slammer" (#34107)

* Renamed "Irish Car Bomb" drink to "Irish Slammer", due to concerns over insensitivity.

* Fixing some missed references

* Added prototype id changes to migration.yml. Removed any reference to the troubles (and corrected ale to stout for flavour text).

* Corrected description back to "Irish Cream"

* Removed non-entities from migration.yml

17 files changed:

Resources/Locale/en-US/flavors/flavor-profiles.ftl		diff \| blob \| history
Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl		diff \| blob \| history
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml		diff \| blob \| history
Resources/Prototypes/Flavors/flavors.yml		diff \| blob \| history
Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml		diff \| blob \| history
Resources/Prototypes/Recipes/Reactions/drinks.yml		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/fill-1.png	[moved from Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-1.png with 100% similarity]	blob \| history
Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/fill-2.png	[moved from Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-2.png with 100% similarity]	blob \| history
Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/fill-3.png	[moved from Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-3.png with 100% similarity]	blob \| history
Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/fill-4.png	[moved from Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-4.png with 100% similarity]	blob \| history
Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/fill-5.png	[moved from Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-5.png with 100% similarity]	blob \| history
Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/fill-6.png	[moved from Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-6.png with 100% similarity]	blob \| history
Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/icon.png	[moved from Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/icon.png with 100% similarity]	blob \| history
Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/icon_empty.png	[moved from Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/icon_empty.png with 100% similarity]	blob \| history
Resources/Textures/Objects/Consumable/Drinks/irishslammer.rsi/meta.json	[moved from Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/meta.json with 100% similarity]	blob \| history
Resources/migration.yml		diff \| blob \| history

Форк Space Station 14 с переводами на русский

RSS Atom