[ANTAGONISTS] Vox Raiders

code/__DEFINES/hud.dm

@@ -59,6 +59,7 @@
 #define ANTAG_HUD_ZOMBIE 22
 // SS220 EDIT - START
 #define ANTAG_HUD_BLOOD_BROTHER 23
+#define ANTAG_HUD_VOX_RAIDER 24
 // SS220 EDIT - END
 
 // Notification action types

code/datums/mind.dm

@@ -567,6 +567,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 ***/

code/modules/admin/verbs/one_click_antag.dm

@@ -21,6 +21,12 @@
 		<a href='byond://?src=[UID()];makeAntag=6'>Make Vampires</a><br>
 		<a href='byond://?src=[UID()];makeAntag=7'>Make Abductor Team (Requires Ghosts)</a><br>
 		"}
+	// SS220 ADD - Start
+	dat += {"
+		<a href='byond://?src=[UID()];makeAntag=8'>Make Blood Brothers Team</a><br>
+		<a href='byond://?src=[UID()];makeAntag=9'>Make Vox Raiders</a><br>
+		"}
+	// SS220 ASS - End
 	usr << browse(dat, "window=oneclickantag;size=400x400")
 	return
 

code/modules/mob/living/carbon/human/species/vox.dm

@@ -99,6 +99,7 @@
 	..()
 	updatespeciescolor(H)
 	H.update_icons()
+	H.faction |= list("Vox")
 
 /datum/species/vox/updatespeciescolor(mob/living/carbon/human/H, owner_sensitive = 1) //Handling species-specific skin-tones for the Vox race.
 	if(H.dna.species.bodyflags & HAS_ICON_SKIN_TONE)

code/modules/projectiles/projectile/bullets.dm

@@ -191,7 +191,7 @@
 
 /obj/item/projectile/bullet/meteorshot/New()
 	..()
-	SpinAnimation()
+	SpinAnimation(5)
 
 /obj/item/projectile/bullet/mime
 	damage = 40

config/example/config.toml

@@ -1123,5 +1123,15 @@ tag = "blood_brothers"
 	"Solar Federation General",
 ]
 
+[[antag_mix_gamemode_configuration.antag_scenarios_configuration]]
+tag = "vox_raiders"
+
+[antag_mix_gamemode_configuration.antag_scenarios_configuration.params]
+"required_players" = 45
+"cost" = 45
+"weight" = 1
+"antag_cap" = 4
+"team_size" = 4
+"candidates_required" = 2
 
 ################################################################

modular_ss220/_defines220/_defines220.dme

@@ -6,7 +6,7 @@
 #include "code/signals_mob/signals_mob_main.dm"
 #include "code/signals_mob/signals_mob_silicon.dm"
 #include "code/signals_mob/signals_mob_simple.dm"
-#include "code/role_preferences.dm"
+#include "code/antagonists.dm"
 #include "code/gamemode.dm"
 #include "code/signals_keybindings.dm"
 #include "code/signals_obj.dm"

modular_ss220/_defines220/code/antagonists.dm

@@ -0,0 +1,6 @@
+#define ROLE_BLOOD_BROTHER "blood brother"
+#define ROLE_VOX_RAIDER "vox raider"
+
+#define VOX_RAID_FREQ 1220
+
+GLOBAL_LIST_EMPTY(raider_spawn)

modular_ss220/_defines220/code/gamemode.dm

@@ -1 +1,4 @@
 #define SPECIAL_ROLE_BLOOD_BROTHER "Blood Brother"
+#define SPECIAL_ROLE_VOX_RAIDER "Vox Raider"
+
+#define isvoxcash(W) (istype(W, /obj/item/stack/vox_cash))

modular_ss220/antagonists/_antagonists.dm

@@ -1,8 +1,23 @@
 /datum/modpack/antagonists
 	name = "Антагонисты и режимы"
 	desc = "Добавляет новые режимы и антагонистов."
-	author = "Gaxeer, dj-34"
+	author = "Gaxeer, dj-34, PhantomRU"
 
 /datum/modpack/antagonists/initialize()
-	GLOB.special_roles |= ROLE_BLOOD_BROTHER
 	GLOB.huds += new/datum/atom_hud/antag/hidden()
+	GLOB.special_roles |= ROLE_BLOOD_BROTHER
+
+	GLOB.huds += new/datum/atom_hud/antag()
+	GLOB.special_roles |= ROLE_VOX_RAIDER
+
+	SSradio.ANTAG_FREQS |= list(VOX_RAID_FREQ)
+
+	SSradio.radiochannels |= list(
+		//"Special Ops" 	= DTH_FREQ,
+		"VoxCom" = VOX_RAID_FREQ,
+	)
+
+	GLOB.department_radio_keys |= list(
+		":VR" = "VoxCom",	"#VR" = "VoxCom",		".VR" = "VoxCom",
+		":vr" = "VoxCom",	"#vr" = "VoxCom",		".vr" = "VoxCom",
+	)

