Ребаланс. ВОКСы дотрагиваясь могут приватизировать под ВОКСов орудие,…

… флаг
ss220club · Mar 27, 2024 · 8608711 · 8608711
1 parent 316c006
commit 8608711
Show file tree

Hide file tree

Showing 8 changed files with 66 additions and 6 deletions.
diff --git a/modular_ss220/antagonists/_antagonists_FUCK_YOU_RAVE_MAGES.dme b/modular_ss220/antagonists/_antagonists_FUCK_YOU_RAVE_MAGES.dme
@@ -27,16 +27,17 @@
 //#include "code/blood_brothers/blood_brothers_team.dm"
 
 // Vox Raiders
-#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/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"

diff --git a/modular_ss220/antagonists/code/guns/biogun.dm b/modular_ss220/antagonists/code/guns/biogun.dm
@@ -12,6 +12,20 @@
 	projectile_speed = 2
 	projectile_range = 30
 	valid_projectile_type = /obj/item/biocore
+	var/is_vox_private = FALSE
+
+/obj/item/gun/throw/biogun/pickup(mob/user)
+	. = ..()
+	if(!is_vox_private)
+		is_vox_private = TRUE
+		to_chat(user, span_notice("Оружие инициализировало вас, более никто кроме Воксов не сможет им воспользоваться."))
+
+/obj/item/gun/throw/biogun/afterattack(atom/target, mob/living/user, flag, params)
+	if(is_vox_private && !isvox(user))
+		if(prob(20))
+			to_chat(user, span_notice("Оружие отказывается с вами работать и не активируется."))
+		return FALSE
+	. = ..()
 
 /obj/item/gun/throw/biogun/Initialize(mapload)
 	. = ..()

diff --git a/modular_ss220/antagonists/code/guns/dartgun.dm b/modular_ss220/antagonists/code/guns/dartgun.dm
@@ -13,6 +13,20 @@
 	var/obj/item/storage/dart_cartridge/cartridge_loaded
 	var/pixel_y_overlay_div = 5	// сколько у нас делений для спрайта оверлея ("Позиций")
 	var/pixel_y_overlay_offset = 2 // на сколько пикселей смещаем оверлей при полном делении
+	var/is_vox_private = FALSE
+
+/obj/item/gun/syringe/dart_gun/pickup(mob/user)
+	. = ..()
+	if(!is_vox_private)
+		is_vox_private = TRUE
+		to_chat(user, span_notice("Оружие инициализировало вас, более никто кроме Воксов не сможет им воспользоваться."))
+
+/obj/item/gun/syringe/dart_gun/afterattack(atom/target, mob/living/user, flag, params)
+	if(is_vox_private && !isvox(user))
+		if(prob(20))
+			to_chat(user, span_notice("Оружие отказывается с вами работать и не активируется."))
+		return FALSE
+	. = ..()
 
 /obj/item/gun/syringe/dart_gun/Destroy()
 	qdel(cartridge_loaded)

diff --git a/modular_ss220/antagonists/code/guns/spikegun.dm b/modular_ss220/antagonists/code/guns/spikegun.dm
@@ -19,6 +19,20 @@
 	cell_type = /obj/item/stock_parts/cell/vox_spike
 	ammo_type = list(/obj/item/ammo_casing/energy/vox_spike)
 	var/can_reload = TRUE
+	var/is_vox_private = FALSE
+
+/obj/item/gun/energy/spike/pickup(mob/user)
+	. = ..()
+	if(!is_vox_private)
+		is_vox_private = TRUE
+		to_chat(user, span_notice("Оружие инициализировало вас, более никто кроме Воксов не сможет им воспользоваться."))
+
+/obj/item/gun/energy/spike/afterattack(atom/target, mob/living/user, flag, params)
+	if(is_vox_private && !isvox(user))
+		if(prob(20))
+			to_chat(user, span_notice("Оружие отказывается с вами работать и не активируется."))
+		return FALSE
+	. = ..()
 
 /obj/item/gun/energy/spike/emp_act()
 	return

diff --git a/modular_ss220/antagonists/code/vox_raider/objects/packs/vox_shop_pack_equipment.dm b/modular_ss220/antagonists/code/vox_raider/objects/packs/vox_shop_pack_equipment.dm
@@ -83,3 +83,12 @@
 		/obj/item/clothing/suit/space/vox,
 		/obj/item/clothing/head/helmet/space/vox
 		)
+
+
+// ============== Misc ==============
+/datum/vox_pack/equipment/flag
+	name = "Флаг"
+	desc = "С ним ценности еще ценнее."
+	reference = "E_FLAG"
+	cost = 100
+	contains = list(/obj/item/flag/vox_raider)
diff --git a/modular_ss220/antagonists/code/vox_raider/objects/vox_objects.dm b/modular_ss220/antagonists/code/vox_raider/objects/vox_objects.dm
diff --git a/modular_ss220/antagonists/code/vox_raider/objects/vox_trade.dm b/modular_ss220/antagonists/code/vox_raider/objects/vox_trade.dm
@@ -44,8 +44,8 @@
 	var/integrity_reward = 5
 	var/electroprotect_reward = 50
 	var/permeability_reward	= 20
-	var/highrisk_reward = 500
-	var/valuable_highrisk_reward = 1000
+	var/highrisk_reward = 2500
+	var/valuable_highrisk_reward = 5000
 	var/value_access_reward = 100
 	var/valuable_access_reward = 500
 	var/unique_tech_level_reward = 300	// учитываем также множитель за технологии

diff --git a/modular_ss220/objects/code/flag.dm b/modular_ss220/objects/code/flag.dm
@@ -5,3 +5,11 @@
 	icon_state = "flag_group"
 	lefthand_file = 'modular_ss220/objects/icons/inhands/flags_lefthand.dmi'
 	righthand_file = 'modular_ss220/objects/icons/inhands/flags_righthand.dmi'
+
+/obj/item/flag/vox_raider
+	name = "флаг вокс рейдеров"
+	desc = "Флаг одной из небезызвестных организаций, вершащие кражи и грабежи в космосе для наживы."
+	icon = 'modular_ss220/objects/icons/flag.dmi'
+	icon_state = "flag_vox_raider"
+	lefthand_file = 'modular_ss220/objects/icons/inhands/flags_lefthand.dmi'
+	righthand_file = 'modular_ss220/objects/icons/inhands/flags_righthand.dmi'