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

# Conflicts:
#	code/modules/clothing/gloves/miscellaneous_vr.dm
#	code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	code/modules/vore/eating/bellymodes_vr.dm
#	config/custom_items.txt
#	config/example/motd.txt
#	icons/mob/human_face_or_vr.dmi
#	icons/mob/vore/taurs_vr.dmi
#	vorestation.dme

2018-04-20 09:03:58 -04:00

..

antagonism

…

general

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

2018-03-31 09:20:59 -04:00

global

Merge pull request #5093 from Neerti/3/21/2018_typing_fix

2018-03-23 21:40:00 -05:00

loadout

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

2018-04-20 09:03:58 -04:00

occupation

POLARIS: No string compare for assistants

2018-03-21 14:19:36 -04: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

Switch to defines for custom species stuff

2018-04-19 19:34:10 -04:00

_defines.dm

…

preference_setup.dm

Polaris Sync

2017-10-16 22:16:24 -04:00