Incoming 26a1bb65f2 Merge branch 'master' of https://github.com/tgstation/-tg-station into wands3 ...

Conflicts:
	code/modules/mob/death.dm
	code/modules/mob/living/carbon/alien/death.dm
	code/modules/mob/living/carbon/brain/death.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/carbon/monkey/death.dm
	code/modules/mob/living/silicon/death.dm
	code/modules/mob/living/silicon/robot/death.dm

2013-12-27 00:55:44 -05:00

..

blob

* Telescience now works on bluespace crystals, which are special crystals which unlock power settings from the telescience computer.

2013-11-12 14:24:56 +00:00

changeling

Merge pull request #2083 from Razharas/Shame

2013-12-21 13:46:34 -08:00

cult

Merge branch 'master' of https://github.com/tgstation/-tg-station into tinypricknomore_andgunstuff

2013-12-18 18:27:22 +00:00

extended

removed asteroids

2012-04-14 00:51:55 +00:00

malfunction

Delta : Pinpointer now points toward the AI.

2013-11-20 00:11:27 +01:00

meteor

* Fixed the party alarm from only working in areas with a certain light level.

2013-12-19 22:07:52 +00:00

nuclear

Added feedback when anchoring fails

2013-12-08 10:33:53 -07:00

revolution

Making round end reports more clear and easy read by:

2013-10-11 23:49:23 +02:00

sandbox

Removed some items from the spawn_forbidden list of sandbox mode. That list is not for potential "grieff" items.

2013-12-05 08:19:52 -03:00

traitor

Fixes DAs not correctly getting the right traitor title before being set as a target.

2013-11-29 21:05:23 +00:00

wizard

Feature: Changed how used books of mindswap punish people. Now if you use a used mindswap book it marks you to be used in a mindswap with the next unfortunate soul who reads its. Some Limitations: You can escape the impending mindswap by changing forms or being dead when the next time someone tries to read the book. You can of course also just keep the book safe or destroy it if you accidentally read one. Only works with things that have hands. Consider intentionally reading one as a monkey then giving it to the captain.

2013-12-21 12:23:50 -05:00

events.dm

Committing carn's modifications to events and other things. Full details below.

2013-02-17 11:44:37 +00:00

factions.dm

Uplink Update:

2013-04-02 01:02:54 +01:00

game_mode.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/1701

2013-11-06 11:03:40 -06:00

gameticker.dm

You can now force any game modes in secret that would start normally.

2013-10-21 17:24:15 +02:00

intercept_report.dm

Committed Rolan7's patch to add more convenience to Hydroponics. The feature list includes:

2012-12-07 13:27:33 +00:00

objective.dm

Moves laser pointer to special steal objectives list

2013-11-09 08:35:18 -07:00

setupgame.dm

Randmutb will no longer select and mutate RACEBLOCK - mutagen, cloning, radiation-events etc will no longer cause this block to change.

2013-08-21 15:45:03 +01:00