Pete Goodfellow 46b8ba8341 Merge branch 'master' of github.com:tgstation/-tg-station into chemistry ...

Conflicts:
	code/game/objects/items/weapons/tools.dm

2013-05-12 15:09:21 +01:00

..

grenades

Replaced most reagent initialisations with the helper proc create_reagents().

2013-04-15 15:40:33 +01:00

implants

Replaced most reagent initialisations with the helper proc create_reagents().

2013-04-15 15:40:33 +01:00

melee

Grammar fixes for item-suicides.

2013-01-17 02:52:57 +00:00

storage

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

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

tanks

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

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

AI_modules.dm

Fixes freeform module logging from logging the player who input the law as both the uploader and the uploadee.

2013-04-13 10:06:28 -04:00

airlock_painter.dm

Changed the airlock_painter stuff back to how Ricotez had them coded. Instead of clicking on the painter and setting the airlock type that way, you do it when you click on the door with the painter.

2013-03-16 13:05:50 -04:00

cards_ids.dm

Fix for missing in-hand sprites for orange id cards

2013-05-11 23:15:37 +01:00

cigs_lighters.dm

Resolves issue #118 - Mob overlays will now update when a cigarette explodes from plasma/weldingfuel after being lit.

2013-04-01 06:41:18 +01:00

clown_items.dm

…

cosmetics.dm

Updating razors to reduce code duplication. Adjusts text styling.

2013-04-14 19:02:52 +01:00

dice.dm

COIN UPDATE

2013-04-23 19:50:05 -05:00

dna_injector.dm

Fixes for admin-spawned dnainjectors: repeat_string has been simplified (it wasn't making NULLED_SE and NULLED_UI to the correct size).

2013-04-27 06:40:17 +01:00

explosives.dm

Changed the default shout.

2013-04-23 10:46:39 +02:00

extinguisher.dm

Replaced most reagent initialisations with the helper proc create_reagents().

2013-04-15 15:40:33 +01:00

flamethrower.dm

Fixes issue 828 - Flamethrower not working with variant-mix plasma tanks.

2013-02-09 20:25:39 +00:00

gift_wrappaper.dm

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

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

handcuffs.dm

-Actually fixes the issues with inhands not updating. Thanks to Aranclanos.

2013-04-22 01:03:42 -05:00

kitchen.dm

-Fixes the stuff Giacom pointed out.

2013-04-21 23:26:59 -05:00

manuals.dm

* Added a manual for Virology. It spawns in Virology and it links to the "Infections" wiki page.

2013-04-06 16:46:05 +01:00

mop.dm

Replaced most reagent initialisations with the helper proc create_reagents().

2013-04-15 15:40:33 +01:00

paint.dm

-Paint now has a limit.

2013-02-01 21:07:55 +00:00

paiwire.dm

…

power_cells.dm

Grammar fixes for item-suicides.

2013-01-17 02:52:57 +00:00

RCD.dm

Airlock settings for the RCD.

2013-03-06 02:34:03 +00:00

RSF.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

scrolls.dm

- More runtime fixes.

2013-03-02 16:51:57 +00:00

shields.dm

Another whack at the defines folder:

2013-01-01 01:25:02 +00:00

singularityhammer.dm

Made cult blades/double barrel shotguns fit on exosuit slots again.

2013-03-03 01:46:25 +00:00

stunbaton.dm

-changes the deductcharge proc again to get rid of my silly hack.

2013-04-22 15:32:00 -05:00

swords_axes_etc.dm

MAKESHIFT WEAPONS UPDATE

2013-04-16 22:59:01 -05:00

table_rack_parts.dm

Fixes issue 954.

2012-10-05 21:17:04 +00:00

teleportation.dm

Committing carn's modifications to events and other things. Full details below.

2013-02-17 11:44:37 +00:00

tools.dm

Standardised welders in tools.dm. Includes text styling and names. Removes redundant procs and code. Adds mob icon updates where appropriate.

2013-04-17 23:52:15 +01:00

twohanded.dm

-Fixes the stuff Giacom pointed out.

2013-04-21 23:26:59 -05:00

weaponry.dm

-Actually fixes the issues with inhands not updating. Thanks to Aranclanos.

2013-04-22 01:03:42 -05:00