PsiOmega e0796caf56 Fixes #6871. Fixes #6821. ...

Amended to match the formatting in #6846, to hopefully avoid merge issues.

2014-10-28 18:46:11 +01:00

..

devices

Fix AI PDA showing tap messages

2014-10-21 16:46:48 +01:00

robot

Large merge resultion. Used remote for map conflicts.

2014-09-23 21:41:54 +09:30

stacks

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

2014-10-15 22:13:44 +01:00

weapons

Fixes #6871. Fixes #6821.

2014-10-28 18:46:11 +01:00

apc_frame.dm

Cables are now stacks

2014-08-25 18:54:35 +04:00

blueprints.dm

Replaces get_turf_loc() with get_turf()

2014-06-10 13:43:11 -04:00

bodybag.dm

Fixes #6735

2014-10-16 10:03:48 +02:00

contraband.dm

…

crayons.dm

…

latexballoon.dm

Fixes FEA temperature_expose() being used...

2014-06-22 00:13:22 -04:00

shooting_range.dm

Replaces get_turf_loc() with get_turf()

2014-06-10 13:43:11 -04:00

toys.dm

integrate XGM into the code

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

trash.dm

…