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

Conflicts:
	code/game/jobs/job/job.dm
	code/game/jobs/job/silicon.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/carbon/human/species/station/station.dm
	code/modules/organs/organ_external.dm
	icons/obj/objects.dmi

2015-06-01 09:07:03 +02:00

..

antimatter

Changed steel material name to a define.

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

rust

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

sensors

mood lighting for computers

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

singularity

End game turf changes now simply alters color.

2015-05-29 23:38:09 +02:00

apc.dm

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

2015-06-01 09:07:03 +02:00

batteryrack.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

breaker_box.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

cable_heavyduty.dm

…

cable_logic.dm

…

cable.dm

Additional IPC tweaks.

2015-05-31 02:30:57 +09:30

cell.dm

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

2015-05-30 16:11:57 +02:00

engine.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

fractal_reactor.dm

Fractal Energy Reactor can now be mapped in.

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

generator_type2.dm

…

generator.dm

Adds a bunch of prettiness to the TEG, fixes a runtime.

2015-03-04 09:13:05 -05:00

gravitygenerator.dm

remove the sub-area system

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

lighting.dm

Merge pull request #9390 from mwerezak/attack-animation

2015-05-21 06:52:30 +02:00

pacman2.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

port_gen.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-25 20:35:46 +03:00

power.dm

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

2015-05-22 08:26:13 +02:00

powernet.dm

Refactors get_apc()

2015-05-28 17:11:26 +02:00

profiling.dm

…

smes_construction.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

smes.dm

Adds Destroys.

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

solar.dm

Telecommunications Solar Arrays

2015-05-25 06:18:10 +02:00

terminal.dm

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

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

tracker.dm

Major sheet and material refactor.

2015-05-17 01:46:53 +09:30

turbine.dm

Renamed shards, katanas, claymores.

2015-05-16 20:36:33 +09:30