DZD 8de0140dcc Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shadowling ...

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

2015-04-21 18:56:34 -04:00

..

helper_datums

GC fixes

2015-02-25 10:58:56 -05:00

spells

Squish Squash

2015-04-04 14:27:53 -04:00

wires

Never mind the ArtVend, mapfix, compile fix, rename plastique --> C4

2015-03-08 19:05:36 +01:00

ai_laws.dm

Remove zeroth law with own board

2015-02-10 03:06:43 +01:00

browser.dm

IT WOOOOOOOOORKS

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

cargoprofile.dm

[Goonchem] Food Reagents

2015-04-10 04:46:50 -04:00

computerfiles.dm

…

datacore.dm

Final fixes

2015-04-21 18:05:43 -04:00

datumvars.dm

Might as well update golems also

2015-04-13 06:05:42 -04:00

martial.dm

Updates the drunk-brawling fighting style

2015-04-17 03:16:01 -07:00

medical_effects.dm

[Goonchem] Tweaks, Fixes, etc.

2015-03-28 21:16:13 -04:00

mind.dm

It compiles!

2015-04-12 19:54:45 -04:00

mixed.dm

…

modules.dm

…

organs.dm

…

periodic_news.dm

Announcement system overhaul, crew monitor system overhaul, add portable crew monitor

2015-02-16 19:03:29 +01:00

pizza_bomb.dm

Traitor Item Additions and Surplus Crates

2015-04-21 03:05:12 -04:00

recipe.dm

Kitchen Overhaul

2015-03-08 05:09:19 -04:00

spell.dm

Add attack animations

2015-02-22 21:15:54 +01:00

sun.dm

Goon process scheduler

2015-02-22 15:24:46 -05:00

supplypacks.dm

Adds Poster Supply Packs

2015-04-03 17:15:07 -04:00

uplink_item.dm

Traitor Item Additions and Surplus Crates

2015-04-21 03:05:12 -04:00