Commit Graph

4 Commits

Author SHA1 Message Date
DJSnapshot
21a1f2eefe laptop vending part 1. and more cleanup.
Conflicts:
	icons/obj/computer3.dmi
2014-06-23 06:17:36 -04:00
DJSnapshot
8a33620554 Initial commit of Computer 3 from Paradise, along with a bunch of fixes.
Conflicts:
	code/__HELPERS/unsorted.dm
	code/datums/browser.dm
	code/setup.dm
	icons/obj/computer3.dmi
2014-06-23 06:02:36 -04:00
ZomgPonies
b8c1dbf620 Preparing repo for overhauled computer3 2014-06-23 05:52:00 -04:00
ZomgPonies
36c7fa3dcd computer3 merge 2013-11-03 14:18:54 -05:00