Shophaune 7266f28757 Fix for duplicated loadout descriptions (#5694) ...

* Add files via upload

* Revert "Merge pull request #1 from Shophaune/plant-bag-ui-bug-fix"

This reverts commit 62a60d4f87774508621506b347c679191e1a242f, reversing
changes made to 6f909ce590.

* Borrowing Ibnesquik's descriptions to fix this issue quickly.

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

..

__datastructures

…

__defines

Ports Vote to SMC

2018-10-20 01:53:13 -04:00

_compatibility/509

…

_global_vars

Admin ticket system (for real this time)

2018-10-09 16:31:01 -04:00

_helpers

Merge pull request #4318 from lbnesquik/Kates-Nevrean-Fix

2018-10-11 23:15:12 -04:00

_onclick

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

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

ATMOSPHERICS

Merge pull request #4296 from VOREStation/phoron-scrubbing

2018-10-01 09:20:05 -04:00

controllers

VS edit merges

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

datums

Merge pull request #4432 from VOREStation/upstream-merge-5685

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

defines

…

game

Merge pull request #4431 from VOREStation/upstream-merge-5675

2018-10-20 17:58:12 -04:00

js

…

modules

Fix for duplicated loadout descriptions (#5694)

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

unit_tests

…

ZAS

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

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

_away_mission_tests.dm

…

_macros_vr.dm

…

_macros.dm

Ports /vg/ instrument frame work, adds client based sound pref

2018-09-05 03:35:34 -05:00

_map_tests.dm

…

_unit_tests.dm

…

global_vr.dm

…

global.dm

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

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

hub.dm

…

names.dm

…

stylesheet.dm

…

world.dm

Admin ticket system (for real this time)

2018-10-09 16:31:01 -04:00