From a918c3663a604d160bc8483c08ee32ceaf977b54 Mon Sep 17 00:00:00 2001 From: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com> Date: Fri, 19 Aug 2022 21:01:49 -0400 Subject: [PATCH 1/3] STUPID --- yogstation.dme | 1 - yogstation/code/game/objects/items/shields.dm | 8 -------- 2 files changed, 9 deletions(-) delete mode 100644 yogstation/code/game/objects/items/shields.dm diff --git a/yogstation.dme b/yogstation.dme index 3f5423f42b33..9ea771104c0b 100644 --- a/yogstation.dme +++ b/yogstation.dme @@ -1015,7 +1015,6 @@ #include "code\game\objects\items\RSF.dm" #include "code\game\objects\items\scrolls.dm" #include "code\game\objects\items\sharpener.dm" -#include "code\game\objects\items\shields.dm" #include "code\game\objects\items\shooting_range.dm" #include "code\game\objects\items\shuttle_creator.dm" #include "code\game\objects\items\shuttle_upgrades.dm" diff --git a/yogstation/code/game/objects/items/shields.dm b/yogstation/code/game/objects/items/shields.dm deleted file mode 100644 index 5babfec3f192..000000000000 --- a/yogstation/code/game/objects/items/shields.dm +++ /dev/null @@ -1,8 +0,0 @@ -/obj/item/shield/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) - SEND_SIGNAL(src, COMSIG_ITEM_HIT_REACT, args) - if(transparent && (hitby.pass_flags & PASSGLASS)) - return FALSE - if(!is_A_facing_B(owner, hitby)) - return FALSE - owner.visible_message(span_danger("[owner] blocks [attack_text] with [src]!")) - return TRUE \ No newline at end of file From 3017fc65419bb6686def3e17185e654c9ea9603a Mon Sep 17 00:00:00 2001 From: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com> Date: Fri, 19 Aug 2022 21:15:55 -0400 Subject: [PATCH 2/3] Update yogstation.dme --- yogstation.dme | 1 - 1 file changed, 1 deletion(-) diff --git a/yogstation.dme b/yogstation.dme index 9ea771104c0b..a1b6e1d02a79 100644 --- a/yogstation.dme +++ b/yogstation.dme @@ -3446,7 +3446,6 @@ #include "yogstation\code\game\objects\items\plushes.dm" #include "yogstation\code\game\objects\items\premadepapers.dm" #include "yogstation\code\game\objects\items\sharpener.dm" -#include "yogstation\code\game\objects\items\shields.dm" #include "yogstation\code\game\objects\items\tool_switcher.dm" #include "yogstation\code\game\objects\items\tools.dm" #include "yogstation\code\game\objects\items\toys.dm" From 9a49ec222fb02fb8eb2643d69a3a825e74501dba Mon Sep 17 00:00:00 2001 From: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com> Date: Fri, 19 Aug 2022 21:23:51 -0400 Subject: [PATCH 3/3] FUCC --- yogstation.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/yogstation.dme b/yogstation.dme index a1b6e1d02a79..8bc5eaf97f48 100644 --- a/yogstation.dme +++ b/yogstation.dme @@ -1015,6 +1015,7 @@ #include "code\game\objects\items\RSF.dm" #include "code\game\objects\items\scrolls.dm" #include "code\game\objects\items\sharpener.dm" +#include "code\game\objects\items\shields.dm" #include "code\game\objects\items\shooting_range.dm" #include "code\game\objects\items\shuttle_creator.dm" #include "code\game\objects\items\shuttle_upgrades.dm"