Markolie 660ffad9a0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise ...

Conflicts:
	code/modules/power/port_gen.dm

2015-07-30 03:08:33 +02:00

..

helper_datums

Updates Nuke Disk Spawning

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

spells

Pass II

2015-07-09 19:51:40 -04:00

wires

Sort of compiles

2015-07-09 15:55:36 -04:00

ai_laws.dm

Fix OneHuman law

2015-07-22 18:35:09 +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

Fixes missing/broken admin permission checks

2015-06-08 07:55:29 -04:00

gas_mixture.dm

LINDA--Updated Gas Datums and Atmospheric Defines

2015-05-18 20:10:30 -04:00

martial.dm

Swaps Weaken Values, Fixes Span Bug

2015-07-03 01:03:59 -04:00

mind.dm

Fix cult sacrifice objective

2015-07-26 06:06:04 +02:00

mixed.dm

Powernet Tweaks

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

modules.dm

…

organs.dm

…

periodic_news.dm

Re-Enables News

2015-07-17 00:09:14 -04:00

recipe.dm

Kitchen Machine Refactor and Max Item fix

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

spell.dm

The Great Del() Cull of 2015

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

supplypacks.dm

tweak

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

uplink_item.dm

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

2015-07-28 18:40:44 +02:00