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

14 KiB

Raw Blame History

View Raw