mwerezak 229f4cb043 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color ...

Conflicts:
	code/modules/customitems/item_defines.dm

2015-04-26 02:04:59 -04:00

..

antagonist

Makes crit oxyloss and malf AI time run in gametime instead of realtime.

2015-04-23 04:42:58 -04:00

area

Merge pull request #8855 from comma/soundenv

2015-04-23 17:04:30 +09:30

dna

Removed some cocked up files.

2015-04-13 22:58:32 +09:30

gamemodes

Merge pull request #8941 from Baystation12/master

2015-04-22 09:32:56 +02:00

jobs

Fixes #7943.

2015-04-18 11:52:03 +02:00

machinery

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color

2015-04-26 02:04:59 -04:00

magic

…

mecha

Spans instead of fonts.

2015-04-17 15:34:37 +03:00

objects

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color

2015-04-26 02:04:59 -04:00

turfs

Ports /vg/'s Nas-Sie remake.

2015-04-12 16:19:16 +02:00

vehicles

…

verbs

Merge pull request #8380 from volas/sanitize_procs

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

asteroid.dm

…

atoms_movable.dm

Mob refactoring.

2015-03-29 10:44:31 +02:00

atoms.dm

Ports /vg/'s Nas-Sie remake.

2015-04-12 16:19:16 +02:00

json.dm

…

periodic_news.dm

…

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

Finalized monkey species definitions and icons.

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