From 40de73d0ee7841df969705ec3eb8e43be27ba654 Mon Sep 17 00:00:00 2001
From: TDSSS <32099540+TDSSS@users.noreply.github.com>
Date: Wed, 14 Aug 2019 21:54:07 +0200
Subject: [PATCH] remove turret, add access requirement to self destruct

---
 .../lavaland_surface_syndicate_base1.dmm      | 22 ++++++++-----------
 code/game/machinery/syndicatebomb.dm          |  4 ++++
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
index 8152e90fe45..7ebf76ed865 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
@@ -6067,6 +6067,13 @@
 /obj/structure/sign/fire,
 /turf/simulated/wall/mineral/plastitanium/coated,
 /area/ruin/unpowered/syndicate_lava_base/engineering)
+"ng" = (
+/obj/structure/table,
+/obj/machinery/photocopier/faxmachine/longrange/syndie{
+	department = "Syndicate Bioweapon Research Outpost"
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/ruin/unpowered/syndicate_lava_base/telecomms)
 "nh" = (
 /obj/machinery/telecomms/relay/preset/ruskie{
 	use_power = 0
@@ -6827,10 +6834,6 @@
 "Au" = (
 /turf/simulated/wall/mineral/plastitanium/explosive,
 /area/ruin/unpowered/syndicate_lava_base/engineering)
-"Bj" = (
-/obj/machinery/porta_turret/syndicate,
-/turf/simulated/wall/mineral/plastitanium/nodiagonal,
-/area/ruin/unpowered/syndicate_lava_base/main)
 "BF" = (
 /obj/structure/grille,
 /obj/structure/window/plastitanium,
@@ -6873,13 +6876,6 @@
 	},
 /turf/simulated/floor/engine,
 /area/ruin/unpowered/syndicate_lava_base/testlab)
-"Ln" = (
-/obj/structure/table,
-/obj/machinery/photocopier/faxmachine/longrange/syndie{
-	department = "Syndicate Bioweapon Research Outpost"
-	},
-/turf/simulated/floor/plasteel/dark,
-/area/ruin/unpowered/syndicate_lava_base/telecomms)
 "LQ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -7347,7 +7343,7 @@ ab
 ab
 ab
 mp
-Ln
+ng
 nk
 nI
 oi
@@ -8835,7 +8831,7 @@ hV
 ha
 ha
 ha
-Bj
+ha
 ha
 ju
 jJ
diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm
index bc2af073fc6..3630beb1f6c 100644
--- a/code/game/machinery/syndicatebomb.dm
+++ b/code/game/machinery/syndicatebomb.dm
@@ -201,6 +201,9 @@
 		return FALSE
 	if(!Adjacent(user))
 		return FALSE
+	if(!allowed(user))
+		to_chat(user, "<span class='warning'>Access denied!</span>")
+		return FALSE
 	return TRUE
 
 /obj/machinery/syndicatebomb/proc/activate()
@@ -273,6 +276,7 @@
 /obj/machinery/syndicatebomb/self_destruct
 	name = "self destruct device"
 	desc = "Do not taunt. Warranty invalid if exposed to high temperature. Not suitable for agents under 3 years of age."
+	req_access = list(access_syndicate)
 	payload = /obj/item/bombcore/large
 	can_unanchor = FALSE
 	var/explosive_wall_group = EXPLOSIVE_WALL_GROUP_SYNDICATE_BASE // If set, this bomb will also cause explosive walls in the same group to explode