modular_ss220/antagonists/_antagonists_vox_raiders.dme

@@ -0,0 +1,62 @@
+//#include "_antagonists.dm"
+
+// Antag Mix
+// #include "code/antag_mix/antag_mix.dm"
+// #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/configuration/antag_mix_configuration.dm"
+// #include "code/mind/memory_edit.dm"
+#include "code/antag_datum.dm"
+#include "code/objectives.dm"
+#include "code/completion.dm"
+
+// Objects
+#include "code/landmarks.dm"
+#include "code/radio.dm"
+#include "code/guns/dartgun_ammo.dm"
+#include "code/guns/dartgun.dm"
+#include "code/guns/spikegun_ammo.dm"
+#include "code/guns/spikegun.dm"
+#include "code/guns/biogun_ammo.dm"
+#include "code/guns/biogun.dm"
+
+// Blood Brothers
+//#include "code/blood_brothers/blood_brothers_datum.dm"
+//#include "code/blood_brothers/blood_brothers_team.dm"
+
+// Vox Raiders
+#include "code/vox_raider/vox_raider_datum.dm"
+#include "code/vox_raider/vox_raider_mode.dm"
+#include "code/vox_raider/vox_raider_team.dm"
+
+// Vox Raiders - Objects
+#include "code/vox_raider/objects/vox_cash.dm"
+#include "code/vox_raider/objects/packs/vox_shop_defines.dm"
+#include "code/vox_raider/objects/vox_shop.dm"
+#include "code/vox_raider/objects/vox_trade_instrument.dm"
+#include "code/vox_raider/objects/vox_trade.dm"
+#include "code/vox_raider/objects/vox_objects.dm"
+#include "code/vox_raider/clothing/vox_backpack.dm"
+#include "code/vox_raider/clothing/vox_clothing.dm"
+#include "code/vox_raider/clothing/vox_gloves.dm"
+#include "code/vox_raider/clothing/vox_outfit.dm"
+#include "code/vox_raider/clothing/vox_shoes.dm"
+#include "code/vox_raider/clothing/vox_suit_armor.dm"
+#include "code/vox_raider/clothing/vox_suit_rig.dm"
+
+// Vox Raiders - Packs
+#include "code/vox_raider/objects/packs/vox_shop_pack.dm"
+#include "code/vox_raider/objects/packs/vox_shop_pack_bio.dm"
+#include "code/vox_raider/objects/packs/vox_shop_pack_clothes.dm"
+#include "code/vox_raider/objects/packs/vox_shop_pack_consumables.dm"
+#include "code/vox_raider/objects/packs/vox_shop_pack_equipment.dm"
+#include "code/vox_raider/objects/packs/vox_shop_pack_goods.dm"
+#include "code/vox_raider/objects/packs/vox_shop_pack_medicine.dm"
+#include "code/vox_raider/objects/packs/vox_shop_pack_melee.dm"
+#include "code/vox_raider/objects/packs/vox_shop_pack_merc.dm"
+#include "code/vox_raider/objects/packs/vox_shop_pack_raider.dm"
+#include "code/vox_raider/objects/packs/vox_shop_pack_dart.dm"
+#include "code/vox_raider/objects/packs/vox_shop_pack_spike.dm"
+#include "code/vox_raider/objects/packs/vox_shop_pack_kit.dm"

modular_ss220/antagonists/code/antag_datum.dm

@@ -0,0 +1,40 @@
+/datum/antagonist/proc/make_body(loc_spawn, datum/mind/mind, try_use_preference = FALSE, species_name = null, list/possible_species)
+	var/datum/character_save/character
+	var/mob/living/carbon/human/H = mind.current
+	if(!H)
+		H = new
+	H.forceMove(get_turf(loc_spawn))
+	var/new_name = H.real_name
+
+	var/client/client = mind.current.client
+	if(try_use_preference && client && client.prefs && length(client.prefs.character_saves))
+		var/temp_species_name = species_name
+		if(!temp_species_name)
+			if(length(possible_species))
+				temp_species_name = pick(possible_species)
+			else
+				temp_species_name = "Human"
+		for(var/datum/character_save/temp_character in client.prefs.character_saves)
+			if(temp_character.species == temp_species_name)
+				character = temp_character
+				species_name = temp_species_name
+				new_name = random_name(character.gender, character.species)
+				break
+
+	if(!character)
+		// Randomize appearance
+		character = new
+		if(!species_name)
+			species_name = pick(get_safe_species())
+		character.species = species_name
+		new_name = random_name(H.gender, species_name)
+		character.randomise()
+
+	character.copy_to(H)
+	H.rename_character(H.real_name, new_name)
+
+	// species
+	H.cleanSE() //No fat/blind/colourblind/epileptic/whatever ops.
+	H.overeatduration = 0
+	H.flavor_text = null
+	H.update_body()

