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

..

ooc.dm

Update ooc.dm

2014-11-27 13:25:16 -08:00

suicide.dm

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

who.dm

I accidentally broke who for people without +ADMIN who were admins.

2013-08-31 13:39:47 -07:00