Jordie0608 26ca19e07d Merge branch 'master' of https://github.com/tgstation/-tg-station into tfwyoubreakyourownfix ...

Conflicts:
	code/modules/mining/mine_items.dm

2015-04-17 18:02:45 +10:00

..

camera

…

dead

Merge pull request #8983 from MrStonedOne/patch-7

2015-04-16 18:19:28 +10:00

living

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

2015-04-17 18:02:45 +10:00

new_player

…

death.dm

…

interactive.dm

Fixes a missing /proc/

2015-04-12 03:18:10 +10: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

Adds Abduction Mode

2015-04-13 18:40:15 +02:00

mob_movement.dm

Some adjustments:

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

mob_transformation_simple.dm

…

mob.dm

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

2015-04-16 23:44:12 +02:00

say_readme.dm

Adds a verb_exclaim var. Fixes #8478.

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

say.dm

…

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