Skip to content

Commit

Permalink
Merge pull request #1013 from Overteh/Cringus31
Browse files Browse the repository at this point in the history
projectile gun fix
  • Loading branch information
molnizz authored Oct 1, 2024
2 parents c200354 + 6f352f1 commit 1cf0176
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@
/turf/open/floor/plastic,
/area/ruin/powered)
"Lm" = (
/obj/item/gun/ballistic/automatic/pistol,
/obj/item/gun/ballistic/automatic/pistol/ringneck,
/obj/effect/decal/cleanable/blood/tracks{
dir = 5
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
},
/area/overmap_encounter/planetoid/cave/explored)
"dX" = (
/obj/item/gun/ballistic/automatic/pistol{
/obj/item/gun/ballistic/automatic/pistol/ringneck{
spawnwithmagazine = 0
},
/turf/open/floor/plating/asteroid/whitesands,
Expand Down
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/shuttles/syndicate/syndicate_aegis.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4699,7 +4699,7 @@
/area/ship/crew/hydroponics)
"Us" = (
/obj/machinery/light/directional/south,
/obj/item/gun/ballistic/automatic/pistol,
/obj/item/gun/ballistic/automatic/pistol/ringneck,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/obj/item/melee/knife/survival,
Expand Down

0 comments on commit 1cf0176

Please sign in to comment.