Merge remote-tracking branch 'upstream/master'

This commit is contained in:
BongaTheProto
2022-01-02 19:50:02 -05:00
10 changed files with 572 additions and 465 deletions
+6
View File
@@ -2046,6 +2046,12 @@
var/obj/item/station_charter/charter = locate(href_list["reject_custom_name"])
if(istype(charter))
charter.reject_proposed(usr)
else if(href_list["approve_custom_name"])
if(!check_rights(R_ADMIN))
return
var/obj/item/station_charter/charter = locate(href_list["approve_custom_name"])
if(istype(charter))
charter.allow_pass(usr)
else if(href_list["jumpto"])
if(!isobserver(usr) && !check_rights(R_ADMIN))
return