mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-29 08:08:49 +01:00
[MIRROR] Fixed some smoking pipe and cigarette bugs and copypasta. [MDB IGNORE] (#10690)
* Fixed some smoking pipe and cigarette bugs and copypasta. (#63908) * Fixed some smoking pipe bugs and copypasta. * Fixed some smoking pipe and cigarette bugs and copypasta. * Fixing dat code doe Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
This commit is contained in:
SkyratBot
co-authored by
Ghom
GoldenAlpharex
Ghom
GoldenAlpharex
parent
958ef94622
commit
356f07db04
@@ -184,17 +184,23 @@ CIGARETTE PACKETS ARE IN FANCY.DM
|
||||
return (TOXLOSS|OXYLOSS)
|
||||
|
||||
/obj/item/clothing/mask/cigarette/attackby(obj/item/W, mob/user, params)
|
||||
if(lit || smoketime <= 0)
|
||||
if(lit)
|
||||
return ..()
|
||||
|
||||
var/lighting_text = W.ignition_effect(src, user)
|
||||
if(!lighting_text)
|
||||
return ..()
|
||||
|
||||
if(!reagents.has_reagent(/datum/reagent/oxygen)) //cigarettes need oxygen
|
||||
var/datum/gas_mixture/air = return_air()
|
||||
if(!air || !air.has_gas(/datum/gas/oxygen, 1)) //or oxygen on a tile to burn
|
||||
to_chat(user, span_notice("Your [name] needs a source of oxygen to burn."))
|
||||
return ..()
|
||||
|
||||
var/lighting_text = W.ignition_effect(src, user)
|
||||
if(lighting_text)
|
||||
if(smoketime > 0)
|
||||
light(lighting_text)
|
||||
else
|
||||
to_chat(user, span_warning("There is nothing to smoke!"))
|
||||
|
||||
/obj/item/clothing/mask/cigarette/afterattack(obj/item/reagent_containers/glass/glass, mob/user, proximity)
|
||||
. = ..()
|
||||
@@ -211,17 +217,21 @@ CIGARETTE PACKETS ARE IN FANCY.DM
|
||||
else
|
||||
to_chat(user, span_warning("[src] is full!"))
|
||||
|
||||
/obj/item/clothing/mask/cigarette/update_icon_state()
|
||||
. = ..()
|
||||
icon_state = lit ? icon_on : icon_off
|
||||
|
||||
/// Lights the cigarette with given flavor text.
|
||||
/obj/item/clothing/mask/cigarette/proc/light(flavor_text = null)
|
||||
if(lit)
|
||||
return
|
||||
if(!(flags_1 & INITIALIZED_1))
|
||||
icon_state = icon_on
|
||||
inhand_icon_state = icon_on
|
||||
return
|
||||
|
||||
lit = TRUE
|
||||
name = "lit [name]"
|
||||
|
||||
if(!(flags_1 & INITIALIZED_1))
|
||||
update_icon()
|
||||
return
|
||||
|
||||
attack_verb_continuous = string_list(list("burns", "singes"))
|
||||
attack_verb_simple = string_list(list("burn", "singe"))
|
||||
hitsound = 'sound/items/welder.ogg'
|
||||
@@ -248,8 +258,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
|
||||
|
||||
reagents.flags &= ~(NO_REACT)
|
||||
reagents.handle_reactions()
|
||||
icon_state = icon_on
|
||||
inhand_icon_state = icon_on
|
||||
update_icon()
|
||||
if(flavor_text)
|
||||
var/turf/T = get_turf(src)
|
||||
T.visible_message(flavor_text)
|
||||
@@ -264,14 +273,12 @@ CIGARETTE PACKETS ARE IN FANCY.DM
|
||||
/obj/item/clothing/mask/cigarette/extinguish()
|
||||
if(!lit)
|
||||
return
|
||||
name = copytext_char(name, 5) //5 == length_char("lit ") + 1
|
||||
attack_verb_continuous = null
|
||||
attack_verb_simple = null
|
||||
hitsound = null
|
||||
damtype = BRUTE
|
||||
force = 0
|
||||
icon_state = icon_off
|
||||
inhand_icon_state = icon_off
|
||||
update_icon()
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
reagents.flags |= NO_REACT
|
||||
lit = FALSE
|
||||
@@ -303,24 +310,22 @@ CIGARETTE PACKETS ARE IN FANCY.DM
|
||||
reagents.remove_any(to_smoke)
|
||||
|
||||
/obj/item/clothing/mask/cigarette/process(delta_time)
|
||||
var/turf/location = get_turf(src)
|
||||
var/mob/living/M = loc
|
||||
if(isliving(loc))
|
||||
M.IgniteMob()
|
||||
var/mob/living/user = isliving(loc) ? loc : null
|
||||
user?.IgniteMob()
|
||||
if(!reagents.has_reagent(/datum/reagent/oxygen)) //cigarettes need oxygen
|
||||
var/datum/gas_mixture/air = return_air()
|
||||
if(!air || !air.has_gas(/datum/gas/oxygen, 1)) //or oxygen on a tile to burn
|
||||
extinguish()
|
||||
return
|
||||
|
||||
location.PolluteTurf(pollution_type, 5, POLLUTION_PASSIVE_EMITTER_CAP) //SKYRAT EDIT ADDITION
|
||||
// SKYRAT EDIT ADDITION START - Pollution
|
||||
var/turf/location = get_turf(src)
|
||||
location.PolluteTurf(pollution_type, 5, POLLUTION_PASSIVE_EMITTER_CAP)
|
||||
// SKYRAT EDIT END
|
||||
|
||||
smoketime -= delta_time * (1 SECONDS)
|
||||
if(smoketime <= 0)
|
||||
new type_butt(location)
|
||||
if(ismob(loc))
|
||||
to_chat(M, span_notice("Your [name] goes out."))
|
||||
qdel(src)
|
||||
put_out(user)
|
||||
return
|
||||
|
||||
open_flame(heat)
|
||||
@@ -330,12 +335,19 @@ CIGARETTE PACKETS ARE IN FANCY.DM
|
||||
|
||||
/obj/item/clothing/mask/cigarette/attack_self(mob/user)
|
||||
if(lit)
|
||||
user.visible_message(span_notice("[user] calmly drops and treads on \the [src], putting it out instantly."))
|
||||
new type_butt(user.loc)
|
||||
new /obj/effect/decal/cleanable/ash(user.loc)
|
||||
qdel(src)
|
||||
put_out(user, TRUE)
|
||||
return ..()
|
||||
|
||||
/obj/item/clothing/mask/cigarette/proc/put_out(mob/user, done_early = FALSE)
|
||||
var/atom/location = drop_location()
|
||||
if(done_early)
|
||||
user.visible_message(span_notice("[user] calmly drops and treads on \the [src], putting it out instantly."))
|
||||
new /obj/effect/decal/cleanable/ash(location)
|
||||
else if(user)
|
||||
to_chat(user, span_notice("Your [name] goes out."))
|
||||
new type_butt(location)
|
||||
qdel(src)
|
||||
|
||||
/obj/item/clothing/mask/cigarette/attack(mob/living/carbon/M, mob/living/carbon/user)
|
||||
if(!istype(M))
|
||||
return ..()
|
||||
@@ -425,7 +437,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM
|
||||
list_reagents = null
|
||||
|
||||
/obj/item/clothing/mask/cigarette/rollie/Initialize(mapload)
|
||||
. = ..()
|
||||
name = pick(list(
|
||||
"bifta",
|
||||
"bifter",
|
||||
@@ -467,6 +478,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
|
||||
"torpedo",
|
||||
"zoot",
|
||||
"zooter"))
|
||||
. = ..()
|
||||
pixel_x = rand(-5, 5)
|
||||
pixel_y = rand(-5, 5)
|
||||
|
||||
@@ -484,7 +496,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
|
||||
list_reagents = list(/datum/reagent/toxin/mindbreaker = 35, /datum/reagent/toxin/lipolicide = 15)
|
||||
|
||||
/obj/item/clothing/mask/cigarette/candy
|
||||
name = "Little Timmy's candy cigarette"
|
||||
name = "\improper Little Timmy's candy cigarette"
|
||||
desc = "For all ages*! Doesn't contain any amount of nicotine. Health and safety risks can be read on the tip of the cigarette."
|
||||
smoketime = 2 MINUTES
|
||||
icon_on = "candyon"
|
||||
@@ -576,56 +588,35 @@ CIGARETTE PACKETS ARE IN FANCY.DM
|
||||
smoketime = 0
|
||||
chem_volume = 200 // So we can fit densified chemicals plants
|
||||
list_reagents = null
|
||||
var/packeditem = FALSE
|
||||
///name of the stuff packed inside this pipe
|
||||
var/packeditem
|
||||
|
||||
/obj/item/clothing/mask/cigarette/pipe/Initialize(mapload)
|
||||
. = ..()
|
||||
name = "empty [initial(name)]"
|
||||
update_name()
|
||||
|
||||
/obj/item/clothing/mask/cigarette/pipe/Destroy()
|
||||
/obj/item/clothing/mask/cigarette/pipe/update_name()
|
||||
. = ..()
|
||||
name = packeditem ? "[packeditem]-packed [initial(name)]" : "empty [initial(name)]"
|
||||
|
||||
/obj/item/clothing/mask/cigarette/pipe/put_out(mob/user, done_early = FALSE)
|
||||
lit = FALSE
|
||||
if(done_early)
|
||||
user.visible_message(span_notice("[user] puts out [src]."), span_notice("You put out [src]."))
|
||||
|
||||
else
|
||||
if(user)
|
||||
to_chat(user, span_notice("Your [name] goes out."))
|
||||
packeditem = null
|
||||
update_icon()
|
||||
|
||||
inhand_icon_state = icon_off
|
||||
user?.update_inv_wear_mask()
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
return ..()
|
||||
|
||||
/obj/item/clothing/mask/cigarette/pipe/process(delta_time)
|
||||
if(isliving(loc))
|
||||
var/mob/living/living_smoker = loc
|
||||
living_smoker.IgniteMob()
|
||||
if(!reagents.has_reagent(/datum/reagent/oxygen)) //cigarettes need oxygen
|
||||
var/datum/gas_mixture/air = return_air()
|
||||
if(!air?.has_gas(/datum/gas/oxygen, 1)) //or oxygen on a tile to burn
|
||||
extinguish()
|
||||
return
|
||||
|
||||
smoketime -= delta_time * (1 SECONDS)
|
||||
if(smoketime <= 0)
|
||||
if(ismob(loc))
|
||||
var/mob/living/living_smoker = loc
|
||||
to_chat(living_smoker, span_notice("Your [name] goes out."))
|
||||
lit = FALSE
|
||||
icon_state = icon_off
|
||||
inhand_icon_state = icon_off
|
||||
living_smoker.update_inv_wear_mask()
|
||||
packeditem = FALSE
|
||||
name = "empty [initial(name)]"
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
return
|
||||
|
||||
open_flame(heat)
|
||||
if(reagents?.total_volume && COOLDOWN_FINISHED(src, drag_cooldown))
|
||||
COOLDOWN_START(src, drag_cooldown, dragtime)
|
||||
handle_reagents()
|
||||
|
||||
/obj/item/clothing/mask/cigarette/pipe/attackby(obj/item/thing, mob/user, params)
|
||||
if(!istype(thing, /obj/item/food/grown))
|
||||
var/lighting_text = thing.ignition_effect(src,user)
|
||||
if(!lighting_text)
|
||||
return ..()
|
||||
|
||||
if(smoketime > 0)
|
||||
light(lighting_text)
|
||||
else
|
||||
to_chat(user, span_warning("There is nothing to smoke!"))
|
||||
return
|
||||
return ..()
|
||||
|
||||
var/obj/item/food/grown/to_smoke = thing
|
||||
if(packeditem)
|
||||
@@ -637,32 +628,24 @@ CIGARETTE PACKETS ARE IN FANCY.DM
|
||||
|
||||
to_chat(user, span_notice("You stuff [to_smoke] into [src]."))
|
||||
smoketime = 13 MINUTES
|
||||
packeditem = TRUE
|
||||
name = "[to_smoke.name]-packed [initial(name)]"
|
||||
packeditem = to_smoke.name
|
||||
update_name()
|
||||
if(to_smoke.reagents)
|
||||
to_smoke.reagents.trans_to(src, to_smoke.reagents.total_volume, transfered_by = user)
|
||||
qdel(to_smoke)
|
||||
|
||||
|
||||
/obj/item/clothing/mask/cigarette/pipe/attack_self(mob/user)
|
||||
var/turf/location = get_turf(user)
|
||||
if(lit)
|
||||
user.visible_message(span_notice("[user] puts out [src]."), span_notice("You put out [src]."))
|
||||
lit = FALSE
|
||||
icon_state = icon_off
|
||||
inhand_icon_state = icon_off
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
var/atom/location = drop_location()
|
||||
if(packeditem && !lit)
|
||||
to_chat(user, span_notice("You empty [src] onto [location]."))
|
||||
new /obj/effect/decal/cleanable/ash(location)
|
||||
packeditem = null
|
||||
smoketime = 0
|
||||
reagents.clear_reagents()
|
||||
update_name()
|
||||
return
|
||||
|
||||
if(smoketime <= 0)
|
||||
return
|
||||
|
||||
to_chat(user, span_notice("You empty [src] onto [location]."))
|
||||
new /obj/effect/decal/cleanable/ash(location)
|
||||
packeditem = FALSE
|
||||
smoketime = 0
|
||||
reagents.clear_reagents()
|
||||
name = "empty [initial(name)]"
|
||||
return ..()
|
||||
|
||||
/obj/item/clothing/mask/cigarette/pipe/cobpipe
|
||||
name = "corn cob pipe"
|
||||
|
||||
Reference in New Issue
Block a user