Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800

code/game/gamemodes/clown_ops/clown_weapons.dm

@@ -202,7 +202,7 @@
 	icon_state = "moustacheg"
 	clumsy_check = GRENADE_NONCLUMSY_FUMBLE
 
-/obj/item/grenade/chem_grenade/teargas/moustache/prime()
+/obj/item/grenade/chem_grenade/teargas/moustache/prime(mob/living/lanced_by)
 	var/list/check_later = list()
 	for(var/mob/living/carbon/C in get_turf(src))
 		check_later += C

code/game/gamemodes/gangs/dominator.dm

@@ -145,9 +145,9 @@
 		new /obj/item/stack/sheet/plasteel(src.loc)
 	qdel(src)
 
-/obj/machinery/dominator/attacked_by(obj/item/I, mob/living/user)
+/obj/machinery/dominator/attacked_by(obj/item/I, mob/living/user, attackchain_flags = NONE, damage_multiplier = 1)
 	add_fingerprint(user)
-	..()
+	return ..()
 
 /obj/machinery/dominator/attack_hand(mob/user)
 	if(operating || (stat & BROKEN))
@@ -240,4 +240,4 @@
 
 #undef DOM_BLOCKED_SPAM_CAP
 #undef DOM_REQUIRED_TURFS
-#undef DOM_HULK_HITS_REQUIRED
+#undef DOM_HULK_HITS_REQUIRED

code/game/gamemodes/gangs/gang_items.dm

@@ -288,7 +288,7 @@ datum/gang_item/clothing/shades //Addition: Why not have cool shades on a gang m
 	name = "Fragmentation Grenade"
 	id = "frag nade"
 	cost = 5
-	item_path = /obj/item/grenade/syndieminibomb/concussion/frag
+	item_path = /obj/item/grenade/frag
 
 /datum/gang_item/equipment/implant_breaker
 	name = "Implant Breaker"

code/game/gamemodes/objective_items.dm

@@ -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 eather the alt verson of the hos gun or the beacon picker.
 
 /datum/objective_item/steal/handtele
 	name = "a hand teleporter."