Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
076c167
Draft Time
Avalon-Proto Aug 19, 2026
42df9a8
Update tgstation.dme
Avalon-Proto Aug 20, 2026
23751ea
RAH
Avalon-Proto Aug 21, 2026
abfb97b
Delete cg_projectiles.dm
Avalon-Proto Aug 21, 2026
7d1e377
Update tgstation.dme
Avalon-Proto Aug 21, 2026
60540be
Update tgstation.dme
Avalon-Proto Aug 21, 2026
2c6ae17
Merge remote-tracking branch 'upstream/master' into Ballistic-Balance…
Avalon-Proto Aug 21, 2026
ebed690
RAH
Avalon-Proto Aug 21, 2026
eca5b6e
RAHG
Avalon-Proto Aug 21, 2026
fb7d596
Update gun_store.dm
Avalon-Proto Aug 21, 2026
91a1a1d
Update gun_store.dm
Avalon-Proto Aug 21, 2026
5672ccd
Update guns.dm
Avalon-Proto Aug 21, 2026
90038b1
Fixes + Comments addressed
Avalon-Proto Aug 21, 2026
f601ab0
Update projectiles.dm
Avalon-Proto Aug 21, 2026
3288e36
Update modular_vcg/modules/weapons/code/projectiles.dm
Avalon-Proto Aug 22, 2026
855be95
Update modular_vcg/modules/weapons/code/guns.dm
Avalon-Proto Aug 22, 2026
0268eac
Comment Cleanup
Avalon-Proto Aug 22, 2026
edd6e0d
Merge branch 'Ballistic-Balance-Blowout' of https://github.com/Avalon…
Avalon-Proto Aug 22, 2026
b6bc7e2
Update guns.dm
Avalon-Proto Aug 22, 2026
95df4e7
Merge branch 'master' into Ballistic-Balance-Blowout
Avalon-Proto Aug 23, 2026
fb16c54
Update projectiles.dm
Avalon-Proto Aug 25, 2026
8a6eef3
Rah
Avalon-Proto Aug 29, 2026
3d11ea3
Merge branch 'master' into Ballistic-Balance-Blowout
Avalon-Proto Aug 29, 2026
9256807
Merge remote-tracking branch 'upstream/master' into Ballistic-Balance…
Avalon-Proto Aug 29, 2026
1971e65
Merge branch 'master' into Ballistic-Balance-Blowout
Avalon-Proto Aug 31, 2026
a18add9
Update projectiles.dm
Avalon-Proto Aug 31, 2026
be07414
Merge branch 'Ballistic-Balance-Blowout' of https://github.com/Avalon…
Avalon-Proto Aug 31, 2026
4bb3ee8
Merge branch 'master' into Ballistic-Balance-Blowout
Avalon-Proto Aug 31, 2026
cf61240
Merge branch 'master' into Ballistic-Balance-Blowout
Avalon-Proto Sep 1, 2026
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 modular_darkpack/modules/retail/code/stores/camping_store.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
new /datum/data/vending_product("hunting knife", /obj/item/knife/vamp),
new /datum/data/vending_product("tent stake", /obj/item/vampire_stake),
new /datum/data/vending_product("shovel", /obj/item/shovel/vamp),
new /datum/data/vending_product("hunting rifle magazine, 7.62x51",/obj/item/ammo_box/magazine/darkpack556/hunt), // Crimson Grid Edit - Magazine was originally 5.56
new /datum/data/vending_product("flashlight", /obj/item/flashlight), // CRIMSON EDIT ADD - Shop Inventories Additions
new /datum/data/vending_product("coal", /obj/item/stack/sheet/mineral/coal, 10), // CRIMSON EDIT ADD - Shop Inventories Additions
new /datum/data/vending_product("hunting rifle magazine, 5.56",/obj/item/ammo_box/magazine/darkpack556/hunt),
new /datum/data/vending_product("pepperspray", /obj/item/reagent_containers/spray/pepper),
new /datum/data/vending_product("SNEKTEK Handheld Taser", /obj/item/melee/baton/security/handtaser),
new /datum/data/vending_product("beretta magazine", /obj/item/ammo_box/magazine/semi9mm),
Expand All @@ -21,7 +21,7 @@
new /datum/data/vending_product("rescue fireaxe", /obj/item/fireaxe/vamp),
new /datum/data/vending_product("chainsaw", /obj/item/chainsaw/vamp),
new /datum/data/vending_product("hunting rifle", /obj/item/gun/ballistic/automatic/darkpack/huntrifle),
new /datum/data/vending_product("5.56 ammo", /obj/item/ammo_box/darkpack/c556),
Comment thread
Avalon-Proto marked this conversation as resolved.
new /datum/data/vending_product("7.52x51 ammo", /obj/item/ammo_box/darkpack/c762x51mm, 1000), // Crimson Grid Replacement - Was 5.56 Ammo Box
new /datum/data/vending_product("military parka", /obj/item/clothing/suit/vampire/coat/milparka, 90),
)
product_types = list(
Expand Down
3 changes: 2 additions & 1 deletion modular_darkpack/modules/retail/code/stores/gun_store.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@
new /datum/data/vending_product("9mm ammo", /obj/item/ammo_box/darkpack/c9mm, 600),
new /datum/data/vending_product(".44 ammo", /obj/item/ammo_box/darkpack/c44, 800),
new /datum/data/vending_product("5.56 ammo", /obj/item/ammo_box/darkpack/c556, 2000),
new /datum/data/vending_product("7.52x51 ammo", /obj/item/ammo_box/darkpack/c762x51mm, 1500), // Crimson Grid Additon
new /datum/data/vending_product("shotgun", /obj/item/gun/ballistic/shotgun/vampire, 900),
new /datum/data/vending_product("double barrel shotgun", /obj/item/gun/ballistic/shotgun/vampire/doublebarrel, 1100),
new /datum/data/vending_product("12ga shotgun shells, buckshot", /obj/item/ammo_box/darkpack/c12g/buck, 400),
new /datum/data/vending_product("desert eagle magazine", /obj/item/ammo_box/magazine/m44, 100),
new /datum/data/vending_product("hunting rifle magazine, 5.56", /obj/item/ammo_box/magazine/darkpack556/hunt, 200),
new /datum/data/vending_product("hunting rifle magazine, 7.62x51", /obj/item/ammo_box/magazine/darkpack556/hunt, 200), // Crimson Grid Edit - Was 5.56
new /datum/data/vending_product("9mm pistol magazine, 18 rounds", /obj/item/ammo_box/magazine/semi9mm, 100),
new /datum/data/vending_product("Colt M1911 magazine", /obj/item/ammo_box/magazine/darkpack45acp, 50),
new /datum/data/vending_product("knife", /obj/item/knife/vamp, 100),
Expand Down
6 changes: 6 additions & 0 deletions modular_vcg/modules/weapons/code/guns.dm
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,9 @@

/obj/item/gun/ballistic/automatic/darkpack/autoshotgun
recoil = 4

/obj/item/ammo_box/magazine/darkpack556/hunt
name = "rifle magazine (7.62x51mm)"
caliber = CALIBER_762NATO
ammo_type = /obj/item/ammo_casing/vampire/c762x51mm
max_ammo = 8
155 changes: 140 additions & 15 deletions modular_vcg/modules/weapons/code/projectiles.dm
Original file line number Diff line number Diff line change
@@ -1,29 +1,154 @@
//Sniper
/obj/projectile/bullet/darkpack/vamp50
damage = 50
// Handgun/Compact cartridges

//50 deagle
/obj/projectile/bullet/darkpack/vamp50ae
// 9mm

/obj/projectile/bullet/darkpack/vamp9mm
damage = 30
exposed_wound_bonus = 10

//Autosniper PSG
/obj/projectile/bullet/darkpack/vamp762x51mm
/obj/projectile/bullet/darkpack/vamp9mm/silver
exposed_wound_bonus = 10

/obj/projectile/bullet/darkpack/vamp9mm/plus
damage = 34
armour_penetration = 15

// 4.6mm

/obj/projectile/bullet/darkpack/vamp46mm
damage = 25
armour_penetration = 35
exposed_wound_bonus = -5
wound_bonus = 0

// .45 Auto

/obj/projectile/bullet/darkpack/vamp45acp
damage = 35
armour_penetration = 0

/obj/projectile/bullet/darkpack/vamp45acp/silver
armour_penetration = 0

/obj/projectile/bullet/darkpack/vamp45acp/HP
damage = 50
armour_penetration = -10
exposed_wound_bonus = 5
wound_bonus = 10

// .44 Magnum

/obj/projectile/bullet/darkpack/vamp44
damage = 45
armour_penetration = 25
exposed_wound_bonus = 0
wound_bonus = 10

/obj/projectile/bullet/darkpack/vamp762x51mm/incendiary
damage = 40
/obj/projectile/bullet/darkpack/vamp44/silver
exposed_wound_bonus = -5

// .50 Action Express

/obj/projectile/bullet/darkpack/vamp50ae
damage = 60
armour_penetration = 10
exposed_wound_bonus = 10
wound_bonus = 10
sharpness = SHARP_EDGED

// Rifle cartridges

// 5.56mm

//AR15, AUG, Hunt Rifle
/obj/projectile/bullet/darkpack/vamp556mm
damage = 35
damage = 33
armour_penetration = 33
exposed_wound_bonus = -10
wound_bonus = 5

/obj/projectile/bullet/darkpack/vamp556mm/incendiary
damage = 24
armour_penetration = 15
exposed_wound_bonus = 5
wound_bonus = 10

/obj/projectile/bullet/darkpack/vamp556mm/silver
wound_bonus = 10
Comment thread
Avalon-Proto marked this conversation as resolved.

// 5.45mm

//AK
/obj/projectile/bullet/darkpack/vamp545mm
damage = 30
armour_penetration = 40
exposed_wound_bonus = -10
wound_bonus = 10


// 7.62x51mm

/obj/projectile/bullet/darkpack/vamp762x51mm
armour_penetration = 45
exposed_wound_bonus = -5
wound_bonus = 10

/obj/projectile/bullet/darkpack/vamp762x51mm/silver
exposed_wound_bonus = 0
wound_bonus = 5

/obj/projectile/bullet/darkpack/vamp762x51mm/incendiary
armour_penetration = 15
exposed_wound_bonus = 5
wound_bonus = 10
Comment thread
Avalon-Proto marked this conversation as resolved.

// .50 BMG
/obj/projectile/bullet/darkpack/vamp50
damage = 120
armour_penetration = 95
exposed_wound_bonus = -10
wound_bonus = 20
sharpness = SHARP_EDGED

// Shotgun ammunition

/obj/projectile/bullet/darkpack/dragonsbreath
damage = 10
armour_penetration = 0
exposed_wound_bonus = 5
wound_bonus = 5
var/firestacks = 2

/obj/projectile/bullet/darkpack/shotpellet
damage = 12
armour_penetration = -10

//shotguns - note that this is slug, not buckshot, single-shot
/obj/projectile/bullet/shotgun_slug/vamp
damage = 55
damage = 80
exposed_wound_bonus = 10
sharpness = SHARP_EDGED

/obj/projectile/bullet/shotgun_slug/vamp/silver
exposed_wound_bonus = 5

// Special projectiles

/obj/projectile/bullet/darkpack/rubber
damage = 5
exposed_wound_bonus = 0
wound_bonus = -5
sharpness = NONE

/obj/projectile/bullet/crossbow_bolt
damage = 45
armour_penetration = 75
exposed_wound_bonus = 30
wound_bonus = 30

/obj/projectile/bullet/darkpack/vamp75
damage = 150
armour_penetration = 60
exposed_wound_bonus = 15
wound_bonus = 15
sharpness = SHARP_EDGED
Comment thread
Avalon-Proto marked this conversation as resolved.

/obj/projectile/bullet/darkpack/vamp75/silver
armour_penetration = 50

Loading