Merge branch 'master' into digileg-runtime

2018-03-19 21:33:50 -05:00
parent 5d2ec7dd88 dad2d44ea2
commit 8cbdf9fcb4
1329 changed files with 2726 additions and 1986 deletions
@@ -28,4 +28,6 @@
 			else
 				to_chat(user,"<span class='warning'>Remove the powercell first!</span>") //We make this check because the stunsword starts without a battery.
 		else
-			to_chat(user, "<span class='warning'> You can't modify [O] with this kit!</span>")
+			to_chat(user, "<span class='warning'> You can't modify [O] with this kit!</span>")
+
+