name and ammo box

- UPP Combat Synth name fixed - Soro fixed - KS-29 is pump desc - NP92 ammo box
cmss13-devs · Sep 14, 2024 · 47a9c68 · 47a9c68
1 parent c3413e8
commit 47a9c68
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 47 deletions.
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
@@ -527,10 +527,10 @@
 	new /obj/item/weapon/gun/energy/taser(src)
 	new /obj/item/weapon/baton(src)
 	new /obj/item/restraint/handcuffs(src)
+	new /obj/item/restraint/handcuffs(src)
 	new /obj/item/reagent_container/spray/pepper(src)
 	new /obj/item/ammo_magazine/pistol/np92(src)
 	new /obj/item/ammo_magazine/pistol/np92(src)
-	new	/obj/item/weapon/gun/pistol/np92(src)
 
 /obj/item/storage/belt/security/MP/CMB
 	name = "\improper CMB duty belt"

diff --git a/code/modules/gear_presets/upp.dm b/code/modules/gear_presets/upp.dm
@@ -487,27 +487,61 @@
 /datum/equipment_preset/upp/synth
 	name = "UPP Combat Synthetic"
 	flags = EQUIPMENT_PRESET_EXTRA
-
 	languages = ALL_SYNTH_LANGUAGES_UPP
-
 	skills = /datum/skills/synthetic
 	assignment = JOB_UPP_COMBAT_SYNTH
 	rank = JOB_UPP_COMBAT_SYNTH
 	paygrades = list(PAY_SHORT_SYN = JOB_PLAYTIME_TIER_0)
 	idtype = /obj/item/card/id/dogtag
 
 /datum/equipment_preset/upp/synth/load_name(mob/living/carbon/human/new_human, randomise)
-	new_human.gender = pick(50;MALE,50;FEMALE)
-
-/* var/datum/preferences/A = new()
+	new_human.gender = pick(60;MALE,40;FEMALE)
+	var/datum/preferences/A = new()
 	A.randomize_appearance(new_human)
-var/random_name
-	if(prob(10))
-		random_name = "[capitalize(randomly_generate_chinese_word(2))]"
-	else if(new_human.gender == MALE)
-		random_name = "[pick(first_names_male_upp)]"
+	var/random_name
+	var/first_name
+	var/last_name
+	//gender checks
+	if(new_human.gender == MALE)
+		if(prob(40))
+			first_name = "[capitalize(randomly_generate_chinese_word(1))]"
+		else
+			first_name = "[pick(GLOB.first_names_male_upp)]"
+		new_human.f_style = pick("3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache")
+	else
+		if(prob(40))
+			first_name = "[capitalize(randomly_generate_chinese_word(1))]"
+		else
+			first_name = "[pick(GLOB.first_names_female_upp)]"
+	//surname
+	if(prob(35))
+		last_name = "[capitalize(randomly_generate_chinese_word(pick(20;1, 80;2)))]"
+	else
+		last_name = "[pick(GLOB.last_names_upp)]"
+	//put them together
+	random_name = "[first_name] [last_name]"
+
+	new_human.change_real_name(new_human, random_name)
+	new_human.age = rand(17,35)
+	var/static/list/colors = list("BLACK" = list(15, 15, 10), "BROWN" = list(48, 38, 18), "BROWN" = list(48, 38, 18),"BLUE" = list(29, 51, 65), "GREEN" = list(40, 61, 39), "STEEL" = list(46, 59, 54))
+	var/static/list/hair_colors = list("BLACK" = list(15, 15, 10), "BROWN" = list(48, 38, 18), "AUBURN" = list(77, 48, 36), "BLONDE" = list(95, 76, 44))
+	var/hair_color = pick(hair_colors)
+	new_human.r_hair = hair_colors[hair_color][1]
+	new_human.g_hair = hair_colors[hair_color][2]
+	new_human.b_hair = hair_colors[hair_color][3]
+	new_human.r_facial = hair_colors[hair_color][1]
+	new_human.g_facial = hair_colors[hair_color][2]
+	new_human.b_facial = hair_colors[hair_color][3]
+	var/eye_color = pick(colors)
+	new_human.r_eyes = colors[eye_color][1]
+	new_human.g_eyes = colors[eye_color][2]
+	new_human.b_eyes = colors[eye_color][3]
+	if(new_human.gender == MALE)
+		new_human.h_style = pick("Undercut", "Partly Shaved", "Side Undercut", "Side Hang Undercut (Reverse)", "Undercut, Top", "Medium Fade", "High Fade")
+		new_human.f_style = pick("Shaved", "Shaved", "Shaved", "Shaved", "Shaved", "Shaved", "3 O'clock Shadow", "3 O'clock Shadow", "3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache", "7 O'clock Shadow", "7 O'clock Moustache",)
 	else
-		random_name = "[pick(first_names_female_upp)]" */
+		new_human.h_style = pick("Side Undercut", "Side Hang Undercut (Reverse)", "Undercut, Top","Pixie Cut Left", "Pixie Cut Right", "Bun")
+
 
 /datum/equipment_preset/upp/synth/load_race(mob/living/carbon/human/new_human)
 	new_human.set_species(SYNTH_GEN_THREE)
