From af74475cadde35637dc2d2cae9d9b32b484ac2f7 Mon Sep 17 00:00:00 2001 From: CosmicScientist Date: Tue, 10 Nov 2015 23:41:59 +0000 Subject: [PATCH 1/4] Because I cannot bear it. --- code/datums/uplink_item.dm | 2 +- code/game/objects/items/dehy_carp.dm | 14 +++++++------- code/game/objects/items/toys.dm | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 4a677ab1d4b..c1f31efd8e8 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -441,7 +441,7 @@ 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 diff --git a/code/game/objects/items/dehy_carp.dm b/code/game/objects/items/dehy_carp.dm index 7c35fd4ff99..bb5e8d9dc15 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 /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,12 +30,12 @@ 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 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 if(owner) @@ -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 ec934e86858..3d285fdbf49 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." From c8391680a68f8016fa4acc064cdea1864c617359 Mon Sep 17 00:00:00 2001 From: CosmicScientist Date: Tue, 10 Nov 2015 23:46:17 +0000 Subject: [PATCH 2/4] So I must bury it. --- code/game/objects/items/dehy_carp.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/dehy_carp.dm b/code/game/objects/items/dehy_carp.dm index bb5e8d9dc15..0b20a76264e 100644 --- a/code/game/objects/items/dehy_carp.dm +++ b/code/game/objects/items/dehy_carp.dm @@ -8,7 +8,7 @@ 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 if(!owned) @@ -33,11 +33,11 @@ //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 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) From d0e5bf65a712050369ac34067bb5df5039e9ec69 Mon Sep 17 00:00:00 2001 From: CosmicScientist Date: Wed, 11 Nov 2015 00:02:40 +0000 Subject: [PATCH 3/4] And hope that something stronger grows there. --- code/datums/uplink_item.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index c1f31efd8e8..0a52551af26 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -443,7 +443,7 @@ var/list/uplink_items = list() name = "Dehydrated Space Carp" 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 = 2 /datum/uplink_item/stealthy_weapons/door_charge name = "Explosive Airlock Charge" From 1369b84782bf3d86257e0be46cf2c4ff8f7c35db Mon Sep 17 00:00:00 2001 From: CosmicScientist Date: Wed, 11 Nov 2015 01:02:39 +0000 Subject: [PATCH 4/4] That may find a place in this world. --- code/datums/uplink_item.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 0a52551af26..b2c39813efe 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -443,7 +443,7 @@ var/list/uplink_items = list() name = "Dehydrated Space Carp" 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 = 2 + cost = 1 /datum/uplink_item/stealthy_weapons/door_charge name = "Explosive Airlock Charge"