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

Fixes powered crossbow not consuming its energy cell (#7818)

Browse Source 
The energy cell doesn't get moved to the crossbow when used on it. The rest works, though.

I also made the message about the rod getting supercharged stand out a bit more.
This commit is contained in:
Erki
2019-12-27 00:43:09 +02:00
committed by GitHub
parent 49eb978e9f
commit 168a0bc8c7
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/launcher/crossbow.dm
+10 -6
View File
@@ -160,7 +160,7 @@
if(istype(W, /obj/item/cell))
if(!cell)
user.drop_from_inventory(cell,src)
user.drop_from_inventory(W, src)
cell = W
to_chat(user, "<span class='notice'>You jam [cell] into [src] and wire it to the firing coil.</span>")
superheat_rod(user)
@@ -180,12 +180,16 @@
..()
/obj/item/gun/launcher/crossbow/proc/superheat_rod(var/mob/user)
if(!user || !cell || !bolt) return
if(cell.charge < 500) return
if(bolt.throwforce >= 15) return
if(!istype(bolt,/obj/item/arrow/rod)) return
if(!user || !cell || !bolt)
return
if(cell.charge < 500)
return
if(bolt.throwforce >= 15)
return
if(!istype(bolt,/obj/item/arrow/rod))
return
to_chat(user, "<span class='notice'>[bolt] plinks and crackles as it begins to glow red-hot.</span>")
to_chat(user, "<span class='warning'>[bolt] plinks and crackles as it begins to glow red-hot.</span>")
bolt.throwforce = 15
bolt.icon_state = "metal-rod-superheated"
cell.use(500)