Tigercat2000 296e689e7e Merge remote-tracking branch 'upstream/master' into tgcam ...

Conflicts:
	code/modules/mob/living/carbon/human/human.dm

2016-03-14 14:45:21 -07:00

..

cache

sortAtom improvements

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

helper_datums

Fixes /datum/events, and by proxy the cable layer

2016-03-06 20:08:37 -05:00

spells

daemon

2016-03-11 01:48:09 -05:00

wires

Port -tg-station cameranets

2016-03-13 15:06:24 -07:00

ai_law_sets.dm

Restore drone law order

2015-12-23 12:09:40 -08:00

ai_laws.dm

Port Bay's silicon law manager

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

beam.dm

Ports TG Beam Code and Medigun

2015-12-16 21:05:10 -05:00

browser.dm

HTML5 and CSS3 for NanoUI + Datum Browser

2015-11-06 11:27:32 -08:00

cargoprofile.dm

Removes Halloss

2016-03-03 23:26:41 -05:00

computerfiles.dm

…

datacore.dm

Woo everything's done

2016-02-01 09:19:05 -08:00

datumvars.dm

Merge pull request #2903 from Aurorablade/OrganRefactor

2016-03-04 19:51:50 -05:00

gas_mixture.dm

Gas Mixture Refactor and Speedup

2015-12-27 18:58:16 -05:00

hud.dm

Merge branch 'OrganRefactor' of https://github.com/Aurorablade/Paradise; branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor

2016-01-21 21:11:26 -05:00

martial.dm

carp grab fix

2016-02-11 21:45:30 -05:00

material_container.dm

Adds tranquillite

2016-03-06 01:49:30 -05:00

mind.dm

Refactors vampire abiliies to be spells

2016-03-10 07:01:31 -05:00

mixed.dm

Fixes Records

2015-12-05 19:01:51 -05:00

modules.dm

scream

2015-10-08 19:22:11 -04:00

periodic_news.dm

…

recipe.dm

…

spell.dm

Refactors vampire abiliies to be spells

2016-03-10 07:01:31 -05:00

supplypacks.dm

Brings justice to the station

2016-03-07 17:50:41 -05:00

uplink_item.dm

Merge pull request #3836 from Fox-McCloud/chem-tweaks

2016-03-12 20:20:33 -05:00

vision_override.dm

Spelling and sanity fixes

2015-09-23 16:20:06 -04:00