cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-01-06 15:13:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing accidental nerfs to the magpistol.

Browse Source
This commit is contained in:
Ghommie
2020-02-05 18:45:15 +01:00
parent af8d6c913d
commit 7e2ad2b71f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/datums/components/storage/concrete/pockets.dm
View File

@@ -56,7 +56,7 @@
/obj/item/scalpel, /obj/item/reagent_containers/syringe, /obj/item/dnainjector, /obj/item/scalpel, /obj/item/reagent_containers/syringe, /obj/item/dnainjector,
/obj/item/reagent_containers/hypospray/medipen, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/hypospray/medipen, /obj/item/reagent_containers/dropper,
/obj/item/implanter, /obj/item/screwdriver, /obj/item/weldingtool/mini, /obj/item/implanter, /obj/item/screwdriver, /obj/item/weldingtool/mini,
/obj/item/firing_pin, /obj/item/gun/ballistic/automatic/pistol /obj/item/firing_pin, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/automatic/magrifle/pistol
)) ))
/datum/component/storage/concrete/pockets/shoes/clown/Initialize() /datum/component/storage/concrete/pockets/shoes/clown/Initialize()

2
code/modules/projectiles/boxes_magazines/external/magweapon.dm vendored
View File

@@ -13,7 +13,7 @@
name = "magpistol magazine (non-lethal disabler)" name = "magpistol magazine (non-lethal disabler)"
icon_state = "smallmagmag" icon_state = "smallmagmag"
ammo_type = /obj/item/ammo_casing/caseless/magnetic/weak/disabler ammo_type = /obj/item/ammo_casing/caseless/magnetic/weak/disabler
max_ammo = 15 max_ammo = 16
/obj/item/ammo_box/magazine/mmag/small/lethal /obj/item/ammo_box/magazine/mmag/small/lethal
name = "magpistol magazine (lethal)" name = "magpistol magazine (lethal)"