cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-11 15:15:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update mre.dm

Browse Source
This commit is contained in:
Heroman3003
2023-03-14 17:59:20 +10:00
committed by GitHub
parent 9987e78f5a
commit 32e97ebda2
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/storage/mre.dm
-6
View File
@@ -234,15 +234,9 @@ MRE Stuff
/obj/item/weapon/storage/mrebag/attack_self(mob/user)
open(user)
<<<<<<< HEAD
/obj/item/weapon/storage/mrebag/open(mob/user)
if(!opened && !isobserver(user))
to_chat(usr, "<span class='notice'>The pouch heats up as you break the vaccum seal.</span>")
=======
/obj/item/storage/mrebag/open(mob/user)
if(!opened)
to_chat(usr, "<span class='notice'>The pouch heats up as you break the vacuum seal.</span>")
>>>>>>> 01d7833f135... Merge pull request #9031 from Verkister/patch-102
opened = 1
update_icon()
. = ..()