Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch

2021-12-21 07:59:33 +08:00
parent fe6556f7b7 d2f3070522
commit fab4b07be5
164 changed files with 128258 additions and 912 deletions
@@ -176,7 +176,7 @@

 	var/mob/living/silicon/robot/R = target
 	if(iscyborg(R))
-		if(R.module.dogborg == TRUE || R.dogborg == TRUE) //I hate whoever that thought that putting two types of dogborg that don't even sync up properly was good
+		if((R.module.dogborg == TRUE || R.dogborg == TRUE) && isturf(R.loc)) //I hate whoever that thought that putting two types of dogborg that don't even sync up properly was good
 			message.pixel_x = 16

 /**