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

..

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

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

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

cult

Reduced Hell Universe Lag

2015-07-07 12:55:39 +02:00

endgame

Puts the world end handling inside a spawn instead of sleep.

2015-07-13 10:13:45 +02:00

epidemic

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

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

events

Grid check now respects critical APC status.

2015-06-25 14:12: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

RSC paths for ai_help command

2015-06-06 14:55:33 +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

Fixes certain modes not sending the 'A round of [x] has ended' notification at round-end

2015-06-26 01:04:03 +01:00

revolution

Merge resolution with master.

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

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

Wizard suits will now be refitted automatically for non-human wizards

2015-06-13 13:43:51 +01:00

events.dm

get rid of mob.see_in_dark and species.darksight

2015-07-09 19:17:04 +01:00

game_mode_latespawn.dm

Refactor/tidies up latejoin antags/in-round antag spawning.

2015-06-21 19:33:49 +09:30

game_mode.dm

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

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

gameticker.dm

Fixes #10203.

2015-07-25 14:08:19 +02:00

intercept_report.dm

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

newobjective.dm

Fixes captain's laser gun

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

objective.dm

Fixes #10129

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

setupgame.dm

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

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