Cael_Aislinn 6bda733e37 Merge branch 'bs12_with_tgport' of github.com:caelaislinn/Baystation12 into bs12_with_tgport ...

Conflicts:
	baystation12.dme
	code/modules/mob/living/carbon/human/inventory.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

2012-10-30 23:53:42 +10:00

..

admin

fixed an issue where mods could gain access to admin powers

2012-10-25 20:31:00 +10:00

assembly

raise default range value of proximity sensor from 1 to 2

2012-10-28 08:37:03 +04: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

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

2012-10-29 07:23:19 +04:00

critters

various mergefixes

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

customitems

Ported custom items system.

2012-10-30 02:27:51 +04: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

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

…

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

readd ssd sleep

2012-10-30 23:46:54 +10:00

paperwork

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

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

power

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

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

projectiles

Fix for detective revolver.

2012-10-30 03:07:51 +04:00

reagents

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

2012-10-29 04:28:32 +04:00

recycling

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

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

research

Xenoarch: artifacts, strange rocks, pretty orebox

2012-10-24 12:38:46 -07:00

scripting

…

security levels

…