Zuhayr b1cac56e9a Merge resolution.

2013-06-15 03:54:22 -07:00

..

grenades

Fixes issues:

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

implants

…

melee

…

storage

Alien Monkeys - Farwa, Stok, Aenera

2013-06-14 02:22:27 -04:00

tanks

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

2013-06-10 17:16:54 -07:00

AI_modules.dm

…

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

…

clown_items.dm

…

cosmetics.dm

…

dice.dm

…

dna_injector.dm

…

explosives.dm

…

extinguisher.dm

…

flamethrower.dm

Fixes issues:

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

game_kit.dm

…

gift_wrappaper.dm

…

handcuffs.dm

…

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

…

mop.dm

…

paint.dm

…

paiwire.dm

…

power_cells.dm

…

RCD.dm

…

RSF.dm

…

scrolls.dm

…

shields.dm

…

stunbaton.dm

…

surgery_limbattachment.dm

…

surgery_tools.dm

Fixed some typos. (feotal, "/red ...")

2013-06-11 15:01:48 -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

…

tools.dm

…

twohanded.dm

…

weaponry.dm

Adjusted kitchen knives. Added projectile pinning. Various tweaks.

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

wires.dm

…