xxalpha 662af7174f Merge remote-tracking branch 'upstream/master' into fixfixfix ...

Conflicts:
	icons/obj/storage.dmi

2015-05-29 21:45:18 +01:00

..

devices

Merge remote-tracking branch 'upstream/master' into fixfixfix

2015-05-29 21:45:18 +01:00

robot

Fixes the mining borg diamond drill upgrade

2015-05-06 10:09:57 -05:00

stacks

fixes autolathe making stacks, fuel > welding fuel, fixes some non-blue medical icons

2015-05-17 01:58:46 +10:00

weapons

Merge pull request #9660 from Cheridan/auth_button

2015-05-29 15:15:16 +03:00

apc_frame.dm

span classes removed from visible.messages

2015-04-24 20:50:51 +03:00

blueprints.dm

Gang v3 has been tested and is now good to go!

2015-04-19 22:26:15 -06:00

body_egg.dm

Massive MC and subsystem rewrite

2015-04-29 02:00:25 -07:00

bodybag.dm

pre-map compile

2015-04-08 15:40:41 +10:00

candle.dm

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

crayons.dm

Merge pull request #9226 from Ikarrus/gang5.2

2015-05-01 13:00:51 -05:00

dehy_carp.dm

Dehydrated carps inherit factions (minus neutral) from their owner.

2015-04-24 15:18:37 -05:00

documents.dm

-Removed some duplicate code

2014-05-04 16:18:48 -06:00

holotape.dm

span classes removed from visible.messages

2015-04-24 20:50:51 +03:00

latexballoon.dm

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

shooting_range.dm

Fixes range targets changing icons

2015-05-14 03:30:32 -03:00

toys.dm

Merge pull request #9559 from xxalpha/cardtrick

2015-05-28 21:41:00 -05:00

trash.dm

Fixes trash disappearing when washed in a sink.

2015-03-03 00:07:08 +01:00