God help me, clown planet is making a comeback.

code/game/machinery/teleporter.dm

@@ -42,6 +42,7 @@
 			user.drop_item()
 			del(I)
 
+			/* FUCK YOU
 			if(C.data == "Clown Land")
 				//whoops
 				for(var/mob/O in hearers(src, null))
@@ -53,10 +54,11 @@
 						new /mob/living/simple_animal/hostile/carp(get_turf(H))
 				//
 			else
-				for(var/mob/O in hearers(src, null))
-					O.show_message("\blue Locked In", 2)
-				src.locked = L
-				one_time_use = 1
+			*/
+			for(var/mob/O in hearers(src, null))
+				O.show_message("\blue Locked In", 2)
+			src.locked = L
+			one_time_use = 1
 
 			src.add_fingerprint(usr)
 	else

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

@@ -15,4 +15,24 @@
 /obj/effect/decal/spraystill
 	density = 0
 	anchored = 1
-	layer = 50
+	layer = 50
+
+/obj/effect/decal/snow
+	name="snow"
+	density=0
+	anchored=1
+	layer=2
+	icon='icons/turf/snow.dmi'
+
+
+/obj/effect/decal/snow/clean/edge
+	icon_state="snow_corner"
+
+/obj/effect/decal/snow/sand/edge
+	icon_state="gravsnow_corner"
+
+/obj/effect/decal/snow/clean/surround
+	icon_state="snow_surround"
+
+/obj/effect/decal/snow/sand/surround
+	icon_state="gravsnow_surround"

code/game/objects/items/weapons/cards_ids.dm

@@ -42,14 +42,14 @@
 	return
 
 /obj/item/weapon/card/data/clown
-	name = "coordinates to clown planet"
+	name = "Coordinates to Clown Planet"
 	icon_state = "data"
 	item_state = "card-id"
 	layer = 3
 	level = 2
 	desc = "This card contains coordinates to the fabled Clown Planet. Handle with care."
 	function = "teleporter"
-	data = "Clown Land"
+	data = "Clown Planet"
 
 /*
  * ID CARDS

code/game/objects/items/weapons/storage/secure.dm

@@ -237,6 +237,14 @@
 	attack_hand(mob/user as mob)
 		return attack_self(user)
 
+// Clown planet WMD storage
+/obj/item/weapon/storage/secure/safe/clown
+	name="WMD Storage"
+
+/obj/item/weapon/storage/secure/safe/clown/New()
+	for(var/i=0;i<10;i++)
+		new /obj/item/weapon/reagent_containers/food/snacks/pie(src)
+
 /obj/item/weapon/storage/secure/safe/HoS/New()
 	..()
 	//new /obj/item/weapon/storage/lockbox/clusterbang(src) This item is currently broken... and probably shouldnt exist to begin with (even though it's cool)

code/game/objects/structures/grille.dm

@@ -12,6 +12,14 @@
 	var/health = 10
 	var/destroyed = 0
 
+/obj/structure/grille/fence/east_west
+	//width=80
+	//height=42
+	icon='icons/fence-ew.dmi'
+/obj/structure/grille/fence/north_south
+	//width=80
+	//height=42
+	icon='icons/fence-ns.dmi'
 
 /obj/structure/grille/ex_act(severity)
 	del(src)

code/game/turfs/simulated/floor_types.dm

@@ -238,6 +238,11 @@
 	icon = 'icons/turf/snow.dmi'
 	icon_state = "snow"
 
+/turf/simulated/floor/plating/snow/concrete
+	name = "concrete"
+	icon = 'icons/turf/floors.dmi'
+	icon_state = "concrete"
+
 /turf/simulated/floor/plating/snow/ex_act(severity)
 	return
 

code/modules/awaymissions/corpse.dm

@@ -177,6 +177,18 @@
 	corpseidjob = "Clown"
 	corpseidaccess = "Clown"
 
+/obj/effect/landmark/corpse/mime
+	name = "Mime"
+	corpseuniform = /obj/item/clothing/under/mime
+	corpseshoes = /obj/item/clothing/shoes/black
+	corpseradio = /obj/item/device/radio/headset
+	corpsemask = /obj/item/clothing/mask/gas/mime
+	corpsegloves = /obj/item/clothing/gloves/white/stunglove // Spawn with empty, crappy batteries.
+	corpseback = /obj/item/weapon/storage/backpack
+	corpseid = 1
+	corpseidjob = "Mime"
+	corpseidaccess = "Mime"
+
 /obj/effect/landmark/corpse/scientist
 	name = "Scientist"
 	corpseradio = /obj/item/device/radio/headset/headset_sci

code/modules/clothing/gloves/boxing.dm

@@ -23,5 +23,10 @@
 	item_state = "lgloves"
 	_color="mime"
 
+	stunglove // For Clown Planet's mimes. - N3X
+		New()
+			..()
+			cell = new /obj/item/weapon/cell/crap/empty(src)
+
 	redcoat
 		_color = "redcoat"		//Exists for washing machines. Is not different from white gloves in any way.

code/modules/power/antimatter/shielding.dm

@@ -129,16 +129,16 @@ proc/cardinalrange(var/center)
 	coredirs = 0
 	dirs = 0
 	for(var/direction in alldirs)
-		var/machine = locate(/obj/machinery, get_step(loc, direction))
+		var/turf/T = get_step(loc, direction)
+		for(var/obj/machinery/machine in T)
+			// Detect cores
+			if((istype(machine, /obj/machinery/am_shielding) && machine:control_unit == control_unit && machine:processing))
+				coredirs |= direction
 
-		// Detect cores
-		if((istype(machine, /obj/machinery/am_shielding) && machine:control_unit == control_unit && machine:processing))
-			coredirs |= direction
-
-		// Detect cores, shielding, and control boxen.
-		if(direction in cardinal)
-			if((istype(machine, /obj/machinery/am_shielding) && machine:control_unit == control_unit) ||(istype(machine, /obj/machinery/power/am_control_unit) && machine == control_unit))
-				dirs |= direction
+			// Detect cores, shielding, and control boxen.
+			if(direction in cardinal)
+				if((istype(machine, /obj/machinery/am_shielding) && machine:control_unit == control_unit) || (istype(machine, /obj/machinery/power/am_control_unit) && machine == control_unit))
+					dirs |= direction
 
 	// If we're next to a core, set the prefix.
 	var/prefix = ""