Merge branch 'master' into updateelder

shiptest-ss13 · Mar 7, 2024 · 07888fa · 07888fa
2 parents e512c63 + b57eca2
commit 07888fa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm
@@ -134,6 +134,7 @@
 	righthand_file = 'icons/mob/inhands/weapons/64x_guns_right.dmi'
 	icon_state = "ebr"
 	item_state = "ebr"
+	zoomable = TRUE
 	mag_display = TRUE
 	weapon_weight = WEAPON_MEDIUM
 	w_class = WEIGHT_CLASS_BULKY
@@ -153,6 +154,7 @@
 	fire_sound = 'sound/weapons/gun/rifle/shot.ogg'
 	icon_state = "gal"
 	item_state = "gal"
+	zoomable = TRUE
 	mag_display = TRUE
 	weapon_weight = WEAPON_MEDIUM
 	w_class = WEIGHT_CLASS_BULKY

diff --git a/html/changelogs/AutoChangeLog-pr-2810.yml b/html/changelogs/AutoChangeLog-pr-2810.yml
@@ -0,0 +1,4 @@
+author: Martinpachu
+changes:
+  - {rscadd: 'The SSG-04, GAL and EBR can now use their scopes!'}
+delete-after: true