PsiOmegaDelta bbe65baf5c Merge remote-tracking branch 'upstream/dev' into 151210-TapeTape ...

Conflicts:
	code/__defines/misc.dm

2015-12-13 11:50:06 +01:00

..

circuitboards

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

2015-12-10 13:04:52 -06:00

grenades

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-12-13 10:47:33 +01:00

implants

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-12-08 08:23:10 +01:00

material

Added boot knives and putting a knife in your boot.

2015-12-01 02:05:29 +10:30

melee

…

storage

Merge remote-tracking branch 'upstream/dev-freeze' into dev.

2015-12-06 11:48:20 +01:00

tanks

Oxygen tanks now have a visual indicator of their pressure on the item icon.

2015-11-20 19:36:33 +10:30

AI_modules.dm

…

autopsy.dm

…

candle.dm

…

cards_ids_syndicate.dm

Merge pull request #11563 from PsiOmegaDelta/151202-LessListingMoreObserving

2015-12-02 12:29:45 -05:00

cards_ids.dm

Fixes being unable to emag secure closets.

2015-12-02 08:30:47 +01:00

cigs_lighters.dm

…

clown_items.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-12-08 08:23:10 +01:00

cosmetics.dm

…

dice.dm

…

dna_injector.dm

Merge remote-tracking branch 'upstream/dev' into attack-cleanup2

2015-10-05 19:20:33 -04:00

explosives.dm

Merge remote-tracking branch 'upstream/dev' into attack-cleanup2

2015-10-05 19:20:33 -04:00

extinguisher.dm

…

flamethrower.dm

…

game_kit.dm

…

gift_wrappaper.dm

Refactors various item attack() implementations

2015-09-08 23:39:33 -04:00

handcuffs.dm

Duct tape can now be used to gag, blindfold or cuff people, and cable cuffs/duct tape can restrain rig-wearing people (poorly).

2015-12-01 02:04:10 +10:30

hydroponics.dm

…

improvised_components.dm

…

kitchen.dm

…

manuals.dm

…

mop.dm

Fixes runtime when cleaning turfs with soap

2015-12-06 02:00:50 -05:00

paint.dm

…

paiwire.dm

…

policetape.dm

Adds tape to medical, and excavation lockers.

2015-12-13 11:48:29 +01:00

power_cells.dm

More merge conflict resolution.

2015-09-13 21:12:14 -05:00

RCD.dm

…

RSF.dm

…

scrolls.dm

…

shields.dm

Glowy items.

2015-09-20 18:18:19 +02:00

stunbaton.dm

Merge remote-tracking branch 'upstream/dev' into attack-cleanup2

2015-10-05 19:20:33 -04:00

surgery_limbattachment.dm

Replaces most instances of if(E & ORGAN_DESTROYED) with if(E.is_stump()). Fixes #11468

2015-12-06 04:17:52 -05:00

surgery_tools.dm

…

swords_axes_etc.dm

Fixes missing cooldowns, missing cult blade sound.

2015-09-09 15:15:43 -04:00

syndie.dm

…

tape.dm

You can now pull your punches when engaging in unarmed combat.

2015-12-01 02:04:39 +10:30

teleportation.dm

…

tools.dm

Adds click cooldowns to common healing and repair actions

2015-12-06 00:23:49 -05:00

traps.dm

…

trays.dm

…

weaponry.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into attack-cleanup2

2015-10-15 07:08:16 -04:00

weldbackpack.dm

…

wires.dm

…