modular blueshield

Fluffy-Frontier · Nov 19, 2023 · ade00d7 · ade00d7
1 parent 3eb9ef4
commit ade00d7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/modular_skyrat/modules/blueshield/code/closet.dm b/modular_skyrat/modules/blueshield/code/closet.dm
@@ -34,10 +34,6 @@
 	new /obj/item/restraints/handcuffs(src)
 	new /obj/item/clothing/glasses/hud/security/sunglasses(src)
 	new /obj/item/storage/medkit/tactical/blueshield(src)
-<<<<<<< HEAD
-	// new /obj/item/storage/toolbox/guncase/skyrat/carwo_large_case/sindano(src) FF EDIT: DELETION - BLUESHIELD-REARM
-=======
-	new /obj/item/storage/toolbox/guncase/skyrat/xhihao_large_case/bogseo(src)
->>>>>>> 86787e055 (Gives blueshields a new shoulder-bruising "submachinegun" that fires .585 (#24640))
+	// new /obj/item/storage/toolbox/guncase/skyrat/xhihao_large_case/bogseo(src) FF EDIT: DELETION - BLUESHIELD-REARM
 	new /obj/item/storage/bag/garment/blueshield(src)
 	new /obj/item/mod/control/pre_equipped/blueshield(src)
diff --git a/tff_modular/modules/blueshield-rearm/code/weapon_beacon.dm b/tff_modular/modules/blueshield-rearm/code/weapon_beacon.dm
@@ -15,6 +15,7 @@
 			// а доставкой прилетит набор с оружием.
 			/obj/item/gun/energy/blueshield = /obj/item/storage/belt/holster/energy/blueshield,
 			/obj/item/gun/ballistic/automatic/sol_smg = /obj/item/storage/toolbox/guncase/skyrat/carwo_large_case/sindano,
+			/obj/item/gun/ballistic/automatic/xhihao_smg = /obj/item/storage/toolbox/guncase/skyrat/xhihao_large_case/bogseo,
 		)
 		for(var/obj/item/weapon as anything in possible_weapons)
 			blueshield_weapons[initial(weapon.name)] = possible_weapons[weapon]