From df7d0eb05fcb3304780588cad9ce85c676dda153 Mon Sep 17 00:00:00 2001 From: Spades Date: Mon, 19 Jun 2017 22:29:24 -0400 Subject: [PATCH] .dm file changes first --- .../structures/crates_lockers/closets/secure/security.dm | 4 ++-- code/modules/clothing/suits/armor_vr.dm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index fdfa3c482ac..8a9875506e8 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -142,10 +142,10 @@ new /obj/item/weapon/storage/box/flashbangs(src) new /obj/item/device/flash(src) new /obj/item/weapon/melee/baton/loaded(src) - new /obj/item/weapon/gun/projectile/lamia(src) + /*new /obj/item/weapon/gun/projectile/lamia(src) new /obj/item/ammo_magazine/m44/rubber(src) new /obj/item/ammo_magazine/m44(src) - new /obj/item/ammo_magazine/m44(src) + new /obj/item/ammo_magazine/m44(src)*/ // NO YOU DO NOT GET A .44 MAGNUM! -Ace new /obj/item/weapon/gun/energy/gun(src) new /obj/item/weapon/cell/device/weapon(src) new /obj/item/weapon/melee/telebaton(src) diff --git a/code/modules/clothing/suits/armor_vr.dm b/code/modules/clothing/suits/armor_vr.dm index 509b58e5465..9d44f78a49d 100644 --- a/code/modules/clothing/suits/armor_vr.dm +++ b/code/modules/clothing/suits/armor_vr.dm @@ -35,10 +35,10 @@ /obj/item/clothing/suit/storage/vest/hoscoat - armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 40, bio = 0, rad = 0) + armor = list(melee = 50, bullet = 40, laser = 40, energy = 25, bomb = 25, bio = 0, rad = 0) /obj/item/clothing/suit/storage/vest/hos - armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 40, bio = 0, rad = 0) + armor = list(melee = 50, bullet = 40, laser = 40, energy = 25, bomb = 25, bio = 0, rad = 0) /obj/item/clothing/suit/storage/vest/hoscoat/jensen name = "armored trenchcoat"