From 5896bd2c8e5e0373c045f9620f0a287d53702c13 Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Mon, 7 Jun 2021 13:46:16 -0400 Subject: [PATCH] Fixes some exploits (#16134) --- code/game/objects/items/weapons/RCD.dm | 2 ++ code/modules/mining/lavaland/loot/colossus_loot.dm | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index 92d13337766..c12809ca160 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -428,6 +428,8 @@ if(iswallturf(A)) if(istype(A, /turf/simulated/wall/r_wall) && !canRwall) return FALSE + if(istype(A, /turf/simulated/wall/indestructible)) + return FALSE if(checkResource(5, user)) to_chat(user, "Deconstructing Wall...") playsound(loc, 'sound/machines/click.ogg', 50, 1) diff --git a/code/modules/mining/lavaland/loot/colossus_loot.dm b/code/modules/mining/lavaland/loot/colossus_loot.dm index 0c58119a6c9..7d4b6250ae3 100644 --- a/code/modules/mining/lavaland/loot/colossus_loot.dm +++ b/code/modules/mining/lavaland/loot/colossus_loot.dm @@ -156,7 +156,7 @@ var/atom/Picked = pick(NewFlora) new Picked(O) continue - if(iswallturf(T) && NewTerrainWalls) + if(iswallturf(T) && NewTerrainWalls && !istype(T, /turf/simulated/wall/indestructible)) T.ChangeTurf(NewTerrainWalls) continue if(istype(Stuff, /obj/structure/chair) && NewTerrainChairs)