Мелкие правки с рациией и аутфитами

code/datums/mind.dm

@@ -537,6 +537,7 @@
 	sections["traitor"] = memory_edit_traitor()
 	// SS220 EDIT - START
 	sections["blood_brother"] = memory_edit_blood_brother()
+	sections["vox_raider"] = memory_edit_vox_raider()
 	// SS220 EDIT - END
 	if(!issilicon(current))
 		/** CULT ***/

modular_ss220/antagonists/_antagonists.dm

@@ -16,6 +16,6 @@
 	)
 
 	GLOB.department_radio_keys |= list(
-		":V" = "VoxCom",	"#V" = "VoxCom",		".V" = "VoxCom",
-		":v" = "VoxCom",	"#v" = "VoxCom",		".v" = "VoxCom",
+		":VR" = "VoxCom",	"#VR" = "VoxCom",		".VR" = "VoxCom",
+		":vr" = "VoxCom",	"#vr" = "VoxCom",		".vr" = "VoxCom",
 	)

modular_ss220/antagonists/_antagonists.dme

@@ -2,8 +2,8 @@
 
 #include "code/antag_mix/scenarios/antag_scenario.dm"
 #include "code/antag_mix/scenarios/antag_team_scenario.dm"
-#include "code/antag_mix/scenarios/minor_scenarios.dm"
 #include "code/antag_mix/scenarios/major_scenarios.dm"
+#include "code/antag_mix/scenarios/minor_scenarios.dm"
 #include "code/configuration/antag_mix_configuration.dm"
 #include "code/mind/memory_edit.dm"
 #include "code/antag_mix/antag_mix.dm"

modular_ss220/antagonists/code/antag_mix/scenarios/antag_scenario.dm

@@ -131,15 +131,15 @@
 		chosen_mind.special_role = antag_special_role
 		chosen_mind.restricted_roles |= restricted_roles
 
-	if(!try_create_characters())
-		return FALSE
-
 	return length(assigned) - assigned_before > 0
 /**
  * Called in `post_setup`, which means that all players already have jobs. Here antags should receive everything they need.
  * Can fail here, but there is nothing we can do on this stage - all players already have their jobs.
 */
 /datum/antag_scenario/proc/execute()
+	if(!is_crew_antag && !try_create_characters())
+		return FALSE
+
 	for(var/datum/mind/assignee as anything in assigned)
 		assignee.add_antag_datum(antag_datum)
 
@@ -225,6 +225,7 @@
 		temp_landmarks.Remove(picked_landmark)
 		var/turf/loc_spawn = get_turf(picked_landmark)
 		make_character(mind, loc_spawn)
+		equip_character(mind)
 
 	return TRUE
 
@@ -236,6 +237,8 @@
 	var/datum/antagonist/temp_antag_datum = locate(antag_datum) in mind.antag_datums
 	temp_antag_datum.create_mob(loc_spawn, TRUE, picked_species, possible_species)
 
+/datum/antag_scenario/proc/equip_character(datum/mind/mind)
+	return TRUE
 /**
  * Recommended species increase the chance of getting a role for RP-experienced players
 */

modular_ss220/antagonists/code/antag_mix/scenarios/antag_team_scenario.dm

@@ -44,9 +44,6 @@
 		message_admins("Picked team of: [json_encode(members)]")
 		picked_teams += list(members)
 
-	if(!try_create_characters())
-		return FALSE
-
 	return length(picked_teams) - teams_before > 0
 
 

modular_ss220/antagonists/code/antag_mix/scenarios/major_scenarios.dm

@@ -18,3 +18,17 @@
 	possible_species = list("Vox")
 	recommended_species_active_pref = list("Vox")
 	recommended_species_mod = 3
+
+/datum/antag_scenario/team/vox_raiders/equip_character(datum/mind/mind)
+	mind.current.equipOutfit(/datum/outfit/vox)
+	mind.current.faction = list("Vox")
+	mind.offstation_role = TRUE
+
+
+
+
+// !!!!!!!!! ВРЕМЯНКА ДЛЯ ТЕСТА
+/datum/antag_scenario/team/vox_raiders/New()
+	. = ..()
+	required_players = 0
+

modular_ss220/antagonists/code/vox_raider/clothing/vox_outfit.dm

@@ -1,5 +1,5 @@
 // Outfit
