Fixes lavaland syndicate station's explosives being able to be picked…

… up (#12033) * wew * Update syndicatebomb.dm * kick the bot until it works * Update code/game/turfs/closed/wall/mineral_walls.dm Co-authored-by: PowerfulBacon <[email protected]> * Revert "Update code/game/turfs/closed/wall/mineral_walls.dm" This reverts commit d4661ea. * Update mineral_walls.dm --------- Co-authored-by: PowerfulBacon <[email protected]>
BeeStation · Dec 26, 2024 · b71a63f · b71a63f
1 parent 14f8905
commit b71a63f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm
@@ -399,6 +399,12 @@
 	range_light = 20
 	range_flame = 20
 
+// Special bomb core for inside the lavaland syndicate base walls. Players should not be able to interact with this.
+/obj/item/bombcore/large/syndicate_base
+	installed = TRUE
+	anchored = TRUE
+	invisibility = INVISIBILITY_OBSERVER
+
 /obj/item/bombcore/miniature
 	name = "small bomb core"
 	w_class = WEIGHT_CLASS_SMALL

diff --git a/code/game/turfs/closed/wall/mineral_walls.dm b/code/game/turfs/closed/wall/mineral_walls.dm
@@ -352,17 +352,22 @@
 	icon_state = "map-overspace"
 	fixed_underlay = list("space"=1)
 
+/////////////////////Lavaland Base Syndicate Explosive Walls /////////////////////
+
 /turf/closed/wall/mineral/plastitanium/explosive
-	var/obj/item/bombcore/large/bombcore
+	var/obj/item/bombcore/large/syndicate_base/bombcore
 
 /turf/closed/wall/mineral/plastitanium/explosive/Initialize(mapload)
 	. = ..()
-	bombcore = new(get_turf(src))
-	bombcore.installed = TRUE
+	bombcore = new /obj/item/bombcore/large/syndicate_base(src)
 
 /turf/closed/wall/mineral/plastitanium/explosive/ex_act(severity)
 	bombcore.detonate()
 
+/turf/closed/wall/mineral/plastitanium/explosive/Destroy()
+	qdel(bombcore)
+	..()
+
 //have to copypaste this code
 /turf/closed/wall/mineral/plastitanium/interior/copyTurf(turf/T)
 	if(T.type != type)