From 320b1e958c4bedc900fa88fffcd09aae4696d26a Mon Sep 17 00:00:00 2001 From: Robustin Date: Mon, 22 Feb 2016 13:24:08 -0500 Subject: [PATCH 1/7] Update mob_helpers.dm --- code/modules/mob/mob_helpers.dm | 41 ++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index eb21d2b982a..179165bedc7 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -114,6 +114,45 @@ newletter+="[newletter][newletter]" newphrase+="[newletter]";counter-=1 return newphrase + +/proc/cultslur(n) + var/phrase = html_decode(n) + var/leng = lentext(phrase) + var/counter=lentext(phrase) + var/newphrase="" + var/newletter="" + while(counter>=1) + newletter=copytext(phrase,(leng-counter)+1,(leng-counter)+2) + if(rand(1,2)==2) + if(lowertext(newletter)=="o") + newletter="u" + if(lowertext(newletter)=="s") + newletter="ch" + if(lowertext(newletter)=="a") + newletter="ah" + if(lowertext(newletter)=="u") + newletter="oo" + if(lowertext(newletter)=="c") + newletter=" NAR " + if(lowertext(newletter)=="t") + newletter=" SIE " + if(rand(1,4)==4) + if(newletter==" ") + newletter=" GLORY " + if(newletter=="H") + newletter=" HAIL " + + switch(rand(1,10)) + if(1) + newletter="'" + if(2) + newletter+="agn" + if(3) + newletter="fth" + if(4) + newletter="nglu" + newphrase+="[newletter]";counter-=1 + return newphrase /proc/stutter(n) var/te = html_decode(n) @@ -403,4 +442,4 @@ It's fairly easy to fix if dealing with single letters but not so much with comp return if(!user.client.AI_Interact) // Do they have it enabled? return - return TRUE \ No newline at end of file + return TRUE From 9763db99def126008b10b2a6c5fb89901e342975 Mon Sep 17 00:00:00 2001 From: Robustin Date: Mon, 22 Feb 2016 16:20:10 -0500 Subject: [PATCH 2/7] Update martial.dm --- code/datums/martial.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/datums/martial.dm b/code/datums/martial.dm index 2aac8e51473..364b9f00c01 100644 --- a/code/datums/martial.dm +++ b/code/datums/martial.dm @@ -492,9 +492,6 @@ /obj/item/weapon/sleeping_carp_scroll/attack_self(mob/living/carbon/human/user) if(!istype(user) || !user) return - if(!is_in_gang(user, "Sleeping Carp")) //Only the Sleeping Carp can use the scroll - user << "You can't comprehend the runes and symbols drawn on [src]." - return 0 user << "You have learned the ancient martial art of the Sleeping Carp! Your hand-to-hand combat has become much more effective, and you are now able to deflect any projectiles \ directed toward you. However, you are also unable to use any ranged weaponry. You can learn more about your newfound art by using the Recall Teachings verb in the Sleeping Carp tab." var/datum/martial_art/the_sleeping_carp/theSleepingCarp = new(null) From d9c6dfce735c869d3a615ba652ab7c75fd4ed047 Mon Sep 17 00:00:00 2001 From: Robustin Date: Mon, 22 Feb 2016 16:27:28 -0500 Subject: [PATCH 3/7] Update mob_helpers.dm --- code/modules/mob/mob_helpers.dm | 39 --------------------------------- 1 file changed, 39 deletions(-) diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 179165bedc7..475cad65762 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -115,45 +115,6 @@ newphrase+="[newletter]";counter-=1 return newphrase -/proc/cultslur(n) - var/phrase = html_decode(n) - var/leng = lentext(phrase) - var/counter=lentext(phrase) - var/newphrase="" - var/newletter="" - while(counter>=1) - newletter=copytext(phrase,(leng-counter)+1,(leng-counter)+2) - if(rand(1,2)==2) - if(lowertext(newletter)=="o") - newletter="u" - if(lowertext(newletter)=="s") - newletter="ch" - if(lowertext(newletter)=="a") - newletter="ah" - if(lowertext(newletter)=="u") - newletter="oo" - if(lowertext(newletter)=="c") - newletter=" NAR " - if(lowertext(newletter)=="t") - newletter=" SIE " - if(rand(1,4)==4) - if(newletter==" ") - newletter=" GLORY " - if(newletter=="H") - newletter=" HAIL " - - switch(rand(1,10)) - if(1) - newletter="'" - if(2) - newletter+="agn" - if(3) - newletter="fth" - if(4) - newletter="nglu" - newphrase+="[newletter]";counter-=1 - return newphrase - /proc/stutter(n) var/te = html_decode(n) var/t = ""//placed before the message. Not really sure what it's for. From c535ea783ed06a88520ba27e8a1a631db72328c2 Mon Sep 17 00:00:00 2001 From: Robustin Date: Mon, 22 Feb 2016 16:28:42 -0500 Subject: [PATCH 4/7] Update human.dm --- code/modules/mob/living/carbon/human/human.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 94799020482..823335b089c 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -159,7 +159,7 @@ if(!prob(martial_art.deflection_chance)) return ..() if(!src.lying && dna && !dna.check_mutation(HULK)) //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!") + src.visible_message("[src] deflects the projectile; they can't be hit with ranged weapons!", "You deflect the projectile!") return 0 ..() @@ -947,4 +947,4 @@ /mob/living/carbon/human/fully_heal(admin_revive = 0) restore_blood() remove_all_embedded_objects() - ..() \ No newline at end of file + ..() From f31cc6e6cffa74754ed327debaefe49f833801e3 Mon Sep 17 00:00:00 2001 From: Robustin Date: Mon, 22 Feb 2016 16:31:44 -0500 Subject: [PATCH 5/7] Update uplink_item.dm --- code/modules/uplink/uplink_item.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/modules/uplink/uplink_item.dm b/code/modules/uplink/uplink_item.dm index 0e6f48cc781..4cdaf5486c8 100644 --- a/code/modules/uplink/uplink_item.dm +++ b/code/modules/uplink/uplink_item.dm @@ -543,6 +543,14 @@ var/list/uplink_items = list() // Global list so we only initialize this once. /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 will also refuse to use dishonorable ranged weaponry." + item = /obj/item/weapon/sleeping_carp_scroll + cost = 17 + exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/gang) + /datum/uplink_item/stealthy_weapons/throwingstars name = "Box of Throwing Stars" desc = "A box of shurikens from ancient Earth martial arts. They are highly effective throwing weapons, \ From b26337dc05534443061b31f00706f400d5a2f19f Mon Sep 17 00:00:00 2001 From: Robustin Date: Mon, 22 Feb 2016 17:00:52 -0500 Subject: [PATCH 6/7] Update uplink_item.dm --- code/modules/uplink/uplink_item.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/uplink/uplink_item.dm b/code/modules/uplink/uplink_item.dm index 4cdaf5486c8..e2351cbf24a 100644 --- a/code/modules/uplink/uplink_item.dm +++ b/code/modules/uplink/uplink_item.dm @@ -548,8 +548,8 @@ var/list/uplink_items = list() // Global list so we only initialize this once. desc = "This scroll contains the secrets of an ancient martial arts technique. You will master unarmed combat, \ deflecting all ranged weapon fire, but you will also refuse to use dishonorable ranged weaponry." item = /obj/item/weapon/sleeping_carp_scroll - cost = 17 - exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/gang) + cost = 17 + exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/gang) /datum/uplink_item/stealthy_weapons/throwingstars name = "Box of Throwing Stars" From 408a302b20663dc991928e53d077d78307ab994d Mon Sep 17 00:00:00 2001 From: Robustin Date: Mon, 22 Feb 2016 17:23:47 -0500 Subject: [PATCH 7/7] Update uplink_item.dm --- code/modules/uplink/uplink_item.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/uplink/uplink_item.dm b/code/modules/uplink/uplink_item.dm index e2351cbf24a..cf6c383742a 100644 --- a/code/modules/uplink/uplink_item.dm +++ b/code/modules/uplink/uplink_item.dm @@ -546,7 +546,7 @@ var/list/uplink_items = list() // Global list so we only initialize this once. /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 will also refuse to use dishonorable ranged weaponry." + deflecting all ranged weapon fire, but you also refuse to use dishonorable ranged weaponry." item = /obj/item/weapon/sleeping_carp_scroll cost = 17 exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/gang)