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

..

blob

new object-based lighting system

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

calamity

Resolving bugs with spawn order and delays.

2015-03-21 11:49:42 +10:30

changeling

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

cult

Merge pull request #9390 from mwerezak/attack-animation

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

endgame

Adds turf processing.

2015-05-16 10:27:47 +02:00

epidemic

Gamemode refactor, lots of code shuffles, PR will have details.

2015-03-21 11:08:17 +10:30

events

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

extended

Gamemode refactor, lots of code shuffles, PR will have details.

2015-03-21 11:08:17 +10:30

heist

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

malfunction

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

meme

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

meteor

Adds Destroys.

2015-04-24 17:11:14 +02:00

ninja

Gamemode refactor, lots of code shuffles, PR will have details.

2015-03-21 11:08:17 +10:30

nuclear

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

revolution

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

2015-03-31 01:37:55 -04:00

sandbox

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

traitor

Gamemode refactor, lots of code shuffles, PR will have details.

2015-03-21 11:08:17 +10:30

wizard

Further description fixes

2015-03-30 01:17:57 +01:00

events.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

game_mode.dm

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

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

gameticker.dm

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

2015-05-18 17:50:48 +02:00

intercept_report.dm

…

newobjective.dm

Fixes captain's laser gun

2015-02-25 23:35:20 -05:00

objective.dm

Major sheet and material refactor.

2015-05-17 01:46:53 +09:30

setupgame.dm

Removes equip_e effect. Rewrites stripping, refactors cuffing. Fixes #8173.

2015-05-15 23:19:57 +09:30