Adds more feedback to traitor dehydrated space carp. Fixes spelling.

This commit is contained in:
bgobandit
2015-07-26 00:00:04 -04:00
parent dbf46a6b29
commit 3ec42691b8
3 changed files with 17 additions and 13 deletions
+8 -8
View File
@@ -348,14 +348,14 @@ var/list/uplink_items = list()
/datum/uplink_item/stealthy_weapons/throwingstars
name = "Box of Throwing Stars"
desc = "A box of throwing stars with a high chance of embedding themselves in people's limbs."
desc = "A box of throwing stars with a high chance of embedding themselves in victims' limbs."
item = /obj/item/weapon/storage/box/throwing_stars
cost = 6
excludefrom = list(/datum/game_mode/nuclear)
/datum/uplink_item/stealthy_weapons/foampistol
name = "Toy Gun (with Stun Darts)"
desc = "An innocent looking toy pistol designed to fire foam darts. Comes loaded with riot grade darts, to incapacitate a target."
desc = "An innocent-looking toy pistol designed to fire foam darts. Comes loaded with riot grade darts, to incapacitate a target."
item = /obj/item/weapon/gun/projectile/automatic/toy/pistol/riot
cost = 6
surplus = 10
@@ -399,14 +399,14 @@ var/list/uplink_items = list()
/datum/uplink_item/stealthy_weapons/pizza_bomb
name = "Pizza Bomb"
desc = "A pizza box with a bomb taped inside of it. The timer needs to be set by opening the box; afterwards, opening the box again will trigger the detonation."
desc = "A pizza box with a bomb taped inside it. The timer needs to be set by opening the box; afterwards, opening the box again will trigger the detonation."
item = /obj/item/device/pizza_bomb
cost = 4
surplus = 8
/datum/uplink_item/stealthy_weapons/dehy_carp
name = "Dehydrated Space Carp"
desc = "Just add water to make your very own hostile to everything space carp. It looks just like a plushie."
desc = "Looks like a plush toy carp, but just add water and it becomes a real-life space carp! Activate before use."
item = /obj/item/toy/carpplushie/dehy_carp
cost = 3
@@ -457,7 +457,7 @@ var/list/uplink_items = list()
/datum/uplink_item/stealthy_tools/chameleon_proj
name = "Chameleon-Projector"
desc = "Projects an image across a user, disguising them as an object scanned with it, as long as they don't move the projector from their hand. The disguised user cannot run and rojectiles pass over them."
desc = "Projects an image across a user, disguising them as an object scanned with it, as long as they don't move the projector from their hand. The disguised user cannot run, and projectiles pass over them."
item = /obj/item/device/chameleon
cost = 7
excludefrom = list(/datum/game_mode/gang)
@@ -478,7 +478,7 @@ var/list/uplink_items = list()
/datum/uplink_item/stealthy_tools/stimpack
name = "Stimpack"
desc = "Stimpacks, a tool of many great heroes, make you nearly immune to stuns and knockdowns for about 5 minutes after injection."
desc = "Stimpacks, the tool of many great heroes, make you nearly immune to stuns and knockdowns for about 5 minutes after injection."
item = /obj/item/weapon/reagent_containers/syringe/stimulants
cost = 8
surplus = 90
@@ -490,7 +490,7 @@ var/list/uplink_items = list()
/datum/uplink_item/device_tools/emag
name = "Cryptographic Sequencer"
desc = "The emag is a small card that unlocks hidden functions in electronic devices, subverts intended functions and characteristically breaks security mechanisms."
desc = "The cryptographic sequencer, or emag, is a small card that unlocks hidden functions in electronic devices, subverts intended functions and characteristically breaks security mechanisms."
item = /obj/item/weapon/card/emag
cost = 6
excludefrom = list(/datum/game_mode/gang)
@@ -657,7 +657,7 @@ var/list/uplink_items = list()
/datum/uplink_item/implants/uplink
name = "Uplink Implant"
desc = "An implant injected into the body, and later activated using a bodily gesture to open an uplink with 10 telecrystals. \
The ability for an agent to open an uplink after their posessions have been stripped from them makes this implant excellent for escaping confinement."
The ability for an agent to open an uplink after their possessions have been stripped from them makes this implant excellent for escaping confinement."
item = /obj/item/weapon/storage/box/syndie_kit/imp_uplink
cost = 14
surplus = 0
+8 -5
View File
@@ -6,22 +6,21 @@
// 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
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
if(owned)
user << "<span class='notice'>[src] stares up at you with friendly eyes.</span>"
if(!owned)
user << "<span class='notice'>You pet [src]. You swear it looks up at you.</span>"
owner = user
owned = 0
owned = 1
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()
@@ -45,4 +44,8 @@
if(F == "neutral")
factions -= F
C.faction = factions
if (!owner || owner.faction != C.faction)
visible_message("<span class='warning'>You have a bad feeling about this.</span>") // welcome to the hostile carp enjoy your die
else
visible_message("<span class='notice'>The newly grown carp looks up at you with friendly eyes.</span>")
qdel(src)
+1
View File
@@ -1132,6 +1132,7 @@
// Attack self
/obj/item/toy/carpplushie/attack_self(mob/user)
playsound(src.loc, bitesound, 20, 1)
user << "<span class='notice'>You pet [src]. D'awww.</span>"
return ..()
/*