Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Another outdated Beretta's PR, as usual. #552

Closed
wants to merge 15 commits into from
Closed

Another outdated Beretta's PR, as usual. #552

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
6fa8db5
New handgun Beretta M9
TakeItEasyiloveyou Oct 23, 2023
09730e0
fix: Fucked up in code
TakeItEasyiloveyou Oct 23, 2023
6b911e9
Merge branch 'master' into berettam9
TakeItEasyiloveyou Oct 23, 2023
3e864ee
Merge branch 'master' into berettam9
TakeItEasyiloveyou Oct 24, 2023
9cba9a1
fix: A little code improvement
TakeItEasyiloveyou Oct 24, 2023
0a7310b
fix: Ya eblan.
TakeItEasyiloveyou Oct 24, 2023
040f862
fix: Had to readd calibers
TakeItEasyiloveyou Oct 24, 2023
3bb575b
Code update
TakeItEasyiloveyou Oct 25, 2023
5eceafd
fix: Moved Beretta away from weapons.dm
TakeItEasyiloveyou Oct 26, 2023
e67ad00
fix: Another day, another shit in code
TakeItEasyiloveyou Oct 26, 2023
0eac10b
Revert "fix: Another day, another shit in code"
TakeItEasyiloveyou Oct 26, 2023
bb9b15e
Merge branch 'master' into berettam9
TakeItEasyiloveyou Oct 26, 2023
58454fc
Merge branch 'berettam9' of https://github.com/TakeItEasyiloveyou/Par…
TakeItEasyiloveyou Oct 26, 2023
41ee248
hi
TakeItEasyiloveyou Oct 26, 2023
b4bbccf
fix: Hi again, obnovlyaisa
TakeItEasyiloveyou Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
208 changes: 208 additions & 0 deletions modular_ss220/objects/code/weapons.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,3 +163,211 @@
max_ammo = 100
icon = 'modular_ss220/objects/icons/ammo.dmi'
icon_state = "mm127_box"

//Beretta M9//

/obj/item/gun/projectile/automatic/pistol/beretta
name = "Беретта M9"
desc = "Один из самых распространенных и узнаваемых пистолетов во вселенной. Старая добрая классика."
icon = 'modular_ss220/objects/icons/guns.dmi'
icon_state = "beretta"
item_state = "beretta"
mag_type = /obj/item/ammo_box/magazine/beretta
fire_sound = 'modular_ss220/objects/sound/weapons/gunshots/beretta_shot.ogg'

/obj/item/gun/projectile/automatic/pistol/beretta/update_icon_state()

icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"
TakeItEasyiloveyou marked this conversation as resolved.
Show resolved Hide resolved

/obj/item/ammo_box/magazine/beretta
name = "beretta rubber 9x19mm magazine"
icon = 'modular_ss220/objects/icons/ammo.dmi'
icon_state = "berettar-10"
base_icon_state = "berettar"
ammo_type = /obj/item/ammo_casing/beretta/mmrub919
max_ammo = 10
caliber = "919mmr"
TakeItEasyiloveyou marked this conversation as resolved.
Show resolved Hide resolved

/obj/item/ammo_box/magazine/beretta/update_icon_state()

icon_state = "[base_icon_state]-[round(ammo_count(),2)]"
TakeItEasyiloveyou marked this conversation as resolved.
Show resolved Hide resolved

/obj/item/ammo_box/magazine/beretta/mm919
name = "beretta lethal 9x19mm magazine"
icon = 'modular_ss220/objects/icons/ammo.dmi'
icon_state = "berettal-10"
base_icon_state = "berettal"
ammo_type = /obj/item/ammo_casing/beretta/mm919
max_ammo = 10
caliber = "919mm"

/obj/item/ammo_box/magazine/beretta/mmbsp919
name = "beretta bluespace 9x19mm magazine"
icon = 'modular_ss220/objects/icons/ammo.dmi'
icon_state = "berettab-10"
base_icon_state = "berettab"
ammo_type = /obj/item/ammo_casing/beretta/mmbsp919
max_ammo = 10
caliber = "919bmm"

