14 Commits

Author	SHA1	Message	Date
dapnee	147fd2d953	imagine forgetting a comma ... oop	2020-06-22 19:35:27 -06:00
dapnee	1b8ab9799d	Update cola.dm ... adds wataur to cola machine	2020-06-22 18:17:21 -06:00
Ghom	8cb15f9279	Actually Balanced and Standardized Vendor Prices. (#12495)	2020-06-09 22:22:53 -07:00
Ghommie	4c6f1b622b	Porting Goofconomy & co.	2020-04-17 07:48:11 +02:00
Winter Flare	cd3f8f5df5	Porting More Stuff ... Ports Moana Lou https://github.com/tgstation/tgstation/pull/46539 Ports Moscow Mule, Sol Dry https://github.com/tgstation/tgstation/pull/48466 Ports Hivemind Eraser https://github.com/tgstation/tgstation/pull/49325	2020-03-22 15:13:00 -04:00
TrilbySpaceClone	c7dbdd73df	Merge branch 'master' into donut	2019-12-22 02:36:57 -05:00
Trilbyspaceclone	fe1576583c	Update code/modules/vending/cola.dm ... Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>	2019-12-16 15:01:16 -05:00
TrilbySpaceClone	32cbe8588e	fogot the beest one	2019-12-15 01:15:55 -05:00
TrilbySpaceClone	5febc54fb8	whats all the buzz around this new drink?	2019-12-15 01:13:15 -05:00
TrilbySpaceClone	c4450579ac	Why does breakfast have a timer? ... https://github.com/tgstation/tgstation/pull/44419 https://github.com/tgstation/tgstation/pull/46220 https://github.com/tgstation/tgstation/pull/44914 https://github.com/tgstation/tgstation/pull/46933 https://github.com/tgstation/tgstation/pull/48153 https://github.com/tgstation/tgstation/pull/46898	2019-12-07 01:53:55 -05:00
Ghommie	a5b37b658b	Purging a lot of space indention in favor of tabs.	2019-10-29 15:46:31 +01:00
Ghommie	0371a5513a	Porting in 18 new drinks from the TGstation, plus tweaking and fixes.	2019-06-29 06:03:57 +02:00
deathride58	b1688405d9	and finally, the modules folder. Now I can publish and take a break	2018-07-02 01:19:37 -04:00
CitadelStationBot	bd3d76b8d3	[MIRROR] Modularises vending machines (#6050) ... * Modularises vending machines * Update vending_items.dm	2018-03-22 06:10:17 -05:00