Razharas a589387ccf Fixing merge conflicts ...

THis is getting harder and harder

2014-02-06 22:26:16 +04:00

..

blob

Repurposes the outdated BE_MONKEY into BE_BLOB and seperates the alien and blob pools so people can prefer to be one or the other or both or neither. An annoucement should be made when this goes live so people are aware they have a new flag to set.

2014-01-29 10:54:00 -05:00

changeling

Arm blades are no longer telekinetic table-breakers. Fixes an arm blade typo. Fixed #2559

2014-01-31 18:07:48 +01:00

cult

Attack sounds for all melee weapons

2014-01-28 22:46:41 +13:00

extended

…

malfunction

Delta : Pinpointer now points toward the AI.

2013-11-20 00:11:27 +01:00

meteor

* Fixed the party alarm from only working in areas with a certain light level.

2013-12-19 22:07:52 +00:00

nuclear

Completes code changes; reimplements ninja steal objective.

2014-01-29 12:28:15 -06:00

revolution

Making round end reports more clear and easy read by:

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

sandbox

Ported cable coils to stacks crudely

2014-01-22 02:11:19 +04:00

traitor

Fixes DAs not correctly getting the right traitor title before being set as a target.

2013-11-29 21:05:23 +00:00

wizard

Attack sounds for all melee weapons

2014-01-28 22:46:41 +13:00

antag_spawner.dm

Syndicate Borg emergency fixes

2014-01-12 23:20:57 +01:00

events.dm

Added SMESes and some turbine fix

2014-01-30 22:21:43 +04:00

factions.dm

…

game_mode.dm

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

2013-11-06 11:03:40 -06:00

gameticker.dm

Gameticker checks for mind in end of game readout

2014-02-03 05:27:03 +13:00

intercept_report.dm

…

objective_items.dm

Gets rid of a couple colons.

2014-01-29 16:01:55 -06:00

objective.dm

Completes code changes; reimplements ninja steal objective.

2014-01-29 12:28:15 -06:00

setupgame.dm

Randmutb will no longer select and mutate RACEBLOCK - mutagen, cloning, radiation-events etc will no longer cause this block to change.

2013-08-21 15:45:03 +01:00