cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7651 from paprka/tacticalfleshlight

Browse Source 
makes flashlight attaching more modular
This commit is contained in:
Cheridan
2015-02-12 07:55:26 -06:00
parent 25b2cb0296 eabbd88858
commit 566fd07593
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,9 +83,9 @@
overlays.Cut()
if(F)
if(F.on)
overlays += "flight-on"
overlays += "flight-[initial(icon_state)]-on"
else
overlays += "flight"
overlays += "flight-[initial(icon_state)]"
return
/obj/item/weapon/gun/energy/ui_action_click()

1
code/modules/projectiles/guns/energy/pulse.dm
View File

@@ -27,6 +27,7 @@
icon_state = "pulse_carbine"
item_state = "pulse"
cell_type = "/obj/item/weapon/stock_parts/cell/pulse/carbine"
can_flashlight = 1
/obj/item/weapon/gun/energy/pulse/carbine/loyalpin
pin = /obj/item/device/firing_pin/implant/loyalty