Merge pull request Civ13#2598 from KanohaShinobi/master

assets

code/modules/1713/_mags1904.dm

@@ -622,6 +622,18 @@ RUSSO-JAPANESE WAR WEAPONS MAGS N AMMO
 
 	desc = "A pouch containing 18 .44 pistol rounds."
 
+/obj/item/ammo_magazine/c357
+	name = "bullet pouch (.357 magnum)"
+	desc = "a pouch of .357 magnum bullets."
+	icon_state = "pouch"
+	ammo_type = /obj/item/ammo_casing/a357
+	caliber = "a357"
+	max_ammo = 30
+	weight = 1.1
+	multiple_sprites = TRUE
+
+	pouch = TRUE
+
 /obj/item/ammo_magazine/shellbox
 	name = "shotgun buckshot box (.12 gauge)"
 	icon_state = "shellbox"

code/modules/1713/apparel_fallout.dm

@@ -50,10 +50,10 @@
 				return
 			else
 				flags_inv = HIDEFACE
-				worn_state = "ncr_fatigues_maskup_rolled"
-				item_state = "ncr_fatigues_maskup_rolled"
-				icon_state = "ncr_fatigues_maskup_rolled"
-				item_state_slots["w_uniform"] = "ncr_fatigues_maskup_rolled"
+				worn_state = "ncr_fatigues_rolled_maskup"
+				item_state = "ncr_fatigues_rolled_maskup"
+				icon_state = "ncr_fatigues_rolled_maskup"
+				item_state_slots["w_uniform"] = "ncr_fatigues_rolled_maskup"
 				usr << "<span class = 'danger'>You roll up your uniform's sleeves.</span>"
 				rolled = TRUE
 				cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
@@ -179,6 +179,7 @@
 /obj/item/clothing/head/helmet/fallout/ncr/goggles/down/New()
 	..()
 	update_clothing_icon()
+	update_icon()
 
 /obj/item/weapon/storage/belt/fallout/ncr
 	name = "NCR Trooper belt"
@@ -212,3 +213,49 @@
 		new /obj/item/ammo_magazine/service_rifle(src)
 	new /obj/item/weapon/attachment/bayonet(src)
 	new /obj/item/weapon/reagent_containers/food/drinks/bottle/canteen/ww2/us(src)
+
+/obj/item/clothing/head/fallout/ncr
+	name = "NCR Officer Beret"
+	desc = "A green camo beret with a capbadge of the NCR's 2 headed bear."
+	icon_state = "ncr_beret"
+	item_state = "ncr_beret"
+	worn_state = "ncr_beret"
+
+/obj/item/clothing/head/fallout/ncr/recon
+	name = "NCR 1st Recon Beret"
+	desc = "A red beret with a capbadge of the NCR's 1st Recon."
+	icon_state = "ncr_beret_recon"
+	item_state = "ncr_beret_recon"
+	worn_state = "ncr_beret_recon"
+
+
+
+////////////////////////////////////////LEGION/////////////////////////////////////////////////
+/obj/item/clothing/under/fallout/legionaire
+	name = "Legionaire Armor"
+	desc = "A red T-shirt and dark skirt with leather armor overtop. Commonly worn by Caesar's Legion."
+	icon_state = "legionaire"
+	item_state = "legionaire"
+	worn_state = "legionaire"
+	armor = list(melee = 35, arrow = 33, gun = 8, energy = 15, bomb = 35, bio = 20, rad = FALSE)
+
+/obj/item/clothing/shoes/heavyboots/wrappedboots/legion
+	name = "Legionaire armored boots"
+	desc = "Black boots with armored plating attached."
+	icon_state = "legion_boots"
+	armor = list(melee = 20, arrow = 10, gun = FALSE, energy = 25, bomb = 10, bio = 10, rad = 40)
+
+/obj/item/clothing/gloves/fingerless/legionaire
+	name = "legionaire hand wraps"
+	icon_state = "legion_handwraps"
+	item_state = "legion_handwraps"
+
+/obj/item/clothing/head/helmet/fallout/legionaire
+	name = "Legionaire Cap"
+	desc = "A rather thin leather cap with ear protection."
+	icon_state = "legionaire"
+	item_state = "legionaire"
+	worn_state = "legionaire"
+	body_parts_covered = HEAD
+	flags_inv = BLOCKHEADHAIR
+	armor = list(melee = 10, arrow = 2, gun = 0, energy = 15, bomb = 10, bio = 20, rad = FALSE)

code/modules/1713/weapons/guns/lever_action.dm

@@ -263,3 +263,17 @@
 	value = 150
 	blackpowder = TRUE
 	load_delay = 3.5
+
+/obj/item/weapon/gun/projectile/leveraction/cowboy_repeater
+	name = "Cowboy Repeater"
+	desc = "A lever-action rifle with a 7-round tube, chambered in .357 Magnum rounds."
+	force = 9
+	icon_state = "cowboy_repeater"
+	caliber = "a357"
+	max_shells = 14
+	weight = 5.0
+	effectiveness_mod = 0.96
+	ammo_type = /obj/item/ammo_casing/a357
+	value = 150
+	blackpowder = TRUE
+	load_delay = 4

code/modules/projectiles/__projectiles.dm

@@ -508,7 +508,7 @@
 	damage = DAMAGE_VERY_HIGH + 23
 	penetrating = 5
 	armor_penetration = 42
-	
+
 /obj/item/projectile/bullet/rifle/a762x51/weak/New()
 	..()
 	damage = (damage)/2
@@ -679,6 +679,11 @@
 	penetrating = 5
 	armor_penetration = 42
 
+/obj/item/projectile/bullet/rifle/a357
+	damage = DAMAGE_HIGH+30
+	penetrating = 2
+	armor_penetration = 12
+
 // Shotguns
 
 /obj/item/projectile/bullet/pellet/buckshot
@@ -698,15 +703,15 @@
 	armor_penetration = 0
 	agony = 60
 	check_armor = "melee"
-	
+
 	embed = FALSE
 	sharp = FALSE
 
 /obj/item/projectile/bullet/shotgun/breaching
 	name = "breaching slug"
 	damage = DAMAGE_LOW + 5
 	armor_penetration = 10
-	
+
 	embed = FALSE
 	sharp = FALSE
 
@@ -731,7 +736,7 @@
 
 /obj/item/projectile/bullet/autocannon/frag/on_impact(var/atom/A)
 	impact_effect(effect_transform)
-	
+
 	var/turf/T = get_turf(A)
 	explosion(T, 0, 0, 1, 1)
 	if (incendiary)
@@ -770,4 +775,3 @@
 	var/turf/T = get_turf(A)
 	explosion(T, 0, 0, 1, 1)
 	..()
-

code/modules/projectiles/_ammo_casing.dm

@@ -1193,6 +1193,16 @@
 	caliber = "a75"
 	value = 8
 
+/obj/item/ammo_casing/a357
+	name = ".357 Magnum cartridge"
+	desc = "A brass .357 Magnum rifle casing."
+	icon_state = "rifle-bullet"
+	spent_icon = "rifle-casing"
+	weight = 0.09
+	projectile_type = /obj/item/projectile/bullet/rifle/a357
+	caliber = "a357"
+	value = 2
+
 
 // Shotguns