Adds Arousal as a Damage Type (#204)

* auto vote runtime error fix

* part 1

* conflict resolution

stop fighting, damnit

* includes

* species flags

* toggleable

* reagent recipes
This commit is contained in:
TalkingCactus
2017-02-06 23:57:29 -06:00
committed by Poojawa
parent fc18933fc8
commit cdea2c6766
22 changed files with 549 additions and 3 deletions
+4
View File
@@ -9,6 +9,8 @@
#define OXY "oxy"
#define CLONE "clone"
#define STAMINA "stamina"
//citadel code
#define AROUSAL "arousal"
//bitflag damage defines used for suicide_act
#define BRUTELOSS 1
@@ -16,6 +18,8 @@
#define TOXLOSS 4
#define OXYLOSS 8
#define SHAME 16
//citadel code
#define AROUSAL 32
#define STUN "stun"
#define WEAKEN "weaken"