cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-30 00:21:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updates L6 SAW

Browse Source 
Also changes src in user checks, probably unnecessary.
This commit is contained in:
mwerezak
2015-02-14 22:09:19 -05:00
parent e5f8ac50b4
commit a6095a3610
4 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/launcher/grenade_launcher.dm
+1 -1
View File
@@ -59,7 +59,7 @@
..()
/obj/item/weapon/gun/launcher/grenade/attack_hand(mob/user)
if(src in user)
if(loc == user)
if(grenades.len)
var/obj/item/weapon/grenade/G = grenades[grenades.len]
grenades.len--
code/modules/projectiles/guns/launcher/syringe_gun.dm
+1 -1
View File
@@ -100,7 +100,7 @@
next = darts[1]
/obj/item/weapon/gun/launcher/syringe/attack_hand(mob/living/user as mob)
if(src in user)
if(loc == user)
if(!darts.len)
user << "<span class='warning'>[src] is empty.</span>"
return
code/modules/projectiles/guns/projectile.dm
+1 -1
View File
@@ -155,7 +155,7 @@
unload_ammo(user)
/obj/item/weapon/gun/projectile/attack_hand(mob/user as mob)
if(src in user)
if(loc == user)
unload_ammo(user, allow_dump=0)
else
return ..()
code/modules/projectiles/guns/projectile/automatic.dm
+13 -15
View File
@@ -74,21 +74,19 @@
/obj/item/weapon/gun/projectile/automatic/l6_saw/update_icon()
icon_state = "l6[cover_open ? "open" : "closed"][ammo_magazine ? round(loaded.len, 25) : "-empty"]"
/obj/item/weapon/gun/projectile/automatic/l6_saw/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, flag, params) //what I tried to do here is just add a check to see if the cover is open or not and add an icon_state change because I can't figure out how c-20rs do it with overlays
/obj/item/weapon/gun/projectile/automatic/l6_saw/special_check(mob/user)
if(cover_open)
user << "<span class='notice'>[src]'s cover is open! Close it before firing!</span>"
else
..()
update_icon()
user << "<span class='warning'>[src]'s cover is open! Close it before firing!</span>"
return 0
return ..()
/obj/item/weapon/gun/projectile/automatic/l6_saw/attack_hand(mob/user as mob)
if(loc != user)
..() //let them pick it up
else if(cover_open)
unload_ammo(user)
/obj/item/weapon/gun/projectile/automatic/l6_saw/attackby(var/obj/item/A as obj, mob/user as mob)
if(istype(A,/obj/item/ammo_magazine) && !cover_open)
user << "<span class='notice'>[src]'s cover is closed! You can't insert a new mag!</span>"
/obj/item/weapon/gun/projectile/automatic/l6_saw/load_ammo(var/obj/item/A, mob/user)
if(!cover_open)
user << "<span class='warning'>You need to open the cover to load [src].</span>"
return
..()
..()
/obj/item/weapon/gun/projectile/automatic/l6_saw/unload_ammo(mob/user)
if(!cover_open)
return
..()