Hubblenaut 534befe753 Merge remote-tracking branch 'upstream/dev-freeze' into dev-freeze ...

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

2014-12-28 00:04:53 +01:00

..

admin

Moved several globals into the config controller, updated eample config appropriately.

2014-12-25 21:10:30 +10:30

assembly

Noise emotes

2014-12-07 12:09:02 +00:00

awaymissions

Refactored gibbing and slipping for carbon mobs, entirely removed mutantrace var. This commit is only partial, following commits are contiguous to it (lol this is atomic right)

2014-12-23 17:38:05 +10:30

client

Moved several globals into the config controller, updated eample config appropriately.

2014-12-25 21:10:30 +10:30

clothing

Merge remote-tracking branch 'upstream/dev-freeze' into dev-freeze

2014-12-28 00:04:53 +01:00

customitems

Fixes lab coat without icon.

2014-12-12 14:30:12 +01:00

destilery

…

detectivework

Merge remote-tracking branch 'upstream/master' into dev

2014-11-21 10:27:56 +01:00

economy

Fixes #7427.

2014-12-12 15:43:29 +01:00

events

Moved several globals into the config controller, updated eample config appropriately.

2014-12-25 21:10:30 +10:30

ext_scripts

…

flufftext

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

food

Refactored gibbing and slipping for carbon mobs, entirely removed mutantrace var. This commit is only partial, following commits are contiguous to it (lol this is atomic right)

2014-12-23 17:38:05 +10:30

games

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

genetics

…

hydroponics

Updating rack paths to match previous commit.

2014-12-24 12:26:43 +10:30

icon generation

…

library

…

liquid

…

maps

Fixes Map Loader issues.

2014-11-28 08:37:23 +01:00

mining

Merge pull request #7491 from Mloc/bs12-sleepyedges

2014-12-22 20:04:08 +01:00

mob

Merge remote-tracking branch 'upstream/dev-freeze' into dev-freeze

2014-12-28 00:04:53 +01:00

nano

Fixes #7199

2014-12-07 22:13:31 +10:30

organs

Refactors and fixes a fair bit of organ transplanting/reattachment/gibbing code. Also fixes an issue with species HUDs.

2014-12-24 16:06:00 +10:30

paperwork

Morphic Clerical Kit

2014-12-12 10:07:42 +01:00

power

Improves power monitor UI

2014-12-26 16:55:03 -05:00

projectiles

Fixes and tweaks to the previous.

2014-12-23 22:03:02 +10:30

reagents

Merge branch 'dev-freeze' of https://github.com/Zuhayr/Baystation12 into dev-freeze

2014-12-24 22:43:10 +10:30

recycling

Merge pull request #7347 from Baystation12/master

2014-12-10 03:21:56 +10:30

research

Fixes shield circuit board research designs

2014-12-22 15:25:34 +01:00

scripting

…

security levels

Readded monkey dexterity checks in each attack_hand as appropriate.

2014-11-13 17:46:37 +10:30

shieldgen

Moves all circuitboards to their respective files.

2014-12-17 14:31:21 +01:00

shuttles

Corrects names of computers, code formatting, updated computer descriptions.

2014-12-14 05:00:38 +01:00

supermatter

Supermatter warning now has its own proc. Fixed some SM bugs.

2014-11-30 00:23:55 +01:00

surgery

Refactors and fixes a fair bit of organ transplanting/reattachment/gibbing code. Also fixes an issue with species HUDs.

2014-12-24 16:06:00 +10:30

vehicles

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

virus2

Removed attack_paw, attack_animal and attack_slime.

2014-11-13 17:15:29 +10:30