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.

Sign up for GitHub

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

Adds Gun Cases. For guns. #2998

Merged
merged 33 commits into from
Jun 24, 2024
Merged

Adds Gun Cases. For guns. #2998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
f1f4b8e
the beginning
Martinpachu May 17, 2024
fffb4a8
improvements
Martinpachu May 17, 2024
2b67a8e
oops
Martinpachu May 17, 2024
e5f876a
nice move
Martinpachu May 17, 2024
99f9b4f
Merge branch 'master' into guncase
Martinpachu May 17, 2024
c6b73a5
Update code/modules/projectiles/guns/ballistic.dm
Martinpachu May 17, 2024
9185d95
Merge remote-tracking branch 'upstream/master' into guncase
Martinpachu May 17, 2024
36ebbd1
Merge branch 'guncase' of https://github.com/Martinpachu/Shiptest-mar…
Martinpachu May 17, 2024
d62c028
:dog:
Martinpachu May 17, 2024
24591a6
eats all the ammo
Martinpachu May 18, 2024
75201df
puts it in maps
Martinpachu May 18, 2024
d4b5bd3
adds sprites and makes it its own unique type
Martinpachu May 18, 2024
30c9b32
adds to cargo and to ship!
Martinpachu May 18, 2024
7cc1dd7
Merge branch 'master' into guncase
Martinpachu May 18, 2024
7fcaa25
fixes
Martinpachu May 18, 2024
15a3c34
Merge branch 'guncase' of https://github.com/Martinpachu/Shiptest-mar…
Martinpachu May 18, 2024
4fb15e9
more fixes
Martinpachu May 18, 2024
5b03261
Update guncases.dm
Martinpachu May 20, 2024
4e4b88e
fixes illestren
Martinpachu May 20, 2024
afb4095
Update guncases.dm
Martinpachu May 21, 2024
9f4d495
Merge remote-tracking branch 'upstream/master' into guncase
Martinpachu May 21, 2024
8e20caa
Merge remote-tracking branch 'upstream/master' into guncase
Martinpachu Jun 15, 2024
1bd540e
fixes scout
Martinpachu Jun 15, 2024
73c58bc
gives these sprites idont cCARE anym
Martinpachu Jun 15, 2024
2a7319b
newline
Martinpachu Jun 16, 2024
fef3648
fixes tortuga
Martinpachu Jun 16, 2024
cc74cc0
fixes it for real
Martinpachu Jun 16, 2024
9da5b21
fixes some stupid fucking lavaland ruin
Martinpachu Jun 16, 2024
ad54638
Merge remote-tracking branch 'upstream/master' into guncase
Martinpachu Jun 19, 2024
8fcd0f5
Merge branch 'master' into guncase
Martinpachu Jun 19, 2024
d042ac1
Merge remote-tracking branch 'upstream/master' into guncase
Martinpachu Jun 21, 2024
9f52202
.44 roumain update
Martinpachu Jun 21, 2024
fba14f1
removes the speedloaders from the shadow (can't take em)
Martinpachu Jun 21, 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
2 changes: 1 addition & 1 deletion _maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@
/turf/open/floor/wood/walnut,
/area/ruin/beach/treasure_cove)
"sd" = (
/obj/structure/guncase,
/obj/structure/guncloset,
/obj/effect/turf_decal/industrial/warning{
dir = 4;
color = "#808080"
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1364,7 +1364,7 @@
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ruin/jungle/cavecrew/cargo)
"qz" = (
/obj/structure/guncase,
/obj/structure/guncloset,
/obj/effect/turf_decal/industrial/hatch/yellow,
/obj/effect/turf_decal/industrial/warning{
dir = 10
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1157,7 +1157,7 @@
/obj/effect/turf_decal/corner/opaque/red/border{
dir = 5
},
/obj/structure/guncase,
/obj/structure/guncloset,
/obj/item/gun/energy/e_gun,
/turf/open/floor/plasteel/dark,
/area/ruin/lavaland/factory/adminstrative)
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/WasteRuins/wasteplanet_pandora.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@
/turf/open/floor/mineral/titanium/white,
/area/ruin/wasteplanet)
"kV" = (
/obj/structure/guncase,
/obj/structure/guncloset,
/turf/open/floor/mineral/titanium/white,
/area/ruin/wasteplanet)
"kZ" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/independent/independent_dwayne.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2089,7 +2089,7 @@
/obj/effect/turf_decal/corner/opaque/yellow/three_quarters{
dir = 4
},
/obj/structure/guncase/shotgun,
/obj/structure/guncloset/shotgun,
/obj/item/gun/ballistic/shotgun/flamingarrow,
/obj/item/gun/ballistic/shotgun/flamingarrow,
/obj/item/gun/ballistic/shotgun/flamingarrow,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/nanotrasen/nanotrasen_heron.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11533,7 +11533,7 @@
/turf/open/floor/plasteel,
/area/ship/hallway/aft)
"Rs" = (
/obj/structure/guncase,
/obj/structure/guncloset,
/obj/item/gun/ballistic/automatic/pistol/candor/no_mag,
/obj/item/gun/ballistic/automatic/pistol/candor/no_mag,
/turf/open/floor/plasteel/tech,
Expand Down
10 changes: 3 additions & 7 deletions _maps/shuttles/nanotrasen/nanotrasen_ranger.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,15 +184,14 @@
/obj/item/clothing/suit/armor/vest/security,
/obj/item/clothing/mask/gas/sechailer,
/obj/item/gps,
/obj/item/gun/ballistic/automatic/pistol/commander,
/obj/structure/railing{
dir = 4
},
/obj/item/ammo_box/c9mm,
/obj/item/ammo_box/c9mm,
/obj/item/ammo_box/magazine/co9mm,
/obj/item/ammo_box/magazine/co9mm,
/obj/item/storage/belt/security/webbing,
/obj/item/storage/pistolcase/commander,
/turf/open/floor/wood,
/area/ship/security)
"bD" = (
Expand Down Expand Up @@ -3115,9 +3114,6 @@
/area/ship/engineering)
"Ha" = (
/obj/structure/closet/secure_closet/lp/lieutenant,
/obj/item/gun/energy/e_gun{
pixel_y = 1
},
/obj/item/stock_parts/cell/gun,
/obj/item/melee/classic_baton/telescopic,
/obj/item/kitchen/knife/combat/survival,
Expand All @@ -3131,12 +3127,12 @@
pixel_x = 7;
pixel_y = -20
},
/obj/item/gun/ballistic/automatic/pistol/commander,
/obj/item/ammo_box/c9mm,
/obj/item/ammo_box/c9mm,
/obj/item/ammo_box/c9mm/rubbershot,
/obj/item/ammo_box/magazine/co9mm,
/obj/item/ammo_box/magazine/co9mm,
/obj/item/storage/pistolcase/commander,
/obj/item/storage/pistolcase/egun,
/turf/open/floor/wood,
/area/ship/crew/dorm)
"Hd" = (
Expand Down
4 changes: 2 additions & 2 deletions _maps/shuttles/pirate/pirate_tortuga.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,7 @@
/obj/effect/turf_decal/techfloor{
dir = 10
},
/obj/structure/guncase{
/obj/structure/guncloset{
anchored = 1
},
/obj/item/gun/ballistic/automatic/assault/skm/pirate,
Expand Down Expand Up @@ -3140,7 +3140,7 @@
/area/ship/maintenance/port)
"Px" = (
/obj/effect/turf_decal/techfloor,
/obj/structure/guncase{
/obj/structure/guncloset{
anchored = 1
},
/obj/item/gun/ballistic/automatic/pistol/candor,
Expand Down
6 changes: 2 additions & 4 deletions _maps/shuttles/roumain/srm_elder.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1250,7 +1250,7 @@
/turf/open/floor/grass/ship/jungle,
/area/ship/hallway/central)
"ox" = (
/obj/structure/guncase,
/obj/structure/guncloset,
/obj/machinery/door/window/eastright{
dir = 8
},
Expand Down Expand Up @@ -2024,11 +2024,9 @@
/obj/item/gps{
pixel_x = -7
},
/obj/item/gun/ballistic/revolver/montagne,
/obj/item/storage/backpack/satchel/leather,
/obj/item/ammo_box/a44roum_speedloader,
/obj/item/ammo_box/a44roum_speedloader,
/obj/item/ammo_box/a44roum,
/obj/item/storage/pistolcase/montagne,
/obj/item/clothing/accessory/waistcoat/roumain,
/turf/open/floor/wood/mahogany,
/area/ship/bridge)
Expand Down
7 changes: 3 additions & 4 deletions _maps/shuttles/solgov/solgov_chronicle.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,10 +271,9 @@
/obj/item/stamp/solgov,
/obj/item/clothing/suit/armor/solgov_trenchcoat,
/obj/item/spacecash/bundle/loadsamoney,
/obj/item/gun/ballistic/automatic/powered/gauss/modelh,
/obj/item/ammo_box/magazine/modelh,
/obj/item/ammo_box/magazine/modelh,
/obj/item/clothing/neck/cloak/solgovcap,
/obj/item/storage/pistolcase/modelh,
/obj/item/ammo_box/ferroslugbox,
/turf/open/floor/carpet/royalblue,
/area/ship/crew/office)
"cg" = (
Expand Down Expand Up @@ -3730,7 +3729,7 @@
/turf/open/floor/wood/walnut,
/area/ship/crew/crewtwo)
"Ks" = (
/obj/structure/guncase{
/obj/structure/guncloset{
desc = "A locker that holds weapons.";
name = "weapon locker"
},
Expand Down
5 changes: 2 additions & 3 deletions _maps/shuttles/solgov/solgov_inkwell.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5858,10 +5858,9 @@
},
/obj/item/fish_feed,
/obj/item/pen/fountain/solgov,
/obj/item/gun/ballistic/automatic/powered/gauss/modelh,
/obj/item/ammo_box/magazine/modelh,
/obj/item/ammo_box/magazine/modelh,
/obj/item/clothing/neck/cloak/solgovcap,
/obj/item/storage/pistolcase/modelh,
/obj/item/ammo_box/ferroslugbox,
/turf/open/floor/wood/maple,
/area/ship/crew/dorm/dormtwo)
"LJ" = (
Expand Down
5 changes: 2 additions & 3 deletions _maps/shuttles/solgov/solgov_paracelsus.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3580,10 +3580,9 @@
},
/obj/item/fish_feed,
/obj/item/pen/fountain/solgov,
/obj/item/gun/ballistic/automatic/powered/gauss/modelh,
/obj/item/ammo_box/magazine/modelh,
/obj/item/ammo_box/magazine/modelh,
/obj/item/clothing/neck/cloak/solgovcap,
/obj/item/storage/pistolcase/modelh,
/obj/item/ammo_box/ferroslugbox,
/turf/open/floor/carpet/royalblue,
/area/ship/crew)
"IZ" = (
Expand Down
8 changes: 3 additions & 5 deletions _maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,10 @@
/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch,
/obj/item/clothing/head/ngr/peaked,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/gun/ballistic/revolver,
/obj/item/ammo_box/a357/match,
/obj/item/ammo_box/a357/match,
/obj/item/ammo_box/a357/match,
/obj/item/pen/edagger,
/obj/item/storage/pistolcase/a357,
/obj/item/ammo_box/a357_box,
/turf/open/floor/carpet/black,
/area/ship/bridge)
"bJ" = (
Expand Down Expand Up @@ -1655,14 +1654,13 @@
/obj/item/clothing/glasses/welding,
/obj/item/storage/toolbox/syndicate,
/obj/item/wrench/combat,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/gun/ballistic/automatic/pistol,
/obj/item/clothing/accessory/holster,
/obj/item/grenade/chem_grenade/metalfoam,
/obj/machinery/airalarm/directional/west,
/obj/item/clothing/suit/ngr,
/obj/item/clothing/head/hardhat/ngr/foreman,
/obj/item/tank/jetpack/suit,
/obj/item/storage/pistolcase/stechkin,
/turf/open/floor/carpet/red,
/area/ship/cargo/office)
"BB" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2732,7 +2732,7 @@
/obj/effect/turf_decal/industrial/fire{
dir = 8
},
/obj/structure/guncase,
/obj/structure/guncloset,
/obj/structure/railing,
/obj/item/gun/ballistic/automatic/smg/c20r,
/obj/machinery/light/directional/east,
Expand Down
11 changes: 5 additions & 6 deletions _maps/shuttles/syndicate/syndicate_twinkleshine.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
/obj/item/megaphone/sec{
name = "syndicate megaphone"
},
/obj/item/gun/ballistic/automatic/pistol/no_mag,
/obj/item/storage/pistolcase/stechkin,
/obj/item/clothing/head/HoS/beret/syndicate,
/obj/item/radio/headset/syndicate/alt/leader,
/obj/item/clothing/gloves/krav_maga/combatglovesplus,
Expand All @@ -121,6 +121,7 @@
name = "Armory Access";
req_access = list(3,150)
},
/obj/item/ammo_box/c10mm,
/turf/open/floor/mineral/plastitanium,
/area/ship/security)
"aE" = (
Expand Down Expand Up @@ -1792,7 +1793,7 @@
/obj/item/codespeak_manual{
charges = 2
},
/obj/item/gun/ballistic/revolver,
/obj/item/storage/pistolcase/a357,
/obj/item/megaphone/sec{
name = "syndicate megaphone"
},
Expand All @@ -1804,7 +1805,6 @@
/obj/item/clothing/head/HoS/syndicate,
/obj/item/ammo_box/a357,
/obj/item/ammo_box/a357,
/obj/item/ammo_box/a357,
/turf/open/floor/carpet/nanoweave/red,
/area/ship/crew/dorm/dormtwo)
"ky" = (
Expand Down Expand Up @@ -7330,10 +7330,9 @@
/obj/item/radio/headset/syndicate/alt{
keyslot = null
},
/obj/item/gun/ballistic/automatic/powered/gauss/modelh,
/obj/item/storage/belt/sabre/solgov,
/obj/item/ammo_box/magazine/modelh,
/obj/item/ammo_box/magazine/modelh,
/obj/item/storage/pistolcase/modelh,
/obj/item/ammo_box/ferroslugbox,
/turf/open/floor/mineral/plastitanium,
/area/ship/bridge)
"Qv" = (
Expand Down
Loading
Loading