Hawk_v3 2cfaf95e78 Merge branch 'upMaster' into updates

2018-10-21 03:48:41 +01:00

..

antagonist

Merge pull request #5438 from PrismaticGynoid/infiltrator_aooc

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

area

Initial merge fixes

2018-10-03 20:08:55 +01:00

dna

Vore Updates and merges

2018-10-03 18:25:39 +01:00

gamemodes

Merge branch 'upMaster' into updates

2018-10-21 03:48:41 +01:00

jobs

Merge remote-tracking branch 'upstream/master'

2018-10-14 17:09:41 +01:00

machinery

Fixes a typo and corrects a map section

2018-10-16 22:23:44 +01:00

magic

…

mecha

Merge remote-tracking branch 'upstream/master'

2018-10-16 22:10:17 +01:00

objects

Merge branch 'upMaster' into updates

2018-10-21 03:48:41 +01:00

turfs

Merge remote-tracking branch 'upstream/master'

2018-10-16 22:10:17 +01:00

vehicles

…

verbs

VS edit merges

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

atoms_movable_vr.dm

Lazily implements taur riding

2018-04-12 15:10:17 -04:00

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

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

…

world.dm

…