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

Conflicts:
	code/modules/admin/topic.dm

2015-08-22 02:30:14 +09:30

..

borer

Merge branch 'dev' into ofClicksAndCooldowns

2015-08-13 08:40:31 +03:00

constructs

Post-merge fixes.

2015-08-06 08:18:39 +02:00

friendly

Minor holder refactor.

2015-08-13 17:31:42 +09:30

hostile

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

corpse.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

head.dm

…

kobold.dm

Revert "get rid of mob.see_in_dark and species.darksight"

2015-07-22 15:14:40 +01:00

parrot.dm

sanitize() refactor: fourth pass

2015-04-03 00:40:57 +03:00

shade.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

simple_animal.dm

Merge branch 'dev' into ofClicksAndCooldowns

2015-08-13 08:40:31 +03:00

worm.dm

Major sheet and material refactor.

2015-05-17 01:46:53 +09:30