@@ -883,5 +917,7 @@ var/random_name
 	//limbs
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup, WEAR_FEET)
 	//pockets
-	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_L_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium, WEAR_R_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/pistol, WEAR_L_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/np92, WEAR_IN_L_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_R_STORE)
+
diff --git a/code/modules/projectiles/ammo_boxes/magazine_boxes.dm b/code/modules/projectiles/ammo_boxes/magazine_boxes.dm
@@ -415,28 +415,6 @@
 /obj/item/ammo_box/magazine/type71/heap/empty
 	empty = TRUE
 
-//-----------------------UPP Pistol Mag Box-----------------------
-
-/obj/item/ammo_box/magazine/np92
-	name = "\improper magazine box (NP92 x 16)"
-	icon_state = "base_upppistol"
-	flags_equip_slot = SLOT_BACK
-	overlay_ammo_type = "_type71_reg"
-	overlay_gun_type = "_np92"
-	overlay_content = "_type71_reg"
-	num_of_magazines = 16
-	magazine_type = /obj/item/ammo_magazine/pistol/np92
-
-/obj/item/ammo_box/magazine/t73
-	name = "\improper magazine box (Type 73 x 16)"
-	icon_state = "base_upppistol"
-	flags_equip_slot = SLOT_BACK
-	overlay_ammo_type = "_type71_reg"
-	overlay_gun_type = "_t73"
-	overlay_content = "_type71_reg"
-	num_of_magazines = 16
-	magazine_type = /obj/item/ammo_magazine/pistol/t73
-
 //-----------------------Nailgun Mag Box-----------------------
 
 /obj/item/ammo_box/magazine/nailgun
@@ -579,7 +557,7 @@
 /obj/item/ammo_box/magazine/mk1
 	name = "magazine box (M41A MK1 x 10)"
 	overlay_ammo_type = "_reg_mk1"
-	overlay_gun_type = "_mk1"
+	overlay_gun_type = "_m41"
 	overlay_content = "_reg"
 	magazine_type = /obj/item/ammo_magazine/rifle/m41aMK1
 	allowed_magazines = list(/obj/item/ammo_magazine/rifle/m41aMK1/recon)
@@ -703,6 +681,21 @@
 /obj/item/ammo_box/magazine/type73/impact/empty
 	empty = TRUE
 
+//-----------------------NP92 Mag Box-----------------------
+
+/obj/item/ammo_box/magazine/np92
+	name = "\improper magazine box (NP92 x 16)"
+	icon_state = "base_type73"
+	flags_equip_slot = SLOT_BACK
+	overlay_ammo_type = "_type71_reg"
+	overlay_gun_type = "_np92"
+	overlay_content = "_type71_reg"
+	num_of_magazines = 16
+	magazine_type = /obj/item/ammo_magazine/pistol/np92
+
+/obj/item/ammo_box/magazine/np92/empty
+
+	empty = TRUE
 
 //-----------------------AR10 Rifle Mag Box-----------------------
 

