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

Conflicts:
	code/game/machinery/doors/windowdoor.dm
	code/game/mecha/mecha.dm
	code/game/objects/structures.dm
	code/game/turfs/simulated/walls.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/living_defense.dm

2014-12-05 22:02:01 +01:00

..

effects

Merge pull request #6130 from phil235/AttackMsgStandardizedFormat

2014-12-04 12:45:31 -06:00

items

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

2014-12-05 22:02:01 +01:00

structures

Merge pull request #6191 from phil235/RestrainedTableClimbingFix

2014-12-05 10:35:32 -06:00

empulse.dm

…

explosion.dm

Removes the unused explosion_recursive.dm and everything related to it, including the configuration option.

2014-11-27 14:28:20 -08:00

items.dm

Merge pull request #6130 from phil235/AttackMsgStandardizedFormat

2014-12-04 12:45:31 -06:00

objs.dm

Unwinded most of shit

2014-11-19 21:36:45 +03:00

structures.dm

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

2014-12-05 22:02:01 +01:00

weapons.dm

…