/obj/item/ammo_box/magazine/beretta/mmap919
name = "beretta armor-piercing 9x19mm magazine"
icon = 'modular_ss220/objects/icons/ammo.dmi'
icon_state = "berettaap-10"
base_icon_state = "berettaap"
ammo_type = /obj/item/ammo_casing/beretta/mmap919
max_ammo = 10
caliber = "919apmm"

/obj/item/ammo_casing/beretta/mmbsp919
caliber = "919bmm"
name = "9x19mm bluespace bullet casing"
desc = "A 9x19mm bluespace bullet casing."
projectile_type = /obj/item/projectile/bullet/mmbsp919

/obj/item/projectile/bullet/mmbsp919
name = "9x19 bluespace bullet"
damage = 18
speed = 0.2

/obj/item/ammo_casing/beretta/mmap919
caliber = "919apmm"
name = "9x19mm armor-piercing bullet casing"
desc = "A 9x19 armor-piercing bullet casing."
projectile_type = /obj/item/projectile/bullet/mmap919

/obj/item/projectile/bullet/mmap919
name = "9x19mm armor-piercing bullet"
damage = 18
armour_penetration_percentage = 35
armour_penetration_flat = 15

/obj/item/ammo_casing/beretta/mmrub919
caliber = "919mmr"
icon = 'modular_ss220/objects/icons/ammo.dmi'
icon_state = "casingmm919"
projectile_type = /obj/item/projectile/bullet/weakbullet4

/obj/item/ammo_casing/beretta/mm919
caliber = "919mm"
icon = 'modular_ss220/objects/icons/ammo.dmi'
icon_state = "casingmm919"
projectile_type = /obj/item/projectile/bullet/weakbullet3

/obj/item/ammo_box/beretta/mm919
name = "box of lethal 9x19mm cartridges"
desc = "Contains up to 20 9x19mm cartridges."
w_class = WEIGHT_CLASS_NORMAL
ammo_type = /obj/item/ammo_casing/beretta/mm919
max_ammo = 20
icon = 'modular_ss220/objects/icons/ammo.dmi'
icon_state = "9mm_box"

/obj/item/ammo_box/beretta/mmrub919
name = "box of rubber 9x19mm cartridges"
desc = "Contains up to 20 rubber 9x19mm cartridges."
w_class = WEIGHT_CLASS_NORMAL
ammo_type = /obj/item/ammo_casing/beretta/mmrub919
max_ammo = 30
icon = 'modular_ss220/objects/icons/ammo.dmi'
icon_state = "9mmr_box"

/obj/item/ammo_box/beretta/mmbsp919
name = "box of bluespace 9x19mm cartridges"
desc = "Contains up to 20 experimental 9x19mm cartridges."
w_class = WEIGHT_CLASS_NORMAL
ammo_type = /obj/item/ammo_casing/beretta/mmbsp919
max_ammo = 20
icon = 'modular_ss220/objects/icons/ammo.dmi'
icon_state = "9mmb_box"

/obj/item/ammo_box/beretta/mmap919
name = "box of armor-penetration 9x19mm cartridges"
desc = "Contains up to 20 armor-penetration 9x19mm cartridges."
w_class = WEIGHT_CLASS_NORMAL
ammo_type = /obj/item/ammo_casing/beretta/mmap919
max_ammo = 20
icon = 'modular_ss220/objects/icons/ammo.dmi'
icon_state = "9mmap_box"

/datum/supply_packs/security/armory/beretta
name = "Beretta M9 Crate"
contains = list(/obj/item/gun/projectile/automatic/pistol/beretta,
/obj/item/gun/projectile/automatic/pistol/beretta)
cost = 450
containername = "beretta m9 pack"

