cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-25 21:19:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6151 from VOREStation/upstream-merge-6507

Browse Source 
[MIRROR] [READY] Recolourable energy weapons.
This commit is contained in:
Novacat
2019-11-01 13:33:02 -04:00
committed by GitHub
parent b15e8b3ddb 0f4e946cfe
commit 4e58ae7609
11 changed files with 153 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm
+1 -1
View File
@@ -108,7 +108,7 @@
attack_edge = 1
attacktext = list("slashed")
loot_list = list(/obj/item/weapon/melee/energy/sword/red = 100, /obj/item/weapon/shield/energy = 100)
loot_list = list(/obj/item/weapon/melee/energy/sword = 100, /obj/item/weapon/shield/energy = 100)
// They have a shield, so they try to block
/mob/living/simple_mob/humanoid/merc/melee/sword/attackby(var/obj/item/O as obj, var/mob/user as mob)
code/modules/mob/update_icons.dm
+1
View File
@@ -90,3 +90,4 @@
/mob/proc/update_targeted()
return