From 04949b4a5ecdc1529ce8284744e9b77d1645b463 Mon Sep 17 00:00:00 2001 From: Kyani <65205627+EmeraldCandy@users.noreply.github.com> Date: Sat, 6 Jul 2024 17:29:06 -0400 Subject: [PATCH] Newspaper bap fix (#26112) * ddsadsa ddsadsa * Update pet.dm * Update pet.dm * Update code/modules/mob/living/simple_animal/friendly/pet.dm Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * early returns * early returns * Update code/modules/mob/living/simple_animal/friendly/pet.dm Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update code/modules/mob/living/simple_animal/friendly/pet.dm Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update code/modules/mob/living/simple_animal/friendly/pet.dm Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Signed-off-by: Charlie <69320440+hal9000PR@users.noreply.github.com> --------- Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Charlie <69320440+hal9000PR@users.noreply.github.com> Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com> Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> --- .../mob/living/simple_animal/friendly/pet.dm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/code/modules/mob/living/simple_animal/friendly/pet.dm b/code/modules/mob/living/simple_animal/friendly/pet.dm index 5c5003dcf21..4ab6c836090 100644 --- a/code/modules/mob/living/simple_animal/friendly/pet.dm +++ b/code/modules/mob/living/simple_animal/friendly/pet.dm @@ -8,12 +8,15 @@ hud_type = /datum/hud/corgi /mob/living/simple_animal/pet/attackby(obj/item/O, mob/user, params) - if(istype(O, /obj/item/newspaper)) - if(!stat) - user.visible_message("[user] baps [name] on the nose with the rolled up [O].") - spawn(0) - for(var/i in list(1,2,4,8,4,2,1,2)) - setDir(i) - sleep(1) - else + if(!istype(O, /obj/item/newspaper)) return ..() + var/obj/item/newspaper/paper = O + if(stat != CONSCIOUS || !paper.rolled) + return + user.visible_message("[user] baps [name] on the nose with the rolled up [O].") + spawn(0) + for(var/i in list(1, 2, 4, 8, 4, 2, 1, 2)) + setDir(i) + sleep(1) + +