mwerezak 0d89717cf2 Merge remote-tracking branch 'upstream/dev' into gun-rewrite ...

Conflicts:
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/projectiles/guns/projectile/pistol.dm

2015-02-13 01:57:19 -05:00

..

antimatter

Cleanup can_fire(), projectile flag

2015-02-12 01:37:19 -05:00

rust

Cleanup can_fire(), projectile flag

2015-02-12 01:37:19 -05:00

sensors

Fixes slightly inaccurate comment

2015-01-01 08:15:15 +01:00

singularity

Area cleanup part 1: Engineering Department

2015-02-03 14:50:11 -08:00

apc.dm

Merge master into dev.

2015-02-12 23:01:08 +10:30

batteryrack.dm

…

breaker_box.dm

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

cable_heavyduty.dm

…

cable_logic.dm

…

cable.dm

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

cell.dm

Generalizes emp energy weapon drain to power cells

2015-02-12 01:37:41 -05:00

engine.dm

…

fractal_reactor.dm

…

generator_type2.dm

…

generator.dm

…

gravitygenerator.dm

…

lighting.dm

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

pacman2.dm

…

port_gen.dm

Replaces text expressions with macros

2015-02-12 01:55:12 -05:00

power.dm

Fixes machines being usable after a power failure

2015-02-11 23:28:53 -05:00

powernet.dm

Fixes two powernet related issues:

2015-01-20 21:12:52 +01:00

profiling.dm

…

smes_construction.dm

SMES Exploit Fix

2015-01-01 08:09:14 +01:00

smes.dm

Merge master into dev.

2015-02-12 23:01:08 +10:30

solar.dm

…

terminal.dm

…

tracker.dm

…

turbine.dm

Updates references

2014-12-27 00:03:20 +01:00