diff --git a/code/modules/organs/internal/brain.dm b/code/modules/organs/internal/brain.dm index ed5d1212a5597..2f37e2cc92acd 100644 --- a/code/modules/organs/internal/brain.dm +++ b/code/modules/organs/internal/brain.dm @@ -205,8 +205,11 @@ /obj/item/organ/internal/brain/take_internal_damage(damageTaken, silent) set waitfor = 0 ..() - if(damageTaken >= 20 && damage >= (max_damage * 0.5)) //This probably won't be triggered by oxyloss or mercury. Probably. - var/damage_secondary = damageTaken * 0.20 + // SIERRA EDIT + ..(damage * 2, silent) + if(damage / 2 >= 10) //This probably won't be triggered by oxyloss or mercury. Probably. + var/damage_secondary = damage / 2 * 0.20 + // SIERRA EDIT-END if (owner) owner.flash_eyes() owner.eye_blurry += damage_secondary diff --git a/maps/sierra/structures/closets/security.dm b/maps/sierra/structures/closets/security.dm index 05c2d02727e68..56d308000898f 100644 --- a/maps/sierra/structures/closets/security.dm +++ b/maps/sierra/structures/closets/security.dm @@ -22,9 +22,8 @@ /obj/item/device/flash, /obj/item/device/megaphone, /obj/item/melee/baton/loaded, - /obj/item/gun/projectile/pistol/sec, - /obj/item/ammo_magazine/pistol/rubber, - /obj/item/ammo_magazine/pistol, + /obj/item/gun/projectile/pistol/hos, + /obj/item/ammo_magazine/pistol/hos = 2, /obj/item/melee/telebaton, /obj/item/device/taperecorder, /obj/item/folder/envelope/nuke, diff --git a/mods/guns/code/projectile.dm b/mods/guns/code/projectile.dm index d18420db2970a..4d1c3c267c083 100644 --- a/mods/guns/code/projectile.dm +++ b/mods/guns/code/projectile.dm @@ -79,3 +79,28 @@ ..() icon_state = (ammo_magazine)? "nt41" : "nt41-e" +/obj/item/gun/projectile/pistol/hos + name = "Kimber Warrior custom" + desc = "The old pistol is in good condition, it used to be in service with the armed forces for officers. You can see silver and bronze on it" + icon = 'mods/guns/icons/obj/M1911.dmi' + icon_state = "standart" + caliber = CALIBER_PISTOL_MAGNUM + magazine_type = /obj/item/ammo_magazine/pistol/hos + allowed_magazines = /obj/item/ammo_magazine/pistol/hos + accuracy = -1 + fire_delay = 5 + origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3) + fire_sound = 'mods/guns/sounds/pistol_fire.ogg' + +/obj/item/ammo_magazine/pistol/hos + name = "Kimber magazine" + icon = 'mods/guns/icons/obj/ammo_m1911.dmi' + icon_state = "m1911" + mag_type = MAGAZINE + matter = list(MATERIAL_STEEL = 1200) + caliber = CALIBER_PISTOL_MAGNUM + ammo_type = /obj/item/ammo_casing/pistol/magnum + max_ammo = 8 + +/obj/item/ammo_magazine/pistol/hos/empty + initial_ammo = 0 diff --git a/mods/guns/icons/obj/M1911.dmi b/mods/guns/icons/obj/M1911.dmi new file mode 100644 index 0000000000000..f29e8ab1c9b52 Binary files /dev/null and b/mods/guns/icons/obj/M1911.dmi differ diff --git a/mods/guns/icons/obj/ammo_m1911.dmi b/mods/guns/icons/obj/ammo_m1911.dmi new file mode 100644 index 0000000000000..693e8db9a7490 Binary files /dev/null and b/mods/guns/icons/obj/ammo_m1911.dmi differ diff --git a/mods/guns/sounds/pistol_fire.ogg b/mods/guns/sounds/pistol_fire.ogg new file mode 100644 index 0000000000000..a808f86907302 Binary files /dev/null and b/mods/guns/sounds/pistol_fire.ogg differ