paprka 1b6eb8afec Merge branch 'master' of https://github.com/tgstation/-tg-station into defibsfinal ...

Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm

2014-11-03 17:57:40 -08:00

..

blob

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

2014-10-21 15:58:39 +02:00

changeling

Fixes changelings deleting themselves with lesser/human form.

2014-10-22 17:04:30 +03:00

cult

Merge pull request #5179 from paprka/cultstuff

2014-10-22 16:45:07 -07:00

extended

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

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

gang

initial commit of assistant antag option

2014-10-13 17:21:02 -07:00

malfunction

Reverts Antag selection happening before job selection

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

meteor

Fix the lag produces by oversized Pumpkings bounds interacting with space transitions.

2014-10-31 19:48:55 +01:00

monkey

Reverts Antag selection happening before job selection

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

nuclear

Adding checks for stun, restrained to many object verbs.

2014-11-01 19:18:01 +01:00

revolution

Fixes #5517

2014-10-29 01:23:47 -04:00

sandbox

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

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

traitor

initial commit of assistant antag option

2014-10-13 17:21:02 -07: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

…

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 traitor objective for defib

2014-10-31 09:16:19 -07:00

objective.dm

…

setupgame.dm

…