Putnam3145 8d09f5a082 Merge branch 'master' into tinytweaks

2019-12-01 23:24:56 -08:00

..

circuitboards

Merge pull request #9882 from FestiveBall/Fersi

2019-11-26 16:02:42 -07:00

devices

Merge pull request #9895 from Thalpy/OrganQoL

2019-11-30 22:22:52 -08:00

grenades

…

implants

Fixes implant pads

2019-11-29 20:12:10 +01:00

melee

…

robot

Merge pull request #9818 from GrayRachnid/portssaboteur

2019-11-19 21:28:25 -07:00

stacks

Merge pull request #9867 from Ghommie/Ghommie-cit375

2019-11-25 11:31:03 +13:00

storage

Merge branch 'master' into tinytweaks

2019-12-01 23:24:56 -08:00

tanks

…

tools

Merge pull request #9867 from Ghommie/Ghommie-cit375

2019-11-25 11:31:03 +13:00

AI_modules.dm

…

airlock_painter.dm

…

apc_frame.dm

…

blueprints.dm

…

body_egg.dm

…

bodybag.dm

…

candle.dm

…

cardboard_cutouts.dm

…

cards_ids.dm

…

charter.dm

…

chrono_eraser.dm

…

cigs_lighters.dm

…

clown_items.dm

Oh yea it's a list

2019-11-23 03:02:29 +01:00

control_wand.dm

…

cosmetics.dm

…

courtroom.dm

…

crayons.dm

…

defib.dm

Merge pull request #10016 from deathride58/mousedropfixes

2019-11-30 22:51:42 -08:00

dehy_carp.dm

…

dice.dm

…

dna_injector.dm

…

documents.dm

…

eightball.dm

…

extinguisher.dm

…

flamethrower.dm

…

gift.dm

…

granters.dm

…

handcuffs.dm

…

his_grace.dm

…

holosign_creator.dm

…

holy_weapons.dm

…

hot_potato.dm

…

inducer.dm

…

kitchen.dm

…

latexballoon.dm

…

manuals.dm

…

miscellaneous.dm

…

mop.dm

…

paint.dm

…

paiwire.dm

…

pet_carrier.dm

Merge pull request #10016 from deathride58/mousedropfixes

2019-11-30 22:51:42 -08:00

pinpointer.dm

…

plushes.dm

…

pneumaticCannon.dm

…

powerfist.dm

…

RCD.dm

Merge pull request #9867 from Ghommie/Ghommie-cit375

2019-11-25 11:31:03 +13:00

RCL.dm

…

religion.dm

…

RPD.dm

…

RSF.dm

…

scrolls.dm

…

sharpener.dm

…

shields.dm

…

shooting_range.dm

…

signs.dm

…

singularityhammer.dm

…

stunbaton.dm

…

taster.dm

…

teleportation.dm

…

teleprod.dm

…

theft_tools.dm

…

toys.dm

Merge pull request #10016 from deathride58/mousedropfixes

2019-11-30 22:51:42 -08:00

trash.dm

…

twohanded.dm

…

vending_items.dm

…

weaponry.dm

Merge pull request #9867 from Ghommie/Ghommie-cit375

2019-11-25 11:31:03 +13:00