-/datum/outfit/admin/vox
+/datum/outfit/vox
 	name = "Vox Clothing"
 	uniform = /obj/item/clothing/under/vox/jumpsuit
 	gloves = /obj/item/clothing/gloves/vox
@@ -19,7 +19,7 @@
 		/obj/item/clothing/head/helmet/space/vox/pressure = 1,
 	)
 
-/datum/outfit/admin/vox/pre_equip(mob/living/carbon/human/H, visualsOnly)
+/datum/outfit/vox/pre_equip(mob/living/carbon/human/H, visualsOnly)
 	. = ..()
 	var/choosen = rand(1, 8)
 	switch(choosen)
@@ -46,7 +46,7 @@
 		if(prob(25))
 			back = /obj/item/storage/backpack/duffel/vox
 
-/datum/outfit/admin/vox/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/datum/outfit/vox/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	. = ..()
 	if(visualsOnly)
 		return
@@ -55,95 +55,99 @@
 	if(istype(I))
 		apply_to_card(I, H, get_all_accesses(), "Vox Raider", "syndie")
 
-/datum/outfit/admin/vox/carapace
-	name = "Vox Carapace"
-	uniform = /obj/item/clothing/suit/hooded/vox_robes
-	suit = /obj/item/clothing/suit/space/vox/carapace
-	gloves = /obj/item/clothing/gloves/color/yellow/vox
-	shoes = /obj/item/clothing/shoes/magboots/vox
-	head = /obj/item/clothing/head/helmet/space/vox/carapace
-	mask = /obj/item/clothing/mask/gas/syndicate
-	glasses = /obj/item/clothing/glasses/thermal/monocle
-	l_ear = /obj/item/radio/headset/vox/alt
-
-
-/datum/outfit/admin/vox/carapace/pre_equip(mob/living/carbon/human/H, visualsOnly)
-	. = ..()
-	uniform = /obj/item/clothing/suit/hooded/vox_robes
-	back = /obj/item/storage/backpack/vox
+	H.internal = H.r_pocket
+	H.update_action_buttons_icon()
 
 
 // ==================== Raiders ====================
-/datum/outfit/admin/vox/raider
+/datum/outfit/vox/raider
 	name = "vox raider"
 	suit = /obj/item/clothing/suit/space/hardsuit/vox
 	suit_store = /obj/item/tank/internals/emergency_oxygen/double/vox
 	gloves = /obj/item/clothing/gloves/color/yellow/vox
 	shoes = /obj/item/clothing/shoes/magboots/vox
 	l_ear = /obj/item/radio/headset/vox/alt
 
-/datum/outfit/admin/vox/raider/trooper
+/datum/outfit/vox/raider/trooper
 	name = "vox raider trooper"
 	suit = /obj/item/clothing/suit/space/hardsuit/vox/trooper
 	shoes = /obj/item/clothing/shoes/magboots/vox/combat
 
-/datum/outfit/admin/vox/raider/scout
+/datum/outfit/vox/raider/scout
 	name = "vox raider scout"
 	suit = /obj/item/clothing/suit/space/hardsuit/vox/scout
 	shoes = /obj/item/clothing/shoes/magboots/vox/scout
 
-/datum/outfit/admin/vox/raider/medic
+/datum/outfit/vox/raider/medic
 	name = "vox raider medic"
 	suit = /obj/item/clothing/suit/space/hardsuit/vox/medic
 
-/datum/outfit/admin/vox/raider/mechanic
+/datum/outfit/vox/raider/mechanic
 	name = "vox raider mechanic"
 	suit = /obj/item/clothing/suit/space/hardsuit/vox/mechanic
 	shoes = /obj/item/clothing/shoes/magboots/vox/heavy
 
-/datum/outfit/admin/vox/raider/heavy
+/datum/outfit/vox/raider/heavy
 	name = "vox raider heavy"
 	suit = /obj/item/clothing/suit/space/hardsuit/vox/heavy
 	shoes = /obj/item/clothing/shoes/magboots/vox/heavy
 
 
 // ==================== Mercenaries ====================
-/datum/outfit/admin/vox/merc
+/datum/outfit/vox/merc
 	name = "vox mercenary"
 	suit = /obj/item/clothing/suit/armor/vox_merc
 	head = /obj/item/clothing/head/helmet/vox_merc
 	gloves = /obj/item/clothing/gloves/color/yellow/vox
 	shoes = /obj/item/clothing/shoes/magboots/vox
 	l_ear = /obj/item/radio/headset/vox/alt
 
