cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compilation fix.

Browse Source
This commit is contained in:
PsiOmega
2015-08-15 11:12:43 +02:00
parent c81ad0964e
commit 4cf736bb5c
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/reagents/reagent_containers/food/drinks/bottle.dm
View File

@@ -9,7 +9,7 @@
force = 5 force = 5
var/smash_duration = 5 //Directly relates to the 'weaken' duration. Lowered by armor (i.e. helmets) 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/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/obj/item/weapon/reagent_containers/glass/rag/rag = null
var/rag_underlay = "rag" var/rag_underlay = "rag"
@@ -17,7 +17,6 @@
..() ..()
if(isGlass) unacidable = 1 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() /obj/item/weapon/reagent_containers/food/drinks/bottle/Destroy()
if(rag) if(rag)
rag.forceMove(src.loc) rag.forceMove(src.loc)
@@ -132,7 +131,7 @@
//Calculating duration and calculating damage. //Calculating duration and calculating damage.
armor_block = target.run_armor_check(affecting, "melee") armor_block = target.run_armor_check(affecting, "melee")
//force will counteract armour, but will never increase duration //force will counteract armour, but will never increase duration
armor_duration = smash_duration + min(0, force - target.getarmor(affecting, "melee") + 10) armor_duration = smash_duration + min(0, force - target.getarmor(affecting, "melee") + 10)