Remie Richards 88faef42ea Adjusts some code to reduce the rapid increase of clustering accidentally somehow caused in this improvement PR ...

Conflicts:
	code/modules/procedural mapping/mapGeneratorModules/nature.dm

2015-05-01 04:14:53 -07:00

..

admin

LINDA, Stage 1

2015-04-28 08:43:42 -07:00

assembly

Merge remote-tracking branch 'Fox/fixessssss' into okayletstrysomethingslightlydifferent

2015-04-29 15:31:21 -07:00

awaymissions

Removing all mutantrace crap except for slimepeople

2015-04-13 06:20:17 -04:00

client

Merge pull request #851 from ZomgPonies/shadow

2015-04-21 20:02:33 -04:00

clothing

Adds in Rings

2015-04-29 19:05:43 -04:00

computer3

Removing all mutantrace crap except for slimepeople

2015-04-13 06:20:17 -04:00

crafting

Revert "R&D Research Levels Unification"

2015-04-07 01:16:19 -04:00

customitems

Custom Items - Theoricus

2015-04-10 03:39:18 -04:00

destilery

…

DetectiveWork

…

economy

…

events

Modify fire_act to temperature_expose where needed

2015-04-29 16:56:12 -07:00

ext_scripts

…

flufftext

…

food

DERP

2015-04-20 16:46:30 -04:00

games

…

genetics

Squish Squash

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

genetics2

…

hydroponics

derp

2015-04-18 02:37:14 -04:00

icon generation

…

jungle

[Goonchem] Reagent Decals

2015-04-17 18:27:49 -04:00

karma

…

library

LINDA, Stage 1

2015-04-28 08:43:42 -07:00

liquid

…

media

…

mining

Adds in Rings

2015-04-29 19:05:43 -04:00

mob

Modify fire_act to temperature_expose where needed

2015-04-29 16:56:12 -07:00

nano

…

ninja

…

organs

Merge pull request #886 from veganzombeh/vampire

2015-04-27 11:08:02 -04:00

paperwork

Merge pull request #895 from tigercat2000/okayletstrysomethingslightlydifferent

2015-04-30 13:18:48 -04:00

power

Modify fire_act to temperature_expose where needed

2015-04-29 16:56:12 -07:00

procedural mapping

Adjusts some code to reduce the rapid increase of clustering accidentally somehow caused in this improvement PR

2015-05-01 04:14:53 -07:00

projectiles

Merge pull request #910 from Fox-McCloud/projectile-fix

2015-04-30 18:30:35 -04:00

reagents

Restore CLF3 to standard level

2015-04-29 17:17:34 -07:00

recycling

LINDA, Stage 1

2015-04-28 08:43:42 -07:00

research

LINDA, Stage 1

2015-04-28 08:43:42 -07:00

scripting

…

security levels

…

shieldgen

Revert "R&D Research Levels Unification"

2015-04-07 01:16:19 -04:00

shuttles

DS Radio and Rapid Deployment Fix

2015-03-29 19:25:32 -04:00

store

Byond doesn't like special characters in type paths, apparently

2015-04-08 15:09:33 -07:00

supermatter

LINDA, Stage 1

2015-04-28 08:43:42 -07:00

surgery

Fixes surgery bugs & removes organ rejection

2015-04-14 22:12:19 -04:00

telesci

Revert "R&D Research Levels Unification"

2015-04-07 01:16:19 -04:00

vehicle

New vehicle: Four-Wheeler, (ATV)

2015-04-20 07:58:13 -07:00

virus2

Squish Squash

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