Merge branch 'master' into upstream-merge-8298

This commit is contained in:
Novacat
2022-03-22 08:53:45 -04:00
committed by GitHub
218 changed files with 4106 additions and 853 deletions
@@ -18,4 +18,9 @@
name = "spyglass"
desc = "It's a hand-held telescope, useful for star-gazing, peeping, and recon."
icon_state = "spyglass"
slot_flags = SLOT_BELT
slot_flags = SLOT_BELT
/obj/item/device/binoculars/scope
name = "rifle scope"
desc = "It's a rifle scope. Would be better if it were actually attached to a rifle."
icon_state = "rifle_scope"