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

Conflicts:
	code/ZAS/FEA_system.dm

2012-11-17 00:20:23 +04:00

..

admin

Fixed a compile warning, reverted my grenade changes as requested by mangled, readded unsecuring-of-the-AI-with-a-wrench and the associated traitor objective checks, tweaked my previous commit re:adminhelps.

2012-11-13 22:46:43 -07:00

assembly

Fixes issue #1889

2012-11-15 23:39:28 +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

…

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

…

customitems

Added Smash Recipe Custom Item

2012-11-13 19:56:52 -05:00

DetectiveWork

Some fixes to Detective Work.

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

flufftext

…

food

…

genetics

Replaced monkey with confusion effect.

2012-11-11 19:35:01 +01:00

icon generation

…

library

…

liquid

…

maps

…

mining

Fixed my ore box mistakes

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

mob

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

2012-11-17 00:20:23 +04:00

paperwork

Added ability to clip photos to clipboards.

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

power

added nullcheck to ZAS func, fix for severed powernets still being connected

2012-11-16 18:53:03 +10:00

projectiles

final pass of merging with my branch

2012-11-16 18:54:43 +04:00

reagents

final pass of merging with my branch

2012-11-16 18:54:43 +04:00

recycling

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

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

research

Fixes buckled people being still buckled after teleportation with artifact.

2012-11-16 00:49:49 +04:00

scripting

…

security levels

…