Fixes charge weapons (#1754)

fixes dimensional ripple removes an uncecessary faction check Co-authored-by: Mr.Heavenly <[email protected]>
vlggms · Dec 23, 2023 · f6031ca · f6031ca
1 parent 20aecf7
commit f6031ca
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/code/game/objects/items/ego_weapons/he.dm b/code/game/objects/items/ego_weapons/he.dm
@@ -1025,6 +1025,7 @@
 	name = "dimensional ripple"
 	desc = "They should've died after bleeding so much. You usually don't quarantine a corpse...."
 	icon_state = "warp2"
+	force = 24
 	lefthand_file = 'icons/mob/inhands/weapons/ego_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/ego_righthand.dmi'
 	inhand_x_dimension = 32

diff --git a/code/game/objects/items/ego_weapons/non_abnormality/_charge.dm b/code/game/objects/items/ego_weapons/non_abnormality/_charge.dm
@@ -13,7 +13,9 @@
 	. = ..()
 	if(!.)
 		return FALSE
-	if(charge<20 && target.stat != DEAD)
+	if((target.stat == DEAD) || target.status_flags & GODMODE)
+		return FALSE
+	if(charge<20)
 		charge+=1
 
 /obj/item/ego_weapon/city/charge/proc/release_charge(mob/living/target, mob/living/user)

diff --git a/code/game/objects/items/ego_weapons/subtype/charge.dm b/code/game/objects/items/ego_weapons/subtype/charge.dm
@@ -13,7 +13,7 @@
 	. = ..()
 	if(!.)
 		return FALSE
-	if((target.stat == DEAD) || (GODMODE in target.status_flags))//if the target is dead or godmode
+	if((target.stat == DEAD) || target.status_flags & GODMODE)//if the target is dead or godmode
 		return FALSE
 	if(charge<20)
 		charge+=1

diff --git a/code/modules/projectiles/projectile/ego_bullets/waw.dm b/code/modules/projectiles/projectile/ego_bullets/waw.dm
@@ -251,12 +251,11 @@
 /obj/projectile/ego_bullet/ego_warring/on_hit(atom/target, blocked = FALSE)
 	. = ..()
 	var/obj/item/gun/ego_gun/warring/bow = fired_from
-	var/mob/living/user = firer
-	var/mob/living/carbon/human/H = target
+	var/mob/living/L = target
 	if(!isliving(target))
 		return
-	if(user.faction_check_mob(H))//player faction
-		return
+	if((L.stat == DEAD) || L.status_flags & GODMODE)//if the target is dead or godmode
+		return FALSE
 	bow.Build_Charge()
 	return