Merge branch 'master' into development

2026-07-21 21:10:30 +01:00 · 2017-11-25 12:57:38 -06:00
parent f7d857a3b2 1ab9c47841
commit 461ec73b94
20 changed files with 61 additions and 38 deletions
@@ -33,6 +33,7 @@
 		icon_state = "echair0"
 	else
 		on = 1
+		shock()
 		icon_state = "echair1"
 	usr << "<span class='notice'>You switch [on ? "on" : "off"] [src].</span>"
 	return