Merge branch 'master' into premium-kas-for-borgs

2022-09-23 17:00:02 -07:00
parent 2d90e0ab33 e70987eec0
commit 142c07c51d
68 changed files with 828 additions and 201 deletions
--- a/code/modules/mining/machine_vending.dm
+++ b/code/modules/mining/machine_vending.dm
@@ -132,7 +132,7 @@
 	. = list()
 	var/mob/living/carbon/human/H
 	var/obj/item/card/id/C
-	if(ishuman(user))
+	if(ishuman(user) || iscyborg(user))
 		H = user
 		C = H.get_idcard(TRUE)
 		if(C)