Merge pull request #10819 from Ghommie/Ghommie-cit541

clown ops infiltrator consistency.

_maps/shuttles/infiltrator_basic.dmm

@@ -924,25 +924,16 @@
 /turf/open/floor/plasteel/dark,
 /area/shuttle/syndicate/medical)
 "ce" = (
-/obj/item/sbeacondrop/bomb{
-	pixel_y = 5
-	},
-/obj/item/sbeacondrop/bomb,
 /obj/structure/table/reinforced,
 /obj/effect/turf_decal/tile/neutral,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
+/obj/effect/landmark/start/nuclear_equipment,
+/obj/effect/landmark/start/nuclear_equipment,
 /turf/open/floor/plasteel/dark,
 /area/shuttle/syndicate/armory)
 "cf" = (
-/obj/item/grenade/syndieminibomb{
-	pixel_x = 4;
-	pixel_y = 2
-	},
-/obj/item/grenade/syndieminibomb{
-	pixel_x = -1
-	},
 /obj/structure/table/reinforced,
 /obj/structure/window/reinforced{
 	dir = 4
@@ -956,6 +947,7 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
+/obj/effect/landmark/start/nuclear_equipment/minibomb,
 /turf/open/floor/plasteel/dark,
 /area/shuttle/syndicate/armory)
 "cg" = (

code/game/objects/effects/landmarks.dm

@@ -273,6 +273,27 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
 	GLOB.newplayer_start += loc
 	return INITIALIZE_HINT_QDEL
 
+/obj/effect/landmark/start/nuclear_equipment
+	name = "bomb or clown beacon spawner"
+	var/nukie_path = /obj/item/sbeacondrop/bomb
+	var/clown_path = /obj/item/sbeacondrop/clownbomb
+
+/obj/effect/landmark/start/nuclear_equipment/after_round_start()
+	var/npath = nukie_path
+	if(istype(SSticker.mode, /datum/game_mode/nuclear/clown_ops))
+		npath = clown_path
+	else if(istype(SSticker.mode, /datum/game_mode/dynamic))
+		var/datum/game_mode/dynamic/D = SSticker.mode
+		if(locate(/datum/dynamic_ruleset/roundstart/nuclear/clown_ops) in D.current_rules)
+			npath = clown_path
+	new npath(loc)
+	return ..()
+
+/obj/effect/landmark/start/nuclear_equipment/minibomb
+	name = "minibomb or bombanana spawner"
+	nukie_path = /obj/item/storage/box/minibombs
+	clown_path = /obj/item/storage/box/bombananas
+
 /obj/effect/landmark/latejoin
 	name = "JoinLate"
 

code/game/objects/items/storage/boxes.dm

@@ -322,6 +322,26 @@
 	for(var/i in 1 to 5)
 		new /obj/item/grenade/empgrenade(src)
 
+/obj/item/storage/box/minibombs
+	name = "box of syndicate minibombs"
+	desc = "A box containing 2 highly explosive syndicate minibombs."
+	icon_state = "syndiebox"
+	illustration = "frag"
+
+/obj/item/storage/box/minibombs/PopulateContents()
+	new /obj/item/grenade/syndieminibomb(src)
+	new /obj/item/grenade/syndieminibomb(src)
+
+/obj/item/storage/box/bombananas
+	name = "box of bombananas"
+	desc = "A box containing 2 highly explosive bombananas. Discard peel at enemy after consumption."
+	icon_state = "syndiebox"
+	illustration = "frag"
+
+/obj/item/storage/box/bombananas/PopulateContents()
+	new /obj/item/reagent_containers/food/snacks/grown/banana/bombanana(src)
+	new /obj/item/reagent_containers/food/snacks/grown/banana/bombanana(src)
+
 /obj/item/storage/box/trackimp
 	name = "boxed tracking implant kit"
 	desc = "Box full of scum-bag tracking utensils."
@@ -1267,4 +1287,4 @@
 
 /obj/item/storage/box/marshmallow/PopulateContents()
 	for (var/i in 1 to 5)
-		new /obj/item/reagent_containers/food/snacks/marshmallow(src)
+		new /obj/item/reagent_containers/food/snacks/marshmallow(src)