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	Tayrtahn <tayrtahn@gmail.com>
	Thu, 28 Mar 2024 06:46:26 +0000 (02:46 -0400)
committer	GitHub <noreply@github.com>
	Thu, 28 Mar 2024 06:46:26 +0000 (17:46 +1100)
commit	794a447bb7f0a36abaac802e0fa4d1ce7c8998ef
tree	17cbdd4375e8255825d3e01befb448fbe871252e	tree \| snapshot
parent	29f34d8423d1033d33032edc28f02edebe861e37	commit \| diff

Separate "thank you" messages from general ads (#25867)

* Separated "thank you" messages from general ads

* Moved MessagePackPrototype to shared, cleaned up AdvertiseComponent, and actually killed AdvertisementsPackPrototype.
+More suggests changes.

* Rename PackPrototypeID to Pack in both components.

72 files changed:

Content.Client/Entry/EntryPoint.cs		diff \| blob \| history
Content.Server/Advertise/AdvertiseComponent.cs	[deleted file]	blob \| history
Content.Server/Advertise/AdvertiseSystem.cs	[deleted file]	blob \| history
Content.Server/Advertise/Components/AdvertiseComponent.cs	[new file with mode: 0644]	blob
Content.Server/Advertise/Components/SpeakOnUIClosedComponent.cs	[new file with mode: 0644]	blob
Content.Server/Advertise/EntitySystems/AdvertiseSystem.cs	[new file with mode: 0644]	blob
Content.Server/Advertise/EntitySystems/SpeakOnUIClosedSystem.cs	[new file with mode: 0644]	blob
Content.Server/Advertisements/AdvertisementsPackPrototype.cs	[deleted file]	blob \| history
Content.Server/VendingMachines/VendingMachineSystem.cs		diff \| blob \| history
Content.Shared/Advertise/MessagePackPrototype.cs	[new file with mode: 0644]	blob
Content.Shared/VendingMachines/VendingMachineComponent.cs		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/ammo.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/atmosdrobe.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/bardrobe.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/boozeomat.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/cargodrobe.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/chang.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/chefdrobe.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/chefvend.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/chemdrobe.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/cigs.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/clothesmate.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/coffee.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/cola.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/condiments.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/curadrobe.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/detdrobe.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/dinnerware.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/discount.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/donut.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/engidrobe.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/fatextractor.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/games.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/genedrobe.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/happyhonk.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/hydrobe.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/janidrobe.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/lawdrobe.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/magivend.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/medidrobe.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/megaseed.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/nanomed.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/nutrimax.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/robodrobe.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/scidrobe.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/secdrobe.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/sectech.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/smartfridge.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/snack.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/sovietsoda.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/syndiedrobe.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/theater.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/vendomat.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Advertisements/virodrobe.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Goodbyes/boozeomat.yml	[new file with mode: 0644]	blob
Resources/Prototypes/Catalog/VendingMachines/Goodbyes/chang.yml	[new file with mode: 0644]	blob
Resources/Prototypes/Catalog/VendingMachines/Goodbyes/chefvend.yml	[new file with mode: 0644]	blob
Resources/Prototypes/Catalog/VendingMachines/Goodbyes/cigs.yml	[new file with mode: 0644]	blob
Resources/Prototypes/Catalog/VendingMachines/Goodbyes/coffee.yml	[new file with mode: 0644]	blob
Resources/Prototypes/Catalog/VendingMachines/Goodbyes/cola.yml	[new file with mode: 0644]	blob
Resources/Prototypes/Catalog/VendingMachines/Goodbyes/discount.yml	[new file with mode: 0644]	blob
Resources/Prototypes/Catalog/VendingMachines/Goodbyes/donut.yml	[new file with mode: 0644]	blob
Resources/Prototypes/Catalog/VendingMachines/Goodbyes/games.yml	[new file with mode: 0644]	blob
Resources/Prototypes/Catalog/VendingMachines/Goodbyes/generic.yml	[new file with mode: 0644]	blob
Resources/Prototypes/Catalog/VendingMachines/Goodbyes/happyhonk.yml	[new file with mode: 0644]	blob
Resources/Prototypes/Catalog/VendingMachines/Goodbyes/lawdrobe.yml	[new file with mode: 0644]	blob
Resources/Prototypes/Catalog/VendingMachines/Goodbyes/nutrimax.yml	[new file with mode: 0644]	blob
Resources/Prototypes/Catalog/VendingMachines/Goodbyes/sectech.yml	[new file with mode: 0644]	blob
Resources/Prototypes/Catalog/VendingMachines/Goodbyes/snack.yml	[new file with mode: 0644]	blob
Resources/Prototypes/Catalog/VendingMachines/Goodbyes/sovietsoda.yml	[new file with mode: 0644]	blob
Resources/Prototypes/Catalog/VendingMachines/Goodbyes/syndiedrobe.yml	[new file with mode: 0644]	blob
Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml		diff \| blob \| history

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

RSS Atom