USSP update part 2 (#20926)

* USSP part 2

* swapping old version for new one in some places

_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm

@@ -1575,14 +1575,8 @@
 /obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/shoes/jackboots,
 /obj/effect/decal/cleanable/dirt,
-/obj/item/clothing/head/foragecap{
-	desc = "The softcap worn by mech pilots.";
-	name = "forage cap"
-	},
-/obj/item/clothing/head/foragecap{
-	desc = "The softcap worn by mech pilots.";
-	name = "forage cap"
-	},
+/obj/item/clothing/head/sovietsidecap,
+/obj/item/clothing/head/sovietsidecap,
 /turf/simulated/floor/plasteel,
 /area/ruin/space/derelict/crew_quarters)
 "dU" = (

_maps/map_files/RandomRuins/SpaceRuins/ussp_tele.dmm

@@ -54,6 +54,7 @@
 /area/ruin/space/derelict/teleporter)
 "l" = (
 /obj/item/rack_parts,
+/obj/item/clothing/under/new_soviet,
 /turf/simulated/floor/plating/airless,
 /area/ruin/space/derelict/teleporter)
 "m" = (

code/_globalvars/lists/names.dm

@@ -18,6 +18,8 @@ GLOBAL_LIST_INIT(mime_names, file2list("config/names/mime.txt"))
 GLOBAL_LIST_INIT(golem_names, file2list("config/names/golem.txt"))
 GLOBAL_LIST_INIT(megacarp_first_names, file2list("strings/names/megacarp1.txt"))
 GLOBAL_LIST_INIT(megacarp_last_names, file2list("strings/names/megacarp2.txt"))
+GLOBAL_LIST_INIT(first_names_soviet, file2list("config/names/first_soviet_male.txt"))
+GLOBAL_LIST_INIT(last_names_soviet, file2list("config/names/last_soviet_male.txt"))
 
 GLOBAL_LIST_INIT(verbs, file2list("config/names/verbs.txt"))
 GLOBAL_LIST_INIT(nouns, file2list("config/names/nouns.txt"))

code/datums/outfits/outfit_admin.dm

@@ -588,7 +588,7 @@
 	uniform = /obj/item/clothing/under/new_soviet
 	back = /obj/item/storage/backpack/satchel
 	head = /obj/item/clothing/head/sovietsidecap
-	id = /obj/item/card/id
+	id = /obj/item/card/id/data
 	shoes = /obj/item/clothing/shoes/combat
 	l_ear = /obj/item/radio/headset/soviet
 	backpack_contents = list(
@@ -599,6 +599,8 @@
 	. = ..()
 	if(visualsOnly)
 		return
+	H.real_name = "[capitalize(pick(GLOB.first_names_soviet))] [capitalize(pick(GLOB.last_names_soviet))]"
+	H.name = H.real_name
 	H.add_language("Neo-Russkiya")
 	H.set_default_language(GLOB.all_languages["Neo-Russkiya"])
 	var/obj/item/card/id/I = H.wear_id
@@ -653,6 +655,41 @@
 		/obj/item/ammo_box/a357 = 2
 	)
 
+/datum/outfit/admin/soviet/marine
+	name = "Soviet Marine"
+
+	gloves = /obj/item/clothing/gloves/combat
+	suit = /obj/item/clothing/suit/space/hardsuit/soviet
+	head = null
+	mask = /obj/item/clothing/mask/gas
+	glasses = /obj/item/clothing/glasses/night
+	belt = /obj/item/storage/belt/military/assault/soviet/full
+	r_pocket = /obj/item/melee/classic_baton/telescopic
+	l_hand = /obj/item/gun/projectile/automatic/ak814
+	suit_store = /obj/item/tank/internals/emergency_oxygen/double
+
+	backpack_contents = list(
+		/obj/item/storage/box/soviet = 1,
+		/obj/item/gun/projectile/automatic/pistol/APS = 1,
+		/obj/item/ammo_box/magazine/apsm10mm = 2,
+		/obj/item/storage/fancy/cigarettes/cigpack_syndicate = 1,
+		/obj/item/lighter/zippo/engraved = 1
+	)
+
+/datum/outfit/admin/soviet/marine/captain
+	name = "Soviet Marine Captain"
+
+	uniform = /obj/item/clothing/under/new_soviet/sovietofficer
+	suit = /obj/item/clothing/suit/space/hardsuit/soviet/commander
+
+	backpack_contents = list(
+		/obj/item/storage/box/soviet = 1,
+		/obj/item/gun/projectile/revolver/mateba = 1,
+		/obj/item/ammo_box/a357 = 2,
+		/obj/item/storage/fancy/cigarettes/cigpack_syndicate = 1,
+		/obj/item/lighter/zippo/engraved = 1
+	)
+
 /datum/outfit/admin/soviet/admiral
 	name = "Soviet Admiral"
 

code/game/gamemodes/wizard/artefact.dm

@@ -593,12 +593,12 @@ GLOBAL_LIST_EMPTY(multiverse)
 				M.equip_to_slot_or_del(sword, slot_r_hand)
 
 			if("soviet")
-				M.equip_to_slot_or_del(new /obj/item/clothing/head/hgpiratecap(M), slot_head)
+				M.equip_to_slot_or_del(new /obj/item/clothing/head/sovietofficerhat(M), slot_head)
 				M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes)
 				M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves)
 				M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear)
