PsiOmega ec4b8c78a1 Merge remote-tracking branch 'upstream/dev' into subsystems ...

Conflicts:
	code/game/machinery/camera/camera.dm
	code/modules/mob/mob.dm

2015-02-17 08:36:12 +01:00

..

dead

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

2015-02-03 22:28:53 +01:00

living

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

2015-02-17 08:36:12 +01:00

new_player

Adds a wardrobe structure to pick your underwear.

2015-02-16 11:17:22 +03:00

death.dm

Readds moonwalking.

2015-01-20 19:16:36 +10:30

emote.dm

correction of all copytext(sanitize(..)) to sanitize(copytext(..))

2015-02-01 22:54:56 +03:00

hear_say.dm

Merge master into dev.

2015-02-12 23:01:08 +10:30

holder.dm

Fixes #7976

2015-01-29 11:15:18 +10:30

inventory.dm

…

language.dm

Merge master into dev.

2015-02-12 23:01:08 +10:30

login.dm

…

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

Readds moonwalking.

2015-01-20 19:16:36 +10:30

mob_grab.dm

Adds species-specific comfort tweaks, skrell nutrition changes.

2015-01-20 19:12:35 +10:30

mob_helpers.dm

Conflict fix

2015-02-03 23:29:08 +03:00

mob_movement.dm

More cargo train fixes

2015-01-03 01:27:10 +13:00

mob_transformation_simple.dm

…

mob.dm

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

2015-02-17 08:36:12 +01:00

say.dm

Reverted "say" error helper

2015-01-09 03:56:58 +01:00

transform_procs.dm

AI latejoin

2015-02-02 17:59:57 +00:00

typing_indicator.dm

…

update_icons.dm

…