Skip to content

Commit

Permalink
conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Sadhorizon committed Jun 24, 2024
1 parent e389729 commit 4fe7d0f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion _maps/shuttles/independent/independent_dwayne.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3071,7 +3071,7 @@
/obj/item/gun/ballistic/shotgun/flamingarrow,
/obj/item/gun/ballistic/shotgun/flamingarrow,
/obj/item/gun/ballistic/shotgun/flamingarrow,
/obj/structure/guncase/shotgun{
/obj/structure/guncloset/shotgun{
name = "rifle locker"
},
/turf/open/floor/plasteel/patterned/grid,
Expand Down

0 comments on commit 4fe7d0f

Please sign in to comment.