Erthilo b75d97a488 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev ...

Conflicts:
	code/game/machinery/kitchen/gibber.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	maps/tgstation2.dmm

2013-08-31 17:45:31 +01:00

..

grenades

Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev

2013-08-31 17:45:31 +01:00

implants

Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.

2013-08-28 03:33:04 +01:00

melee

Grammar fixes for item-suicides.

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

storage

Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.

2013-08-28 03:33:04 +01:00

tanks

Vox gear tweaks. Dartgun buff, removal of tank sounds, addition of multitools.

2013-07-29 06:43:37 -07:00

AI_modules.dm

Rename of cyborgs to robots (in strings), addition of robot spawn name-choosing proc, addition of method for removing robot brain.

2013-02-25 19:48:00 -08:00

cards_ids.dm

Emags now have a ten-use limit.

2013-08-24 19:25:05 -07:00

cigs_lighters.dm

copmile fixes, rework a few things to better fit tg code structure, replace tgstation.2.0.9.1.dmm with tgstation.2.1.0.dmm (kept old map file), tgstation.2.0.9.1.dmm has 1233 errors

2013-01-14 21:07:16 +10:00

clown_items.dm

…

cosmetics.dm

…

dice.dm

You can carve out books with a pair of wirecutters or a kitchen knife to create a handy hiding place.

2012-11-15 20:15:49 +00:00

dna_injector.dm

Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.

2013-08-28 03:33:04 +01:00

explosives.dm

Removed undeeded "ATTACK:"

2013-08-28 03:37:11 +01:00

extinguisher.dm

Fully reverts clickdelay change.

2013-08-13 13:10:09 +01:00

flamethrower.dm

Fixes issues:

2013-04-18 09:56:49 -07:00

game_kit.dm

…

gift_wrappaper.dm

Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.

2013-08-28 03:33:04 +01:00

handcuffs.dm

Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.

2013-08-28 03:33:04 +01:00

hydroponics.dm

Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.

2013-08-28 03:33:04 +01:00

kitchen.dm

Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.

2013-08-28 03:33:04 +01:00

manuals.dm

Uncomments Space Law book content.

2013-08-20 14:20:46 +01:00

mop.dm

…

paint.dm

…

paiwire.dm

…

power_cells.dm

And once again, did that the wrong way around. Whoops.

2013-07-20 18:41:50 +01:00

RCD.dm

Fully reverts clickdelay change.

2013-08-13 13:10:09 +01: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

Some improvement to the teleport scroll and spell code. It unbuckles the user now.

2013-01-17 06:22:29 +00:00

shields.dm

Another whack at the defines folder:

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

stunbaton.dm

Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.

2013-08-28 03:33:04 +01:00

surgery_limbattachment.dm

…

surgery_tools.dm

Bug fixes for embedding/pinning code.

2013-06-18 21:24:26 -07:00

swords_axes_etc.dm

Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.

2013-08-28 03:33:04 +01:00

syndie.dm

…

table_rack_parts.dm

…

teleportation.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

tools.dm

Fixes issue #3240. The order for visible_message is visible, person, audible. Here, visible and person were reversed.

2013-07-04 21:13:33 -07:00

twohanded.dm

Third time is a charm. Fixed a bunch of map things and reverted the axe back to it's premerge values. Also added airlocks back to mining.

2013-02-17 20:59:36 -05:00

weaponry.dm

Removed undeeded "ATTACK:"

2013-08-28 03:37:11 +01:00

wires.dm

…