Merge with upstream/master

Fixes conflicts
2026-08-23 03:57:13 +01:00 · 2015-02-18 13:41:32 -05:00
parent fbd9c367c0 87ed05c146
commit 4bcdb94a99
325 changed files with 5353 additions and 3917 deletions
@@ -3,8 +3,8 @@
 	desc = "Used to remotely activate devices."
 	icon_state = "signaller"
 	item_state = "signaler"
-	m_amt = 1000
-	g_amt = 200
+	m_amt = 400
+	g_amt = 120
 	origin_tech = "magnets=1"
 	wires = WIRE_RECEIVE | WIRE_PULSE | WIRE_RADIO_PULSE | WIRE_RADIO_RECEIVE