Merge pull request #11369 from Ghommie/Ghommie-cit609

Porting the musician and curator beacons.
2020-03-08 07:34:48 -07:00
parent ea1bb1812c 9066287037
commit c736568a5a
8 changed files with 161 additions and 43 deletions
@@ -106,9 +106,9 @@

 /datum/quirk/musician/on_spawn()
 	var/mob/living/carbon/human/H = quirk_holder
-	var/obj/item/instrument/guitar/guitar = new(get_turf(H))
-	H.put_in_hands(guitar)
-	H.equip_to_slot(guitar, SLOT_IN_BACKPACK)
+	var/obj/item/choice_beacon/music/B = new(get_turf(H))
+	H.put_in_hands(B)
+	H.equip_to_slot(B, SLOT_IN_BACKPACK)
 	var/obj/item/musicaltuner/musicaltuner = new(get_turf(H))
 	H.put_in_hands(musicaltuner)
 	H.equip_to_slot(musicaltuner, SLOT_IN_BACKPACK)