phil235 2dc956bea0 Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing ...

# Conflicts:
#	code/game/gamemodes/clock_cult/clock_scripture.dm
#	code/game/gamemodes/clock_cult/clock_structures.dm

2016-10-31 19:59:00 +01:00

..

PDA

Replaces yet more istypes with helpers (#20806)

2016-10-10 17:48:35 +13:00

radio

Fixes speaking being delayed by tcomms (#21020)

2016-10-19 13:37:15 +13:00

aicard.dm

Added priority overlay system. (#18225)

2016-06-17 10:11:53 +12:00

camera_bug.dm

Fix multiple href exploits from incorrectly scoped locates

2016-09-28 06:55:45 +00:00

chameleonproj.dm

Plane master handling + new chemical Rotatium (#20707)

2016-10-18 11:41:23 +02:00

doorCharge.dm

Contents_explosion() tweaks (#20934)

2016-10-16 10:01:37 +13:00

flashlight.dm

Replaces a bunch of istypes with their proper macros (#20739)

2016-09-30 20:21:08 +02:00

geiger_counter.dm

POWER TOOLS TAKE 2. (#20923)

2016-10-14 10:19:23 +13:00

instruments.dm

Minor devil fixes (#20770)

2016-10-18 08:45:45 +02:00

laserpointer.dm

Adds a few turf istype helpers (#20754)

2016-10-01 19:25:46 +02:00

lightreplacer.dm

…

machineprototype.dm

Fix origin tech

2016-06-10 23:05:05 +03:00

megaphone.dm

Megaphone no longer have special say code to handle their effect.

2016-09-13 18:27:55 +02:00

multitool.dm

stop the pills (#18703)

2016-06-20 12:07:44 +02:00

paicard.dm

Added priority overlay system. (#18225)

2016-06-17 10:11:53 +12:00

pipe_painter.dm

Adding var/list/atom_colours to /atom .

2016-10-19 01:51:30 +02:00

powersink.dm

stop the pills (#18703)

2016-06-20 12:07:44 +02:00

scanners.dm

Contents_explosion() tweaks (#20934)

2016-10-16 10:01:37 +13:00

sensor_device.dm

…

taperecorder.dm

Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)

2016-10-10 11:14:59 +13:00

traitordevices.dm

stop the pills (#18703)

2016-06-20 12:07:44 +02:00

transfer_valve.dm

Added priority overlay system. (#18225)

2016-06-17 10:11:53 +12:00