Spamcat 11e27c5999 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into loops ...

Conflicts:
	code/game/gamemodes/objective.dm

2013-07-01 19:49:29 +04:00

..

grenades

Fixes issues:

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

implants

Derp, forgot main part of explosive implant EMP code and changelog.

2013-02-23 00:41:20 +04:00

melee

Grammar fixes for item-suicides.

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

storage

Secbelts now can hold melee weapons.

2013-06-19 15:08:55 +04:00

tanks

Vox oxygen toxicity, vox breath mask, nitrogen tank for spawning.

2013-06-10 17:16:54 -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

Custom item.

2013-07-01 19:21:49 -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

File structure again.

2012-08-26 05:20:27 +00:00

cosmetics.dm

Fixes issue 955. (Signalers don't update bomb overlays)

2012-09-23 15:31:01 +00:00

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

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

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

explosives.dm

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

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

extinguisher.dm

Changed the AI's intercoms around a bit.

2012-08-26 04:16:37 +00:00

flamethrower.dm

Fixes issues:

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

game_kit.dm

Added game kit to crew quarters + Fixed genetics inner shutters

2012-04-08 09:22:14 +03:00

gift_wrappaper.dm

Merge branch 'incremental_tg' r5600 into bs12_with_tgport

2013-01-23 00:23:37 +10:00

handcuffs.dm

Another whack at the defines folder:

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

hydroponics.dm

Cobpipe fix

2013-05-31 00:09:00 -05:00

kitchen.dm

Adjusted kitchen knives. Added projectile pinning. Various tweaks.

2013-06-13 20:46:09 -07:00

manuals.dm

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

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

mop.dm

Fixes issue 950. (tele-mopping of floors)

2012-09-23 14:14:22 +00:00

paint.dm

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

paiwire.dm

…

power_cells.dm

Grammar fixes for item-suicides.

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

RCD.dm

Another whack at the defines folder:

2013-01-01 01:25:02 +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

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

Merge branch 'incremental_tg' r5600 into bs12_with_tgport

2013-01-23 00:23:37 +10:00

surgery_limbattachment.dm

Ported limb selection.

2012-10-17 20:08:34 +02:00

surgery_tools.dm

Bug fixes for embedding/pinning code.

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

swords_axes_etc.dm

Secbelts now can hold melee weapons.

2013-06-19 15:08:55 +04:00

syndie.dm

Anti-meta update. Renames and re-icons a bunch of syndicate items to reduce meta from names and examine messages.

2012-06-07 19:54:37 +01:00

table_rack_parts.dm

Fixes issue 954.

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

teleportation.dm

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

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

tools.dm

Due to git tree being fucked up for some reason, manually reapplied many man many fixes.

2013-02-07 07:13:27 +04: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

Adjusted kitchen knives. Added projectile pinning. Various tweaks.

2013-06-13 20:46:09 -07:00

wires.dm

Merge tgstation13 r4570 into bs12_with_tgport

2012-08-28 19:57:11 +10:00