Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Falcon Drone appears on marine MD #4057

Merged
merged 3 commits into from
Aug 3, 2023
Merged

Falcon Drone appears on marine MD #4057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e5e310
falcon MD
realforest2001 Jul 30, 2023
c242395
requested changes
realforest2001 Aug 1, 2023
2d6dccb
Apply suggestions from code review
realforest2001 Aug 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions code/game/objects/items/devices/motion_detector.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,11 +229,14 @@
if(human_user)
show_blip(human_user, M)

for(var/mob/hologram/queen/Q in GLOB.hologram_list)
if(Q.z != cur_turf.z || !(range_bounds.contains_atom(Q))) continue
for(var/mob/hologram/holo as anything in GLOB.hologram_list)
if(!holo.motion_sensed)
continue
if(holo.z != cur_turf.z || !(range_bounds.contains_atom(holo)))
continue
ping_count++
if(human_user)
show_blip(human_user, Q, "queen_eye")
show_blip(human_user, holo, "queen_eye")

if(ping_count > 0)
playsound(loc, pick('sound/items/detector_ping_1.ogg', 'sound/items/detector_ping_2.ogg', 'sound/items/detector_ping_3.ogg', 'sound/items/detector_ping_4.ogg'), 60, 0, 7, 2)
Expand Down
1 change: 1 addition & 0 deletions code/modules/cm_preds/falcon.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
var/obj/item/falcon_drone/parent_drone
var/obj/item/clothing/gloves/yautja/owned_bracers
desc = "An agile drone used by Yautja to survey the hunting grounds."
motion_sensed = TRUE

/mob/hologram/falcon/Initialize(mapload, mob/M, obj/item/falcon_drone/drone, obj/item/clothing/gloves/yautja/bracers)
. = ..()
Expand Down
4 changes: 3 additions & 1 deletion code/modules/cm_tech/hologram.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
GLOBAL_LIST_EMPTY(hologram_list)
GLOBAL_LIST_EMPTY_TYPED(hologram_list, /mob/hologram)

/mob/hologram
name = "Hologram"
Expand All @@ -16,6 +16,8 @@ GLOBAL_LIST_EMPTY(hologram_list)

var/mob/linked_mob
var/datum/action/leave_hologram/leave_button
///If can be detected on motion detectors.
var/motion_sensed = FALSE

/mob/hologram/movement_delay()
. = -2 // Very fast speed, so they can navigate through easily, they can't ever have movement delay whilst as a hologram
Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/living/carbon/xenomorph/castes/Queen.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
/mob/hologram/queen
name = "Queen Eye"
action_icon_state = "queen_exit"
motion_sensed = TRUE

color = "#a800a8"

Expand Down