Meghan-Rossi 604fd1b74f Resolve conflicts, fix compile errors

2019-12-19 17:49:21 +00:00

..

internal

Change various global species lists to GLOB versions, adds 2 more event subspecies.

2019-12-16 00:52:29 -05:00

subtypes

Fixes vorestation species without eyecolor being able to have eyecolor

2019-12-14 09:51:20 +10:00

blood.dm

Replaces lentext with length

2019-12-12 13:13:18 -05:00

misc.dm

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

organ_external_vr.dm

Adds Ability for Tails to Hide Bodyparts

2019-08-20 01:45:46 -04:00

organ_external.dm

513 Compatability

2019-12-12 10:40:27 -05:00

organ_icon.dm

Merge pull request #6565 from Heroman3003/eyecolor-fix

2019-12-15 14:49:27 -05:00

organ_internal.dm

…

organ_stump.dm

…

organ.dm

Resolve conflicts, fix compile errors

2019-12-19 17:49:21 +00:00

pain.dm

…

robolimbs_vr.dm

Resolve conflicts, fix compile errors

2019-12-19 17:49:21 +00:00

robolimbs.dm

Adds new FBP brand + sprite. (#6513)

2019-11-03 13:34:52 -05:00

wound.dm

…