Robustin eb7f2ddc99 Merge branch 'master' of https://github.com/tgstation/tgstation into GG3 ...

# Conflicts:
#	icons/obj/guns/projectile.dmi

2017-05-21 17:54:44 -04:00

..

blob

Two more types of Legion and makes environment_smash levels into defines (#27160)

2017-05-21 19:51:52 +12:00

changeling

Adds some antag alerts (#26931)

2017-05-12 17:16:57 -03:00

clock_cult

Merge pull request #27376 from ChangelingRain/ratvarwalls

2017-05-19 08:25:05 -03:00

cult

Merge pull request #27466 from Cyberboss/patch-87

2017-05-21 16:25:27 -03:00

devil

Two more types of Legion and makes environment_smash levels into defines (#27160)

2017-05-21 19:51:52 +12:00

extended

…

gang

Merge branch 'master' into ganguns

2017-05-20 19:41:52 -04:00

malfunction

Changes some << to to_chat

2017-04-27 04:20:26 +03:00

meteor

Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual (#27344)

2017-05-17 22:54:54 -05:00

miniantags

Two more types of Legion and makes environment_smash levels into defines (#27160)

2017-05-21 19:51:52 +12:00

nuclear

World.dm Refactor (#27268)

2017-05-18 21:53:46 +10:00

revolution

Unorphans the blackbox (#26129)

2017-04-27 10:04:57 +12:00

sandbox

EngiMarket Part Four - Ranged RCD and Rapid Lighting Device (RLD) (#25263)

2017-04-14 09:31:43 +12:00

traitor

Fixes everyone having codespeak

2017-05-15 15:10:01 +01:00

wizard

Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual (#27344)

2017-05-17 22:54:54 -05:00

antag_hud.dm

Changed alternate appearances to /datum/atom_hud s (#26289)

2017-04-23 20:25:52 +02:00

antag_spawner.dm

Fixes syndicate borg spawner

2017-05-18 18:09:14 -05:00

events.dm

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00

factions.dm

…

game_mode.dm

Merge pull request #26631 from Robustin/CultMasterAttempt2

2017-05-06 12:55:50 -04:00

intercept_report.dm

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00

objective_items.dm

…

objective.dm

Gets rid of more edge cases

2017-05-05 23:47:37 +01:00