Merge remote-tracking branch 'citadel/master' into mobility_flags

code/modules/power/singularity/containment_field.dm

@@ -6,6 +6,7 @@
 	icon = 'icons/obj/singularity.dmi'
 	icon_state = "Contain_F"
 	density = FALSE
+	move_resist = INFINITY
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
 	use_power = NO_POWER_USE
 	interaction_flags_atom = NONE

code/modules/power/singularity/emitter.dm

@@ -68,6 +68,11 @@
 	sparks.attach(src)
 	sparks.set_up(1, TRUE, src)
 
+/obj/machinery/power/emitter/examine(mob/user)
+	. = ..()
+	if(in_range(user, src) || isobserver(user))
+		. += "<span class='notice'>The status display reads: Emitting one beam each <b>[fire_delay*0.1]</b> seconds.<br>Power consumption at <b>[active_power_usage]W</b>.</span>"
+
 /obj/machinery/power/emitter/ComponentInitialize()
 	. = ..()
 	AddComponent(/datum/component/empprotection, EMP_PROTECT_SELF | EMP_PROTECT_WIRES)

code/modules/power/singularity/field_generator.dm

@@ -245,6 +245,7 @@ field_generator power level display
 	if(state != FG_WELDED || !anchored)
 		turn_off()
 		return
+	move_resist = INFINITY
 	spawn(1)
 		setup_field(1)
 	spawn(2)
@@ -335,6 +336,7 @@ field_generator power level display
 					message_admins("A singulo exists and a containment field has failed at [ADMIN_VERBOSEJMP(T)].")
 					investigate_log("has <font color='red'>failed</font> whilst a singulo exists at [AREACOORD(T)].", INVESTIGATE_SINGULO)
 			O.last_warning = world.time
+	move_resist = initial(move_resist)
 
 /obj/machinery/field/generator/shock(mob/living/user)
 	if(fields.len)

code/modules/power/singularity/singularity.dm

@@ -7,6 +7,7 @@
 	icon_state = "singularity_s1"
 	anchored = TRUE
 	density = TRUE
+	move_resist = INFINITY
 	layer = MASSIVE_OBJ_LAYER
 	light_range = 6
 	appearance_flags = 0
@@ -113,7 +114,8 @@
 
 
 /obj/singularity/bullet_act(obj/item/projectile/P)
-	return 0 //Will there be an impact? Who knows.  Will we see it? No.
+	qdel(P)
+	return BULLET_ACT_HIT //Will there be an impact? Who knows.  Will we see it? No.
 
 
 /obj/singularity/Bump(atom/A)