Xhuis 7f6871c233 Fixes conflicts and commits

2015-03-21 12:47:25 -04:00

..

devices

Fixes conflicts and commits

2015-03-21 12:47:25 -04:00

robot

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

2015-02-24 22:16:53 +00:00

stacks

Fixes many checks in construction from stacks, so you can no longer build two girders on top of each other for example.

2015-03-03 23:43:17 +01:00

weapons

Fixes conflicts and commits

2015-03-21 12:47:25 -04: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

Resolves #6971 - non-lighting_subarea areas are now stored in list/sortedAreas. This list is sorted by area name using timSort only when areas are added to it. Currently the only other thing that adds to this list is the station-blueprints object.

2015-01-18 20:46:30 +00:00

bodybag.dm

Code cleanup

2015-03-13 10:41:00 -07: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

…

documents.dm

…

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

merge commits

2015-03-02 12:40:16 -05:00

trash.dm

Fixes trash disappearing when washed in a sink.

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