Merge branch 'master' into upstream-merge-10092

This commit is contained in:
Nadyr
2021-04-10 22:50:33 -04:00
committed by GitHub
72 changed files with 22645 additions and 20959 deletions

View File

@@ -155,6 +155,7 @@ var/list/admin_verbs_fun = list(
/client/proc/smite,
/client/proc/smite_vr, //VOREStation Add,
/client/proc/admin_lightning_strike,
/client/proc/resize //VOREStation Add,
)
var/list/admin_verbs_spawn = list(

View File

@@ -4,7 +4,7 @@
set category = "Fun"
if(!check_rights(R_ADMIN, R_FUN))
return
var/size_multiplier = input(usr, "Input size multiplier.", "Resize", 1) as num|null
if(!size_multiplier)
return //cancelled