ccomp5950 6736fb54e7 Merge branch '_base-turf' of https://github.com/mwerezak/Baystation12 into dev ...

Conflicts:
	code/game/area/Space Station 13 areas.dm

2015-12-17 20:25:36 -05:00

..

antimatter

Updates blob

2015-10-05 18:10:16 +03:00

sensors

Implements a reasonable /hide() default.

2015-12-04 11:15:44 +01:00

singularity

Updates all get_base_turf usages to get_base_turf_by_area.

2015-12-06 14:01:21 -05:00

apc.dm

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

2015-12-06 11:48:20 +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

Removed intact var in favour of is_plating() proc, fixed issues with invisible initialized pipes.

2015-08-16 17:51:19 -07:00

cable_logic.dm

…

cable.dm

Merge pull request #11645 from PsiOmegaDelta/151209-CableRainbow

2015-12-12 02:54:49 +03:00

cell.dm

Updates blob

2015-10-05 18:10:16 +03:00

fractal_reactor.dm

…

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

Map cleanup, tweaks and merge fixes.

2015-11-02 10:05:14 +01:00

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

Destroy tweaks.

2015-09-25 10:44:23 +02:00

power.dm

Removed intact var in favour of is_plating() proc, fixed issues with invisible initialized pipes.

2015-08-16 17:51:19 -07:00

powernet.dm

Improves powernet destruction.

2015-09-16 08:00:22 +02:00

profiling.dm

…

smes_construction.dm

Updates gridcheck behavior

2015-11-07 17:11:25 +01:00

smes.dm

Ghosts can now view any object with a NanoUI interface.

2015-11-22 12:21:41 +01:00

solar.dm

Merge pull request #11397 from Baystation12/dev-freeze

2015-10-31 16:43:02 +01:00

terminal.dm

Implements a reasonable /hide() default.

2015-12-04 11:15:44 +01:00

tracker.dm

Major sheet and material refactor.

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

turbine.dm

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-20 14:09:07 +02:00