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

Cameras For HMS, Redux #312

Closed
wants to merge 18 commits into from
Closed

Cameras For HMS, Redux #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
de6c369
fuck that shit
Jun 2, 2024
2b6c465
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
Jun 2, 2024
8ea6f23
emails
Jun 2, 2024
1e582ef
should hopefully accidently unfuck this
Jun 2, 2024
38aee5f
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
KoishiVibe Jun 3, 2024
b69183d
FUCK.
Jun 6, 2024
d5078fe
unfucks that.
Jun 6, 2024
edf2ede
try to fix the problem
Jun 6, 2024
a361ab2
i dont know why hpefully fixed????
Jun 6, 2024
0f713b9
hopefully fixed wait no this needs to mathc
Jun 6, 2024
115e852
done
KoishiVibe Jun 13, 2024
f0b4d03
fucking fix you piece of shit
Jun 20, 2024
017baf3
undoes a fuckup with the master
Jun 22, 2024
3be565c
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
Jun 22, 2024
9698a01
fixes issue
Jun 22, 2024
c040c59
how tf did this get changed
KoishiVibe Jun 25, 2024
a8c99c0
basic first step, but I need to make the overwatch console pick up on…
Jun 28, 2024
61977ee
these changes are probably fine right?
Jul 2, 2024
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
1 change: 1 addition & 0 deletions code/modules/clothing/glasses/night.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@

var/far_sight = FALSE
var/obj/item/weapon/gun/smartgun/linked_smartgun = null
var/obj/structure/machinery/camera/camera

/obj/item/clothing/glasses/night/m56_goggles/Destroy()
linked_smartgun = null
Expand Down
10 changes: 7 additions & 3 deletions code/modules/cm_marines/overwatch.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,11 +657,15 @@
user.reset_view(null)

//returns the helmet camera the human is wearing
/obj/structure/machinery/computer/overwatch/proc/get_camera_from_target(mob/living/carbon/human/H)
/obj/structure/machinery/computer/overwatch/proc/get_camera_from_target(mob/living/carbon/human/overwatch_target)
if(current_squad)
if(H && istype(H) && istype(H.head, /obj/item/clothing/head/helmet/marine))
var/obj/item/clothing/head/helmet/marine/helm = H.head
if(overwatch_target && istype(overwatch_target) && istype(overwatch_target.head, /obj/item/clothing/head/helmet/marine))
var/obj/item/clothing/head/helmet/marine/helm = overwatch_target.head
return helm.camera
if(overwatch_target && istype(overwatch_target) && istype(overwatch_target.glasses, /obj/item/clothing/glasses/night/m56_goggles))
var/obj/item/clothing/glasses/night/m56_goggles/glass = overwatch_target.glasses
return glass.camera



// Alerts all groundside marines about the incoming OB
Expand Down
Loading