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

Head Mounted Sight Has Camera #303

Closed
wants to merge 16 commits into from
Closed

Head Mounted Sight Has Camera #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 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
1c75947
basic conceptual
Jun 22, 2024
55b17cb
undoes a fucking master branch problem.
Jun 22, 2024
7ca2e31
ffs
Jun 22, 2024
0f4832b
Merge remote-tracking branch 'upstream/master' into smartgunner-camera
Jun 22, 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
22 changes: 22 additions & 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 @@ -102,6 +102,28 @@
req_skill_level = SKILL_SPEC_SMARTGUN

var/far_sight = FALSE
var/list/smartgun_head_ban = list(/obj/item/clothing/head/helmet/marine)
var/obj/structure/machinery/camera/camera
/obj/item/clothing/glasses/night/m56_goggles/proc/check_equipping(mob/living/carbon/human/equipping_human, obj/item/equipping_item, slot)

Check warning on line 107 in code/modules/clothing/glasses/night.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

nested absolute path inside /obj/item/clothing/glasses/night/m56_goggles
SIGNAL_HANDLER

if(slot != WEAR_HEAD)

Check failure on line 110 in code/modules/clothing/glasses/night.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

got '!=', expected one of: '/', '[', '=', as, 'in', ';', ')', ','
return


if(is_type_in_list(equipping_item, smartgun_head_ban))
return

. = COMPONENT_HUMAN_CANCEL_ATTEMPT_EQUIP

if(equipping_item.flags_equip_slot == SLOT_BACK)
to_chat(equipping_human, SPAN_WARNING("You can't equip [equipping_item] on your back while wearing [src]."))
return

/obj/item/clothing/suit/storage/marine/smartgunner/unequipped(mob/user, slot)
. = ..()

UnregisterSignal(user, COMSIG_HUMAN_ATTEMPTING_EQUIP)
var/obj/item/weapon/gun/smartgun/linked_smartgun = null

/obj/item/clothing/glasses/night/m56_goggles/Destroy()
Expand Down
4 changes: 2 additions & 2 deletions code/modules/defenses/sentry_computer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
* Sentry gun computer which links to defensive structures.
*/
/obj/item/device/sentry_computer
name = "\improper Sentry Gun Network Laptop"
desc = "A laptop loaded with sentry control software."
name = "\improper AN/PSQ-55 Remote Weapons Console"
desc = "A TREE hardened laptop equipped with additional C2 software for the UA-571 family of robot sentries."
icon = 'icons/obj/structures/props/sentrycomp.dmi'
icon_state = "sentrycomp_cl"
w_class = SIZE_SMALL
Expand Down
Loading