From e8011776a62321de35b169e2cf8b3b0ce19cfdd5 Mon Sep 17 00:00:00 2001 From: TheTrueSilverRat Date: Fri, 14 Aug 2026 16:46:03 +0800 Subject: [PATCH 1/6] Update guns.dm --- modular_darkpack/modules/weapons/code/guns.dm | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/modular_darkpack/modules/weapons/code/guns.dm b/modular_darkpack/modules/weapons/code/guns.dm index b8a22f964d68..3ea04ee3f37d 100644 --- a/modular_darkpack/modules/weapons/code/guns.dm +++ b/modular_darkpack/modules/weapons/code/guns.dm @@ -8,7 +8,7 @@ worn_icon = 'modular_darkpack/modules/weapons/icons/worn_guns.dmi' ONFLOOR_ICON_HELPER('modular_darkpack/modules/weapons/icons/weapons_onfloor.dmi') recoil = 5 - + slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_SUITSTORE //Leave serial_type blank for no serial number/obliterated serial number. serial_type = "SF" @@ -429,6 +429,7 @@ fire_delay = 2 recoil = 5 spread = 4 + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE bolt_type = BOLT_TYPE_LOCKING show_bolt_icon = FALSE mag_display = TRUE @@ -452,6 +453,7 @@ fire_delay = 1 spread = 2 recoil = 3 + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE bolt_type = BOLT_TYPE_LOCKING show_bolt_icon = FALSE mag_display = TRUE @@ -485,6 +487,7 @@ recoil = 5 burst_size = 1 spread = 5 + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE bolt_type = BOLT_TYPE_LOCKING show_bolt_icon = FALSE mag_display = TRUE @@ -503,6 +506,7 @@ desc = "Pretty old, but also easy fireable and cleanable by vodka. This one has had its stock removed and the barrel chopped; it's a miracle it still cycles! Uses 5.45 rounds." icon_state = "ak74_sawn" inhand_icon_state = "ak74_sawn" + slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_SUITSTORE w_class = WEIGHT_CLASS_NORMAL weapon_weight = WEAPON_MEDIUM recoil = 8 //Increased recoil due to sawing off the stock on a full-auto. Bootleg draco. @@ -532,6 +536,7 @@ fire_delay = 2 spread = 3 recoil = 5 + slot = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE bolt_type = BOLT_TYPE_LOCKING show_bolt_icon = FALSE mag_display = TRUE @@ -563,6 +568,7 @@ recoil = 5 burst_size = 1 spread = 15 + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE bolt_type = BOLT_TYPE_OPEN show_bolt_icon = FALSE mag_display = TRUE @@ -609,7 +615,7 @@ recoil = 3 fire_delay = 1 //It's bolt-action. Fast as you can go really; which is still pretty slow. burst_size = 1 - slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT | ITEM_SLOT_SUITSTORE projectile_damage_multiplier = 1.5 //~52 damage vs 35 base .44 damage. It's ok, on par with 5.56 but lower pen and slower to fire due to bolt action. masquerade_violating = FALSE serial_type = "WN" @@ -661,7 +667,7 @@ //zoomable = TRUE //zoom_amt = 10 //Long range, enough to see in front of you, but no tiles behind you. //zoom_out_amt = 5 - slot_flags = ITEM_SLOT_BACK + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE projectile_damage_multiplier = 2 //140 damage. Nice. actions_types = list() masquerade_violating = TRUE @@ -693,7 +699,7 @@ fire_delay = 5 spread = 2 recoil = 6 - slot_flags = ITEM_SLOT_BACK + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE projectile_damage_multiplier = 1.5 actions_types = list() masquerade_violating = TRUE @@ -734,6 +740,7 @@ worn_icon_state = "pomp" recoil = 6 fire_delay = 6 + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE accepted_magazine_type = /obj/item/ammo_box/magazine/internal/vampshotgun can_be_sawn_off = TRUE fire_sound = 'modular_darkpack/modules/deprecated/sounds/pomp.ogg' @@ -754,6 +761,7 @@ recoil = 10 w_class = WEIGHT_CLASS_NORMAL weapon_weight = WEAPON_MEDIUM + slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_SUITSTORE accepted_magazine_type = /obj/item/ammo_box/magazine/internal/vampshotgun/sawnoff /obj/item/ammo_box/magazine/internal/darkpack_dbarrel @@ -785,6 +793,7 @@ burst_delay = 2 recoil = 5 spread = 2 + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE fire_delay = 3 accepted_magazine_type = /obj/item/ammo_box/magazine/internal/darkpack_dbarrel can_be_sawn_off = TRUE @@ -804,6 +813,7 @@ . = ..() w_class = WEIGHT_CLASS_NORMAL //Lets you stow it in a bag weapon_weight = WEAPON_MEDIUM //Lets you one-hand it on sawing. + slot_flags = ITEM_SLOT_SUITSTORE | ITEM_SLOT_BELT // Lets you put it on your belt now /obj/item/ammo_box/magazine/darkpackautoshot name = "shotgun magazine (12ga)" @@ -833,7 +843,7 @@ show_bolt_icon = FALSE mag_display = TRUE fire_sound = 'modular_darkpack/modules/deprecated/sounds/pomp.ogg' - slot_flags = ITEM_SLOT_BACK + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE projectile_damage_multiplier = 0.9 masquerade_violating = TRUE recoil = 6 @@ -849,6 +859,7 @@ icon_state = "crossbow0" inhand_icon_state = "crossbow0" fire_delay = 16 + slot_flags = ITEM_SLOT_SUITSTORE | ITEM_SLOT_BACK | ITEM_SLOT_BELT accepted_magazine_type = /obj/item/ammo_box/magazine/internal/vampcrossbow fire_sound = 'sound/items/syringeproj.ogg' w_class = WEIGHT_CLASS_NORMAL @@ -890,7 +901,7 @@ recoil = 10 //tee hee spread = 14 w_class = WEIGHT_CLASS_BULKY - slot_flags = ITEM_SLOT_BACK + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE projectile_damage_multiplier = 1.5 //150 damage; it is a single-shot. serial_shown = FALSE //No serial, it's a musket. actions_types = list() @@ -909,4 +920,4 @@ recoil = 12 spread = 25 //+25 from sawing off anyway, good fucking luck w_class = WEIGHT_CLASS_NORMAL - slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT | ITEM_SLOT_SUITSTORE From a997adb9e3e1d0efe6231c4b0b2b34564fe0ca72 Mon Sep 17 00:00:00 2001 From: TheTrueSilverRat Date: Fri, 14 Aug 2026 17:42:10 +0800 Subject: [PATCH 2/6] lots more edits --- code/__DEFINES/~~crimson_defines/inventory.dm | 16 ++++++++++++ modular_darkpack/modules/weapons/code/guns.dm | 25 ++++++------------- modular_vcg/modules/clothes/code/suit.dm | 20 +++++++++++++++ modular_vcg/modules/weapons/code/guns.dm | 14 +++++++++++ modular_vcg/modules/weapons/code/melee.dm | 21 ++++++++++++++++ tgstation.dme | 2 ++ 6 files changed, 80 insertions(+), 18 deletions(-) create mode 100644 code/__DEFINES/~~crimson_defines/inventory.dm create mode 100644 modular_vcg/modules/clothes/code/suit.dm diff --git a/code/__DEFINES/~~crimson_defines/inventory.dm b/code/__DEFINES/~~crimson_defines/inventory.dm new file mode 100644 index 000000000000..e0ef8cc6378b --- /dev/null +++ b/code/__DEFINES/~~crimson_defines/inventory.dm @@ -0,0 +1,16 @@ +//necessary for the new inventory stuff Cause holy shit is darkpack items loogged in stupdily + +//Mostly a just in case someone needs a "Store all melee weapons" cause holy moly do they have some random names +GLOBAL_LIST_INIT(darkpack_melee list( + /obj/item/melee/vamp, + /obj/item/fireaxe/vamp, + /obj/item/katana/vamp, + /obj/item/melee/sabre/vamp, + /obj/item/melee/sabre/rapier, + /obj/item/claymore/longsword, + /obj/item/claymore/machete, + /obj/item/melee/baseball_bat/vamp, + /obj/item/knife/vamp, + /obj/item/shovel/vamp, + /obj/item/scythe/vamp, +)) diff --git a/modular_darkpack/modules/weapons/code/guns.dm b/modular_darkpack/modules/weapons/code/guns.dm index 3ea04ee3f37d..b8a22f964d68 100644 --- a/modular_darkpack/modules/weapons/code/guns.dm +++ b/modular_darkpack/modules/weapons/code/guns.dm @@ -8,7 +8,7 @@ worn_icon = 'modular_darkpack/modules/weapons/icons/worn_guns.dmi' ONFLOOR_ICON_HELPER('modular_darkpack/modules/weapons/icons/weapons_onfloor.dmi') recoil = 5 - slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_SUITSTORE + //Leave serial_type blank for no serial number/obliterated serial number. serial_type = "SF" @@ -429,7 +429,6 @@ fire_delay = 2 recoil = 5 spread = 4 - slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE bolt_type = BOLT_TYPE_LOCKING show_bolt_icon = FALSE mag_display = TRUE @@ -453,7 +452,6 @@ fire_delay = 1 spread = 2 recoil = 3 - slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE bolt_type = BOLT_TYPE_LOCKING show_bolt_icon = FALSE mag_display = TRUE @@ -487,7 +485,6 @@ recoil = 5 burst_size = 1 spread = 5 - slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE bolt_type = BOLT_TYPE_LOCKING show_bolt_icon = FALSE mag_display = TRUE @@ -506,7 +503,6 @@ desc = "Pretty old, but also easy fireable and cleanable by vodka. This one has had its stock removed and the barrel chopped; it's a miracle it still cycles! Uses 5.45 rounds." icon_state = "ak74_sawn" inhand_icon_state = "ak74_sawn" - slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_SUITSTORE w_class = WEIGHT_CLASS_NORMAL weapon_weight = WEAPON_MEDIUM recoil = 8 //Increased recoil due to sawing off the stock on a full-auto. Bootleg draco. @@ -536,7 +532,6 @@ fire_delay = 2 spread = 3 recoil = 5 - slot = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE bolt_type = BOLT_TYPE_LOCKING show_bolt_icon = FALSE mag_display = TRUE @@ -568,7 +563,6 @@ recoil = 5 burst_size = 1 spread = 15 - slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE bolt_type = BOLT_TYPE_OPEN show_bolt_icon = FALSE mag_display = TRUE @@ -615,7 +609,7 @@ recoil = 3 fire_delay = 1 //It's bolt-action. Fast as you can go really; which is still pretty slow. burst_size = 1 - slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT | ITEM_SLOT_SUITSTORE + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT projectile_damage_multiplier = 1.5 //~52 damage vs 35 base .44 damage. It's ok, on par with 5.56 but lower pen and slower to fire due to bolt action. masquerade_violating = FALSE serial_type = "WN" @@ -667,7 +661,7 @@ //zoomable = TRUE //zoom_amt = 10 //Long range, enough to see in front of you, but no tiles behind you. //zoom_out_amt = 5 - slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE + slot_flags = ITEM_SLOT_BACK projectile_damage_multiplier = 2 //140 damage. Nice. actions_types = list() masquerade_violating = TRUE @@ -699,7 +693,7 @@ fire_delay = 5 spread = 2 recoil = 6 - slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE + slot_flags = ITEM_SLOT_BACK projectile_damage_multiplier = 1.5 actions_types = list() masquerade_violating = TRUE @@ -740,7 +734,6 @@ worn_icon_state = "pomp" recoil = 6 fire_delay = 6 - slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE accepted_magazine_type = /obj/item/ammo_box/magazine/internal/vampshotgun can_be_sawn_off = TRUE fire_sound = 'modular_darkpack/modules/deprecated/sounds/pomp.ogg' @@ -761,7 +754,6 @@ recoil = 10 w_class = WEIGHT_CLASS_NORMAL weapon_weight = WEAPON_MEDIUM - slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_SUITSTORE accepted_magazine_type = /obj/item/ammo_box/magazine/internal/vampshotgun/sawnoff /obj/item/ammo_box/magazine/internal/darkpack_dbarrel @@ -793,7 +785,6 @@ burst_delay = 2 recoil = 5 spread = 2 - slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE fire_delay = 3 accepted_magazine_type = /obj/item/ammo_box/magazine/internal/darkpack_dbarrel can_be_sawn_off = TRUE @@ -813,7 +804,6 @@ . = ..() w_class = WEIGHT_CLASS_NORMAL //Lets you stow it in a bag weapon_weight = WEAPON_MEDIUM //Lets you one-hand it on sawing. - slot_flags = ITEM_SLOT_SUITSTORE | ITEM_SLOT_BELT // Lets you put it on your belt now /obj/item/ammo_box/magazine/darkpackautoshot name = "shotgun magazine (12ga)" @@ -843,7 +833,7 @@ show_bolt_icon = FALSE mag_display = TRUE fire_sound = 'modular_darkpack/modules/deprecated/sounds/pomp.ogg' - slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE + slot_flags = ITEM_SLOT_BACK projectile_damage_multiplier = 0.9 masquerade_violating = TRUE recoil = 6 @@ -859,7 +849,6 @@ icon_state = "crossbow0" inhand_icon_state = "crossbow0" fire_delay = 16 - slot_flags = ITEM_SLOT_SUITSTORE | ITEM_SLOT_BACK | ITEM_SLOT_BELT accepted_magazine_type = /obj/item/ammo_box/magazine/internal/vampcrossbow fire_sound = 'sound/items/syringeproj.ogg' w_class = WEIGHT_CLASS_NORMAL @@ -901,7 +890,7 @@ recoil = 10 //tee hee spread = 14 w_class = WEIGHT_CLASS_BULKY - slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE + slot_flags = ITEM_SLOT_BACK projectile_damage_multiplier = 1.5 //150 damage; it is a single-shot. serial_shown = FALSE //No serial, it's a musket. actions_types = list() @@ -920,4 +909,4 @@ recoil = 12 spread = 25 //+25 from sawing off anyway, good fucking luck w_class = WEIGHT_CLASS_NORMAL - slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT | ITEM_SLOT_SUITSTORE + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT diff --git a/modular_vcg/modules/clothes/code/suit.dm b/modular_vcg/modules/clothes/code/suit.dm new file mode 100644 index 000000000000..526905c73e06 --- /dev/null +++ b/modular_vcg/modules/clothes/code/suit.dm @@ -0,0 +1,20 @@ + +/obj/item/clothing/suit/vampire/jacket/Initialize(mapload) + . = ..() + allowed += GLOB.security_vest_allowed +/obj/item/clothing/suit/vampire/trench/Initialize(mapload) + . = ..() + allowed += GLOB.security_vest_allowed + +/obj/item/clothing/suit/vampire/vest/Initialize(mapload) + . = ..() + allowed += GLOB.security_vest_allowed + +/obj/item/clothing/suit/vampire/eod/Initialize(mapload) + . = ..() + allowed += GLOB.security_vest_allowed + +/obj/item/clothing/suit/vampire/bogatyr/Initialize(mapload) + . = ..() + allowed += GLOB.security_vest_allowed + allowed += GLOB.darkpack_melee //Bogatyar armor knows how to hold melee stuff diff --git a/modular_vcg/modules/weapons/code/guns.dm b/modular_vcg/modules/weapons/code/guns.dm index 1e8fd87ee815..d312b1837187 100644 --- a/modular_vcg/modules/weapons/code/guns.dm +++ b/modular_vcg/modules/weapons/code/guns.dm @@ -1,5 +1,6 @@ /obj/item/gun/ballistic/automatic/darkpack recoil = 3 + slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_SUITSTORE /obj/item/gun/ballistic/automatic/pistol/darkpack recoil = 2 @@ -39,42 +40,55 @@ // Rifles /obj/item/gun/ballistic/automatic/darkpack/ar15 + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE recoil = 3 /obj/item/gun/ballistic/automatic/darkpack/huntrifle + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE recoil = 1 /obj/item/gun/ballistic/automatic/darkpack/ak74 + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE recoil = 3 /obj/item/gun/ballistic/automatic/darkpack/ak74/sawn + slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_SUITSTORE recoil = 4 /obj/item/gun/ballistic/automatic/darkpack/aug + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE recoil = 3 /obj/item/gun/ballistic/automatic/darkpack/thompson + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE | ITEM_SLOT_BELT recoil = 3 /obj/item/gun/ballistic/rifle/darkpack/lever + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT | ITEM_SLOT_SUITSTORE recoil = 1 // Sniper /obj/item/gun/ballistic/automatic/darkpack/sniper + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE recoil = 6 /obj/item/gun/ballistic/automatic/darkpack/autosniper + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE recoil = 4 // Shotguns /obj/item/gun/ballistic/shotgun/vampire + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE recoil = 4 /obj/item/gun/ballistic/shotgun/vampire/sawnoff + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT | ITEM_SLOT_SUITSTORE recoil = 6 /obj/item/gun/ballistic/shotgun/vampire/doublebarrel + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE recoil = 3 /obj/item/gun/ballistic/automatic/darkpack/autoshotgun + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE recoil = 4 diff --git a/modular_vcg/modules/weapons/code/melee.dm b/modular_vcg/modules/weapons/code/melee.dm index d4e5b093eca1..a421175d9e67 100644 --- a/modular_vcg/modules/weapons/code/melee.dm +++ b/modular_vcg/modules/weapons/code/melee.dm @@ -1,14 +1,35 @@ + +//Mostly for item additions +/obj/item/katana/vamp + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT | ITEM_SLOT_SUITSTORE + +/obj/item/melee/sabre/vamp + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT | ITEM_SLOT_SUITSTORE + +/obj/item/melee/sabre/rapier + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT | ITEM_SLOT_SUITSTORE + +/obj/item/claymore/longsword + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT | ITEM_SLOT_SUITSTORE + +/obj/item/melee/baseball_bat/vamp + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT | ITEM_SLOT_SUITSTORE + + /obj/item/chainsaw/vamp force_on = 3 LETHAL_TTRPG_DAMAGE /obj/item/claymore/machete + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT | ITEM_SLOT_SUITSTORE force = 1.5 LETHAL_TTRPG_DAMAGE /obj/item/melee/vamp/tire force = 1 LETHAL_TTRPG_DAMAGE /obj/item/fireaxe/vamp + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE force_wielded = 2 LETHAL_TTRPG_DAMAGE /obj/item/darkpack/spear + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE force = 2 LETHAL_TTRPG_DAMAGE diff --git a/tgstation.dme b/tgstation.dme index e2218384c089..0045861cd2b4 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -503,6 +503,7 @@ #include "code\__DEFINES\~darkpack\traits\sources.dm" #include "code\__DEFINES\~~crimson_defines\admin.dm" #include "code\__DEFINES\~~crimson_defines\chat.dm" +#include "code\__DEFINES\~~crimson_defines\inventory.dm" #include "code\__DEFINES\~~crimson_defines\keybinding.dm" #include "code\__DEFINES\~~crimson_defines\patreon.dm" #include "code\__DEFINES\~~crimson_defines\phone.dm" @@ -8298,6 +8299,7 @@ #include "modular_vcg\master_files\code\modules\mocking\client.dm" #include "modular_vcg\master_files\code\modules\phones\code\_phone.dm" #include "modular_vcg\master_files\code\modules\phones\code\_phone_notifications.dm" +#include "modular_vcg\modules\clothes\code\suit.dm" #include "modular_vcg\modules\donator\code\patreon_data.dm" #include "modular_vcg\modules\donator\code\prefs_and_client.dm" #include "modular_vcg\modules\donator\code\twitch_data.dm" From 2e7f4dcf718b575647f21a6f3d8eba4dbc215fa3 Mon Sep 17 00:00:00 2001 From: TheTrueSilverRat Date: Fri, 14 Aug 2026 18:02:02 +0800 Subject: [PATCH 3/6] Update inventory.dm --- code/__DEFINES/~~crimson_defines/inventory.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/__DEFINES/~~crimson_defines/inventory.dm b/code/__DEFINES/~~crimson_defines/inventory.dm index e0ef8cc6378b..7446ed43c894 100644 --- a/code/__DEFINES/~~crimson_defines/inventory.dm +++ b/code/__DEFINES/~~crimson_defines/inventory.dm @@ -1,7 +1,7 @@ //necessary for the new inventory stuff Cause holy shit is darkpack items loogged in stupdily //Mostly a just in case someone needs a "Store all melee weapons" cause holy moly do they have some random names -GLOBAL_LIST_INIT(darkpack_melee list( +GLOBAL_LIST_INIT(darkpack_melee, list( /obj/item/melee/vamp, /obj/item/fireaxe/vamp, /obj/item/katana/vamp, From d31f93066ad5a994e29549e8905242eac4456747 Mon Sep 17 00:00:00 2001 From: TheTrueSilverRat Date: Sat, 15 Aug 2026 09:41:41 +0800 Subject: [PATCH 4/6] Revert "Merge branch 'master' of https://github.com/TheTrueSilverRat/SecondCity" This reverts commit 90a939a4ec8bd81b7b38dee57a0a91fcdbf83f15, reversing changes made to 854d77fbe5414686e9e1694a07086e2f079287ac. --- html/changelogs/AutoChangeLog-pr-1314.yml | 5 +++++ html/changelogs/AutoChangeLog-pr-1348.yml | 6 ++++++ html/changelogs/archive/2026-08.yml | 9 --------- 3 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 html/changelogs/AutoChangeLog-pr-1314.yml create mode 100644 html/changelogs/AutoChangeLog-pr-1348.yml diff --git a/html/changelogs/AutoChangeLog-pr-1314.yml b/html/changelogs/AutoChangeLog-pr-1314.yml new file mode 100644 index 000000000000..36a99d1521f3 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1314.yml @@ -0,0 +1,5 @@ +author: "FalloutFalcon" +delete-after: True +changes: + - rscadd: "Hub displays more information about server" + - config: "Server tagline config to be displayed in hub" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1348.yml b/html/changelogs/AutoChangeLog-pr-1348.yml new file mode 100644 index 000000000000..053d50acbbe4 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1348.yml @@ -0,0 +1,6 @@ +author: "breadcrombs" +delete-after: True +changes: + - rscadd: "The lever action rifle alongside the double barrel shotgun can now be purchased from the supply console." + - rscadd: "45 ACP can now be bought from the supply console." + - balance: "The lever action rifle can now be stored in the belt slot." \ No newline at end of file diff --git a/html/changelogs/archive/2026-08.yml b/html/changelogs/archive/2026-08.yml index 120e2d975d2a..36d5d543b599 100644 --- a/html/changelogs/archive/2026-08.yml +++ b/html/changelogs/archive/2026-08.yml @@ -110,12 +110,3 @@ - rscadd: submarine sandwiches (4 types) flleeppyy: - admin: Removed Darkpack Ban Options and moved LOOC ban to the Abstract category. -2026-08-11: - FalloutFalcon: - - rscadd: Hub displays more information about server - - config: Server tagline config to be displayed in hub - breadcrombs: - - rscadd: The lever action rifle alongside the double barrel shotgun can now be - purchased from the supply console. - - rscadd: 45 ACP can now be bought from the supply console. - - balance: The lever action rifle can now be stored in the belt slot. From 7649e061595b1f6bc1bc679e5aa7029679714457 Mon Sep 17 00:00:00 2001 From: TheTrueSilverRat Date: Tue, 25 Aug 2026 18:56:17 +0800 Subject: [PATCH 5/6] removing that stuff --- code/__DEFINES/~~crimson_defines/inventory.dm | 16 ---------------- tgstation.dme | 1 - 2 files changed, 17 deletions(-) delete mode 100644 code/__DEFINES/~~crimson_defines/inventory.dm diff --git a/code/__DEFINES/~~crimson_defines/inventory.dm b/code/__DEFINES/~~crimson_defines/inventory.dm deleted file mode 100644 index 7446ed43c894..000000000000 --- a/code/__DEFINES/~~crimson_defines/inventory.dm +++ /dev/null @@ -1,16 +0,0 @@ -//necessary for the new inventory stuff Cause holy shit is darkpack items loogged in stupdily - -//Mostly a just in case someone needs a "Store all melee weapons" cause holy moly do they have some random names -GLOBAL_LIST_INIT(darkpack_melee, list( - /obj/item/melee/vamp, - /obj/item/fireaxe/vamp, - /obj/item/katana/vamp, - /obj/item/melee/sabre/vamp, - /obj/item/melee/sabre/rapier, - /obj/item/claymore/longsword, - /obj/item/claymore/machete, - /obj/item/melee/baseball_bat/vamp, - /obj/item/knife/vamp, - /obj/item/shovel/vamp, - /obj/item/scythe/vamp, -)) diff --git a/tgstation.dme b/tgstation.dme index 1e8f6dc34fa8..47f2a8bd6f38 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -503,7 +503,6 @@ #include "code\__DEFINES\~darkpack\traits\sources.dm" #include "code\__DEFINES\~~crimson_defines\admin.dm" #include "code\__DEFINES\~~crimson_defines\chat.dm" -#include "code\__DEFINES\~~crimson_defines\inventory.dm" #include "code\__DEFINES\~~crimson_defines\keybinding.dm" #include "code\__DEFINES\~~crimson_defines\patreon.dm" #include "code\__DEFINES\~~crimson_defines\phone.dm" From c69fb735dc50be4724b7976042d3a2ffcc2c1e97 Mon Sep 17 00:00:00 2001 From: TheTrueSilverRat Date: Tue, 25 Aug 2026 21:50:28 +0800 Subject: [PATCH 6/6] Update suit.dm --- modular_vcg/modules/clothes/code/suit.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/modular_vcg/modules/clothes/code/suit.dm b/modular_vcg/modules/clothes/code/suit.dm index 526905c73e06..6ded1433fbbf 100644 --- a/modular_vcg/modules/clothes/code/suit.dm +++ b/modular_vcg/modules/clothes/code/suit.dm @@ -17,4 +17,3 @@ /obj/item/clothing/suit/vampire/bogatyr/Initialize(mapload) . = ..() allowed += GLOB.security_vest_allowed - allowed += GLOB.darkpack_melee //Bogatyar armor knows how to hold melee stuff