Kelenius 41ff9819bd Merge branch 'dev' into ofChemistryAndStuff ...

Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/organs/organ_internal.dm
	code/modules/organs/organ_objects.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/syringes.dm

2015-03-31 17:44:42 +03:00

..

chem

Chemistry commit

2015-03-25 19:09:10 +03:00

decals

Merge branch 'dev' into ofChemistryAndStuff

2015-03-31 17:44:42 +03:00

spawners

Refactored gibbing and slipping for carbon mobs, entirely removed mutantrace var. This commit is only partial, following commits are contiguous to it (lol this is atomic right)

2014-12-23 17:38:05 +10:30

aliens.dm

Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP.

2015-03-11 21:17:51 +10:30

bump_teleporter.dm

…

effect_system.dm

Chemistry commit

2015-03-25 19:09:10 +03:00

explosion_particles.dm

Another pass at WIP folder

2015-02-03 12:14:13 +03:00

gibs.dm

Fixes and tweaks to the previous.

2014-12-23 22:03:02 +10:30

glowshroom.dm

Renamed some files, did some path replacements

2015-02-04 10:48:18 +10:30

landmarks.dm

Gamemode refactor, lots of code shuffles, PR will have details.

2015-03-21 11:08:17 +10:30

manifest.dm

…

mines.dm

Preliminary work on converting all monkeys to a human subspecies.

2015-03-25 02:15:45 +10:30

misc.dm

…

overlays.dm

…

portals.dm

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

2014-09-10 22:14:37 +01:00

spiders.dm

Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev

2014-09-29 06:19:26 +09:30

step_triggers.dm

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00