volas e4e8ef3392 Merge remote-tracking branch 'upstream/dev' into admin_stuff ...

Conflicts:
	code/modules/admin/admin_verbs.dm

2015-03-09 18:11:10 +03:00

..

area

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

2015-02-24 13:09:05 +01:00

dna

…

gamemodes

Merge pull request #8367 from mwerezak/cult-conversion

2015-03-06 11:57:03 +03:00

jobs

Merge pull request #8328 from PsiOmegaDelta/LessIsMore

2015-03-03 10:21:16 +03:00

machinery

Projectile effects - Part 3

2015-03-09 22:17:34 +13:00

magic

…

mecha

Allows exosuits to interface with adjacent airlock controllers and buttons.

2015-02-21 20:54:01 -05:00

objects

Merge pull request #8387 from PsiOmegaDelta/ChangeAppearance

2015-03-09 13:42:19 +03: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

Third refactor for examine system! This time we go back to atom-var based system, but because strings are tabled, it's apparently okay.

2015-02-20 08:04:17 -05: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

Rewriting the /obj/effect/glowshroom into a more general system.

2015-02-04 10:49:09 +10:30

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

Replaces stool structures with stool items

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