cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-10 07:41:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

More vape refillers (#20821)

Browse Source 
* Added more reagent containers that can fuel vapes. God help us

* Didn't even know that existed

* Less memage
This commit is contained in:
Cyberboss
2016-10-10 13:22:41 -04:00
committed by phil235
parent 803e23e132
commit 1f728f0f6c
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/cigs_lighters.dm
+3 -3
View File
@@ -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 << "<span class='notice'>You start puffing on that dank vape</span>"
user << "<span class='notice'>You start puffing on the vape.</span>"
reagents.set_reacting(TRUE)
START_PROCESSING(SSobj, src)
else //it will not start if the vape is opened.