Meghan-Rossi 604fd1b74f Resolve conflicts, fix compile errors

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

..

antagonism

Merge pull request #5828 from Cerebulon/traitorFix

2019-01-13 00:29:09 -05:00

general

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

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

global

Merge pull request #6548 from Meghan-Rossi/paifix

2019-11-29 19:49:03 -05:00

loadout

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

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

occupation

Changes Engineering to LHS

2019-04-25 20:09:09 -04:00

skills

…

traits

Merge pull request #6473 from Woodratt/09272019_weightbodytype

2019-10-06 03:34:05 -04:00

vore

Resolve conflicts, fix compile errors

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

_defines.dm

…

preference_setup_vr.dm

Resolve conflicts, fix compile errors

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

preference_setup.dm

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

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