Skip to content

Commit

Permalink
FIX: Another code fix for Beretta M9 (#593)
Browse files Browse the repository at this point in the history
## Что этот PR делает

Небольшой фикс кода.

## Почему это хорошо для игры

Nanofixes, son. 

## Изображения изменений

Здесь могло быть изображение кода.

## Тестирование

Тест прошел на локалке и вполне успешно. 

## Changelog

:cl:
fix: Починил крафт патронов в протолате рнд. Уменьшил количество коробок
патронов в ящике карго. Сделал перезарядку магазинов как у магазинов
ВТшки.
/:cl:
  • Loading branch information
TakeItEasyiloveyou authored Oct 31, 2023
1 parent 1988123 commit a06590b
Showing 1 changed file with 5 additions and 10 deletions.
15 changes: 5 additions & 10 deletions modular_ss220/objects/code/beretta.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
righthand_file = 'modular_ss220/objects/icons/inhands/guns_righthand.dmi'
icon_state = "beretta"
item_state = "beretta"
w_class = WEIGHT_CLASS_NORMAL
can_suppress = FALSE
mag_type = /obj/item/ammo_box/magazine/beretta
fire_sound = 'modular_ss220/objects/sound/weapons/gunshots/beretta_shot.ogg'
Expand All @@ -20,6 +21,8 @@
multi_sprite_step = 2
ammo_type = /obj/item/ammo_casing/beretta/mmrub919
max_ammo = 10
multiload = 0
slow_loading = TRUE
caliber = "919mm"

/obj/item/ammo_box/magazine/beretta/mm919
Expand Down Expand Up @@ -120,8 +123,6 @@
/datum/supply_packs/security/armory/berettarubberammo
name = "Beretta M9 Rubber Ammunition Crate"
contains = list(/obj/item/ammo_box/beretta,
/obj/item/ammo_box/beretta,
/obj/item/ammo_box/beretta,
/obj/item/ammo_box/beretta,
/obj/item/ammo_box/magazine/beretta,
/obj/item/ammo_box/magazine/beretta)
Expand All @@ -131,8 +132,6 @@
/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)
Expand All @@ -142,8 +141,6 @@
/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)
Expand All @@ -153,8 +150,6 @@
/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)
Expand All @@ -174,7 +169,7 @@
/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"
id = "box_beretta_ap"
req_tech = list("combat" = 3, "materials" = 2)
build_type = PROTOLATHE
materials = list(MAT_METAL = 6000, MAT_SILVER = 600, MAT_GLASS = 1000)
Expand All @@ -184,7 +179,7 @@
/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"
id = "box_beretta_bsp"
req_tech = list("combat" = 6, "materials" = 5, "bluespace" = 6)
build_type = PROTOLATHE
materials = list(MAT_METAL = 8000, MAT_SILVER = 600, MAT_BLUESPACE = 1000)
Expand Down

0 comments on commit a06590b

Please sign in to comment.