Bottles and cartons now smash when thrown, breaking the container and spilling the contents over whatever is hit. This includes ones made into molotov cocktails. (#15943)

This commit is contained in:
Pidgey
2021-07-08 22:33:12 +01:00
committed by GitHub
parent b949b1adc2
commit 64a0b9e83d
@@ -12,7 +12,7 @@
var/const/duration = 13 //Directly relates to the 'weaken' duration. Lowered by armor (i.e. helmets)
var/isGlass = 1 //Whether the 'bottle' is made of glass or not so that milk cartons dont shatter when someone gets hit by it
/obj/item/reagent_containers/food/drinks/bottle/proc/smash(mob/living/target, mob/living/user, ranged = 0)
/obj/item/reagent_containers/food/drinks/bottle/proc/smash(mob/living/target, mob/living/user, ranged = FALSE)
//Creates a shattering noise and replaces the bottle with a broken_bottle
var/new_location = get_turf(loc)
@@ -124,6 +124,11 @@
reagents.reaction(M, REAGENT_TOUCH)
reagents.clear_reagents()
/obj/item/reagent_containers/food/drinks/bottle/throw_impact(atom/target,mob/thrower)
..()
SplashReagents(target)
smash(target, thrower, ranged = TRUE)
/obj/item/reagent_containers/food/drinks/bottle/decompile_act(obj/item/matter_decompiler/C, mob/user)
if(!reagents.total_volume)
C.stored_comms["glass"] += 3
@@ -345,11 +350,10 @@
if(istype(R, A))
firestarter = 1
break
SplashReagents(target)
..()
if(firestarter && active)
target.fire_act()
new /obj/effect/hotspot(get_turf(target))
..()
/obj/item/reagent_containers/food/drinks/bottle/molotov/attackby(obj/item/I, mob/user, params)
if(is_hot(I) && !active)