Unknown dca2e93209 VS: Conflict Resolution + VS Changes ...

Makes soft vendors work again
Conflict Resolution II
Fixes Shelter Capsule Vendor
Note to self remember quotations
Bad Lynx stop forgetting quotes!

2020-03-31 13:56:38 -04:00

..

__datastructures

…

__defines

Merge pull request #7020 from VOREStation/upstream-merge-6761

2020-03-29 17:51:20 -04:00

_compatibility/509

…

_global_vars

Makes language keys case sensitive, adds unit tests for language conflicts, fixes some language conflicts

2020-03-17 00:22:05 -04:00

_helpers

Fix error handler printing bogus src.loc and usr.loc info

2020-03-30 20:30:36 -04:00

_onclick

Merge pull request #6834 from Mechoid/RIGFixes

2020-03-17 01:06:31 -04:00

ATMOSPHERICS

VOREStation Specific: Always call update_use_power() instead of directly setting the use_power var.

2020-03-24 14:40:54 -04:00

controllers

Merge pull request #7054 from VOREStation/aro-sscleanup

2020-03-30 21:07:17 -04:00

datums

Distillery tweaks (#6892)

2020-03-25 16:36:26 -04:00

defines

Mergey Merge Polaris VChat

2020-03-29 15:37:43 -04:00

game

VS: Conflict Resolution + VS Changes

2020-03-31 13:56:38 -04:00

js

…

modules

VS: Conflict Resolution + VS Changes

2020-03-31 13:56:38 -04:00

unit_tests

Makes Travis fail PRs that runtime during init/unit testing.

2020-03-24 17:29:09 -04:00

ZAS

…

_away_mission_tests.dm

…

_macros_vr.dm

…

_macros.dm

…

_map_tests.dm

…

_unit_tests.dm

…

global_init.dm

Update code/global_init.dm

2020-03-17 00:43:49 -04:00

global_vr.dm

…

global.dm

…

hub.dm

…

names.dm

…

stylesheet.dm

VChat: Redone chat output done in Vue.js

2020-03-27 17:08:14 -04:00

world.dm

…