Verkister b0199bb80e Merge branch 'master' of https://github.com/VOREStation/VOREStation into returnofthelongpup ...

# Conflicts:
#	icons/vore/custom_clothes_vr.dmi

2017-09-28 08:50:38 +03:00

..

antagonist

Brings back the aliens as they were when removed, minus huggers (until we can get a suitable replacement), for admins to use.

2017-09-03 01:46:08 -07:00

area

HOTFIX

2017-09-21 20:26:48 -04:00

dna

Enables dual coloring for ears.

2017-08-13 15:20:11 +03:00

gamemodes

HOTFIX

2017-09-21 20:26:48 -04:00

jobs

Bumps borgs up by one.

2017-09-24 11:28:46 -04:00

machinery

HOTFIX

2017-09-21 20:26:48 -04:00

magic

…

mecha

HOTFIX

2017-09-21 20:26:48 -04:00

objects

Brings back some slightly tweaked individual oties.

2017-09-23 14:24:40 +03:00

turfs

HOTFIX

2017-09-21 20:26:48 -04:00

vehicles

…

verbs

Polaris sync

2017-09-15 21:17:34 -04:00

atoms_movable.dm

Merge pull request #3775 from Neerti/9/8/2017_tg_maploader_port

2017-09-11 17:17:23 -04:00

atoms.dm

MERGE

2017-08-07 16:55:50 -04:00

base_turf.dm

…

json.dm

…

periodic_news.dm

…

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

socket_talk.dm

…

sound.dm

HOTFIX

2017-09-21 20:26:48 -04:00

supplyshuttle.dm

work

2017-09-04 21:52:47 -04:00

trader_visit.dm

…