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

..

effects

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

items

Allow reflector construction (#25084)

2017-03-14 20:46:56 -04:00

structures

Fixes sinks giving misleading messages when containers full (#25037)

2017-03-15 16:38:33 -04:00

buckling.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

empulse.dm

Closes the Pool. (#23150)

2017-01-22 16:00:23 -05:00

explosion.dm

Lagchecks removing from storage, reverts bluespace ore satchel limit (#24310)

2017-02-24 16:22:57 +13:00

items.dm

Adds support for weapons with reach (#24395)

2017-03-11 17:00:43 +13:00

obj_defense.dm

Fixes the fire overlay never being cut (#24354)

2017-02-23 09:01:21 +13:00

objs.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

radiation.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

structures.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

weapons.dm

…