From adf142fe3d9fd4d0e4de9283272b0ac45c661beb Mon Sep 17 00:00:00 2001 From: TatsumakiMagi Date: Sun, 4 Nov 2018 21:48:10 +0000 Subject: [PATCH] Updates rollie volume 100, processes all reagents, grammar correction, target icon update --- code/game/objects/items/weapons/cigs.dm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm index 03c3f636888..28d216c4cbd 100644 --- a/code/game/objects/items/weapons/cigs.dm +++ b/code/game/objects/items/weapons/cigs.dm @@ -64,7 +64,7 @@ LIGHTERS ARE IN LIGHTERS.DM /obj/item/clothing/mask/cigarette/fire_act() light() -/obj/item/clothing/mask/cigarette/attackby(obj/item/W as obj, mob/user as mob, params) +/obj/item/clothing/mask/cigarette/attackby(obj/item/W as obj, mob/user as mob, mob/living/carbon/target, params) ..() if(istype(W, /obj/item/weldingtool)) var/obj/item/weldingtool/WT = W @@ -89,7 +89,7 @@ LIGHTERS ARE IN LIGHTERS.DM else if(istype(W, /obj/item/melee/energy/sword/saber)) var/obj/item/melee/energy/sword/saber/S = W if(S.active) - light("[user] swings their [W], barely missing their nose. [user.p_they(TRUE)] light[user.p_s()] [user.p_their()] [name] in the process.") + light("[user] makes a violent slashing motion, barely missing [user.p_their()] nose as light flashes. [user.p_they(TRUE)] light[user.p_s()] [user.p_their()] [name] with [W] in the process.") else if(istype(W, /obj/item/assembly/igniter)) light("[user] fiddles with [W], and manages to light [user.p_their()] [name].") @@ -107,6 +107,7 @@ LIGHTERS ARE IN LIGHTERS.DM //can't think of any other way to update the overlays :< user.update_inv_wear_mask() + target.update_inv_wear_mask() user.update_inv_l_hand() user.update_inv_r_hand() return @@ -195,7 +196,8 @@ LIGHTERS ARE IN LIGHTERS.DM if(reagents && reagents.total_volume) // check if it has any reagents at all if(is_being_smoked) // if it's being smoked, transfer reagents to the mob var/mob/living/carbon/C = loc - reagents.trans_to(C, REAGENTS_METABOLISM) + for (var/datum/reagent/R in reagents.reagent_list) + reagents.trans_to(C, REAGENTS_METABOLISM) if(!reagents.total_volume) // There were reagents, but now they're gone to_chat(C, "Your [name] loses its flavor.") else // else just remove some of the reagents @@ -232,7 +234,7 @@ LIGHTERS ARE IN LIGHTERS.DM throw_speed = 0.5 item_state = "spliffoff" smoketime = 180 - chem_volume = 50 + chem_volume = 100 /obj/item/clothing/mask/cigarette/rollie/New() ..()