Commit Graph

39 Commits

Author SHA1 Message Date
Southbridge
87ff3a2421 New and Modified Map Spawners (#34424)
* Added spanwers and modified others

* adjusted values to be more in line with what I want

* this comment may have caused that test fail

* oh my god another typo

* Modified door crate to be engineering flavored

* reduced the pride vendor odds

Webedit lmao
2025-01-16 01:56:12 +01:00
Alpaccalypse
3cac75f117 Smite vending machine (#34420)
* Added smite machine to YAML

* Added smite ads and inventory

* Added smite vendor sprites

* Changed the description of the machine to not repeat and ad line.

* Added newline to end of inventory .yml

* Corrected erroneous edit.

* Tweaked all sprites

* Added tesla toy to contraband. Reduced number of drinks available

* Reduced soda varieties but increased can numbers.

* Removed tesla toy from contraband inventory

* Removed speech component from vending machines that already inherit it

* Moved Sprite component to top of list

* Added Smite vendors to random spanwers

* Alphabetised spawn prototypes, commented where name is unclear
2025-01-15 19:20:01 +01:00
Southbridge
6c41d967e5 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>
2025-01-13 19:49:02 +01:00
ArtisticRoomba
65bf3c61b6 Adds the syndicate Booze-O-Mat (Bruise-O-Mat) to nukie planet (#32107) 2024-09-16 02:59:00 -06:00
Emisse
6419f3d5d9 smartfridge semi functional (#22443)
* smartfridge

* leftovers from when it was powered

* real
2023-12-13 01:19:40 -07:00
potato1234_x
6abb55088c CuraDrobe + Misc Librarian Stuff (#19469)
* sprites

* stuff

* jumpsuit sprites

* jumpskirt sprites

* fix 2

* CLOTHING FIX 2 IM LOSING MY MIND

* contrast 2

* update 239
2023-10-10 11:55:30 -05:00
potato1234_x
4761e8679c Vending machine sprite polish (#19210)
* g

* chefvend
2023-08-21 14:45:53 -04:00
Velcroboy
f04e0a0ea1 Centers condiment dispenser (#19308)
Co-authored-by: Jeff <velcroboy333@hotmail.com>
2023-08-19 09:45:43 -07:00
Kara
ec02907446 Various bar-related fixes (#19126)
* Various bar-related fixes

* smartfwidge

* gumbo
2023-08-14 15:03:20 -06:00
potato1234_x
2b6cbdab74 Fix inconsistent vending machine sprites (#18953)
* fixe

* updatery
2023-08-13 01:15:13 -06:00
Flareguy
509f20084a Converts Microwave & Wallmed to old /tg/ sprites (#18970)
* changes microwave and nanomed to use old /tg/ sprites

* makes microwave smaller
2023-08-10 23:12:37 -06:00
potato1234_x
dda4b73f89 Dr. Gibb Vendor (#18651)
* g

* g2

* fixe

* fixe2
2023-08-04 20:07:40 -06:00
Flareguy
f378563114 Revert "TG Smartfrige Sprite (#16801)" (#18659)
This reverts commit 56f33bbae4.
2023-08-04 12:29:43 -06:00
Hyenh
d8b478a731 Discount resprite. (#18609) 2023-08-03 05:50:05 -06:00
Puro
bc79e94682 [VM] SyndieDrobe (#17885)
* [VM] SyndieDrobe

* "Death to NT"

* Animation update
2023-07-09 13:19:35 -06:00
potato1234_x
56f33bbae4 TG Smartfrige Sprite (#16801) 2023-05-25 19:11:12 +10:00
OctoRocket
25f2573b12 [Add] Adds winterdrobe (#16652)
* winterdrobe added

* changed timings

* more coats

* fix typo

* add bomber jacket to the winterdrobe

* remove winterdrobe items from clothesmate

* restock box added
2023-05-20 18:52:23 -06:00
freeman2651
33c9222602 [entity] Chemvend (#16326)
* adds chemvend

* chemvend tweaks

* add restock to cargo market
2023-05-12 03:31:20 -06:00
potato1234_x
5a4e93fabd [Entity] Sustenance Vendor (#15119)
* sustenance vendor

* emaggedinventory
2023-04-09 16:00:23 -06:00
potato1234_x
dbf9f71ee8 vend tweaks and clothes (#14961) 2023-03-30 22:31:51 -06:00
potato1234_x
51778afe6f TG Vending Machines + Tweaks (#14703)
* d

d

* engivend misalignment

* sustenance vendor

* Revert "sustenance vendor"

This reverts commit 2f4fb47df4529e93b7fc69da1b7a10e8a7c9f2c2.

* shamblers juice

* pwrgame

* most food/drink machines

* robotech deluxe, centdrobe and some restock boxes

* copyright + salv vend

* tweaks

* restock box + more tweaks

* yaml linter fail

* divide vendor contents

* divide contents 2
2023-03-24 02:54:47 -06:00
potato1234_x
8006f985a2 Fix Engivend Sprite Misalignment (#14618) 2023-03-13 13:22:52 +11:00
brainfood1183
6654558046 happy honk meal box dispenser (#13490) 2023-01-22 21:08:16 -04:00
ChilbroBaggins
782c9f00cb Adds Condiment Station for dining areas (#12939)
Co-authored-by: Jeff <velcroboy333@hotmail.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2023-01-20 07:56:05 -08:00
ChilbroBaggins
786f55e789 Adds Chefvend (#12934)
Co-authored-by: Jeff <velcroboy333@hotmail.com>
2022-12-21 06:49:39 -08:00
metalgearsloth
798a880a82 Fix some more rsis (#13107) 2022-12-20 09:37:34 +01:00
Andreas Kämper
42f3155c85 Clean up vending machines and port their visualizer (#10465) 2022-08-31 05:12:09 -07:00
Deahaka
2d2516b58c Donut-Vend add (#9703)
* donut-vend

* after_review

* emogarbagechoice

* after_2_review

* added_emagged

* miss

Co-authored-by: wrexbe <81056464+wrexbe@users.noreply.github.com>
2022-07-30 19:58:57 -07:00
Peptide90
53ff974e67 Salvage vendor (#10112)
* adds basics for salvage vendor

* adds floodlights to vendor

* adds knife and pka to vendor

* adds the mining vendor sprite

* fixes flashlight ID...smh
2022-07-30 19:31:50 -07:00
Ablankmann
d4c5381a09 BEHOLD! The MagiVend! (#9440)
* Magivend Sprites, and Entity stuffs

* Oopsie!
2022-07-08 19:40:49 -07:00
Peptide90
18c2d7a4df Gas Tank dispenser (#8160) 2022-05-18 12:46:35 +10:00
Peptide90
3b54566e5b Changs chinese food vending machine (#7754)
* new chinese food items from paradise

* made soy sauce salty

* new snacks based on the new assets

* chang assets 1

* chang vending machine

* rsi animation and fix

* rsi path fix

* misc changes

* fortune cookie snacks complete with fortunes

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml

darn Americans

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
2022-05-11 00:17:24 -07:00
Fishfish458
a8f3e56bc4 Add all relevant autodrobes and more hats across the station (#6599)
Co-authored-by: fishfish458 <fishfish458>
2022-02-10 14:58:31 -07:00
Swept
8ef1b1a87c Fixes youtool vending machine deny state (#6602) 2022-02-09 19:00:57 -07:00
Fishfish458
35d97b5f42 Add dicebag and game vending machine (#6415)
Co-authored-by: fishfish458 <fishfish458>
2022-02-04 14:16:58 -07:00
Michael Phillips
a8cd34ad11 Updated Smart Fridge Graphics and Fixed Naming (#5947) 2022-01-14 01:32:16 +11:00
Rane
f186ffe571 Added filled wardrobes for most jobs (#5946)
* Added filled wardrobes for most jobs

* Updated based on feedback from mirrorcult

* Readded accidentally deleted cult helmet and maybe test won't fail now 🙏

* Added PietyVend

* Fixed stray pixel

Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2022-01-01 18:08:57 +01:00
Swept
e34888373a Respriting the codebase (#4820)
* Walls

* Airlocks mostly ported

* Disposal Unit

* Tiles

* Lighting

* Catwalk

* Windows

* Some vending machine work

* More Vending Machines

* Rest of vending machine sprites ported

* Fixes to vending machines

* Tables (This took a lot of work)

* Fixes low walls being required for window smoothing
- Also replaces window damage visualization

* Plasma Window

* APC

* SMES + Reorganized parts.yml

* Furniture and Organization and Removed Shelf

* Renamed seats.yml to chairs.yml

* Dispensers

* Lazy-fixed the glass airlocks

* Don't need this no more

* Tilez

* blue circuit my fucking beloved

* Switches lights to cev one

* Conveyors and Switch

* Reorients lights

* !ALERT! MAP CHANGES !ALERT!

Co-authored-by: Vera Aguilera Puerto <gradientvera@outlook.com>
2021-10-15 11:58:40 +02:00
Swept
5f9ba812ca Reorganizes Resources/Constructible (#4252) 2021-07-15 18:30:50 +00:00