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

Conflicts:
	code/modules/research/designs/mechfabricator_designs.dm

2015-02-06 13:19:15 +08:00

..

carbon

Merge pull request #7490 from Miauw62/sayfix

2015-02-05 11:54:23 -08:00

silicon

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

2015-02-06 13:19:15 +08:00

simple_animal

Repath all non jetpack tank types to tank/internals

2015-02-01 18:25:39 +00:00

damage_procs.dm

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

2014-12-29 17:05:20 +03:00

death.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

emote.dm

Fixes saycode breaking when the ckey of a ghost was set to null.

2015-02-01 12:37:49 +01:00

living_defense.dm

Merge pull request #6622 from Thunder12345/grammarFixes

2014-12-29 10:20:35 -03:00

living_defines.dm

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

living.dm

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

2015-01-25 21:56:39 -08:00

login.dm

Fixes implants not updating the implant secHUD

2014-11-27 12:56:17 -03:00

logout.dm

…

say.dm

Fixes saycode breaking when the ckey of a ghost was set to null.

2015-02-01 12:37:49 +01:00