We build for china

_maps/map_files/Pahrump/Pahrump-Above-3.dmm

@@ -9385,7 +9385,6 @@
 "aJF" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/remains/human,
-/obj/item/gun/ballistic/automatic/pistol/type17,
 /turf/open/floor/plasteel/f13/vault_floor/neutral,
 /area/f13/brotherhood/surface)
 "aJG" = (

_maps/map_files/Pahrump/Pahrump-Surface-2.dmm

@@ -12327,7 +12327,6 @@
 /turf/open/indestructible/ground/outside/road,
 /area/f13/wasteland)
 "eST" = (
-/obj/item/gun/ballistic/automatic/pistol/type17,
 /obj/item/storage/briefcase,
 /turf/open/indestructible/ground/outside/desert,
 /area/f13/wasteland)
@@ -33978,7 +33977,6 @@
 /area/f13/building)
 "nId" = (
 /obj/effect/decal/cleanable/glass,
-/obj/item/gun/ballistic/automatic/pistol/type17,
 /turf/open/indestructible/ground/outside/dirt{
 	dir = 1;
 	icon_state = "dirtcorner"

code/game/objects/effects/spawners/f13lootdrop.dm

@@ -1105,8 +1105,8 @@
 /obj/effect/spawner/bundle/f13/type17
 	name = "chinese 10mm pistol and ammo spawner"
 	items = list(
-				/obj/item/gun/ballistic/automatic/pistol/type17,
-				/obj/item/ammo_box/magazine/m10mm_adv/simple/
+				/obj/item/gun/ballistic/revolver/chinese,
+				/obj/item/ammo_box/m10mm_strip,
 				)
 
 /obj/effect/spawner/bundle/f13/m1911

code/game/objects/effects/spawners/themed_loot_tables.dm

@@ -196,7 +196,7 @@
 	name = "weaponspawner criminal"
 	loot = list(
 		/obj/item/gun/ballistic/automatic/autopipe = 18,
-		/obj/item/gun/ballistic/automatic/pistol/type17 = 16,
+		/obj/item/gun/ballistic/revolver/chinese = 16,
 		/obj/effect/spawner/bundle/f13/single_shotgun = 13,
 		/obj/item/gun/ballistic/revolver/thatgun = 8,
 		/obj/effect/spawner/bundle/f13/miniuzi = 4,

code/game/objects/items/melee/f13onehanded.dm

@@ -143,12 +143,12 @@
 
 /obj/item/melee/onehanded/chinesesword //[low damage, low wounding, very high block]
 	name = "chinese officer's sword"
-	desc = "A sword usually issued to chinese officers during the great war. Despite being ntended for ceremonial use, it's still very well made and functional. Not very heavy but in trained hands its an incredibly agile weapon."
+	desc = "A sword usually issued to chinese officers during the great war. Despite being intended for ceremonial use, it's still very well made and functional. Not very heavy but in trained hands its an incredibly agile weapon."
 	icon = 'icons/fallout/objects/melee/melee.dmi'
 	lefthand_file = 'icons/fallout/onmob/weapons/melee1h_lefthand.dmi'
 	righthand_file = 'icons/fallout/onmob/weapons/melee1h_righthand.dmi'
 	icon_state = "chinasword"
-	item_state = "spathasmith" //placeholder
+	item_state = "spatha" //placeholder
 	force = 30 //worse than scrap sabre
 	wound_bonus = WOUNDING_BONUS_MODEST
 	block_chance = 25 //perfectly balanced

code/modules/WVM/wmv_buyer.dm

@@ -168,7 +168,7 @@ Change pathing to /obj/machinery/mineral/wasteland_trader/meat_o_mat when big ma
 								/obj/item/reagent_containers/food/snacks/meat/slab/bloatfly_meat = 2,
 								/obj/item/reagent_containers/food/snacks/meat/slab/cazador_meat = 2,
 								/obj/item/reagent_containers/food/snacks/meat/slab/mirelurk = 2,
-								/obj/item/reagent_containers/food/snacks/meat/slab/wolf = 2,	
+								/obj/item/reagent_containers/food/snacks/meat/slab/wolf = 2,
 								/obj/item/organ/heart = 30,
 								/obj/item/organ/ears = 5,
 								/obj/item/organ/eyes = 5,
@@ -313,7 +313,7 @@ Fence
 						/obj/item/gun/ballistic/revolver/hobo/pepperbox = 8,
 						/obj/item/gun/ballistic/revolver/single_shotgun = 8,
 						/obj/item/gun/ballistic/automatic/pistol/n99 = 8,
-						/obj/item/gun/ballistic/automatic/pistol/type17 = 8,
+						/obj/item/gun/ballistic/revolver/chinese = 8,
 						/obj/item/gun/ballistic/automatic/pistol/pistol22 = 8,
 						/obj/item/gun/ballistic/automatic/pistol/ninemil = 8,
 						/obj/item/gun/ballistic/automatic/pistol/sig = 8,

code/modules/cargo/exports/misc_export.dm

@@ -33,7 +33,7 @@
 	unit_name = "light pistols"
 	export_types = list(
 		/obj/item/gun/ballistic/automatic/pistol/n99,
-		/obj/item/gun/ballistic/automatic/pistol/type17,
+		/obj/item/gun/ballistic/revolver/chinese,
 		/obj/item/gun/ballistic/automatic/pistol/ninemil,
 		/obj/item/gun/ballistic/automatic/pistol/pistol22,
 		/obj/item/gun/ballistic/automatic/pistol/beretta/automatic,

code/modules/clothing/head/f13factionhead.dm

@@ -1287,11 +1287,15 @@
 /obj/item/clothing/head/f13/chinese/officer
 	name = "PLA officer's cap"
 	desc = "A People's Liberation Army peaked cap, worn by officers."
-	icon = 'icons/fallout/clothing/hats.dmi'
-	mob_overlay_icon = 'icons/fallout/onmob/clothes/head.dmi'
 	icon_state = "chinese_officer"
 	item_state = "chinese_officer"
 
+/obj/item/clothing/head/f13/chinese/militant
+	name = "PLA militant cap"
+	desc = "A People's Liberation Army peaked cap with marching bandana, worn by communist forces in the United States to conceal their identity."
+	icon_state = "chinese_militant"
+	item_state = "chinese_militant"
+
 //Old World Law Enforcement
 //Police and State Police
 

code/modules/clothing/under/f13.dm

@@ -957,11 +957,14 @@
 /obj/item/clothing/under/f13/chinese/officer
 	name = "PLA officer's uniform"
 	desc = "An pre-war People's Liberation Army uniform, worn by officers."
-	icon = 'icons/fallout/clothing/uniforms.dmi'
-	mob_overlay_icon = 'icons/fallout/onmob/clothes/uniform.dmi'
 	icon_state = "chinese_officer"
 	item_state = "chinese_officer"
 
+/obj/item/clothing/under/f13/chinese/militant
+	name = "PLA militant uniform"
+	desc = "An pre-war People's Liberation Army uniform, intended to be worn by communist militants in the United States."
+	icon_state = "chinese_militant"
+	item_state = "chinese_militant"
 //Old World Law Enforcement
 //Police and State Police
 

code/modules/fallout/misc/gang_items.dm

@@ -186,7 +186,7 @@
 	name = "Type 17 Pistol"
 	id = "type17"
 	cost = 50
-	item_path = /obj/item/gun/ballistic/automatic/pistol/type17
+	item_path = /obj/item/gun/ballistic/revolver/chinese
 
 /datum/gang_item/weapon/type93
 	name = "Worn Type 93"
@@ -248,7 +248,6 @@
 	cost = 75
 	item_path = /obj/item/grenade/f13/dynamite
 
-
 ///////////////////
 //EQUIPMENT
 ///////////////////

code/modules/jobs/job_types/wasteland.dm

@@ -216,10 +216,10 @@
 
 /datum/outfit/loadout/denchemist
 	name = "Chemist"
-	r_hand = /obj/item/gun/ballistic/automatic/pistol/type17
+	r_hand = /obj/item/gun/ballistic/revolver/chinese
 	suit = /obj/item/clothing/suit/toggle/labcoat/chemist
 	backpack_contents = list(
-						/obj/item/ammo_box/magazine/m10mm_adv/simple = 1,
+						/obj/item/ammo_box/m10mm_strip = 1,
 						/obj/item/grenade/chem_grenade = 1,
 						/obj/item/clothing/mask/gas = 1,
 						/obj/item/reagent_containers/glass/beaker/large = 2
@@ -1299,4 +1299,3 @@ Raider
 	ADD_TRAIT(H, TRAIT_HARD_YARDS, src)
 
 */
-

code/modules/mob/living/simple_animal/hostile/f13/chinese.dm

@@ -31,7 +31,7 @@
 /mob/living/simple_animal/hostile/chinese/ranged
 	icon_state = "chinesepistol"
 	icon_living = "chinesepistol"
-	loot = list(/obj/effect/mob_spawn/human/corpse/chineseremnant/pistol, /obj/item/gun/ballistic/automatic/pistol/type17, /obj/item/ammo_box/magazine/m9mm)
+	loot = list(/obj/effect/mob_spawn/human/corpse/chineseremnant/pistol, /obj/item/gun/ballistic/revolver/chinese, /obj/item/ammo_box/magazine/m9mm)
 	ranged = 1
 	maxHealth = 110
 	health = 110

code/modules/mob/living/simple_animal/hostile/russian.dm

@@ -59,7 +59,7 @@
 	rapid = 3
 	casingtype = /obj/item/ammo_casing/c10mm
 	loot = list(/obj/effect/mob_spawn/human/corpse/russian/ranged/officer,
-				/obj/item/gun/ballistic/automatic/pistol/type17)
+				/obj/item/gun/ballistic/revolver/chinese)
 
 /mob/living/simple_animal/hostile/russian/ranged/officer/Aggro()
 	..()

code/modules/projectiles/boxes_magazines/ammo_boxes.dm

@@ -577,6 +577,18 @@
 /obj/item/ammo_box/l10mm/empty
 	start_empty = 1
 
+/obj/item/ammo_box/m10mm_strip
+	name = "10mm clip"
+	icon = 'icons/fallout/objects/guns/ammo.dmi'
+	icon_state = "10mm_strip"
+	ammo_type = /obj/item/ammo_casing/c10mm
+	caliber = "10mm"
+	max_ammo = 10
+	multiple_sprites = 1
+
+/obj/item/ammo_box/m10mm_strip/empty
+	start_empty = 1
+
 
 //.357
 /obj/item/ammo_box/a357

code/modules/projectiles/boxes_magazines/internal/revolver.dm

@@ -23,6 +23,10 @@
 	caliber = "10mm"
 	max_ammo = 12
 
+/obj/item/ammo_box/magazine/internal/cylinder/rev6520/china
+	name = "chinese internal magazine 10mm"
+	max_ammo = 10
+
 /obj/item/ammo_box/magazine/internal/cylinder/rev4570
 	name = "4570 cylinder"
 	ammo_type = /obj/item/ammo_casing/c4570

code/modules/projectiles/guns/ballistic/pistol.dm

@@ -104,19 +104,26 @@
 	can_automatic = FALSE
 
 
-//Type 17								Keywords: 10mm, Semi-auto, 12/24 round magazine. Special modifiers: damage +1, spread +1
-/obj/item/gun/ballistic/automatic/pistol/type17
+//Type 17								Keywords: 10mm, psuedo-revolver, loads from stripper clips, Special modifiers: damage +1, spread +1
+/obj/item/gun/ballistic/revolver/chinese
 	name = "chinese type-17 pistol"
 	desc = "Chinese military sidearm at the time of the Great War. The ones around are old and worn, but somewhat popular due to the long barrel and rechambered in 10mm after the original ammo ran dry decades ago."
+	icon = 'icons/fallout/objects/guns/ballistic.dmi'
 	icon_state = "chinapistol"
-	mag_type = /obj/item/ammo_box/magazine/m10mm_adv/simple
+	casing_ejector = TRUE
+	mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev6520/china
 	fire_delay = 1
 	extra_damage = 24
 	recoil = 0.1
 	spread = 3
 	can_suppress = FALSE
 	fire_sound = 'sound/f13weapons/10mm_fire_02.ogg'
 
+/obj/item/gun/ballistic/revolver/chinese/update_icon_state()
+	if(!magazine || !magazine.ammo_count(0))
+		icon_state = "[initial(icon_state)]-e"
+	else
+		icon_state = "[initial(icon_state)]"
 
 //Browning Hi-power						Keywords: 9mm, Semi-auto
 /obj/item/gun/ballistic/automatic/pistol/ninemil

code/modules/projectiles/guns/ballistic/revolver.dm

@@ -386,6 +386,8 @@
 	fire_sound = 'sound/f13weapons/boltfire.ogg'
 
 
+
+
 /////////////
 // NEEDLER //
 /////////////

code/modules/projectiles/guns/energy/laser.dm

@@ -410,6 +410,23 @@
 	scope_y_offset = 20
 	equipsound = 'sound/f13weapons/equipsounds/aer9equip.ogg'
 
+/obj/item/gun/energy/laser/aer9/carbine
+	name = "\improper AER9 laser carbine"
+	desc = "A sturdy pre-war laser rifle That has been cut down to a pistol size. Power output and length are reduced. Maybe you can turn it back into a rifle."
+	icon_state = "laser"
+	item_state = "laser-rifle-aer9"
+	ammo_type = list(/obj/item/ammo_casing/energy/laser/lasgun/hitscan)
+	cell_type = /obj/item/stock_parts/cell/ammo/mfc
+	w_class = WEIGHT_CLASS_NORMAL
+	weapon_weight = WEAPON_MEDIUM
+	slot_flags = ITEM_SLOT_BELT
+	fire_delay = 0.4 //slightly faster
+	slowdown = 0.1 //slightly less slowdoqwm
+	scope_state = "AEP7_scope"
+	scope_x_offset = 12
+	scope_y_offset = 20
+	equipsound = 'sound/f13weapons/equipsounds/aer9equip.ogg'
+
 /obj/item/gun/energy/laser/aer9/focused
 	name = "\improper Hot-wired AER9 laser rifle"
 	desc = "A sturdy pre-war laser rifle. Emits beams of concentrated light to kill targets. This one has been jury-rigged against common sense to dump more power into its shots."