Markolie 90f722d752 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into intercom ...

Conflicts:
	code/modules/projectiles/guns/projectile/automatic.dm
	icons/mob/back.dmi

2015-09-15 04:18:27 +02:00

..

cache

sortAtom improvements

2015-08-28 23:52:27 +02:00

helper_datums

Updates Nuke Disk Spawning

2015-07-24 17:33:25 -04:00

spells

Lightning bolt spell progress bar

2015-09-12 19:43:23 -04:00

wires

Fix reference to nuke

2015-08-20 21:57:41 +02:00

ai_law_sets.dm

Fix Antimov typo

2015-09-03 20:20:17 +02:00

ai_laws.dm

Port Bay's silicon law manager

2015-08-31 02:18:49 +02:00

browser.dm

IT WOOOOOOOOORKS

2014-12-06 16:19:47 -05:00

cargoprofile.dm

Blob Mode Major Overhaul

2015-07-12 02:45:40 -04:00

computerfiles.dm

…

datacore.dm

NanoUI traitor uplink

2015-07-28 06:28:01 +02:00

datumvars.dm

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

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

gas_mixture.dm

Buff scrubbers and add widenet 3x3 scrubbing

2015-08-03 23:22:25 +02:00

martial.dm

In hand sprite overhaul

2015-09-13 22:44:18 +02:00

material_container.dm

Fixes Autolathes and Stacks

2015-09-13 18:59:36 -04:00

mind.dm

Port Bay's silicon law manager

2015-08-31 02:18:49 +02:00

mixed.dm

Powernet rework

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

modules.dm

…

organs.dm

…

periodic_news.dm

Replaces typesof with subtypesof where applicable

2015-08-03 11:04:28 -04:00

recipe.dm

Kitchen Machine Refactor and Max Item fix

2015-07-10 09:46:30 -04:00

spell.dm

Nukes useless /wizard/ spell pathing

2015-08-08 14:06:50 -04:00

supplypacks.dm

Cargo interface overhaul

2015-08-24 19:20:20 +02:00

uplink_item.dm

Guns update

2015-09-14 04:05:20 +02:00