-				M.equip_to_slot_or_del(new /obj/item/clothing/suit/hgpirate(M), slot_wear_suit)
-				M.equip_to_slot_or_del(new /obj/item/clothing/under/costume/soviet(M), slot_w_uniform)
+				M.equip_to_slot_or_del(new /obj/item/clothing/suit/sovietcoat(M), slot_wear_suit)
+				M.equip_to_slot_or_del(new /obj/item/clothing/under/new_soviet/sovietofficer(M), slot_w_uniform)
 				M.equip_to_slot_or_del(sword, slot_r_hand)
 
 			if("officer")

code/game/jobs/access.dm

@@ -401,7 +401,7 @@
 	return list("Solar Federation Lieutenant","Solar Federation Specops Lieutenant","Solar Federation Marine","Solar Federation Specops Marine","Solar Federation Representative","Sol Trader","Solar Federation General")
 
 /proc/get_all_soviet_jobs()
-	return list("Soviet Tourist", "Soviet Conscript", "Soviet Soldier", "Soviet Officer", "Soviet Admiral")
+	return list("Soviet Tourist", "Soviet Conscript", "Soviet Soldier", "Soviet Officer", "Soviet Marine", "Soviet Marine Captain", "Soviet Admiral")
 
 /proc/get_all_job_icons() //For all existing HUD icons
 	return GLOB.joblist + get_all_ERT_jobs() + list("Prisoner")

code/game/objects/items/devices/radio/headset.dm

@@ -123,7 +123,7 @@
 	set_frequency(SYND_FREQ)
 
 /obj/item/radio/headset/soviet
-	name = "soviet headset"
+	name = "soviet bowman headset"
 	desc = "Used by U.S.S.P forces. Protects ears from flashbangs."
 	flags = EARBANGPROTECT
 	origin_tech = "syndicate=3"

code/game/objects/items/weapons/cards_ids.dm

@@ -1089,6 +1089,9 @@
 	else
 		..()
 
+/obj/item/card/id/data
+	icon_state = "data"
+
 // Decals
 /obj/item/id_decal
 	name = "identification card decal"

code/game/objects/items/weapons/storage/belt.dm

@@ -468,6 +468,15 @@
 	new /obj/item/ammo_box/magazine/m45(src)
 	update_icon()
 
+/obj/item/storage/belt/military/assault/soviet/full/populate_contents()
+	new /obj/item/ammo_box/magazine/ak814(src)
+	new /obj/item/ammo_box/magazine/ak814(src)
+	new /obj/item/ammo_box/magazine/ak814(src)
+	new /obj/item/grenade/plastic/c4/thermite(src)
+	new /obj/item/grenade/plastic/c4/thermite(src)
+	new /obj/item/grenade/plastic/c4/thermite(src)
+	update_icon()
+
 /obj/item/storage/belt/janitor
 	name = "janibelt"
 	desc = "A belt used to hold most janitorial supplies."

code/game/objects/structures/crates_lockers/closets/gimmick.dm

@@ -45,16 +45,16 @@
 	open_door_sprite = "syndicate1_door"
 
 /obj/structure/closet/gimmick/russian/populate_contents()
-	new /obj/item/clothing/head/ushanka(src)
-	new /obj/item/clothing/head/ushanka(src)
-	new /obj/item/clothing/head/ushanka(src)
-	new /obj/item/clothing/head/ushanka(src)
-	new /obj/item/clothing/head/ushanka(src)
-	new /obj/item/clothing/under/costume/soviet(src)
-	new /obj/item/clothing/under/costume/soviet(src)
-	new /obj/item/clothing/under/costume/soviet(src)
-	new /obj/item/clothing/under/costume/soviet(src)
-	new /obj/item/clothing/under/costume/soviet(src)
+	new /obj/item/clothing/head/sovietsidecap(src)
+	new /obj/item/clothing/head/sovietsidecap(src)
+	new /obj/item/clothing/head/sovietsidecap(src)
+	new /obj/item/clothing/head/sovietsidecap(src)
+	new /obj/item/clothing/head/sovietsidecap(src)
+	new /obj/item/clothing/under/new_soviet(src)
+	new /obj/item/clothing/under/new_soviet(src)
+	new /obj/item/clothing/under/new_soviet(src)
+	new /obj/item/clothing/under/new_soviet(src)
+	new /obj/item/clothing/under/new_soviet(src)
 
 
 /obj/structure/closet/gimmick/tacticool

