merge

2021-10-29 21:50:58 -07:00
parent 319c5e23fe
commit 186b552103
64 changed files with 208 additions and 205 deletions
@@ -30,7 +30,7 @@
 			SplashReagents(user)
 			return
 		else
-			DISABLE_BITFIELD(reagents.reagents_holder_flags, OPENCONTAINER)
+			reagents.reagents_holder_flags &= ~(OPENCONTAINER)
 			ENABLE_BITFIELD(reagents.reagents_holder_flags, DRAWABLE |INJECTABLE )
 			spillable = FALSE
 			sealed = TRUE
@@ -141,11 +141,11 @@

 /obj/item/reagent_containers/rag/towel/attack(mob/living/M, mob/living/user)
 	if(user.a_intent == INTENT_HARM)
-		DISABLE_BITFIELD(item_flags, NOBLUDGEON)
+		item_flags &= ~(NOBLUDGEON)
 		. = TRUE
 	..()
 	if(.)
-		ENABLE_BITFIELD(item_flags, NOBLUDGEON)
+		item_flags |= NOBLUDGEON

 /obj/item/reagent_containers/rag/towel/equipped(mob/living/user, slot)
 	. = ..()