Aranclanos 3fed8dd8f6 Merge branch 'Cybernetic-limbs' of https://github.com/RobRichards1997/-tg-station into Cybernetic-limbs ...

Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm

2013-11-26 22:03:26 -03: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

Nuke Op Population Scaling and Content Update

2013-11-03 16:41:57 -06:00

bible.dm

Fixes bible spam

2013-11-24 15:24:55 +00:00

boxes.dm

Fixed the description on the new box

2013-09-12 11:12:14 +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

Reformatted the way objects and items structure their description text, added the little object "icon" everyone seems to be using.

2013-11-16 22:15:50 +01:00

firstaid.dm

Nuke Op Population Scaling and Content Update

2013-11-03 16:41:57 -06:00

lockbox.dm

Fixes "Its locked! in lockbox.dm to say "It's locked!" as it should

2013-10-13 23:25:41 -05: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

Mecha fixes

2013-10-16 01:30:00 -04:00

toolbox.dm

Reduced toolbox force to 10

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

uplink_kits.dm

Nuke Op Population Scaling and Content Update

2013-11-03 16:41:57 -06: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