phil235 194398cbbd Merge branch 'master' of https://github.com/tgstation/-tg-station into PreliminaryDamageRefactor ...

# Conflicts:
#	code/game/gamemodes/miniantags/bot_swarm/swarmer.dm
#	code/game/objects/effects/portals.dm

2016-09-29 01:44:27 +02:00

..

PDA

Requested changes to #20637 (#20701)

2016-09-28 08:54:42 +02:00

radio

Mining tweaks, fixes and balance changes (#18697)

2016-06-28 21:58:57 +12: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

Wearing colored glasses colors your vision, if you want to. (#20499)

2016-09-17 16:28:50 +12:00

doorCharge.dm

Syndicate origin tech changes

2016-05-18 20:12:01 +03:00

flashlight.dm

Carbon Dismemberment , second attempt. (#20461)

2016-09-12 19:33:50 +02:00

geiger_counter.dm

stop the pills (#18703)

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

instruments.dm

Some preliminary changes before the damage refactor PR. The changes here do absolutely nothing gamewise.

2016-09-27 22:33:08 +02:00

laserpointer.dm

Carbon Dismemberment , second attempt. (#20461)

2016-09-12 19:33:50 +02:00

lightreplacer.dm

origin and req lvl changes

2016-05-21 17:17:20 +03:00

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

…

powersink.dm

stop the pills (#18703)

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

scanners.dm

Carbon Dismemberment , second attempt. (#20461)

2016-09-12 19:33:50 +02:00

sensor_device.dm

…

taperecorder.dm

More than 2 hands!? WHAAAAAAT

2016-09-02 16:10:16 +01: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