Jordie0608 0bf6f09969 Merge branch 'master' of https://github.com/tgstation/-tg-station into whocodesthecodemen ...

Conflicts:
	code/modules/admin/verbs/pray.dm

2015-06-16 17:24:20 +10:00

..

flavor_misc.dm

Readds wagging tail feature with WJohn's help on sprites

2015-06-13 20:34:38 -04:00

mapping.dm

Added department security spawn points and fixed dep sec spawning.

2015-05-16 22:20:31 +01:00

mobs.dm

Fixes admin stealth failing to be actual stealth due to href reading or and the pop-out window.

2015-05-20 09:26:26 -03:00

names.dm

Changes clown/mime naming to use preferences. Player will now choose their mime/clown name in the main preference screen and save it, instead of at roundstart.

2015-04-23 23:18:35 +02:00

objects.dm

toggle nuke and set sec level button, flamethrower logging

2015-06-16 17:19:56 +10:00