правки

code/__DEFINES/mobs.dm

@@ -298,6 +298,8 @@
 #define isdemon(A) 			(istype((A), /mob/living/simple_animal/demon))
 #define ismorph(A)		(istype((A), /mob/living/simple_animal/hostile/morph))
 #define isborer(A)		(istype((A), /mob/living/simple_animal/borer))
+#define isrevenant(A)		(istype((A), /mob/living/simple_animal/revenant))
+#define isshadowdemon(A)		(istype((A), /mob/living/simple_animal/demon/shadow))
 
 #define issilicon(A)	(istype((A), /mob/living/silicon))
 #define isAI(A)			(istype((A), /mob/living/silicon/ai))

code/datums/components/spy_bug.dm

@@ -0,0 +1,44 @@
+/datum/component/spy_bug
+	var/obj/item/spy_bug/bug
+
+/datum/component/spy_bug/RegisterWithParent()
+	var/atom/par = parent
+	for (var/obj/item/spy_bug/spy_bug in par.contents)
+		bug = spy_bug
+
+	RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine))
+	RegisterSignal(parent, COMSIG_CLICK_ALT, PROC_REF(on_altclick))
+	RegisterSignal(parent, COMSIG_PREQDELETED, PROC_REF(deleted_handler))
+
+/datum/component/spy_bug/UnregisterFromParent()
+	UnregisterSignal(parent, COMSIG_PARENT_EXAMINE)
+	UnregisterSignal(parent, COMSIG_CLICK_ALT)
+	UnregisterSignal(parent, COMSIG_PREQDELETED)
+
+/datum/component/spy_bug/proc/on_examine(datum/source, mob/living/carbon/human/user, list/examine_list)
+	SIGNAL_HANDLER
+
+	if(!istype(user))
+		return
+
+	examine_list += span_warning("Вы видите небольшое устройство с микрофоном и камерой.")
+
+/datum/component/spy_bug/proc/on_altclick(datum/source, mob/living/carbon/human/user)
+	SIGNAL_HANDLER
+
+	if(!istype(user))
+		return
+
+	if(!user.Adjacent(parent))
+		return
+
+	if(user.stat)
+		return
+
+	if(HAS_TRAIT(user, TRAIT_HANDS_BLOCKED))
+		return
+
+	bug.unhook(user)
+
+/datum/component/spy_bug/proc/deleted_handler()
+	bug.unhook()

code/datums/spells/bloodcrawl.dm

@@ -295,7 +295,7 @@
 
 /obj/effect/proc_holder/spell/bloodcrawl/shadow_crawl/post_phase_in(mob/living/user, obj/effect/dummy/slaughter/holder)
 	..()
-	if(!istype(user, /mob/living/simple_animal/demon/shadow))
+	if(!isshadowdemon(user))
 		return
 	var/mob/living/simple_animal/demon/shadow/demon = user
 	demon.RegisterSignal(holder, COMSIG_MOVABLE_MOVED, TYPE_PROC_REF(/mob/living/simple_animal/demon/shadow, check_darkness))

code/game/gamemodes/miniantags/demons/shadow_demon/shadow_demon.dm

@@ -286,7 +286,7 @@
 /datum/objective/wrap/check_completion()
 	var/wrap_count = 0
 	for(var/datum/mind/player in get_owners())
-		if(!istype(player.current, /mob/living/simple_animal/demon/shadow) || QDELETED(player.current))
+		if(!isshadowdemon(player.current) || QDELETED(player.current))
 			continue
 
 		var/mob/living/simple_animal/demon/shadow/demon = player.current

code/game/gamemodes/miniantags/revenant/revenant.dm

@@ -130,7 +130,7 @@
 
 	for(var/mob/M in GLOB.mob_list)
 		var/rendered = "<span class='revennotice'><b>[src]</b> [(isobserver(M) ? ("([ghost_follow_link(src, ghost=M)])") : "")] says, \"[message]\"</span>"
