cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 12:29:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes chemical cartridge splashing

Browse Source 
- Fixes #11853
- Attempting to transfer reagents into the cartridge when it is closed will no longer splash the reagents.
This commit is contained in:
Atlantis
2016-01-01 01:43:53 +01:00
parent 8edf5cebc5
commit 9d1e6e017c
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers.dm
+9 -1
View File
@@ -135,7 +135,15 @@
return 1
/obj/item/weapon/reagent_containers/proc/standard_pour_into(var/mob/user, var/atom/target) // This goes into afterattack and yes, it's atom-level
if(!target.is_open_container() || !target.reagents)
if(!target.reagents)
return 0
// Ensure we don't splash beakers and similar containers.
if(!target.is_open_container() && istype(target, /obj/item/weapon/reagent_containers))
user << "<span class='notice'>\The [target] is closed.</span>"
return 1
// Otherwise don't care about splashing.
else if(!target.is_open_container())
return 0
if(!reagents || !reagents.total_volume)