Ports dash weapons to the dash datum

2017-10-03 18:10:39 -05:00
parent aec96bbbbe
commit 4e648765db
8 changed files with 257 additions and 71 deletions
@@ -591,3 +591,7 @@
 		var/mob/M = owner
 		var/datum/language_holder/H = M.get_language_holder()
 		H.open_language_menu(usr)
+<<<<<<< HEAD
+=======
+
+>>>>>>> 380413f... Ports dash weapons to the dash datum (#31222)