Zuhayr 9d5f14298d Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	code/game/gamemodes/traitor/traitor.dm
	code/modules/mob/living/silicon/pai/pai.dm

2015-09-07 11:03:41 +09:30

..

dead

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

2015-09-07 11:03:41 +09:30

freelook

Fixes #10819

2015-08-23 14:34:58 -04:00

language

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-09-05 09:24:30 +02:00

living

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

2015-09-07 11:03:41 +09:30

new_player

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-08-22 15:28:49 +01:00

animations.dm

Refactors floating and magboot checks. Fixes #10256

2015-08-03 23:19:04 +10:00

death.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-27 10:20:20 +02:00

emote.dm

…

hear_say.dm

…

holder.dm

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

2015-08-31 16:17:24 +09:30

inventory.dm

Vent crawling now explicitly checks for equipped items.

2015-09-04 08:09:05 +02:00

login.dm

…

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-08-15 10:52:17 +02:00

mob_grab_specials.dm

Cleans up mob_grab.dm

2015-08-18 22:02:01 -04:00

mob_grab.dm

Cleans up mob_grab.dm

2015-08-18 22:02:01 -04:00

mob_helpers.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-08-18 18:05:16 +02:00

mob_movement.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-09-02 14:42:27 +02:00

mob_transformation_simple.dm

…

mob.dm

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

2015-08-29 16:53:07 +09:30

say.dm

…

transform_procs.dm

…

typing_indicator.dm

…

update_icons.dm

Fixes #9326

2015-07-26 14:57:49 -04:00