Commit Graph

27 Commits

Author SHA1 Message Date
Ghom
63fb4544b4 Another fix for contraband items costing like premium ones. (#12253) 2020-05-15 07:16:25 -07:00
Ghommie
88e499a39a Some quick economy fixes and improvements. 2020-05-13 03:31:16 +02:00
Ghommie
7fb96ab0cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-05-12 20:06:59 +02:00
Lin
0acec2e56f vendors now accept dollar bills again (#12109)
* make vendors accept bills

* build

* forgot that function

* this is better

* i thought i had a hook for this
2020-05-05 05:38:19 +02:00
Ghommie
1cb83547fa whops! 2020-05-03 03:23:00 +02:00
Ghommie
53c0ea391e steam sales. 2020-05-03 02:54:13 +02:00
Ghommie
a194d7dafe merge conflict and job/dept discounts support. 2020-05-03 02:11:05 +02:00
Arturlang
53395171e1 Fixes vendors some (#12056) 2020-05-01 17:59:04 +02:00
Ghommie
4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
spookydonut
a6f6a27c87 Update code/modules/vending/_vending.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-04-12 00:53:57 +08:00
spookydonut
230e5fca20 fix everything 2020-04-11 15:32:09 +08:00
Arturlang
f80900fd0b Fixes vendors not eating coins (#11795) 2020-04-09 19:07:11 +02:00
Artur
5fbe05f3c9 Cleaning up and finishing up 2020-04-08 18:16:10 +03:00
Artur
881f8765f4 Stufffs 2020-04-01 15:29:40 +03:00
Artur
4d53c3f6c0 updates vendors.. 2020-03-31 21:00:50 +03:00
Ghommie
95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
Ghommie
9591bb5471 porting "global to static" 2019-11-09 22:53:56 +01:00
Ghommie
0513f3464a one 2019-06-05 19:20:25 +02:00
kevinz000
3abeb214fd Update _vending.dm 2018-08-20 14:57:31 -07:00
Unknown
761f2f931b tweaks 2018-08-09 10:16:15 +02:00
Unknown
d6e6d0f70b Ports the lovely vending machine UI by Andrew Montagne from Oracle 2018-08-08 15:23:41 +02:00
deathride58
3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
oranges
1d0f775f56 Merge pull request #38360 from ShizCalev/key-cleanup
Cleans up some logging
2018-06-11 22:29:27 -05:00
Jordan Brown
5e15a988f6 Refactor machinery to default to being anchored 2018-06-01 11:28:19 -05:00
Poojawa
5fa001c10f things with stuff (#6233)
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
CitadelStationBot
bd3d76b8d3 [MIRROR] Modularises vending machines (#6050)
* Modularises vending machines

* Update vending_items.dm
2018-03-22 06:10:17 -05:00