Ccomp5950 c028db481e Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	code/modules/mob/living/carbon/monkey/diona.dm
	code/modules/reagents/Chemistry-Machinery.dm

2014-01-23 00:05:53 -06:00

..

antimatter

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

singularity

Fixed rad collector toxin drain bug

2014-01-20 16:16:02 +13:00

apc.dm

Added leaving prints on APCs when using item on them

2013-12-25 22:11:13 +10:30

cable_heavyduty.dm

…

cable_logic.dm

…

cable.dm

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

cell.dm

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

engine.dm

…

generator_type2.dm

…

generator.dm

…

gravitygenerator.dm

World loops 2: Electric Boogaloo.

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

lighting.dm

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

pacman2.dm

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

port_gen.dm

…

power.dm

Implements hooks, an easier way to write code to be called at startup/roundstart/roundend.

2013-11-25 21:16:09 +00:00

smes.dm

SMES fix, AI's can now use them.

2014-01-19 21:26:15 -06:00

solar.dm

…

switch.dm

…

terminal.dm

…

tracker.dm

…

turbine.dm

World loops 2: Electric Boogaloo.

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