LetterJay 31102d0ec4 Merge pull request #2608 from Citadel-Station-13/upstream-merge-30262 ...

[MIRROR] Soft crit, except not terrible

2017-09-07 10:01:35 -05:00

..

circuitboards

…

devices

Merge pull request #2608 from Citadel-Station-13/upstream-merge-30262

2017-09-07 10:01:35 -05:00

grenades

Merge branch 'master' into upstream-merge-30079

2017-09-06 09:24:23 -05:00

implants

…

melee

…

robot

Merge pull request #2436 from Citadel-Station-13/upstream-merge-30004

2017-09-06 09:15:11 -05:00

stacks

Merge pull request #2608 from Citadel-Station-13/upstream-merge-30262

2017-09-07 10:01:35 -05:00

storage

Merge branch 'master' into upstream-merge-30079

2017-09-06 09:24:23 -05:00

tanks

…

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

…

clown.dm

…

control_wand.dm

…

cosmetics.dm

…

courtroom.dm

…

crayons.dm

…

defib.dm

…

dehy_carp.dm

…

dice.dm

…

dna_injector.dm

…

documents.dm

…

eightball.dm

…

extinguisher.dm

…

flamethrower.dm

…

gift.dm

…

handcuffs.dm

…

his_grace.dm

…

holosign_creator.dm

…

holy_weapons.dm

Merge branch 'master' into upstream-merge-30079

2017-09-06 09:24:23 -05:00

inducer.dm

…

kitchen.dm

…

latexballoon.dm

…

manuals.dm

…

miscellaneous.dm

…

mop.dm

…

paint.dm

…

paiwire.dm

…

pneumaticCannon.dm

…

powerfist.dm

…

RCD.dm

…

RCL.dm

Merge branch 'master' into upstream-merge-29964

2017-08-29 21:07:01 -07:00

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

this sure was FUN

2017-09-07 09:47:56 -05:00

teleprod.dm

…

theft_tools.dm

…

tools.dm

…

toys.dm

…

trash.dm

…

twohanded.dm

…

vending_items.dm

…

weaponry.dm

…