-/datum/outfit/admin/vox/merc/storm
+/datum/outfit/vox/merc/storm
 	name = "vox mercenary stormtrooper"
 	suit = /obj/item/clothing/suit/armor/vox_merc/stormtrooper
 	head = /obj/item/clothing/head/helmet/vox_merc/stormtrooper
 	shoes = /obj/item/clothing/shoes/magboots/vox/combat
 
-/datum/outfit/admin/vox/merc/fieldmedic
+/datum/outfit/vox/merc/fieldmedic
 	name = "vox mercenary field medic"
 	suit = /obj/item/clothing/suit/armor/vox_merc/fieldmedic
 	head = /obj/item/clothing/head/helmet/vox_merc/fieldmedic
 
-/datum/outfit/admin/vox/merc/bomber
+/datum/outfit/vox/merc/bomber
 	name = "vox mercenary bomber"
 	suit = /obj/item/clothing/suit/armor/vox_merc/bomber
 	head = /obj/item/clothing/head/helmet/vox_merc/bomber
 	shoes = /obj/item/clothing/shoes/magboots/vox/heavy
 
-/datum/outfit/admin/vox/merc/laminar
+/datum/outfit/vox/merc/laminar
 	name = "vox mercenary laminar"
 	suit = /obj/item/clothing/suit/armor/vox_merc/laminar
 	head = /obj/item/clothing/head/helmet/vox_merc/laminar
 
-/datum/outfit/admin/vox/merc/laminar/scout
+/datum/outfit/vox/merc/laminar/scout
 	name = "vox mercenary laminar scout"
 	suit = /obj/item/clothing/suit/armor/vox_merc/laminar/scout
 	shoes = /obj/item/clothing/shoes/magboots/vox/scout
 
-/datum/outfit/admin/vox/merc/stealth
+/datum/outfit/vox/merc/stealth
 	name = "vox mercenary stealth"
 	suit = /obj/item/clothing/suit/armor/vox_merc/stealth
 	head = /obj/item/clothing/head/helmet/vox_merc/stealth
+
+
+// ==================== Other ====================
+/datum/outfit/vox/carapace
+	name = "Vox Carapace"
+	uniform = /obj/item/clothing/suit/hooded/vox_robes
+	suit = /obj/item/clothing/suit/space/vox/carapace
+	gloves = /obj/item/clothing/gloves/color/yellow/vox
+	shoes = /obj/item/clothing/shoes/magboots/vox
+	head = /obj/item/clothing/head/helmet/space/vox/carapace
+	mask = /obj/item/clothing/mask/gas/syndicate
+	glasses = /obj/item/clothing/glasses/thermal/monocle
+	l_ear = /obj/item/radio/headset/vox/alt
+
+/datum/outfit/vox/carapace/pre_equip(mob/living/carbon/human/H, visualsOnly)
+	. = ..()
+	uniform = /obj/item/clothing/suit/hooded/vox_robes
+	back = /obj/item/storage/backpack/vox

modular_ss220/antagonists/code/vox_raider/clothing/vox_shoes.dm

@@ -15,6 +15,9 @@
 	armor = list(MELEE = 15, BULLET = 15, LASER = 15, ENERGY = 15, BOMB = 50, RAD = 0, FIRE = 115, ACID = 50)
 	strip_delay = 7 SECONDS
 	resistance_flags = NONE
+	slowdown = 0
+	slowdown_passive = 0
+	slowdown_active = 1
 
 /obj/item/clothing/shoes/magboots/vox/combat
 	name = "vox combat magclaws"
@@ -35,11 +38,13 @@
 	permeability_coefficient = 0.01
 	armor = list(MELEE = 115, BULLET = 50, LASER = 75, ENERGY = 50, BOMB = 200, RAD = 200, FIRE = 450, ACID = 200)
 	strip_delay = 14 SECONDS
-	slowdown_active = SHOES_SLOWDOWN+2
+	slowdown_passive = SHOES_SLOWDOWN+1
+	slowdown_active = SHOES_SLOWDOWN+3
 
 /obj/item/clothing/shoes/magboots/vox/scout
 	name = "vox scout magclaws"
 	desc = "Легкие налапочники для когтистых лап причудливой формы с продвинутым сцеплением с поверхностью для ускорение передвижения."
 	item_state = "boots-vox-combat"
 	icon_state = "boots-vox-combat"
