Merge pull request #76 from eyespy2222/testbranch

Dance 'till your dead!

GainStation13/code/mobs/cakegolem.dm

@@ -43,8 +43,9 @@
 
 /mob/living/simple_animal/friendly/cakegolem/attack_hand(mob/living/L)
 	. = ..()
-	if(!.) //the attack was blocked
-		return
+
+	//if(.) //the attack was blocked
+		//return
 	if(L.a_intent == INTENT_HARM && L.reagents && !stat)
 		L.reagents.add_reagent(/datum/reagent/consumable/nutriment, 0.4)
 		L.reagents.add_reagent(/datum/reagent/consumable/nutriment/vitamin, 0.4)

code/game/objects/items/stacks/tiles/tile_mineral.dm

@@ -75,6 +75,13 @@
 	icon_state = "tile_calorite_strong"
 	turf_type = /turf/open/floor/mineral/calorite/strong
 
+/obj/item/stack/tile/mineral/calorite/dance  //GS13 - glamourous variant!
+	name = "Calorite dance floor"
+	singular_name = "Calorite dance floor tile"
+	desc = "A dance floor made out of calorite, for a party both you and your waistline will never forget!."
+	icon_state = "tile_calorite_dance"
+	turf_type = /turf/open/floor/mineral/calorite/dance
+
 
 /obj/item/stack/tile/mineral/abductor
 	name = "alien floor tile"

code/game/turfs/simulated/floor/mineral_floor.dm

@@ -239,6 +239,14 @@
 	floor_tile = /obj/item/stack/tile/mineral/calorite/strong
 	icons = list("calorite_strong","calorite_dam")
 
+// calorite dance floor, groovy! - GS13
+
+/turf/open/floor/mineral/calorite/dance
+	name = "Infused calorite floor"
+	icon_state = "calorite_dance"
+	floor_tile = /obj/item/stack/tile/mineral/calorite/dance
+	icons = list("calorite_dance","calorite_dam")
+
 //DIAMOND
 
 /turf/open/floor/mineral/diamond

tgstation.dme

@@ -3076,9 +3076,9 @@
 #include "GainStation13\code\machinery\feeding_tube.dm"
 #include "GainStation13\code\mechanics\fatness.dm"
 #include "GainStation13\code\mechanics\spells.dm"
-#include "GainStation13\code\mobs\cakegolem.dm"
 #include "GainStation13\code\mechanics\wand.dm"
 #include "GainStation13\code\mechanics\web_weaving.dm"
+#include "GainStation13\code\mobs\cakegolem.dm"
 #include "GainStation13\code\modules\client\preferences\preferences.dm"
 #include "GainStation13\code\modules\mob\living\emote.dm"
 #include "GainStation13\code\modules\reagents\chemistry\reagents\consumable_reagents.dm"