Heredth 5d77dcecaa Added new vending machines, and changed a couple of other files. Might be worth looking through just to make sure I didnt fuck everything up ...

Conflicts:
	code/game/machinery/vending.dm

2014-03-11 06:11:12 -04:00

..

clown3.dmm

Added new vending machines, and changed a couple of other files. Might be worth looking through just to make sure I didnt fuck everything up

2014-03-11 06:11:12 -04:00

wildwest.dm

Standardize LASER, NOCLONE, and HUSK

2014-01-21 22:59:53 -05:00