Adds Arousal as a Damage Type (#204)

Browse Source

* 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

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

code/citadel/icons/objects.dmi

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.0 KiB