KorPhaeron 2bb41cd5b3 Merge remote-tracking branch 'refs/remotes/tgstation/master' into control_wand ...

# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm

2016-03-01 19:18:29 -06:00

..

__DATASTRUCTURES

…

__DEFINES

* Cleaned bot patrol/summon logic regarding pathing retries

2016-02-22 17:56:34 +01:00

__HELPERS

add stack_trace() to unsorted.dm

2016-02-28 17:13:24 -06:00

__PATH_COMPATIBILITY

Add back path_compatibility.dm

2016-02-13 00:11:05 -06:00

_globalvars

Merge remote-tracking branch 'upstream/master' into uhhhhh

2016-02-19 18:32:07 +00:00

_onclick

Cyborgs can no longer activate the object in their active module when incapacitated. They also can't change their sensor mode (sechud, etc...) while incapacitated.

2016-02-29 23:09:13 +01:00

controllers

Merge pull request #15709 from Malkevin/cuffsandclean

2016-03-01 20:28:56 -03:00

datums

Merge pull request #15836 from phil235/SpellFix

2016-03-01 21:09:20 -03:00

game

Merge remote-tracking branch 'refs/remotes/tgstation/master' into control_wand

2016-03-01 19:18:29 -06:00

js

…

modules

Merge pull request #15838 from Incoming5643/feline_magnet_2

2016-03-01 22:01:24 -03:00

orphaned procs

Fixes Command Report paper sprite

2016-02-26 22:33:12 +01:00

_compile_options.dm

…

hub.dm

…

world.dm

Improves admin counting for irc

2016-02-09 21:37:44 -03:00