Merge pull request #5193 from dylanstrategie/Meteor-Hit-Is-Over

Forcefully deprecate meteor_hit()

code/game/objects/effects/aliens.dm

@@ -85,11 +85,6 @@
 	healthcheck()
 	return
 
-/obj/effect/alien/resin/meteorhit()
-	health-=50
-	healthcheck()
-	return
-
 /obj/effect/alien/resin/hitby(AM as mob|obj)
 	..()
 	for(var/mob/O in viewers(src, null))

code/game/objects/structures.dm

@@ -17,9 +17,6 @@ obj/structure/ex_act(severity)
 		if(3.0)
 			return
 
-obj/structure/meteorhit(obj/O as obj)
-	del(src)
-
 /obj/structure/Destroy()
 	if(hascall(src, "unbuckle"))
 		src:unbuckle()

code/game/objects/structures/crates_lockers/closets.dm

@@ -260,13 +260,6 @@
 			A.loc = src.loc
 		del(src)
 
-/obj/structure/closet/meteorhit(obj/O as obj)
-	if(O.icon_state == "flaming")
-		for(var/mob/M in src)
-			M.meteorhit(O)
-		src.dump_contents()
-		del(src)
-
 /obj/structure/closet/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(src.opened)
 		if(istype(W, /obj/item/weapon/grab))

code/game/objects/structures/crates_lockers/closets/statue.dm

@@ -110,12 +110,6 @@
 	for(var/mob/M in src)
 		shatter(M)
 
-/obj/structure/closet/statue/meteorhit(obj/O as obj)
-	if(O.icon_state == "flaming")
-		for(var/mob/M in src)
-			M.meteorhit(O)
-			shatter(M)
-
 /obj/structure/closet/statue/attackby(obj/item/I as obj, mob/user as mob)
 	health -= I.force
 	visible_message("<span class='warning'>[user] strikes [src] with [I].</span>")

code/game/objects/structures/displaycase.dm

@@ -136,13 +136,6 @@
 		if(occupant) dump()
 		del(src)
 
-
-/obj/structure/displaycase/meteorhit(obj/O as obj)
-		getFromPool(/obj/item/weapon/shard, loc)
-		if(occupant) dump()
-		del(src)
-
-
 /obj/structure/displaycase/proc/healthcheck()
 	if (src.health <= 0)
 		if (!( src.destroyed ))

code/game/objects/structures/grille.dm

@@ -53,10 +53,6 @@
 	health -= rand(initial(health)*0.8, initial(health)*3) //Grille will always be blasted, but chances of leaving things over
 	healthcheck(hitsound = 1)
 
-/obj/structure/grille/meteorhit()
-	health -= rand(initial(health)*0.8, initial(health)*3)
-	healthcheck(hitsound = 1)
-
 /obj/structure/grille/Bumped(atom/user)
 	if(ismob(user))
 		shock(user, 60) //Give the user the benifit of the doubt

code/game/objects/structures/lamarr_cage.dm

@@ -39,13 +39,6 @@
 		Break()
 		qdel(src)
 
-
-/obj/structure/lamarr/meteorhit(obj/O as obj)
-		getFromPool(/obj/item/weapon/shard, loc)
-		Break()
-		qdel(src)
-
-
 /obj/structure/lamarr/proc/healthcheck()
 	if (src.health <= 0)
 		if (!( src.destroyed ))

code/game/objects/structures/safe.dm

@@ -171,11 +171,6 @@ obj/structure/safe/blob_act()
 obj/structure/safe/ex_act(severity)
 	return
 
-
-obj/structure/safe/meteorhit(obj/O as obj)
-	return
-
-
 //FLOOR SAFES
 /obj/structure/safe/floor
 	name = "floor safe"

code/game/objects/structures/tables_racks.dm

@@ -642,10 +642,6 @@
 	user.drop_item(W, src.loc)
 	return 1
 
-/obj/structure/rack/meteorhit(obj/O as obj)
-	del(src)
-
-
 /obj/structure/table/attack_hand(mob/user)
 	if(M_HULK in user.mutations)
 		visible_message("<span class='danger'>[user] smashes [src] apart!</span>")

code/game/objects/structures/window.dm

@@ -124,11 +124,6 @@
 	health -= rand(30, 50)
 	healthcheck()
 
-/obj/structure/window/meteorhit()
-
-	health -= rand(100, 150)
-	healthcheck()
-
 /obj/structure/window/CheckExit(var/atom/movable/O, var/turf/target)
 
 	if(istype(O) && O.checkpass(PASSGLASS))