Markolie aca3a2cecb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into powernet ...

Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
	code/game/machinery/alarm.dm
	code/modules/power/smes.dm

2015-08-01 21:44:47 +02:00

..

newchem

Update upgradable machinery New code

2015-07-30 22:19:32 +02:00

reagent_containers

Update smartfridge types, merge branch 'master' of https://github.com/ParadiseSS13/Paradise into powernet

2015-08-01 19:35:39 +02:00

Chemistry-Colours.dm

Fixes colors runtiming. Oops.

2015-05-14 00:51:45 -04:00

Chemistry-Holder.dm

Merge pull request #1480 from Fox-McCloud/qdel-the-dels

2015-07-09 22:37:43 -04:00

Chemistry-Machinery.dm

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

2015-08-01 19:41:11 +02:00

Chemistry-Readme.dm

…

Chemistry-Reagents.dm

The Great Del() Cull of 2015

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

Chemistry-Recipes.dm

Freezing is silent

2015-07-09 05:49:56 -04:00

dartgun.dm

The Great Del() Cull of 2015

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

grenade_launcher.dm

Who needs cream pie logging anyways

2015-05-29 19:09:20 -04:00

reagent_containers.dm

Destroy Pass III

2015-07-08 03:39:52 -04:00

reagent_dispenser.dm

Explosion Rework

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

syringe_gun.dm

The Great Del() Cull of 2015

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