Steelpoint 9ce2add084 Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun ...

Conflicts:
	icons/obj/guns/energy.dmi

2015-02-25 14:10:54 +08:00

..

energy

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

2015-02-25 14:10:54 +08:00

magic

Merge to master - sole conflicting file was ninja.dm FUCK NINJAS

2014-10-04 01:45:39 -07:00

projectile

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

energy.dm

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

2015-02-18 02:29:07 -08:00

magic.dm

Fixes object processing list by replacing "SSobj.processing.Add" by "SSobj.processing |= " to avoid having duplicated objects in the list, meaning the objects would be processed more than once per iteration.

2015-02-14 14:18:49 +01:00

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