PsiOmega 659b07415d Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/machinery/rechargestation.dm
	code/game/mecha/equipment/tools/medical_tools.dm
 	maps/exodus-1.dmm

2015-07-26 10:00:12 +02:00

..

antagonist

Reverting an accidentally committed test change.

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

area

Removes unlimited_power var

2015-07-19 00:33:17 -04:00

dna

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

2015-07-26 10:00:12 +02:00

gamemodes

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

2015-07-26 10:00:12 +02:00

jobs

Fixes #10129

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

machinery

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

2015-07-26 10:00:12 +02:00

magic

…

mecha

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

2015-07-26 10:00:12 +02:00

objects

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

2015-07-24 10:46:32 +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-07-26 10:00:12 +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