Merge branch 'master' of github.com:Baystation12/Baystation12

code/modules/admin/admin.dm

@@ -1475,6 +1475,8 @@
 						else
 							infect_mob_random_greater(victim)
 						message_admins("[key_name_admin(usr)] has infected [victim] with a [lesser ? "minor" : "major"] virus2.", 1)
+				if("trigger_armed_response_team")
+					trigger_armed_response_team(1)
 				if("retardify")
 					if (src.rank in list("Badmin", "Game Admin", "Game Master"))
 						for(var/mob/living/carbon/human/H in world)
@@ -2039,6 +2041,7 @@
 <A href='?src=\ref[src];secretsfun=radiation'>Irradiate the station</A><BR>
 <A href='?src=\ref[src];secretsfun=prison_break'>Trigger a Prison Break</A><BR>
 <A href='?src=\ref[src];secretsfun=virus'>Trigger a Virus Outbreak</A><BR>
+<A href='?src=\ref[src];secretsfun=trigger_armed_response_team'>Trigger the Emergency Response Team</A><BR>
 <A href='?src=\ref[src];secretsfun=immovable'>Spawn an Immovable Rod</A><BR>
 <A href='?src=\ref[src];secretsfun=lightsout'>Toggle a "lights out" event</A><BR>
 <A href='?src=\ref[src];secretsfun=ionstorm'>Spawn an Ion Storm</A><BR>

code/modules/chemical/Chemistry-Tools.dm

@@ -250,7 +250,7 @@
 	HasProximity(atom/movable/AM as mob|obj)
 		if(istype(attached_device, /obj/item/device/assembly/prox_sensor))
 			var/obj/item/device/assembly/prox_sensor/D = attached_device
-			if (istype(AM, /obj/beam))
+			if (istype(AM, /obj/effect/beam))
 				return
 			if (AM.move_speed < 12)
 				D.sense()

code/modules/flufftext/Hallucination.dm

@@ -213,7 +213,7 @@ proc/check_panel(mob/M)
 			return 1
 	return 0	*/
 
-/obj/fake_attacker
+/obj/effect/fake_attacker
 	icon = null
 	icon_state = null
 	name = ""
@@ -355,7 +355,7 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite
 	if(!possible_clones.len) return
 	clone = pick(possible_clones)
 	//var/obj/fake_attacker/F = new/obj/fake_attacker(outside_range(target))
-	var/obj/fake_attacker/F = new/obj/fake_attacker(target.loc)
+	var/obj/effect/fake_attacker/F = new/obj/effect/fake_attacker(target.loc)
 	if(clone.l_hand)
 		if(!(locate(clone.l_hand) in non_fakeattack_weapons))
 			clone_weapon = clone.l_hand.name

code/modules/mob/living/carbon/human/human.dm

@@ -1295,8 +1295,8 @@
 	else if (gender == FEMALE)
 		g = "f"
 
-	stand_icon = new /icon('human.dmi', "torso_s")
-	lying_icon = new /icon('human.dmi', "torso_l")
+	stand_icon = new /icon('human.dmi', "torso_[g]_s")
+	lying_icon = new /icon('human.dmi', "torso_[g]_l")
 
 	var/husk = (mutations & HUSK)
 	var/obese = (mutations & FAT)