-	slowdown_active = -2	// !!! проверить и выставить -1 если много или броне.
+	slowdown_passive = -0.25
+	slowdown_active = 0

modular_ss220/antagonists/code/vox_raider/clothing/vox_suit_armor.dm

@@ -146,16 +146,7 @@
 	name = "vox mercenary laminar scout vest"
 	desc = "Компактный и мобильный костюм сформированный из лёгких пластин и за счет их особого размещения, увеличивает погашение импульсов перенаправляя их в ускорение носителя, но взамен теряя значимые защитные свойства. "
 	armor = list(MELEE = 20, BULLET = 20, LASER = 10, ENERGY = 40, BOMB = 40, RAD = 20, FIRE = 20, ACID = 20)
-
-/obj/item/clothing/suit/armor/vox_merc/laminar/scout/equipped(mob/living/user, slot)
-	..()
-	if(isvox(user) && slot == SLOT_HUD_OUTER_SUIT)
-		ADD_TRAIT(user, TRAIT_GOTTAGOFAST, "laminararmor[UID()]")
-
-/obj/item/clothing/suit/armor/vox_merc/laminar/scout/dropped(mob/user)
-	. = ..()
-	if(user)
-		REMOVE_TRAIT(user, TRAIT_GOTTAGOFAST, "laminararmor[UID()]")
+	slowdown = -0.25
 
 
 // Stealth

modular_ss220/antagonists/code/vox_raider/objects/packs/vox_shop_pack.dm

@@ -15,7 +15,8 @@
 		if(!path)
 			continue
 		var/atom/movable/AM = path
-		ui_manifest += "<big>[bicon(AM)]</big> [initial(AM.name)]"	// !!!! проверяем отобразится ли иконка
+		var/icon/I = icon(initial(AM.icon), initial(AM.icon_state))
+		ui_manifest += "<big>[bicon(I)]</big> [initial(AM.name)]"	// !!!! проверяем отобразится ли иконка
 
 /datum/vox_pack/proc/create_package(turf/spawn_location, mob/user, put_in_hands = TRUE)
 	var/list/items_list = list()

modular_ss220/antagonists/code/vox_raider/objects/vox_trade.dm

@@ -122,7 +122,7 @@
 	return TRUE
 
 /obj/machinery/vox_trader/proc/do_trade(mob/user)
-	var/list/items_list = get_turf(src)
+	var/list/items_list = get_turf(src).GetAllContents(7)
 
 	if(!length(items_list))
 		sparks()

modular_ss220/antagonists/code/vox_raider/vox_raider_mode.dm

@@ -10,6 +10,10 @@
 	. = ..()
 	list_scenarios = list(/datum/antag_scenario/team/vox_raiders)
 
+	var/datum/antag_scenario/antag_datum = /datum/antag_scenario/team/vox_raiders
+	required_players = initial(antag_datum.required_players)
+	return
+
 /datum/game_mode/antag_mix/vox_raider/announce()
 	to_chat(world, "<B>The current game mode is - Vox Raiders!</B>")
 	to_chat(world, "Поблизости сектора [world.name] обнаружен корабль <b>воксов</b>!")

modular_ss220/cyrillic_fixes/_cyrillic_fixes.dm

@@ -21,9 +21,11 @@
 
 	Busy letters by radio(eng):
 	c e h i l m n p r s t u w x z
+	vr
 
 	Busy letters by radio(rus):
 	б г д е ё з к р с т у ц ч ш ы ь я Э
+	мк
 
 	Busy symbols by radio:
 	~ , $ _ - + *
@@ -66,8 +68,8 @@
 		":Ё" = "cords",			"#Ё" = "cords",			"№Ё" = "cords",			".Ё" = "cords",
 
 	// modular_ss220/antagonists/code/antagonist_radio.dm
-		":М" = "VoxCom",		"#М" = "VoxCom",		"№М" = "VoxCom",		".М" = "VoxCom",
-		":м" = "VoxCom",		"#м" = "VoxCom",		"№м" = "VoxCom",		".м" = "VoxCom",
+		":МК" = "VoxCom",		"#МК" = "VoxCom",		"№МК" = "VoxCom",		".МК" = "VoxCom",
+		":мк" = "VoxCom",		"#мк" = "VoxCom",		"№мк" = "VoxCom",		".мк" = "VoxCom",
 
 	// Russian symbols no case
 		// None yet.