Merge pull request #8777 from CosmicScientist/SpaceCarpTatorItem

Adds space carp traitor item and carp plushie "attack"

code/game/objects/items/dehy_carp.dm

@@ -0,0 +1,43 @@
+/*
+ *	Dehydrated Carp
+ *	Instant carp, just add water
+ */
+
+// Child of carpplushie because this should do everything the toy does and more
+/obj/item/toy/carpplushie/dehy_carp
+	var/mob/owner = null	// Carp doesn't attack owner, set when using in hand
+	var/owned = 1	// Boolean, no owner to begin with
+
+// Attack self
+/obj/item/toy/carpplushie/dehy_carp/attack_self(mob/user as mob)
+	src.add_fingerprint(user)	// Anyone can add their fingerprints to it with this
+	if(owned)
+		user << "<span class='notice'>[src] stares up at you with friendly eyes.</span>"
+		owner = user
+		owned = 0
+	return ..()
+
+
+/obj/item/toy/carpplushie/dehy_carp/afterattack(obj/O, mob/user,proximity)
+	if(!proximity) return
+	if(istype(O,/obj/structure/sink))
+		user << "<span class='notice'>You place [src] under a stream of water...</span>"
+		user.drop_item()
+		loc = get_turf(O)
+		return Swell()
+	..()
+
+/obj/item/toy/carpplushie/dehy_carp/proc/Swell()
+	desc = "It's growing!"
+	visible_message("<span class='notice'>[src] swells up!</span>")
+
+	// Animation
+	icon = 'icons/mob/animal.dmi'
+	flick("carp_swell", src)
+	// Wait for animation to end
+	sleep(6)
+	// Make space carp
+	var/mob/living/simple_animal/hostile/carp/C = new /mob/living/simple_animal/hostile/carp(get_turf(src))
+	// Make carp non-hostile to user, yes this means
+	C.faction |= "\ref[owner]"
+	qdel(src)

code/game/objects/items/toys.dm

@@ -1038,6 +1038,18 @@ obj/item/toy/cards/deck/syndicate
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "carpplushie"
 	w_class = 2.0
+	attack_verb = list("bitten", "eaten", "fin slapped")
+	var/bitesound = 'sound/weapons/bite.ogg'
+
+// Attack mob
+/obj/item/toy/carpplushie/attack(mob/M as mob, mob/user as mob)
+	playsound(loc, bitesound, 20, 1)	// Play bite sound in local area
+	return ..()
+
+// Attack self
+/obj/item/toy/carpplushie/attack_self(mob/user as mob)
+	playsound(src.loc, bitesound, 20, 1)
+	return ..()
 
 /*
  * Toy big red button