cib 422ec63bfc Merge branch 'master' of github.com:Baystation12/Baystation12 ...

Conflicts:
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/human/human.dm

2012-11-13 19:01:03 +01: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

Fixed the sillies marked with "skytodo". Removed ONESIZEFITSALL flag as we removed fatness, replaced it with PLASMAGUARD flag as that is what we were using the value as previously. Firedoors should no longer be derpy. The remaining "skytodo"s are places where I have no idea what the fuck you wanted or no idea what the fuck needed done with it.

2012-11-11 14:33:33 -07:00

critters

various mergefixes

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

customitems

Added Graduation Lighter. Deleted my own custom item.

2012-11-11 18:00:12 -05:00

DetectiveWork

Some fixes to Detective Work.

2012-11-11 14:46:37 -07:00

flufftext

…

food

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

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

genetics

Replaced monkey with confusion effect.

2012-11-11 19:35:01 +01: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

…

mining

Fixed my ore box mistakes

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

mob

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

2012-11-13 19:01:03 +01: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

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

2012-11-13 04:02:26 +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

artifacts full list of effects enabled, contact based effect works on toucher, not artifact itself

2012-11-12 11:11:35 +04:00

scripting

…

security levels

…