skull132 a5848c2802 Merge branch 'development' into map-development ...

# Conflicts:
#	baystation12.dme
#	code/game/objects/random/random.dm
#	code/game/turfs/turf_changing.dm
#	code/modules/mining/ore.dm
#	code/modules/mob/living/silicon/robot/robot_modules.dm

2017-05-01 01:07:56 +03:00

..

antimatter

/vg/ AME port (#1831)

2017-03-05 22:05:57 +02:00

sensors

More fixes (#1405)

2017-01-07 12:47:56 +02:00

singularity

UDP Logging (#1997)

2017-04-01 23:47:00 +03:00

tesla

Tesla Standardization

2016-02-21 22:24:14 +02:00

apc.dm

Code Cleanup: Destroy() fixes part 1 + Misc Fixes (#1933)

2017-03-18 23:06:24 +02:00

batteryrack.dm

…

breaker_box.dm

Air alarm cleanup + Object Descriptions (#1354)

2016-12-31 04:19:02 +02:00

cable_heavyduty.dm

…

cable_logic.dm

…

cable.dm

Fix nooses runtime and food capitalization (#1955)

2017-03-21 06:49:44 +02:00

cell.dm

UDP Logging (#1997)

2017-04-01 23:47:00 +03:00

fractal_reactor.dm

…

generator_type2.dm

…

generator.dm

Processor-driven effects system & Minor Lighting Performance Tweaks (#1697)

2017-02-04 03:34:13 +02:00

gravitygenerator.dm

…

lighting.dm

Merge branch 'development' into map-development

2017-05-01 01:07:56 +03:00

pacman2.dm

…

port_gen.dm

…

power.dm

Fixes blobs and other stuff (#1513)

2017-01-11 22:24:39 +02:00

powernet.dm

SMES Load Balancing

2016-01-12 21:38:23 +01:00

profiling.dm

UDP Logging (#1997)

2017-04-01 23:47:00 +03:00

smes_construction.dm

UDP Logging (#1997)

2017-04-01 23:47:00 +03:00

smes.dm

Spark Fixes (#1764)

2017-02-14 14:37:16 +02:00

solar.dm

Probably fixes all the issues with computers sprites (#1378)

2017-01-03 01:36:00 +02:00

terminal.dm

…

tracker.dm

…

turbine.dm

BayMerge Bugfix; Fixing guns, update computers. (#1263)

2016-12-21 21:48:04 +02:00