From dae4d37ebe654a593b1984c1a39a9f8d6ebbda99 Mon Sep 17 00:00:00 2001 From: Aranclanos Date: Thu, 27 Jun 2013 23:34:46 -0300 Subject: [PATCH] The attack() of cigarette packets is now updated to the storage procs and stuff. It will pick the first object of the contents instead of creating a new cigarette and generating issues. --- code/game/objects/items/weapons/storage/fancy.dm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 3c60005f754..d521ac63d1e 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -186,13 +186,11 @@ return if(M == user && user.zone_sel.selecting == "mouth" && contents.len > 0 && !user.wear_mask) - var/obj/item/clothing/mask/cigarette/W = new /obj/item/clothing/mask/cigarette(user) - reagents.trans_to(W, (reagents.total_volume/contents.len)) - user.equip_to_slot_if_possible(W, slot_wear_mask) - reagents.maximum_volume = 15 * contents.len - contents.len-- + var/obj/item/clothing/mask/cigarette/W = contents[1] + remove_from_storage(W, M) + M.equip_to_slot_if_possible(W, slot_wear_mask) + contents -= W user << "You take a cigarette out of the pack." - update_icon() else ..()