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

Conflicts:
	.travis.yml
	code/modules/mob/living/living.dm
	code/modules/mob/mob_grab.dm

2015-09-02 14:58:13 +02:00

..

dead

Makes observers use forceMove.

2015-08-23 17:45:46 +02:00

freelook

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

2015-08-24 10:31:30 +02:00

language

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

2015-09-01 11:22:10 +09:30

living

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

2015-09-02 14:58:13 +02:00

new_player

Adds a new set of hair and facial hair

2015-08-27 14:47:02 -04:00

animations.dm

Refactors floating and magboot checks. Fixes #10256

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

death.dm

…

emote.dm

…

gender.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

Shuffles de-equipping logic.

2015-08-24 14:24:31 +02:00

login.dm

…

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and

2015-08-16 06:05:21 -07:00

mob_grab_specials.dm

Cleans up mob_grab.dm

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

mob_grab.dm

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

2015-09-02 14:58:13 +02:00

mob_helpers.dm

Synth access and icon update changes.

2015-08-20 12:40:08 +02:00

mob_movement.dm

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

2015-09-02 14:58:13 +02:00

mob_transformation_simple.dm

…

mob.dm

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

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

say.dm

…

transform_procs.dm

…

typing_indicator.dm

…

update_icons.dm

…