Merge pull request #6559 from Citadel-Station-13/upstream-merge-37501

[MIRROR] Fixes missing icons
2018-05-02 01:19:58 +00:00
parent 9c41fd5516 a5395c730d
commit 4851b9bd82
10 changed files with 8 additions and 4 deletions
@@ -665,6 +665,7 @@
 	name = "envirosuit extinguisher cartridge"
 	desc = "A cartridge loaded with a compressed extinguisher mix, used to refill the automatic extinguisher on plasma envirosuits."
 	icon_state = "plasmarefill"
+	icon = 'icons/obj/device.dmi'

 /obj/item/clothing/under/rank/security/navyblue/russian
 	name = "russian officer's uniform"
@@ -190,7 +190,6 @@ interface with the mining shuttle at the landing site if a mobile beacon is also
 	item_state = "electronic"
 	lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
-	icon = 'icons/obj/device.dmi'
 	desc = "Deploy to designate the landing zone of the auxillary base."
 	w_class = WEIGHT_CLASS_SMALL
 	shuttle_id = "colony_drop"
@@ -2,7 +2,6 @@
 /obj/item/ammo_box
 	name = "ammo box (null_reference_exception)"
 	desc = "A box of ammo."
-	icon_state = "357"
 	icon = 'icons/obj/ammo.dmi'
 	flags_1 = CONDUCT_1
 	slot_flags = SLOT_BELT
@@ -30,6 +30,7 @@

 /obj/item/ammo_box/magazine/toy/smgm45
 	name = "donksoft SMG magazine"
+	icon_state = "c20r45-toy"
 	caliber = "foam_force"
 	ammo_type = /obj/item/ammo_casing/caseless/foam_dart
 	max_ammo = 20
@@ -39,10 +40,12 @@
 	icon_state = "c20r45-[round(ammo_count(),2)]"

 /obj/item/ammo_box/magazine/toy/smgm45/riot
+	icon_state = "c20r45-riot"
 	ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot

 /obj/item/ammo_box/magazine/toy/m762
 	name = "donksoft box magazine"
+	icon_state = "a762-toy"
 	caliber = "foam_force"
 	ammo_type = /obj/item/ammo_casing/caseless/foam_dart
 	max_ammo = 50
@@ -52,4 +55,5 @@
 	icon_state = "a762-[round(ammo_count(),10)]"

 /obj/item/ammo_box/magazine/toy/m762/riot
+	icon_state = "a762-riot"
 	ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot