Zuhayr 1eb759447e Merge resolution, using dev-freeze map due to unreconcilable conflicts.

2014-09-13 16:54:48 +09:30

..

grenades

Fixes human internal organs list

2014-07-12 16:15:37 -04:00

implants

Merge resolution, master into dev.

2014-08-21 12:01:38 +09:30

melee

…

storage

Merge resolution, using dev-freeze map due to unreconcilable conflicts.

2014-09-13 16:54:48 +09:30

tanks

Master to dev merge.

2014-08-11 17:23:40 +09:30

AI_modules.dm

Fix infinite loop in freeform AI module

2014-06-25 23:09:21 +04:00

candle.dm

Changes candle.dm procs to absolute paths

2014-08-31 19:48:34 -07:00

cards_ids.dm

…

cigs_lighters.dm

Merge resolution, using dev-freeze map due to unreconcilable conflicts.

2014-09-13 16:54:48 +09:30

clown_items.dm

integrate XGM into the code

2014-07-22 19:52:12 +01:00

cosmetics.dm

remove double paper/attack() definition

2014-08-03 13:52:47 +02:00

dice.dm

…

dna_injector.dm

…

explosives.dm

…

extinguisher.dm

Thrown items can be targeted, has miss chance...

2014-07-15 01:14:04 -04:00

flamethrower.dm

integrate XGM into the code

2014-07-22 19:52:12 +01:00

game_kit.dm

…

gift_wrappaper.dm

…

handcuffs.dm

Fixes some handcuff oversights

2014-08-03 11:49:37 -04:00

hydroponics.dm

…

kitchen.dm

Eating with utensils now produces the eating sound, fixed #5687

2014-07-19 18:33:30 -07:00

manuals.dm

Merge pull request #5603 from DJSnapshot/hotfix

2014-07-14 07:12:37 +04:00

mop.dm

…

paint.dm

…

paiwire.dm

…

power_cells.dm

APC cell_type is now an actual power cell type

2014-09-10 22:12:43 -04:00

RCD.dm

…

RSF.dm

Fixes #5874

2014-09-01 23:20:27 +09:30

scrolls.dm

…

shards.dm

Compile fixes.

2014-08-21 12:19:10 +09:30

shields.dm

…

stunbaton.dm

Stunbaton fixes and cleanup

2014-07-31 19:17:05 -04:00

surgery_limbattachment.dm

…

surgery_tools.dm

…

swords_axes_etc.dm

Merge remote-tracking branch 'upstream/dev' into stun-baton

2014-07-31 14:31:21 -04:00

syndie.dm

…

table_rack_parts.dm

…

teleportation.dm

…

tools.dm

Fixes #5879

2014-09-01 22:45:37 +09:30

twohanded.dm

Stunbatons now run on charge.

2014-06-29 17:46:06 +04:00

weaponry.dm

More proximity fixes

2014-08-13 20:58:49 +01:00

wires.dm

…