From 0d125c20a0ec3810f5e0d19ad82771147a96d3cf Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Sat, 21 Jan 2017 06:17:06 -0500 Subject: [PATCH 1/9] why do i do this.. --- .../objects/items/weapons/holy_weapons.dm | 100 ++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index be74349f8ca..7fd61e32acc 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -453,6 +453,106 @@ if(prob(10)) to_chat(H, "Being in the presence of [holder]'s [src] is interfering with your powers!") +/obj/item/weapon/nullrod/salt + name = "Holy Salt" + icon = 'icons/obj/food/containers.dmi' + icon_state = "saltshakersmall" + item_state = null + desc = "While commonly used to repel some ghosts, it appears others are downright attracted to it." + force = 0 + throwforce = 0 + var/ghostcall = 0 + + +/obj/item/weapon/nullrod/salt/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) + if(iscarbon(M))//no hitting people + return ..() + + if(!user.mind || user.mind.assigned_role != "Chaplain") + to_chat(user, "You are not close enough with [ticker.Bible_deity_name] to use [src].") + return + + if(ghostcall) + to_chat(user, "You are already using [src].") + + user.visible_message("[user] kneels[M == user ? null : " next to [M]"] and begins to utter a prayer to [ticker.Bible_deity_name] while drawing a circle with salt!.", \ + "You kneel[M == user ? null : " next to [M]"] and begin a prayer to [ticker.Bible_deity_name] while drawing a circle!.") + + ghostcall = 1 + if(do_after(user, 50, target = M)) + notify_ghosts("The Chaplain is calling ghosts to [get_area(src)] with [src.name]!", source = src) + ghostcall = 0 + return + else + to_chat(user, "Your prayer to [ticker.Bible_deity_name] was interrupted.") + ghostcall = 0 + + +/obj/item/weapon/nullrod/bread + name = "prayer bread" + icon = 'icons/obj/trash.dmi' + icon_state = "tastybread" + desc = "a staple of worshipers of the Silentfather, this holy mime artifact has an odd effect on clowns." + force = 0 + throwforce = 0 + var/praying = 0 + +/obj/item/weapon/nullrod/bread/New() + ..() + processing_objects.Add(src) + + +/obj/item/weapon/nullrod/bread/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) + if(!iscarbon(M)) + return ..() + + if(!user.mind || user.mind.assigned_role != "Chaplain") + to_chat(user, "You are not close enough with [ticker.Bible_deity_name] to use [src].") + return + + if(praying) + to_chat(user, "You are already using [src].") + + user.visible_message("[user] kneels[M == user ? null : " next to [M]"] and begins to utter a prayer to [ticker.Bible_deity_name].", \ + "You kneel[M == user ? null : " next to [M]"] and begin a prayer to [ticker.Bible_deity_name].") + + praying = 1 + if(do_after(user, 150, target = M)) + if(ishuman(M)) + var/mob/living/carbon/human/target = M + + if(target.mind) + target.mind.miming = 1//will need to remove this after a time + to_chat(target, "You feel quiet..") + + + if(prob(25)) + to_chat(target, "[user]'s prayer to [ticker.Bible_deity_name] has eased your pain..and hunger!") + target.adjustToxLoss(-5) + target.adjustOxyLoss(-5) + target.adjustBruteLoss(-5) + target.adjustFireLoss(-5) + target.nutrition += 1 + + praying = 0 + + else + to_chat(user, "Your prayer to [ticker.Bible_deity_name] was interrupted.") + praying = 0 + +/obj/item/weapon/nullrod/bread/process() + if(ishuman(loc)) + var/mob/living/carbon/human/holder = loc + //would like to make the holder mime if they have it in on thier person in general + if(src == holder.l_hand || src == holder.r_hand) // Holding this in your hand will + for(var/mob/living/carbon/human/H in range(5)) + if(H.current.mind.assigned_role == "Clown") + H.mind.miming = 1//will need to remove this after a time + H.color = "grey" //and this + if(prob(10)) + to_chat(H, "Being in the presence of [holder]'s [src] is interfering with your honk!") + + /obj/item/weapon/nullrod/missionary_staff name = "holy staff" desc = "It has a mysterious, protective aura." From 559fcebb57810bd2b14630a5fae2331d902ec080 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Sat, 21 Jan 2017 08:50:30 -0500 Subject: [PATCH 2/9] ferp --- code/game/objects/items/weapons/holy_weapons.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index 7fd61e32acc..c2bcc8711df 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -522,7 +522,7 @@ var/mob/living/carbon/human/target = M if(target.mind) - target.mind.miming = 1//will need to remove this after a time + H.AdjustSilence(5) to_chat(target, "You feel quiet..") @@ -546,9 +546,9 @@ //would like to make the holder mime if they have it in on thier person in general if(src == holder.l_hand || src == holder.r_hand) // Holding this in your hand will for(var/mob/living/carbon/human/H in range(5)) - if(H.current.mind.assigned_role == "Clown") - H.mind.miming = 1//will need to remove this after a time - H.color = "grey" //and this + if(H.mind.assigned_role == "Clown") + H.AdjustSilence(30) + animate_fade_grayscale(H,20) if(prob(10)) to_chat(H, "Being in the presence of [holder]'s [src] is interfering with your honk!") From 8f3ea0d5cb4e89f370651d8119153bb3476365e3 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Sat, 21 Jan 2017 08:50:58 -0500 Subject: [PATCH 3/9] blrghh --- code/game/objects/items/weapons/holy_weapons.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index c2bcc8711df..f5893b25f80 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -522,7 +522,7 @@ var/mob/living/carbon/human/target = M if(target.mind) - H.AdjustSilence(5) + target.AdjustSilence(5) to_chat(target, "You feel quiet..") From 1769672037322ccbcb197192df7f83509e36118d Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Sat, 21 Jan 2017 19:37:08 -0500 Subject: [PATCH 4/9] this icon was a thing.... --- code/game/objects/items/weapons/holy_weapons.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index f5893b25f80..7cae0b77df3 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -465,7 +465,7 @@ /obj/item/weapon/nullrod/salt/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) - if(iscarbon(M))//no hitting people + if(!iscarbon(M)) return ..() if(!user.mind || user.mind.assigned_role != "Chaplain") @@ -490,8 +490,8 @@ /obj/item/weapon/nullrod/bread name = "prayer bread" - icon = 'icons/obj/trash.dmi' - icon_state = "tastybread" + icon = 'icons/obj/food/food.dmi' + icon_state = "baguette" desc = "a staple of worshipers of the Silentfather, this holy mime artifact has an odd effect on clowns." force = 0 throwforce = 0 From 64b820082308fd46eb1f16dfc66dd27bd67c8a40 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Sun, 22 Jan 2017 19:42:13 -0500 Subject: [PATCH 5/9] changes --- code/game/objects/items/weapons/holy_weapons.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index 7cae0b77df3..affae55b4a2 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -480,7 +480,7 @@ ghostcall = 1 if(do_after(user, 50, target = M)) - notify_ghosts("The Chaplain is calling ghosts to [get_area(src)] with [src.name]!", source = src) + notify_ghosts("The Chaplain is calling ghosts to [get_area(src)] with [name]!", source = src) ghostcall = 0 return else @@ -547,7 +547,7 @@ if(src == holder.l_hand || src == holder.r_hand) // Holding this in your hand will for(var/mob/living/carbon/human/H in range(5)) if(H.mind.assigned_role == "Clown") - H.AdjustSilence(30) + H.AdjustSilence(10) animate_fade_grayscale(H,20) if(prob(10)) to_chat(H, "Being in the presence of [holder]'s [src] is interfering with your honk!") From eb4b320676c1672b6b125ff1e2a4992ed145a8db Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Mon, 23 Jan 2017 18:31:13 -0500 Subject: [PATCH 6/9] fox changes --- .../objects/items/weapons/holy_weapons.dm | 71 ++++--------------- 1 file changed, 12 insertions(+), 59 deletions(-) diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index affae55b4a2..914ed044549 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -457,90 +457,43 @@ name = "Holy Salt" icon = 'icons/obj/food/containers.dmi' icon_state = "saltshakersmall" - item_state = null + item_state = "saltshakersmall" desc = "While commonly used to repel some ghosts, it appears others are downright attracted to it." force = 0 throwforce = 0 - var/ghostcall = 0 + var/ghostcall_CD = 0 -/obj/item/weapon/nullrod/salt/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) - if(!iscarbon(M)) - return ..() +/obj/item/weapon/nullrod/salt/attack_self(mob/user) if(!user.mind || user.mind.assigned_role != "Chaplain") to_chat(user, "You are not close enough with [ticker.Bible_deity_name] to use [src].") return - if(ghostcall) - to_chat(user, "You are already using [src].") - - user.visible_message("[user] kneels[M == user ? null : " next to [M]"] and begins to utter a prayer to [ticker.Bible_deity_name] while drawing a circle with salt!.", \ - "You kneel[M == user ? null : " next to [M]"] and begin a prayer to [ticker.Bible_deity_name] while drawing a circle!.") - - ghostcall = 1 - if(do_after(user, 50, target = M)) + if(!(ghostcall_CD > world.time)) + ghostcall_CD = world.time + 3000 //deciseconds..5 minutes + user.visible_message("[user] kneels and begins to utter a prayer to [ticker.Bible_deity_name] while drawing a circle with salt!.", \ + "You kneel and begin a prayer to [ticker.Bible_deity_name] while drawing a circle!.") notify_ghosts("The Chaplain is calling ghosts to [get_area(src)] with [name]!", source = src) - ghostcall = 0 - return else - to_chat(user, "Your prayer to [ticker.Bible_deity_name] was interrupted.") - ghostcall = 0 + to_chat(user, "You need to wait before using [src] again.") + return -/obj/item/weapon/nullrod/bread +/obj/item/weapon/nullrod/rosary/bread name = "prayer bread" icon = 'icons/obj/food/food.dmi' icon_state = "baguette" desc = "a staple of worshipers of the Silentfather, this holy mime artifact has an odd effect on clowns." force = 0 throwforce = 0 - var/praying = 0 -/obj/item/weapon/nullrod/bread/New() +/obj/item/weapon/nullrod/rosary/bread/New() ..() processing_objects.Add(src) -/obj/item/weapon/nullrod/bread/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) - if(!iscarbon(M)) - return ..() - - if(!user.mind || user.mind.assigned_role != "Chaplain") - to_chat(user, "You are not close enough with [ticker.Bible_deity_name] to use [src].") - return - - if(praying) - to_chat(user, "You are already using [src].") - - user.visible_message("[user] kneels[M == user ? null : " next to [M]"] and begins to utter a prayer to [ticker.Bible_deity_name].", \ - "You kneel[M == user ? null : " next to [M]"] and begin a prayer to [ticker.Bible_deity_name].") - - praying = 1 - if(do_after(user, 150, target = M)) - if(ishuman(M)) - var/mob/living/carbon/human/target = M - - if(target.mind) - target.AdjustSilence(5) - to_chat(target, "You feel quiet..") - - - if(prob(25)) - to_chat(target, "[user]'s prayer to [ticker.Bible_deity_name] has eased your pain..and hunger!") - target.adjustToxLoss(-5) - target.adjustOxyLoss(-5) - target.adjustBruteLoss(-5) - target.adjustFireLoss(-5) - target.nutrition += 1 - - praying = 0 - - else - to_chat(user, "Your prayer to [ticker.Bible_deity_name] was interrupted.") - praying = 0 - -/obj/item/weapon/nullrod/bread/process() +/obj/item/weapon/nullrod/rosary/bread/process() if(ishuman(loc)) var/mob/living/carbon/human/holder = loc //would like to make the holder mime if they have it in on thier person in general From 318c339f113c759b58e1d163cecf3a1cd21a7df1 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Mon, 23 Jan 2017 18:32:40 -0500 Subject: [PATCH 7/9] icons are silly --- code/game/objects/items/weapons/holy_weapons.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index 914ed044549..6f7a00f69d0 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -457,7 +457,6 @@ name = "Holy Salt" icon = 'icons/obj/food/containers.dmi' icon_state = "saltshakersmall" - item_state = "saltshakersmall" desc = "While commonly used to repel some ghosts, it appears others are downright attracted to it." force = 0 throwforce = 0 @@ -472,8 +471,8 @@ if(!(ghostcall_CD > world.time)) ghostcall_CD = world.time + 3000 //deciseconds..5 minutes - user.visible_message("[user] kneels and begins to utter a prayer to [ticker.Bible_deity_name] while drawing a circle with salt!.", \ - "You kneel and begin a prayer to [ticker.Bible_deity_name] while drawing a circle!.") + user.visible_message("[user] kneels and begins to utter a prayer to [ticker.Bible_deity_name] while drawing a circle with salt!", \ + "You kneel and begin a prayer to [ticker.Bible_deity_name] while drawing a circle!") notify_ghosts("The Chaplain is calling ghosts to [get_area(src)] with [name]!", source = src) else to_chat(user, "You need to wait before using [src] again.") From 29c6a89f4538a4dcf68631b0d6a7f89c8e489287 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Tue, 24 Jan 2017 23:24:49 -0500 Subject: [PATCH 8/9] removes processed bread --- code/game/objects/items/weapons/holy_weapons.dm | 7 ------- 1 file changed, 7 deletions(-) diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index 6f7a00f69d0..975bc0fbca5 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -484,13 +484,6 @@ icon = 'icons/obj/food/food.dmi' icon_state = "baguette" desc = "a staple of worshipers of the Silentfather, this holy mime artifact has an odd effect on clowns." - force = 0 - throwforce = 0 - -/obj/item/weapon/nullrod/rosary/bread/New() - ..() - processing_objects.Add(src) - /obj/item/weapon/nullrod/rosary/bread/process() if(ishuman(loc)) From 55e58ef471a25c30de7029f58a7e54abe2e8ac8b Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Thu, 26 Jan 2017 10:39:48 -0500 Subject: [PATCH 9/9] honk --- code/game/objects/items/weapons/holy_weapons.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index 975bc0fbca5..78a88efdadb 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -492,7 +492,7 @@ if(src == holder.l_hand || src == holder.r_hand) // Holding this in your hand will for(var/mob/living/carbon/human/H in range(5)) if(H.mind.assigned_role == "Clown") - H.AdjustSilence(10) + H.Silence(10) animate_fade_grayscale(H,20) if(prob(10)) to_chat(H, "Being in the presence of [holder]'s [src] is interfering with your honk!")