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

2019-12-06 20:09:35 +01:00
parent 6484eea339 0598c35d70
commit 542c9007ee
1029 changed files with 34299 additions and 143444 deletions
@@ -15,7 +15,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons)

 /obj/item/extraction_pack/examine()
 	. = ..()
-	usr.show_message("It has [uses_left] use\s remaining.", 1)
+	. += "It has [uses_left] use\s remaining."

 /obj/item/extraction_pack/attack_self(mob/user)
 	var/list/possible_beacons = list()