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

Conflicts:
	code/modules/mob/living/simple_animal/friendly/cat.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
	code/modules/mob/living/simple_animal/friendly/lizard.dm
	code/modules/mob/living/simple_animal/friendly/mouse.dm
	code/modules/mob/living/simple_animal/hostile/bees.dm

2015-04-08 19:10:20 +02:00

..

camera

…

dead

Initial say cleanup commit.

2015-03-18 19:23:31 +01:00

living

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

2015-04-08 19:10:20 +02:00

new_player

Merge pull request #8100 from Incoming5643/newbieguard

2015-03-09 02:29:09 -05:00

death.dm

…

interactive.dm

Fixes to SNPCs

2015-04-02 05:19:21 +11:00

inventory.dm

…

login.dm

…

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

Merge pull request #8291 from Xhuis/nerf_thermal_vision

2015-03-26 13:01:25 +11:00

mob_grab.dm

…

mob_helpers.dm

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

2015-03-23 16:51:03 +01:00

mob_movement.dm

Some adjustments:

2015-04-02 17:39:02 +02:00

mob_transformation_simple.dm

…

mob.dm

Giving simple_animal their own version of update_canmove(). This fixes small animals' density being always set to 1 by life().

2015-03-30 22:11:05 +02:00

say_readme.dm

Adds a verb_exclaim var. Fixes #8478.

2015-03-22 18:55:59 +01:00

say.dm

Moves chat toggles into their own variable.

2015-03-05 18:38:07 +01:00

transform_procs.dm

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

2015-03-23 16:51:03 +01:00

update_icons.dm

Monkeys can now wear hats! Monkeys can now also wear all masks, instead of the select few they had icons for (which have been removed, since they are no longer needed)

2015-03-26 15:23:52 +00:00