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

grand modded ammo&guns fix #1363

Open
wants to merge 1 commit into
base: beta-dev
Choose a base branch
from
Open

grand modded ammo&guns fix #1363

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
37 changes: 19 additions & 18 deletions code/modules/cargo/packs/ammo.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,24 +375,25 @@

/* .308 */

/datum/supply_pack/ammo/a308_ammo_box
name = "308 Ammo Box Crate"
desc = "Contains a thirty-round .308 box for DMRs such as the SsG-04 and CM-GAL-S."
contains = list(/obj/item/storage/box/ammo/a308)
cost = 500

/datum/supply_pack/ammo/a308_ap
name = "308 Armour Piercing Ammo Box Crate"
desc = "Contains a thirty-round .308 armour piercing box for DMRs such as the SsG-04 and CM-GAL-S."
contains = list(/obj/item/storage/box/ammo/a308/ap)
cost = 500

/datum/supply_pack/ammo/a308_hp
name = "308 Hollow Point Ammo Box Crate"
desc = "Contains a thirty-round .308 hollow point box for DMRs such as the SsG-04 and CM-GAL-S."
contains = list(/obj/item/storage/box/ammo/a308/hp)
cost = 500

// [CELADON-DELETE] - cargo ammo fix
///datum/supply_pack/ammo/a308_ammo_box
//name = "308 Ammo Box Crate"
//desc = "Contains a thirty-round .308 box for DMRs such as the SsG-04 and CM-GAL-S."
//contains = list(/obj/item/storage/box/ammo/a308)
//cost = 500

///datum/supply_pack/ammo/a308_ap
//name = "308 Armour Piercing Ammo Box Crate"
//desc = "Contains a thirty-round .308 armour piercing box for DMRs such as the SsG-04 and CM-GAL-S."
//contains = list(/obj/item/storage/box/ammo/a308/ap)
//cost = 500

///datum/supply_pack/ammo/a308_hp
//name = "308 Hollow Point Ammo Box Crate"
//desc = "Contains a thirty-round .308 hollow point box for DMRs such as the SsG-04 and CM-GAL-S."
//contains = list(/obj/item/storage/box/ammo/a308/hp)
//cost = 500
// [/CELADON-DELETE] - cargo ammo fix
/* 6.5 */

/datum/supply_pack/ammo/a65clip_box
Expand Down
2 changes: 1 addition & 1 deletion code/modules/cargo/packs/magazines.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
contains = list(/obj/item/ammo_box/c38)
cost = 250
faction_discount = 20
faction = /datum/faction/srm
faction = /datum/faction/srm

/datum/supply_pack/magazine/c38match
name = ".38 Match Grade Speedloader"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/ammunition/ballistic/sniper.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
name = ".300 Magnum Trac bullet casing"
desc = "A .300 Magnum Tracker casing."
projectile_type = /obj/projectile/bullet/a300/trac
bullet_skin = "trac"
//[CELADON-DELETE] - iconstate fix

//6.5 CLIP

Expand Down
1 change: 0 additions & 1 deletion mod_celadon/outpost_console/_outpost_console.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

#include "_outpost_console.dm"

#include "code/supply_pack/independent/ammunition.dm"
#include "code/supply_pack/independent/civilian.dm"
#include "code/supply_pack/independent/costumes_toys.dm"
#include "code/supply_pack/independent/food.dm"
Expand Down
34 changes: 0 additions & 34 deletions mod_celadon/outpost_console/code/supply_pack/independent/ammunition.dm
View file
Open in desktop

This file was deleted.

14 changes: 7 additions & 7 deletions mod_celadon/outpost_console/code/supply_pack/independent/gun.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,13 +173,13 @@
cost = 3000
contains = list(/obj/item/storage/guncase/cobra)
crate_name = "SMG crate"
/datum/supply_pack/faction/independent/gun/skm
name = "SKM-24 Rifle Crate"
desc = "Contains a high-powered, automatic rifle chambered in 7.62x40mm CLIP."
cost = 5000
contains = list(/obj/item/storage/guncase/skm)
crate_name = "auto rifle crate"

///datum/supply_pack/faction/independent/gun/skm
//name = "SKM-24 Rifle Crate"
//desc = "Contains a high-powered, automatic rifle chambered in 7.62x40mm CLIP."
//cost = 5000
//contains = list(/obj/item/storage/guncase/skm)
//crate_name = "auto rifle crate"
//Оффы такой же ящик в игру ввели лол
/datum/supply_pack/faction/independent/gun/attachment/rail_light
name = "Tactical Rail Light Crate"
desc = "Contains a single rail light to be mounted on a firearm."
Expand Down
Loading
Loading