Merge branch 'master' into pol-moved

code/modules/power/singularity/act.dm

@@ -47,12 +47,19 @@
 		return 2
 
 /obj/singularity_pull(S, current_size)
-	if(simulated)
-		if(anchored)
-			if(current_size >= STAGE_FIVE)
-				step_towards(src, S)
-		else
-			step_towards(src, S)
+	set waitfor = 0
+
+	if(anchored)
+		return
+
+	sleep(0) //this is needed or multiple items will be thrown sequentially and not simultaneously
+	if(current_size >= STAGE_FOUR)
+		step_towards(src,S)
+		sleep(1)
+		step_towards(src,S)
+	else if(current_size > STAGE_ONE)
+		step_towards(src,S)
+	else ..()
 
 /obj/effect/beam/singularity_pull()
 	return
@@ -60,20 +67,6 @@
 /obj/effect/overlay/singularity_pull()
 	return
 
-/obj/item/singularity_pull(S, current_size)
-	spawn(0) //this is needed or multiple items will be thrown sequentially and not simultaneously
-		if(current_size >= STAGE_FOUR)
-			//throw_at(S, 14, 3)
-			step_towards(src,S)
-			sleep(1)
-			step_towards(src,S)
-		else if(current_size > STAGE_ONE)
-			step_towards(src,S)
-		else ..()
-
-/obj/machinery/atmospherics/pipe/singularity_pull()
-	return
-
 /obj/machinery/power/supermatter/shard/singularity_act()
 	qdel(src)
 	return 5000
@@ -113,30 +106,6 @@
 	ChangeTurf(get_base_turf_by_area(src))
 	return 2
 
-/turf/simulated/floor/singularity_pull(S, current_size)
-	if(flooring && current_size >= STAGE_THREE)
-		if(prob(current_size / 2))
-			var/leave_tile = TRUE
-			if(broken || burnt || flooring.flags & TURF_IS_FRAGILE)
-				leave_tile = FALSE
-			playsound(src, 'sound/items/crowbar.ogg', 50, 1)
-			make_plating(leave_tile)
-
-/turf/simulated/wall/singularity_pull(S, current_size)
-
-	if(!reinf_material)
-		if(current_size >= STAGE_FIVE)
-			if(prob(75))
-				dismantle_wall()
-			return
-		if(current_size == STAGE_FOUR)
-			if(prob(30))
-				dismantle_wall()
-	else
-		if(current_size >= STAGE_FIVE)
-			if(prob(30))
-				dismantle_wall()
-
 /turf/space/singularity_act()
 	return
 

code/modules/power/singularity/collector.dm

@@ -103,9 +103,9 @@ var/global/list/rad_collectors = list()
 	return ..()
 
 /obj/machinery/power/rad_collector/examine(mob/user)
-	if (..(user, 3))
-		to_chat(user, "The meter indicates that \the [src] is collecting [last_power] W.")
-		return 1
+	. = ..()
+	if(get_dist(user, src) <= 3)
+		. += "The meter indicates that it is collecting [last_power] W."
 
 /obj/machinery/power/rad_collector/ex_act(severity)
 	switch(severity)

code/modules/power/singularity/emitter.dm

@@ -267,15 +267,15 @@
 			qdel(src)
 
 /obj/machinery/power/emitter/examine(mob/user)
-	..()
+	. = ..()
 	var/integrity_percentage = round((integrity / initial(integrity)) * 100)
 	switch(integrity_percentage)
 		if(0 to 30)
-			to_chat(user, "<span class='danger'>\The [src] is close to falling apart!</span>")
+			. += "<span class='danger'>It is close to falling apart!</span>"
 		if(31 to 70)
-			to_chat(user, "<span class='danger'>\The [src] is damaged.</span>")
+			. += "<span class='danger'>It is damaged.</span>"
 		if(77 to 99)
-			to_chat(user, "<span class='warning'>\The [src] is slightly damaged.</span>")
+			. += "<span class='warning'It is slightly damaged.</span>"
 
 //R-UST port
 /obj/machinery/power/emitter/proc/get_initial_fire_delay()

code/modules/power/singularity/particle_accelerator/particle_accelerator.dm

@@ -112,20 +112,17 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
 	return 1
 
 /obj/structure/particle_accelerator/examine(mob/user)
-	switch(src.construction_state)
+	. = ..()
+	
+	switch(construction_state)
 		if(0)
-			src.desc = text("A [name], looks like it's not attached to the flooring")
+			. += "Looks like it's not attached to the flooring."
 		if(1)
-			src.desc = text("A [name], it is missing some cables")
+			. += "It is missing some cables."
 		if(2)
-			src.desc = text("A [name], the panel is open")
+			. += "The panel is open."
 		if(3)
-			src.desc = text("The [name] is assembled")
-			if(powered)
-				src.desc = src.desc_holder
-	..()
-	return
-
+			. += "It is assembled."
 
 /obj/structure/particle_accelerator/attackby(obj/item/W, mob/user)
 	if(istool(W))
@@ -295,19 +292,17 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
 	return
 
 /obj/machinery/particle_accelerator/examine(mob/user)
-	switch(src.construction_state)
+	. = ..()
+	
+	switch(construction_state)
 		if(0)
-			src.desc = text("A [name], looks like it's not attached to the flooring")
+			. += "Looks like it's not attached to the flooring."
 		if(1)
-			src.desc = text("A [name], it is missing some cables")
+			. += "It is missing some cables."
 		if(2)
-			src.desc = text("A [name], the panel is open")
+			. += "The panel is open."
 		if(3)
-			src.desc = text("The [name] is assembled")
-			if(powered)
-				src.desc = src.desc_holder
-	..()
-	return
+			. += "It is assembled."
 
 
 /obj/machinery/particle_accelerator/attackby(obj/item/W, mob/user)

code/modules/power/singularity/particle_accelerator/particle_smasher.dm

@@ -37,11 +37,11 @@
 	..()
 
 /obj/machinery/particle_smasher/examine(mob/user)
-	..()
-	if(user in view(1))
-		to_chat(user, "<span class='notice'>\The [src] contains:</span>")
+	. = ..()
+	if(Adjacent(user))
+		. += "<span class='notice'>\The [src] contains:</span>"
 		for(var/obj/item/I in contents)
-			to_chat(user, "<span class='notice'>\the [I]</span>")
+			. += "<span class='notice'>\the [I]</span>"
 
 /obj/machinery/particle_smasher/attackby(obj/item/W as obj, mob/user as mob)
 	if(W.type == /obj/item/device/analyzer)