PsiOmegaDelta e1aa05be02 Merge remote-tracking branch 'upstream/dev' into 150707-MoreOverlaysFewerStates ...

Conflicts:
	code/game/machinery/computer/security.dm

2015-07-28 09:16:34 +02:00

..

dead

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

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

freelook

Revert "get rid of mob.see_in_dark and species.darksight"

2015-07-22 15:14:40 +01:00

language

…

living

Merge remote-tracking branch 'upstream/dev' into 150707-MoreOverlaysFewerStates

2015-07-28 09:16:34 +02:00

new_player

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

2015-07-09 08:45:49 +02:00

animations.dm

…

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

…

inventory.dm

Fixes issues with raider equipping

2015-07-04 16:32:35 -04:00

login.dm

…

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

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

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

mob_grab.dm

…

mob_helpers.dm

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

2015-07-17 23:19:34 +02:00

mob_movement.dm

…

mob_transformation_simple.dm

…

mob.dm

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

2015-07-20 08:28:32 +02:00

say.dm

…

transform_procs.dm

…

typing_indicator.dm

…

update_icons.dm

Fixes #9326

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