Allows escape pods to be armed from inside the pod

Conflicts:
	code/game/machinery/embedded_controller/simple_docking_controller.dm
This commit is contained in:
mwerezak
2014-07-13 06:27:01 -04:00
committed by ZomgPonies
parent fe40190870
commit e8b9375887
6 changed files with 128 additions and 149 deletions
+1 -1
View File
@@ -271,7 +271,7 @@ var/global/datum/shuttle_controller/shuttle_controller
dock_controller_map -= C.id_tag
//escape pods
if(istype(C, /obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod))
if(istype(C, /obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod) && istype(shuttle, /datum/shuttle/ferry/escape_pod))
var/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod/EPC = C
EPC.pod = shuttle