Merge branch 'master' into Icons/guns

This commit is contained in:
Aronai Sieyes
2021-07-01 11:04:34 -04:00
committed by GitHub
522 changed files with 4523 additions and 3586 deletions
+2 -2
View File
@@ -43,7 +43,7 @@
set src in view(1)
var/prev_size = size_set_to
var/size_select = input("Put the desired size (25-200%), (1-600%) in dormitory areas.", "Set Size", size_set_to * 100) as num|null
var/size_select = input(usr, "Put the desired size (25-200%), (1-600%) in dormitory areas.", "Set Size", size_set_to * 100) as num|null
if(!size_select)
return //cancelled
//We do valid resize testing in actual firings because people move after setting these things.
@@ -86,7 +86,7 @@
set category = "Object"
set src in view(1)
var/size_select = input("Put the desired size (1-600%)", "Set Size", size_set_to * 100) as num|null
var/size_select = input(usr, "Put the desired size (1-600%)", "Set Size", size_set_to * 100) as num|null
if(!size_select)
return //cancelled
size_set_to = clamp((size_select/100), 0, 1000) //eheh