paprka 4a0aa0c0a5 Merge branch 'master' of https://github.com/tgstation/-tg-station into nosenseofrightandwrongiguess ...

Conflicts:
	code/game/gamemodes/wizard/rightandwrong.dm
	code/modules/projectiles/ammunition/ammo_casings.dm
	code/modules/projectiles/ammunition/boxes.dm
	icons/obj/ammo.dmi
	icons/obj/gun.dmi

2015-01-15 22:16:11 -08:00

..

blob

Merge pull request #7032 from Iamgoofball/raginmages

2015-01-15 14:28:47 -03:00

changeling

Merge pull request #6986 from Menshin/ear_damage_ooping

2015-01-13 01:19:56 -06:00

cult

Merge pull request #7026 from optimumtact/runeytunes

2015-01-15 19:15:42 +01:00

extended

…

gang

Fixes malf AI lockdown affecting doors on z levels other than station and mining.

2015-01-11 15:39:32 +01:00

malfunction

Fixes malf AI lockdown affecting doors on z levels other than station and mining.

2015-01-11 15:39:32 +01:00

meteor

Resolves #6923 - Mistake made during merging meant that some gamemode objectives were using hardcoded area-type-lists for checking objective completion. (This is why allow/disallow lists are dumb)

2015-01-10 03:57:02 +00:00

monkey

Resolves #6923 - Mistake made during merging meant that some gamemode objectives were using hardcoded area-type-lists for checking objective completion. (This is why allow/disallow lists are dumb)

2015-01-10 03:57:02 +00:00

nuclear

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

2015-01-15 16:14:27 -06:00

revolution

Fixes malf AI lockdown affecting doors on z levels other than station and mining.

2015-01-11 15:39:32 +01:00

sandbox

Replaces a bunch of input() with stripped_input()

2015-01-11 19:02:53 -03:00

traitor

Fixed stuff tkdrg pointed out

2014-12-28 10:49:04 +03:00

wizard

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

2015-01-15 22:16:11 -08:00

antag_hud.dm

Changes the antag hud ERROR()s to CRASH()s

2014-12-08 13:50:09 -03:00

antag_spawner.dm

…

events.dm

Fixes malf AI lockdown affecting doors on z levels other than station and mining.

2015-01-11 15:39:32 +01:00

factions.dm

…

game_mode.dm

SubSystem rewrite

2014-12-31 13:25:41 +00:00

intercept_report.dm

…

objective_items.dm

Mining sound revamp, using realistic sounds now instead of reusing sound. Plus improved Taser sound.

2014-12-09 19:38:49 -08:00

objective.dm

Merge pull request #6968 from phil235/LockdownMalfFix

2015-01-14 14:58:10 -03:00

setupgame.dm

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

2015-01-04 01:52:14 +00:00