Thalpy f77bcc9765 Merge branch 'master' into master

2019-07-14 15:10:32 +01:00

..

_vending.dm

…

assist.dm

…

autodrobe.dm

…

boozeomat.dm

Porting in 18 new drinks from the TGstation, plus tweaking and fixes.

2019-06-29 06:03:57 +02:00

cartridge.dm

…

cigarette.dm

…

clothesmate.dm

Update clothesmate.dm

2019-05-16 15:51:46 -04:00

coffee.dm

Adds condiments to the coffie vender with coins! (#7902)

2019-01-08 02:28:24 -08:00

cola.dm

Porting in 18 new drinks from the TGstation, plus tweaking and fixes.

2019-06-29 06:03:57 +02:00

drinnerware.dm

Porting in 18 new drinks from the TGstation, plus tweaking and fixes.

2019-06-29 06:03:57 +02:00

engineering.dm

…

engivend.dm

Update engivend.dm

2019-01-13 01:42:11 -05:00

games.dm

…

liberation_toy.dm

…

liberation.dm

…

magivend.dm

…

medical_wall.dm

Added to vendors/tech.

2019-06-08 01:00:51 +01:00

medical.dm

Merge branch 'pr/18'

2019-06-23 19:15:07 +01:00

megaseed.dm

Peanuts, peanut butter, and sandwiches.

2019-06-17 05:17:24 +02:00

nutrimax.dm

…

plasmaresearch.dm

…

robotics.dm

…

security.dm

Ports "Adds blueshirt items to sectech and defines them better."

2019-07-13 06:42:09 +02:00

snack.dm

Update snack.dm (#7899)

2019-01-08 02:35:19 -08:00

sovietsoda.dm

…

sustenance.dm

…

toys.dm

…

wardrobes.dm

Buncha fixes and QoL stuff. (pH, hypo, heater and dispencer_

2019-06-30 19:16:27 +01:00

youtool.dm

…