cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-02 13:34:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

[READY] Recolourable energy weapons. (#6507)

Browse Source
This commit is contained in:
lolman360
2019-11-02 03:37:27 +11:00
committed by VirgoBot
parent 87e3a84ba2
commit ae859c49e9
9 changed files with 135 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm
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)

1
code/modules/mob/update_icons.dm
View File

@@ -90,3 +90,4 @@
/mob/proc/update_targeted()
return