/datum/supply_packs/security/armory/berettarubberammo
name = "Beretta M9 Rubber Ammunition Crate"
contains = list(/obj/item/ammo_box/beretta/mmrub919,
/obj/item/ammo_box/beretta/mmrub919,
/obj/item/ammo_box/beretta/mmrub919,
/obj/item/ammo_box/beretta/mmrub919,
/obj/item/ammo_box/magazine/beretta,
/obj/item/ammo_box/magazine/beretta)
cost = 350
containername = "beretta rubber ammunition pack"

/datum/supply_packs/security/armory/berettalethalammo
name = "Beretta M9 Lethal Ammunition Crate"
contains = list(/obj/item/ammo_box/beretta/mm919,
/obj/item/ammo_box/beretta/mm919,
/obj/item/ammo_box/beretta/mm919,
/obj/item/ammo_box/beretta/mm919,
/obj/item/ammo_box/magazine/beretta/mm919,
/obj/item/ammo_box/magazine/beretta/mm919)
cost = 400
containername = "beretta lethal ammunition pack"

/datum/supply_packs/security/armory/berettaexperimentalammo
name = "Beretta M9 Bluespace Ammunition Crate"
contains = list(/obj/item/ammo_box/beretta/mmbsp919,
/obj/item/ammo_box/beretta/mmbsp919,
/obj/item/ammo_box/beretta/mmbsp919,
/obj/item/ammo_box/beretta/mmbsp919,
/obj/item/ammo_box/magazine/beretta/mmbsp919,
/obj/item/ammo_box/magazine/beretta/mmbsp919)
cost = 500
containername = "beretta bluespace ammunition pack"

/datum/supply_packs/security/armory/berettaarmorpiercingammo
name = "Beretta M9 Armor-piercing Ammunition Crate"
contains = list(/obj/item/ammo_box/beretta/mmap919,
/obj/item/ammo_box/beretta/mmap919,
/obj/item/ammo_box/beretta/mmap919,
/obj/item/ammo_box/beretta/mmap919,
/obj/item/ammo_box/magazine/beretta/mmap919,
/obj/item/ammo_box/magazine/beretta/mmap919)
cost = 500
containername = "beretta AP ammunition pack"

/datum/design/box_beretta/lethal
name = "Beretta M9 Lethal Ammo Box (9mm)"
desc = "A box of 20 lethal rounds for Beretta M9"
id = "box_beretta"
req_tech = list("combat" = 2, "materials" = 1)
build_type = PROTOLATHE
materials = list(MAT_METAL = 6000, MAT_SILVER = 600)
build_path = /obj/item/ammo_box/beretta/mm919
category = list("Weapons")

/datum/design/box_beretta/ap
name = "Beretta M9 AP Ammo Box (9mm)"
desc = "A box of 20 armor-piercing rounds for Beretta M9"
id = "box_beretta"
req_tech = list("combat" = 3, "materials" = 2)
build_type = PROTOLATHE
materials = list(MAT_METAL = 6000, MAT_SILVER = 600, MAT_GLASS = 1000)
build_path = /obj/item/ammo_box/beretta/mmap919
category = list("Weapons")

/datum/design/box_beretta/bluespace
name = "Beretta M9 Bluespace Ammo Box (9mm)"
desc = "A box of 20 high velocity bluespace rounds for Beretta M9"
id = "box_beretta"
req_tech = list("combat" = 3, "materials" = 2, "bluespace" = 3)
TakeItEasyiloveyou marked this conversation as resolved.
Show resolved Hide resolved
build_type = PROTOLATHE
materials = list(MAT_METAL = 8000, MAT_SILVER = 600, MAT_BLUESPACE = 5000)
TakeItEasyiloveyou marked this conversation as resolved.
Show resolved Hide resolved
build_path = /obj/item/ammo_box/beretta/mmbsp919
category = list("Weapons")

Binary file modified modular_ss220/objects/icons/ammo.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified modular_ss220/objects/icons/guns.dmi
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/objects/sound/weapons/gunshots/beretta_shot.ogg
View file
Open in desktop
Binary file not shown.