From 9dbdbf7e1fdf8be9ad9cc88e2fe8ce3ee20fe6b5 Mon Sep 17 00:00:00 2001 From: zoomachina <97964454+zoomachina@users.noreply.github.com> Date: Thu, 7 Nov 2024 07:10:14 +0300 Subject: [PATCH] Prevent vape from being emptied if the cap isn't open (#87652) ## About The Pull Request If the cap isn't open, reagents won't be emptied ## Why It's Good For The Game It makes no sense and you constantly empty reagents by accident, this will hopefully prevent this ## Changelog :cl: fix: e-cigarettes can't be emptied if the cap isn't open /:cl: Co-authored-by: Ben10Omintrix <138636438+Ben10Omintrix@users.noreply.github.com> --- code/game/objects/items/cigarettes.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/objects/items/cigarettes.dm b/code/game/objects/items/cigarettes.dm index aab4f59fce3..5eddcf93d4b 100644 --- a/code/game/objects/items/cigarettes.dm +++ b/code/game/objects/items/cigarettes.dm @@ -949,6 +949,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM return TRUE /obj/item/vape/attack_self(mob/user) + if(!screw) + balloon_alert(user, "open the cap first!") + return if(reagents.total_volume > 0) to_chat(user, span_notice("You empty [src] of all reagents.")) reagents.clear_reagents()