PsiOmega f9306431b7 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/mob/living/carbon/human/human.dm

2015-05-14 22:20:58 +02:00

..

antimatter

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

rust

Merge pull request #8946 from Zuhayr/miningstuff

2015-05-12 13:13:31 +03:00

sensors

mood lighting for computers

2015-05-10 20:54:29 +01:00

singularity

Dev merge.

2015-05-11 18:45:14 +09:30

apc.dm

Merge pull request #9073 from PsiOmegaDelta/QDels

2015-05-12 18:26:57 +03:00

batteryrack.dm

Updates code based off of GinjaNinja's Feedback

2015-05-05 17:16:10 +02:00

breaker_box.dm

…

cable_heavyduty.dm

…

cable_logic.dm

…

cable.dm

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

cell.dm

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

2015-05-14 22:20:58 +02:00

engine.dm

…

fractal_reactor.dm

…

generator_type2.dm

…

generator.dm

…

gravitygenerator.dm

remove the sub-area system

2015-05-10 17:06:29 +01:00

lighting.dm

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

pacman2.dm

…

port_gen.dm

…

power.dm

remove the sub-area system

2015-05-10 17:06:29 +01:00

powernet.dm

remove the sub-area system

2015-05-10 17:06:29 +01:00

profiling.dm

…

smes_construction.dm

…

smes.dm

Adds Destroys.

2015-04-24 17:11:14 +02:00

solar.dm

initialize() should now always be called, be it on game starting up or object being created after game start.

2015-04-30 19:28:35 +02:00

terminal.dm

Terminals, scrubbers, airlocks, and alarms get a Destroy() review.

2015-05-12 08:16:30 +02:00

tracker.dm

…

turbine.dm

…