TG sync Sunday (#201)

* stage one * datums and shit * game stuff * modules * tgstation.dme * tools * these things for icons * compiling fixes * merge spree on TG * other updates * updated maps with deepfryers * My helpers were not helping
2017-02-06 00:36:56 -06:00
parent aeeca195c7
commit 73b6b33f79
279 changed files with 3548 additions and 2585 deletions
@@ -33,6 +33,9 @@
 		if(istype(O,/obj/machinery))
 			var/obj/machinery/M = O
 			M.power_change()
+	
+	if(holoitem)
+		O.flags |= HOLOGRAM
 	return O


@@ -194,16 +194,16 @@

 /obj/machinery/computer/holodeck/Destroy()
 	emergency_shutdown()
-	..()
+	return ..()

 /obj/machinery/computer/holodeck/emp_act(severity)
 	emergency_shutdown()
-	..()
+	return ..()

 /obj/machinery/computer/holodeck/ex_act(severity, target)
 	emergency_shutdown()
-	..()
+	return ..()

 /obj/machinery/computer/holodeck/blob_act(obj/structure/blob/B)
 	emergency_shutdown()
-	..()
+	return ..()