Datraen bb7713b2a8 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Slime_Rework_3 ...

# Conflicts:
#	code/game/objects/items/devices/multitool.dm

2016-05-19 17:31:25 -04:00

..

circuitboards

Adds PDA Multicaster

2016-05-12 02:50:35 -04:00

grenades

Updates flashbangs and flash/flare rounds to take advantage of new lighting.

2016-05-12 16:21:39 +01:00

implants

Changes Death Alarm

2016-05-15 22:42:54 -05:00

material

Weapon sharpness and edge adjustments

2016-05-12 16:13:41 +01:00

melee

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

storage

Fixes #1636

2016-05-19 11:36:18 -04:00

tanks

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

AI_modules.dm

…

autopsy.dm

Construction Update

2016-03-25 16:02:36 -04:00

candle.dm

…

cards_ids_syndicate.dm

Syndicate id card now checks if the player mind an antag.

2015-12-10 10:55:55 +00:00

cards_ids.dm

Adds the ability to feed telecrystals to emags for more uses

2016-05-05 19:59:36 +01:00

cigs_lighters.dm

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

clown_items.dm

Revert "Revert "Bay update.""

2016-02-07 16:33:30 +10:30

cosmetics.dm

Construction Update

2016-03-25 16:02:36 -04:00

dice.dm

…

dna_injector.dm

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

explosives.dm

Makes plastique better

2016-05-18 18:24:10 -04:00

extinguisher.dm

1.4.0 Fire extinguishe fixes and tweaks

2015-12-31 20:57:18 -08:00

flamethrower.dm

Construction Update

2016-03-25 16:02:36 -04:00

game_kit.dm

…

gift_wrappaper.dm

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

handcuffs.dm

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

hydroponics.dm

…

improvised_components.dm

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

manuals.dm

…

mop_deploy.dm

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

mop.dm

Revert "Revert "Bay update.""

2016-02-07 16:33:30 +10:30

paint.dm

…

paiwire.dm

…

policetape.dm

Fixes doortape using wrong icon

2015-12-11 16:46:13 +01:00

power_cells.dm

…

RCD.dm

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

RSF.dm

…

scrolls.dm

…

shields.dm

Adds a bunch of stuff for sec armor. See PR for details.

2016-03-06 04:18:39 -05:00

stunbaton.dm

Fixes certain compile errors with the taser, baton.

2016-05-12 18:38:41 -04:00

surgery_limbattachment.dm

…

surgery_tools.dm

…

swords_axes_etc.dm

Tweaks to previous commits.

2015-12-24 21:13:40 +10:30

syndie.dm

…

tape.dm

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

teleportation.dm

…

tools.dm

Makes robolimbs repair completely

2016-05-18 01:25:34 -04:00

traps.dm

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

trays.dm

Slight optimization in dropped, adds colors to material items.

2016-01-14 18:29:49 -05:00

weaponry.dm

…

weldbackpack.dm

…