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

Conflicts:
	code/game/objects/items/weapons/kitchen.dm

2015-02-25 20:44:32 +01:00

..

autotraitor

Autotraitor selection fix

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

blob

Mapfix, hivemind fix

2015-02-25 01:13:53 +01:00

borer

Z-level check refactor

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

changeling

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

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

cult

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

epidemic

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

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

events

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

extended

…

heist

Remove click delay from most things

2015-02-22 18:47:58 +01:00

malfunction

Goon process scheduler

2015-02-22 15:24:46 -05: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

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

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

ninja

…

nuclear

Rebalance nuke ops skin color a bit

2015-02-24 01:58:23 +01:00

revolution

Standardize mutations

2015-02-22 19:04:43 +01:00

sandbox

Add shuttle stranding

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

traitor

Standardize mutations

2015-02-22 19:04:43 +01:00

vampire

Standardize mutations

2015-02-22 19:04:43 +01:00

wizard

Merge remote-tracking branch 'upstream/master' into Fixes

2015-02-23 16:47:55 -05:00

xenos

Bug fixes, add atmos watertank

2015-02-25 19:47:04 +01: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

Thickmaterial Flag

2015-02-21 07:26:25 -05:00

gameticker.dm

Optimizing lobby stuff

2015-02-24 11:22:12 -05:00

intercept_report.dm

…

newobjective.dm

Z-level check refactor

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

objective.dm

Merge remote-tracking branch 'upstream/master' into changeling

2015-02-20 19:05:25 -05:00

scoreboard.dm

Z-level check refactor

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

setupgame.dm

Emergency: Removing WHISPER disability which infinite loops

2015-02-21 12:35:06 -05:00

steal_items.dm

Defib update, cell path update

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