Merge branch 'KabKebab:master' into random_junk

code/game/objects/items/dyekit.dm

@@ -0,0 +1,60 @@
+/obj/item/dyespray
+	name = "hair dye spray"
+	desc = "A spray to dye your hair any gradients you'd like."
+	icon = 'icons/obj/dyespray.dmi'
+	icon_state = "dyespray"
+
+	var/uses = 10 //SKYRAT EDIT ADDITION
+
+/obj/item/dyespray/attack_self(mob/user)
+	dye(user)
+
+/obj/item/dyespray/pre_attack(atom/target, mob/living/user, params)
+	dye(target)
+	return ..()
+
+/**
+ * Applies a gradient and a gradient color to a mob.
+ *
+ * Arguments:
+ * * target - The mob who we will apply the gradient and gradient color to.
+ */
+
+/obj/item/dyespray/proc/dye(mob/target)
+	if(!ishuman(target))
+		return
+
+	if(!uses) //SKYRAT EDIT ADDITION
+		return //SKYRAT EDIT ADDITION
+	
+	var/mob/living/carbon/human/human_target = target
+
+	var/new_hair_color = input(usr, "Choose a base hair color:", "Character Preference","#"+human_target.hair_color) as color|null
+	if(!new_hair_color)
+		return
+
+	var/new_grad_style = input(usr, "Choose a color pattern:", "Character Preference")  as null|anything in GLOB.hair_gradients_list
+	if(!new_grad_style)
+		return
+
+	var/new_grad_color = input(usr, "Choose a secondary hair color:", "Character Preference","#"+human_target.grad_color) as color|null
+	if(!new_grad_color)
+		return
+
+	human_target.hair_color = sanitize_hexcolor(new_hair_color)
+	human_target.grad_style = new_grad_style
+	human_target.grad_color = sanitize_hexcolor(new_grad_color)
+	to_chat(human_target, "<span class='notice'>You start applying the hair dye...</span>")
+	if(!do_after(usr, 30, target = human_target))
+		return
+	playsound(src, 'sound/effects/spray.ogg', 5, TRUE, 5)
+	human_target.update_hair()
+
+	//SKYRAT EDIT ADDITION
+	uses--
+
+/obj/item/dyespray/examine(mob/user)
+	. = ..()
+	. += "It has [uses] uses left."
+
+	//SKYRAT EDIT END

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/closed.dm

@@ -322,4 +322,4 @@
 	name = "wall"
 	desc = "A wall made out of a strange metal. The squares on it pulse in a predictable pattern."
 	icon = 'icons/turf/walls/hierophant_wall.dmi'
-	icon_state = "wall"
+	icon_state = "wall"

code/game/turfs/open.dm

@@ -204,6 +204,23 @@
 	clawfootstep = FOOTSTEP_HARD_CLAW
 	heavyfootstep = FOOTSTEP_GENERIC_HEAVY
 
+
+/turf/open/indestructible/chocolate
+	name = "chocolate floor"
+	desc = "A rather tasty floor, hopefully it does not ruin your shoes."
+	icon = 'Gainstation13/icons/turf/floor_candy.dmi'
+	icon_state = "choclit_alt2"
+
+
+/turf/open/indestructible/bubblegum
+	name = "bubblegum floor"
+	desc = "A rather tasty floor, hopefully it does not ruin your shoes."
+	icon = 'Gainstation13/icons/turf/floor_candy.dmi'
+	icon_state = "floor_pinkgum"
+
+
+
+
 /turf/open/indestructible/clock_spawn_room/Entered()
 	..()
 	START_PROCESSING(SSfastprocess, src)

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

code/game/turfs/simulated/water.dm

@@ -12,3 +12,20 @@
 	barefootstep = FOOTSTEP_WATER
 	clawfootstep = FOOTSTEP_WATER
 	heavyfootstep = FOOTSTEP_WATER
+
+
+
+/turf/open/chocolateriver
+	gender = PLURAL
+	name = "liquid chocolate"
+	desc = "This is probably used for some kind of huge fountain."
+	icon = 'Gainstation13/icons/turf/floor_candy.dmi'
+	icon_state = "chocwater"
+	slowdown = 1
+	bullet_sizzle = TRUE
+	bullet_bounce_sound = null //needs a splashing sound one day.
+
+	footstep = FOOTSTEP_WATER
+	barefootstep = FOOTSTEP_WATER
+	clawfootstep = FOOTSTEP_WATER
+	heavyfootstep = FOOTSTEP_WATER