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

..

food

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

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

glass

Updates chemistry colors

2015-04-28 09:23:39 +03:00

blood_pack.dm

…

borghydro.dm

Compilation fix.

2015-07-24 11:02:39 +02:00

dropper.dm

Removes *COVERSEYES

2015-08-18 17:06:49 -04:00

food.dm

Increases placement cells per turf from 16 to 64

2015-08-22 18:06:54 +02:00

glass.dm

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

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

hypospray.dm

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

2015-08-15 10:52:17 +02:00

pill.dm

Merge with dev-freeze.

2015-06-21 20:45:47 +09:30

spray.dm

Merge branch 'dev' into ofClicksAndCooldowns

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

syringes.dm

Rewrites shield handling

2015-08-26 10:39:31 -04:00