PsiOmega f25e8a7a67 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/objects/items/stacks/tiles/plasteel.dm
	code/game/objects/items/stacks/tiles/tile_types.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/pai/pai.dm
	code/modules/surgery/implant.dm
	code/setup.dm

2015-06-26 20:28:47 +02: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

Base Life-addition()

2015-06-13 13:36:08 +02:00

cult

It is no longer possible to define the amount of telecrystals per game mode.

2015-06-18 10:59:45 +02:00

endgame

End game turf changes now simply alters color.

2015-05-29 23:38:09 +02:00

epidemic

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

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

events

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

2015-06-26 20:28:47 +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

It is no longer possible to define the amount of telecrystals per game mode.

2015-06-18 10:59:45 +02:00

meme

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

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

meteor

It is no longer possible to define the amount of telecrystals per game mode.

2015-06-18 10:59:45 +02:00

ninja

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

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

nuclear

It is no longer possible to define the amount of telecrystals per game mode.

2015-06-18 10:59:45 +02:00

revolution

It is no longer possible to define the amount of telecrystals per game mode.

2015-06-18 10:59:45 +02:00

sandbox

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

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

traitor

It is no longer possible to define the amount of telecrystals per game mode.

2015-06-18 10:59:45 +02:00

wizard

It is no longer possible to define the amount of telecrystals per game mode.

2015-06-18 10:59:45 +02:00

events.dm

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02: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

Merge with dev-freeze.

2015-06-21 20:45:47 +09:30

gameticker.dm

Merge remote-tracking branch 'remotes/upstream/dev' into definecrusade

2015-06-05 11:26:25 +03: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