cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 21:18:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-sync

Browse Source
This commit is contained in:
xPokee
2025-10-03 07:05:54 -04:00
parent d9c4fe21be 7ee1cd7c06
commit 5e629dff04
517 changed files with 24339 additions and 21253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/ballistic/rifle.dm
+4 -1
View File
@@ -77,7 +77,7 @@
SET_BASE_PIXEL(-8, 0)
/obj/item/gun/ballistic/rifle/boltaction/add_bayonet_point()
AddComponent(/datum/component/bayonet_attachable, offset_x = 32, offset_y = 12)
AddComponent(/datum/component/bayonet_attachable, offset_x = 41, offset_y = 14, bayonet_overlay = "bayonet_thin")
/obj/item/gun/ballistic/rifle/boltaction/sawoff(mob/user)
. = ..()
@@ -142,6 +142,9 @@
accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction/surplus
can_jam = TRUE
/obj/item/gun/ballistic/rifle/boltaction/surplus/add_bayonet_point()
AddComponent(/datum/component/bayonet_attachable, offset_x = 41, offset_y = 14, bayonet_overlay = "bayonet_thin_surplus")
/obj/item/gun/ballistic/rifle/boltaction/prime
name = "\improper Sakhno-Zhihao Sporting Rifle"
desc = "An upgrade and modernisation of the original Sakhno rifle, made with such wonders as \
code/modules/projectiles/guns/energy/laser.dm
+3
View File
@@ -60,6 +60,9 @@
spread = 14
pin = /obj/item/firing_pin/implant/pindicate
/obj/item/gun/energy/laser/carbine/cybersun/unrestricted
pin = /obj/item/firing_pin
/obj/item/gun/energy/laser/carbine/practice
name = "practice laser carbine"
desc = "A modified version of the laser carbine, this one fires even less concentrated energy bolts designed for target practice."