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-07 00:57:29 -05:00
committed by Poojawa
parent fc18933fc8
commit cdea2c6766
22 changed files with 549 additions and 3 deletions
+2
View File
@@ -50,6 +50,8 @@
var/obj/screen/healths
var/obj/screen/healthdoll
var/obj/screen/internals
//citadel code
var/obj/screen/arousal
var/ui_style_icon = 'icons/mob/screen_midnight.dmi'
+4
View File
@@ -293,6 +293,10 @@
healths = new /obj/screen/healths()
infodisplay += healths
//citadel code
arousal = new /obj/screen/arousal()
infodisplay += arousal
healthdoll = new /obj/screen/healthdoll()
infodisplay += healthdoll