mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-12 11:13:16 +00:00
-Fixed holopads not letting you holo_talk when you weren't on the holopad.
-AIs can now double click on living mobs (/mob/living) to instantly start tracking them. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4673 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -105,8 +105,8 @@
|
|||||||
return
|
return
|
||||||
|
|
||||||
if (!near_camera(target))
|
if (!near_camera(target))
|
||||||
U << "Target is not on or near any active cameras on the station. We'll check again in 5 seconds (unless you use the cancel-camera verb)."
|
U << "Target is not near any active cameras."
|
||||||
sleep(50) //because we're sleeping another second after this (a few lines down)
|
sleep(100)
|
||||||
continue
|
continue
|
||||||
|
|
||||||
if(U.eyeobj)
|
if(U.eyeobj)
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ var/const/HOLOPAD_MODE = 0
|
|||||||
last_request = world.time
|
last_request = world.time
|
||||||
user << "<span class='notice'>You request an AI's presence.</span>"
|
user << "<span class='notice'>You request an AI's presence.</span>"
|
||||||
var/area/area = get_area(src)
|
var/area/area = get_area(src)
|
||||||
for(var/mob/living/silicon/ai/AI in player_list)
|
for(var/mob/living/silicon/ai/AI in living_mob_list)
|
||||||
if(!AI.client) continue
|
if(!AI.client) continue
|
||||||
AI << "<span class='info'>Your presence is requested at <a href='?src=\ref[AI];jumptoholopad=\ref[src]'>\the [area]</a>.</span>"
|
AI << "<span class='info'>Your presence is requested at <a href='?src=\ref[AI];jumptoholopad=\ref[src]'>\the [area]</a>.</span>"
|
||||||
else
|
else
|
||||||
@@ -50,8 +50,7 @@ var/const/HOLOPAD_MODE = 0
|
|||||||
if(!(stat & NOPOWER) && user.eyeobj.loc == src.loc)//If the projector has power and client eye is on it.
|
if(!(stat & NOPOWER) && user.eyeobj.loc == src.loc)//If the projector has power and client eye is on it.
|
||||||
if(!hologram)//If there is not already a hologram.
|
if(!hologram)//If there is not already a hologram.
|
||||||
create_holo(user)//Create one.
|
create_holo(user)//Create one.
|
||||||
for(var/mob/M in viewers())
|
src.visible_message("A holographic image of [user] flicks to life right before your eyes!")
|
||||||
M.show_message("A holographic image of [user] flicks to life right before your eyes!",1)
|
|
||||||
else
|
else
|
||||||
user << "\red ERROR: \black Image feed in progress."
|
user << "\red ERROR: \black Image feed in progress."
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -76,8 +76,21 @@
|
|||||||
if(istype(usr, /mob/living/silicon/ai))
|
if(istype(usr, /mob/living/silicon/ai))
|
||||||
var/mob/living/silicon/ai/AI = usr
|
var/mob/living/silicon/ai/AI = usr
|
||||||
if(AI.eyeobj && AI.client.eye == AI.eyeobj)
|
if(AI.eyeobj && AI.client.eye == AI.eyeobj)
|
||||||
|
AI.cameraFollow = null
|
||||||
AI.eyeobj.setLoc(src)
|
AI.eyeobj.setLoc(src)
|
||||||
|
|
||||||
|
/mob/living/Click()
|
||||||
|
if(isAI(usr))
|
||||||
|
return
|
||||||
|
..()
|
||||||
|
|
||||||
|
/mob/living/DblClick()
|
||||||
|
if(isAI(usr) && usr != src)
|
||||||
|
var/mob/living/silicon/ai/A = usr
|
||||||
|
A.ai_actual_track(src)
|
||||||
|
return
|
||||||
|
..()
|
||||||
|
|
||||||
// This will move the AIEye. It will also cause lights near the eye to light up, if toggled.
|
// This will move the AIEye. It will also cause lights near the eye to light up, if toggled.
|
||||||
// This is handled in the proc below this one.
|
// This is handled in the proc below this one.
|
||||||
|
|
||||||
|
|||||||
@@ -48,7 +48,7 @@
|
|||||||
if (!message)
|
if (!message)
|
||||||
return
|
return
|
||||||
|
|
||||||
var/obj/machinery/hologram/holopad/T = locate(/obj/machinery/hologram/holopad) in src.eyeobj.loc
|
var/obj/machinery/hologram/holopad/T = src.current
|
||||||
if(istype(T) && T.hologram && T.master == src)//If there is a hologram and its master is the user.
|
if(istype(T) && T.hologram && T.master == src)//If there is a hologram and its master is the user.
|
||||||
var/message_a = say_quote(message)
|
var/message_a = say_quote(message)
|
||||||
|
|
||||||
|
|||||||
@@ -48,6 +48,14 @@ Stuff which is in development and not yet visible to players or just code relate
|
|||||||
should be listed in the changelog upon commit tho. Thanks. -->
|
should be listed in the changelog upon commit tho. Thanks. -->
|
||||||
|
|
||||||
<!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
|
<!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
|
||||||
|
<div class="commit sansserif">
|
||||||
|
<h2 class="date">10 September 2012</h2>
|
||||||
|
<h3 class="author">Giacom updated:</h3>
|
||||||
|
<ul class="changes bgimages16">
|
||||||
|
<li class="rscadd">AIs can double click on mobs to instantly start tracking them.</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="commit sansserif">
|
<div class="commit sansserif">
|
||||||
<h2 class="date">Important note for server hosts!</h2>
|
<h2 class="date">Important note for server hosts!</h2>
|
||||||
<h3 class="author">Important note for server hosts!:</h3>
|
<h3 class="author">Important note for server hosts!:</h3>
|
||||||
|
|||||||
Reference in New Issue
Block a user