12/21 modernizations from TG live (#103)

* sync (#3)

* shuttle auto call

* Merge /vore into /master (#39)

* progress

* Compile errors fixed

No idea if it's test worthy tho as conflicts with race overhaul and
narky removal.

* Update admins.txt

* efforts continue

Fuck grab code, seriously

* grab code is cancer

* Execute the Narkism

Do not hesitate.

Show no mercy.

* holy shit grab code is awful

* have I bitched about grab code

My bitching, let me show you it

* código de agarre es una mierda

No really it is

* yeah I don't even know anymore.

* Lolnope. Fuck grab code

* I'm not even sure what to fix anymore

* Self eating is not an acceptable fate

* Taste the void, son.

* My code doesn't pass it's own sanity check.

Maybe it's a sign of things to come.

* uncommented and notes

* It Works and I Don't Know Why (#38)

* shuttle auto call

* it works and I don't know why

* Subsystem 12/21

Most Recent TG subsystem folder

* globalvars 12/21

Tossed out the flavor_misc and parallax files

* Onclick 12/21

as well as .dme updates

* _defines 12/21

ommited old _MC.dm

* _HELPERS 12/21

Preserved snowflake placement of furry sprites

* _defeines/genetics

reapplied narkism holdover for snowflake races.

* Oops forgot mutant colors

* modules porting 12/21 + Sounds/icons

Admin, Client and most of mob life files ommitted

* enviroment file

* Admin optimizations

ahelp log system kept

* Mob ports 12/21

Flavor text preserved

* datums ported 12/21

* Game ported 12/21

* batch of duplicate fixes/dogborg work

Dogborgs need to be modernized to refractored borg standards.

* moar fixes

* Maps and futher compile fixes

code/modules/power/singularity/collector.dm

@@ -1,4 +1,4 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33
+
 var/global/list/rad_collectors = list()
 
 /obj/machinery/power/rad_collector
@@ -10,6 +10,9 @@ var/global/list/rad_collectors = list()
 	density = 1
 	req_access = list(access_engine_equip)
 //	use_power = 0
+	obj_integrity = 350
+	max_integrity = 350
+	integrity_failure = 80
 	var/obj/item/weapon/tank/internals/plasma/loaded_tank = null
 	var/last_power = 0
 	var/active = 0
@@ -78,14 +81,14 @@ var/global/list/rad_collectors = list()
 			user << "<span class='warning'>Remove the plasma tank first!</span>"
 			return 1
 		if(!anchored && !isinspace())
-			playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
+			playsound(src.loc, W.usesound, 75, 1)
 			anchored = 1
 			user.visible_message("[user.name] secures the [src.name].", \
 				"<span class='notice'>You secure the external bolts.</span>", \
 				"<span class='italics'>You hear a ratchet.</span>")
 			connect_to_network()
 		else if(anchored)
-			playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
+			playsound(src.loc, W.usesound, 75, 1)
 			anchored = 0
 			user.visible_message("[user.name] unsecures the [src.name].", \
 				"<span class='notice'>You unsecure the external bolts.</span>", \
@@ -105,12 +108,10 @@ var/global/list/rad_collectors = list()
 		return ..()
 
 
-/obj/machinery/power/rad_collector/ex_act(severity, target)
-	switch(severity)
-		if(2, 3)
-			eject()
-	return ..()
-
+/obj/machinery/power/rad_collector/obj_break(damage_flag)
+	if(!(stat & BROKEN) && !(flags & NODECONSTRUCT))
+		eject()
+		stat |= BROKEN
 
 /obj/machinery/power/rad_collector/proc/eject()
 	locked = 0
@@ -119,6 +120,7 @@ var/global/list/rad_collectors = list()
 		return
 	Z.loc = get_turf(src)
 	Z.layer = initial(Z.layer)
+	Z.plane = initial(Z.plane)
 	src.loaded_tank = null
 	if(active)
 		toggle_power()
@@ -155,4 +157,3 @@ var/global/list/rad_collectors = list()
 		flick("ca_deactive", src)
 	update_icons()
 	return
-

code/modules/power/singularity/containment_field.dm

@@ -1,13 +1,13 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33
+
 
 /obj/machinery/field/containment
-	name = "Containment Field"
+	name = "containment field"
 	desc = "An energy field."
 	icon = 'icons/obj/singularity.dmi'
 	icon_state = "Contain_F"
 	anchored = 1
 	density = 0
-	unacidable = 1
+	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
 	use_power = 0
 	luminosity = 4
 	layer = ABOVE_OBJ_LAYER
@@ -26,14 +26,33 @@
 		shock(user)
 		return 1
 
+/obj/machinery/field/containment/attackby(obj/item/W, mob/user, params)
+	shock(user)
+	return 1
 
-/obj/machinery/field/containment/blob_act(obj/effect/blob/B)
+/obj/machinery/field/containment/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
+	switch(damage_type)
+		if(BURN)
+			playsound(loc, 'sound/effects/EMPulse.ogg', 75, 1)
+		if(BRUTE)
+			playsound(loc, 'sound/effects/EMPulse.ogg', 75, 1)
+
+/obj/machinery/field/containment/blob_act(obj/structure/blob/B)
 	return 0
 
-
 /obj/machinery/field/containment/ex_act(severity, target)
 	return 0
 
+/obj/machinery/field/containment/attack_animal(mob/living/simple_animal/M)
+	if(!FG1 || !FG2)
+		qdel(src)
+		return
+	if(ismegafauna(M))
+		M.visible_message("<span class='warning'>[M] glows fiercely as the containment field flickers out!</span>")
+		FG1.calc_power(INFINITY) //rip that 'containment' field
+		M.adjustHealth(-M.obj_damage)
+	else
+		..()
 
 /obj/machinery/field/containment/Crossed(mob/mover)
 	if(isliving(mover))
@@ -59,6 +78,8 @@
 /obj/machinery/field/containment/Move()
 	qdel(src)
 
+
+
 // Abstract Field Class
 // Used for overriding certain procs
 
@@ -77,26 +98,23 @@
 	return ..()
 
 /obj/machinery/field/proc/shock(mob/living/user)
-	if(isliving(user))
-		var/shock_damage = min(rand(30,40),rand(30,40))
+	var/shock_damage = min(rand(30,40),rand(30,40))
 
-		if(iscarbon(user))
-			var/stun = min(shock_damage, 15)
-			user.Stun(stun)
-			user.Weaken(10)
-			user.electrocute_act(shock_damage, src, 1)
+	if(iscarbon(user))
+		user.Stun(15)
+		user.Weaken(10)
+		user.electrocute_act(shock_damage, src, 1)
 
-		else if(issilicon(user))
-			if(prob(20))
-				user.Stun(2)
-			user.take_overall_damage(0, shock_damage)
-			user.visible_message("<span class='danger'>[user.name] was shocked by the [src.name]!</span>", \
-			"<span class='userdanger'>Energy pulse detected, system damaged!</span>", \
-			"<span class='italics'>You hear an electrical crack.</span>")
+	else if(issilicon(user))
+		if(prob(20))
+			user.Stun(2)
+		user.take_overall_damage(0, shock_damage)
+		user.visible_message("<span class='danger'>[user.name] was shocked by the [src.name]!</span>", \
+		"<span class='userdanger'>Energy pulse detected, system damaged!</span>", \
+		"<span class='italics'>You hear an electrical crack.</span>")
 
-		user.updatehealth()
-		bump_field(user)
-	return
+	user.updatehealth()
+	bump_field(user)
 
 /obj/machinery/field/proc/clear_shock()
 	hasShocked = 0

code/modules/power/singularity/emitter.dm

@@ -1,4 +1,4 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33
+
 
 /obj/machinery/power/emitter
 	name = "Emitter"
@@ -126,6 +126,16 @@
 		user << "<span class='warning'>The [src] needs to be firmly secured to the floor first!</span>"
 		return 1
 
+/obj/machinery/power/emitter/attack_animal(mob/living/simple_animal/M)
+	if(ismegafauna(M))
+		state = 0
+		anchored = FALSE
+		M.visible_message("<span class='warning'>[M] rips [src] free from its moorings!</span>")
+	else
+		..()
+	if(!anchored)
+		step(src, get_dir(M, src))
+
 
 /obj/machinery/power/emitter/emp_act(severity)//Emitters are hardened but still might have issues
 //	add_load(1000)
@@ -205,14 +215,14 @@
 			if(0)
 				if(isinspace()) return
 				state = 1
-				playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
+				playsound(src.loc, W.usesound, 75, 1)
 				user.visible_message("[user.name] secures [src.name] to the floor.", \
 					"<span class='notice'>You secure the external reinforcing bolts to the floor.</span>", \
 					"<span class='italics'>You hear a ratchet</span>")
 				src.anchored = 1
 			if(1)
 				state = 0
-				playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
+				playsound(src.loc, W.usesound, 75, 1)
 				user.visible_message("[user.name] unsecures [src.name] reinforcing bolts from the floor.", \
 					"<span class='notice'>You undo the external reinforcing bolts.</span>", \
 					"<span class='italics'>You hear a ratchet.</span>")
@@ -235,7 +245,7 @@
 					user.visible_message("[user.name] starts to weld the [src.name] to the floor.", \
 						"<span class='notice'>You start to weld \the [src] to the floor...</span>", \
 						"<span class='italics'>You hear welding.</span>")
-					if (do_after(user,20/W.toolspeed, target = src))
+					if (do_after(user,20*W.toolspeed, target = src))
 						if(!src || !WT.isOn()) return
 						state = 2
 						user << "<span class='notice'>You weld \the [src] to the floor.</span>"
@@ -246,7 +256,7 @@
 					user.visible_message("[user.name] starts to cut the [src.name] free from the floor.", \
 						"<span class='notice'>You start to cut \the [src] free from the floor...</span>", \
 						"<span class='italics'>You hear welding.</span>")
-					if (do_after(user,20/W.toolspeed, target = src))
+					if (do_after(user,20*W.toolspeed, target = src))
 						if(!src || !WT.isOn()) return
 						state = 1
 						user << "<span class='notice'>You cut \the [src] free from the floor.</span>"

code/modules/power/singularity/field_generator.dm

@@ -1,4 +1,4 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33
+
 
 
 /*
@@ -23,13 +23,17 @@ field_generator power level display
 #define FG_ONLINE 2
 
 /obj/machinery/field/generator
-	name = "Field Generator"
+	name = "field generator"
 	desc = "A large thermal battery that projects a high amount of energy when powered."
 	icon = 'icons/obj/machines/field_generator.dmi'
 	icon_state = "Field_Gen"
 	anchored = 0
 	density = 1
 	use_power = 0
+	obj_integrity = 500
+	max_integrity = 500
+	//100% immune to lasers and energy projectiles since it absorbs their energy.
+	armor = list(melee = 25, bullet = 10, laser = 100, energy = 100, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 70)
 	var/const/num_power_levels = 6	// Total number of power level icon has
 	var/power_level = 0
 	var/active = FG_OFFLINE
@@ -87,14 +91,14 @@ field_generator power level display
 			if(FG_UNSECURED)
 				if(isinspace()) return
 				state = FG_SECURED
-				playsound(loc, 'sound/items/Ratchet.ogg', 75, 1)
+				playsound(loc, W.usesound, 75, 1)
 				user.visible_message("[user.name] secures [name] to the floor.", \
 					"<span class='notice'>You secure the external reinforcing bolts to the floor.</span>", \
 					"<span class='italics'>You hear ratchet.</span>")
 				anchored = 1
 			if(FG_SECURED)
 				state = FG_UNSECURED
-				playsound(loc, 'sound/items/Ratchet.ogg', 75, 1)
+				playsound(loc, W.usesound, 75, 1)
 				user.visible_message("[user.name] unsecures [name] reinforcing bolts from the floor.", \
 					"<span class='notice'>You undo the external reinforcing bolts.</span>", \
 					"<span class='italics'>You hear ratchet.</span>")
@@ -114,7 +118,7 @@ field_generator power level display
 					user.visible_message("[user.name] starts to weld the [name] to the floor.", \
 						"<span class='notice'>You start to weld \the [src] to the floor...</span>", \
 						"<span class='italics'>You hear welding.</span>")
-					if (do_after(user,20/W.toolspeed, target = src))
+					if (do_after(user,20*W.toolspeed, target = src))
 						if(!src || !WT.isOn()) return
 						state = FG_WELDED
 						user << "<span class='notice'>You weld the field generator to the floor.</span>"
@@ -125,7 +129,7 @@ field_generator power level display
 					user.visible_message("[user.name] starts to cut the [name] free from the floor.", \
 						"<span class='notice'>You start to cut \the [src] free from the floor...</span>", \
 						"<span class='italics'>You hear welding.</span>")
-					if (do_after(user,20/W.toolspeed, target = src))
+					if (do_after(user,20*W.toolspeed, target = src))
 						if(!src || !WT.isOn()) return
 						state = FG_SECURED
 						user << "<span class='notice'>You cut \the [src] free from the floor.</span>"
@@ -133,12 +137,21 @@ field_generator power level display
 	else
 		return ..()
 
+/obj/machinery/field/generator/attack_animal(mob/living/simple_animal/M)
+	if(M.environment_smash >= 3 && active == FG_OFFLINE && state != FG_UNSECURED)
+		state = FG_UNSECURED
+		anchored = FALSE
+		M.visible_message("<span class='warning'>[M] rips [src] free from its moorings!</span>")
+	else
+		..()
+	if(!anchored)
+		step(src, get_dir(M, src))
 
 /obj/machinery/field/generator/emp_act()
 	return 0
 
 
-/obj/machinery/field/generator/blob_act(obj/effect/blob/B)
+/obj/machinery/field/generator/blob_act(obj/structure/blob/B)
 	if(active)
 		return 0
 	else
@@ -148,7 +161,7 @@ field_generator power level display
 	if(Proj.flag != "bullet")
 		power = min(power + Proj.damage, field_generator_max_power)
 		check_power_level()
-	return 0
+	..()
 
 
 /obj/machinery/field/generator/Destroy()
@@ -182,8 +195,10 @@ field_generator power level display
 				start_fields()
 
 
-/obj/machinery/field/generator/proc/calc_power()
+/obj/machinery/field/generator/proc/calc_power(set_power_draw)
 	var/power_draw = 2 + fields.len
+	if(set_power_draw)
+		power_draw = set_power_draw
 
 	if(draw_power(round(power_draw/2,1)))
 		check_power_level()

code/modules/power/singularity/generator.dm

@@ -1,5 +1,5 @@
 /////SINGULARITY SPAWNER
-/obj/machinery/the_singularitygen/
+/obj/machinery/the_singularitygen
 	name = "Gravitational Singularity Generator"
 	desc = "An Odd Device which produces a Gravitational Singularity when set up."
 	icon = 'icons/obj/singularity.dmi'
@@ -7,6 +7,7 @@
 	anchored = 0
 	density = 1
 	use_power = 0
+	resistance_flags = FIRE_PROOF
 	var/energy = 0
 	var/creation_type = /obj/singularity
 
@@ -25,13 +26,13 @@
 			user.visible_message("[user.name] secures [src.name] to the floor.", \
 				"<span class='notice'>You secure the [src.name] to the floor.</span>", \
 				"<span class='italics'>You hear a ratchet.</span>")
-			playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
+			playsound(src.loc, W.usesound, 75, 1)
 			anchored = 1
 		else if(anchored)
 			user.visible_message("[user.name] unsecures [src.name] from the floor.", \
 				"<span class='notice'>You unsecure the [src.name] from the floor.</span>", \
 				"<span class='italics'>You hear a ratchet.</span>")
-			playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
+			playsound(src.loc, W.usesound, 75, 1)
 			anchored = 0
 	else
 		return ..()

code/modules/power/singularity/narsie.dm

@@ -25,8 +25,8 @@
 
 /obj/singularity/narsie/large/New()
 	..()
-	world << "<span class='narsie'>NAR-SIE HAS RISEN</span>"
-	world << pick('sound/hallucinations/im_here1.ogg', 'sound/hallucinations/im_here2.ogg')
+	send_to_playing_players("<span class='narsie'>NAR-SIE HAS RISEN</span>")
+	send_to_playing_players(pick('sound/hallucinations/im_here1.ogg', 'sound/hallucinations/im_here2.ogg'))
 
 	var/area/A = get_area(src)
 	if(A)
@@ -36,7 +36,7 @@
 	narsie_spawn_animation()
 
 	sleep(70)
-	SSshuttle.emergency.request(null, 0.3) // Cannot recall
+	SSshuttle.emergency.request(null, 0.1) // Cannot recall
 
 
 /obj/singularity/narsie/large/attack_ghost(mob/dead/observer/user as mob)
@@ -50,7 +50,7 @@
 	eat()
 	if(!target || prob(5))
 		pickcultist()
-	if(istype(target, /obj/structure/clockwork/massive/ratvar))
+	if(istype(target, /obj/structure/destructible/clockwork/massive/ratvar))
 		move(get_dir(src, target)) //Oh, it's you again.
 	else
 		move()
@@ -86,7 +86,7 @@
 /obj/singularity/narsie/proc/pickcultist() //Narsie rewards her cultists with being devoured first, then picks a ghost to follow.
 	var/list/cultists = list()
 	var/list/noncultists = list()
-	for(var/obj/structure/clockwork/massive/ratvar/enemy in poi_list) //Prioritize killing Ratvar
+	for(var/obj/structure/destructible/clockwork/massive/ratvar/enemy in poi_list) //Prioritize killing Ratvar
 		if(enemy.z != z)
 			continue
 		acquire(enemy)

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

@@ -4,9 +4,10 @@
 	icon = 'icons/obj/machines/particle_accelerator.dmi'
 	icon_state = "particle"
 	anchored = 1
-	density = 1
+	density = 0
 	var/movement_range = 10
 	var/energy = 10
+	var/speed = 1
 
 /obj/effect/accelerated_particle/weak
 	movement_range = 8
@@ -21,24 +22,27 @@
 	energy = 50
 
 
-/obj/effect/accelerated_particle/New(loc, dir = 2)
-	src.setDir(dir)
+/obj/effect/accelerated_particle/New(loc)
+	..()
 
-	spawn(0)
-		move(1)
+	addtimer(src, "move", 1)
 
 
 /obj/effect/accelerated_particle/Bump(atom/A)
-	if (A)
-		if(ismob(A))
+	if(A)
+		if(isliving(A))
 			toxmob(A)
-		if((istype(A,/obj/machinery/the_singularitygen))||(istype(A,/obj/singularity/)))
-			A:energy += energy
+		else if(istype(A, /obj/machinery/the_singularitygen))
+			var/obj/machinery/the_singularitygen/S = A
+			S.energy += energy
+		else if(istype(A, /obj/singularity))
+			var/obj/singularity/S = A
+			S.energy += energy
 
 
-/obj/effect/accelerated_particle/Bumped(atom/A)
-	if(ismob(A))
-		Bump(A)
+/obj/effect/accelerated_particle/Crossed(atom/A)
+	if(isliving(A))
+		toxmob(A)
 
 
 /obj/effect/accelerated_particle/ex_act(severity, target)
@@ -46,15 +50,13 @@
 
 /obj/effect/accelerated_particle/proc/toxmob(mob/living/M)
 	M.rad_act(energy*6)
-	M.updatehealth()
 
-
-/obj/effect/accelerated_particle/proc/move(lag)
+/obj/effect/accelerated_particle/proc/move()
 	if(!step(src,dir))
-		loc = get_step(src,dir)
+		forceMove(get_step(src,dir))
 	movement_range--
 	if(movement_range == 0)
 		qdel(src)
 	else
-		sleep(lag)
-		move(lag)
+		sleep(speed)
+		move()

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

@@ -26,6 +26,10 @@
 	icon_state = "none"
 	anchored = 0
 	density = 1
+	obj_integrity = 500
+	max_integrity = 500
+	armor = list(melee = 30, bullet = 20, laser = 20, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 90, acid = 80)
+
 	var/obj/machinery/particle_accelerator/control_box/master = null
 	var/construction_state = PA_CONSTRUCTION_UNSECURED
 	var/reference = null
@@ -95,7 +99,7 @@
 	switch(construction_state)
 		if(PA_CONSTRUCTION_UNSECURED)
 			if(istype(W, /obj/item/weapon/wrench) && !isinspace())
-				playsound(loc, 'sound/items/Ratchet.ogg', 75, 1)
+				playsound(loc, W.usesound, 75, 1)
 				anchored = 1
 				user.visible_message("[user.name] secures the [name] to the floor.", \
 					"You secure the external bolts.")
@@ -103,7 +107,7 @@
 				did_something = TRUE
 		if(PA_CONSTRUCTION_UNWIRED)
 			if(istype(W, /obj/item/weapon/wrench))
-				playsound(loc, 'sound/items/Ratchet.ogg', 75, 1)
+				playsound(loc, W.usesound, 75, 1)
 				anchored = 0
 				user.visible_message("[user.name] detaches the [name] from the floor.", \
 					"You remove the external bolts.")
@@ -143,16 +147,17 @@
 	return ..()
 
 
+/obj/structure/particle_accelerator/deconstruct(disassembled = TRUE)
+	if(!(flags & NODECONSTRUCT))
+		new /obj/item/stack/sheet/metal (loc, 5)
+	qdel(src)
+
 /obj/structure/particle_accelerator/Move()
 	..()
 	if(master && master.active)
 		master.toggle_power()
 		investigate_log("was moved whilst active; it <font color='red'>powered down</font>.","singulo")
 
-/obj/structure/particle_accelerator/blob_act(obj/effect/blob/B)
-	if(prob(50))
-		qdel(src)
-
 
 /obj/structure/particle_accelerator/update_icon()
 	switch(construction_state)
@@ -165,7 +170,6 @@
 				icon_state="[reference]p[strength]"
 			else
 				icon_state="[reference]c"
-	return
 
 /obj/structure/particle_accelerator/proc/update_state()
 	if(master)

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

@@ -1,5 +1,3 @@
-
-
 /obj/machinery/particle_accelerator/control_box
 	name = "Particle Accelerator Control Console"
 	desc = "This controls the density of the particles."
@@ -161,6 +159,7 @@
 	var/turf/T = loc
 
 	assembled = 0
+	critical_machine = FALSE
 
 	var/obj/structure/particle_accelerator/fuel_chamber/F = locate() in orange(1,src)
 	if(!F)
@@ -191,6 +190,7 @@
 		return 0
 
 	assembled = 1
+	critical_machine = TRUE	//Only counts if the PA is actually assembled.
 	return 1
 
 /obj/machinery/particle_accelerator/control_box/proc/check_part(turf/T, type)
@@ -204,7 +204,7 @@
 
 /obj/machinery/particle_accelerator/control_box/proc/toggle_power()
 	active = !active
-	investigate_log("turned [active?"<font color='red'>ON</font>":"<font color='green'>OFF</font>"] by [usr ? key_name(usr) : "outside forces"]","singulo")
+	investigate_log("turned [active?"<font color='green'>ON</font>":"<font color='red'>OFF</font>"] by [usr ? key_name(usr) : "outside forces"]","singulo")
 	message_admins("PA Control Computer turned [active ?"ON":"OFF"] by [usr ? key_name_admin(usr) : "outside forces"](<A HREF='?_src_=holder;adminmoreinfo=\ref[usr]'>?</A>) (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[usr]'>FLW</A>) in ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
 	log_game("PA Control Computer turned [active ?"ON":"OFF"] by [usr ? "[key_name(usr)]" : "outside forces"] in ([x],[y],[z])")
 	if(active)
@@ -226,7 +226,7 @@
 
 /obj/machinery/particle_accelerator/control_box/interact(mob/user)
 	if((get_dist(src, user) > 1) || (stat & (BROKEN|NOPOWER)))
-		if(!istype(user, /mob/living/silicon))
+		if(!issilicon(user))
 			user.unset_machine()
 			user << browse(null, "window=pacontrol")
 			return
@@ -249,8 +249,6 @@
 		dat += "Particle Strength: [strength] "
 		dat += "<A href='?src=\ref[src];strengthdown=1'>--</A>|<A href='?src=\ref[src];strengthup=1'>++</A><BR><BR>"
 
-	//user << browse(dat, "window=pacontrol;size=420x500")
-	//onclose(user, "pacontrol")
 	var/datum/browser/popup = new(user, "pacontrol", name, 420, 300)
 	popup.set_content(dat)
 	popup.set_title_image(user.browse_rsc_icon(icon, icon_state))
@@ -273,7 +271,7 @@
 	switch(construction_state)
 		if(PA_CONSTRUCTION_UNSECURED)
 			if(istype(W, /obj/item/weapon/wrench) && !isinspace())
-				playsound(loc, 'sound/items/Ratchet.ogg', 75, 1)
+				playsound(loc, W.usesound, 75, 1)
 				anchored = 1
 				user.visible_message("[user.name] secures the [name] to the floor.", \
 					"You secure the external bolts.")
@@ -281,7 +279,7 @@
 				did_something = TRUE
 		if(PA_CONSTRUCTION_UNWIRED)
 			if(istype(W, /obj/item/weapon/wrench))
-				playsound(loc, 'sound/items/Ratchet.ogg', 75, 1)
+				playsound(loc, W.usesound, 75, 1)
 				anchored = 0
 				user.visible_message("[user.name] detaches the [name] from the floor.", \
 					"You remove the external bolts.")
@@ -320,7 +318,7 @@
 
 	..()
 
-/obj/machinery/particle_accelerator/control_box/blob_act(obj/effect/blob/B)
+/obj/machinery/particle_accelerator/control_box/blob_act(obj/structure/blob/B)
 	if(prob(50))
 		qdel(src)
 

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

@@ -27,15 +27,17 @@
 /obj/structure/particle_accelerator/particle_emitter/proc/emit_particle(strength = 0)
 	if((last_shot + fire_delay) <= world.time)
 		last_shot = world.time
-		var/turf/T = get_step(src,dir)
+		var/turf/T = get_turf(src)
+		var/obj/effect/accelerated_particle/P
 		switch(strength)
 			if(0)
-				new/obj/effect/accelerated_particle/weak(T, dir)
+				P = new/obj/effect/accelerated_particle/weak(T)
 			if(1)
-				new/obj/effect/accelerated_particle(T, dir)
+				P = new/obj/effect/accelerated_particle(T)
 			if(2)
-				new/obj/effect/accelerated_particle/strong(T, dir)
+				P = new/obj/effect/accelerated_particle/strong(T)
 			if(3)
-				new/obj/effect/accelerated_particle/powerful(T, dir)
+				P = new/obj/effect/accelerated_particle/powerful(T)
+		P.setDir(dir)
 		return 1
 	return 0

code/modules/power/singularity/singularity.dm

@@ -1,4 +1,4 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33
+
 
 /obj/singularity
 	name = "gravitational singularity"
@@ -9,7 +9,7 @@
 	density = 1
 	layer = MASSIVE_OBJ_LAYER
 	luminosity = 6
-	unacidable = 1 //Don't comment this out.
+	appearance_flags = 0
 	var/current_size = 1
 	var/allowed_size = 1
 	var/contained = 1 //Are we going to move around?
@@ -26,7 +26,7 @@
 	var/last_failed_movement = 0//Will not move in the same dir if it couldnt before, will help with the getting stuck on fields thing
 	var/last_warning
 	var/consumedSupermatter = 0 //If the singularity has eaten a supermatter shard and can go to stage six
-	burn_state = LAVA_PROOF
+	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
 
 /obj/singularity/New(loc, var/starting_energy = 50, var/temp = 0)
 	//CARN: admin-alert for chuckle-fuckery.
@@ -60,10 +60,23 @@
 	consume(user)
 	return 1
 
+/obj/singularity/attack_paw(mob/user)
+	consume(user)
+
+/obj/singularity/attack_alien(mob/user)
+	consume(user)
+
+/obj/singularity/attack_animal(mob/user)
+	consume(user)
+
+/obj/singularity/attackby(obj/item/weapon/W, mob/user, params)
+	consume(user)
+	return 1
+
 /obj/singularity/Process_Spacemove() //The singularity stops drifting for no man!
 	return 0
 
-/obj/singularity/blob_act(obj/effect/blob/B)
+/obj/singularity/blob_act(obj/structure/blob/B)
 	return
 
 /obj/singularity/ex_act(severity, target)
@@ -237,7 +250,7 @@
 
 /obj/singularity/proc/eat()
 	set background = BACKGROUND_ENABLED
-	for(var/tile in spiral_range_turfs(grav_pull, src, 1))
+	for(var/tile in spiral_range_turfs(grav_pull, src))
 		var/turf/T = tile
 		if(!T || !isturf(loc))
 			continue
@@ -246,7 +259,7 @@
 		else
 			consume(T)
 		for(var/thing in T)
-			if(isturf(loc))
+			if(isturf(loc) && thing != src)
 				var/atom/movable/X = thing
 				if(get_dist(X, src) > consume_range)
 					X.singularity_pull(src, current_size)
@@ -391,11 +404,11 @@
 
 /obj/singularity/proc/mezzer()
 	for(var/mob/living/carbon/M in oviewers(8, src))
-		if(istype(M, /mob/living/carbon/brain)) //Ignore brains
+		if(istype(M, /mob/living/brain)) //Ignore brains
 			continue
 
 		if(M.stat == CONSCIOUS)
-			if (istype(M,/mob/living/carbon/human))
+			if (ishuman(M))
 				var/mob/living/carbon/human/H = M
 				if(istype(H.glasses, /obj/item/clothing/glasses/meson))
 					var/obj/item/clothing/glasses/meson/MS = H.glasses
@@ -415,11 +428,9 @@
 
 
 /obj/singularity/proc/pulse()
-
 	for(var/obj/machinery/power/rad_collector/R in rad_collectors)
-		if(get_dist(R, src) <= 15) // Better than using orange() every process
+		if(R.z == z && get_dist(R, src) <= 15) // Better than using orange() every process
 			R.receive_pulse(energy)
-	return
 
 /obj/singularity/singularity_act()
 	var/gain = (energy/2)