From 4cf736bb5c2a80ce01d11ec61e2cf168f13ed39f Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Sat, 15 Aug 2015 11:12:43 +0200 Subject: [PATCH] Compilation fix. --- .../reagents/reagent_containers/food/drinks/bottle.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm index 535717bb52..5c557ce950 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm @@ -9,7 +9,7 @@ force = 5 var/smash_duration = 5 //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 - + var/obj/item/weapon/reagent_containers/glass/rag/rag = null var/rag_underlay = "rag" @@ -17,7 +17,6 @@ ..() if(isGlass) unacidable = 1 -/obj/item/weapon/reagent_containers/food/drinks/bottle/proc/smash(mob/living/target as mob, mob/living/user as mob) /obj/item/weapon/reagent_containers/food/drinks/bottle/Destroy() if(rag) rag.forceMove(src.loc) @@ -132,7 +131,7 @@ //Calculating duration and calculating damage. armor_block = target.run_armor_check(affecting, "melee") - + //force will counteract armour, but will never increase duration armor_duration = smash_duration + min(0, force - target.getarmor(affecting, "melee") + 10)