cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes cable dipping (#35724)

Browse Source 
* dip cable sanity

* open containers mob exclusion
This commit is contained in:
DeityLink
2024-01-08 16:47:56 +01:00
committed by GitHub
parent 051f51b5e4
commit 68d1dd0602
7 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/atoms.dm
View File

@@ -454,7 +454,7 @@ its easier to just keep the beam vertical.
if(desc) if(desc)
to_chat(user, 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) if(get_dist(user,src) > 3)
to_chat(user, "<span class='info'>You can't make out the contents.</span>") to_chat(user, "<span class='info'>You can't make out the contents.</span>")
else else

2
code/game/objects/items/incense.dm
View File

@@ -130,7 +130,7 @@
/obj/item/incense_stick/afterattack(var/obj/reagentholder, var/mob/user) /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) if(reagentholder.reagents.has_reagent(WATER) && lit)
to_chat(user, "<span class='warning'>\The [src] fizzles as you dip it into \the [reagentholder].</span>") to_chat(user, "<span class='warning'>\The [src] fizzles as you dip it into \the [reagentholder].</span>")
exting() exting()

2
code/game/objects/items/weapons/cigs_lighters.dm
View File

@@ -314,7 +314,7 @@ MATCHBOXES ARE ALSO IN FANCY.DM
/obj/item/clothing/mask/cigarette/afterattack(obj/reagentholder, mob/user as mob) /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 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)) var/atom/new_butt = new type_butt(get_turf(reagentholder))
transfer_fingerprints_to(new_butt) transfer_fingerprints_to(new_butt)

3
code/modules/mob/living/living.dm
View File

@@ -1380,9 +1380,6 @@ Thanks.
return return
return return
/mob/living/is_open_container()
return 1
/mob/living/proc/scoop_up(mob/M) //M = mob who scoops us up! /mob/living/proc/scoop_up(mob/M) //M = mob who scoops us up!
if(!holder_type) if(!holder_type)
return 0 return 0

2
code/modules/reagents/Chemistry-Reagents.dm
View File

@@ -10316,7 +10316,7 @@ var/global/list/tonio_doesnt_remove=list("tonio", "blood")
if(!data["stored_phrase"]) if(!data["stored_phrase"])
set_phrase(sanitize(speech.message)) set_phrase(sanitize(speech.message))
var/atom/container = holder.my_atom 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>") 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)) if(!(container.flags & SILENTCONTAINER))
playsound(container, 'sound/effects/bubbles.ogg', 20, -3) playsound(container, 'sound/effects/bubbles.ogg', 20, -3)

2
code/modules/reagents/Chemistry-Recipes.dm
View File

@@ -587,7 +587,7 @@
var/power = 0 var/power = 0
/datum/chemical_reaction/fuelbomb/on_reaction(var/datum/reagents/holder, var/created_volume) /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. if(!is_in_airtight_object(holder.my_atom)) //Don't pop while ventcrawling.
var/turf/location = get_turf(holder.my_atom.loc) var/turf/location = get_turf(holder.my_atom.loc)

2
code/modules/reagents/reagent_containers/dropper.dm
View File

@@ -23,7 +23,7 @@
icon_state = "dropper[(reagents.total_volume ? 1 : 0)]" icon_state = "dropper[(reagents.total_volume ? 1 : 0)]"
/obj/item/weapon/reagent_containers/dropper/attack(var/mob/M, var/mob/user) /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>") to_chat(user, "<span class='warning'>That doesn't make much sense.</span>")
return 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>") 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>")