From e2b8b03972060d54cc2a2a007682398026cb056a Mon Sep 17 00:00:00 2001 From: XeonMations Date: Sat, 14 Dec 2024 13:40:23 +0200 Subject: [PATCH 1/6] wew --- code/game/machinery/syndicatebomb.dm | 5 +++++ code/game/turfs/closed/wall/mineral_walls.dm | 12 +++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index 8dd5ec0baa082..1710d5f04c596 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -399,6 +399,11 @@ 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 + /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 index 4a9f4d54a846e..3484a361655b8 100644 --- a/code/game/turfs/closed/wall/mineral_walls.dm +++ b/code/game/turfs/closed/wall/mineral_walls.dm @@ -352,17 +352,23 @@ 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(get_turf(src)) + bombcore.forceMove(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) From ecf34ccdacdc4b32ad4d3ab5d920c481e8bb1232 Mon Sep 17 00:00:00 2001 From: XeonMations Date: Sat, 14 Dec 2024 14:01:10 +0200 Subject: [PATCH 2/6] Update syndicatebomb.dm --- code/game/machinery/syndicatebomb.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index 1710d5f04c596..c2c144a3729ce 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -403,6 +403,7 @@ /obj/item/bombcore/large/syndicate_base installed = TRUE anchored = TRUE + invisibility = INVISIBILITY_OBSERVER /obj/item/bombcore/miniature name = "small bomb core" From d40149dd65463ae948016499dd5383a2cf4aa350 Mon Sep 17 00:00:00 2001 From: XeonMations Date: Sat, 14 Dec 2024 14:31:52 +0200 Subject: [PATCH 3/6] kick the bot until it works From d4661ead04608073adad539a64b2dc8cc354f33a Mon Sep 17 00:00:00 2001 From: XeonMations <62395746+XeonMations@users.noreply.github.com> Date: Tue, 24 Dec 2024 16:21:02 +0200 Subject: [PATCH 4/6] Update code/game/turfs/closed/wall/mineral_walls.dm Co-authored-by: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com> --- code/game/turfs/closed/wall/mineral_walls.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/turfs/closed/wall/mineral_walls.dm b/code/game/turfs/closed/wall/mineral_walls.dm index 3484a361655b8..c73500b20adc9 100644 --- a/code/game/turfs/closed/wall/mineral_walls.dm +++ b/code/game/turfs/closed/wall/mineral_walls.dm @@ -359,8 +359,7 @@ /turf/closed/wall/mineral/plastitanium/explosive/Initialize(mapload) . = ..() - bombcore = new /obj/item/bombcore/large/syndicate_base(get_turf(src)) - bombcore.forceMove(src) + bombcore = new /obj/item/bombcore/large/syndicate_base(src) /turf/closed/wall/mineral/plastitanium/explosive/ex_act(severity) bombcore.detonate() From ca06cf76cdf37d5b02b5eb6032b598b5f07d2dc2 Mon Sep 17 00:00:00 2001 From: XeonMations Date: Tue, 24 Dec 2024 16:25:45 +0200 Subject: [PATCH 5/6] Revert "Update code/game/turfs/closed/wall/mineral_walls.dm" This reverts commit d4661ead04608073adad539a64b2dc8cc354f33a. --- code/game/turfs/closed/wall/mineral_walls.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/turfs/closed/wall/mineral_walls.dm b/code/game/turfs/closed/wall/mineral_walls.dm index c73500b20adc9..3484a361655b8 100644 --- a/code/game/turfs/closed/wall/mineral_walls.dm +++ b/code/game/turfs/closed/wall/mineral_walls.dm @@ -359,7 +359,8 @@ /turf/closed/wall/mineral/plastitanium/explosive/Initialize(mapload) . = ..() - bombcore = new /obj/item/bombcore/large/syndicate_base(src) + bombcore = new /obj/item/bombcore/large/syndicate_base(get_turf(src)) + bombcore.forceMove(src) /turf/closed/wall/mineral/plastitanium/explosive/ex_act(severity) bombcore.detonate() From e4b4268db7e84c7a1657eac053cbda823a260b94 Mon Sep 17 00:00:00 2001 From: XeonMations Date: Tue, 24 Dec 2024 23:23:22 +0200 Subject: [PATCH 6/6] Update mineral_walls.dm --- code/game/turfs/closed/wall/mineral_walls.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/turfs/closed/wall/mineral_walls.dm b/code/game/turfs/closed/wall/mineral_walls.dm index 3484a361655b8..c73500b20adc9 100644 --- a/code/game/turfs/closed/wall/mineral_walls.dm +++ b/code/game/turfs/closed/wall/mineral_walls.dm @@ -359,8 +359,7 @@ /turf/closed/wall/mineral/plastitanium/explosive/Initialize(mapload) . = ..() - bombcore = new /obj/item/bombcore/large/syndicate_base(get_turf(src)) - bombcore.forceMove(src) + bombcore = new /obj/item/bombcore/large/syndicate_base(src) /turf/closed/wall/mineral/plastitanium/explosive/ex_act(severity) bombcore.detonate()