mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-30 15:38:02 +01:00
Merge pull request #11955 from Very-Soft/balltweak
Tweak capture crystal
This commit is contained in:
@@ -65,6 +65,7 @@
|
||||
if(!AI.hostile)
|
||||
AI.set_stance(STANCE_IDLE)
|
||||
to_chat(M, span("notice", "\The [bound_mob] is now [AI.hostile ? "hostile" : "passive"]."))
|
||||
log_admin("[key_name_admin(M)] set [bound_mob] to [AI.hostile].")
|
||||
else if(bound_mob.client)
|
||||
var/transmit_msg
|
||||
transmit_msg = sanitizeSafe(input(usr, "What is your command?", "Command", null) as text, MAX_NAME_LEN)
|
||||
@@ -73,6 +74,7 @@
|
||||
return
|
||||
to_chat(bound_mob, "<span class='notice'>\The [owner] commands, '[transmit_msg]'</span>")
|
||||
to_chat(M, "<span class='notice'>Your command has been transmitted, '[transmit_msg]'</span>")
|
||||
log_admin("[key_name_admin(M)] sent the command, '[transmit_msg]' to [bound_mob].")
|
||||
else
|
||||
to_chat(M, "<span class='notice'>\The [src] emits an unpleasant tone... \The [bound_mob] is unresponsive.</span>")
|
||||
playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1)
|
||||
@@ -112,6 +114,19 @@
|
||||
AI.set_follow(M)
|
||||
to_chat(M, "<span class='notice'>\The [src] chimes~ \The [bound_mob] started following following [AI.leader].</span>")
|
||||
|
||||
/obj/item/capture_crystal/verb/destroy_crystal()
|
||||
set name = "Destroy Crystal"
|
||||
set category = "Object"
|
||||
set src in usr
|
||||
if(!ismob(loc))
|
||||
return
|
||||
var/mob/living/M = src.loc
|
||||
if(M != owner)
|
||||
to_chat(M, "<span class='notice'>\The [src] is too hard for you to break.</span>")
|
||||
else
|
||||
to_chat(M, "<span class='notice'>\The [src] cracks and disintegrates in your hand.</span>")
|
||||
qdel(src)
|
||||
|
||||
/obj/item/capture_crystal/update_icon()
|
||||
. = ..()
|
||||
if(spawn_mob_type)
|
||||
@@ -289,6 +304,7 @@
|
||||
else if(!isanimal(M)) //So it's not player controlled, but it's also not a simplemob?
|
||||
to_chat(user, "<span class='warning'>This creature is not suitable for capture.</span>")
|
||||
playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1)
|
||||
return
|
||||
var/mob/living/simple_mob/S = M
|
||||
if(!S.ai_holder) //We don't really want to capture simplemobs that don't have an AI
|
||||
to_chat(user, "<span class='warning'>This creature is not suitable for capture.</span>")
|
||||
|
||||
Reference in New Issue
Block a user