Commit Graph

6 Commits

Author SHA1 Message Date
mwerezak
9874ce38ce shuttle_controller now uses a shuttle datum
Conflicts:
	code/game/machinery/computer/communications.dm
	code/modules/admin/verbs/randomverbs.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/power/singularity/singularity.dm
2014-06-23 11:07:58 -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
Necaladun
fb29f28a96 Emergency Message Cooldown
Dropped from 10 to 1 minute so people can actual hold a bit of
conversation with CC if needed. If they spam, BSA is still there.
2014-04-15 00:29:29 +09:30
Rob Nelson
7b7cfb605d Comm console is now NanoUI. Fixes github #489, hopefully.
Conflicts:
	code/game/machinery/computer/communications.dm
	code/modules/nano/nanoui.dm
2014-02-15 15:33:45 -05:00
ZomgPonies
36c7fa3dcd computer3 merge 2013-11-03 14:18:54 -05:00