Merge pull request #2610 from Spamcat/bleeding-edge-freeze

NRA Utopia

code/game/turfs/simulated/floor_types.dm

@@ -160,6 +160,9 @@
 	name = "Water"
 	icon_state = "water"
 
+/turf/simulated/floor/beach/water/New()
+	..()
+	overlays += image("icon"='icons/misc/beach.dmi',"icon_state"="water5","layer"=MOB_LAYER+0.1)
 
 /turf/simulated/floor/grass
 	name = "Grass patch"

code/modules/mob/living/simple_animal/friendly/spiderbot.dm

@@ -203,6 +203,9 @@
 	if(camera)
 		camera.status = 0
 
+	held_item.loc = src.loc
+	held_item = null
+
 	robogibs(src.loc, viruses)
 	src.Del()
 	return
@@ -327,4 +330,9 @@
 				src << "\red \The [selection] is too far away."
 
 	src << "\red There is nothing of interest to take."
-	return 0
+	return 0
+
+/mob/living/simple_animal/spiderbot/examine()
+	..()
+	if(src.held_item)
+		usr << "It is carrying \a [src.held_item] \icon[src.held_item]."