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

Conflicts:
	code/modules/mob/living/carbon/alien/life.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/living/simple_animal/slime/life.dm

2015-03-20 19:32:16 +01:00

..

maploader

Allows setting an associative variable to null.

2014-12-22 16:27:23 +01:00

mission_code

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

2014-12-28 11:20:15 +03:00

bluespaceartillery.dm

Removing many instances of the no longer used second argument of message_admins() proc.

2014-10-05 01:29:30 +02:00

corpse.dm

slime from carbon to simple animal

2015-03-14 23:40:57 +01:00

exile.dm

Removed hilarious but useless sleep() in closets/boxes New()

2014-11-10 01:59:32 +01:00

gateway.dm

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

pamphlet.dm

…

trigger.dm

…

zlevel.dm

Makes the message when you're attacked slightly bigger for better visibility."

2015-03-12 23:15:54 +01:00