From 1f728f0f6c9815cfdb27124fd2d6eafda0ded653 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Mon, 10 Oct 2016 13:22:41 -0400 Subject: [PATCH] More vape refillers (#20821) * Added more reagent containers that can fuel vapes. God help us * Didn't even know that existed * Less memage --- code/game/objects/items/weapons/cigs_lighters.dm | 6 +++--- config/admins.txt | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index ae9fe307c69..7b5c25af4f0 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -580,7 +580,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /////////////// /obj/item/clothing/mask/vape name = "E-Cigarette" - desc = "A classy and highly sophisticated electronic cigarette, for classy and dignified gentlemen. A warning label reads \"Warning: do not fill with flamable materials\""//<<< i'd vape to that. + desc = "A classy and highly sophisticated electronic cigarette, for classy and dignified gentlemen. A warning label reads \"Warning: Do not fill with flammable materials.\""//<<< i'd vape to that. icon = 'icons/obj/clothing/masks.dmi' icon_state = null item_state = null @@ -607,7 +607,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM item_state = "[param_color]_vape" /obj/item/clothing/mask/vape/attackby(obj/item/O, mob/user, params) - if(istype(O, /obj/item/weapon/reagent_containers/glass)) + if(istype(O, /obj/item/weapon/reagent_containers) && (O.flags & OPENCONTAINER)) if(reagents.total_volume < chem_volume) if(O.reagents.total_volume > 0) O.reagents.trans_to(src,25) @@ -672,7 +672,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/vape/equipped(mob/user, slot) if(slot == slot_wear_mask) if(!screw) - user << "You start puffing on that dank vape" + user << "You start puffing on the vape." reagents.set_reacting(TRUE) START_PROCESSING(SSobj, src) else //it will not start if the vape is opened. diff --git a/config/admins.txt b/config/admins.txt index 8be65927ee9..1930f4d68f0 100644 --- a/config/admins.txt +++ b/config/admins.txt @@ -120,3 +120,4 @@ SnipeDragon = Game Master Fjeld = Game Master kevinz000 = Game Master TrustyGun = Game Master +Cyberboss = Game Master \ No newline at end of file