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

..

antagonist

Removes AOOC from non-team antags

2018-04-14 23:25:34 -05:00

area

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

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

dna

Removes old taur riding code

2018-04-21 11:01:44 -04:00

gamemodes

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

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

jobs

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

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

machinery

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

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

magic

…

mecha

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

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

objects

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

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

turfs

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

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

vehicles

…

verbs

POLARIS: Revamp logging to be consistent

2018-03-13 18:20:58 -04:00

atoms_movable_vr.dm

Lazily implements taur riding

2018-04-12 15:10:17 -04:00

atoms_movable.dm

Lazily implements taur riding

2018-04-12 15:10:17 -04:00

atoms.dm

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

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

base_turf.dm

…

json.dm

…

periodic_news.dm

…

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

socket_talk.dm

…

sound.dm

POLARIS: Port's /tg/'s current sound.dm, plus pref

2018-03-13 17:46:40 -04:00

supplyshuttle.dm

Arranges lots of things into planes (#5072)

2018-03-28 12:59:12 -07:00

trader_visit.dm

…

world.dm

Implemented basic GLOB and TGS3's DMAPI

2018-02-27 18:31:13 -05:00