From 84def6e1446974c4b88ede76c4ebed3d4f8d9a77 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Sun, 28 Feb 2016 02:08:32 -0500 Subject: [PATCH] Adds Sleeping Carp Scroll to Uplink --- code/datums/uplink_item.dm | 9 +++++++++ code/modules/mob/living/carbon/human/human.dm | 2 +- code/modules/projectiles/gun.dm | 14 +++++++++----- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index ccfdfad2432..2e25e2fd816 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -518,6 +518,15 @@ var/list/uplink_items = list() /datum/uplink_item/stealthy_weapons category = "Stealthy and Inconspicuous Weapons" +/datum/uplink_item/stealthy_weapons/martialarts + name = "Martial Arts Scroll" + desc = "This scroll contains the secrets of an ancient martial arts technique. You will master unarmed combat, \ + deflecting all ranged weapon fire, but you also refuse to use dishonorable ranged weaponry." + reference = "SCS" + item = /obj/item/weapon/sleeping_carp_scroll + cost = 17 + excludefrom = list(/datum/game_mode/nuclear) + /datum/uplink_item/stealthy_weapons/edagger name = "Energy Dagger" desc = "A dagger made of energy that looks and functions as a pen when off." diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index d70e22f1496..87e8ea264ce 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -404,7 +404,7 @@ if(!prob(martial_art.deflection_chance)) return ..() if(!src.lying && !(HULK in mutations)) //But only if they're not lying down, and hulks can't do it - src.visible_message("[src] deflects the projectile!", "You deflect the projectile!") + visible_message("[src] deflects the projectile; they can't be hit with ranged weapons!", "You deflect the projectile!") return 0 ..() diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index d44fb37f20b..bc96891cd4d 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -105,20 +105,24 @@ return if (!user.IsAdvancedToolUser() || istype(user, /mob/living/simple_animal/diona)) - user << "\red You don't have the dexterity to do this!" + user << "You don't have the dexterity to do this!" return if(istype(user, /mob/living)) var/mob/living/M = user if (HULK in M.mutations) - M << "\red Your meaty finger is much too large for the trigger guard!" + M << "Your meaty finger is much too large for the trigger guard!" return if(ishuman(user)) var/mob/living/carbon/human/H = user - if(H.species.name == "Golem") - user << "\red Your metal fingers don't fit in the trigger guard!" + if(H.get_species() == "Golem") + user << "Your metal fingers don't fit in the trigger guard!" return - if(user.dna && user.dna.species == "Shadowling") + if(H.get_species() == "Shadowling") user << "The muzzle flash would cause damage to your form!" + return + if(H.martial_art && H.martial_art.name == "The Sleeping Carp") //great dishonor to famiry + user << "Use of ranged weaponry would bring dishonor to the clan." + return add_fingerprint(user)