Merge branch 'master' into upstream-merge-37476

2018-05-20 23:12:07 -05:00
parent ea9b3622fd 6963275d45
commit 0758204515
172 changed files with 6336 additions and 4958 deletions
@@ -289,7 +289,7 @@
 /mob/proc/show_inv(mob/user)
 	return

-//mob verbs are faster than object verbs. See http://www.byond.com/forum/?post=1326139&page=2#comment8198716 for why this isn't atom/verb/examine()
+//mob verbs are faster than object verbs. See https://secure.byond.com/forum/?post=1326139&page=2#comment8198716 for why this isn't atom/verb/examine()
 /mob/verb/examinate(atom/A as mob|obj|turf in view()) //It used to be oview(12), but I can't really say why
 	set name = "Examine"
 	set category = "IC"