PsiOmega ce30b00287 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/setup.dm
	icons/mob/items_righthand.dmi
	maps/exodus-1.dmm
	maps/exodus-5.dmm

2015-03-13 09:23:26 +01:00

..

dead

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

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

language

Split language.dm across multiple files.

2015-03-01 02:01:43 +10:30

living

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

2015-03-13 09:23:26 +01:00

new_player

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

2015-03-01 21:13:38 +01: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

Fixes #8231. Adds on_hear_radio proc for observers to add tracking.

2015-02-27 17:18:47 -05:00

holder.dm

Partial breathing refactor

2015-03-09 00:09:34 -04:00

inventory.dm

Fixes #8075

2015-02-18 23:55:21 -05:00

login.dm

…

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

Fixing compile issues, adjusted buckle code after a weird merge.

2015-03-07 11:52:14 +10:30

mob_grab.dm

Updates grabs

2015-02-17 23:40:51 -05:00

mob_helpers.dm

Synth medical sensors now report dead/alive status.

2015-03-02 13:04:02 +01:00

mob_movement.dm

Fixes space movement runtime

2015-03-09 03:32:18 -04:00

mob_transformation_simple.dm

…

mob.dm

Merge pull request #8443 from Baystation12/master

2015-03-11 19:37:19 +10:30

say.dm

Reverted "say" error helper

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

transform_procs.dm

Robot code clean up and fixes.

2015-03-10 13:37:20 +01:00

typing_indicator.dm

…

update_icons.dm

…