Revert "12/21 modernizations from TG live"

code/modules/flufftext/Hallucination.dm

@@ -11,7 +11,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
 
 */
 
-/mob/living/carbon
+/mob/living/carbon/
 	var/image/halimage
 	var/image/halbody
 	var/obj/halitem
@@ -206,18 +206,6 @@ Gunshots/explosions/opening doors/less rare audio (done)
 		target << "<span class='notice'>[xeno_name] scrambles into the ventilation ducts!</span>"
 	qdel(src)
 
-/obj/effect/hallucination/simple/clown
-	image_icon = 'icons/mob/animal.dmi'
-	image_state = "clown"
-
-/obj/effect/hallucination/simple/clown/New(loc,var/mob/living/carbon/T,duration)
-	..(loc, T)
-	name = pick(clown_names)
-	QDEL_IN(src,duration)
-
-/obj/effect/hallucination/simple/clown/scary
-	image_state = "scary_clown"
-
 /obj/effect/hallucination/singularity_scare
 	//Singularity moving towards you.
 	//todo Hide where it moved with fake space images
@@ -315,12 +303,11 @@ Gunshots/explosions/opening doors/less rare audio (done)
 		if(target.client)
 			delusions |= A
 			target.client.images |= A
-	QDEL_IN(src, duration)
-
-/obj/effect/hallucination/delusion/Destroy()
+	sleep(duration)
 	for(var/image/I in delusions)
 		if(target.client)
 			target.client.images.Remove(I)
+	qdel(src)
 
 /obj/effect/hallucination/fakeattacker/New(loc,var/mob/living/carbon/T)
 	target = T
@@ -337,10 +324,14 @@ Gunshots/explosions/opening doors/less rare audio (done)
 		return
 
 	var/obj/effect/fake_attacker/F = new/obj/effect/fake_attacker(get_turf(target),target)
-	for(var/obj/item/I in clone.held_items)
-		if(!(locate(I) in non_fakeattack_weapons))
-			clone_weapon = I.name
-			F.weap = I
+	if(clone.l_hand)
+		if(!(locate(clone.l_hand) in non_fakeattack_weapons))
+			clone_weapon = clone.l_hand.name
+			F.weap = clone.l_hand
+	else if (clone.r_hand)
+		if(!(locate(clone.r_hand) in non_fakeattack_weapons))
+			clone_weapon = clone.r_hand.name
+			F.weap = clone.r_hand
 
 	F.name = clone.name
 	F.my_target = target
@@ -376,7 +367,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
 	var/collapse
 	var/image/down
 
-	obj_integrity = 100
+	var/health = 100
 
 /obj/effect/fake_attacker/attackby(obj/item/weapon/P, mob/living/user, params)
 	step_away(src,my_target,2)
@@ -386,7 +377,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
 	my_target.visible_message("<span class='danger'>[my_target] flails around wildly.</span>", \
 							"<span class='danger'>[my_target] has attacked [src]!</span>")
 
-	obj_integrity -= P.force
+	src.health -= P.force
 
 /obj/effect/fake_attacker/Crossed(mob/M, somenumber)
 	if(M == my_target)
@@ -423,7 +414,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
 /obj/effect/fake_attacker/proc/attack_loop()
 	while(1)
 		sleep(rand(5,10))
-		if(obj_integrity < 0)
+		if(src.health < 0)
 			collapse()
 			continue
 		if(get_dist(src,my_target) > 1)
@@ -432,7 +423,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
 			updateimage()
 		else
 			if(prob(15))
-				do_attack_animation(my_target, ATTACK_EFFECT_PUNCH)
+				src.do_attack_animation(my_target)
 				if(weapon_name)
 					my_target << sound(pick('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg'))
 					my_target.show_message("<span class='danger'>[src.name] has attacked [my_target] with [weapon_name]!</span>", 1)
@@ -464,7 +455,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
 	target << I
 	QDEL_IN(O, 300)
 
-var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/ballistic, /obj/item/ammo_box/a357,\
+var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/item/ammo_box/a357,\
 	/obj/item/weapon/gun/energy/kinetic_accelerator/crossbow, /obj/item/weapon/melee/energy/sword/saber,\
 	/obj/item/weapon/storage/box/syndicate, /obj/item/weapon/storage/box/emps,\
 	/obj/item/weapon/cartridge/syndicate, /obj/item/clothing/under/chameleon,\
@@ -628,14 +619,10 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/ballistic, /obj/item
 			//src << "Traitor Items"
 			if(!halitem)
 				halitem = new
-				var/obj/item/l_hand = get_item_for_held_index(1)
-				var/obj/item/r_hand = get_item_for_held_index(2)
-				var/l = ui_hand_position(get_held_index_of_item(l_hand))
-				var/r = ui_hand_position(get_held_index_of_item(r_hand))
-				var/list/slots_free = list(l,r)
-				if(l_hand) slots_free -= l
-				if(r_hand) slots_free -= r
-				if(ishuman(src))
+				var/list/slots_free = list(ui_lhand,ui_rhand)
+				if(l_hand) slots_free -= ui_lhand
+				if(r_hand) slots_free -= ui_rhand
+				if(istype(src,/mob/living/carbon/human))
 					var/mob/living/carbon/human/H = src
 					if(!H.belt) slots_free += ui_belt
 					if(!H.l_store) slots_free += ui_storage1
@@ -643,7 +630,6 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/ballistic, /obj/item
 				if(slots_free.len)
 					halitem.screen_loc = pick(slots_free)
 					halitem.layer = ABOVE_HUD_LAYER
-					halitem.plane = ABOVE_HUD_PLANE
 					switch(rand(1,6))
 						if(1) //revolver
 							halitem.icon = 'icons/obj/guns/projectile.dmi'

code/modules/flufftext/TextFilters.dm

@@ -1,4 +1,4 @@
-
+//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
 
 //is this shit even used at all
 /proc/NewStutter(phrase,stunned)