Mark van Alphen 0f98a95666 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs ...

# Conflicts:
#	icons/mob/actions/actions.dmi
#	paradise.dme

2019-05-13 22:14:38 +02:00

..

radio

Chameleon overhaul

2019-05-01 20:59:41 +02:00

aicard.dm

…

autopsy.dm

…

camera_bug.dm

…

chameleonproj.dm

…

flash.dm

SSticker

2019-04-30 16:47:47 +01:00

flashlight.dm

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

2019-05-13 22:14:38 +02:00

floor_painter.dm

…

handheld_defib.dm

…

instruments.dm

…

laserpointer.dm

…

lightreplacer.dm

…

machineprototype.dm

…

megaphone.dm

Chameleon overhaul

2019-05-01 20:59:41 +02:00

multitool.dm

…

paicard.dm

…

pipe_painter.dm

…

pizza_bomb.dm

…

powersink.dm

fixups

2019-04-29 04:41:31 -04:00

scanners.dm

…

sensor_device.dm

…

taperecorder.dm

…

thermal_drill.dm

…

traitordevices.dm

…

transfer_valve.dm

…

uplinks.dm

SSticker

2019-04-30 16:47:47 +01:00

voice.dm

Chameleon overhaul

2019-05-01 20:59:41 +02:00

whistle.dm

…