Merge pull request #33933 from coiax/wizard-late-joining

Late joiners also get summoned guns/magic
2018-01-10 03:11:56 -06:00
parent dfe39e7a1d
commit 3b9b6f156e
9 changed files with 209 additions and 220 deletions
@@ -12,7 +12,11 @@
 /obj/item/gun/ballistic/automatic/pistol/update_icon()
 	..()
 	icon_state = "[initial(icon_state)][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]"
-	return
+
+/obj/item/gun/ballistic/automatic/pistol/suppressed/Initialize(mapload)
+	. = ..()
+	var/obj/item/suppressor/S = new(src)
+	install_suppressor(S)

 /obj/item/gun/ballistic/automatic/pistol/m1911
 	name = "\improper M1911"