Merge pull request #2331 from Citadel-Station-13/upstream-merge-29803

[MIRROR] Ports weapons to Initialize()
2017-08-12 06:35:09 -05:00
parent 8ca2a8d3bd fa19568a06
commit c174eb3f5d
1 changed files with 2 additions and 2 deletions
@@ -2,8 +2,8 @@
 	name = "weapon"
 	icon = 'icons/obj/weapons.dmi'

-/obj/item/weapon/New()
-	..()
+/obj/item/weapon/Initialize()
+	. = ..()
 	if(!hitsound)
 		if(damtype == "fire")
 			hitsound = 'sound/items/welder.ogg'