From 076c1679c276418d944d18ab25fcd62fc24a4824 Mon Sep 17 00:00:00 2001 From: Avalon Date: Wed, 19 Aug 2026 18:57:12 -0400 Subject: [PATCH 01/20] Draft Time --- .../modules/weapons/code/cg_projectiles.dm | 54 +++++++ .../modules/weapons/code/projectiles.dm | 140 +++++++++--------- tgstation.dme | 2 + 3 files changed, 126 insertions(+), 70 deletions(-) create mode 100644 modular_darkpack/modules/weapons/code/cg_projectiles.dm diff --git a/modular_darkpack/modules/weapons/code/cg_projectiles.dm b/modular_darkpack/modules/weapons/code/cg_projectiles.dm new file mode 100644 index 000000000000..7576fa6e0b23 --- /dev/null +++ b/modular_darkpack/modules/weapons/code/cg_projectiles.dm @@ -0,0 +1,54 @@ +////----BULLET DAMAGE DEFINES---///// + +#define CG_RUBBERBULLET_DAMAGE 5 + +#define CG_9MM_DAMAGE 30 +#define CG_9MM_HV_DAMAGE 35 + +#define CG_45ACP_DAMAGE 35 +#define CG_45ACP_HP_DAMAGE 40 + +#define CG_44MAG_DAMAGE 50 + +#define CG_50AE_DAMAGE 70 + +#define CG_50BMG_DAMAGE 120 + +#define CG_556CAL_DAMAGE 30 +#define CG_556CAL_INCENDIARY_DAMAGE 32 + +#define CG_545CAL_DAMAGE 30 + +#define CG_46CAL_DAMAGE 25 + +#define CG_12G_SLUG_DAMAGE 80 +#define CG_12G_INCAP_DAMAGE 15 +#define CG_12G_PELLET_DAMAGE 9 +#define CG_12G_DRAGONSBREATH_DAMAGE 6 + +#define CG_BOLT_DAMAGE 45 + +#define CG_762CAL_DAMAGE 55 +#define CG_762CAL_INCENDIARY_DAMAGE 50 + +#define CG_75CAL_DAMAGE 150 + +/////---WOUNDING BONUSES---///// + +#define CG_WOUND_MALUS -5 +#define CG_LOWCAL_BONUS 0 +#define CG_MEDCAL_BONUS 10 +#define CG_HICAL_BONUS 20 +#define CG_SHOTGUN_BONUS 5 // Per Pellet after all +#define CG_XTRM_WOUND_BONUS 30 + +////---ARMOR PIERCE---//// + +#define CG_NO_AP 0 +#define CG_LOW_AP 5 +#define CG_MED_AP 15 +#define CG_HIGH_AP 25 +#define CG_XTRM_AP 50 + + + diff --git a/modular_darkpack/modules/weapons/code/projectiles.dm b/modular_darkpack/modules/weapons/code/projectiles.dm index 00a251bee286..90ee736571b0 100644 --- a/modular_darkpack/modules/weapons/code/projectiles.dm +++ b/modular_darkpack/modules/weapons/code/projectiles.dm @@ -1,16 +1,17 @@ /obj/projectile/bullet/darkpack abstract_type = /obj/projectile/bullet/darkpack + hitscan = TRUE // Crimson Grid Addition // 9x19mm Parabellum /obj/projectile/bullet/darkpack/vamp9mm name = "9mm bullet" - damage = 18 - exposed_wound_bonus = 10 + damage = CG_9MM_DAMAGE // Crimson Grid Edit - Was 18 + exposed_wound_bonus = CG_MEDCAL_BONUS // Crimson Grid Edit - Was 10 /obj/projectile/bullet/darkpack/vamp9mm/plus name = "9mm HV bullet" - damage = 22 - armour_penetration = 10 + damage = CG_9MM_HV_DAMAGE // Crimson Grid Edit - Was 22 + armour_penetration = CG_LOW_AP // Crimson Grid Edit - Was 10 /obj/projectile/bullet/darkpack/vamp9mm/silver name = "9mm silver bullet" @@ -22,15 +23,14 @@ // .45 ACP /obj/projectile/bullet/darkpack/vamp45acp name = ".45 ACP bullet" - damage = 20 - armour_penetration = 5 + damage = CG_45ACP_DAMAGE // Crimson Grid Edit - Was 20 + armour_penetration = CG_LOW_AP // Crimson Grid Edit - Was 5 /obj/projectile/bullet/darkpack/vamp45acp/HP name = ".45 ACP hollow point bullet" - damage = 25 - armour_penetration = 0 - wound_bonus = 5 - wound_bonus = 5 + damage = CG_45ACP_HP_DAMAGE // Crimson Grid Edit - Was 25 + armour_penetration = CG_NO_AP // Crimson Grid Edit - Was 0 + wound_bonus = CG_SHOTGUN_BONUS // Crimson Grid Edit - Was 5 /obj/projectile/bullet/darkpack/vamp45acp/silver name = ".45 ACP silver bullet" @@ -42,10 +42,10 @@ // .44 Magnum /obj/projectile/bullet/darkpack/vamp44 name = ".44 bullet" - damage = 35 - armour_penetration = 15 - exposed_wound_bonus = -5 - wound_bonus = 10 + damage = CG_44MAG_DAMAGE // Crimson Grid Edit - Was 35 + armour_penetration = CG_MED_AP // Crimson Grid Edit - Was 15 + exposed_wound_bonus = CG_WOUND_MALUS // Crimson Grid Edit - Was -5 + wound_bonus = CG_MEDCAL_BONUS // Crimson Grid Edit - Was 10 /obj/projectile/bullet/darkpack/vamp44/silver name = ".44 silver bullet" @@ -58,29 +58,29 @@ // .50 BMG/AE /obj/projectile/bullet/darkpack/vamp50 name = ".50 BMG bullet" - damage = 70 - armour_penetration = 20 - exposed_wound_bonus = 5 - wound_bonus = 5 + damage = CG_50BMG_DAMAGE // Crimson Grid Edit - Was 70 + armour_penetration = CG_MED_AP // Crimson Grid Edit - Was 20 + exposed_wound_bonus = CG_SHOTGUN_BONUS // Crimson Grid Edit - Was 5 + wound_bonus = CG_SHOTGUN_BONUS // Crimson Grid Edit - Was 5 /obj/projectile/bullet/darkpack/vamp50ae name = ".50 AE bullet" - damage = 40 - armour_penetration = 20 - exposed_wound_bonus = 5 - wound_bonus = 5 + damage = CG_50AE_DAMAGE // Crimson Grid Edit - Was 40 + armour_penetration = CG_MED_AP // Crimson Grid Edit - Was 20 + exposed_wound_bonus = CG_SHOTGUN_BONUS // Crimson Grid Edit - Was 5 + wound_bonus = CG_SHOTGUN_BONUS // Crimson Grid Edit - Was 5 // 5.56mm NATO /obj/projectile/bullet/darkpack/vamp556mm name = "5.56mm bullet" - damage = 45 - armour_penetration = 25 - exposed_wound_bonus = -5 - wound_bonus = 5 + damage = CG_556CAL_DAMAGE // Crimson Grid Edit - Was 45 + armour_penetration = CG_HIGH_AP // Crimson Grid Edit - Was 25 + exposed_wound_bonus = CG_WOUND_MALUS // Crimson Grid Edit - Was -5 + wound_bonus = CG_SHOTGUN_BONUS // Crimson Grid Edit - Was 5 /obj/projectile/bullet/darkpack/vamp556mm/incendiary - armour_penetration = 0 - damage = 30 + armour_penetration = CG_NO_AP // Crimson Grid Edit - Was 0 + damage = CG_556CAL_INCENDIARY_DAMAGE // Crimson Grid Edit - Was 30 var/fire_stacks = 4 /obj/projectile/bullet/darkpack/vamp556mm/incendiary/on_hit(atom/target, blocked = 0, pierce_hit) @@ -92,7 +92,7 @@ /obj/projectile/bullet/darkpack/vamp556mm/silver name = "5.56mm silver bullet" - armour_penetration = 20 + armour_penetration = CG_MED_AP // Crimson Grid Edit - Was 20 /obj/projectile/bullet/darkpack/vamp556mm/silver/on_hit(atom/target, blocked = 0, pierce_hit) . = ..() @@ -101,26 +101,26 @@ // 5.45x39mm /obj/projectile/bullet/darkpack/vamp545mm name = "5.45mm bullet" - damage = 40 - armour_penetration = 30 - exposed_wound_bonus = -5 - wound_bonus = 5 + damage = CG_545CAL_DAMAGE // Crimson Grid Edit - Was 40 + armour_penetration = CG_HIGH_AP // Crimson Grid Edit - Was 30 + exposed_wound_bonus = CG_WOUND_MALUS // Crimson Grid Edit - Was -5 + wound_bonus = CG_SHOTGUN_BONUS // Crimson Grid Edit - Was 5 // 4.6mm HK /obj/projectile/bullet/darkpack/vamp46mm name = "4.6mm bullet" - damage = 19 - armour_penetration = 30 - exposed_wound_bonus = 0 - wound_bonus = 0 + damage = CG_46CAL_DAMAGE // Crimson Grid Edit - Was 19 + armour_penetration = CG_HIGH_AP // Crimson Grid Edit - Was 30 + exposed_wound_bonus = CG_LOWCAL_BONUS // Crimson Grid Edit - Was 0 + wound_bonus = CG_LOWCAL_BONUS // Crimson Grid Edit - Was 0 // 12 Gauge /obj/projectile/bullet/shotgun_slug/vamp name = "12g shotgun slug" - damage = 70 - armour_penetration = 15 - exposed_wound_bonus = 5 - wound_bonus = 10 + damage = CG_12G_SLUG_DAMAGE // Crimson Grid Edit - Was 70 + armour_penetration = CG_MED_AP // Crimson Grid Edit - Was 15 + exposed_wound_bonus = CG_SHOTGUN_BONUS // Crimson Grid Edit - Was 5 + wound_bonus = CG_MEDCAL_BONUS // Crimson Grid Edit - Was 10 /obj/projectile/bullet/shotgun_slug/vamp/on_hit(atom/target, blocked = 0, pierce_hit) . = ..() @@ -135,7 +135,7 @@ /obj/projectile/bullet/shotgun_slug/vamp/silver name = "12g silver shotgun slug" - armour_penetration = 10 + armour_penetration = CG_LOW_AP // Crimson Grid Edit - Was 10 /obj/projectile/bullet/shotgun_slug/vamp/silver/on_hit(atom/target, blocked = 0, pierce_hit) . = ..() @@ -143,23 +143,23 @@ /obj/projectile/bullet/darkpack/rubber name = "12g shotgun rubber shot" - damage = 5 + damage = CG_RUBBERBULLET_DAMAGE // Crimson Grid Edit - Was 5 stamina = 50 - exposed_wound_bonus = 5 - wound_bonus = -5 + exposed_wound_bonus = CG_SHOTGUN_BONUS // Crimson Grid Edit - Was 5 + wound_bonus = CG_WOUND_MALUS // Crimson Grid Edit - Was -5 /obj/projectile/bullet/darkpack/incap name = "12g shotgun incapacitation shot" - damage = 15 + damage = CG_12G_INCAP_DAMAGE // Crimson Grid Edit - Was 15 stamina = 80 /obj/projectile/bullet/darkpack/shotpellet name = "12g shotgun pellet" - damage = 9 + damage = CG_12G_PELLET_DAMAGE // Crimson Grid Edit - Was 9 range = 22 //range of where you can see + one screen after - armour_penetration = 10 - exposed_wound_bonus = 10 - wound_bonus = -5 + armour_penetration = CG_LOW_AP // Crimson Grid Edit - Was 10 + exposed_wound_bonus = CG_MEDCAL_BONUS // Crimson Grid Edit - Was 10 + wound_bonus = CG_WOUND_MALUS // Crimson Grid Edit - Was -5 /obj/projectile/bullet/darkpack/shotpellet/on_hit(atom/target, blocked = 0, pierce_hit) . = ..() @@ -169,12 +169,12 @@ /obj/projectile/bullet/darkpack/dragonsbreath name = "12g shotgun incendiary pellet" - damage = 6 + damage = CG_12G_DRAGONSBREATH_DAMAGE // Crimson Grid Edit - Was 6 damage_type = BURN range = 22 //range of where you can see + one screen after - armour_penetration = 0 - exposed_wound_bonus = 0 - wound_bonus = 0 + armour_penetration = CG_NO_AP // Crimson Grid Edit - Was 0 + exposed_wound_bonus = CG_LOWCAL_BONUS // Crimson Grid Edit - Was 0 + wound_bonus = CG_LOWCAL_BONUS // Crimson Grid Edit - Was 0 var/fire_stacks = 1 // 1 stack per pellet but we have 9 pellets so it adds up /obj/projectile/bullet/darkpack/dragonsbreath/on_hit(atom/target, blocked = 0, pierce_hit) @@ -188,10 +188,10 @@ // Crossbow Bolt /obj/projectile/bullet/crossbow_bolt name = "bolt" - damage = 45 - armour_penetration = 75 - exposed_wound_bonus = 30 - wound_bonus = 30 //We're gonna make this hurt as much as possible. + damage = CG_BOLT_DAMAGE // Crimson Grid Edit - Was 45 + armour_penetration = CG_XTRM_AP // Crimson Grid Edit - Was 75 + exposed_wound_bonus = CG_XTRM_WOUND_BONUS // Crimson Grid Edit - Was 30 + wound_bonus = CG_XTRM_WOUND_BONUS // Crimson Grid Edit - Was 30 sharpness = SHARP_POINTY embed_type = /datum/embedding/crossbolt //YEEEEOUCH!!!! @@ -208,14 +208,14 @@ // 7.62x51mm NATO /obj/projectile/bullet/darkpack/vamp762x51mm name = "7.62x51mm bullet" - damage = 55 - armour_penetration = 25 - exposed_wound_bonus = -5 - wound_bonus = 5 + damage = CG_762CAL_DAMAGE // Crimson Grid Edit - Was 55 + armour_penetration = CG_HIGH_AP // Crimson Grid Edit - Was 25 + exposed_wound_bonus = CG_WOUND_MALUS // Crimson Grid Edit - Was -5 + wound_bonus = CG_SHOTGUN_BONUS // Crimson Grid Edit - Was 5 /obj/projectile/bullet/darkpack/vamp762x51mm/incendiary - armour_penetration = 5 //Big ass bullet - damage = 50 + armour_penetration = CG_LOW_AP // Crimson Grid Edit - Was 5 + damage = CG_762CAL_INCENDIARY_DAMAGE // Crimson Grid Edit - Was 50 var/fire_stacks = 3 //This one comes in Semi-automatics /obj/projectile/bullet/darkpack/vamp762x51mm/incendiary/on_hit(atom/target, blocked = FALSE, pierce_hit) @@ -227,7 +227,7 @@ /obj/projectile/bullet/darkpack/vamp762x51mm/silver name = "7.62x51mm silver bullet" - armour_penetration = 20 + armour_penetration = CG_MED_AP // Crimson Grid Edit - Was 20 /obj/projectile/bullet/darkpack/vamp762x51mm/silver/on_hit(atom/target, blocked = FALSE, pierce_hit) . = ..() @@ -235,14 +235,14 @@ /obj/projectile/bullet/darkpack/vamp75 name = ".75 ball" - damage = 100 - armour_penetration = 5 - exposed_wound_bonus = 5 - wound_bonus = 5 + damage = CG_75CAL_DAMAGE // Crimson Grid Edit - Was 100 + armour_penetration = CG_LOW_AP // Crimson Grid Edit - Was 5 + exposed_wound_bonus = CG_SHOTGUN_BONUS // Crimson Grid Edit - Was 5 + wound_bonus = CG_SHOTGUN_BONUS // Crimson Grid Edit - Was 5 /obj/projectile/bullet/darkpack/vamp75/silver name = ".75 silver ball" - armour_penetration = 0 + armour_penetration = CG_NO_AP // Crimson Grid Edit - Was 0 /obj/projectile/bullet/darkpack/vamp75/silver/on_hit(atom/target, blocked = FALSE, pierce_hit) . = ..() diff --git a/tgstation.dme b/tgstation.dme index e2218384c089..758a15b13d84 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -8199,6 +8199,8 @@ #include "modular_darkpack\modules\weapons\code\ammo_boxes.dm" #include "modular_darkpack\modules\weapons\code\ammo_casings.dm" #include "modular_darkpack\modules\weapons\code\ammostack.dm" +#include "modular_darkpack\modules\weapons\code\cg_projectiles.dm" +#include "modular_darkpack\modules\weapons\code\cg_projectiles.dm" #include "modular_darkpack\modules\weapons\code\crafting_recipes.dm" #include "modular_darkpack\modules\weapons\code\flamethrower.dm" #include "modular_darkpack\modules\weapons\code\guns.dm" From 42df9a8c770eefcbeb6b6be977c4d9844f006a57 Mon Sep 17 00:00:00 2001 From: Avalon Date: Thu, 20 Aug 2026 17:07:12 -0400 Subject: [PATCH 02/20] Update tgstation.dme --- tgstation.dme | 1 - 1 file changed, 1 deletion(-) diff --git a/tgstation.dme b/tgstation.dme index 758a15b13d84..c32d5dd168ab 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -8200,7 +8200,6 @@ #include "modular_darkpack\modules\weapons\code\ammo_casings.dm" #include "modular_darkpack\modules\weapons\code\ammostack.dm" #include "modular_darkpack\modules\weapons\code\cg_projectiles.dm" -#include "modular_darkpack\modules\weapons\code\cg_projectiles.dm" #include "modular_darkpack\modules\weapons\code\crafting_recipes.dm" #include "modular_darkpack\modules\weapons\code\flamethrower.dm" #include "modular_darkpack\modules\weapons\code\guns.dm" From 23751ea54f91abd12234a92eeb76b4153958c56c Mon Sep 17 00:00:00 2001 From: Avalon Date: Thu, 20 Aug 2026 21:52:57 -0400 Subject: [PATCH 03/20] RAH --- .../~~crimson_defines}/cg_projectiles.dm | 26 +-- .../modules/weapons/code/projectiles.dm | 140 ++++++++-------- modular_vcg/modules/weapons/code/guns.dm | 14 ++ .../modules/weapons/code/projectiles.dm | 153 ++++++++++++++++-- tgstation.dme | 1 + 5 files changed, 239 insertions(+), 95 deletions(-) rename {modular_darkpack/modules/weapons/code => code/__DEFINES/~~crimson_defines}/cg_projectiles.dm (87%) diff --git a/modular_darkpack/modules/weapons/code/cg_projectiles.dm b/code/__DEFINES/~~crimson_defines/cg_projectiles.dm similarity index 87% rename from modular_darkpack/modules/weapons/code/cg_projectiles.dm rename to code/__DEFINES/~~crimson_defines/cg_projectiles.dm index 7576fa6e0b23..5bae95c17210 100644 --- a/modular_darkpack/modules/weapons/code/cg_projectiles.dm +++ b/code/__DEFINES/~~crimson_defines/cg_projectiles.dm @@ -1,7 +1,11 @@ -////----BULLET DAMAGE DEFINES---///// +////----GENERIC BULLET---///// #define CG_RUBBERBULLET_DAMAGE 5 +///---HANDGUN AMMO---/// + +#define CG_46CAL_DAMAGE 25 + #define CG_9MM_DAMAGE 30 #define CG_9MM_HV_DAMAGE 35 @@ -9,29 +13,31 @@ #define CG_45ACP_HP_DAMAGE 40 #define CG_44MAG_DAMAGE 50 - #define CG_50AE_DAMAGE 70 -#define CG_50BMG_DAMAGE 120 +///---RIFLE AMMO---/// + +#define CG_545CAL_DAMAGE 30 #define CG_556CAL_DAMAGE 30 #define CG_556CAL_INCENDIARY_DAMAGE 32 -#define CG_545CAL_DAMAGE 30 +#define CG_762CAL_DAMAGE 55 +#define CG_762CAL_INCENDIARY_DAMAGE 50 +#define CG_50BMG_DAMAGE 120 -#define CG_46CAL_DAMAGE 25 +#define CG_75CAL_DAMAGE 150 + +///--SHOTGUN STUFF---/// #define CG_12G_SLUG_DAMAGE 80 #define CG_12G_INCAP_DAMAGE 15 #define CG_12G_PELLET_DAMAGE 9 #define CG_12G_DRAGONSBREATH_DAMAGE 6 -#define CG_BOLT_DAMAGE 45 - -#define CG_762CAL_DAMAGE 55 -#define CG_762CAL_INCENDIARY_DAMAGE 50 +///---UNIQUE WEAPONS---/// -#define CG_75CAL_DAMAGE 150 +#define CG_BOLT_DAMAGE 45 /////---WOUNDING BONUSES---///// diff --git a/modular_darkpack/modules/weapons/code/projectiles.dm b/modular_darkpack/modules/weapons/code/projectiles.dm index 90ee736571b0..00a251bee286 100644 --- a/modular_darkpack/modules/weapons/code/projectiles.dm +++ b/modular_darkpack/modules/weapons/code/projectiles.dm @@ -1,17 +1,16 @@ /obj/projectile/bullet/darkpack abstract_type = /obj/projectile/bullet/darkpack - hitscan = TRUE // Crimson Grid Addition // 9x19mm Parabellum /obj/projectile/bullet/darkpack/vamp9mm name = "9mm bullet" - damage = CG_9MM_DAMAGE // Crimson Grid Edit - Was 18 - exposed_wound_bonus = CG_MEDCAL_BONUS // Crimson Grid Edit - Was 10 + damage = 18 + exposed_wound_bonus = 10 /obj/projectile/bullet/darkpack/vamp9mm/plus name = "9mm HV bullet" - damage = CG_9MM_HV_DAMAGE // Crimson Grid Edit - Was 22 - armour_penetration = CG_LOW_AP // Crimson Grid Edit - Was 10 + damage = 22 + armour_penetration = 10 /obj/projectile/bullet/darkpack/vamp9mm/silver name = "9mm silver bullet" @@ -23,14 +22,15 @@ // .45 ACP /obj/projectile/bullet/darkpack/vamp45acp name = ".45 ACP bullet" - damage = CG_45ACP_DAMAGE // Crimson Grid Edit - Was 20 - armour_penetration = CG_LOW_AP // Crimson Grid Edit - Was 5 + damage = 20 + armour_penetration = 5 /obj/projectile/bullet/darkpack/vamp45acp/HP name = ".45 ACP hollow point bullet" - damage = CG_45ACP_HP_DAMAGE // Crimson Grid Edit - Was 25 - armour_penetration = CG_NO_AP // Crimson Grid Edit - Was 0 - wound_bonus = CG_SHOTGUN_BONUS // Crimson Grid Edit - Was 5 + damage = 25 + armour_penetration = 0 + wound_bonus = 5 + wound_bonus = 5 /obj/projectile/bullet/darkpack/vamp45acp/silver name = ".45 ACP silver bullet" @@ -42,10 +42,10 @@ // .44 Magnum /obj/projectile/bullet/darkpack/vamp44 name = ".44 bullet" - damage = CG_44MAG_DAMAGE // Crimson Grid Edit - Was 35 - armour_penetration = CG_MED_AP // Crimson Grid Edit - Was 15 - exposed_wound_bonus = CG_WOUND_MALUS // Crimson Grid Edit - Was -5 - wound_bonus = CG_MEDCAL_BONUS // Crimson Grid Edit - Was 10 + damage = 35 + armour_penetration = 15 + exposed_wound_bonus = -5 + wound_bonus = 10 /obj/projectile/bullet/darkpack/vamp44/silver name = ".44 silver bullet" @@ -58,29 +58,29 @@ // .50 BMG/AE /obj/projectile/bullet/darkpack/vamp50 name = ".50 BMG bullet" - damage = CG_50BMG_DAMAGE // Crimson Grid Edit - Was 70 - armour_penetration = CG_MED_AP // Crimson Grid Edit - Was 20 - exposed_wound_bonus = CG_SHOTGUN_BONUS // Crimson Grid Edit - Was 5 - wound_bonus = CG_SHOTGUN_BONUS // Crimson Grid Edit - Was 5 + damage = 70 + armour_penetration = 20 + exposed_wound_bonus = 5 + wound_bonus = 5 /obj/projectile/bullet/darkpack/vamp50ae name = ".50 AE bullet" - damage = CG_50AE_DAMAGE // Crimson Grid Edit - Was 40 - armour_penetration = CG_MED_AP // Crimson Grid Edit - Was 20 - exposed_wound_bonus = CG_SHOTGUN_BONUS // Crimson Grid Edit - Was 5 - wound_bonus = CG_SHOTGUN_BONUS // Crimson Grid Edit - Was 5 + damage = 40 + armour_penetration = 20 + exposed_wound_bonus = 5 + wound_bonus = 5 // 5.56mm NATO /obj/projectile/bullet/darkpack/vamp556mm name = "5.56mm bullet" - damage = CG_556CAL_DAMAGE // Crimson Grid Edit - Was 45 - armour_penetration = CG_HIGH_AP // Crimson Grid Edit - Was 25 - exposed_wound_bonus = CG_WOUND_MALUS // Crimson Grid Edit - Was -5 - wound_bonus = CG_SHOTGUN_BONUS // Crimson Grid Edit - Was 5 + damage = 45 + armour_penetration = 25 + exposed_wound_bonus = -5 + wound_bonus = 5 /obj/projectile/bullet/darkpack/vamp556mm/incendiary - armour_penetration = CG_NO_AP // Crimson Grid Edit - Was 0 - damage = CG_556CAL_INCENDIARY_DAMAGE // Crimson Grid Edit - Was 30 + armour_penetration = 0 + damage = 30 var/fire_stacks = 4 /obj/projectile/bullet/darkpack/vamp556mm/incendiary/on_hit(atom/target, blocked = 0, pierce_hit) @@ -92,7 +92,7 @@ /obj/projectile/bullet/darkpack/vamp556mm/silver name = "5.56mm silver bullet" - armour_penetration = CG_MED_AP // Crimson Grid Edit - Was 20 + armour_penetration = 20 /obj/projectile/bullet/darkpack/vamp556mm/silver/on_hit(atom/target, blocked = 0, pierce_hit) . = ..() @@ -101,26 +101,26 @@ // 5.45x39mm /obj/projectile/bullet/darkpack/vamp545mm name = "5.45mm bullet" - damage = CG_545CAL_DAMAGE // Crimson Grid Edit - Was 40 - armour_penetration = CG_HIGH_AP // Crimson Grid Edit - Was 30 - exposed_wound_bonus = CG_WOUND_MALUS // Crimson Grid Edit - Was -5 - wound_bonus = CG_SHOTGUN_BONUS // Crimson Grid Edit - Was 5 + damage = 40 + armour_penetration = 30 + exposed_wound_bonus = -5 + wound_bonus = 5 // 4.6mm HK /obj/projectile/bullet/darkpack/vamp46mm name = "4.6mm bullet" - damage = CG_46CAL_DAMAGE // Crimson Grid Edit - Was 19 - armour_penetration = CG_HIGH_AP // Crimson Grid Edit - Was 30 - exposed_wound_bonus = CG_LOWCAL_BONUS // Crimson Grid Edit - Was 0 - wound_bonus = CG_LOWCAL_BONUS // Crimson Grid Edit - Was 0 + damage = 19 + armour_penetration = 30 + exposed_wound_bonus = 0 + wound_bonus = 0 // 12 Gauge /obj/projectile/bullet/shotgun_slug/vamp name = "12g shotgun slug" - damage = CG_12G_SLUG_DAMAGE // Crimson Grid Edit - Was 70 - armour_penetration = CG_MED_AP // Crimson Grid Edit - Was 15 - exposed_wound_bonus = CG_SHOTGUN_BONUS // Crimson Grid Edit - Was 5 - wound_bonus = CG_MEDCAL_BONUS // Crimson Grid Edit - Was 10 + damage = 70 + armour_penetration = 15 + exposed_wound_bonus = 5 + wound_bonus = 10 /obj/projectile/bullet/shotgun_slug/vamp/on_hit(atom/target, blocked = 0, pierce_hit) . = ..() @@ -135,7 +135,7 @@ /obj/projectile/bullet/shotgun_slug/vamp/silver name = "12g silver shotgun slug" - armour_penetration = CG_LOW_AP // Crimson Grid Edit - Was 10 + armour_penetration = 10 /obj/projectile/bullet/shotgun_slug/vamp/silver/on_hit(atom/target, blocked = 0, pierce_hit) . = ..() @@ -143,23 +143,23 @@ /obj/projectile/bullet/darkpack/rubber name = "12g shotgun rubber shot" - damage = CG_RUBBERBULLET_DAMAGE // Crimson Grid Edit - Was 5 + damage = 5 stamina = 50 - exposed_wound_bonus = CG_SHOTGUN_BONUS // Crimson Grid Edit - Was 5 - wound_bonus = CG_WOUND_MALUS // Crimson Grid Edit - Was -5 + exposed_wound_bonus = 5 + wound_bonus = -5 /obj/projectile/bullet/darkpack/incap name = "12g shotgun incapacitation shot" - damage = CG_12G_INCAP_DAMAGE // Crimson Grid Edit - Was 15 + damage = 15 stamina = 80 /obj/projectile/bullet/darkpack/shotpellet name = "12g shotgun pellet" - damage = CG_12G_PELLET_DAMAGE // Crimson Grid Edit - Was 9 + damage = 9 range = 22 //range of where you can see + one screen after - armour_penetration = CG_LOW_AP // Crimson Grid Edit - Was 10 - exposed_wound_bonus = CG_MEDCAL_BONUS // Crimson Grid Edit - Was 10 - wound_bonus = CG_WOUND_MALUS // Crimson Grid Edit - Was -5 + armour_penetration = 10 + exposed_wound_bonus = 10 + wound_bonus = -5 /obj/projectile/bullet/darkpack/shotpellet/on_hit(atom/target, blocked = 0, pierce_hit) . = ..() @@ -169,12 +169,12 @@ /obj/projectile/bullet/darkpack/dragonsbreath name = "12g shotgun incendiary pellet" - damage = CG_12G_DRAGONSBREATH_DAMAGE // Crimson Grid Edit - Was 6 + damage = 6 damage_type = BURN range = 22 //range of where you can see + one screen after - armour_penetration = CG_NO_AP // Crimson Grid Edit - Was 0 - exposed_wound_bonus = CG_LOWCAL_BONUS // Crimson Grid Edit - Was 0 - wound_bonus = CG_LOWCAL_BONUS // Crimson Grid Edit - Was 0 + armour_penetration = 0 + exposed_wound_bonus = 0 + wound_bonus = 0 var/fire_stacks = 1 // 1 stack per pellet but we have 9 pellets so it adds up /obj/projectile/bullet/darkpack/dragonsbreath/on_hit(atom/target, blocked = 0, pierce_hit) @@ -188,10 +188,10 @@ // Crossbow Bolt /obj/projectile/bullet/crossbow_bolt name = "bolt" - damage = CG_BOLT_DAMAGE // Crimson Grid Edit - Was 45 - armour_penetration = CG_XTRM_AP // Crimson Grid Edit - Was 75 - exposed_wound_bonus = CG_XTRM_WOUND_BONUS // Crimson Grid Edit - Was 30 - wound_bonus = CG_XTRM_WOUND_BONUS // Crimson Grid Edit - Was 30 + damage = 45 + armour_penetration = 75 + exposed_wound_bonus = 30 + wound_bonus = 30 //We're gonna make this hurt as much as possible. sharpness = SHARP_POINTY embed_type = /datum/embedding/crossbolt //YEEEEOUCH!!!! @@ -208,14 +208,14 @@ // 7.62x51mm NATO /obj/projectile/bullet/darkpack/vamp762x51mm name = "7.62x51mm bullet" - damage = CG_762CAL_DAMAGE // Crimson Grid Edit - Was 55 - armour_penetration = CG_HIGH_AP // Crimson Grid Edit - Was 25 - exposed_wound_bonus = CG_WOUND_MALUS // Crimson Grid Edit - Was -5 - wound_bonus = CG_SHOTGUN_BONUS // Crimson Grid Edit - Was 5 + damage = 55 + armour_penetration = 25 + exposed_wound_bonus = -5 + wound_bonus = 5 /obj/projectile/bullet/darkpack/vamp762x51mm/incendiary - armour_penetration = CG_LOW_AP // Crimson Grid Edit - Was 5 - damage = CG_762CAL_INCENDIARY_DAMAGE // Crimson Grid Edit - Was 50 + armour_penetration = 5 //Big ass bullet + damage = 50 var/fire_stacks = 3 //This one comes in Semi-automatics /obj/projectile/bullet/darkpack/vamp762x51mm/incendiary/on_hit(atom/target, blocked = FALSE, pierce_hit) @@ -227,7 +227,7 @@ /obj/projectile/bullet/darkpack/vamp762x51mm/silver name = "7.62x51mm silver bullet" - armour_penetration = CG_MED_AP // Crimson Grid Edit - Was 20 + armour_penetration = 20 /obj/projectile/bullet/darkpack/vamp762x51mm/silver/on_hit(atom/target, blocked = FALSE, pierce_hit) . = ..() @@ -235,14 +235,14 @@ /obj/projectile/bullet/darkpack/vamp75 name = ".75 ball" - damage = CG_75CAL_DAMAGE // Crimson Grid Edit - Was 100 - armour_penetration = CG_LOW_AP // Crimson Grid Edit - Was 5 - exposed_wound_bonus = CG_SHOTGUN_BONUS // Crimson Grid Edit - Was 5 - wound_bonus = CG_SHOTGUN_BONUS // Crimson Grid Edit - Was 5 + damage = 100 + armour_penetration = 5 + exposed_wound_bonus = 5 + wound_bonus = 5 /obj/projectile/bullet/darkpack/vamp75/silver name = ".75 silver ball" - armour_penetration = CG_NO_AP // Crimson Grid Edit - Was 0 + armour_penetration = 0 /obj/projectile/bullet/darkpack/vamp75/silver/on_hit(atom/target, blocked = FALSE, pierce_hit) . = ..() diff --git a/modular_vcg/modules/weapons/code/guns.dm b/modular_vcg/modules/weapons/code/guns.dm index 1e8fd87ee815..8ca48fcb2e8c 100644 --- a/modular_vcg/modules/weapons/code/guns.dm +++ b/modular_vcg/modules/weapons/code/guns.dm @@ -1,15 +1,19 @@ /obj/item/gun/ballistic/automatic/darkpack recoil = 3 + attack_difficulty = 7 /obj/item/gun/ballistic/automatic/pistol/darkpack recoil = 2 + attack_difficulty = 6 /obj/item/gun/ballistic/revolver/darkpack recoil = 2 + attack_difficulty = 5 // Revolvers /obj/item/gun/ballistic/revolver/darkpack/snub recoil = 1 + attack_difficulty = 6 // Pistols /obj/item/gun/ballistic/automatic/pistol/darkpack/deagle @@ -33,6 +37,7 @@ /obj/item/gun/ballistic/automatic/darkpack/mac10/super recoil = 3 + attack_difficulty = 8 /obj/item/gun/ballistic/automatic/darkpack/mp7 recoil = 1 @@ -43,18 +48,21 @@ /obj/item/gun/ballistic/automatic/darkpack/huntrifle recoil = 1 + attack_difficulty = 6 /obj/item/gun/ballistic/automatic/darkpack/ak74 recoil = 3 /obj/item/gun/ballistic/automatic/darkpack/ak74/sawn recoil = 4 + attack_difficulty = 8 /obj/item/gun/ballistic/automatic/darkpack/aug recoil = 3 /obj/item/gun/ballistic/automatic/darkpack/thompson recoil = 3 + attack_difficulty = 6 /obj/item/gun/ballistic/rifle/darkpack/lever recoil = 1 @@ -62,19 +70,25 @@ // Sniper /obj/item/gun/ballistic/automatic/darkpack/sniper recoil = 6 + attack_difficulty = 8 /obj/item/gun/ballistic/automatic/darkpack/autosniper recoil = 4 + attack_difficulty = 8 // Shotguns /obj/item/gun/ballistic/shotgun/vampire recoil = 4 + attack_difficulty = 5 /obj/item/gun/ballistic/shotgun/vampire/sawnoff recoil = 6 + attack_difficulty = 7 /obj/item/gun/ballistic/shotgun/vampire/doublebarrel recoil = 3 + attack_difficulty = 5 /obj/item/gun/ballistic/automatic/darkpack/autoshotgun recoil = 4 + attack_difficulty = 6 diff --git a/modular_vcg/modules/weapons/code/projectiles.dm b/modular_vcg/modules/weapons/code/projectiles.dm index 44f02cff6070..c96e2b64339b 100644 --- a/modular_vcg/modules/weapons/code/projectiles.dm +++ b/modular_vcg/modules/weapons/code/projectiles.dm @@ -1,29 +1,152 @@ -//Sniper -/obj/projectile/bullet/darkpack/vamp50 - damage = 50 +// Handgun cartridges +/obj/projectile/bullet/darkpack/vamp9mm + damage = 30 + exposed_wound_bonus = 10 -//50 deagle -/obj/projectile/bullet/darkpack/vamp50ae +/obj/projectile/bullet/darkpack/vamp9mm/silver damage = 30 + exposed_wound_bonus = 10 -//Autosniper PSG -/obj/projectile/bullet/darkpack/vamp762x51mm +/obj/projectile/bullet/darkpack/vamp46mm + damage = 25 + armour_penetration = 35 + exposed_wound_bonus = -5 + wound_bonus = 0 + +/obj/projectile/bullet/darkpack/vamp45acp + damage = 35 + armour_penetration = 0 + +/obj/projectile/bullet/darkpack/vamp45acp/silver + damage = 35 + armour_penetration = 0 + +/obj/projectile/bullet/darkpack/vamp9mm/plus + damage = 34 + armour_penetration = 15 + +/obj/projectile/bullet/darkpack/vamp45acp/HP + damage = 50 + armour_penetration = -10 + wound_bonus = 10 + +/obj/projectile/bullet/darkpack/vamp44 damage = 45 + armour_penetration = 20 + exposed_wound_bonus = 0 + wound_bonus = 10 -/obj/projectile/bullet/darkpack/vamp762x51mm/incendiary - damage = 40 +/obj/projectile/bullet/darkpack/vamp44/silver + damage = 45 + armour_penetration = 15 + exposed_wound_bonus = 0 + wound_bonus = 10 + +/obj/projectile/bullet/darkpack/vamp50ae + damage = 60 + armour_penetration = 10 + exposed_wound_bonus = 10 + wound_bonus = 10 + +// Rifle cartridges -//AR15, AUG, Hunt Rifle /obj/projectile/bullet/darkpack/vamp556mm damage = 35 + armour_penetration = 33 + exposed_wound_bonus = -10 + wound_bonus = 5 /obj/projectile/bullet/darkpack/vamp556mm/incendiary - damage = 24 + damage = 35 + armour_penetration = 15 + exposed_wound_bonus = 0 + wound_bonus = 10 + +/obj/projectile/bullet/darkpack/vamp556mm/silver + damage = 35 + armour_penetration = 33 + exposed_wound_bonus = -10 + wound_bonus = 10 -//AK /obj/projectile/bullet/darkpack/vamp545mm - damage = 30 + damage = 32 + armour_penetration = 40 + exposed_wound_bonus = -10 + wound_bonus = 10 -//shotguns - note that this is slug, not buckshot, single-shot -/obj/projectile/bullet/shotgun_slug/vamp +/obj/projectile/bullet/darkpack/vamp762x51mm/incendiary + damage = 55 + armour_penetration = 15 + exposed_wound_bonus = 0 + wound_bonus = 10 + +/obj/projectile/bullet/darkpack/vamp762x51mm damage = 55 + armour_penetration = 45 + exposed_wound_bonus = -5 + wound_bonus = 10 + +/obj/projectile/bullet/darkpack/vamp762x51mm/silver + damage = 55 + armour_penetration = 45 + exposed_wound_bonus = -5 + wound_bonus = 10 + +/obj/projectile/bullet/darkpack/vamp50 + damage = 120 + armour_penetration = 95 + exposed_wound_bonus = -10 + wound_bonus = 20 + +// Shotgun ammunition + +/obj/projectile/bullet/darkpack/dragonsbreath + damage = 8 + armour_penetration = 0 + exposed_wound_bonus = 5 + wound_bonus = 5 + +/obj/projectile/bullet/darkpack/shotpellet + damage = 12 + armour_penetration = -10 + exposed_wound_bonus = 10 + wound_bonus = -5 + +/obj/projectile/bullet/darkpack/incap + damage = 15 + +/obj/projectile/bullet/shotgun_slug/vamp + damage = 80 + armour_penetration = 15 + exposed_wound_bonus = 10 + wound_bonus = 10 + +/obj/projectile/bullet/shotgun_slug/vamp/silver + damage = 80 + armour_penetration = 15 + exposed_wound_bonus = 5 + wound_bonus = 10 + +// Special projectiles +/obj/projectile/bullet/darkpack/rubber + damage = 5 + exposed_wound_bonus = 5 + wound_bonus = -5 + +/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 = 80 + exposed_wound_bonus = 15 + wound_bonus = 15 + +/obj/projectile/bullet/darkpack/vamp75/silver + damage = 150 + armour_penetration = 80 + exposed_wound_bonus = 15 + wound_bonus = 15 diff --git a/tgstation.dme b/tgstation.dme index c32d5dd168ab..09acc74dbcfa 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -502,6 +502,7 @@ #include "code\__DEFINES\~darkpack\traits\macros.dm" #include "code\__DEFINES\~darkpack\traits\sources.dm" #include "code\__DEFINES\~~crimson_defines\admin.dm" +#include "code\__DEFINES\~~crimson_defines\cg_projectiles.dm" #include "code\__DEFINES\~~crimson_defines\chat.dm" #include "code\__DEFINES\~~crimson_defines\keybinding.dm" #include "code\__DEFINES\~~crimson_defines\patreon.dm" From abfb97b598746bd2123e5ac0d219c4e3bfc2ee76 Mon Sep 17 00:00:00 2001 From: Avalon Date: Thu, 20 Aug 2026 21:53:37 -0400 Subject: [PATCH 04/20] Delete cg_projectiles.dm --- .../~~crimson_defines/cg_projectiles.dm | 60 ------------------- 1 file changed, 60 deletions(-) delete mode 100644 code/__DEFINES/~~crimson_defines/cg_projectiles.dm diff --git a/code/__DEFINES/~~crimson_defines/cg_projectiles.dm b/code/__DEFINES/~~crimson_defines/cg_projectiles.dm deleted file mode 100644 index 5bae95c17210..000000000000 --- a/code/__DEFINES/~~crimson_defines/cg_projectiles.dm +++ /dev/null @@ -1,60 +0,0 @@ -////----GENERIC BULLET---///// - -#define CG_RUBBERBULLET_DAMAGE 5 - -///---HANDGUN AMMO---/// - -#define CG_46CAL_DAMAGE 25 - -#define CG_9MM_DAMAGE 30 -#define CG_9MM_HV_DAMAGE 35 - -#define CG_45ACP_DAMAGE 35 -#define CG_45ACP_HP_DAMAGE 40 - -#define CG_44MAG_DAMAGE 50 -#define CG_50AE_DAMAGE 70 - -///---RIFLE AMMO---/// - -#define CG_545CAL_DAMAGE 30 - -#define CG_556CAL_DAMAGE 30 -#define CG_556CAL_INCENDIARY_DAMAGE 32 - -#define CG_762CAL_DAMAGE 55 -#define CG_762CAL_INCENDIARY_DAMAGE 50 -#define CG_50BMG_DAMAGE 120 - -#define CG_75CAL_DAMAGE 150 - -///--SHOTGUN STUFF---/// - -#define CG_12G_SLUG_DAMAGE 80 -#define CG_12G_INCAP_DAMAGE 15 -#define CG_12G_PELLET_DAMAGE 9 -#define CG_12G_DRAGONSBREATH_DAMAGE 6 - -///---UNIQUE WEAPONS---/// - -#define CG_BOLT_DAMAGE 45 - -/////---WOUNDING BONUSES---///// - -#define CG_WOUND_MALUS -5 -#define CG_LOWCAL_BONUS 0 -#define CG_MEDCAL_BONUS 10 -#define CG_HICAL_BONUS 20 -#define CG_SHOTGUN_BONUS 5 // Per Pellet after all -#define CG_XTRM_WOUND_BONUS 30 - -////---ARMOR PIERCE---//// - -#define CG_NO_AP 0 -#define CG_LOW_AP 5 -#define CG_MED_AP 15 -#define CG_HIGH_AP 25 -#define CG_XTRM_AP 50 - - - From 7d1e377d05d026383489dbe01a48c7439443c36a Mon Sep 17 00:00:00 2001 From: Avalon Date: Thu, 20 Aug 2026 21:53:55 -0400 Subject: [PATCH 05/20] Update tgstation.dme --- tgstation.dme | 1 - 1 file changed, 1 deletion(-) diff --git a/tgstation.dme b/tgstation.dme index 09acc74dbcfa..f505d6af6261 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -8200,7 +8200,6 @@ #include "modular_darkpack\modules\weapons\code\ammo_boxes.dm" #include "modular_darkpack\modules\weapons\code\ammo_casings.dm" #include "modular_darkpack\modules\weapons\code\ammostack.dm" -#include "modular_darkpack\modules\weapons\code\cg_projectiles.dm" #include "modular_darkpack\modules\weapons\code\crafting_recipes.dm" #include "modular_darkpack\modules\weapons\code\flamethrower.dm" #include "modular_darkpack\modules\weapons\code\guns.dm" From 60540be2470728ff6d41d9ebb3a6213a25ceb51c Mon Sep 17 00:00:00 2001 From: Avalon Date: Thu, 20 Aug 2026 21:59:46 -0400 Subject: [PATCH 06/20] Update tgstation.dme --- tgstation.dme | 1 - 1 file changed, 1 deletion(-) diff --git a/tgstation.dme b/tgstation.dme index f505d6af6261..e2218384c089 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -502,7 +502,6 @@ #include "code\__DEFINES\~darkpack\traits\macros.dm" #include "code\__DEFINES\~darkpack\traits\sources.dm" #include "code\__DEFINES\~~crimson_defines\admin.dm" -#include "code\__DEFINES\~~crimson_defines\cg_projectiles.dm" #include "code\__DEFINES\~~crimson_defines\chat.dm" #include "code\__DEFINES\~~crimson_defines\keybinding.dm" #include "code\__DEFINES\~~crimson_defines\patreon.dm" From ebed690fd91f653d9a6406cb4cd849b92735b6c4 Mon Sep 17 00:00:00 2001 From: Avalon Date: Thu, 20 Aug 2026 23:07:29 -0400 Subject: [PATCH 07/20] RAH --- .../modules/weapons/code/ammo_boxes.dm | 80 ++++++++++++++++ .../modules/weapons/code/ammo_casings.dm | 93 +++++++++++++++++++ modular_vcg/modules/weapons/code/guns.dm | 9 +- .../modules/weapons/code/projectiles.dm | 39 ++++++-- tgstation.dme | 2 + 5 files changed, 212 insertions(+), 11 deletions(-) create mode 100644 modular_vcg/modules/weapons/code/ammo_boxes.dm create mode 100644 modular_vcg/modules/weapons/code/ammo_casings.dm diff --git a/modular_vcg/modules/weapons/code/ammo_boxes.dm b/modular_vcg/modules/weapons/code/ammo_boxes.dm new file mode 100644 index 000000000000..65720981678b --- /dev/null +++ b/modular_vcg/modules/weapons/code/ammo_boxes.dm @@ -0,0 +1,80 @@ + +// 9x19mm Parabellum + +/obj/item/ammo_box/darkpack/c9mm + name = "ammo box (9mm)" + icon_state = "9box" + ammo_type = /obj/item/ammo_casing/vampire/c9mm + max_ammo = 100 + custom_price = 300 + + +// .45 ACP +/obj/item/ammo_box/darkpack/c45acp + name = "ammo box (.45 ACP)" + icon_state = "45box" + ammo_type = /obj/item/ammo_casing/vampire/c45acp + max_ammo = 100 + +// .44 Magnum +/obj/item/ammo_box/darkpack/c44 + name = "ammo box (.44)" + icon_state = "44box" + ammo_type = /obj/item/ammo_casing/vampire/c44 + max_ammo = 60 + +// .50 AE +/obj/item/ammo_box/darkpack/c50ae + name = "ammo box (.50 AE)" + icon_state = "50box" //placeholder, needs new box + ammo_type = /obj/item/ammo_casing/vampire/c50ae + max_ammo = 40 + +// .50 BMG +/obj/item/ammo_box/darkpack/c50 + name = "ammo box (.50 BMG)" + icon_state = "50box" + ammo_type = /obj/item/ammo_casing/vampire/c50 + max_ammo = 20 + +// 5.56mm NATO +/obj/item/ammo_box/darkpack/c556 + name = "ammo box (5.56)" + icon_state = "556box" + ammo_type = /obj/item/ammo_casing/vampire/c556mm + max_ammo = 60 + custom_price = 2000 + +// 5.45x39mm +/obj/item/ammo_box/darkpack/c545 + name = "ammo box (5.45)" + icon_state = "545box" + ammo_type = /obj/item/ammo_casing/vampire/c545mm + max_ammo = 60 + +// 4.6mm HK // DARKPACK TODO: Ammo box for 4.6mm NATO +/obj/item/ammo_box/darkpack/c46pdw + name = "ammo box (4.6mm)" + icon_state = "46box" + ammo_type = /obj/item/ammo_casing/vampire/c46pdw + max_ammo = 100 + +// 12 Gauge +/obj/item/ammo_box/darkpack/c12g + name = "ammo box (12g)" + icon_state = "12box" + ammo_type = /obj/item/ammo_casing/vampire/c12g + max_ammo = 30 + +/obj/item/ammo_box/darkpack/c12g/buck/incendiary + name = "ammo box (12g, Dragon's Breath)" + icon_state = "12box_dragon" + ammo_type = /obj/item/ammo_casing/vampire/c12g/buck/incendiary + +// 7.62x51mm NATO +/obj/item/ammo_box/darkpack/c762x51mm + name = "ammo box (7.62x51mm)" + icon_state = "762box" + ammo_type = /obj/item/ammo_casing/vampire/c762x51mm + max_ammo = 80 + diff --git a/modular_vcg/modules/weapons/code/ammo_casings.dm b/modular_vcg/modules/weapons/code/ammo_casings.dm new file mode 100644 index 000000000000..efad6c81ffe1 --- /dev/null +++ b/modular_vcg/modules/weapons/code/ammo_casings.dm @@ -0,0 +1,93 @@ +// 9x19mm Parabellum +/obj/item/ammo_casing/vampire/c9mm + name = "9mm bullet casing" + desc = "A 9mm bullet casing." + caliber = CALIBER_9MMPARA + projectile_type = /obj/projectile/bullet/darkpack/vamp9mm + +// .45 ACP +/obj/item/ammo_casing/vampire/c45acp + name = ".45 ACP bullet casing" + desc = "A .45 ACP bullet casing." + caliber = CALIBER_45ACP + projectile_type = /obj/projectile/bullet/darkpack/vamp45acp + icon_state = "45" + base_icon_state = "45" + +// .44 Magnum +/obj/item/ammo_casing/vampire/c44 + name = ".44 bullet casing" + desc = "A .44 bullet casing." + caliber = CALIBER_44MAG + projectile_type = /obj/projectile/bullet/darkpack/vamp44 + icon_state = "44" + base_icon_state = "44" + +// .50 BMG/AE +/obj/item/ammo_casing/vampire/c50ae + name = ".50 AE bullet casing" + desc = "A .50 AE bullet casing." + caliber = CALIBER_50CAL_AE + projectile_type = /obj/projectile/bullet/darkpack/vamp50ae + icon_state = "44" //placeholder + base_icon_state = "44" //placeholder + +/obj/item/ammo_casing/vampire/c50 + name = ".50 BMG bullet casing" + desc = "A .50 BMG bullet casing." + caliber = CALIBER_50CAL_BMG + projectile_type = /obj/projectile/bullet/darkpack/vamp50 + icon_state = "50" + base_icon_state = "50" + +// 5.56mm NATO +/obj/item/ammo_casing/vampire/c556mm + name = "5.56mm bullet casing" + desc = "A 5.56mm bullet casing." + caliber = CALIBER_556NATO + projectile_type = /obj/projectile/bullet/darkpack/vamp556mm + icon_state = "556" + base_icon_state = "556" + +// 5.45x39mm +/obj/item/ammo_casing/vampire/c545mm + name = "5.45mm bullet casing" + desc = "A 5.45mm bullet casing." + caliber = CALIBER_545SOVIET + projectile_type = /obj/projectile/bullet/darkpack/vamp545mm + icon_state = "545" + base_icon_state = "545" + +// 4.6mm HK +/obj/item/ammo_casing/vampire/c46pdw + name = "4.6mm bullet casing" + desc = "A 4.6mm bullet casing." + caliber = CALIBER_46HK + projectile_type = /obj/projectile/bullet/darkpack/vamp46mm + icon_state = "46" + base_icon_state = "46" + +// 12 Gauge +/obj/item/ammo_casing/vampire/c12g + name = "12g shell casing" + desc = "A 12g shell casing." + caliber = CALIBER_12G + projectile_type = /obj/projectile/bullet/shotgun_slug/vamp + icon_state = "12" + base_icon_state = "12" + +/obj/item/ammo_casing/vampire/c12g/buck + desc = "A 12g shell casing (00 buck)." + projectile_type = /obj/projectile/bullet/darkpack/shotpellet + pellets = 8 + variance = 25 + +// 7.62x51mm NATO +/obj/item/ammo_casing/vampire/c762x51mm // DARKPACK TODO: can you believe these never had a sprite? tfn... + name = "7.62x51mm bullet casing" + desc = "A 7.62x51mm bullet casing." + caliber = CALIBER_762NATO + projectile_type = /obj/projectile/bullet/darkpack/vamp762x51mm + icon_state = "762" + base_icon_state = "762" + diff --git a/modular_vcg/modules/weapons/code/guns.dm b/modular_vcg/modules/weapons/code/guns.dm index 8ca48fcb2e8c..7ef9be23109a 100644 --- a/modular_vcg/modules/weapons/code/guns.dm +++ b/modular_vcg/modules/weapons/code/guns.dm @@ -28,16 +28,17 @@ // SMGs /obj/item/gun/ballistic/automatic/darkpack/uzi recoil = 3 + attack_difficulty = 8 /obj/item/gun/ballistic/automatic/darkpack/mp5 recoil = 2 /obj/item/gun/ballistic/automatic/darkpack/mac10 recoil = 4 + attack_difficulty = 8 /obj/item/gun/ballistic/automatic/darkpack/mac10/super recoil = 3 - attack_difficulty = 8 /obj/item/gun/ballistic/automatic/darkpack/mp7 recoil = 1 @@ -92,3 +93,9 @@ /obj/item/gun/ballistic/automatic/darkpack/autoshotgun recoil = 4 attack_difficulty = 6 + +// Magazine Changes + +/obj/item/ammo_box/magazine/darkpack556/hunt + caliber = CALIBER_762NATO + max_ammo = 10 diff --git a/modular_vcg/modules/weapons/code/projectiles.dm b/modular_vcg/modules/weapons/code/projectiles.dm index c96e2b64339b..4b1c67ce02ac 100644 --- a/modular_vcg/modules/weapons/code/projectiles.dm +++ b/modular_vcg/modules/weapons/code/projectiles.dm @@ -1,4 +1,7 @@ -// Handgun cartridges +// Handgun/Compact cartridges + +// 9mm + /obj/projectile/bullet/darkpack/vamp9mm damage = 30 exposed_wound_bonus = 10 @@ -7,12 +10,20 @@ damage = 30 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 @@ -21,15 +32,13 @@ damage = 35 armour_penetration = 0 -/obj/projectile/bullet/darkpack/vamp9mm/plus - damage = 34 - armour_penetration = 15 - /obj/projectile/bullet/darkpack/vamp45acp/HP damage = 50 armour_penetration = -10 wound_bonus = 10 +// .44 Magnum + /obj/projectile/bullet/darkpack/vamp44 damage = 45 armour_penetration = 20 @@ -42,6 +51,8 @@ exposed_wound_bonus = 0 wound_bonus = 10 +// .50 Action Express + /obj/projectile/bullet/darkpack/vamp50ae damage = 60 armour_penetration = 10 @@ -50,6 +61,8 @@ // Rifle cartridges +// 5.56mm + /obj/projectile/bullet/darkpack/vamp556mm damage = 35 armour_penetration = 33 @@ -68,17 +81,16 @@ exposed_wound_bonus = -10 wound_bonus = 10 +// 5.45mm + /obj/projectile/bullet/darkpack/vamp545mm damage = 32 armour_penetration = 40 exposed_wound_bonus = -10 wound_bonus = 10 -/obj/projectile/bullet/darkpack/vamp762x51mm/incendiary - damage = 55 - armour_penetration = 15 - exposed_wound_bonus = 0 - wound_bonus = 10 + +// 7.62x51mm /obj/projectile/bullet/darkpack/vamp762x51mm damage = 55 @@ -92,6 +104,13 @@ exposed_wound_bonus = -5 wound_bonus = 10 +/obj/projectile/bullet/darkpack/vamp762x51mm/incendiary + damage = 55 + armour_penetration = 15 + exposed_wound_bonus = 0 + wound_bonus = 10 + +// .50 BMG /obj/projectile/bullet/darkpack/vamp50 damage = 120 armour_penetration = 95 diff --git a/tgstation.dme b/tgstation.dme index 400b6ec3de87..b6ff89073bcc 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -8331,6 +8331,8 @@ #include "modular_vcg\modules\powers\code\discipline\potence\potence.dm" #include "modular_vcg\modules\relays\code\relays.dm" #include "modular_vcg\modules\toggle_looc\code\looc_toggle.dm" +#include "modular_vcg\modules\weapons\code\ammo_boxes.dm" +#include "modular_vcg\modules\weapons\code\ammo_casings.dm" #include "modular_vcg\modules\weapons\code\guns.dm" #include "modular_vcg\modules\weapons\code\melee.dm" #include "modular_vcg\modules\weapons\code\projectiles.dm" From eca5b6ed3e36dff883346e10aea6d18a018f2d64 Mon Sep 17 00:00:00 2001 From: Avalon Date: Thu, 20 Aug 2026 23:22:45 -0400 Subject: [PATCH 08/20] RAHG --- modular_darkpack/modules/retail/code/stores/gun_store.dm | 1 + modular_vcg/modules/weapons/code/guns.dm | 1 + 2 files changed, 2 insertions(+) diff --git a/modular_darkpack/modules/retail/code/stores/gun_store.dm b/modular_darkpack/modules/retail/code/stores/gun_store.dm index ed069c2c8443..067bf8441965 100644 --- a/modular_darkpack/modules/retail/code/stores/gun_store.dm +++ b/modular_darkpack/modules/retail/code/stores/gun_store.dm @@ -12,6 +12,7 @@ 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), diff --git a/modular_vcg/modules/weapons/code/guns.dm b/modular_vcg/modules/weapons/code/guns.dm index 7ef9be23109a..fc20f5050948 100644 --- a/modular_vcg/modules/weapons/code/guns.dm +++ b/modular_vcg/modules/weapons/code/guns.dm @@ -97,5 +97,6 @@ // Magazine Changes /obj/item/ammo_box/magazine/darkpack556/hunt +name = "rifle magazine (7.62x51mm)" caliber = CALIBER_762NATO max_ammo = 10 From fb7d5967b13a6703a7bab0b4c2e0f7d479035853 Mon Sep 17 00:00:00 2001 From: Avalon Date: Thu, 20 Aug 2026 23:23:33 -0400 Subject: [PATCH 09/20] Update gun_store.dm --- modular_darkpack/modules/retail/code/stores/gun_store.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_darkpack/modules/retail/code/stores/gun_store.dm b/modular_darkpack/modules/retail/code/stores/gun_store.dm index 067bf8441965..f2b867fd456a 100644 --- a/modular_darkpack/modules/retail/code/stores/gun_store.dm +++ b/modular_darkpack/modules/retail/code/stores/gun_store.dm @@ -17,7 +17,7 @@ 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), From 91a1a1d0e9c63f40bb96e37e39005e7f18d72cc4 Mon Sep 17 00:00:00 2001 From: Avalon Date: Thu, 20 Aug 2026 23:35:22 -0400 Subject: [PATCH 10/20] Update gun_store.dm --- modular_darkpack/modules/retail/code/stores/gun_store.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_darkpack/modules/retail/code/stores/gun_store.dm b/modular_darkpack/modules/retail/code/stores/gun_store.dm index f2b867fd456a..d1942bb7d619 100644 --- a/modular_darkpack/modules/retail/code/stores/gun_store.dm +++ b/modular_darkpack/modules/retail/code/stores/gun_store.dm @@ -12,7 +12,7 @@ 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("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), From 5672ccd37116a5061ac1c869c93971d26095d0d0 Mon Sep 17 00:00:00 2001 From: Avalon Date: Thu, 20 Aug 2026 23:41:17 -0400 Subject: [PATCH 11/20] Update guns.dm --- modular_vcg/modules/weapons/code/guns.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_vcg/modules/weapons/code/guns.dm b/modular_vcg/modules/weapons/code/guns.dm index fc20f5050948..bef3b7660ad4 100644 --- a/modular_vcg/modules/weapons/code/guns.dm +++ b/modular_vcg/modules/weapons/code/guns.dm @@ -97,6 +97,6 @@ // Magazine Changes /obj/item/ammo_box/magazine/darkpack556/hunt -name = "rifle magazine (7.62x51mm)" + name = "rifle magazine (7.62x51mm)" caliber = CALIBER_762NATO max_ammo = 10 From 90038b1bfabfbba39537e2c468e890d5f2e79cdc Mon Sep 17 00:00:00 2001 From: Avalon Date: Fri, 21 Aug 2026 00:12:51 -0400 Subject: [PATCH 12/20] Fixes + Comments addressed --- .../modules/weapons/code/ammo_boxes.dm | 80 ---------------- .../modules/weapons/code/ammo_casings.dm | 93 ------------------- modular_vcg/modules/weapons/code/guns.dm | 14 --- .../modules/weapons/code/projectiles.dm | 18 ++-- tgstation.dme | 2 - 5 files changed, 7 insertions(+), 200 deletions(-) delete mode 100644 modular_vcg/modules/weapons/code/ammo_boxes.dm delete mode 100644 modular_vcg/modules/weapons/code/ammo_casings.dm diff --git a/modular_vcg/modules/weapons/code/ammo_boxes.dm b/modular_vcg/modules/weapons/code/ammo_boxes.dm deleted file mode 100644 index 65720981678b..000000000000 --- a/modular_vcg/modules/weapons/code/ammo_boxes.dm +++ /dev/null @@ -1,80 +0,0 @@ - -// 9x19mm Parabellum - -/obj/item/ammo_box/darkpack/c9mm - name = "ammo box (9mm)" - icon_state = "9box" - ammo_type = /obj/item/ammo_casing/vampire/c9mm - max_ammo = 100 - custom_price = 300 - - -// .45 ACP -/obj/item/ammo_box/darkpack/c45acp - name = "ammo box (.45 ACP)" - icon_state = "45box" - ammo_type = /obj/item/ammo_casing/vampire/c45acp - max_ammo = 100 - -// .44 Magnum -/obj/item/ammo_box/darkpack/c44 - name = "ammo box (.44)" - icon_state = "44box" - ammo_type = /obj/item/ammo_casing/vampire/c44 - max_ammo = 60 - -// .50 AE -/obj/item/ammo_box/darkpack/c50ae - name = "ammo box (.50 AE)" - icon_state = "50box" //placeholder, needs new box - ammo_type = /obj/item/ammo_casing/vampire/c50ae - max_ammo = 40 - -// .50 BMG -/obj/item/ammo_box/darkpack/c50 - name = "ammo box (.50 BMG)" - icon_state = "50box" - ammo_type = /obj/item/ammo_casing/vampire/c50 - max_ammo = 20 - -// 5.56mm NATO -/obj/item/ammo_box/darkpack/c556 - name = "ammo box (5.56)" - icon_state = "556box" - ammo_type = /obj/item/ammo_casing/vampire/c556mm - max_ammo = 60 - custom_price = 2000 - -// 5.45x39mm -/obj/item/ammo_box/darkpack/c545 - name = "ammo box (5.45)" - icon_state = "545box" - ammo_type = /obj/item/ammo_casing/vampire/c545mm - max_ammo = 60 - -// 4.6mm HK // DARKPACK TODO: Ammo box for 4.6mm NATO -/obj/item/ammo_box/darkpack/c46pdw - name = "ammo box (4.6mm)" - icon_state = "46box" - ammo_type = /obj/item/ammo_casing/vampire/c46pdw - max_ammo = 100 - -// 12 Gauge -/obj/item/ammo_box/darkpack/c12g - name = "ammo box (12g)" - icon_state = "12box" - ammo_type = /obj/item/ammo_casing/vampire/c12g - max_ammo = 30 - -/obj/item/ammo_box/darkpack/c12g/buck/incendiary - name = "ammo box (12g, Dragon's Breath)" - icon_state = "12box_dragon" - ammo_type = /obj/item/ammo_casing/vampire/c12g/buck/incendiary - -// 7.62x51mm NATO -/obj/item/ammo_box/darkpack/c762x51mm - name = "ammo box (7.62x51mm)" - icon_state = "762box" - ammo_type = /obj/item/ammo_casing/vampire/c762x51mm - max_ammo = 80 - diff --git a/modular_vcg/modules/weapons/code/ammo_casings.dm b/modular_vcg/modules/weapons/code/ammo_casings.dm deleted file mode 100644 index efad6c81ffe1..000000000000 --- a/modular_vcg/modules/weapons/code/ammo_casings.dm +++ /dev/null @@ -1,93 +0,0 @@ -// 9x19mm Parabellum -/obj/item/ammo_casing/vampire/c9mm - name = "9mm bullet casing" - desc = "A 9mm bullet casing." - caliber = CALIBER_9MMPARA - projectile_type = /obj/projectile/bullet/darkpack/vamp9mm - -// .45 ACP -/obj/item/ammo_casing/vampire/c45acp - name = ".45 ACP bullet casing" - desc = "A .45 ACP bullet casing." - caliber = CALIBER_45ACP - projectile_type = /obj/projectile/bullet/darkpack/vamp45acp - icon_state = "45" - base_icon_state = "45" - -// .44 Magnum -/obj/item/ammo_casing/vampire/c44 - name = ".44 bullet casing" - desc = "A .44 bullet casing." - caliber = CALIBER_44MAG - projectile_type = /obj/projectile/bullet/darkpack/vamp44 - icon_state = "44" - base_icon_state = "44" - -// .50 BMG/AE -/obj/item/ammo_casing/vampire/c50ae - name = ".50 AE bullet casing" - desc = "A .50 AE bullet casing." - caliber = CALIBER_50CAL_AE - projectile_type = /obj/projectile/bullet/darkpack/vamp50ae - icon_state = "44" //placeholder - base_icon_state = "44" //placeholder - -/obj/item/ammo_casing/vampire/c50 - name = ".50 BMG bullet casing" - desc = "A .50 BMG bullet casing." - caliber = CALIBER_50CAL_BMG - projectile_type = /obj/projectile/bullet/darkpack/vamp50 - icon_state = "50" - base_icon_state = "50" - -// 5.56mm NATO -/obj/item/ammo_casing/vampire/c556mm - name = "5.56mm bullet casing" - desc = "A 5.56mm bullet casing." - caliber = CALIBER_556NATO - projectile_type = /obj/projectile/bullet/darkpack/vamp556mm - icon_state = "556" - base_icon_state = "556" - -// 5.45x39mm -/obj/item/ammo_casing/vampire/c545mm - name = "5.45mm bullet casing" - desc = "A 5.45mm bullet casing." - caliber = CALIBER_545SOVIET - projectile_type = /obj/projectile/bullet/darkpack/vamp545mm - icon_state = "545" - base_icon_state = "545" - -// 4.6mm HK -/obj/item/ammo_casing/vampire/c46pdw - name = "4.6mm bullet casing" - desc = "A 4.6mm bullet casing." - caliber = CALIBER_46HK - projectile_type = /obj/projectile/bullet/darkpack/vamp46mm - icon_state = "46" - base_icon_state = "46" - -// 12 Gauge -/obj/item/ammo_casing/vampire/c12g - name = "12g shell casing" - desc = "A 12g shell casing." - caliber = CALIBER_12G - projectile_type = /obj/projectile/bullet/shotgun_slug/vamp - icon_state = "12" - base_icon_state = "12" - -/obj/item/ammo_casing/vampire/c12g/buck - desc = "A 12g shell casing (00 buck)." - projectile_type = /obj/projectile/bullet/darkpack/shotpellet - pellets = 8 - variance = 25 - -// 7.62x51mm NATO -/obj/item/ammo_casing/vampire/c762x51mm // DARKPACK TODO: can you believe these never had a sprite? tfn... - name = "7.62x51mm bullet casing" - desc = "A 7.62x51mm bullet casing." - caliber = CALIBER_762NATO - projectile_type = /obj/projectile/bullet/darkpack/vamp762x51mm - icon_state = "762" - base_icon_state = "762" - diff --git a/modular_vcg/modules/weapons/code/guns.dm b/modular_vcg/modules/weapons/code/guns.dm index bef3b7660ad4..e1083721badd 100644 --- a/modular_vcg/modules/weapons/code/guns.dm +++ b/modular_vcg/modules/weapons/code/guns.dm @@ -1,19 +1,15 @@ /obj/item/gun/ballistic/automatic/darkpack recoil = 3 - attack_difficulty = 7 /obj/item/gun/ballistic/automatic/pistol/darkpack recoil = 2 - attack_difficulty = 6 /obj/item/gun/ballistic/revolver/darkpack recoil = 2 - attack_difficulty = 5 // Revolvers /obj/item/gun/ballistic/revolver/darkpack/snub recoil = 1 - attack_difficulty = 6 // Pistols /obj/item/gun/ballistic/automatic/pistol/darkpack/deagle @@ -28,14 +24,12 @@ // SMGs /obj/item/gun/ballistic/automatic/darkpack/uzi recoil = 3 - attack_difficulty = 8 /obj/item/gun/ballistic/automatic/darkpack/mp5 recoil = 2 /obj/item/gun/ballistic/automatic/darkpack/mac10 recoil = 4 - attack_difficulty = 8 /obj/item/gun/ballistic/automatic/darkpack/mac10/super recoil = 3 @@ -56,14 +50,12 @@ /obj/item/gun/ballistic/automatic/darkpack/ak74/sawn recoil = 4 - attack_difficulty = 8 /obj/item/gun/ballistic/automatic/darkpack/aug recoil = 3 /obj/item/gun/ballistic/automatic/darkpack/thompson recoil = 3 - attack_difficulty = 6 /obj/item/gun/ballistic/rifle/darkpack/lever recoil = 1 @@ -71,28 +63,22 @@ // Sniper /obj/item/gun/ballistic/automatic/darkpack/sniper recoil = 6 - attack_difficulty = 8 /obj/item/gun/ballistic/automatic/darkpack/autosniper recoil = 4 - attack_difficulty = 8 // Shotguns /obj/item/gun/ballistic/shotgun/vampire recoil = 4 - attack_difficulty = 5 /obj/item/gun/ballistic/shotgun/vampire/sawnoff recoil = 6 - attack_difficulty = 7 /obj/item/gun/ballistic/shotgun/vampire/doublebarrel recoil = 3 - attack_difficulty = 5 /obj/item/gun/ballistic/automatic/darkpack/autoshotgun recoil = 4 - attack_difficulty = 6 // Magazine Changes diff --git a/modular_vcg/modules/weapons/code/projectiles.dm b/modular_vcg/modules/weapons/code/projectiles.dm index 4b1c67ce02ac..b47023bcf6df 100644 --- a/modular_vcg/modules/weapons/code/projectiles.dm +++ b/modular_vcg/modules/weapons/code/projectiles.dm @@ -64,19 +64,19 @@ // 5.56mm /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 = 35 + damage = 33 armour_penetration = 15 exposed_wound_bonus = 0 wound_bonus = 10 /obj/projectile/bullet/darkpack/vamp556mm/silver - damage = 35 + damage = 33 armour_penetration = 33 exposed_wound_bonus = -10 wound_bonus = 10 @@ -128,11 +128,6 @@ /obj/projectile/bullet/darkpack/shotpellet damage = 12 armour_penetration = -10 - exposed_wound_bonus = 10 - wound_bonus = -5 - -/obj/projectile/bullet/darkpack/incap - damage = 15 /obj/projectile/bullet/shotgun_slug/vamp damage = 80 @@ -147,9 +142,10 @@ wound_bonus = 10 // Special projectiles + /obj/projectile/bullet/darkpack/rubber damage = 5 - exposed_wound_bonus = 5 + exposed_wound_bonus = 0 wound_bonus = -5 /obj/projectile/bullet/crossbow_bolt @@ -160,12 +156,12 @@ /obj/projectile/bullet/darkpack/vamp75 damage = 150 - armour_penetration = 80 + armour_penetration = 60 exposed_wound_bonus = 15 wound_bonus = 15 /obj/projectile/bullet/darkpack/vamp75/silver damage = 150 - armour_penetration = 80 + armour_penetration = 60 exposed_wound_bonus = 15 wound_bonus = 15 diff --git a/tgstation.dme b/tgstation.dme index b6ff89073bcc..400b6ec3de87 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -8331,8 +8331,6 @@ #include "modular_vcg\modules\powers\code\discipline\potence\potence.dm" #include "modular_vcg\modules\relays\code\relays.dm" #include "modular_vcg\modules\toggle_looc\code\looc_toggle.dm" -#include "modular_vcg\modules\weapons\code\ammo_boxes.dm" -#include "modular_vcg\modules\weapons\code\ammo_casings.dm" #include "modular_vcg\modules\weapons\code\guns.dm" #include "modular_vcg\modules\weapons\code\melee.dm" #include "modular_vcg\modules\weapons\code\projectiles.dm" From f601ab06f6f580446368e0a8f69a13dbd4ddfd99 Mon Sep 17 00:00:00 2001 From: Avalon Date: Fri, 21 Aug 2026 00:14:25 -0400 Subject: [PATCH 13/20] Update projectiles.dm --- modular_vcg/modules/weapons/code/projectiles.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_vcg/modules/weapons/code/projectiles.dm b/modular_vcg/modules/weapons/code/projectiles.dm index b47023bcf6df..1e58486b7d24 100644 --- a/modular_vcg/modules/weapons/code/projectiles.dm +++ b/modular_vcg/modules/weapons/code/projectiles.dm @@ -84,7 +84,7 @@ // 5.45mm /obj/projectile/bullet/darkpack/vamp545mm - damage = 32 + damage = 30 armour_penetration = 40 exposed_wound_bonus = -10 wound_bonus = 10 From 3288e366203039db07b4a78a81a237fe25dfd25b Mon Sep 17 00:00:00 2001 From: Avalon Date: Sat, 22 Aug 2026 01:17:42 -0400 Subject: [PATCH 14/20] Update modular_vcg/modules/weapons/code/projectiles.dm Co-authored-by: chazzyjazzy <33268885+chazzyjazzy@users.noreply.github.com> --- modular_vcg/modules/weapons/code/projectiles.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/modular_vcg/modules/weapons/code/projectiles.dm b/modular_vcg/modules/weapons/code/projectiles.dm index 1e58486b7d24..c0c22808649a 100644 --- a/modular_vcg/modules/weapons/code/projectiles.dm +++ b/modular_vcg/modules/weapons/code/projectiles.dm @@ -131,15 +131,10 @@ /obj/projectile/bullet/shotgun_slug/vamp damage = 80 - armour_penetration = 15 exposed_wound_bonus = 10 - wound_bonus = 10 /obj/projectile/bullet/shotgun_slug/vamp/silver - damage = 80 - armour_penetration = 15 exposed_wound_bonus = 5 - wound_bonus = 10 // Special projectiles From 855be95c9484f17f9c64b65e3c2599200e3e082d Mon Sep 17 00:00:00 2001 From: Avalon Date: Sat, 22 Aug 2026 01:17:51 -0400 Subject: [PATCH 15/20] Update modular_vcg/modules/weapons/code/guns.dm Co-authored-by: chazzyjazzy <33268885+chazzyjazzy@users.noreply.github.com> --- modular_vcg/modules/weapons/code/guns.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/modular_vcg/modules/weapons/code/guns.dm b/modular_vcg/modules/weapons/code/guns.dm index e1083721badd..f4db22dc0a09 100644 --- a/modular_vcg/modules/weapons/code/guns.dm +++ b/modular_vcg/modules/weapons/code/guns.dm @@ -80,8 +80,6 @@ /obj/item/gun/ballistic/automatic/darkpack/autoshotgun recoil = 4 -// Magazine Changes - /obj/item/ammo_box/magazine/darkpack556/hunt name = "rifle magazine (7.62x51mm)" caliber = CALIBER_762NATO From 0268eac1a8509e7aaaba646c667fbd8ddb940f3f Mon Sep 17 00:00:00 2001 From: Avalon Date: Sat, 22 Aug 2026 08:16:49 -0400 Subject: [PATCH 16/20] Comment Cleanup --- modular_darkpack/modules/retail/code/stores/camping_store.dm | 4 ++-- modular_vcg/modules/weapons/code/guns.dm | 1 - modular_vcg/modules/weapons/code/projectiles.dm | 4 ---- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/modular_darkpack/modules/retail/code/stores/camping_store.dm b/modular_darkpack/modules/retail/code/stores/camping_store.dm index 165c7eff855e..755a24e80c0c 100644 --- a/modular_darkpack/modules/retail/code/stores/camping_store.dm +++ b/modular_darkpack/modules/retail/code/stores/camping_store.dm @@ -5,7 +5,7 @@ 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, 5.56",/obj/item/ammo_box/magazine/darkpack556/hunt), + new /datum/data/vending_product("hunting rifle magazine, 7.62x51",/obj/item/ammo_box/magazine/darkpack556/hunt), // Crimson Grid Edit - Was 5.56 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), @@ -19,7 +19,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), + new /datum/data/vending_product("7.52x51 ammo", /obj/item/ammo_box/darkpack/c762x51mm, 1000), // Crimson Grid Additon new /datum/data/vending_product("military parka", /obj/item/clothing/suit/vampire/coat/milparka, 90), ) product_types = list( diff --git a/modular_vcg/modules/weapons/code/guns.dm b/modular_vcg/modules/weapons/code/guns.dm index e1083721badd..7d39f51c4f1f 100644 --- a/modular_vcg/modules/weapons/code/guns.dm +++ b/modular_vcg/modules/weapons/code/guns.dm @@ -43,7 +43,6 @@ /obj/item/gun/ballistic/automatic/darkpack/huntrifle recoil = 1 - attack_difficulty = 6 /obj/item/gun/ballistic/automatic/darkpack/ak74 recoil = 3 diff --git a/modular_vcg/modules/weapons/code/projectiles.dm b/modular_vcg/modules/weapons/code/projectiles.dm index 1e58486b7d24..ab3fc7e191f4 100644 --- a/modular_vcg/modules/weapons/code/projectiles.dm +++ b/modular_vcg/modules/weapons/code/projectiles.dm @@ -70,15 +70,11 @@ wound_bonus = 5 /obj/projectile/bullet/darkpack/vamp556mm/incendiary - damage = 33 armour_penetration = 15 exposed_wound_bonus = 0 wound_bonus = 10 /obj/projectile/bullet/darkpack/vamp556mm/silver - damage = 33 - armour_penetration = 33 - exposed_wound_bonus = -10 wound_bonus = 10 // 5.45mm From b6bc7e24c8b8703c52afda052ecf1f2ad39d8117 Mon Sep 17 00:00:00 2001 From: Avalon Date: Sat, 22 Aug 2026 19:49:26 -0400 Subject: [PATCH 17/20] Update guns.dm --- modular_vcg/modules/weapons/code/guns.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modular_vcg/modules/weapons/code/guns.dm b/modular_vcg/modules/weapons/code/guns.dm index fb2392313b3d..d7355fa7c2e9 100644 --- a/modular_vcg/modules/weapons/code/guns.dm +++ b/modular_vcg/modules/weapons/code/guns.dm @@ -82,4 +82,5 @@ /obj/item/ammo_box/magazine/darkpack556/hunt name = "rifle magazine (7.62x51mm)" caliber = CALIBER_762NATO - max_ammo = 10 + ammo_type = /obj/item/ammo_casing/vampire/c762x51mm + max_ammo = 8 From fb16c544cee074512dc83053bd36daa67fc7ec54 Mon Sep 17 00:00:00 2001 From: Avalon Date: Tue, 25 Aug 2026 19:06:27 -0400 Subject: [PATCH 18/20] Update projectiles.dm --- modular_vcg/modules/weapons/code/projectiles.dm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/modular_vcg/modules/weapons/code/projectiles.dm b/modular_vcg/modules/weapons/code/projectiles.dm index cdfec710fc36..283368410a78 100644 --- a/modular_vcg/modules/weapons/code/projectiles.dm +++ b/modular_vcg/modules/weapons/code/projectiles.dm @@ -58,6 +58,7 @@ armour_penetration = 10 exposed_wound_bonus = 10 wound_bonus = 10 + sharpness = SHARP_EDGED // Rifle cartridges @@ -112,14 +113,16 @@ armour_penetration = 95 exposed_wound_bonus = -10 wound_bonus = 20 + sharpness = SHARP_EDGED // Shotgun ammunition /obj/projectile/bullet/darkpack/dragonsbreath - damage = 8 + damage = 10 armour_penetration = 0 exposed_wound_bonus = 5 wound_bonus = 5 + var/firestacks = 2 /obj/projectile/bullet/darkpack/shotpellet damage = 12 @@ -128,6 +131,7 @@ /obj/projectile/bullet/shotgun_slug/vamp damage = 80 exposed_wound_bonus = 10 + sharpness = SHARP_EDGED /obj/projectile/bullet/shotgun_slug/vamp/silver exposed_wound_bonus = 5 @@ -138,6 +142,7 @@ damage = 5 exposed_wound_bonus = 0 wound_bonus = -5 + sharpness = NONE /obj/projectile/bullet/crossbow_bolt damage = 45 @@ -150,9 +155,8 @@ armour_penetration = 60 exposed_wound_bonus = 15 wound_bonus = 15 + sharpness = SHARP_EDGED /obj/projectile/bullet/darkpack/vamp75/silver - damage = 150 - armour_penetration = 60 - exposed_wound_bonus = 15 - wound_bonus = 15 + armour_penetration = 50 + From 8a6eef3d5bd18e10aa73b3f65f57b78ab44fd729 Mon Sep 17 00:00:00 2001 From: Avalon Date: Fri, 28 Aug 2026 21:06:39 -0400 Subject: [PATCH 19/20] Rah --- .../modules/retail/code/stores/camping_store.dm | 4 ++-- modular_vcg/modules/weapons/code/projectiles.dm | 10 +++------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/modular_darkpack/modules/retail/code/stores/camping_store.dm b/modular_darkpack/modules/retail/code/stores/camping_store.dm index 755a24e80c0c..85057cf692a8 100644 --- a/modular_darkpack/modules/retail/code/stores/camping_store.dm +++ b/modular_darkpack/modules/retail/code/stores/camping_store.dm @@ -5,7 +5,7 @@ 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 - Was 5.56 + 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("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), @@ -19,7 +19,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("7.52x51 ammo", /obj/item/ammo_box/darkpack/c762x51mm, 1000), // Crimson Grid Additon + 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( diff --git a/modular_vcg/modules/weapons/code/projectiles.dm b/modular_vcg/modules/weapons/code/projectiles.dm index 283368410a78..9c4a6e526f47 100644 --- a/modular_vcg/modules/weapons/code/projectiles.dm +++ b/modular_vcg/modules/weapons/code/projectiles.dm @@ -90,21 +90,17 @@ // 7.62x51mm /obj/projectile/bullet/darkpack/vamp762x51mm - damage = 55 armour_penetration = 45 exposed_wound_bonus = -5 wound_bonus = 10 /obj/projectile/bullet/darkpack/vamp762x51mm/silver - damage = 55 - armour_penetration = 45 - exposed_wound_bonus = -5 - wound_bonus = 10 + exposed_wound_bonus = 0 + wound_bonus = 5 /obj/projectile/bullet/darkpack/vamp762x51mm/incendiary - damage = 55 armour_penetration = 15 - exposed_wound_bonus = 0 + exposed_wound_bonus = 5 wound_bonus = 10 // .50 BMG From a18add958024f98303c9c56da7e5869b454fd376 Mon Sep 17 00:00:00 2001 From: Avalon Date: Mon, 31 Aug 2026 09:24:00 -0400 Subject: [PATCH 20/20] Update projectiles.dm --- modular_vcg/modules/weapons/code/projectiles.dm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/modular_vcg/modules/weapons/code/projectiles.dm b/modular_vcg/modules/weapons/code/projectiles.dm index 9c4a6e526f47..637a369b898e 100644 --- a/modular_vcg/modules/weapons/code/projectiles.dm +++ b/modular_vcg/modules/weapons/code/projectiles.dm @@ -7,7 +7,6 @@ exposed_wound_bonus = 10 /obj/projectile/bullet/darkpack/vamp9mm/silver - damage = 30 exposed_wound_bonus = 10 /obj/projectile/bullet/darkpack/vamp9mm/plus @@ -29,27 +28,24 @@ armour_penetration = 0 /obj/projectile/bullet/darkpack/vamp45acp/silver - damage = 35 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 = 20 + armour_penetration = 25 exposed_wound_bonus = 0 wound_bonus = 10 /obj/projectile/bullet/darkpack/vamp44/silver - damage = 45 - armour_penetration = 15 - exposed_wound_bonus = 0 - wound_bonus = 10 + exposed_wound_bonus = -5 // .50 Action Express @@ -72,7 +68,7 @@ /obj/projectile/bullet/darkpack/vamp556mm/incendiary armour_penetration = 15 - exposed_wound_bonus = 0 + exposed_wound_bonus = 5 wound_bonus = 10 /obj/projectile/bullet/darkpack/vamp556mm/silver