Makes all three sol rifles more visually distinct from one another, a…

…nd removes .40 sol drum magazines (#282)

* bigger weapons!

* tweaks the new qarad sprite a little

* changes the sprites of the other two weapons as well

modular_nova/modules/black_mesa/code/armaments/_armament_primary.dm

@@ -22,12 +22,6 @@
 	subcategory = ARMAMENT_SUBCATEGORY_ASSAULTRIFLE
 	mags_to_spawn = 3
 
-/datum/armament_entry/hecu/primary/assaultrifle/automaties
-	item_type = /obj/item/gun/ballistic/automatic/sol_rifle/machinegun
-	max_purchase = 1
-	cost = 14
-	magazine = /obj/item/ammo_box/magazine/c40sol_rifle/drum
-
 /datum/armament_entry/hecu/primary/assaultrifle/infanteria
 	item_type = /obj/item/gun/ballistic/automatic/sol_rifle
 	max_purchase = 2

modular_nova/modules/company_imports/code/armament_datums/sol_defense.dm

@@ -157,11 +157,14 @@
 	item_type = /obj/item/ammo_box/magazine/c40sol_rifle/standard/starts_empty
 	cost = PAYCHECK_COMMAND
 
+<<<<<<< HEAD
 /* /datum/armament_entry/company_import/sol_defense/magazines/sol_rifle_drum
 	item_type = /obj/item/ammo_box/magazine/c40sol_rifle/drum/starts_empty
 	cost = PAYCHECK_COMMAND * 3
 	contraband = TRUE */ // FLUFFY FRONTIER REMOVAL - SOL WEAPONS REBALANCE
 
+=======
+>>>>>>> 6c3ed558 (Makes all three sol rifles more visually distinct from one another, and removes .40 sol drum magazines (#282))
 /datum/armament_entry/company_import/sol_defense/magazines/sol_grenade_standard
 	item_type = /obj/item/ammo_box/magazine/c980_grenade/starts_empty
 	cost = PAYCHECK_COMMAND * 2

modular_nova/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/magazines.dm

@@ -65,20 +65,6 @@
 /obj/item/ammo_box/magazine/c40sol_rifle/standard/starts_empty
 	start_empty = TRUE
 
-
-/obj/item/ammo_box/magazine/c40sol_rifle/drum
-	name = "\improper Sol rifle drum magazine"
-	desc = "A massive drum magazine for SolFed rifles, holds sixty rounds."
-
-	icon_state = "rifle_drum"
-
-	w_class = WEIGHT_CLASS_BULKY
-
-	max_ammo = 60
-
-/obj/item/ammo_box/magazine/c40sol_rifle/drum/starts_empty
-	start_empty = TRUE
-
 // .980 grenade magazines
 
 /obj/item/ammo_box/magazine/c980_grenade

modular_nova/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/rifle.dm

@@ -121,13 +121,13 @@
 	name = "\improper Qarad Light Machinegun"
 	desc = "A hefty machinegun commonly seen in the hands of SolFed military types. Accepts any standard SolFed rifle magazine."
 
-	icon_state = "outomaties"
+	icon_state = "qarad"
 	worn_icon_state = "outomaties"
 	inhand_icon_state = "outomaties"
 
 	bolt_type = BOLT_TYPE_OPEN
 
-	spawn_magazine_type = /obj/item/ammo_box/magazine/c40sol_rifle/drum
+	spawn_magazine_type = /obj/item/ammo_box/magazine/c40sol_rifle
 
 	fire_delay = 0.1 SECONDS