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

Conflicts:
	code/modules/mob/living/simple_animal/friendly/corgi.dm

2014-12-03 18:59:32 +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

Fixes more span classes. Replaces some "for() show_message()" with "visible_message()". Adding a suicide message for slimes. Fixes simple_animal/corgi having two attackby procs.

2014-11-28 16:08:59 +01:00

weapons

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

2014-12-03 18:59:32 +01: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

Adds a new prize mech based on the mime mech.

2014-10-21 10:26:01 -05:00

trash.dm

Cleans up the trash.dm

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