CitadelStationBot 2d84e09851 Fixes plasma glass merging with normal glass

2017-07-08 09:45:46 -05:00

..

__DATASTRUCTURES

…

__DEFINES

Merge pull request #1901 from Citadel-Station-13/upstream-merge-28992

2017-07-06 11:22:24 -05:00

__HELPERS

July 5th TG sync (#1883)

2017-07-05 22:14:19 -05:00

_globalvars

Dreams while sleeping are now slightly longer on average and will contain more possibilities (#1940)

2017-07-07 23:48:49 -07:00

_js

…

_onclick

Adds Necropolis curses for cursed items in Necropolis ruins

2017-07-06 10:15:09 -05:00

citadel

Fixes Gamemode Voting & Map Edits (#1937)

2017-07-07 17:54:53 -04:00

controllers

Make timer debug info more robust (#1942)

2017-07-07 23:49:10 -07:00

datums

Adds Headphones!

2017-07-07 12:44:47 -05:00

game

Fixes plasma glass merging with normal glass

2017-07-08 09:45:46 -05:00

modules

Fixes plasma glass merging with normal glass

2017-07-08 09:45:46 -05:00

_compile_options.dm

July 5th TG sync (#1883)

2017-07-05 22:14:19 -05:00

world.dm

July 5th TG sync (#1883)

2017-07-05 22:14:19 -05:00