PsiOmega 5b8f055595 Merge remote-tracking branch 'upstream/dev' into PCAILaws ...

Conflicts:
	code/game/objects/items/weapons/AI_modules.dm

2015-03-28 20:26:24 +01:00

..

diseases

sanitize() refactor: third pass (misc)

2015-03-25 01:05:21 +03:00

helper_datums

Replaces stool structures with stool items

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

wires

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

2015-03-13 09:23:26 +01:00

ai_law_sets.dm

Changes the silicon is_malf/is_traitor procs to utilize the new antag datums.

2015-03-25 19:27:03 +01:00

ai_laws.dm

Changes the silicon is_malf/is_traitor procs to utilize the new antag datums.

2015-03-22 17:43:20 +01:00

browser.dm

Fixed up security, medical, card, and crew. Made Computer 3 actually do what it's supposed to do.

2014-06-22 03:31:06 -07:00

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

sanitize() refactor: first pass (sanitize)

2015-03-22 23:31:19 +03:00

disease.dm

Update disease.dm

2013-09-01 23:42:35 -07:00

mind.dm

Merge pull request #8380 from volas/sanitize_procs

2015-03-29 00:57:33 +10:30

mixed.dm

Powernets

2014-09-07 01:10:22 -04:00

modules.dm

…

organs.dm

…

recipe.dm

KITCHEN CODE IS WORKING. YES. I CAN DIE NOW.

2015-02-16 22:11:59 +10:30

sun.dm

finishes work on adapting the goon process scheduler for BS12.

2015-03-04 05:14:36 -05:00

supplypacks.dm

Merge remote-tracking branch 'upstream/dev' into reagent_dispenser

2015-03-16 21:21:56 +00:00