[MIRROR] Fixes Vape Pen (e-cig) reagent spam (#5296)
* Fixes Vape Pen (e-cig) reagent spam * Update cigs_lighters.dm
This commit is contained in:
committed by
Poojawa
parent
d1be1ea28a
commit
5c16755e58
@@ -785,14 +785,14 @@ CIGARETTE PACKETS ARE IN FANCY.DM
|
||||
//open flame removed because vapes are a closed system, they wont light anything on fire
|
||||
|
||||
if(super && vapetime > 3)//Time to start puffing those fat vapes, yo.
|
||||
var/datum/effect_system/smoke_spread/chem/s = new
|
||||
s.set_up(reagents, 1, loc, silent=TRUE)
|
||||
var/datum/effect_system/smoke_spread/chem/smoke_machine/s = new
|
||||
s.set_up(reagents, 1, 24, loc)
|
||||
s.start()
|
||||
vapetime = 0
|
||||
|
||||
if((obj_flags & EMAGGED) && vapetime > 3)
|
||||
var/datum/effect_system/smoke_spread/chem/s = new
|
||||
s.set_up(reagents, 4, loc, silent=TRUE)
|
||||
var/datum/effect_system/smoke_spread/chem/smoke_machine/s = new
|
||||
s.set_up(reagents, 4, 24, loc)
|
||||
s.start()
|
||||
vapetime = 0
|
||||
if(prob(5))//small chance for the vape to break and deal damage if it's emagged
|
||||
@@ -807,4 +807,4 @@ CIGARETTE PACKETS ARE IN FANCY.DM
|
||||
return
|
||||
|
||||
if(reagents && reagents.total_volume)
|
||||
hand_reagents()
|
||||
hand_reagents()
|
||||
@@ -17,7 +17,7 @@
|
||||
var/max_range = 3 // displayed max range is 3 * max range
|
||||
|
||||
/datum/effect_system/smoke_spread/chem/smoke_machine/set_up(datum/reagents/carry, setting=1, efficiency=10, loc)
|
||||
amount = setting * 3
|
||||
amount = setting
|
||||
carry.copy_to(chemholder, 20)
|
||||
carry.remove_any(amount * 16 / efficiency)
|
||||
location = loc
|
||||
@@ -72,7 +72,7 @@
|
||||
var/smoke_test = locate(/obj/effect/particle_effect/smoke) in T
|
||||
if(on && !smoke_test)
|
||||
var/datum/effect_system/smoke_spread/chem/smoke_machine/smoke = new()
|
||||
smoke.set_up(reagents, setting, efficiency, T)
|
||||
smoke.set_up(reagents, setting*3, efficiency, T)
|
||||
smoke.start()
|
||||
|
||||
/obj/machinery/smoke_machine/attackby(obj/item/I, mob/user, params)
|
||||
|
||||
Reference in New Issue
Block a user