xxalpha c25576ad6a Merge remote-tracking branch 'upstream/master' into catwalkmachines ...

Conflicts:
	code/game/objects/structures/lattice.dm

2015-03-20 17:02:00 +00:00

..

floor

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

2015-03-20 17:02:00 +00:00

dirtystation.dm

readds some lines that were necessary to make not a fuckton of messes spawn

2015-01-13 13:21:01 -08:00

floor.dm

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

2015-03-06 19:19:09 +00:00

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

walls_misc.dm

…

walls_reinforced.dm

Adds SLOT_BACK for energy katana, makes energy katana call emag_act() on what it strikes (mirroring energy/blade functionality cleanly), Removes energy/blade hacks.

2015-03-09 21:48:45 +00:00

walls.dm

Adds SLOT_BACK for energy katana, makes energy katana call emag_act() on what it strikes (mirroring energy/blade functionality cleanly), Removes energy/blade hacks.

2015-03-09 21:48:45 +00:00