Skip to content

Commit

Permalink
Removes magazine locks from Security's ballistic sidearms (#6669)
Browse files Browse the repository at this point in the history
Done by kev's instructions

:cl:
tweak: Security LTL ballistics can now load lethal magazines when
needed, no more needing to get the same weapon issued but in lethal
flavour.
/:cl:
  • Loading branch information
jakeramsay007 authored Aug 25, 2024
1 parent 960a599 commit 2a24d08
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions code/modules/projectiles/guns/projectile/pistol.dm
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
desc = "The NT Mk58 is a cheap, ubiquitous sidearm, produced by a Nanotrasen subsidiary. Found pretty much everywhere humans are. This one is a less-lethal variant that only accepts .45 rubber or flash magazines."
icon_state = "secguncomp"
magazine_type = /obj/item/ammo_magazine/a45/rubber
allowed_magazines = list(/obj/item/ammo_magazine/a45/rubber, /obj/item/ammo_magazine/a45/flash, /obj/item/ammo_magazine/a45/practice)
// allowed_magazines = list(/obj/item/ammo_magazine/a45/rubber, /obj/item/ammo_magazine/a45/flash, /obj/item/ammo_magazine/a45/practice)
projectile_type = /obj/projectile/bullet/pistol/medium
caliber = /datum/ammo_caliber/a45
origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
Expand Down Expand Up @@ -320,7 +320,7 @@
/obj/item/gun/ballistic/p92x/sec
desc = "A widespread sidearm called the P92X which is used by military, police, and security forces across the galaxy. This one is a less-lethal variant that only accepts 9mm rubber or flash magazines."
magazine_type = /obj/item/ammo_magazine/a9mm/rubber
allowed_magazines = list(/obj/item/ammo_magazine/a9mm/rubber, /obj/item/ammo_magazine/a9mm/flash)
// allowed_magazines = list(/obj/item/ammo_magazine/a9mm/rubber, /obj/item/ammo_magazine/a9mm/flash)

//Ported this over from the _vr before deletion. Commenting them out because I'm not sure we want these in.
/*
Expand Down

0 comments on commit 2a24d08

Please sign in to comment.