Markolie aca3a2cecb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into powernet ...

Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
	code/game/machinery/alarm.dm
	code/modules/power/smes.dm

2015-08-01 21:44:47 +02:00

..

autotraitor

All modes now choose their antagonists before they choose jobs.

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

blob

Merge pull request #1544 from Fox-McCloud/oh-no

2015-07-19 17:15:02 -04:00

borer

Changes a few del to del()

2015-07-10 23:28:08 -04:00

changeling

Moved changeling swap form to swap_form.dm instead of absorb.dm, because one would think absorb.dm would contain the absorb power

2015-07-25 19:31:50 -07:00

cult

Don't assign new objective if sacrifice fails - eldergod and survive are mutually exclusive

2015-07-26 06:28:04 +02:00

epidemic

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

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

events

Powernet rework

2015-07-31 23:59:41 +02:00

extended

Nuke Ops Rework Phase 2

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

heist

Fix Vox heist end game announcement

2015-07-28 02:28:24 +02:00

malfunction

Fix Malf AI

2015-07-17 01:00:25 +02:00

meme

…

meteor

Makes Cables GC Better

2015-07-08 09:30:03 -04:00

mutiny

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

nations

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

nuclear

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

2015-07-28 18:40:44 +02:00

revolution

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

sandbox

Add shuttle stranding

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

shadowling

Add borg headlamp, add movement states for surgeon/miner bot, add jetpack overlay to all miner borgs

2015-07-30 19:33:49 +02:00

traitor

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

vampire

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

wizard

Pass II

2015-07-09 19:51:40 -04: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

Mob Refactor+Update and Pet Collars

2015-05-28 00:20:25 -04:00

factions.dm

…

game_mode.dm

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

2015-07-28 18:40:44 +02:00

gameticker.dm

Powernet rework

2015-07-31 23:59:41 +02:00

intercept_report.dm

Efficiency: Joblist

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

newobjective.dm

Drill and drone fixes

2015-08-01 10:13:54 -04:00

objective.dm

Fix cult sacrifice objective

2015-07-26 06:06:04 +02:00

scoreboard.dm

Inverts new karma reminder and scoreboard toggles

2015-07-06 23:07:04 -04:00

setupgame.dm

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

steal_items.dm

Drill and drone fixes

2015-08-01 10:13:54 -04:00