Novacat d4f7e752eb Merge pull request #4675 from VOREStation/upstream-merge-5828 ...

[MIRROR] Fixes antagonist options not appearing in preferences

2019-03-27 15:17:38 -04:00

..

__datastructures

…

__defines

Merge pull request #4675 from VOREStation/upstream-merge-5828

2019-03-27 15:17:38 -04:00

_compatibility/509

…

_global_vars

Conflict Resolution

2019-03-27 12:05:38 -04:00

_helpers

Merge pull request #4658 from VOREStation/upstream-merge-5812

2019-03-27 13:52:30 -04:00

_onclick

Resolves compile errors with the exception of map errors.

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

ATMOSPHERICS

Standardizes rotation verbs

2019-03-27 03:17:07 -04:00

controllers

Conflict Resolution

2019-03-27 12:05:38 -04:00

datums

Upgrades SDQL2 and refactors it to a datum

2019-03-27 11:50:49 -04:00

defines

Fixes PDA manifest excluding all non-syndie borgs (#5695)

2018-10-21 14:23:48 -04:00

game

Merge pull request #4665 from VOREStation/upstream-merge-5824

2019-03-27 14:12:46 -04:00

js

…

modules

Merge pull request #4675 from VOREStation/upstream-merge-5828

2019-03-27 15:17:38 -04:00

unit_tests

…

ZAS

Merges AI Branch into Master

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

_away_mission_tests.dm

…

_macros_vr.dm

…

_macros.dm

Adds Various Sounds, Looping Sound System

2019-03-27 03:55:21 -04:00

_map_tests.dm

…

_unit_tests.dm

…

global_vr.dm

…

global.dm

Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer

2019-03-26 23:58:26 -04:00

hub.dm

…

names.dm

…

stylesheet.dm

Merge branch 'master' into upstream-merge-5735

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

world.dm

Conflict Resolution

2019-03-27 12:05:38 -04:00