Merge pull request #5964 from Citadel-Station-13/upstream-merge-36459

[MIRROR] Clown Ops

code/modules/clothing/shoes/bananashoes.dm

@@ -4,25 +4,30 @@
 	name = "mk-honk prototype shoes"
 	desc = "Lost prototype of advanced clown tech. Powered by bananium, these shoes leave a trail of chaos in their wake."
 	icon_state = "clown_prototype_off"
-	var/on = FALSE
 	actions_types = list(/datum/action/item_action/toggle)
+	var/on = FALSE
+	var/always_noslip = FALSE
 
 /obj/item/clothing/shoes/clown_shoes/banana_shoes/Initialize()
 	. = ..()
 	AddComponent(/datum/component/material_container, list(MAT_BANANIUM), 200000, TRUE)
 	AddComponent(/datum/component/squeak, list('sound/items/bikehorn.ogg'=1), 75)
+	if(always_noslip)
+		flags_1 |= NOSLIP_1
 
 /obj/item/clothing/shoes/clown_shoes/banana_shoes/step_action()
 	. = ..()
+	GET_COMPONENT(bananium, /datum/component/material_container)
 	if(on)
-		new/obj/item/grown/bananapeel/specialpeel(get_step(src,turn(usr.dir, 180))) //honk
-		GET_COMPONENT(bananium, /datum/component/material_container)
-		bananium.use_amount_type(100, MAT_BANANIUM)
 		if(bananium.amount(MAT_BANANIUM) < 100)
 			on = !on
-			flags_1 &= ~NOSLIP_1
+			if(!always_noslip)
+				flags_1 &= ~NOSLIP_1
 			update_icon()
 			to_chat(loc, "<span class='warning'>You ran out of bananium!</span>")
+		else
+			new /obj/item/grown/bananapeel/specialpeel(get_step(src,turn(usr.dir, 180))) //honk
+			bananium.use_amount_type(100, MAT_BANANIUM)
 
 /obj/item/clothing/shoes/clown_shoes/banana_shoes/attack_self(mob/user)
 	GET_COMPONENT(bananium, /datum/component/material_container)
@@ -42,10 +47,11 @@
 		on = !on
 		update_icon()
 		to_chat(user, "<span class='notice'>You [on ? "activate" : "deactivate"] the prototype shoes.</span>")
-		if(on)
-			flags_1 |= NOSLIP_1
-		else
-			flags_1 &= ~NOSLIP_1
+		if(!always_noslip)
+			if(on)
+				flags_1 |= NOSLIP_1
+			else
+				flags_1 &= ~NOSLIP_1
 	else
 		to_chat(user, "<span class='warning'>You need bananium to turn the prototype shoes on!</span>")