cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-13 08:03:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix prayer breads (#23056)

Browse Source
This commit is contained in:
Farie82
2023-10-30 20:03:47 +01:00
committed by GitHub
parent a7568f73b4
commit 2d23ee4aaa
2 changed files with 39 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__HELPERS/AnimationLibrary.dm
+6 -1
View File
@@ -8,7 +8,12 @@
if(!istype(A) && !isclient(A))
return
A.color = null
animate(A, color = MATRIX_GREYSCALE, time = time, easing = SINE_EASING)
animate(A, color = MATRIX_GREYSCALE, time = time, easing = SINE_EASING, flags = ANIMATION_PARALLEL)
/proc/animate_fade_colored(atom/A, time = 5)
if(!istype(A) && !isclient(A))
return
animate(A, color = null, time = time, easing = SINE_EASING, flags = ANIMATION_PARALLEL)
/proc/animate_melt_pixel(atom/A)
if(!istype(A))
code/game/objects/items/weapons/holy_weapons.dm
+33 -10
View File
@@ -611,19 +611,42 @@
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."
var/list/smited_clowns
/obj/item/nullrod/rosary/bread/equipped(mob/user, slot, initial = FALSE)
. = ..()
if(ishuman(user) && (slot == SLOT_HUD_LEFT_HAND || slot == SLOT_HUD_RIGHT_HAND))
START_PROCESSING(SSobj, src)
else
STOP_PROCESSING(SSobj, src)
/obj/item/nullrod/rosary/bread/dropped(mob/user, silent)
. = ..()
STOP_PROCESSING(SSobj, src)
/obj/item/nullrod/rosary/bread/Destroy()
STOP_PROCESSING(SSobj, src)
for(var/clown in smited_clowns)
unsmite_clown(clown)
return ..()
/obj/item/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
if(src == holder.l_hand || src == holder.r_hand)
for(var/mob/living/carbon/human/H in range(5, loc))
if(H.mind.assigned_role == "Clown")
H.Silence(20 SECONDS)
animate_fade_grayscale(H,20)
if(prob(10))
to_chat(H, "<span class='userdanger'>Being in the presence of [holder]'s [src] is interfering with your honk!</span>")
var/mob/living/carbon/human/holder = loc
//would like to make the holder mime if they have it in on thier person in general
for(var/mob/living/carbon/human/H in range(5, loc))
if(H.mind.assigned_role == "Clown" && !LAZYACCESS(smited_clowns, H))
LAZYSET(smited_clowns, H, TRUE)
H.Silence(20 SECONDS)
animate_fade_grayscale(H, 2 SECONDS)
addtimer(CALLBACK(src, PROC_REF(unsmite_clown), H), 20 SECONDS)
if(prob(10))
to_chat(H, "<span class='userdanger'>Being in the presence of [holder]'s [src] is interfering with your honk!</span>")
/obj/item/nullrod/rosary/bread/proc/unsmite_clown(mob/living/carbon/human/hell_spawn)
animate_fade_colored(hell_spawn, 2 SECONDS)
LAZYREMOVE(smited_clowns, hell_spawn)
/obj/item/nullrod/missionary_staff
name = "holy staff"