merge

2021-10-29 21:50:58 -07:00
parent 319c5e23fe
commit 186b552103
64 changed files with 208 additions and 205 deletions
@@ -78,7 +78,7 @@
 	// these vars are not really standardized but all would theoretically create stuff on death
 	for(var/v in list("butcher_results","corpse","weapon1","weapon2","blood_volume") & mob.vars)
 		mob.vars[v] = null
-	ENABLE_BITFIELD(mob.flags_1, HOLOGRAM_1)
+	mob.flags_1 |= HOLOGRAM_1
 	if(isliving(mob))
 		var/mob/living/L = mob
 		L.vore_flags = 0