PsiOmegaDelta 9057655da6 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/clothing/clothing.dm
	code/modules/clothing/spacesuits/spacesuits.dm
	code/modules/clothing/spacesuits/void/merc.dm
	code/modules/clothing/spacesuits/void/void.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/silicon/ai/ai.dm

2015-08-24 10:31:30 +02:00

..

air.dm

Adds processes, next step is to replace them in the current MC and ticker

2015-02-19 05:09:35 -05:00

alarm.dm

Adds Destroys.

2015-04-24 17:11:14 +02:00

chemistry.dm

Implements reaction-over-time and reaction yield

2015-05-30 16:44:24 -04:00

disease.dm

Adds Destroys.

2015-04-24 17:11:14 +02:00

emergencyShuttle.dm

Adds processes, next step is to replace them in the current MC and ticker

2015-02-19 05:09:35 -05:00

event.dm

Adds processes, next step is to replace them in the current MC and ticker

2015-02-19 05:09:35 -05:00

garbage.dm

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

2015-08-16 05:40:47 -07:00

inactivity.dm

Inactivity process tweaks.

2015-05-26 09:04:26 +02:00

initialize.dm

Re-implements admin fun events as datums.

2015-07-07 11:19:01 +02:00

lighting.dm

Adds processes, next step is to replace them in the current MC and ticker

2015-02-19 05:09:35 -05:00

machinery.dm

Machinery controller now reports amounts of powernets and pipenets as well.

2015-08-20 23:06:52 +02:00

mob.dm

Adds Destroys.

2015-04-24 17:11:14 +02:00

nanoui.dm

Adds Destroys.

2015-04-24 17:11:14 +02:00

obj.dm

Adds Destroys.

2015-04-24 17:11:14 +02:00

Shuttle.dm

Adds processes, next step is to replace them in the current MC and ticker

2015-02-19 05:09:35 -05:00

sun.dm

Adds processes, next step is to replace them in the current MC and ticker

2015-02-19 05:09:35 -05:00

supply.dm

Adds processes, next step is to replace them in the current MC and ticker

2015-02-19 05:09:35 -05:00

ticker.dm

Adds processes, next step is to replace them in the current MC and ticker

2015-02-19 05:09:35 -05:00

turf.dm

Limits wall processing.

2015-05-16 11:27:19 +02:00

vote.dm

Adds processes, next step is to replace them in the current MC and ticker

2015-02-19 05:09:35 -05:00