Neerti b93595c19f Merge branch 'master' into 9/4/2015_master_to_dev ...

Conflicts:
	code/game/jobs/job/security.dm
	code/modules/projectiles/guns/energy/nuclear.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	maps/colony-1.dmm
	maps/colony-5.dmm

2015-09-04 08:43:37 -04:00

..

dead

Merge remote-tracking branch 'upstream/dev' into 150705-SecretAdminDatums

2015-08-20 14:16:35 +02:00

freelook

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

2015-08-23 01:30:46 -04:00

language

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

2015-08-15 11:06:03 +02:00

living

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

2015-08-23 01:30:46 -04:00

new_player

Merge branch 'master' into 9/4/2015_master_to_dev

2015-09-04 08:43:37 -04:00

animations.dm

Refactors floating and magboot checks. Fixes #10256

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

death.dm

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

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

emote.dm

…

gender.dm

…

hear_say.dm

…

holder.dm

Minor holder refactor.

2015-08-13 17:31:42 +09:30

inventory.dm

…

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

Gluttonous var changes.

2015-08-22 03:33:18 +09:30

mob_helpers.dm

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

2015-08-18 18:05:16 +02:00

mob_movement.dm

Merge branch 'dev' into ofClicksAndCooldowns

2015-08-21 16:15:07 +03:00

mob_transformation_simple.dm

…

mob.dm

Merge branch 'dev' into ofClicksAndCooldowns

2015-08-21 16:15:07 +03:00

say.dm

…

transform_procs.dm

…

typing_indicator.dm

…

update_icons.dm

Fixes #9326

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