Schnayy 460202cb6e Puts the trinket box back in after I had to comment it out in the gift vendor pr from conflict. ...

https://user-images.githubusercontent.com/26665154/36401962-a75e2e54-15a0-11e8-8be3-b8271d2c6ee7.png

Also fixes a minor bug of the heartbox held sprites being in the wrong location and thus having no held sprites.

2018-02-25 01:57:03 -06:00

..

__defines

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into steals_more_armor

2018-02-21 23:33:17 -06:00

_compatibility/509

…

_helpers

Merge pull request #4926 from VOREStation/vplk-gas-turbine

2018-02-23 13:16:56 -06:00

_onclick

Fix HUD creation and ventcrawling

2018-02-21 17:47:19 -05:00

ATMOSPHERICS

Consolidated digital t-valves type paths.

2018-02-22 15:11:55 -05:00

controllers

POLARIS?: Attempt to find the source of qdel'd images

2018-02-20 10:00:48 -05:00

datums

Removes the VeyMed license from Cargo

2018-02-23 22:04:00 -06:00

defines

…

game

Puts the trinket box back in after I had to comment it out in the gift vendor pr from conflict.

2018-02-25 01:57:03 -06:00

js

…

modules

Merge pull request #4941 from Mechoid/Turret_Fangs

2018-02-24 22:54:39 -08:00

unit_tests

Make scheduler and Master init order predictable and make unit tests wait until init is done before starting.

2018-02-05 15:50:13 -05:00

ZAS

…

_away_mission_tests.dm

…

_macros.dm

…

_map_tests.dm

…

_unit_tests.dm

…

global.dm

…

hub.dm

…

names.dm

…

stylesheet.dm

…

world.dm

Make scheduler and Master init order predictable and make unit tests wait until init is done before starting.

2018-02-05 15:50:13 -05:00