PsiOmega 66c56926d0 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/gamemodes/cult/runes.dm

2015-04-08 10:40:38 +02:00

..

diseases

…

helper_datums

Replaces stool structures with stool items

2015-02-18 01:06:00 -05:00

spells

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-04-08 10:40:38 +02:00

wires

Merge pull request #8660 from Baystation12/master

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

ai_laws.dm

…

browser.dm

…

computerfiles.dm

…

datacore.dm

Collapsed space vines, glowshrooms and biomass into one spreading-plant system.

2015-02-04 10:49:41 +10:30

datumvars.dm

…

disease.dm

…

mind.dm

Removes the vox armalis.

2015-03-27 16:41:32 +10:30

mixed.dm

…

modules.dm

…

organs.dm

…

recipe.dm

Switches hacky list copying method in check_items and check_fruit to use Copy(). Uses Cut() to make sure that one item does not satisfy the need for multiple items of the same type.

2015-04-01 11:41:46 -04:00

spell.dm

…

sun.dm

…

supplypacks.dm

Adds orderable flaregun crate

2015-03-09 16:00:49 -04:00