Tigercat2000 0a66ac4ba5 Merge remote-tracking branch 'upstream/master' into HolidayDatums ...

Conflicts:
	code/__DEFINES/misc.dm

2015-05-16 18:40:54 -07:00

..

autotraitor

All modes now choose their antagonists before they choose jobs.

2015-05-13 06:14:00 -07:00

blob

FIX: Linda airflow affecting mob when it shouldn't

2015-05-15 05:08:48 -07:00

borer

Z-level check refactor

2015-02-16 20:33:28 +01:00

changeling

Apply new antag-restricted-roles stuff to traitorchan

2015-05-16 11:58:39 -07:00

cult

All modes now choose their antagonists before they choose jobs.

2015-05-13 06:14:00 -07:00

epidemic

Announcement system overhaul, crew monitor system overhaul, add portable crew monitor

2015-02-16 19:03:29 +01:00

events

Lighting overhaul.

2015-05-10 12:03:27 -07:00

extended

Nuke Ops Rework Phase 2

2014-11-05 06:56:46 -05:00

heist

Removing all mutantrace crap except for slimepeople

2015-04-13 06:20:17 -04:00

malfunction

Fixes camera upgrades not working properly

2015-05-11 08:17:08 -04:00

meme

…

meteor

Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things

2015-02-22 22:12:11 +01:00

mutiny

Squish Squash

2015-04-04 14:27:53 -04:00

nations

Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things

2015-02-22 22:12:11 +01:00

nuclear

Fixes medical item runtime and a line git ate

2015-05-14 07:23:26 -04:00

revolution

All modes now choose their antagonists before they choose jobs.

2015-05-13 06:14:00 -07:00

sandbox

Add shuttle stranding

2015-02-01 16:05:43 +01:00

shadowling

All modes now choose their antagonists before they choose jobs.

2015-05-13 06:14:00 -07:00

traitor

All modes now choose their antagonists before they choose jobs.

2015-05-13 06:14:00 -07:00

vampire

Fixes luminosity checks

2015-05-15 01:07:08 -04:00

wizard

Generic Action\Action Button System

2015-05-11 09:32:08 -07:00

xenos

Overhaul global defines and vars

2015-05-12 20:48:38 -07:00

antag_spawner.dm

Simplify get_candidates, minor adjustment to antag ages

2015-02-12 19:09:05 +01:00

events.dm

Z-level check refactor

2015-02-16 20:33:28 +01:00

factions.dm

…

game_mode.dm

Shadowling fixes

2015-05-05 21:44:44 -04:00

gameticker.dm

Change holidays into datums

2015-05-15 20:52:39 -07:00

intercept_report.dm

Efficiency: Joblist

2014-03-01 00:41:18 -05:00

newobjective.dm

Removes Space Ninjas

2015-03-02 19:05:44 -05:00

objective.dm

Squish Squash

2015-04-04 14:27:53 -04:00

scoreboard.dm

Z-level check refactor

2015-02-16 20:33:28 +01:00

setupgame.dm

Insulated Gloves Fix

2015-03-08 19:12:35 -04:00

steal_items.dm

Replace other instances of item/blueprint

2015-03-26 18:55:31 +01:00