Markolie 8bede1db99 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ipcmasterrace ...

Conflicts:
	code/modules/mob/living/simple_animal/friendly/fox.dm
	code/modules/organs/organ_alien.dm

2015-08-18 18:38:59 +02:00

..

antimatter

-tg- atom pooling system, qdel changes

2015-06-21 15:47:57 -07:00

singularity

Consolidate ?/FLW links under key_name_admin

2015-08-17 00:13:53 +02:00

supermatter

Consolidate ?/FLW links under key_name_admin

2015-08-17 00:13:53 +02:00

apc.dm

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

2015-08-18 18:38:59 +02:00

cable_heavyduty.dm

Icon and Sound Cleanup

2015-06-06 09:38:10 -04:00

cable_logic.dm

Powernet Tweaks

2015-06-14 17:21:01 -04:00

cable.dm

Final IPC fixes (hopefully)

2015-08-16 03:43:20 +02:00

cell.dm

Explosion Rework

2015-06-20 04:13:55 -04:00

engine.dm

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

generator_type2.dm

…

generator.dm

TeG spark cap increase, it was scrub previously

2015-05-22 02:34:51 +02:00

gravitygenerator.dm

-tg- atom pooling system, qdel changes

2015-06-21 15:47:57 -07:00

lighting.dm

qdel pass II

2015-07-11 02:10:31 -04:00

port_gen.dm

Upgraded pacman fix

2015-08-01 19:37:58 +02:00

power.dm

New proc to replace world.log <<, log_to_dd()

2015-08-14 18:18:57 -07:00

powernet.dm

Tweak electrocution damage from power gloves, GC update

2015-08-02 19:10:31 +02:00

smes.dm

SMES (de)construction fixes

2015-08-12 22:14:47 +02:00

solar.dm

Solar control initialization fix

2015-08-03 01:14:06 +02:00

switch.dm

Removes TABLEPASS and FPRINT flags

2015-02-10 17:41:37 -05:00

terminal.dm

Powernet rework

2015-07-31 23:59:41 +02:00

tracker.dm

GC fixes

2015-08-01 01:09:44 +02:00

turbine.dm

Powernet rework

2015-07-31 23:59:41 +02:00