diff --git a/modular_vcg/modules/clothes/code/suit.dm b/modular_vcg/modules/clothes/code/suit.dm new file mode 100644 index 000000000000..6ded1433fbbf --- /dev/null +++ b/modular_vcg/modules/clothes/code/suit.dm @@ -0,0 +1,19 @@ + +/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 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 a0454197eafa..daa8c6366cf2 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -8326,6 +8326,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"