-		if(istype(M, /mob/living/simple_animal/revenant) || isobserver(M))
+		if(isrevenant(M) || isobserver(M))
 			to_chat(M, rendered)
 
 
@@ -355,7 +355,7 @@
 	var/total_essence = 0
 
 	for(var/datum/mind/player in get_owners())
-		if(!istype(player.current, /mob/living/simple_animal/revenant) || QDELETED(player.current))
+		if(!isrevenant(player.current) || QDELETED(player.current))
 			continue
 
 		var/mob/living/simple_animal/revenant/revenant = player.current

code/game/objects/items/devices/uplinks.dm

@@ -559,10 +559,10 @@ GLOBAL_LIST_EMPTY(world_uplinks)
 		malfs += ismalfAI(M)
 		borers += isborer(M)
 		morphs += ismorph(M)
-		revenants += istype(M, /mob/living/simple_animal/revenant)
+		revenants += isrevenant(M)
 		demons += isdemon(M)
-		shadow_demons += istype(M, /mob/living/simple_animal/demon/shadow)
-		pulse_demons += istype(M, /mob/living/simple_animal/demon/pulse_demon)
+		shadow_demons += isshadowdemon(M)
+		pulse_demons += ispulsedemon(M)
 
 		crew += ishuman(M)
 

code/modules/antagonists/traitor/affiliates/items/mi13/sound_ring.dm

@@ -18,57 +18,30 @@
 
 	changing = TRUE
 
-	var/list/choices // only types that we can meet in the game
-
-	if(!stud)
-		choices = list(
-			"iron" = image(icon = 'icons/obj/clothing/rings.dmi', icon_state = "ironring"),
-			"silver" = image(icon = 'icons/obj/clothing/rings.dmi', icon_state = "silverring"),
-			"gold" = image(icon = 'icons/obj/clothing/rings.dmi', icon_state = "goldring"),
-			"plasma" = image(icon = 'icons/obj/clothing/rings.dmi', icon_state = "plasmaring"),
-			"uranium" = image(icon = 'icons/obj/clothing/rings.dmi', icon_state = "uraniumring")
-		)
-	else
-		choices = list(
-			"iron" = image(icon = 'icons/obj/clothing/rings.dmi', icon_state = "d_ironring"),
-			"silver" = image(icon = 'icons/obj/clothing/rings.dmi', icon_state = "d_silverring"),
-			"gold" = image(icon = 'icons/obj/clothing/rings.dmi', icon_state = "d_goldring"),
-			"plasma" = image(icon = 'icons/obj/clothing/rings.dmi', icon_state = "d_plasmaring"),
-			"uranium" = image(icon = 'icons/obj/clothing/rings.dmi', icon_state = "d_uraniumring")
-		)
-
-	var/selected_chameleon = show_radial_menu(usr, loc, choices, require_near = TRUE)
-	switch(selected_chameleon)
-		if("iron")
-			name =  "iron ring"
-			icon_state = "ironring"
-			material = "iron"
-			ring_color = "iron"
-		if("silver")
-			name =  "silver ring"
-			icon_state = "silverring"
-			material = "silver"
-			ring_color = "silver"
-		if("gold")
-			name =  "gold ring"
-			icon_state = "goldring"
-			material = "gold"
-			ring_color = "gold"
-		if("plasma")
-			name = "plasma ring"
-			icon_state = "plasmaring"
-			material = "plasma"
-			ring_color = "plasma"
-		if("uranium")
-			name = "uranium ring"
-			icon_state = "uraniumring"
-			material = "uranium"
-			ring_color = "uranium"
-		else
-			changing = FALSE
-			return
-
-	user.visible_message(span_warning("[user] changes the look of his ring!"), span_notice("[selected_chameleon] selected."))
+	// only types that we can meet in the game
+	var/list/possible = list("iron ring", "silver ring", "gold ring", "plasma ring", "uranium ring")
+	var/list/obj/item/clothing/gloves/ring/choices = list()
+	for(var/type in typesof(/obj/item/clothing/gloves/ring))
+		if(type == src.type)
+			continue
+
+		if(!(name in possible))
+			continue
+
+		var/obj/item/clothing/gloves/ring/ring = new type
+		ring.stud = stud
+		choices[ring] = image(icon = ring.icon, icon_state = ring.icon_state)
+
+	var/obj/item/clothing/gloves/ring/selected_chameleon = show_radial_menu(usr, loc, choices, require_near = TRUE)
+	if(!selected_chameleon)
+		return
+
+	name = selected_chameleon.name
+	icon_state = selected_chameleon.icon_state
+	material = selected_chameleon.material
+	ring_color = selected_chameleon.ring_color
+
+	user.visible_message(span_warning("[user] изменяет внешний вид кольца!"), span_notice("[selected_chameleon] selected."))
 	playsound(loc, 'sound/items/screwdriver2.ogg', 50, 1)
 	to_chat(user, span_notice("Смена маскировки..."))
 	update_icon(UPDATE_ICON_STATE)

