Markolie 1d7de41acb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna ...

# Conflicts:
#	code/modules/pooling/pool.dm

2017-01-27 17:28:14 +01:00

..

singularity

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna

2017-01-12 16:24:26 +01:00

supermatter

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna

2017-01-06 16:36:46 +01:00

tesla

Lay groundwork for megafauna, and add Ashdragon.

2016-10-23 23:15:57 +02:00

apc.dm

Merge pull request #6120 from TullyBurnalot/OverOverload

2017-01-15 12:44:47 -05:00

cable_heavyduty.dm

…

cable_logic.dm

…

cable.dm

Delays and Welder Repair Tweaks

2016-08-19 21:34:39 -04:00

cell.dm

logging changes

2017-01-25 23:44:27 -05:00

engine.dm

…

generator.dm

Naming and using updated

2017-01-15 19:48:14 +02:00

gravitygenerator.dm

UID mass replace: src=\ref[src]

2016-09-05 23:02:10 -04:00

lighting.dm

logging changes

2017-01-25 23:44:27 -05:00

port_gen.dm

Adds a ui_key arg to ui_data

2016-12-31 12:51:07 -08:00

power.dm

…

powernet.dm

…

smes.dm

Adds a ui_key arg to ui_data

2016-12-31 12:51:07 -08:00

solar.dm

Adds a ui_key arg to ui_data

2016-12-31 12:51:07 -08:00

switch.dm

…

terminal.dm

…

tracker.dm

…

treadmill.dm

Fox's requests

2016-10-23 15:45:35 -07:00

turbine.dm

UID mass replace: src=\ref[src]

2016-09-05 23:02:10 -04:00