Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit697

2020-04-25 02:49:59 +02:00
parent 1659e2804e 5ccdc55e42
commit 0c1c879fb4
353 changed files with 5212 additions and 2971 deletions
@@ -804,7 +804,7 @@
 	var/new_cloud = input("Set the public nanite chamber's Cloud ID (1-100).", "Cloud ID", cloud_id) as num|null
 	if(new_cloud == null)
 		return
-	cloud_id = CLAMP(round(new_cloud, 1), 1, 100)
+	cloud_id = clamp(round(new_cloud, 1), 1, 100)

 /obj/item/circuitboard/machine/public_nanite_chamber/examine(mob/user)
 	. = ..()