Spades 3021faa349 Merge pull request #4587 from VOREStation/upstream-merge-5777 ...

[MIRROR] Fixes laptops blocking people properly.

2019-03-04 11:43:46 -05:00

..

antagonist

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

area

Cleanup of numerous issues and oversights.

2019-02-25 16:24:51 +10:00

dna

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

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

gamemodes

Resolves compile errors with the exception of map errors.

2019-01-12 21:09:29 -05:00

jobs

Fixes a runtime with radio.dm

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

machinery

Merge pull request #4587 from VOREStation/upstream-merge-5777

2019-03-04 11:43:46 -05:00

magic

…

mecha

Merge branch 'master' into upstream-merge-5735

2019-01-14 11:20:55 -05:00

objects

Merge branch 'master' into upstream-merge-5757

2019-03-02 08:05:51 -05:00

turfs

[AI BRANCH] Attempt to fix Active Edge

2019-02-16 23:46:26 -05:00

vehicles

…

verbs

VS edit merges

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

atoms_movable_vr.dm

…

atoms_movable.dm

Merge pull request #5747 from Neerti/fulltile_window_improvements

2018-12-04 14:37:19 -05: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

…