SamCroswell 15a8b1d7d6 Merge Conflict Resolution

2016-07-16 18:47:18 -04:00

..

grenades

Personal Crafting - Initial Commit

2016-07-15 16:25:37 -04:00

implants

Deletes Parole Implants

2016-07-13 21:44:50 -07:00

melee

Merge remote-tracking branch 'upstream/master' into hit-reactions

2016-07-07 22:50:53 -04:00

storage

Merge pull request #5054 from Fox-McCloud/mining-tweaks

2016-07-16 10:57:54 -04:00

tanks

Merge branch 'master' into w_class

2016-07-10 09:29:12 -04:00

AI_modules.dm

Merge branch 'master' into w_class

2016-07-10 09:29:12 -04:00

alien_specific.dm

TG Hit Reaction Port+Armor Fixes

2016-07-07 21:17:03 -04:00

bee_briefcase.dm

Changed to DZD's suggestion

2016-06-20 22:17:17 -07:00

cards_ids.dm

Merge branch 'master' into w_class

2016-07-10 09:29:12 -04:00

cash.dm

Removes .0 at the end of w_class numbers

2016-07-08 12:26:34 -04:00

caution.dm

Removes .0 at the end of w_class numbers

2016-07-08 12:26:34 -04:00

chrono_eraser.dm

Removes .0 at the end of w_class numbers

2016-07-08 12:26:34 -04:00

cigs.dm

…

clown_items.dm

Merge branch 'master' into w_class

2016-07-10 09:29:12 -04:00

cosmetics.dm

Removes .0 at the end of w_class numbers

2016-07-08 12:26:34 -04:00

courtroom.dm

Removes .0 at the end of w_class numbers

2016-07-08 12:26:34 -04:00

defib.dm

Personal Crafting - Initial Commit

2016-07-15 16:25:37 -04:00

dice.dm

…

disks.dm

…

dna_injector.dm

Mass replace

2016-07-07 19:34:02 -07:00

dnascrambler.dm

Mass replace

2016-07-07 19:34:02 -07:00

explosives.dm

Better Target Bugfix

2016-07-14 15:51:20 -04:00

extinguisher.dm

Merge branch 'master' into w_class

2016-07-10 09:29:12 -04:00

fireworks.dm

Mass replace

2016-07-07 19:34:02 -07:00

flamethrower.dm

Personal Crafting - Initial Commit

2016-07-15 16:25:37 -04:00

garrote.dm

…

gift_wrappaper.dm

Mass replace

2016-07-07 19:34:02 -07:00

handcuffs.dm

Merge pull request #4895 from TullyBurnalot/ArmlessCuffs

2016-07-14 23:30:38 -04:00

holosign.dm

…

holy_weapons.dm

TG Hit Reaction Port+Armor Fixes

2016-07-07 21:17:03 -04:00

kitchen.dm

Merge branch 'master' into w_class

2016-07-10 09:29:12 -04:00

legcuffs.dm

Merge branch 'master' into w_class

2016-07-10 09:29:12 -04:00

lighters.dm

Removes .0 at the end of w_class numbers

2016-07-08 12:26:34 -04:00

manuals.dm

Bureaucracy Update

2016-07-07 20:24:07 +01:00

misc.dm

Removes .0 at the end of w_class numbers

2016-07-08 12:26:34 -04:00

mop.dm

Removes .0 at the end of w_class numbers

2016-07-08 12:26:34 -04:00

paint.dm

Merge branch 'master' into w_class

2016-07-10 09:29:12 -04:00

paiwire.dm

…

pneumaticCannon.dm

Personal Crafting - Initial Commit

2016-07-15 16:25:37 -04:00

power_cells.dm

Fixes pulse shot cost.

2016-07-11 19:52:24 +02:00

RCD.dm

Merge branch 'master' into w_class

2016-07-10 09:29:12 -04:00

RSF.dm

Merge branch 'master' into w_class

2016-07-10 09:29:12 -04:00

scissors.dm

Mass replace

2016-07-07 19:34:02 -07:00

scrolls.dm

Merge branch 'master' into w_class

2016-07-10 09:29:12 -04:00

shards.dm

Merge branch 'master' into w_class

2016-07-10 09:29:12 -04:00

shields.dm

TG Hit Reaction Port+Armor Fixes

2016-07-07 21:17:03 -04:00

signs.dm

Personal Crafting - Initial Commit

2016-07-15 16:25:37 -04:00

soap.dm

Merge branch 'master' into w_class

2016-07-10 09:29:12 -04:00

staff.dm

Merge branch 'master' into w_class

2016-07-10 09:29:12 -04:00

stock_parts.dm

Removes .0 at the end of w_class numbers

2016-07-08 12:26:34 -04:00

stunbaton.dm

Personal Crafting - Initial Commit

2016-07-15 16:25:37 -04:00

swords_axes_etc.dm

whoops

2016-07-09 22:50:05 -04:00

syndie_uplink.dm

Removes .0 at the end of w_class numbers

2016-07-08 12:26:34 -04:00

table_rack_parts.dm

Mass replace

2016-07-07 19:34:02 -07:00

tape.dm

…

teleportation.dm

Merge branch 'master' into w_class

2016-07-10 09:29:12 -04:00

tools.dm

Merge branch 'master' into w_class

2016-07-10 09:29:12 -04:00

twohanded.dm

Merge branch 'master' into w_class

2016-07-10 09:29:12 -04:00

vending_items.dm

Removes .0 at the end of w_class numbers

2016-07-08 12:26:34 -04:00

weaponry.dm

Merge branch 'master' into w_class

2016-07-10 09:29:12 -04:00

whetstone.dm

…

wires.dm

Mass replace

2016-07-07 19:34:02 -07:00