Cuboos 0bb7d2a5a5 Merge remote-tracking branch 'remotes/upstream/master' into CuboosSoundS1E1 ...

Conflicts:
	code/game/objects/items/weapons/defib.dm
	config/admins.txt

2014-12-15 18:12:14 -08:00

..

admin

Merge pull request #6333 from tkdrg/singulobj

2014-12-14 10:02:39 +03:00

assembly

Fixes not being able to hear the beeping of infrared beam, timer and proximity sensor in the dark.

2014-11-22 22:56:13 +01:00

awaymissions

Merge pull request #6333 from tkdrg/singulobj

2014-12-14 10:02:39 +03:00

client

Fixes assistant jobban bug

2014-11-27 16:51:15 -03:00

clothing

Merge pull request #6357 from tkdrg/funtimes

2014-12-15 10:05:38 -08:00

crafting

FRAG-12 + admins.txt

2014-12-11 21:16:45 +00:00

detectivework

Standardizes attack messages to always show the attacker first (when there is an attacker).

2014-11-24 01:49:34 +01:00

events

Covers up traces of the coder conspiracy.

2014-12-08 17:06:27 +01:00

flufftext

Standardizes attack messages to always show the attacker first (when there is an attacker).

2014-11-24 01:49:34 +01:00

food&drinks

Making nutrition level values into defines.

2014-12-13 17:15:35 +01:00

holiday

Spookoween should be mucho bettero now

2014-11-04 19:11:23 +01:00

hydroponics

Changes the hunger system in various ways. New hunger hud icons. Food w/o sugar can be loaded in snack vending machines by anyone. Adding two new var for mobs "satiety" and "metabolism efficiency". Rearranging datum/reagents, all "good" medical reagents are under datum/reagent/medicine/ and all food&drink reagents are under datum/reagent/consumable. Adding a pizza crate to cargo orders. Growns and cooked food are given vitamins while junk food are all given sugar. Removed some unnecessary code in Chemistry-Reagents.dm .

2014-12-11 20:46:27 +01:00

library

Fixes monkeys being able to read books

2014-12-14 13:06:33 -05:00

mining

Merge remote-tracking branch 'remotes/upstream/master' into CuboosSoundS1E1

2014-12-15 18:12:14 -08:00

mob

Merge remote-tracking branch 'remotes/upstream/master' into CuboosSoundS1E1

2014-12-15 18:12:14 -08:00

nano

…

paperwork

Ok now explosions shall work properly

2014-12-05 23:21:48 +03:00

power

Merge pull request #6333 from tkdrg/singulobj

2014-12-14 10:02:39 +03:00

projectiles

Merge remote-tracking branch 'remotes/upstream/master' into CuboosSoundS1E1

2014-12-15 18:12:14 -08:00

reagents

Fixes not being able to remove used slime extract from the slime extract smartfridge in xenobio.

2014-12-15 01:30:18 +01:00

recycling

Ok now explosions shall work properly

2014-12-05 23:21:48 +03:00

research

Merge remote-tracking branch 'remotes/upstream/master' into CuboosSoundS1E1

2014-12-15 18:12:14 -08:00

scripting

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

security levels

Merge branch 'master' of https://github.com/tgstation/-tg-station into Msg1Fix

2014-10-05 13:48:11 +02:00

shuttle

moves emag effects from attackby() into atom proc emag_act()

2014-11-20 17:49:06 -08:00

surgery

Making nutrition level values into defines.

2014-12-13 17:15:35 +01:00

telesci

Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor

2014-12-09 16:03:45 -08:00