PsiOmega 5a1bf5a6a4 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/objects/items/toys.dm

2015-05-26 08:26:48 +02:00

..

antagonist

Rebalancing and adjusting divisors for all weapon damage values.

2015-05-17 16:51:55 +09:30

area

new object-based lighting system

2015-05-10 20:54:25 +01:00

dna

…

gamemodes

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

2015-05-26 08:26:48 +02:00

jobs

Adds engineering workboots

2015-05-23 23:00:26 -04:00

machinery

Airlock sounds

2015-05-23 22:59:18 -04:00

magic

…

mecha

Merge pull request #9390 from mwerezak/attack-animation

2015-05-21 06:52:30 +02:00

objects

Updates bear traps

2015-05-24 16:33:41 -04:00

turfs

Merge pull request #9390 from mwerezak/attack-animation

2015-05-21 06:52:30 +02:00

vehicles

…

verbs

…

asteroid.dm

…

atoms_movable.dm

new object-based lighting system

2015-05-10 20:54:25 +01:00

atoms.dm

new object-based lighting system

2015-05-10 20:54:25 +01:00

json.dm

…

periodic_news.dm

…

response_team.dm

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

2015-05-11 09:28:59 +02:00

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