[WIP] Survloot and Maploot "Overhaul" Part 1: LV624, Soro, Solaris Ridge

code/game/machinery/vending/vending_types.dm

@@ -222,7 +222,7 @@
 	)
 
 /obj/structure/machinery/vending/security
-	name = "\improper SecTech"
+	name = "\improper MPTech"
 	desc = "A security equipment vendor."
 	product_ads = "Crack capitalist skulls!;Beat some heads in!;Don't forget - harm is good!;Your weapons are right here.;Handcuffs!;Freeze, scumbag!;Don't tase me bro!;Tase them, bro.;Why not have a donut?"
 	icon_state = "sec"
@@ -252,6 +252,34 @@
 	)
 	contraband = list(/obj/item/clothing/glasses/sunglasses = 2,/obj/item/storage/donut_box = 2)
 
+/obj/structure/machinery/vending/security/marshall
+	name = "\improper SecTech"
+	desc = "A Colonial Marshall Bureau equipment vendor"
+	product_ads = "Crack capitalist skulls!;Beat some heads in!;Don't forget - harm is good!;Your weapons are right here.;Handcuffs!;Freeze, scumbag!;Don't tase me bro!;Tase them, bro.;Why not have a donut?"
+	icon_state = "sec"
+	icon_deny = "sec-deny"
+	req_access = list(ACCESS_CIVILIAN_BRIG)
+	products = list(
+		/obj/item/handcuffs = 8,
+		/obj/item/handcuffs/zip = 10,
+		/obj/item/explosive/grenade/flashbang = 4,
+		/obj/item/weapon/gun/energy/taser = 4,
+		/obj/item/reagent_container/spray/pepper = 4,
+		/obj/item/weapon/baton = 4,
+		/obj/item/device/flashlight = 4,
+		/obj/item/storage/belt/security = 4,
+		/obj/item/device/flash = 5,
+		/obj/item/reagent_container/food/snacks/donut/normal = 12,
+		/obj/item/storage/box/evidence = 6,
+		/obj/item/clothing/head/helmet/marine/MP = 6,
+		/obj/item/clothing/head/beret/marine/mp/mppeaked = 6,
+		/obj/item/clothing/head/beret/marine/mp/mpcap = 6,
+		/obj/item/clothing/under/CM_uniform = 2,
+		/obj/item/clothing/glasses/sunglasses/sechud = 3,
+		/obj/item/tape/regulation = 5,
+	)
+	contraband = list(/obj/item/clothing/glasses/sunglasses = 2,/obj/item/storage/donut_box = 2)
+
 /obj/structure/machinery/vending/sea
 	name = "\improper SeaTech"
 	desc = "An equipment vendor designed to save lives"

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -77,7 +77,7 @@
 	new /obj/item/clothing/under/rank/security/corp(src)
 
 /obj/structure/closet/secure_closet/security/soro
-	name = "Security Officer's Locker"
+	name = "Police Officer's Locker"
 	req_one_access = list(ACCESS_CIVILIAN_COMMAND, ACCESS_CIVILIAN_BRIG)
 	icon_state = "secure_locked_police"
 	icon_closed = "secure_closed_police"
@@ -89,23 +89,22 @@
 /obj/structure/closet/secure_closet/security/soro/Initialize()
 	. = ..()
 	if(prob(50))
-		new /obj/item/storage/backpack/security(src)
+		new /obj/item/storage/belt/gun/type47/np92(src)
 	else
-		new /obj/item/storage/backpack/satchel/sec(src)
-	new /obj/item/storage/belt/security(src)
+		new new /obj/item/storage/belt/gun/type47/t73(src)
 	new /obj/item/device/flash(src)
+	new /obj/item/storage/backpack/lightpack/upp(src)
 	new /obj/item/reagent_container/spray/pepper(src)
 	new /obj/item/explosive/grenade/flashbang(src)
 	new /obj/item/weapon/baton/loaded(src)
 	new /obj/item/weapon/gun/energy/taser(src)
-	new /obj/item/clothing/glasses/sunglasses/sechud(src)
+	new /obj/item/clothing/glasses/hud/security(src)
 	new /obj/item/device/hailer(src)
-	new /obj/item/clothing/accessory/storage/black_vest(src)
-	new /obj/item/clothing/suit/storage/snow_suit/soviet(src)
-	new /obj/item/clothing/head/ushanka(src)
-	new /obj/item/clothing/mask/rebreather/scarf(src)
-	new /obj/item/clothing/under/rank/veteran/soviet_uniform_01(src)
-	new /obj/item/storage/belt/gun/type47/t73(src)
+	new /obj/item/clothing/accessory/storage/webbing (src)
+	new /obj/item/clothing/accessory/patch/upp(src)
+	new /obj/item/clothing/suit/storage/marine/faction/UPP/mp(src)
+	new /obj/item/clothing/head/uppcap/ushanka(src)
+	new /obj/item/clothing/under/marine/veteran/UPP/mp(src)
 
 
 

code/game/objects/structures/gun_rack.dm

@@ -64,6 +64,13 @@
 /obj/structure/gun_rack/type71/unloaded
 	populate_type = /obj/item/weapon/gun/rifle/type71/unloaded
 
+/obj/structure/gun_rack/type71/carbine
+	icon_state = "type71"
+	desc = "Some off-branded gun rack. Per SOF and UPPA regulations, weapons should be stored in secure safes and only given out when necessary. Of course, most (but not all!) units overlook this regulation, only storing their firearms in safes when inspection arrives."
+	max_stored = 6
+	initial_stored = 6
+	allowed_type = /obj/item/weapon/gun/rifle/type71/carbine
+
 /obj/structure/gun_rack/apc
 	name = "APC ammo compartment"
 	icon_state = "frontal"

