GinjaNinja32
|
c77605265c
|
code/game/objects, code/game/machinery merge fix
|
2015-06-02 20:18:45 +01:00 |
|
Kelenius
|
317abc6b79
|
Merge branch 'dev' into ofChemistryAndStuff
Conflicts:
code/datums/recipe.dm
code/game/machinery/bots/farmbot.dm
code/game/machinery/bots/medbot.dm
code/game/mecha/equipment/tools/tools.dm
code/game/objects/effects/chem/chemsmoke.dm
code/game/objects/effects/effect_system.dm
code/game/objects/items/toys.dm
code/game/objects/items/weapons/extinguisher.dm
code/game/objects/items/weapons/mop.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/organs/organ_internal.dm
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/Chemistry-Recipes.dm
code/modules/reagents/reagent_containers/food/snacks.dm
code/modules/reagents/reagent_containers/pill.dm
code/modules/reagents/reagent_containers/spray.dm
maps/exodus-1.dmm
|
2015-04-28 10:49:26 +03:00 |
|
PsiOmega
|
1ae0ad6d92
|
Updates the atom_pool, now datum_pool, to handle any datum object.
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
|
2015-04-24 09:59:05 +02:00 |
|
Kelenius
|
b4b635f32d
|
Chemistry commit
I messed something in the git
|
2015-03-25 19:09:10 +03:00 |
|
Chinsky
|
72463a35f3
|
Another pass at WIP folder
|
2015-02-03 12:14:13 +03:00 |
|