Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not

2021-10-08 21:05:41 -03:00
parent 5aa12b4716 3cfaad31c1
commit 437b3105d1
135 changed files with 144395 additions and 145067 deletions
@@ -23,4 +23,10 @@

 /obj/item/ammo_box/magazine/mm712x82/match
 	name = "box magazine (Match 7.12x82mm)"
+	icon_state = "a762-50"
 	ammo_type = /obj/item/ammo_casing/mm712x82/match
+	max_ammo = 50
+
+/obj/item/ammo_box/magazine/mm712x82/update_icon()
+	..()
+	icon_state = "a762-[round(ammo_count(),10)]"
@@ -278,6 +278,7 @@
 	w_class = WEIGHT_CLASS_SMALL
 	require_module = 1
 	module_type = list(/obj/item/robot_module/miner)
+	module_flags = BORG_MODULE_MINER
 	var/denied_type = null
 	var/maximum_of_type = 1
 	var/cost = 30