mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-10 10:21:11 +00:00
Fixes cable dipping (#35724)
* dip cable sanity * open containers mob exclusion
This commit is contained in:
@@ -454,7 +454,7 @@ its easier to just keep the beam vertical.
|
||||
if(desc)
|
||||
to_chat(user, desc)
|
||||
|
||||
if(reagents && is_open_container() && !ismob(src) && !hide_own_reagents()) //is_open_container() isn't really the right proc for this, but w/e
|
||||
if(reagents && is_open_container() && !hide_own_reagents()) //is_open_container() isn't really the right proc for this, but w/e
|
||||
if(get_dist(user,src) > 3)
|
||||
to_chat(user, "<span class='info'>You can't make out the contents.</span>")
|
||||
else
|
||||
|
||||
@@ -130,7 +130,7 @@
|
||||
|
||||
/obj/item/incense_stick/afterattack(var/obj/reagentholder, var/mob/user)
|
||||
..()
|
||||
if(reagentholder.is_open_container() && !ismob(reagentholder) && reagentholder.reagents)
|
||||
if(reagentholder.is_open_container() && reagentholder.reagents)
|
||||
if(reagentholder.reagents.has_reagent(WATER) && lit)
|
||||
to_chat(user, "<span class='warning'>\The [src] fizzles as you dip it into \the [reagentholder].</span>")
|
||||
exting()
|
||||
|
||||
@@ -314,7 +314,7 @@ MATCHBOXES ARE ALSO IN FANCY.DM
|
||||
|
||||
/obj/item/clothing/mask/cigarette/afterattack(obj/reagentholder, mob/user as mob)
|
||||
..()
|
||||
if(reagentholder.is_open_container() && !ismob(reagentholder) && reagentholder.reagents)
|
||||
if(reagentholder.is_open_container() && reagentholder.reagents)
|
||||
if(reagentholder.reagents.has_reagent(SACID) || reagentholder.reagents.has_reagent(PACID)) //Dumping into acid, a dumb idea
|
||||
var/atom/new_butt = new type_butt(get_turf(reagentholder))
|
||||
transfer_fingerprints_to(new_butt)
|
||||
|
||||
@@ -1380,9 +1380,6 @@ Thanks.
|
||||
return
|
||||
return
|
||||
|
||||
/mob/living/is_open_container()
|
||||
return 1
|
||||
|
||||
/mob/living/proc/scoop_up(mob/M) //M = mob who scoops us up!
|
||||
if(!holder_type)
|
||||
return 0
|
||||
|
||||
@@ -10316,7 +10316,7 @@ var/global/list/tonio_doesnt_remove=list("tonio", "blood")
|
||||
if(!data["stored_phrase"])
|
||||
set_phrase(sanitize(speech.message))
|
||||
var/atom/container = holder.my_atom
|
||||
if(container.is_open_container())
|
||||
if(container.is_open_container() || ismob(container))
|
||||
container.visible_message("<span class='notice'>[bicon(container)] The solution fizzles for a moment.</span>", "You hear something fizzling for a moment.", "<span class='notice'>[bicon(container)] \The [container] replies something, but you can't hear them.</span>")
|
||||
if(!(container.flags & SILENTCONTAINER))
|
||||
playsound(container, 'sound/effects/bubbles.ogg', 20, -3)
|
||||
|
||||
@@ -587,7 +587,7 @@
|
||||
var/power = 0
|
||||
|
||||
/datum/chemical_reaction/fuelbomb/on_reaction(var/datum/reagents/holder, var/created_volume)
|
||||
if(holder.my_atom.is_open_container())
|
||||
if(holder.my_atom.is_open_container() || ismob(holder.my_atom))
|
||||
if(!is_in_airtight_object(holder.my_atom)) //Don't pop while ventcrawling.
|
||||
var/turf/location = get_turf(holder.my_atom.loc)
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
icon_state = "dropper[(reagents.total_volume ? 1 : 0)]"
|
||||
|
||||
/obj/item/weapon/reagent_containers/dropper/attack(var/mob/M, var/mob/user)
|
||||
if(!reagents.total_volume && M.is_open_container())
|
||||
if(!reagents.total_volume)
|
||||
to_chat(user, "<span class='warning'>That doesn't make much sense.</span>")
|
||||
return
|
||||
M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Squirt attempt with [src.name] by [user.name] ([user.ckey]). Reagents: [reagents.get_reagent_ids(1)]</font>")
|
||||
|
||||
Reference in New Issue
Block a user