Mark van Alphen b65fbb907e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs ...

# Conflicts:
#	icons/obj/vending.dmi
#	paradise.dme

2019-05-30 19:35:52 +02:00

..

grenades

…

implants

Merge

2019-05-09 17:06:35 +01:00

melee

…

storage

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs

2019-05-30 19:35:52 +02:00

tanks

…

AI_modules.dm

…

alien_specific.dm

…

bee_briefcase.dm

…

cards_ids.dm

…

cash.dm

…

caution.dm

…

chrono_eraser.dm

…

cigs.dm

Remove unused species_fit and move chameleon file

2019-05-05 20:37:53 +02:00

clown_items.dm

…

cosmetics.dm

…

courtroom.dm

…

defib.dm

Remove unused species_fit and move chameleon file

2019-05-05 20:37:53 +02:00

dice.dm

…

disks.dm

…

dna_injector.dm

COMIC injector fix

2019-05-01 21:07:43 +02:00

dnascrambler.dm

…

explosives.dm

…

extinguisher.dm

…

fireworks.dm

…

flamethrower.dm

…

garrote.dm

…

gift_wrappaper.dm

…

handcuffs.dm

Cuffs can't be used when you have antidrop on

2019-05-05 13:14:00 +02:00

highlander_swords.dm

…

holosign.dm

…

holy_weapons.dm

…

kitchen.dm

…

legcuffs.dm

…

lighters.dm

…

manuals.dm

…

misc.dm

…

mop.dm

…

paint.dm

…

paiwire.dm

…

pneumaticCannon.dm

…

powerfist.dm

…

RCD.dm

…

RCL.dm

…

rpd.dm

…

RSF.dm

…

scissors.dm

…

scrolls.dm

…

shards.dm

…

shields.dm

…

signs.dm

…

soap.dm

Adds new inhand sprites

2019-05-06 16:08:38 +02:00

staff.dm

…

stock_parts.dm

…

stunbaton.dm

…

swords_axes_etc.dm

…

tape.dm

…

teleportation.dm

…

teleprod.dm

…

tools.dm

…

twohanded.dm

…

vending_items.dm

…

weaponry.dm

…

whetstone.dm

…