Chinsky 1640b0a1c1 Merge pull request #7015 from Zuhayr/attackverbremoval ...

Attack proc removal/refactor.

2014-11-14 11:18:43 +03:00

..

grenades

Removed attack_paw, attack_animal and attack_slime.

2014-11-13 17:15:29 +10:30

implants

Fixed up organ transplant rejection, added cortical stacks, changed vox over to use organ stacks.

2014-09-30 14:09:41 +09:30

melee

Cleans up food slicing

2014-11-07 00:10:49 -05:00

storage

Merge pull request #7015 from Zuhayr/attackverbremoval

2014-11-14 11:18:43 +03:00

tanks

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

AI_modules.dm

…

candle.dm

…

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

…

cosmetics.dm

Custom loadout updates

2014-11-01 15:56:11 -04:00

dice.dm

…

dna_injector.dm

Removed attack_paw, attack_animal and attack_slime.

2014-11-13 17:15:29 +10:30

explosives.dm

…

extinguisher.dm

Merge conflict resolution.

2014-11-10 13:00:06 +10:30

flamethrower.dm

…

game_kit.dm

…

gift_wrappaper.dm

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

handcuffs.dm

Fixes bad handcuff check

2014-11-01 17:02:54 -04:00

hydroponics.dm

…

kitchen.dm

Makes items used to slice food have the edge flag set, cleans up energy weapons, and adjusts slicable w_class.

2014-11-06 19:50:40 -05:00

manuals.dm

Changed phrasing about pressure with full oxygen internals as suggested by mwerezak.

2014-10-29 01:49:28 -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

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

scrolls.dm

…

shards.dm

Collapsed Bump() down to carbon from alien and monkey. Stripped out extraneous stuff from carbon/alien HUD. Implemented some life stuff for aliens.

2014-09-30 15:28:30 +09:30

shields.dm

Makes items used to slice food have the edge flag set, cleans up energy weapons, and adjusts slicable w_class.

2014-11-06 19:50:40 -05:00

stunbaton.dm

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

surgery_limbattachment.dm

…

surgery_tools.dm

Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev

2014-09-29 06:19:26 +09:30

swords_axes_etc.dm

Makes items used to slice food have the edge flag set, cleans up energy weapons, and adjusts slicable w_class.

2014-11-06 19:50:40 -05:00

syndie.dm

…

table_rack_parts.dm

Merg resolution.

2014-10-02 02:33:06 +09:30

teleportation.dm

…

tools.dm

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

twohanded.dm

Makes items used to slice food have the edge flag set, cleans up energy weapons, and adjusts slicable w_class.

2014-11-06 19:50:40 -05:00

weaponry.dm

…

wires.dm

…