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

M42 Spotter Sight now requires pamphlet. #5846

Closed
wants to merge 1 commit into from
Closed

M42 Spotter Sight now requires pamphlet. #5846

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 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 @@ -70,6 +70,14 @@
name = "\improper M42 spotter sight"
desc = "A companion headset and night vision goggles system for USCM spotters. Allows highlighted imaging of surroundings. Click it to toggle."

/obj/item/clothing/glasses/night/m42_night_goggles/spotter/can_use_active_effect(mob/living/carbon/human/user)
if(!(GLOB.character_traits[/datum/character_trait/skills/spotter] in user.traits))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This shouldn't be exclusive to spotter. No reason why the spec can't also use it.

to_chat(user, SPAN_WARNING("You have no idea how to use this!"))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This message is unnecessary currently because the caller of this proc also sends a message.
image

return FALSE
else
return TRUE

Comment on lines +77 to +79
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
else
return TRUE
return ..()

Still ought to use the parent implementation of the proc ever it changes.


/obj/item/clothing/glasses/night/m42_night_goggles/m42c
name = "\improper M42C special operations sight"
desc = "A specialized variation of the M42 scout sight system, intended for use with the high-power M42C anti-tank sniper rifle. Allows for highlighted imaging of surroundings, as well as detection of thermal signatures even from a great distance. Click it to toggle."
Expand Down
Loading