Chinsky e40140be03 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze ...

Conflicts:
	html/changelog.html
	maps/tgstation.2.1.0.0.1.dmm

2013-06-08 05:55:42 +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

Merge pull request #2977 from MagmaRam/master

2013-06-05 06:21:47 -07:00

tanks

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

2013-01-11 22:12:31 +10: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

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12

2013-05-24 05:23:36 -04: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

…

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

…

flamethrower.dm

Fixes issues:

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

game_kit.dm

…

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

Added Rice and Plastellium plants. Rice stalks are grinded into rice that you can make boiled rice, rice pudding and Sake from. Plastellium is refined into plastic by grinding it into plasticide. 20 plasticide + 10 poly acid makes 10 sheets of platic which can be used to make crates, forks, spoons, knives, ashtrays or plastic bags from.

2013-04-23 22:52:08 +01: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

…

paint.dm

…

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

…

surgery_tools.dm

UNadded robotic hands and feet because there was no point in doing this in the first place.

2013-05-31 22:32:39 -04:00

swords_axes_etc.dm

Telescopic baton message fix.

2013-05-23 16:24:53 -04: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

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

De-Culting and you! Null Rods re-receive the ability to de-cult cultists, and a tiny desc change. Holy Water also has the chance to de-cult on metabolism, but less of a chance than the null rod. Holy Water may need some balance adjustments, will watch it in the future.

2013-03-27 19:45:40 -04:00

wires.dm

…