Jordie0608 76dddc56a0 Merge branch 'master' of https://github.com/tgstation/-tg-station into thesetypofixesdedicatedtoshakespeare ...

Conflicts:
	icons/obj/gun.dmi

2014-10-17 22:50:48 +11:00

..

blob

Reverts Antag selection happening before job selection

2014-10-09 22:57:19 +01:00

changeling

Reverts Antag selection happening before job selection

2014-10-09 22:57:19 +01:00

cult

Reverts Antag selection happening before job selection

2014-10-09 22:57:19 +01:00

extended

Removes two unused vars of the gamemode datums, uplink_welcome and uplink_uses.

2014-09-11 06:06:59 -03:00

gang

Reverts Antag selection happening before job selection

2014-10-09 22:57:19 +01:00

malfunction

Reverts Antag selection happening before job selection

2014-10-09 22:57:19 +01:00

meteor

Hotfix for meteors lagging to shit

2014-09-19 03:57:33 -03:00

monkey

Reverts Antag selection happening before job selection

2014-10-09 22:57:19 +01:00

nuclear

Merge pull request #5180 from hornygranny/PILLSHERE

2014-10-13 10:40:27 +01:00

revolution

Reverts Antag selection happening before job selection

2014-10-09 22:57:19 +01:00

sandbox

Removes two unused vars of the gamemode datums, uplink_welcome and uplink_uses.

2014-09-11 06:06:59 -03:00

traitor

Reverts Antag selection happening before job selection

2014-10-09 22:57:19 +01:00

wizard

Defines riot shotgun for spawn in the armory

2014-10-14 01:28:53 +11:00

antag_spawner.dm

Revert "Players Jobbanned from Antagonist Roles cannot be spawned as, or converted to, them"

2014-09-19 13:38:10 -03:00

events.dm

Priority Announcement Changes

2014-05-05 22:18:57 -06:00

factions.dm

…

game_mode.dm

Resolved conflicts and addressed maintainer feedback.

2014-09-21 15:30:54 -06:00

gameticker.dm

Reverts Antag selection happening before job selection

2014-10-09 22:57:19 +01:00

intercept_report.dm

- Removes the useless has_been_rev var

2014-09-26 21:37:07 -06:00

objective_items.dm

Adds construction permits

2014-10-11 17:39:27 -05:00

objective.dm

Merge gang mode into latest version

2014-08-30 23:31:44 -06:00

setupgame.dm

…