Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods

code/modules/mob/living/living.dm

@@ -636,14 +636,15 @@
 	else if(canmove)
 		if(on_fire)
 			resist_fire() //stop, drop, and roll
-		else if(resting) //cit change - allows resisting out of resting
+			return
+		if(resting) //cit change - allows resisting out of resting
 			resist_a_rest() // ditto
-		else if(iscarbon(src)) //Citadel Change for embedded removal memes
-			var/mob/living/carbon/C = src
-			if(!C.handcuffed && !C.legcuffed)
-				return TRUE
-		else if(last_special <= world.time)
+			return
+		if(resist_embedded()) //Citadel Change for embedded removal memes
+			return
+		if(last_special <= world.time)
 			resist_restraints() //trying to remove cuffs.
+			return
 
 
 /mob/proc/resist_grab(moving_resist)

code/modules/mob/living/simple_animal/simple_animal_vr.dm

@@ -49,6 +49,8 @@
 // Simple animals have only one belly.  This creates it (if it isn't already set up)
 /mob/living/simple_animal/init_vore()
 	vore_init = TRUE
+	if(CHECK_BITFIELD(flags_1, HOLOGRAM_1))
+		return
 	if(vore_organs.len)
 		return
 	if(no_vore) //If it can't vore, let's not give it a stomach.