Kelenius 24ef7752cd Merge branch 'Baystation12/dev' into ofChemistryAndStuff ...

Conflicts:
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/carbon/monkey/monkey.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/glass.dm

2015-03-28 19:14:59 +03:00

..

antagonist

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

2015-03-25 01:06:32 +03:00

area

First pass on making heist a pirate mode (human based)

2015-03-21 11:13:05 +10:30

dna

Merge branch 'Baystation12/dev' into ofChemistryAndStuff

2015-03-28 19:14:59 +03:00

gamemodes

Merge pull request #8380 from volas/sanitize_procs

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

jobs

Merge pull request #8380 from volas/sanitize_procs

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

machinery

Merge branch 'Baystation12/dev' into ofChemistryAndStuff

2015-03-28 19:14:59 +03:00

magic

Cleanup helper files maths.dm, time.dm, type2type.dm, add macros for bit-manipulation

2015-01-09 21:55:11 +06:00

mecha

Merge branch 'Baystation12/dev' into ofChemistryAndStuff

2015-03-28 19:14:59 +03:00

objects

Merge branch 'Baystation12/dev' into ofChemistryAndStuff

2015-03-28 19:14:59 +03:00

turfs

Preliminary work on converting all monkeys to a human subspecies.

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

vehicles

…

verbs

Merge pull request #8380 from volas/sanitize_procs

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

asteroid.dm

…

atoms_movable.dm

…

atoms.dm

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

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

json.dm

…

periodic_news.dm

Another pass at WIP folder

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

response_team.dm

sanitize() refactor: third pass (misc)

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

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

Rewriting the /obj/effect/glowshroom into a more general system.

2015-02-04 10:49:09 +10:30

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

Finalized monkey species definitions and icons.

2015-03-26 14:45:41 +10:30