Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real

2020-07-08 22:02:03 -07:00
parent b35e11788c d79e1cdb9d
commit a625d6562b
1515 changed files with 270775 additions and 326499 deletions
@@ -36,6 +36,7 @@
 	targetitem = /obj/item/gun/energy/e_gun/hos
 	difficulty = 10
 	excludefromjob = list("Head Of Security")
+	altitems = list(/obj/item/gun/ballistic/revolver/mws, /obj/item/choice_beacon/hosgun) //We now look for either the alt verson of the hos gun or the beacon picker.

 /datum/objective_item/steal/handtele
 	name = "a hand teleporter."