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

..

antagonist

Correctly intends a world-message.

2015-09-10 08:05:35 +02:00

area

resolves issue with space and unsimulated turfs being odd and dark

2015-08-30 15:27:04 +10:00

dna

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-17 13:05:58 +02:00

gamemodes

Merge remote-tracking branch 'upstream/dev' into 150907-UplinkUses

2015-09-09 08:18:26 +02:00

jobs

Merge pull request #11002 from Sligneris/patch-1

2015-09-05 17:29:16 +02:00

machinery

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

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

magic

…

mecha

Merge pull request #10672 from mwerezak/frag-grenade

2015-09-07 14:12:27 +09:30

objects

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

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

turfs

Merge pull request #10672 from mwerezak/frag-grenade

2015-09-07 14:12:27 +09:30

vehicles

…

verbs

…

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

atoms_movable.dm

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

2015-08-14 08:34:42 +02:00

atoms.dm

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

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

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

json.dm

…

periodic_news.dm

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

response_team.dm

Merge pull request #10266 from PsiOmegaDelta/150722-TagPairs

2015-09-07 13:57:09 +09:30

shuttle_engines.dm

…

skincmd.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

fix #10617

2015-08-13 21:01:46 +01:00