ughhhh

Monkestation · Nov 19, 2023 · f47db73 · f47db73
1 parent 7f40e7a
commit f47db73
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/code/__DEFINES/ai/ai_blackboard.dm b/code/__DEFINES/ai/ai_blackboard.dm
@@ -27,11 +27,6 @@
 /// Something the mob will remote when calling reinforcements
 #define BB_REINFORCEMENTS_EMOTE "BB_reinforcements_emote"
 
-/// Store a single or list of emotes at this key
-#define BB_EMOTE_KEY "BB_emotes"
-/// Chance to perform an emote per second
-#define BB_EMOTE_CHANCE "BB_EMOTE_CHANCE"
-
 ///Turf we want a mob to move to
 #define BB_TRAVEL_DESTINATION "BB_travel_destination"
 

diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
@@ -157,7 +157,7 @@
 
 /mob/living/attackby(obj/item/attacking_item, mob/living/user, params)
 	for(var/datum/surgery/operations as anything in surgeries)
-		if(user.combat_mode)
+		if(user.istate & ISTATE_HARM)
 			break
 		if(IS_IN_INVALID_SURGICAL_POSITION(src, operations))
 			continue

diff --git a/monkestation/code/modules/possession/basic_additions.dm b/monkestation/code/modules/possession/basic_additions.dm
@@ -43,6 +43,7 @@
 	update_held_items()
 
 /mob/living/basic/update_held_items()
+	. = ..()
 	remove_overlay(1)
 	var/list/hands_overlays = list()