PsiOmegaDelta 6a22086c17 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/verbs/suicide.dm
	code/modules/nano/modules/crew_monitor.dm

2015-12-06 11:34:36 +01:00

..

antimatter

Changed steel material name to a define.

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

sensors

NanoUI sources can now be datums instead of atom/movable.

2015-06-08 17:06:06 +02:00

singularity

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

2015-07-01 22:46:40 +02:00

apc.dm

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

2015-12-06 11:34:36 +01:00

batteryrack.dm

Merge branch 'dev' into ofResearchAndPrototypes

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

breaker_box.dm

Compilation fixes.

2015-06-16 11:03:25 +02:00

cable_heavyduty.dm

…

cable_logic.dm

…

cable.dm

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

2015-08-11 18:47:05 +01:00

cell.dm

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

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

engine.dm

Refactored random map generator system and added several terrain generators.

2015-06-03 04:36:19 +09:30

fractal_reactor.dm

Fractal Energy Reactor can now be mapped in.

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

generator_type2.dm

…

generator.dm

Merge resolution with master.

2015-06-28 06:02:52 +09:30

gravitygenerator.dm

remove the sub-area system

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

lighting.dm

Merge pull request #10784 from Kelenius/masterRuntimes

2015-09-07 14:01:24 +09:30

pacman2.dm

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

port_gen.dm

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

power.dm

More Destroy()s, better implementation

2015-06-06 11:04:41 +02:00

powernet.dm

Refactors get_apc()

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

profiling.dm

…

smes_construction.dm

Compilation fixes.

2015-06-16 11:03:25 +02:00

smes.dm

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

2015-06-16 10:52:33 +02:00

solar.dm

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

2015-10-31 16:31:05 +01: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