code/modules/client/preference/loadout/loadout_uniform.dm

@@ -103,7 +103,7 @@
 	path = /obj/item/clothing/under/color/darkred
 
 /datum/gear/uniform/suit/soviet
-	display_name = "USSP uniform"
+	display_name = "Old USSP uniform"
 	path = /obj/item/clothing/under/costume/soviet
 
 /datum/gear/uniform/suit/kilt

code/modules/clothing/spacesuits/hardsuit.dm

@@ -497,6 +497,40 @@
 /obj/item/clothing/head/helmet/space/hardsuit/syndi/freedom/update_icon_state()
 	return
 
+//Soviet hardsuit
+/obj/item/clothing/head/helmet/space/hardsuit/soviet
+	name = "\improper Soviet hardsuit helmet"
+	desc = "A military hardsuit helmet bearing the red star of the U.S.S.P."
+	icon_state = "hardsuit0-soviet"
+	item_state = "hardsuit0-soviet"
+	item_color = "soviet"
+	armor = list(MELEE = 35, BULLET = 15, LASER = 30, ENERGY = 10, BOMB = 10, BIO = 100, RAD = 50, FIRE = 75, ACID = 75)
+
+/obj/item/clothing/suit/space/hardsuit/soviet
+	name = "\improper Soviet hardsuit"
+	desc = "A soviet military hardsuit designed for maximum speed and mobility. Proudly displays the U.S.S.P flag on the chest."
+	icon_state = "hardsuit-soviet"
+	item_state = "hardsuit-soviet"
+	slowdown = 0.5
+	armor = list(MELEE = 35, BULLET = 15, LASER = 30, ENERGY = 10, BOMB = 10, BIO = 100, RAD = 50, FIRE = 75, ACID = 75)
+	allowed = list(/obj/item/gun, /obj/item/flashlight, /obj/item/tank/internals, /obj/item/melee/baton, /obj/item/reagent_containers/spray/pepper, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/restraints/handcuffs)
+	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/soviet
+	jetpack = /obj/item/tank/jetpack/suit
+
+/obj/item/clothing/head/helmet/space/hardsuit/soviet/commander
+	name = "\improper Soviet command hardsuit helmet"
+	desc = "A military hardsuit helmet with a red command stripe."
+	icon_state = "hardsuit0-soviet-commander"
+	item_state = "hardsuit0-soviet-commander"
+	item_color = "soviet-commander"
+
+/obj/item/clothing/suit/space/hardsuit/soviet/commander
+	name = "\improper Soviet command hardsuit"
+	desc = "A soviet military command hardsuit designed for maximum speed and mobility."
+	icon_state = "hardsuit-soviet-commander"
+	item_state = "hardsuit-soviet-commander"
+	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/soviet/commander
+
 //Medical hardsuit
 /obj/item/clothing/head/helmet/space/hardsuit/medical
 	name = "medical hardsuit helmet"

config/names/first_soviet_male.txt

@@ -0,0 +1,52 @@
+Aleksandr
+Alexey
+Anatoly
+Andrey
+Andrusha
+Artyom
+Boris
+Borya
+Danya
+Danyl
+Denis
+Deniska
+Dima
+Dmitry
+Gennady
+Gyena
+Ilya
+Ilyusha
+Ivan
+Kirill
+Kirusha
+Kolya
+Konstantin
+Kostya
+Leo
+Lyosha
+Maksim
+Max
+Mikhail
+Misha
+Nikita
+Nikita
+Nikolai
+Oleg
+Olezhek
+Roma
+Roman
+Sasha
+Sergey
+Seryozha
+Slava
+Tolya
+Tyoma
+Vanya
+Victor
+Vitya
+Vladimir
+Volodya
+Vova
+Vyacheslav
+Yevgeny
+Zhenya

config/names/last_soviet_male.txt

@@ -0,0 +1,40 @@
+Alekseev
+Andreev
+Belov
+Belyaev
+Fyodorov
+Golubev
+Gusev
+Ilyin
+Ivanov
+Kiselyov
+Komarov
+Kovalyov
+Kozlov
+Kuzmin
+Kuznetsov
+Lebedev
+Makarov
+Mikhailov
+Morozov
+Nikitin
+Nikolaev
+Novikov
+Orlov
+Pavlov
+Petrov
+Popov
+Semyonov
+Sidorov
+Smirnov
+Sokolov
+Solovyov
+Stepanov
+Tarasov
+Titov
+Vassiliev
+Vinogradov
+Volkov
+Yegorov
+Zaitsev
+Zakharov