Tkdrg 92e2dc1b2b Fixes antag huds disappearing on transfer_to() ...

I am retarded please merge asap

2015-11-16 19:53:33 -03:00

..

abduction

merge conflict fix

2015-11-10 18:44:10 +02:00

blob

Merge remote-tracking branch 'upstream/master' into hog-mergeconflicts

2015-11-02 01:06:30 -03:00

changeling

Fixes ling revive exploit

2015-11-14 03:11:36 -03:00

cult

Merge remote-tracking branch 'refs/remotes/tgstation/master' into jobbans

2015-11-09 00:29:41 -06:00

extended

…

gang

Merge remote-tracking branch 'refs/remotes/tgstation/master' into jobbans

2015-11-09 00:29:41 -06:00

handofgod

Merge pull request #13017 from tkdrg/hoghog

2015-11-15 09:00:50 +03:00

malfunction

Merge remote-tracking branch 'upstream/master' into hog-mergeconflicts

2015-11-02 01:06:30 -03:00

meteor

Radiation changes

2015-09-26 13:33:27 -04:00

monkey

About a million changes, but largely: Functional (Sort of) Antag Huds, Mind fixes, and Final glue to get the mode working.

2015-10-07 22:11:19 +01:00

nuclear

Merge pull request #12778 from AnturK/minor_upgrades

2015-11-15 09:07:21 +03:00

revolution

Merge remote-tracking branch 'refs/remotes/tgstation/master' into jobbans

2015-11-09 00:29:41 -06:00

sandbox

f u c k c o n f l i c t s

2015-09-25 14:35:44 +03:00

shadowling

Merge remote-tracking branch 'upstream/master' into fuk

2015-11-07 15:56:39 -03:00

traitor

About a million changes, but largely: Functional (Sort of) Antag Huds, Mind fixes, and Final glue to get the mode working.

2015-10-07 22:11:19 +01:00

wizard

Merge pull request #13011 from KorPhaeron/really_bad_ideas

2015-11-14 22:08:48 -06:00

antag_hud.dm

Fixes antag huds disappearing on transfer_to()

2015-11-16 19:53:33 -03:00

antag_spawner.dm

Merge remote-tracking branch 'upstream/master' into hog-mergeconflicts

2015-11-02 01:06:30 -03:00

events.dm

Tweaks

2015-10-11 08:56:13 -05:00

factions.dm

…

game_mode.dm

Merge pull request #12795 from KorPhaeron/jobbans

2015-11-11 10:36:35 -06:00

intercept_report.dm

…

objective_items.dm

Merge pull request #12780 from AnturK/nukekitfix

2015-11-02 19:15:59 -06:00

objective.dm

Fixes one nuke kit per round.

2015-10-31 20:57:49 +01:00

setupgame.dm

Fixes error in SetupGenetics proc

2015-10-20 01:07:35 +02:00