modular_ss220/antagonists/code/antag_mix/antag_mix.dm

@@ -7,17 +7,20 @@
 	var/max_antag_fraction = 1
 	/// How much budget has left
 	var/budget = 0
+	/// Scenarious for choose
+	var/list/datum/antag_scenario/list_scenarios = list()
 	/// List of scenarios chosen on `pre_setup` stage, and which will be applied on `post_setup`
 	var/list/datum/antag_scenario/executed_scenarios = list()
 
 
 /datum/game_mode/antag_mix/New()
 	. = ..()
 	apply_configuration()
+	list_scenarios = subtypesof(/datum/antag_scenario)
 
 
 /datum/game_mode/antag_mix/pre_setup()
-	var/list/datum/antag_scenario/possible_scenarios = subtypesof(/datum/antag_scenario)
+	var/list/datum/antag_scenario/possible_scenarios = list_scenarios
 
 	var/list/mob/new_player/ready_players = get_ready_players()
 	var/ready_players_amount = length(ready_players)
@@ -26,6 +29,7 @@
 
 	var/list/datum/antag_scenario/acceptable_scenarios = initialize_acceptable_scenarios(possible_scenarios, ready_players_amount)
 	if(!length(acceptable_scenarios))
+		log_antag_mix("Invalid game mode pre setup antag_mix - acceptable scenarios.")
 		return FALSE
 
 	budget = calculate_budget(ready_players_amount)
@@ -97,7 +101,7 @@
 		if(!length(drafted_scenarios) || (current_antag_fraction >= max_antag_fraction))
 			break
 
-		var/datum/antag_scenario/picked_scenario = pickweight(drafted_scenarios)
+		var/datum/antag_scenario/picked_scenario = length(drafted_scenarios) == 1 ? drafted_scenarios[1] : pickweight(drafted_scenarios)
 		if(picked_scenario.cost > budget_left)
 			drafted_scenarios.Remove(picked_scenario)
 			continue
@@ -114,11 +118,17 @@
 		log_antag_mix("Scenario '[picked_scenario.name]' with: cost '[picked_scenario.cost]', weight '[picked_scenario.weight]' was picked [picked_scenarios[picked_scenario]] times")
 		log_antag_mix("Antagonist fraction is '[current_antag_fraction]'")
 
+		if(picked_scenario.execution_once)
+			drafted_scenarios.Remove(picked_scenario)
+
 	if(!length(picked_scenarios))
 		log_antag_mix("No antag scenarios were picked. Let another game mode roll.")
 		return FALSE
 
 	for(var/picked_scenario in picked_scenarios)
+		log_debug("Antag mix picked scenario: [picked_scenario], spend budget [picked_scenarios[picked_scenario] - 1] times, left budget: [budget_left], players ready: [players_ready_amount]")
+		//var/scaled_times_picked = length(picked_scenarios) > 1 ? picked_scenarios[picked_scenario] - 1 : 1
+		//spend_budget(pre_execute_scenario(picked_scenario, scaled_times_picked, players_ready_amount))
 		spend_budget(pre_execute_scenario(picked_scenario, picked_scenarios[picked_scenario] - 1, players_ready_amount))
 
 	if(budget != budget_left && current_antag_fraction < max_antag_fraction && length(drafted_scenarios))
@@ -134,13 +144,15 @@
 
 /datum/game_mode/antag_mix/proc/pre_execute_scenario(datum/antag_scenario/scenario_to_pre_execute, scaled_times, players_ready_amount)
 	if(!scenario_to_pre_execute)
+		log_antag_mix("Scenario '[scenario_to_pre_execute.name]' can't pre execute.")
 		return 0
 
+	log_antag_mix("Scenario '[scenario_to_pre_execute.name]' params: scaled_times [scaled_times]; players_ready_amount: [players_ready_amount]")
 	scenario_to_pre_execute.trim_candidates()
 
 	scenario_to_pre_execute.scaled_times = scaled_times
 	if(!scenario_to_pre_execute.pre_execute(players_ready_amount))
-		log_antag_mix("Scenario '[scenario_to_pre_execute.name]' failed to pre execute")
+		log_antag_mix("Scenario '[scenario_to_pre_execute.name]' failed to pre execute.")
 		return 0
 
 	executed_scenarios |= scenario_to_pre_execute