Markolie 354e569f9d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise ...

Conflicts:
	code/game/machinery/rechargestation.dm

2015-02-09 16:15:00 +01:00

..

autotraitor

Autotraitor selection fix

2015-02-05 15:24:43 +01:00

blob

Fix blob jobban oversight

2015-02-01 22:16:17 +01:00

borer

Fix some oversights

2015-01-31 19:54:24 +01:00

changeling

Prevent IPC's from becoming changeling during traitorchan

2015-01-20 04:35:45 +01:00

cult

Spacesuit Buff

2015-01-31 23:36:56 -05:00

epidemic

Replace every instance of NanoTrasen with Nanotrasen.

2014-11-29 21:01:29 +01:00

events

Defib update, cell path update

2015-02-09 16:12:01 +01:00

extended

Nuke Ops Rework Phase 2

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

heist

Vox Heist port from Bay

2015-01-10 06:21:21 +01:00

malfunction

Add shuttle stranding

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

meme

…

meteor

…

mutiny

Extra jobban checks

2015-02-01 16:38:17 +01:00

nations

Adds a sound when nations mode is announced

2014-08-16 22:09:49 +01:00

ninja

…

nuclear

Syndiborg pinpointer, adds antag preferences and send back to lobby to player panel

2015-01-30 16:24:13 +01:00

revolution

Add shuttle stranding

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

sandbox

Add shuttle stranding

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

traitor

Turns off exchange objective during autotraitor

2015-02-07 17:45:54 -05:00

vampire

Chapel now makes vampires extra crispy

2015-01-20 13:54:03 -05:00

wizard

Fixes artificer spell being removed

2015-02-08 23:54:52 +01:00

xenos

Prioritize station destruction over xenos exterminated

2015-01-07 04:30:33 +01:00

antag_spawner.dm

Blob event fixes, toggle preferences age check, jobban check

2015-02-01 14:19:11 +01:00

events.dm

Blob event fixes, toggle preferences age check, jobban check

2015-02-01 14:19:11 +01:00

factions.dm

…

game_mode.dm

Crossbow Rework

2015-02-03 23:35:09 -05:00

gameticker.dm

Event overhaul from Bay, atmos fixes

2015-01-21 23:05:59 +01:00

intercept_report.dm

…

newobjective.dm

Defib update, cell path update

2015-02-09 16:12:01 +01:00

objective.dm

Secret documents cannot be normal steal objectives

2015-01-31 16:52:03 -05:00

scoreboard.dm

Defib update, cell path update

2015-02-09 16:12:01 +01:00

setupgame.dm

Disability fixes

2015-02-08 14:20:57 +01:00

steal_items.dm

Defib update, cell path update

2015-02-09 16:12:01 +01:00