Kreastr 001ea33ce0 Merge branch 'animation' ...

Merging animation fixes

Conflicts:
	baystation12.dme
	code/defines/obj.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/mob_movement.dm
	config/admins.txt

2012-11-07 01:38:28 +02:00

..

admin

I am ashamed

2012-11-04 21:35:49 -05:00

assembly

Fixed Security HUD issues, reinstated old grenade behavior, de-nerfed Polyacid

2012-11-04 16:17:35 -07:00

awaymissions

made away missions actually load properly, also added a command report / admin report when they become active. made all away missions except wizard academy possible destinations

2012-10-27 19:59:05 +10:00

chemical

Added attack logging, some moderator groundwork, fixed alien species and save files.

2012-09-23 21:49:25 +01:00

client

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport

2012-10-21 01:25:04 +10:00

clothing

Alternative titles system.

2012-10-31 08:40:51 +04:00

critters

various mergefixes

2012-10-09 22:49:38 +10:00

customitems

Fixed custom welding helmets paths, making them act as welding helmets again.

2012-11-01 02:57:54 +04:00

DetectiveWork

retrack detective files

2012-11-05 01:16:21 +10:00

flufftext

…

food

Merge remote-tracking branch 'remotes/git-svn' r4881 into bs12_with_tgport

2012-10-15 23:17:18 +10:00

icon generation

…

library

…

liquid

…

maps

…

mining

Fixed my ore box mistakes

2012-10-25 08:48:25 -07:00

mob

Merge branch 'animation'

2012-11-07 01:38:28 +02:00

paperwork

Added ability to clip photos to clipboards.

2012-11-04 21:03:17 +04:00

power

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport

2012-10-21 01:25:04 +10:00

projectiles

Proted instabeams for energy projectiles.

2012-11-06 20:35:48 +04:00

reagents

Removed the ability to create vira.

2012-11-05 19:49:30 +01:00

recycling

Merge remote-tracking branch 'remotes/git-svn' r4920 into bs12_with_tgport

2012-10-21 00:25:05 +10:00

research

Proted instabeams for energy projectiles.

2012-11-06 20:35:48 +04:00

scripting

…

security levels

…