Commit Graph

17 Commits

Author SHA1 Message Date
ZomgPonies
cb9b6fca4d Replacing civilian with support department. Still need to make changes on MySQL schema. 2014-06-26 19:42:14 -04:00
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
615f81588a uses get_turf instead of get_turf_loc now 2014-06-23 06:23:11 -04:00
DJSnapshot
54bfc06609 Forgot to commit welcome.dm 2014-06-23 06:22:56 -04:00
DJSnapshot
e55208bc69 fixes for potential runtimes. 2014-06-23 06:17:48 -04:00
DJSnapshot
21a1f2eefe laptop vending part 1. and more cleanup.
Conflicts:
	icons/obj/computer3.dmi
2014-06-23 06:17:36 -04:00
DJSnapshot
fbfecb0e99 lowercase ntos by request of mloc + updates to background. 2014-06-23 06:17:11 -04:00
DJSnapshot
54b2e5f7a7 Fixed up security, medical, card, and crew. Made Computer 3 actually do what it's supposed to do.
Conflicts:
	code/datums/browser.dm
	html/browser/common.css
2014-06-23 06:16:29 -04:00
ZomgPonies
f35d8d335d Paradise fixes to PR 2014-06-23 06:12:41 -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
jack-fractal
2754b56e0c adding the spirit entity code, fixing the cameraNet so that it compiles properly
Conflicts:
	code/datums/visibility_networks/dictionary.dm
	code/game/machinery/doors/door.dm
	code/modules/mob/living/silicon/ai/freelook/cameranet.dm
2014-05-15 05:06:38 -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
c5ebe7acaa Added 5 new types of random events 2013-11-05 08:08:01 -05:00
ZomgPonies
4bfad39ae3 Code Fixes 2013-11-04 19:47:34 -05:00
ZomgPonies
36c7fa3dcd computer3 merge 2013-11-03 14:18:54 -05:00