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

Fixes Shit.

Browse Source
This commit is contained in:
lolman360
2020-08-18 14:28:57 +10:00
parent f02d2080bc
commit 6f21b23a87
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,7 +76,8 @@
return 1
/obj/item/ammo_box/attackby(obj/item/A, mob/user, params, silent = FALSE, replace_spent = 0)
if(INTERACTING_WITH(user, A))
if(INTERACTING_WITH(user, src) || INTERACTING_WITH(user, A))
to_chat(user, "<span class='notice'>You're already doing that!</span>")
return FALSE
var/num_loaded = 0
if(!can_load(user))
@@ -84,8 +85,11 @@
if(istype(A, /obj/item/ammo_box))
var/obj/item/ammo_box/AM = A
for(var/obj/item/ammo_casing/AC in AM.stored_ammo)
if(load_delay)
if(do_after(user, load_delay, target = src))
if(load_delay || AM.load_delay)
var/loadtime = load_delay
if(AM.load_delay > load_delay)
loadtime = AM.load_delay
if(do_after(user, loadtime, target = src))
else
return FALSE
var/did_load = give_round(AC, replace_spent)

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

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