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

Jump to bottom

Guncrate fixes #3158

Merged
merged 1 commit into from
Jul 14, 2024
Merged

Guncrate fixes #3158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions code/game/objects/items/storage/guncases.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

/obj/item/storage/guncase/beacon
/obj/item/storage/guncase/beacon/PopulateContents()
new /obj/item/gun/ballistic/shotgun/doublebarrel/beacon(src)
new /obj/item/gun/ballistic/shotgun/doublebarrel/beacon/no_mag(src)

/obj/item/storage/guncase/scout
/obj/item/storage/guncase/scout/PopulateContents()
Expand Down Expand Up @@ -79,7 +79,7 @@

/obj/item/storage/guncase/wt550
/obj/item/storage/guncase/wt550/PopulateContents()
new /obj/item/gun/ballistic/automatic/smg/wt550(src)
new /obj/item/gun/ballistic/automatic/smg/wt550/no_mag(src)
new /obj/item/ammo_box/magazine/wt550m9/empty(src)
new /obj/item/ammo_box/magazine/wt550m9/empty(src)

Expand Down
6 changes: 3 additions & 3 deletions code/modules/cargo/packs/gun.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,14 +120,14 @@
name = "Hellfire Shotgun Crate"
desc = "For when you need to deal with 8 hooligans. Contains a pump shotgun, with a 8-round capacity."
cost = 2000
contains = list(/obj/item/gun/ballistic/shotgun/hellfire)
contains = list(/obj/item/storage/guncase/hellfire)
crate_name = "shotgun crate"

/datum/supply_pack/gun/brimstone_shotgun
name = "Brimstone Shotgun Crate"
desc = "For when you need to deal with 5 hooligans, and QUICKLY. Contains a slamfire shotgun, with a 5-round capacity. Warranty voided if sawed off."
cost = 2000
contains = list(/obj/item/gun/ballistic/shotgun/brimstone)
contains = list(/obj/item/storage/guncase/brimstone)
crate_name = "shotgun crate"

/*
Expand Down Expand Up @@ -159,7 +159,7 @@
name = "Scout Sniper Rifle Crate"
desc = "Contains a traditional scoped rifle to hunt wildlife and big game from a respectful distance. Chambered in powerful .300 Magnum."
cost = 5500
contains = list(/obj/item/gun/ballistic/rifle/scout)
contains = list(/obj/item/storage/guncase/scout)
crate_name = "rifle crate"

/datum/supply_pack/gun/cobra20
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/boxes_magazines/external/rifle.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
multiple_sprites = AMMO_BOX_FULL_EMPTY

/obj/item/ammo_box/magazine/skm_762_40/empty
start_empty = FALSE
start_empty = TRUE

/obj/item/ammo_box/magazine/skm_762_40/extended
name = "extended assault rifle magazine (7.62x40mm CLIP)"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/guns/ballistic/shotgun.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -755,7 +755,7 @@ EMPTY_GUN_HELPER(shotgun/bulldog/inteq)
recoil = 2
recoil_unwielded = 4

/obj/item/gun/ballistic/shotgun/doublebarrel/beacon
/obj/item/gun/ballistic/shotgun/doublebarrel/beacon/no_mag
spawnwithmagazine = FALSE

/obj/item/gun/ballistic/shotgun/doublebarrel/beacon/factory
Expand Down
4 changes: 2 additions & 2 deletions code/modules/projectiles/guns/energy.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@
cell = new cell_type(src)
else
cell = new(src)
if(!dead_cell)
cell.give(cell.maxcharge)
if(dead_cell)
cell.use(cell.maxcharge)
update_ammo_types()
recharge_newshot(TRUE)
if(selfcharge)
Expand Down
Loading