cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

AI PiP Fixes

Browse Source 
Fixes the undefined icon resulting in this:
![https://i.tigercat2000.net/2020/05/firefox_4x2cbYTrT1.png](https://i.tigercat2000.net/2020/05/firefox_4x2cbYTrT1.png)
Fixes the two buttons being misaligned with the UI.
Fixes double-clicking inside the AI PiP room teleporting the AI Eye out to the room and completely breaking the view. Do note that double-clicking no longer works at all inside the multi-cam room, as a tradeoff for completely preventing UI breaks.
This commit is contained in:
Rykka
2020-05-10 21:53:31 -04:00
parent dad851b252
commit 29037fd40a
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/_onclick/hud/_defines.dm
View File

@@ -75,8 +75,8 @@
#define ui_ai_pda_log "SOUTH:6,WEST+11:16" #define ui_ai_pda_log "SOUTH:6,WEST+11:16"
#define ui_ai_take_picture "SOUTH:6,WEST+12:16" #define ui_ai_take_picture "SOUTH:6,WEST+12:16"
#define ui_ai_view_images "SOUTH:6,WEST+13:16" #define ui_ai_view_images "SOUTH:6,WEST+13:16"
#define ui_ai_multicam "SOUTH+1:6,WEST+13" #define ui_ai_multicam "SOUTH+1:6,WEST+12:16"
#define ui_ai_add_multicam "SOUTH+1:6,WEST+14" #define ui_ai_add_multicam "SOUTH+1:6,WEST+13:16"
//Gun buttons //Gun buttons
#define ui_gun1 "EAST-2:26,SOUTH+2:7" #define ui_gun1 "EAST-2:26,SOUTH+2:7"

1
code/_onclick/hud/picture_in_picture.dm
View File

@@ -2,6 +2,7 @@
name = "Picture-in-picture" name = "Picture-in-picture"
screen_loc = "CENTER" screen_loc = "CENTER"
plane = PLANE_WORLD plane = PLANE_WORLD
icon = null
var/atom/center var/atom/center
var/width = 0 var/width = 0
var/height = 0 var/height = 0

7
code/modules/mob/freelook/ai/eye.dm
View File

@@ -86,7 +86,12 @@
/atom/proc/move_camera_by_click() /atom/proc/move_camera_by_click()
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.multicam_on || (AI.client.eye == AI.eyeobj))) if(AI.eyeobj)
+ if(!AI.multicam_on || AI.client.eye != AI.eyeobj)
+ return
+ var/area/A = get_area(AI.eyeobj)
+ if(istype(A, /area/ai_multicam_room))
+ return
var/turf/T = get_turf(src) var/turf/T = get_turf(src)
if(T) if(T)
AI.eyeobj.setLoc(T) AI.eyeobj.setLoc(T)