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

SAW and c20r fixes

Browse Source 
Fixes SAW unloading. Fixes c20r and SAW icon states. Tweaks sniper desc, and makes clip icons for 7.62mm ammo less pixelated - still pretty much a codersprite though. Fixes ptrs item_state.
This commit is contained in:
mwerezak
2015-02-16 22:54:09 -05:00
parent 7f19a8a77b
commit 2791a93bf2
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/projectile.dm
+1
View File
@@ -170,6 +170,7 @@
)
if(auto_eject_sound)
playsound(user, auto_eject_sound, 40, 1)
ammo_magazine.update_icon()
ammo_magazine = null
update_icon()
code/modules/projectiles/guns/projectile/automatic.dm
+4 -4
View File
@@ -42,7 +42,7 @@
/obj/item/weapon/gun/projectile/automatic/c20r/update_icon()
..()
if(ammo_magazine)
icon_state = "c20r-[round(loaded.len,4)]"
icon_state = "c20r-[round(ammo_magazine.stored_ammo.len,4)]"
else
icon_state = "c20r"
return
@@ -88,7 +88,7 @@
update_icon()
/obj/item/weapon/gun/projectile/automatic/l6_saw/update_icon()
icon_state = "l6[cover_open ? "open" : "closed"][ammo_magazine ? round(loaded.len, 25) : "-empty"]"
icon_state = "l6[cover_open ? "open" : "closed"][ammo_magazine ? round(ammo_magazine.stored_ammo.len, 25) : "-empty"]"
/obj/item/weapon/gun/projectile/automatic/l6_saw/special_check(mob/user)
if(cover_open)
@@ -102,7 +102,7 @@
return
..()
/obj/item/weapon/gun/projectile/automatic/l6_saw/unload_ammo(mob/user)
/obj/item/weapon/gun/projectile/automatic/l6_saw/unload_ammo(mob/user, var/allow_dump=1)
if(!cover_open)
return
..()
..()
code/modules/projectiles/guns/projectile/sniper.dm
+2 -2
View File
@@ -1,8 +1,8 @@
/obj/item/weapon/gun/projectile/heavysniper
name = "\improper PTRS-7 rifle"
desc = "A portable anti-armour rifle fitted with a scope. Originally designed to used against lightly armoured exosuits, it is capable of punching through non-reinforced walls with ease. Fires 14.5mm AP shells."
desc = "A portable anti-armour rifle fitted with a scope. Originally designed to used against armoured exosuits, it is capable of punching through non-reinforced walls with ease. Fires 14.5mm AP shells."
icon_state = "heavysniper"
item_state = "sniper0"
item_state = "shotgun"
w_class = 4
force = 10
slot_flags = SLOT_BACK