Kreastr 9ddc1d02d9 Merge branch 'master' of git://github.com/Baystation12/Baystation12 ...

Conflicts:
	code/modules/mob/mob_defines.dm

2012-11-11 16:43: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

Annnnnnnd another custom item: http://baystation12.net/forums/viewtopic.php?f=33&t=5413

2012-11-11 00:13:43 +00:00

DetectiveWork

retrack detective files

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

flufftext

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

food

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

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

icon generation

…

library

Bookcases and filing cabinets can now be prestocked from the map, by placing books and papers on top of them. Updated the example away mission- it's now a complete mission, and should demonstrate everything that's necessary in an away mission. It has a few power issues, but hopefully someone can fix those for me~

2012-09-09 15:28:05 +00:00

liquid

- Added the 'splash' and 'kaboom' verbs to 'debug verbs'.

2012-08-30 12:48:28 +00:00

maps

Revert "Random not much finished bullshit work on mapdata."

2012-09-06 15:51:23 -07:00

mining

Fixed my ore box mistakes

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

mob

Merge branch 'master' of git://github.com/Baystation12/Baystation12

2012-11-11 16:43: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

Fixed up autoinjectors and added health analyzer to regular first aid.

2012-11-11 11:45:24 +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

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

security levels

…