PJB3005 dec97db5b6 Merge remote-tracking branch 'upstream/master' into rebase-to-vg

2017-02-12 22:16:10 +01:00

..

devices

Merge remote-tracking branch 'upstream/master' into rebase-to-vg

2017-02-12 16:35:57 +01:00

robot

Fixes the cyborg hugging module self targeting (#23465)

2017-01-31 09:38:38 +01:00

stacks

Adds crafting blindfolds, hacked autodrobes contain a blindfold and muzzles (#23953)

2017-02-12 17:55:05 +01:00

weapons

Merge remote-tracking branch 'upstream/master' into rebase-to-vg

2017-02-12 16:35:57 +01:00

apc_frame.dm

…

blueprints.dm

Merge remote-tracking branch 'upstream/master' into rebase-to-vg

2017-02-08 14:30:23 +01:00

body_egg.dm

Fixes some bad addtimer calls. Adds INVOKE_ASYNC. Replaces addtimer(..., 0) (#23424)

2017-01-31 09:20:54 +13:00

bodybag.dm

Bluespace body bags of holding

2017-01-25 08:52:16 -05:00

candle.dm

Merge remote-tracking branch 'upstream/master' into rebase-to-vg

2017-02-08 14:30:23 +01:00

cardboard_cutouts.dm

…

charter.dm

BYOS shuttle restrictions (Shuttle changes #1) (#23904)

2017-02-12 14:13:44 +13:00

control_wand.dm

…

crayons.dm

Merge remote-tracking branch 'upstream/master' into rebase-to-vg

2017-02-08 14:30:23 +01:00

dehy_carp.dm

Makes qdeleted and qdestroying macros (#23666)

2017-02-06 00:59:27 +13:00

documents.dm

…

latexballoon.dm

…

nuke_tools.dm

Removes/Refactors /mob/unEquip (#22918)

2017-01-31 09:28:31 +13:00

religion.dm

…

shooting_range.dm

…

toys.dm

Removes/Refactors /mob/unEquip (#22918)

2017-01-31 09:28:31 +13:00

trash.dm

Adds lumps of coal. (#22346)

2016-12-23 09:33:22 +13:00