Skip to content

Commit

Permalink
Add pistol HOS. and fix brain damage (#2579)
Browse files Browse the repository at this point in the history
  • Loading branch information
Teteshnik1 authored Aug 3, 2024
1 parent 0e6ec87 commit 1535a77
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 5 deletions.
7 changes: 5 additions & 2 deletions code/modules/organs/internal/brain.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions maps/sierra/structures/closets/security.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
25 changes: 25 additions & 0 deletions mods/guns/code/projectile.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Binary file added mods/guns/icons/obj/M1911.dmi
Binary file not shown.
Binary file added mods/guns/icons/obj/ammo_m1911.dmi
Binary file not shown.
Binary file added mods/guns/sounds/pistol_fire.ogg
Binary file not shown.

0 comments on commit 1535a77

Please sign in to comment.