Merge remote-tracking branch 'upstream/master' into floorcluwneport

This commit is contained in:
keronshb
2021-05-31 22:21:34 -04:00
68 changed files with 576 additions and 301 deletions
+1 -1
View File
@@ -61,7 +61,7 @@
originMachine.visible_message("[originMachine] beeps and seems lifeless.")
kill()
return
vendingMachines = listclearnulls(vendingMachines)
listclearnulls(vendingMachines)
if(!vendingMachines.len) //if every machine is infected
for(var/obj/machinery/vending/upriser in infectedMachines)
if(prob(70) && !QDELETED(upriser))