deathride58
ccd370328c
Merge branch 'master' into upstream-merge-33316
2017-12-11 00:01:02 +00:00
Anonmare
52da86e214
Fixes booze-o-mats not having booze ( #33418 )
...
* Update vending.dm
* Update vending.dm
* Update vending_items.dm
* Adds a missing close parenthisis
* I'm drunk and blind, don't sue me
* Update vending_items.dm
* Update vending_items.dm
2017-12-10 13:20:06 -06:00
Jordan Brown
f3fd81af24
Adds games vendor resupply crate
2017-12-06 22:53:21 -06:00
bawhoppen
82981339ed
Adds desc to things lacking them.
2017-10-01 15:07:37 -05:00
LetterJay
74588305ce
Update vending_items.dm
2017-09-11 17:50:49 -05:00
Kerbin-Fiber
d158ec9528
Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter
2017-09-10 03:43:09 -05:00
kevinz000
c638386507
Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. ( #2460 )
...
* fuck pubby
* fuck you too ceres
* ree
* this is going to be a disaster isn't it
* disaster
* dme
* -_-
* tg
* woops
* proper sync
* Welcome to conflict hell.
* lets hope this fixes more things than it breaks
* gdi
* goddamnit
2017-08-24 21:07:58 -07:00
