GinjaNinja32 d09cd2fe57 Merge remote-tracking branch 'upstream/dev' into span_class=notice ...

Conflicts:
	code/game/antagonist/station/rogue_ai.dm
	code/game/gamemodes/malfunction/Malf_Modules.dm
	code/game/jobs/job_controller.dm
	code/game/verbs/ooc.dm

2015-05-29 21:55:37 +01:00

..

blob

code/game, excluding code/game/machinery and code/game/objects

2015-05-29 21:51:27 +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

code/game, excluding code/game/machinery and code/game/objects

2015-05-29 21:51:27 +01:00

endgame

Adds turf processing.

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

epidemic

code/game, excluding code/game/machinery and code/game/objects

2015-05-29 21:51:27 +01:00

events

code/game, excluding code/game/machinery and code/game/objects

2015-05-29 21:51:27 +01: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

code/game, excluding code/game/machinery and code/game/objects

2015-05-29 21:51:27 +01:00

meme

code/game, excluding code/game/machinery and code/game/objects

2015-05-29 21:51:27 +01:00

meteor

Limits the ability of the SM to return to the station zlevel once ejected.

2015-05-21 01:02:30 -04:00

ninja

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

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

nuclear

code/game, excluding code/game/machinery and code/game/objects

2015-05-29 21:51:27 +01:00

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

code/game, excluding code/game/machinery and code/game/objects

2015-05-29 21:51:27 +01:00

game_mode.dm

Merge remote-tracking branch 'upstream/dev' into span_class=notice

2015-05-29 21:55:37 +01:00

gameticker.dm

Merge remote-tracking branch 'upstream/dev' into span_class=notice

2015-05-29 21:55:37 +01: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