aggro grabs only drop two handed guns

HaloSpaceStation · Jan 29, 2024 · bb338c3 · bb338c3
1 parent bf96687
commit bb338c3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/code/modules/mob/grab/normal/norm_aggressive.dm b/code/modules/mob/grab/normal/norm_aggressive.dm
@@ -22,6 +22,15 @@
 /datum/grab/normal/aggressive/process_effect(var/obj/item/grab/G)
 	var/mob/living/carbon/human/affecting = G.affecting
 
+	//Drop two-handed guns.
+	var/obj/item/weapon/gun/g = affecting.l_hand
+
+	if((istype(g) && g.one_hand_penalty == -1))
+		affecting.drop_l_hand()
+	g = affecting.r_hand
+	if((istype(g) && g.one_hand_penalty == -1))
+		affecting.drop_r_hand()
+
 	// Keeps those who are on the ground down
 	if(affecting.lying)
 		affecting.Weaken(4)
diff --git a/code/modules/mob/grab/normal/norm_neck.dm b/code/modules/mob/grab/normal/norm_neck.dm
@@ -22,7 +22,7 @@
 
 	break_chance_table = list(3, 18, 45, 100)
 
-/datum/grab/normal/aggressive/process_effect(var/obj/item/grab/G)
+/datum/grab/normal/neck/process_effect(var/obj/item/grab/G)
 	var/mob/living/carbon/human/affecting = G.affecting
 
 	//Drop two-handed guns, or items bigger than large.

diff --git a/code/modules/tables/interactions.dm b/code/modules/tables/interactions.dm
@@ -90,7 +90,7 @@
 
 			if(G.force_danger())
 				G.affecting.forceMove(src.loc)
-				G.affecting.Weaken(rand(2,5))
+				G.affecting.Weaken(rand(2,4))
 				visible_message("<span class='danger'>[G.assailant] puts [G.affecting] on \the [src].</span>")
 				qdel(W)
 			else