Chinsky be95e54e43 Merge branch 'master' into dev ...

Conflicts:
	code/defines/obj/weapon.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/living/silicon/say.dm
	icons/mob/uniform.dmi
	maps/tgstation2.dmm

2014-06-17 16:16:44 +04:00

..

antimatter

Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.

2014-06-11 01:14:38 +09:30

singularity

Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.

2014-06-11 01:14:38 +09:30

apc.dm

Merge pull request #5219 from Zuhayr/autolathe

2014-06-12 20:28:44 +04:00

batteryrack.dm

Let's test this rebase thing.

2014-06-14 15:20:25 +01:00

cable_heavyduty.dm

…

cable_logic.dm

- Added ground code for logic elements. Currently supports sensors, indicators, negators, two input and gates, or gates, xor gates, xnor (equivalence) gates and a relay, with one control input that works by logic laws and another input and output that work by powernet laws.

2012-10-12 22:46:24 +00:00

cable.dm

Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.

2014-06-11 01:14:38 +09:30

cell.dm

Changes most viable, used entries of plasma with phoron.

2014-04-10 05:05:04 -07:00

engine.dm

-Changed turf creations, merging everything to only one proc

2012-11-13 13:39:00 +00:00

generator_type2.dm

removed debug output for type 2 TEGs

2013-03-05 17:06:43 +10:00

generator.dm

Quick fix to TEG

2014-05-20 07:12:28 +04:00

gravitygenerator.dm

World loops 2: Electric Boogaloo.

2013-07-01 19:43:56 +04:00

lighting.dm

Merge branch 'master' into dev

2014-06-17 16:16:44 +04:00

pacman2.dm

Merge remote-tracking branch 'upstream/master' into dev

2014-05-08 19:27:02 +01:00

port_gen.dm

More changes. Added uses for tritium, m.hydrogen and platinum. Increased cargo price for phoron.

2014-06-08 01:39:49 +09:30

power.dm

Removed my debug lines.

2014-03-08 03:55:22 -06:00

smes.dm

-Fixed: Trying to build a terminal without enough cables would leave SMES bugged out until VV'ed.

2014-06-03 17:35:14 +01:00

solar.dm

Changes most viable, used entries of plasma with phoron.

2014-04-10 05:05:04 -07:00

switch.dm

…

terminal.dm

…

tracker.dm

-Changed the powernet nodes list to be a dictionary list (associative list, hashtable, etc..)

2012-12-29 07:24:42 +00:00

turbine.dm

Fixes circuit var for other consoles

2014-05-22 18:05:57 -04:00