xxalpha 3c3c87aeae Merge remote-tracking branch 'upstream/master' into fixfixfix ...

Conflicts:
	_maps/map_files/generic/z2.dmm

2015-04-10 17:17:35 +01:00

..

devices

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

2015-04-10 17:17:35 +01:00

robot

Adds a cyborg upgrade module for the satchel of holding. Also fixes the diamond drill upgrade for borgs not being able to equip the drill with upgrade.

2015-03-12 23:26:02 -04:00

stacks

Day Who-Knows: Bar Gambling Expansion!

2015-03-29 18:09:54 -05:00

weapons

Merge branch 'master' of https://github.com/tgstation/-tg-station into FoodRecipes2

2015-04-09 17:38:14 +02:00

apc_frame.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

blueprints.dm

construction permit's w_class to 1

2015-03-25 16:52:09 +11:00

body_egg.dm

- Makes body_egg parent for alien embryos/changeling eggs

2015-03-24 17:54:20 +01: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

Fixes Spraycans not coloring faces correctly

2015-04-08 15:02:32 +10:00

documents.dm

-Removed some duplicate code

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

holotape.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyParams

2015-02-24 22:16:53 +00: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

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

toys.dm

See #7217

2015-03-31 02:26:05 +11:00

trash.dm

Fixes trash disappearing when washed in a sink.

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