phil235 78d28a6d64 Merge branch 'master' of https://github.com/tgstation/-tg-station into BigUserdanger ...

Conflicts:
	code/modules/events/ninja.dm

2015-03-15 12:30:27 +01:00

..

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

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

helpers.dm

ABSOLUTELY ABSOLUTE

2014-08-06 16:21:24 +02:00

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

igniter.dm

Igniter sparks

2014-06-11 22:52:53 +01:00

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

mousetrap.dm

Makes the message when you're attacked slightly bigger for better visibility."

2015-03-12 23:15:54 +01:00

proximity.dm

Code cleanup

2015-03-13 10:41:00 -07:00

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

signaler.dm

Makes assembly parts work with wires

2015-01-17 18:08:55 +01:00

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

voice.dm

Makes assembly parts work with wires

2015-01-17 18:08:55 +01:00