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

Conflicts:
	code/game/machinery/doors/airlock.dm
	code/game/objects/structures/door_assembly.dm
	code/game/objects/structures/false_walls.dm
	code/game/objects/structures/mineral_doors.dm
	code/modules/research/protolathe.dm
	icons/obj/doors/door_assembly.dmi

2014-04-11 02:51:07 +10:00

..

blob

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

2014-03-30 20:48:03 +02:00

changeling

Changeling bug fixes

2014-04-07 18:32:20 +03:00

cult

Fixed a likely exploit with more cultists getting word rewards than intended

2014-03-26 21:38:39 +00:00

extended

…

malfunction

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

2014-03-21 03:05:39 -07:00

meteor

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

nuclear

Modified qdel() to accept any datum.

2014-03-24 00:10:43 -04:00

revolution

Making round end reports more clear and easy read by:

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

sandbox

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

2014-04-11 02:51:07 +10:00

traitor

Changed the wording on the round-end messages of double agents, now clowns and mime won't have different text than the rest.

2014-04-03 15:57:16 -03:00

wizard

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

2014-03-29 16:59:14 +00:00

antag_spawner.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

events.dm

Remove name checks

2014-02-19 17:23:57 -05:00

factions.dm

Uplink Update:

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

game_mode.dm

Fixes my gamemode debugger

2014-04-05 15:27:12 +01:00

gameticker.dm

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

2014-04-08 14:29:58 +02:00

intercept_report.dm

…

objective_items.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

objective.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

setupgame.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00