Aronai Sieyes ed525cef2c Merge pull request #4355 from VOREStation/upstream-merge-5650 ...

[MIRROR] Fix incorrect HUD/screen/hologram

2018-10-10 17:40:57 -04:00

..

antagonist

Merge pull request #5438 from PrismaticGynoid/infiltrator_aooc

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

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

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

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

jobs

Alter gateway access on 2 jobs

2018-10-08 15:33:48 -04:00

machinery

Merge pull request #4355 from VOREStation/upstream-merge-5650

2018-10-10 17:40:57 -04:00

magic

…

mecha

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

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

objects

Merge pull request #4316 from VOREStation/upstream-merge-5628

2018-10-08 20:29:08 -04:00

turfs

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

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

vehicles

…

verbs

Merge pull request #4166 from deathride58/characterdirectory

2018-09-27 19:35:53 -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

…

base_turf.dm

…

json.dm

…

periodic_news.dm

…

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

socket_talk.dm

…

sound.dm

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

2018-09-27 18:01:09 -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

…