Thalpy 41eee65b15 Merge branch 'master' into master

2019-06-17 12:18:40 +01:00

..

circuitboards

…

devices

Merge branch 'master' into master

2019-06-17 12:18:40 +01:00

grenades

…

implants

god why fuck

2019-06-10 00:07:04 -07:00

melee

lmao2reach

2019-06-08 07:19:11 -04:00

robot

…

stacks

Merge pull request #8497 from BurgerLUA/Clockwork-Reflectors

2019-06-16 19:41:57 -07:00

storage

Merge branch 'master' into master

2019-06-17 12:18:40 +01:00

tanks

Merge pull request #8416 from Trilbyspaceclone/patch-135

2019-06-16 19:35:05 -07:00

tools

…

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

…

control_wand.dm

…

cosmetics.dm

…

courtroom.dm

removes family gavel, readds briefcase

2019-06-10 10:16:32 -04:00

crayons.dm

…

defib.dm

…

dehy_carp.dm

…

dice.dm

…

dna_injector.dm

…

documents.dm

…

eightball.dm

…

extinguisher.dm

Merge pull request #8578 from Ghommie/Ghommie-cit41

2019-06-16 19:38:23 -07:00

flamethrower.dm

…

gift.dm

…

granters.dm

Update granters.dm

2019-06-07 18:35:52 -04:00

handcuffs.dm

…

his_grace.dm

…

holosign_creator.dm

…

holy_weapons.dm

Merge pull request #8576 from Sishen1542/whipcrack

2019-06-16 01:18:37 -07:00

hot_potato.dm

…

inducer.dm

…

kitchen.dm

…

latexballoon.dm

…

manuals.dm

…

miscellaneous.dm

…

mop.dm

…

paint.dm

…

paiwire.dm

…

pet_carrier.dm

…

pinpointer.dm

…

plushes.dm

Merge branch 'master' into Fritz-cute

2019-06-10 15:15:41 +10:00

pneumaticCannon.dm

…

powerfist.dm

…

RCD.dm

…

RCL.dm

…

religion.dm

…

RPD.dm

…

RSF.dm

…

scrolls.dm

…

sharpener.dm

…

shields.dm

Update shields.dm

2019-06-16 10:22:07 -04:00

shooting_range.dm

…

signs.dm

…

singularityhammer.dm

…

stunbaton.dm

fixes.

2019-06-15 02:19:57 +02:00

taster.dm

…

teleportation.dm

…

teleprod.dm

fixes.

2019-06-15 02:19:57 +02:00

theft_tools.dm

…

toys.dm

…

trash.dm

…

twohanded.dm

…

vending_items.dm

…

weaponry.dm

…