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

2019-07-03 03:24:28 +02:00
parent d5279c8373 d01eb661cd
commit ffecca8c11
328 changed files with 9909 additions and 6862 deletions
@@ -4,11 +4,6 @@
 /obj/machinery/computer/cargo/request
 	req_access = list()

-/obj/machinery/computer/cargo/emag_act(mob/user)
-	. = ..()
-	if(.)
-		req_access = list()
-
 /obj/machinery/computer/cargo/ui_act(action, params, datum/tgui/ui)
 	if(!allowed(usr))
 		to_chat(usr, "<span class='notice'>Access denied.</span>")