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

Conflicts:
	code/_onclick/hud/plane_master.dm
	code/modules/lighting/lighting_object.dm

2017-03-15 18:53:09 -07:00

..

__DATASTRUCTURES

…

__DEFINES

Fixes lighting of pixel shifted objects and reverts the hacky memleak fix + other lighting fixes (#24963)

2017-03-14 19:27:23 +01:00

__HELPERS

Fixes lighting of pixel shifted objects and reverts the hacky memleak fix + other lighting fixes (#24963)

2017-03-14 19:27:23 +01:00

__PATH_COMPATIBILITY

…

_globalvars

Mob Initialization (#24840)

2017-03-13 20:21:12 +01:00

_onclick

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

2017-03-15 18:53:09 -07:00

controllers

Fixes problems with icon overlays (#24530)

2017-03-14 19:28:05 +01:00

datums

Fix force_dismount (#25069)

2017-03-14 20:47:12 -04:00

game

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

2017-03-15 18:53:09 -07:00

js

…

modules

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

2017-03-15 18:53:09 -07:00

orphaned_procs

Generates messages when xeno eggs are delivered (#24852)

2017-03-13 21:58:20 +13:00

_compile_options.dm

Makes find_references go DEEP

2017-02-07 14:13:32 -05:00

world.dm

Mob Initialization (#24840)

2017-03-13 20:21:12 +01:00