Merge pull request #9149 from datlo/master

Clown Magboots

code/datums/uplink_item.dm

@@ -129,6 +129,14 @@ var/list/uplink_items = list()
 	cost = 5
 	job = list("Clown")
 
+/datum/uplink_item/jobspecific/clownmagboots
+	name = "Clown Magboots"
+	desc = "A pair of modified clown shoes fitted with an advanced magnetic traction system. Look and sound exactly like regular clown shoes unless closely inspected."
+	reference = "CM"
+	item = /obj/item/clothing/shoes/magboots/clown
+	cost = 3
+	job = list("Clown")
+
 //mime
 /datum/uplink_item/jobspecific/caneshotgun
 	name = "Cane Shotgun + Assassination Darts"

code/modules/clothing/shoes/magboots.dm

@@ -6,6 +6,7 @@
 	var/magboot_state = "magboots"
 	var/magpulse = 0
 	var/slowdown_active = 2
+	var/slowdown_passive = SHOES_SLOWDOWN
 	actions_types = list(/datum/action/item_action/toggle)
 	strip_delay = 70
 	put_on_delay = 70
@@ -14,7 +15,7 @@
 /obj/item/clothing/shoes/magboots/attack_self(mob/user)
 	if(magpulse)
 		flags &= ~NOSLIP
-		slowdown = SHOES_SLOWDOWN
+		slowdown = slowdown_passive
 	else
 		flags |= NOSLIP
 		slowdown = slowdown_active
@@ -53,4 +54,18 @@
 obj/item/clothing/shoes/magboots/syndie/advance //For the Syndicate Strike Team
 	desc = "Reverse-engineered magboots that appear to be based on an advanced model, as they have a lighter magnetic pull. Property of Gorlex Marauders."
 	name = "advanced blood-red magboots"
-	slowdown_active = SHOES_SLOWDOWN
+	slowdown_active = SHOES_SLOWDOWN
+
+/obj/item/clothing/shoes/magboots/clown
+	desc = "The prankster's standard-issue clowning shoes. Damn they're huge! There's a red light on the side."
+	name = "clown shoes"
+	icon_state = "clownmag0"
+	magboot_state = "clownmag"
+	item_state = "clown_shoes"
+	slowdown = SHOES_SLOWDOWN+1
+	slowdown_active = SHOES_SLOWDOWN+1
+	slowdown_passive = SHOES_SLOWDOWN+1
+	item_color = "clown"
+	silence_steps = 1
+	shoe_sound = "clownstep"
+	origin_tech = "magnets=4;syndicate=2"