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

Conflicts:
	code/game/objects/items/weapons/storage/fancy.dm
	code/modules/mob/living/carbon/human/life.dm

2015-03-20 08:44:52 +01:00

..

area

Makes radiation shielded an area flag

2015-03-17 18:54:45 -07:00

dna

…

gamemodes

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

2015-03-20 08:44:52 +01:00

jobs

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

2015-03-20 08:44:52 +01:00

machinery

Merge pull request #8461 from comma/biofluff

2015-03-18 02:55:05 +10:30

magic

…

mecha

Allows unconscious/dead exosuit pilots to be removed if maintenance protocols are enabled.

2015-03-10 02:47:54 -04:00

objects

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

2015-03-20 08:44:52 +01:00

turfs

Makes starlight strength configurable.

2015-02-24 16:12:07 +01:00

vehicles

…

verbs

'Who' verb now shows the age of players on the server for admins

2015-03-09 14:20:31 +03:00

asteroid.dm

…

atoms_movable.dm

…

atoms.dm

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

2015-03-13 09:23:26 +01:00

json.dm

…

periodic_news.dm

…

response_team.dm

Makes available ERT species a config option.

2015-03-08 15:45:52 +01:00

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

Replaces stool structures with stool items

2015-02-18 01:06:00 -05:00