Repede 372e145108 Merge branch 'master' of https://github.com/VOREStation/VOREStation ...

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/seromi.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm

Fixed conflicts, fixed race racism money bs

2018-04-27 21:45:13 -04:00

..

antagonism

…

general

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-04252018

2018-04-25 17:23:33 -04:00

global

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-04252018

2018-04-25 17:23:33 -04:00

loadout

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2018-04-27 21:45:13 -04:00

occupation

Small fixes and ports discovered during merge. (#5138)

2018-04-04 17:35:15 -07:00

skills

…

traits

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15

2018-03-15 22:41:14 -04:00

vore

Fix Scree and Scree Accessories

2018-04-21 23:22:08 -04:00

_defines.dm

…

preference_setup.dm

…