PsiOmegaDelta 8da7141af1 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/simple_animal/simple_animal.dm

2015-07-14 08:11:11 +02:00

..

antagonist

Reverting an accidentally committed test change.

2015-07-14 05:19:01 +09:30

area

Fixes #9394

2015-07-10 00:21:17 +09:30

dna

…

gamemodes

Comment cleanup, adds TODOs for a bunch of minor things that the antag system may need to address before the end of freeze.

2015-07-14 05:19:01 +09:30

jobs

Fixes #10129

2015-07-14 05:18:58 +09:30

machinery

Merge pull request #10163 from PsiOmegaDelta/150713-Fixes

2015-07-13 09:35:58 -04:00

magic

…

mecha

Merge resolution with master.

2015-06-28 06:02:52 +09:30

objects

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

2015-07-14 08:11:11 +02:00

turfs

Wizards can no longer de-jaunt in turfs with dense objects.

2015-07-12 14:31:26 +02:00

vehicles

…

verbs

Removed the last few references to MODE, fixed some oversights with player_is_antag().

2015-07-14 05:19:00 +09:30

asteroid.dm

…

atoms_movable.dm

Wrenching times no longer runtime.

2015-06-28 18:17:53 +02:00

atoms.dm

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

2015-06-30 08:24:43 +02:00

json.dm

…

periodic_news.dm

…

response_team.dm

Antagonist system refactor. Fixes #9495, #9290, #9521, #8800 and #9465.

2015-06-21 18:08:26 +09:30

shuttle_engines.dm

…

skincmd.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

Supply shuttle and crate fixes

2015-05-23 16:15:04 +01:00