]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Porting Pride-O-Mat to Upstream (#34412)
authorSouthbridge <7013162+southbridge-fur@users.noreply.github.com>
Mon, 13 Jan 2025 18:49:02 +0000 (13:49 -0500)
committerGitHub <noreply@github.com>
Mon, 13 Jan 2025 18:49:02 +0000 (19:49 +0100)
commit6c41d967e5ca4f08573c73f03f8975580fd9f7eb
tree7395c212c15a12c2b725fdc74297b2444c72a4ac
parentb308589428cc65fa8a2ba637cd08617c63247eb0
Porting Pride-O-Mat to Upstream (#34412)

* Pride-O-Mat (#1322)

* Added Pride-O-Mat

* Yep

* Updated license to the correct one

* Added more lines, reconfigured settings a bit, also added cloaks to inventory, set coder socks to emag inventory

* Removed bunny ears, fixed typo

* Made requested changes

Webedit lmao

---------

Co-authored-by: Dorragon <101672978+Dorragon@users.noreply.github.com>
Resources/Locale/en-US/advertisements/vending/pride.ftl [new file with mode: 0644]
Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml [new file with mode: 0644]
Resources/Prototypes/Catalog/VendingMachines/advertisements.yml
Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml
Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
Resources/Textures/Structures/Machines/VendingMachines/pride.rsi/broken.png [new file with mode: 0644]
Resources/Textures/Structures/Machines/VendingMachines/pride.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Machines/VendingMachines/pride.rsi/normal-unshaded.png [new file with mode: 0644]
Resources/Textures/Structures/Machines/VendingMachines/pride.rsi/off.png [new file with mode: 0644]
Resources/Textures/Structures/Machines/VendingMachines/pride.rsi/panel.png [new file with mode: 0644]