Arokha Sieyes 30a8a3ce31 VS edit merges

2018-10-20 17:37:08 -04:00

..

antagonist

…

area

Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018

2018-09-27 18:01:09 -04:00

dna

Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018

2018-09-27 18:01:09 -04:00

gamemodes

VS edit merges

2018-10-20 17:37:08 -04:00

jobs

Merge pull request #4358 from VOREStation/aro-traitstats

2018-10-12 01:45:54 -04:00

machinery

Makes RCDs Clean Again

2018-10-16 14:17:44 -04:00

magic

…

mecha

Makes RCDs Clean Again

2018-10-16 14:17:44 -04:00

objects

Merge pull request #4408 from VOREStation/upstream-merge-5679

2018-10-16 14:50:40 -04:00

turfs

VS Changes to unsimulated.dm

2018-10-16 14:42:54 -04:00

vehicles

…

verbs

VS edit merges

2018-10-20 17:37:08 -04:00

atoms_movable_vr.dm

…

atoms_movable.dm

Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018

2018-09-27 18:01:09 -04:00

atoms.dm

Makes RCDs Clean Again

2018-10-16 14:17:44 -04:00

base_turf.dm

…

json.dm

…

periodic_news.dm

…

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

socket_talk.dm

…

sound.dm

Magazines improvements

2018-10-15 15:52:56 -04:00

supplyshuttle.dm

…

trader_visit.dm

…