From 23df1fdc43fbb92c6ec3c58b3ea9f028e91ce753 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Tue, 14 Mar 2023 18:08:01 +1000 Subject: [PATCH] [MIRROR] Fixes a raunchy typo --- code/game/objects/items/weapons/storage/mre.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/game/objects/items/weapons/storage/mre.dm b/code/game/objects/items/weapons/storage/mre.dm index 390d4e4e8f..cf07aad638 100644 --- a/code/game/objects/items/weapons/storage/mre.dm +++ b/code/game/objects/items/weapons/storage/mre.dm @@ -235,8 +235,13 @@ MRE Stuff open(user) /obj/item/weapon/storage/mrebag/open(mob/user) +<<<<<<< HEAD if(!opened) to_chat(usr, "The pouch heats up as you break the vaccum seal.") +======= + if(!opened && !isobserver(user)) + to_chat(usr, "The pouch heats up as you break the vacuum seal.") +>>>>>>> 2acd96947a... Merge pull request #14684 from VOREStation/upstream-merge-9031 opened = 1 update_icon() . = ..()