FlattestGuitar ead42d5a27 Merges conflicts

2017-07-16 23:58:43 +02:00

..

grenades

Refactors Species Flags into Species Traits List

2017-07-13 18:55:45 -04:00

implants

other "radios"

2017-07-01 00:14:36 -04:00

melee

Merge remote-tracking branch 'upstream/master' into so-edgey

2017-07-04 17:17:09 -04:00

storage

Merge remote-tracking branch 'upstream/master' into embedding

2017-07-01 01:03:04 -04:00

tanks

Merges conflicts

2017-07-16 23:58:43 +02:00

AI_modules.dm

…

alien_specific.dm

…

bee_briefcase.dm

…

cards_ids.dm

…

cash.dm

…

caution.dm

Adds movement intents

2017-06-10 10:12:14 +01:00

chrono_eraser.dm

…

cigs.dm

…

clown_items.dm

Updates Intents

2017-06-10 09:43:36 +01:00

cosmetics.dm

Refactors Species Flags into Species Traits List

2017-07-13 18:55:45 -04:00

courtroom.dm

…

defib.dm

Merge branch 'master' into PAIN

2017-06-27 21:18:17 +02:00

dice.dm

…

disks.dm

…

dna_injector.dm

Refactors Species Flags into Species Traits List

2017-07-13 18:55:45 -04:00

dnascrambler.dm

Vamp Shapeshift/DNAScrambler Fixes & Desnowflakes Prefsetup

2017-07-15 09:58:26 -04:00

explosives.dm

Refactors TK to work a bit more consistently

2017-06-22 23:24:37 -07:00

extinguisher.dm

…

fireworks.dm

…

flamethrower.dm

Refactors TK to work a bit more consistently

2017-06-22 23:24:37 -07:00

garrote.dm

…

gift_wrappaper.dm

Merge pull request #7567 from SamHPurp/re-factors-posters

2017-07-10 18:48:21 -04:00

handcuffs.dm

Adds random option for cable cuffs too

2017-06-15 01:47:28 +01:00

highlander_swords.dm

can_use_guns -> no_guns

2017-06-09 21:39:50 -04:00

holosign.dm

…

holy_weapons.dm

The Most Non-Edgey PR Ever

2017-07-01 19:48:43 -04:00

kitchen.dm

Merge remote-tracking branch 'upstream/master' into so-edgey

2017-07-04 17:17:09 -04:00

legcuffs.dm

…

lighters.dm

…

manuals.dm

Fixes errant improper capitalised references

2017-06-14 08:00:18 +01:00

misc.dm

…

mop.dm

Buffs Advanced Mop

2017-07-04 21:45:15 -04:00

paint.dm

…

paiwire.dm

…

pneumaticCannon.dm

…

power_cells.dm

…

powerfist.dm

Icon Fixes

2017-06-30 03:21:12 -04:00

RCD.dm

Refactors TK to work a bit more consistently

2017-06-22 23:24:37 -07:00

RCL.dm

…

rpd.dm

Crazylemon changes

2017-06-24 08:08:55 +01:00

RSF.dm

…

scissors.dm

Refactors Species Flags into Species Traits List

2017-07-13 18:55:45 -04:00

scrolls.dm

…

shards.dm

Merge remote-tracking branch 'upstream/master' into so-edgey

2017-07-01 20:17:16 -04:00

shields.dm

…

signs.dm

…

soap.dm

Blood Refactor (#6220)

2017-07-11 16:49:11 -04:00

staff.dm

…

stock_parts.dm

…

stunbaton.dm

Updates Intents

2017-06-10 09:43:36 +01:00

swords_axes_etc.dm

Updates Intents

2017-06-10 09:43:36 +01:00

syndie_uplink.dm

…

table_rack_parts.dm

Luxury Bluespace Capsule & More

2017-06-07 11:17:44 -07:00

tape.dm

…

teleportation.dm

bugfix

2017-06-30 03:16:12 -04:00

teleprod.dm

…

tools.dm

The Most Non-Edgey PR Ever

2017-07-01 19:48:43 -04:00

twohanded.dm

Merge remote-tracking branch 'upstream/master' into so-edgey

2017-07-01 20:17:16 -04:00

vending_items.dm

…

weaponry.dm

Merge remote-tracking branch 'upstream/master' into so-edgey

2017-07-01 20:17:16 -04:00

whetstone.dm

The Most Non-Edgey PR Ever

2017-07-01 19:48:43 -04:00

wires.dm

…