Robustin 143e3fe2f4 Merge branch 'master' of https://github.com/tgstation/-tg-station into GangBangTest ...

# Conflicts:
#	icons/obj/ammo.dmi

2017-05-25 14:35:25 -04:00

..

__DATASTRUCTURES

[s] Moves sensitive data out of GLOB (#26039)

2017-04-12 19:53:13 +02:00

__DEFINES

Adds marker beacons to mining as a vendible item (#27589)

2017-05-24 18:31:44 -03:00

__HELPERS

Refactors explosions (#26361)

2017-05-24 18:44:08 -03:00

_globalvars

Removes the mess added with recalling with a message

2017-05-20 02:32:01 -03:00

_js

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00

_onclick

Merge branch 'master' into culttweaks2

2017-05-22 10:36:57 -04:00

controllers

Properly makes ID console jobslot open/close delays a config option (#27606)

2017-05-25 10:38:03 -03:00

datums

Crushers now actually mark (#27610)

2017-05-24 20:28:35 -03:00

game

Merge branch 'master' of https://github.com/tgstation/-tg-station into GangBangTest

2017-05-25 14:35:25 -04:00

modules

Merge branch 'master' of https://github.com/tgstation/-tg-station into GangBangTest

2017-05-25 14:35:25 -04:00

_compile_options.dm

Wizards are now at least 30 years old. Apprentices are 17 to 29. (#27245)

2017-05-15 09:01:38 -03:00

world.dm

World.dm Refactor (#27268)

2017-05-18 21:53:46 +10:00