code/modules/gear_presets/survivors/sorokyne_strata/preset_sorokyne_strata.dm

@@ -1,6 +1,7 @@
 /datum/equipment_preset/survivor/engineer/soro
 	name = "Survivor - Sorokyne Strata Political Prisioner"
 	assignment = "Sorokyne Strata Political Prisioner"
+	languages = list(LANGUAGE_ENGLISH, LANGUAGE_RUSSIAN)
 
 /datum/equipment_preset/survivor/engineer/soro/load_gear(mob/living/carbon/human/new_human)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP(new_human), WEAR_BODY)
@@ -14,20 +15,22 @@
 /datum/equipment_preset/survivor/security/soro
 	name = "Survivor - Sorokyne Strata Security"
 	assignment = "Sorokyne Strata Security"
+	languages = list(LANGUAGE_ENGLISH, LANGUAGE_RUSSIAN)
 
 /datum/equipment_preset/survivor/security/soro/load_gear(mob/living/carbon/human/new_human)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/veteran/soviet_uniform_01(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/mp(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/soviet(new_human), WEAR_JACKET)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp(new_human), WEAR_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp(new_human), WEAR_FEET)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(new_human), WEAR_FACE)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/ushanka(new_human), WEAR_HEAD)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/upp(new_human), WEAR_HANDS)
 	..()
 
 /datum/equipment_preset/survivor/doctor/soro
 	name = "Survivor - Sorokyne Strata Doctor"
 	assignment = "Sorokyne Strata Doctor"
+	languages = list(LANGUAGE_ENGLISH, LANGUAGE_RUSSIAN)
 
 /datum/equipment_preset/survivor/doctor/soro/load_gear(mob/living/carbon/human/new_human)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/veteran/soviet_uniform_01(new_human), WEAR_BODY)
@@ -38,6 +41,7 @@
 /datum/equipment_preset/survivor/scientist/soro
 	name = "Survivor - Sorokyne Strata Researcher"
 	assignment = "Sorokyne Strata Researcher"
+	languages = list(LANGUAGE_ENGLISH, LANGUAGE_RUSSIAN)
 
 /datum/equipment_preset/survivor/scientist/soro/load_gear(mob/living/carbon/human/new_human)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/blue(new_human), WEAR_BODY)
@@ -52,6 +56,7 @@
 /datum/equipment_preset/survivor/interstellar_human_rights_observer/soro
 	name = "Survivor - Sorokyne Interstellar Human Rights Observer"
 	assignment = "Interstellar Human Rights Observer(Sorokyne)"
+	languages = list(LANGUAGE_ENGLISH, LANGUAGE_RUSSIAN, LANGUAGE_CHINESE)
 
 
 /datum/equipment_preset/survivor/interstellar_human_rights_observer/soro/load_gear(mob/living/carbon/human/new_human)

maps/map_files/BigRed/BigRed.dmm

@@ -963,7 +963,7 @@
 /area/bigredv2/outside/telecomm)
 "adc" = (
 /obj/structure/surface/table/woodentable/fancy,
-/obj/item/clothing/head/det_hat,
+/obj/item/clothing/head/CMB,
 /turf/open/floor{
 	icon_state = "wood"
 	},
@@ -1671,6 +1671,7 @@
 "afp" = (
 /obj/structure/surface/rack,
 /obj/item/ammo_magazine/revolver/cmb,
+/obj/item/ammo_magazine/revolver/cmb,
 /turf/open/floor{
 	dir = 8;
 	icon_state = "vault"
@@ -1682,6 +1683,7 @@
 	dir = 1
 	},
 /obj/item/ammo_magazine/revolver/cmb,
+/obj/item/ammo_magazine/revolver/cmb,
 /turf/open/floor{
 	dir = 8;
 	icon_state = "vault"
@@ -2852,7 +2854,7 @@
 "aiI" = (
 /obj/structure/surface/table,
 /obj/item/ammo_magazine/shotgun/buckshot,
-/obj/item/clothing/head/beret/sec/warden,
+/obj/item/clothing/head/CMB,
 /turf/open/floor{
 	icon_state = "dark"
 	},
@@ -3380,8 +3382,16 @@
 /area/bigredv2/outside/marshal_office)
 "akk" = (
 /obj/structure/surface/rack,
-/obj/item/clothing/suit/armor/riot,
-/obj/item/clothing/suit/armor/riot,
+/obj/item/clothing/head/helmet/marine/veteran/ua_riot,
+/obj/item/clothing/head/helmet/marine/veteran/ua_riot,
+/obj/item/clothing/suit/storage/marine/veteran/ua_riot{
+	pixel_y = -8
+	},
+/obj/item/clothing/suit/storage/marine/veteran/ua_riot{
+	pixel_y = -8
+	},
+/obj/item/prop/helmetgarb/riot_shield,
+/obj/item/prop/helmetgarb/riot_shield,
 /turf/open/floor{
 	icon_state = "dark"
 	},
@@ -15729,15 +15739,15 @@
 "aSR" = (
 /obj/structure/pipes/vents/pump,
 /obj/structure/surface/rack,
-/obj/item/weapon/gun/smg/mp27,
+/obj/item/weapon/gun/smg/m39,
 /turf/open/floor{
 	dir = 8;
 	icon_state = "redcorner"
 	},
 /area/bigredv2/outside/admin_building)
 "aSS" = (
 /obj/structure/surface/rack,
-/obj/item/weapon/gun/smg/mp27,
+/obj/item/weapon/gun/smg/m39,
 /turf/open/floor{
 	dir = 8;
 	icon_state = "redcorner"