Markolie f7fe8c8c6f Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixes3 ...

Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm

2015-09-28 03:05:04 +02:00

..

PDA

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

2015-09-28 03:05:04 +02:00

radio

Merge remote-tracking branch 'upstream/master' into rcs-update

2015-09-23 01:19:28 -04:00

aicard.dm

Port Bay's silicon law manager

2015-08-31 02:18:49 +02:00

autopsy.dm

Pass II

2015-07-09 19:51:40 -04:00

camera_bug.dm

In hand sprite overhaul

2015-09-13 22:44:18 +02:00

chameleonproj.dm

spawn() added to ex_act

2015-08-01 15:48:29 -04:00

debugger.dm

Pass I

2015-09-04 05:18:48 -04:00

flash.dm

In hand sprite overhaul

2015-09-13 22:44:18 +02:00

flashlight.dm

Add torch, more in-hand fixes

2015-09-16 03:22:01 +02:00

guitar.dm

In hand sprite overhaul

2015-09-13 22:44:18 +02:00

laserpointer.dm

Pixel-coords laserpointer

2015-09-26 08:45:43 -07:00

lightreplacer.dm

Bay12 examine overhaul.

2015-09-14 11:51:40 -07:00

megaphone.dm

…

modkit.dm

Bay12 examine overhaul.

2015-09-14 11:51:40 -07:00

multitool.dm

Pass I

2015-09-04 05:18:48 -04:00

paicard.dm

Add cooldown to pAI card/drone reactivations

2015-09-11 06:51:14 +02:00

pipe_painter.dm

Atmos fixes

2015-09-22 05:15:05 +02:00

pizza_bomb.dm

Progress bars + Wall Rationalization

2015-08-31 13:38:51 -07:00

powersink.dm

Pass I

2015-09-04 05:18:48 -04:00

scanners.dm

In hand sprite overhaul

2015-09-13 22:44:18 +02:00

sensor_device.dm

Update NanoUI to be up-to-date with Bay

2015-07-28 21:04:44 +02:00

taperecorder.dm

pass II, taperecorder exploit fix

2015-09-18 05:46:00 -04:00

traitordevices.dm

In hand sprite overhaul

2015-09-13 22:44:18 +02:00

transfer_valve.dm

Fix compile error

2015-08-17 01:03:34 +02:00

uplinks.dm

Hopefully fix uplink crashing

2015-08-19 22:22:51 +02:00

violin.dm

Preference option for instruments/sanitize tempo

2015-09-23 07:00:01 +02:00

whistle.dm

In hand sprite overhaul

2015-09-13 22:44:18 +02:00