Merge pull request #2744 from Spamcat/bef

fixes

code/game/machinery/alarm.dm

@@ -131,7 +131,7 @@
 			return
 
 		var/turf/simulated/location = loc
-		ASSERT(istype(location))
+		if(!istype(location))	return//returns if loc is not simulated
 
 		var/datum/gas_mixture/environment = location.return_air()
 		var/partial_pressure = R_IDEAL_GAS_EQUATION*environment.temperature/environment.volume

code/game/mecha/working/ripley.dm

@@ -111,8 +111,7 @@
 
 
 /obj/mecha/working/ripley/attackby(obj/item/weapon/W as obj, mob/user as mob)
-
-  if(istype(W, /obj/item/weapon/fluff/sven_fjeltson_1))
+	if(istype(W, /obj/item/weapon/fluff/sven_fjeltson_1))//this shit broke ripleys
 		src.icon_state = "earth"
 		src.initial_icon = "earth"
 		src.name = "APLU \"Strike the Earth!\""
@@ -121,3 +120,5 @@
 		user.drop_item()
 		del(W)
 		return
+	else
+		..()