diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index c2f8600e463..1910b88dd9e 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -441,9 +441,9 @@ var/list/uplink_items = list() /datum/uplink_item/stealthy_weapons/dehy_carp name = "Dehydrated Space Carp" - desc = "Looks like a plush toy carp, but just add water and it becomes a real-life space carp! Activate before use." + desc = "Looks like a plush toy carp, but just add water and it becomes a real-life space carp! Activate in your hand before use so it knows not to kill you." item = /obj/item/toy/carpplushie/dehy_carp - cost = 3 + cost = 1 /datum/uplink_item/stealthy_weapons/door_charge name = "Explosive Airlock Charge" diff --git a/code/game/objects/items/dehy_carp.dm b/code/game/objects/items/dehy_carp.dm index 7c35fd4ff99..0b20a76264e 100644 --- a/code/game/objects/items/dehy_carp.dm +++ b/code/game/objects/items/dehy_carp.dm @@ -3,14 +3,14 @@ * Instant carp, just add water */ -// Child of carpplushie because this should do everything the toy does and more +//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 = 0 // Boolean, no owner to begin with + var/mob/owner = null //Carp doesn't attack owner, set when using in hand + var/owned = 0 //Boolean, no owner to begin with -// Attack self +//Attack self /obj/item/toy/carpplushie/dehy_carp/attack_self(mob/user) - src.add_fingerprint(user) // Anyone can add their fingerprints to it with this + src.add_fingerprint(user) //Anyone can add their fingerprints to it with this if(!owned) user << "You pet [src]. You swear it looks up at you." owner = user @@ -30,14 +30,14 @@ desc = "It's growing!" visible_message("[src] swells up!") - // Animation + //Animation icon = 'icons/mob/animal.dmi' flick("carp_swell", src) - // Wait for animation to end + //Wait for animation to end sleep(6) - // Make space carp + //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, and their allies + //Make carp non-hostile to user, and their allies if(owner) var/list/factions = owner.faction for(var/F in factions) @@ -45,7 +45,7 @@ factions -= F C.faction = factions if (!owner || owner.faction != C.faction) - visible_message("You have a bad feeling about this.") // welcome to the hostile carp enjoy your die + visible_message("You have a bad feeling about this.") //welcome to the hostile carp enjoy your die else visible_message("The newly grown carp looks up at you with friendly eyes.") qdel(src) \ No newline at end of file diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 24e7ce32755..f119483aea6 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -1126,12 +1126,12 @@ burn_state = 0 //Burnable var/bitesound = 'sound/weapons/bite.ogg' -// Attack mob +//Attack mob /obj/item/toy/carpplushie/attack(mob/M, mob/user) - playsound(loc, bitesound, 20, 1) // Play bite sound in local area + playsound(loc, bitesound, 20, 1) //Play bite sound in local area return ..() -// Attack self +//Attack self /obj/item/toy/carpplushie/attack_self(mob/user) playsound(src.loc, bitesound, 20, 1) user << "You pet [src]. D'awww."