code/modules/antagonists/traitor/affiliates/items/mi13/spy_kit.dm

@@ -86,50 +86,6 @@
 		c_tag = new_name
 		camera = new(src, network, c_tag)
 
-/datum/component/spy_bug
-	var/obj/item/spy_bug/bug
-
-/datum/component/spy_bug/RegisterWithParent()
-	var/atom/par = parent
-	for (var/obj/item/spy_bug/spy_bug in par.contents)
-		bug = spy_bug
-
-	RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine))
-	RegisterSignal(parent, COMSIG_CLICK_ALT, PROC_REF(on_altclick))
-	RegisterSignal(parent, COMSIG_PREQDELETED, PROC_REF(deleted_handler))
-
-/datum/component/spy_bug/UnregisterFromParent()
-	UnregisterSignal(parent, COMSIG_PARENT_EXAMINE)
-	UnregisterSignal(parent, COMSIG_CLICK_ALT)
-	UnregisterSignal(parent, COMSIG_PREQDELETED)
-
-/datum/component/spy_bug/proc/on_examine(datum/source, mob/living/carbon/human/user, list/examine_list)
-	SIGNAL_HANDLER
-
-	if(!istype(user))
-		return
-
-	examine_list += span_warning("Вы видите небольшое устройство с микрофоном и камерой.")
-
-/datum/component/spy_bug/proc/on_altclick(datum/source, mob/living/carbon/human/user)
-	SIGNAL_HANDLER
-
-	if(!istype(user))
-		return
-
-	if(!user.Adjacent(parent))
-		return
-
-	if(user.stat)
-		return
-
-	if(HAS_TRAIT(user, TRAIT_HANDS_BLOCKED))
-		return
-
-	bug.unhook(user)
-
-/datum/component/spy_bug/proc/deleted_handler()
-	bug.unhook()
 
 /obj/item/camera_bug/spy_monitor
 	name = "spy monitor"

code/modules/mob/holder_pet_carrier.dm

@@ -79,7 +79,7 @@
 	if(target.mob_size > mob_size)
 		to_chat(user, span_warning("Ваша переноска слишком мала!"))
 		return FALSE
-	if(istype(target, /mob/living/simple_animal/revenant))
+	if(!isrevenant(target))
 		return FALSE
 
 	target.forceMove(src)

paradise.dme

@@ -464,6 +464,7 @@
 #include "code\datums\components\slippery.dm"
 #include "code\datums\components\spawner.dm"
 #include "code\datums\components\spooky.dm"
+#include "code\datums\components\spy_bug.dm"
 #include "code\datums\components\squeak.dm"
 #include "code\datums\components\surgery_initiator.dm"
 #include "code\datums\components\swarming.dm"