Markolie 89665cfe5c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into alarms ...

Conflicts:
	_maps/map_files/RandomZLevels/moonoutpost19.dmm
	_maps/map_files/cyberiad/cyberiad.dmm
	code/controllers/master_controller.dm
	code/game/machinery/alarm.dm
	code/modules/power/apc.dm

2015-08-03 00:04:24 +02:00

..

airlock.dm

NanoUI synth airlock update

2015-03-03 18:45:22 +01:00

alarm.dm

Alarm system overhaul

2015-08-02 07:13:03 +02:00

apc.dm

Wire hacking recode from /tg/.

2014-01-12 22:37:55 -05:00

autolathe.dm

Autolathe hack fix

2014-12-24 19:15:13 +01:00

camera.dm

/tg/ Wire Datum method pass 1: APC, Airlocks, Vending Machines\

2013-11-10 13:14:22 -05:00

explosive.dm

Sort of compiles

2015-07-09 15:55:36 -04:00

mulebot.dm

/tg/ Wire Datum method pass 1: APC, Airlocks, Vending Machines\

2013-11-10 13:14:22 -05:00

particle_accelerator.dm

/tg/ Wire Datum method pass 1: APC, Airlocks, Vending Machines\

2013-11-10 13:14:22 -05:00

radio.dm

Revert "Revert "Saycode/language/species port from Bay""

2015-02-20 17:46:35 +01:00

robot.dm

Adds Syndiborg to NukeOps, enables shortcuts for borgs/drones, notifies the AI of borg changes

2014-11-23 07:52:38 +01:00

smartfridge.dm

Powernet rework

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

syndicatebomb.dm

Syndicate Bomb Port

2014-10-29 04:21:31 -04:00

taperecorder.dm

/tg/ Wire Datum method pass 1: APC, Airlocks, Vending Machines\

2013-11-10 13:14:22 -05:00

vending.dm

Vending machine overhaul, teleporter area fix, add events to status tab

2015-02-13 15:27:42 +01:00

wires.dm

Vending machine overhaul, teleporter area fix, add events to status tab

2015-02-13 15:27:42 +01:00