carnie 3a70153d01 Merge branch 'master' of github.com:tgstation/-tg-station into DNAfix ...

Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm

2013-05-20 00:33:42 +01:00

..

backpack.dm

Adding google code commits r5836 to r5849. RIP in peace google code.

2013-03-11 04:26:54 +00:00

bags.dm

Re-enabled bag item count thing

2013-04-27 09:32:51 +10:00

belt.dm

Committing suomynonAyletamitlU's storage item standardisation commit: http://forums.nanotrasen.com/viewtopic.php?f=16&t=11746

2013-01-08 19:11:56 +00:00

bible.dm

update_icons.dm changes for humans. This ties in with the dna changes and the changes to skin_tone and hair colours

2013-05-10 18:41:08 +01:00

boxes.dm

Made the new prisoner ID box a parent of /box instead of /box/ids,

2013-05-11 17:32:11 +01:00

briefcase.dm

- Fixed some bugs with traffic computer. Added some more functions for NTSL, which I think will really expand the functionality of it. time() will return the time in the number variable, timestamp(format) will return it in string.

2013-02-06 10:33:29 +00:00

fancy.dm

Committing suomynonAyletamitlU's storage item standardisation commit: http://forums.nanotrasen.com/viewtopic.php?f=16&t=11746

2013-01-08 19:11:56 +00:00

firstaid.dm

Committing suomynonAyletamitlU's storage item standardisation commit: http://forums.nanotrasen.com/viewtopic.php?f=16&t=11746

2013-01-08 19:11:56 +00:00

lockbox.dm

Medals

2013-04-25 20:08:02 -06:00

secure.dm

- Fixed some bugs with traffic computer. Added some more functions for NTSL, which I think will really expand the functionality of it. time() will return the time in the number variable, timestamp(format) will return it in string.

2013-02-06 10:33:29 +00:00

storage.dm

Removes /obj/item/weapon/gift from the code, as it was completely unused.

2013-03-28 13:02:46 +00:00

toolbox.dm

Reduced toolbox force to 10

2013-05-11 11:44:52 -05:00

uplink_kits.dm

Adds a new DARK LORD syndicate bundle! Comes with two energy swords, a TK injector, an agent card to make your own cool title, and some stylish robes.

2013-02-27 20:14:20 +00:00

wallets.dm

-Made firesuits effective again by changing the proc which damages the humans due to the flames to fire_act(). The flames themselves will hurt people, who are directly on top of it, but if they're wearing a firesuit the damage is much less.

2013-01-02 11:26:30 +00:00