Unknown b48efb138f More merge conflict fixes ...

I think I got them all.

2018-12-13 00:33:32 -05:00

..

antagonist

Merge pull request #5438 from PrismaticGynoid/infiltrator_aooc

2018-07-25 17:25:51 -04:00

area

Merge pull request #5733 from Neerti/area_initialize_fix

2018-11-04 18:42:42 -05: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

Fixes a runtime with radio.dm

2018-12-09 01:55:46 -05:00

machinery

More merge conflict fixes

2018-12-13 00:33:32 -05:00

magic

…

mecha

Merge pull request #4530 from VOREStation/upstream-merge-5643

2018-12-12 21:25:46 -05:00

objects

Merge pull request #4524 from VOREStation/upstream-merge-5715

2018-12-12 21:25:02 -05: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

Merge pull request #5665 from lbnesquik/Kates-Machinery-Port

2018-10-30 18:36:30 -04:00

supplyshuttle.dm

Removes empty file, gives the QM a control console again (Was replaced with an ordering console)

2018-08-02 20:00:23 -07:00

trader_visit.dm

…