Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Return of the M37 #443

Merged
merged 35 commits into from
Sep 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
0ac9b91
Da Revolva
Mar 27, 2024
b1f8fc5
Oopsiedaisies
Mar 27, 2024
2803a43
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Mar 30, 2024
e747764
Revert "Oopsiedaisies"
Mar 30, 2024
c3cee8a
Auto stash before revert of "Oopsiedaisies"
Mar 30, 2024
6c995e9
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Mar 31, 2024
763913d
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Apr 3, 2024
0fae340
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Apr 5, 2024
49133af
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Apr 7, 2024
4e9b759
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Apr 8, 2024
807e1ae
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Apr 10, 2024
2aa51ac
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Apr 23, 2024
47fb185
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
May 21, 2024
cd11ccc
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Aug 15, 2024
939b7fa
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Aug 22, 2024
5256522
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Aug 23, 2024
e3d4a54
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Aug 25, 2024
0f33748
Fix
Aug 25, 2024
a54119c
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Aug 25, 2024
619ba83
Merge branches 'master' and 'master' of https://github.com/PvE-CMSS13…
Aug 25, 2024
64c3fa7
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Aug 27, 2024
b198276
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Aug 27, 2024
ff918c9
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Aug 28, 2024
5b47911
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Aug 29, 2024
36a9f84
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Sep 1, 2024
f784dab
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Sep 4, 2024
21dcde7
Merge remote-tracking branch 'PvE-CMSS13/master'
Sep 5, 2024
78a8b12
Merge remote-tracking branch 'PvE-CMSS13/master'
Sep 9, 2024
d33e1f1
Stuff
Sep 9, 2024
c70fe63
Other stuff
Sep 9, 2024
ffc3dfd
Lol Lmao
Sep 9, 2024
d88ecf4
Merge branch 'master' into boxfix
Max-023 Sep 14, 2024
d9e3808
Update golden_arrow.dmm
Max-023 Sep 15, 2024
39c2ac2
Fixes
Sep 15, 2024
c1f1279
Update golden_arrow.dmm
Max-023 Sep 15, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions code/modules/cm_marines/equipment/guncases.dm
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,9 @@
new /obj/item/weapon/gun/shotgun/pump(src)
new /obj/item/ammo_magazine/shotgun/buckshot(src)
new /obj/item/ammo_magazine/shotgun/slugs(src)
new /obj/item/storage/pouch/shotgun(src)
new /obj/item/storage/large_holster/m37(src)
new /obj/item/attachable/stock/shotgun(src)


/obj/item/storage/box/guncase/shotgunpump/special
Expand Down
5 changes: 4 additions & 1 deletion maps/map_files/golden_arrow/golden_arrow.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -6576,8 +6576,9 @@
},
/obj/structure/surface/table/almayer,
/obj/item/weapon/gun/rifle/m4ra/pve{
pixel_y = 8
pixel_y = 9
},
/obj/item/storage/box/guncase/shotgunpump,
/turf/open/floor/almayer/plate,
/area/golden_arrow/platoonprep)
"awN" = (
Expand Down Expand Up @@ -15970,6 +15971,8 @@
/obj/structure/machinery/light/double/blue{
light_color = "#dae2ff"
},
/obj/structure/surface/table/almayer,
/obj/item/tool/crowbar,
/turf/open/floor/almayer,
/area/golden_arrow/platoonarmory)
"hbu" = (
Expand Down
Loading