makes LZ detector work while landed round 2 #4647
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cm13-github
added
the
Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
bot
added
the
Balance
cm13-github
removed
the
Merge Conflict
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
Zonespace27
added
the
Balance Approved
ghost
reviewed
Oct 13, 2023
Comment on lines
521
to
522
| for(var/obj/structure/machinery/computer/cameras/dropship/D in range(5, loc)) | ||
| linked_cam_console = D |
ghost
reviewed
Oct 13, 2023
Comment on lines
521
to
522
| for(var/obj/structure/machinery/computer/cameras/dropship/Dropship_camera_console in range(5, loc)) | ||
| linked_cam_console = Dropship_camera_console |
Zonespace27
requested changes
Oct 13, 2023
| /obj/structure/dropship_equipment/electronics/landing_zone_detector/proc/connect_cameras() | ||
| if(linked_cam_console) | ||
| return | ||
| for(var/obj/structure/machinery/computer/cameras/dropship/dropship_camera_console in range(5, loc)) |
There was a problem hiding this comment.
this can become
var/obj/structure/machinery/computer/cameras/dropship/dropship_camera_console = locate() in range(5, loc)
| if(!linked_cam_console) | ||
| return | ||
| linked_cam_console.network.Remove(CAMERA_NET_LANDING_ZONES) | ||
| for(var/datum/weakref/ref in linked_cam_console.concurrent_users) |
There was a problem hiding this comment.
for(var/datum/weakref/ref as anything in linked_cam_console.concurrent_users)
| icon_state = "lz_detector" | ||
| point_cost = 50 | ||
| var/obj/structure/machinery/computer/cameras/dropship/linked_cam_console | ||
|
|
||
| /obj/structure/dropship_equipment/electronics/landing_zone_detector/proc/connect_cameras() |
| @@ -507,41 +507,48 @@ | |||
| icon_state = initial(icon_state) | |||
|
|
|||
| /obj/structure/dropship_equipment/electronics/landing_zone_detector | |||
|
|
|||
| name = "\improper AN/AVD-60 LZ detector" | ||
| desc = "An electronic device linked to the dropship's camera system that lets you observe your landing zone mid-flight." | ||
| desc = "An electronic device linked to the dropship's camera system that lets you observe your landing zone." | ||
|
|
| break | ||
| linked_cam_console.network.Add(CAMERA_NET_LANDING_ZONES) | ||
|
|
||
| /obj/structure/dropship_equipment/electronics/landing_zone_detector/proc/disconnect_cameras() |
Zonespace27
approved these changes
Nov 2, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
remade some stuff from #4516 to clean up the code, rest is the same. did not get to test it also not shure if I solved the mergeconflict properly if not tell me what is wrong
🆑
balance: LZ detector now works even when the DS is stationary
/:cl: