Water bottles (and other closed non-carbonated drinks) no longer explode when shaken (#7221)

This commit is contained in:
JohnWildkins
2019-10-25 06:33:41 -04:00
committed by Erki
parent 3142ce6627
commit b375519d09
4 changed files with 101 additions and 3 deletions

View File

@@ -29,9 +29,11 @@
playsound(loc,'sound/items/soda_shaking.ogg', rand(10,50), 1)
return
if(shaken)
boom(user)
else
open(user)
for(var/datum/reagent/R in reagents.reagent_list)
if(R.carbonated)
boom(user)
return
open(user)
/obj/item/weapon/reagent_containers/food/drinks/proc/open(mob/user as mob)
playsound(loc,'sound/effects/canopen.ogg', rand(10,50), 1)