Atlantis 1da44dc861 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge ...

- Merge resolution: Updates intellicard NanoUI to correctly show separate hardware integrity/backup capacitor percentages.

2015-05-24 20:23:46 +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

Implements github suggestions

2015-05-23 22:22:38 +02:00

batteryrack.dm

Updates code based off of GinjaNinja's Feedback

2015-05-05 17:16:10 +02: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

Changed steel material name to a define.

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

cell.dm

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

2015-05-22 08:26:13 +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

…

generator_type2.dm

…

generator.dm

…

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

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

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

port_gen.dm

Merge with master.

2015-05-23 21:29:40 +09:30

power.dm

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

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

powernet.dm

remove the sub-area system

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

profiling.dm

…

smes_construction.dm

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

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

smes.dm

Adds Destroys.

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

solar.dm

Major sheet and material refactor.

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

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