fixes + advanced injectors

2020-01-19 15:17:57 +08:00
parent a8e4989d74 0a5e2cf8ff
commit 718ff58e0b
240 changed files with 5515 additions and 3079 deletions
@@ -87,6 +87,14 @@
 		return
 	. = ..()

+/obj/machinery/computer/shuttle/mining/common
+	name = "lavaland shuttle console"
+	desc = "Used to call and send the lavaland shuttle."
+	req_access = list()
+	circuit = /obj/item/circuitboard/computer/mining_shuttle/common
+	shuttleId = "mining_common"
+	possible_destinations = "whiteship_home;lavaland_common_away;landing_zone_dock;mining_public"
+
 /**********************Mining car (Crate like thing, not the rail car)**************************/

 /obj/structure/closet/crate/miningcar
@@ -250,7 +250,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\

 /obj/item/twohanded/required/gibtonite/bullet_act(obj/item/projectile/P)
 	GibtoniteReaction(P.firer)
-	..()
+	return ..()

 /obj/item/twohanded/required/gibtonite/ex_act()
 	GibtoniteReaction(null, 1)