Merge pull request #4148 from Zuhayr/master

Disables meteor mode.

baystation12.dme

@@ -1241,12 +1241,12 @@
 #include "code\modules\surgery\eye.dm"
 #include "code\modules\surgery\face.dm"
 #include "code\modules\surgery\generic.dm"
+#include "code\modules\surgery\headreattach.dm"
 #include "code\modules\surgery\implant.dm"
 #include "code\modules\surgery\other.dm"
 #include "code\modules\surgery\ribcage.dm"
 #include "code\modules\surgery\robolimbs.dm"
 #include "code\modules\surgery\surgery.dm"
-#include "code\modules\surgery\headreattach.dm"
 #include "code\modules\telesci\bscrystal.dm"
 #include "code\modules\telesci\gps.dm"
 #include "code\modules\telesci\telepad.dm"

code/game/gamemodes/events/space_ninja.dm

@@ -547,7 +547,7 @@ As such, it's hard-coded for now. No reason for it not to be, really.
 	equip_to_slot_or_del(new /obj/item/device/flashlight(src), slot_belt)
 	equip_to_slot_or_del(new /obj/item/weapon/plastique(src), slot_r_store)
 	equip_to_slot_or_del(new /obj/item/weapon/plastique(src), slot_l_store)
-	equip_to_slot_or_del(new /obj/item/weapon/tank/emergency_oxygen(src), slot_s_store)
+	equip_to_slot_or_del(new /obj/item/weapon/tank/oxygen(src), slot_s_store)
 	return 1
 
 //=======//HELPER PROCS//=======//

code/game/gamemodes/meteor/meteor.dm

@@ -6,6 +6,7 @@
 	var/const/meteordelay = 2000
 	var/nometeors = 1
 	required_players = 0
+	votable = 0
 
 	uplink_welcome = "EVIL METEOR Uplink Console:"
 	uplink_uses = 10

code/game/objects/effects/decals/Cleanable/misc.dm

@@ -40,6 +40,14 @@
 	icon = 'icons/effects/effects.dmi'
 	icon_state = "dirt"
 
+/obj/effect/decal/cleanable/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W,/obj/item/weapon/crowbar))
+		var/turf/T = get_turf(src)
+		if(T)
+			T.attackby(W,user)
+			return
+	..()
+
 /obj/effect/decal/cleanable/flour
 	name = "flour"
 	desc = "It's still good. Four second rule!"

code/game/turfs/simulated.dm

@@ -23,12 +23,12 @@
 		if(M.lying)        return
 		dirt++
 		var/obj/effect/decal/cleanable/dirt/dirtoverlay = locate(/obj/effect/decal/cleanable/dirt, src)
-		if (dirt >= 30)
+		if (dirt >= 50)
 			if (!dirtoverlay)
 				dirtoverlay = new/obj/effect/decal/cleanable/dirt(src)
 				dirtoverlay.alpha = 15
-			else if (dirt > 30)
-				dirtoverlay.alpha = min(dirtoverlay.alpha+20, 255)
+			else if (dirt > 50)
+				dirtoverlay.alpha = min(dirtoverlay.alpha+5, 255)
 
 		if(istype(M, /mob/living/carbon/human))
 			var/mob/living/carbon/human/H = M