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 2025-12-10 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'haha' of https://github.com/lolman360/Citadel-Station-13 into haha

Browse Source
This commit is contained in:
lolman360
2020-08-19 12:20:38 +10:00
parent f35989b09e 5306da7938
commit ee4da21d38
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/modules/projectiles/boxes_magazines/_box_magazine.dm
View File

@@ -86,11 +86,8 @@
var/obj/item/ammo_box/AM = A var/obj/item/ammo_box/AM = A
for(var/obj/item/ammo_casing/AC in AM.stored_ammo) for(var/obj/item/ammo_casing/AC in AM.stored_ammo)
if(load_delay || AM.load_delay) if(load_delay || AM.load_delay)
var/loadtime = load_delay var/loadtime = max(AM.load_delay, load_delay)
if(AM.load_delay > load_delay) if(!do_after(user, loadtime, target = src))
loadtime = AM.load_delay
if(do_after(user, loadtime, target = src))
else
return FALSE return FALSE
var/did_load = give_round(AC, replace_spent) var/did_load = give_round(AC, replace_spent)
if(did_load) if(did_load)

6
code/modules/projectiles/guns/ballistic.dm
View File

@@ -53,10 +53,8 @@
..() ..()
if (istype(A, /obj/item/ammo_box/magazine)) if (istype(A, /obj/item/ammo_box/magazine))
var/obj/item/ammo_box/magazine/AM = A var/obj/item/ammo_box/magazine/AM = A
if(AM.load_delay) if(AM.load_delay && !do_after(user, AM.load_delay, target = src))
if(do_after(user, AM.load_delay, target = src)) return FALSE
else
return FALSE
if (!magazine && istype(AM, mag_type)) if (!magazine && istype(AM, mag_type))
if(user.transferItemToLoc(AM, src)) if(user.transferItemToLoc(AM, src))
magazine = AM magazine = AM