diff --git a/code/modules/projectiles/guns/shotguns.dm b/code/modules/projectiles/guns/shotguns.dm
@@ -402,15 +402,13 @@ can cause issues with ammo types getting mixed up during the burst.
 
 /obj/item/weapon/gun/shotgun/pump/type23
 	name = "\improper KS-29 riot shotgun"
-	desc = "A contemporary semi-automatic design based off of the KS-23, a Soviet-era riot shotgun chambered in 6 gauge shells. Like its Naval Infantry sibling, it is downgraded to 8 gauge chambering in order to make it more controllable without much loss to overall firepower and allow for easier storage of large quantities of shells on the individual user. Its internal tube magazine can store 4 shells."
+	desc = "A contemporary pump-action design based off of the KS-23, a Soviet-era riot shotgun chambered in 6 gauge shells. Like its Naval Infantry sibling, it is downgraded to 8 gauge chambering in order to make it more controllable without much loss to overall firepower and allow for easier storage of large quantities of shells on the individual user. Its internal tube magazine can store 4 shells."
 	icon = 'icons/obj/items/weapons/guns/guns_by_faction/upp.dmi'
 	icon_state = "type23_wood"
 	item_state = "type23_wood"
 	fire_sound = 'sound/weapons/gun_type23.ogg'
 	current_mag = /obj/item/ammo_magazine/internal/shotgun/type23
-	attachable_allowed = list(
-		/obj/item/attachable/stock/type23/wood,
-		)
+	attachable_allowed = list(/obj/item/attachable/stock/type23/wood)
 	flags_gun_features = GUN_CAN_POINTBLANK|GUN_INTERNAL_MAG
 	flags_equip_slot = SLOT_BACK
 	gauge = "8g"

diff --git a/icons/obj/items/weapons/guns/ammo_boxes/boxes_and_lids.dmi b/icons/obj/items/weapons/guns/ammo_boxes/boxes_and_lids.dmi
diff --git a/icons/obj/items/weapons/guns/ammo_boxes/text.dmi b/icons/obj/items/weapons/guns/ammo_boxes/text.dmi
diff --git a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm
@@ -9866,9 +9866,6 @@
 /obj/item/ammo_magazine/handful/shotgun/heavy/buckshot,
 /obj/item/ammo_magazine/handful/shotgun/heavy/buckshot,
 /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot/upp,
-/obj/item/weapon/gun/shotgun/type23/riot,
-/obj/item/weapon/gun/shotgun/type23/riot,
-/obj/item/weapon/gun/shotgun/type23/riot,
 /turf/open/floor/strata/red1,
 /area/strata/ag/interior/landingzone_checkpoint)
 "bUJ" = (
@@ -11788,7 +11785,6 @@
 /obj/item/ammo_magazine/handful/shotgun/heavy/buckshot,
 /obj/item/ammo_magazine/handful/shotgun/heavy/slug,
 /obj/item/ammo_magazine/handful/shotgun/heavy/slug,
-/obj/item/weapon/gun/shotgun/type23/riot,
 /turf/open/floor/strata/red1,
 /area/strata/ag/interior/research_decks/security)
 "ddP" = (
@@ -20891,7 +20887,6 @@
 /obj/item/ammo_magazine/handful/shotgun/heavy/buckshot,
 /obj/item/ammo_magazine/handful/shotgun/heavy/slug,
 /obj/item/ammo_magazine/handful/shotgun/heavy/slug,
-/obj/item/weapon/gun/shotgun/type23/riot,
 /turf/open/floor/strata/red1,
 /area/strata/ag/interior/research_decks/security)
 "lKv" = (
@@ -30422,7 +30417,6 @@
 /obj/structure/pipes/standard/simple/hidden/cyan{
 	dir = 4
 	},
-/obj/item/weapon/gun/shotgun/type23/riot,
 /turf/open/floor/strata/white_cyan1,
 /area/strata/ag/interior/dorms)
 "uBs" = (