PsiOmegaDelta a7fa8cde49 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/clothing/spacesuits/void/merc.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/simple_animal/borer/borer_captive.dm
	code/modules/mob/mob_grab_specials.dm
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
	html/changelogs/.all_changelog.yml

2015-09-11 08:54:03 +02:00

..

dead

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

2015-09-07 11:31:19 +09:30

freelook

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

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

language

Cleans up living/say broadcast and verb logic

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

living

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

2015-09-11 08:54:03 +02:00

new_player

Added the Resomi.

2015-09-04 08:57:03 +09:30

animations.dm

Merge pull request #10420 from Kearel/sbike

2015-09-07 13:58:25 +09:30

death.dm

…

emote.dm

…

gender.dm

…

hear_say.dm

…

holder.dm

Added the Resomi.

2015-09-04 08:57:03 +09:30

inventory.dm

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

2015-09-07 11:31:19 +09:30

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

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

2015-09-11 08:54:03 +02:00

mob_grab.dm

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

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

mob_helpers.dm

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

2015-09-11 08:54:03 +02:00

mob_movement.dm

Merge pull request #10420 from Kearel/sbike

2015-09-07 13:58:25 +09:30

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

Languages now use alternative prefix keys.

2015-08-26 13:17:57 +02:00

transform_procs.dm

Rotates and otherwise cleans up map intercom usage.

2015-09-02 14:26:59 +02:00

typing_indicator.dm

…

update_icons.dm

…