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

..

cache

Further caching updates

2015-08-11 18:28:45 +02:00

helper_datums

Updates Nuke Disk Spawning

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

spells

Lightning Bolt Buff

2015-08-09 18:58:53 -04:00

wires

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

2015-08-03 00:04:24 +02:00

ai_laws.dm

Replaces typesof with subtypesof where applicable

2015-08-03 11:04:28 -04: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

Nukes useless /wizard/ spell pathing

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

mind.dm

Cult loyalty implant fix

2015-08-17 19:24:21 +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

tweak

2015-06-30 21:24:26 -04:00

uplink_item.dm

Update syndi toolbox description

2015-08-13 21:02:42 +02:00