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

..

devices

Merge pull request #6115 from CorruptComputer/pdashitstorm

2014-11-28 20:52:38 +03:00

robot

Merge pull request #6125 from MrPerson/span_classes_never_heard_of_them

2014-12-02 15:54:17 +03:00

stacks

Merge pull request #6130 from phil235/AttackMsgStandardizedFormat

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

weapons

Merge pull request #6034 from Jordie0608/whatwerethechancesofthishappening

2014-12-05 10:15:45 -06:00

apc_frame.dm

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

blueprints.dm

Fixes blueprint HTML injection exploit

2014-11-22 14:32:10 -03:00

bodybag.dm

Adding bluespace bodybags. Adding changelog.

2014-10-21 17:27:40 +02:00

candle.dm

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

crayons.dm

Prevented from using popups away from crayon, popup now updates properly, mime colours are properly shown.

2014-09-28 14:02:08 +04:00

documents.dm

-Removed some duplicate code

2014-05-04 16:18:48 -06:00

latexballoon.dm

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

2014-11-27 15:30:37 +03:00

shooting_range.dm

Changes many span classes.

2014-10-18 16:00:38 +02:00

toys.dm

Visible_message() now uses recursive_hear_check so mob inside something can see those messages. Fixes being able to see visible_message w/o seeing the src of it (happened when the src could see us but not the other way around), you no longer see visible_message from mobs inside closets for example.

2014-12-04 01:08:04 +01:00

trash.dm

Cleans up the trash.dm

2014-02-13 10:35:02 -05:00