Zulker Nayeen Nahiyan 0a3f523066 Merge remote-tracking branch 'refs/remotes/origin/dev' into dev ...

Conflicts:
	code/__HELPERS/maths.dm
	code/__HELPERS/type2type.dm
	code/modules/clothing/head/hardhat.dm
	code/modules/clothing/spacesuits/captain.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/clothing/spacesuits/rig/rig_pieces.dm
	code/modules/clothing/spacesuits/rig/suits/light.dm
	code/modules/clothing/spacesuits/spacesuits.dm
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/suits/utility.dm
	code/modules/events/event_manager.dm
	code/modules/mob/living/living.dm
	code/setup.dm

2015-02-04 04:44:09 +06:00

..

antimatter

Removes FPRINT and TABLEPASS flags

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

rust

Merge remote-tracking branch 'refs/remotes/origin/dev' into dev

2015-02-04 04:44:09 +06:00

sensors

Fixes slightly inaccurate comment

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

singularity

Merge pull request #7850 from Baystation12/master

2015-01-16 14:23:03 +03:00

apc.dm

Added attack_ghost to APC and SMES to allow observing

2015-01-01 18:26:55 +00:00

batteryrack.dm

Removed unused substation batteryrack code.

2014-12-17 14:31:57 +01:00

breaker_box.dm

Removes FPRINT and TABLEPASS flags

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

cable_heavyduty.dm

Cables are now stacks

2014-08-25 18:54:35 +04:00

cable_logic.dm

Fixes #6121

2014-09-04 05:02:03 +01:00

cable.dm

Removes FPRINT and TABLEPASS flags

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

cell.dm

Optimalisations

2014-12-31 01:53:53 +01:00

engine.dm

Removed attack_paw, attack_animal and attack_slime.

2014-11-13 17:15:29 +10:30

fractal_reactor.dm

Fractal Energy Reactor can now be mapped in.

2014-11-28 21:35:02 +01:00

generator_type2.dm

…

generator.dm

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

gravitygenerator.dm

Removed attack_paw, attack_animal and attack_slime.

2014-11-13 17:15:29 +10:30

lighting.dm

Removes FPRINT and TABLEPASS flags

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

pacman2.dm

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

port_gen.dm

Fixes portable generator balance

2015-01-25 23:59:07 -05:00

power.dm

Fixes power runtime

2015-01-22 15:03:54 +00:00

powernet.dm

Fixes two powernet related issues:

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

profiling.dm

May fix the debug verbs showing up for non-debuggers. Probably not.

2014-09-15 01:56:38 +09:30

smes_construction.dm

SMES Exploit Fix

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

smes.dm

Merge pull request #7617 from fira/obscomps

2015-02-03 18:12:16 +03:00

solar.dm

Fixes (at least some) of the recursive power-drain crash issues.

2014-12-14 14:44:53 +10:30

terminal.dm

Merge conflict resolution.

2014-11-10 13:00:06 +10:30

tracker.dm

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

turbine.dm

Updates references

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