From: Mario <zacjardine@y7mail.com>
Date: Sat, 25 Nov 2017 02:25:05 +0000 (+0000)
Subject: Merge branch 'DefaultUser/func_button_dont_accumulate_dmg' into 'master'
X-Git-Tag: xonotic-v0.8.5~147
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=aa0676b6956aa549117b240abb8dd639b40b3680;hp=467b2f00681c5fe71aa1a836778b1d49970ccf61

Merge branch 'DefaultUser/func_button_dont_accumulate_dmg' into 'master'

Update func_button flags for radiant

See merge request xonotic/xonotic-maps.pk3dir!105
---

diff --git a/scripts/entities.ent b/scripts/entities.ent
index 0827c12e..b3b51683 100644
--- a/scripts/entities.ent
+++ b/scripts/entities.ent
@@ -130,6 +130,7 @@ When a button is touched by a player, it moves in the direction set by the &quot
 <real key="health" name="health">(default 0) if set to any non-zero value, the button must take damage (any amount) to activate.</real>
 -------- SPAWNFLAGS --------
 <flag key="NOSPLASH" name="NOSPLASH" bit="8">if set, splash damage cannot activate the door, only direct damage can (requires health to be set)</flag>
+<flag key="DONTACCUMULATEDMG" name="DONTACCUMULATEDMG" bit="7">if set, all the damage needs to be done in one hit (requires health to be set)</flag>
 </group>
 
 <group name="func_conveyor" color="0 .5 .8">