diff --git a/_maps/map_files/Mafia/mafia_ayylmao.dmm b/_maps/map_files/Mafia/mafia_ayylmao.dmm index 2a98cea57e6..d4c42cec0f7 100644 --- a/_maps/map_files/Mafia/mafia_ayylmao.dmm +++ b/_maps/map_files/Mafia/mafia_ayylmao.dmm @@ -11,7 +11,7 @@ /turf/open/floor/plating, /area/centcom/mafia) "h" = ( -/obj/structure/grille/indestructable, +/obj/structure/grille/indestructible, /turf/open/floor/plating, /area/centcom/mafia) "i" = ( @@ -83,7 +83,7 @@ /turf/open/floor/plating/abductor2, /area/centcom/mafia) "z" = ( -/obj/structure/grille/indestructable, +/obj/structure/grille/indestructible, /turf/open/floor/fakespace, /area/centcom/mafia) "B" = ( diff --git a/_maps/map_files/Mafia/mafia_ball.dmm b/_maps/map_files/Mafia/mafia_ball.dmm index 30127498e7e..2991fb8d78f 100644 --- a/_maps/map_files/Mafia/mafia_ball.dmm +++ b/_maps/map_files/Mafia/mafia_ball.dmm @@ -21,7 +21,7 @@ /turf/open/floor/plating, /area/centcom/mafia) "h" = ( -/obj/structure/grille/indestructable, +/obj/structure/grille/indestructible, /turf/open/floor/plating, /area/centcom/mafia) "i" = ( diff --git a/_maps/map_files/Mafia/mafia_gothic.dmm b/_maps/map_files/Mafia/mafia_gothic.dmm index b3fd6a1f709..4dd3c89f22a 100644 --- a/_maps/map_files/Mafia/mafia_gothic.dmm +++ b/_maps/map_files/Mafia/mafia_gothic.dmm @@ -21,7 +21,7 @@ /turf/open/floor/plating, /area/centcom/mafia) "h" = ( -/obj/structure/grille/indestructable, +/obj/structure/grille/indestructible, /turf/open/floor/plating, /area/centcom/mafia) "i" = ( diff --git a/_maps/map_files/Mafia/mafia_lavaland.dmm b/_maps/map_files/Mafia/mafia_lavaland.dmm index 97bcd38a63e..231afa533d3 100644 --- a/_maps/map_files/Mafia/mafia_lavaland.dmm +++ b/_maps/map_files/Mafia/mafia_lavaland.dmm @@ -18,7 +18,7 @@ /turf/open/floor/plating, /area/centcom/mafia) "h" = ( -/obj/structure/grille/indestructable, +/obj/structure/grille/indestructible, /turf/open/floor/plating, /area/centcom/mafia) "i" = ( diff --git a/_maps/map_files/Mafia/mafia_snow.dmm b/_maps/map_files/Mafia/mafia_snow.dmm index 6762a712334..741eec9ec2b 100644 --- a/_maps/map_files/Mafia/mafia_snow.dmm +++ b/_maps/map_files/Mafia/mafia_snow.dmm @@ -18,7 +18,7 @@ /turf/open/floor/plating, /area/centcom/mafia) "h" = ( -/obj/structure/grille/indestructable, +/obj/structure/grille/indestructible, /turf/open/floor/plating, /area/centcom/mafia) "i" = ( diff --git a/_maps/map_files/Mafia/mafia_spiderclan.dmm b/_maps/map_files/Mafia/mafia_spiderclan.dmm index 0058bd8157a..d1799e8e0fb 100644 --- a/_maps/map_files/Mafia/mafia_spiderclan.dmm +++ b/_maps/map_files/Mafia/mafia_spiderclan.dmm @@ -25,7 +25,7 @@ /turf/open/floor/plating, /area/centcom/mafia) "h" = ( -/obj/structure/grille/indestructable, +/obj/structure/grille/indestructible, /turf/open/floor/plating, /area/centcom/mafia) "i" = ( diff --git a/_maps/map_files/Mafia/mafia_syndie.dmm b/_maps/map_files/Mafia/mafia_syndie.dmm index 2fc10ff9b50..2ef330840d6 100644 --- a/_maps/map_files/Mafia/mafia_syndie.dmm +++ b/_maps/map_files/Mafia/mafia_syndie.dmm @@ -27,7 +27,7 @@ /turf/open/floor/plating, /area/centcom/mafia) "h" = ( -/obj/structure/grille/indestructable, +/obj/structure/grille/indestructible, /turf/open/floor/plating, /area/centcom/mafia) "i" = ( diff --git a/_maps/shuttles/emergency_medisim.dmm b/_maps/shuttles/emergency_medisim.dmm index 1d9947c2db4..c84f4083509 100644 --- a/_maps/shuttles/emergency_medisim.dmm +++ b/_maps/shuttles/emergency_medisim.dmm @@ -547,7 +547,7 @@ /turf/open/misc/sandy_dirt, /area/shuttle/escape/simulation) "xP" = ( -/obj/structure/grille/indestructable, +/obj/structure/grille/indestructible, /turf/open/floor/plating, /area/shuttle/escape/simulation) "yk" = ( diff --git a/code/game/machinery/telecomms/machines/allinone.dm b/code/game/machinery/telecomms/machines/allinone.dm index 95eb877aea4..1a359f07e03 100644 --- a/code/game/machinery/telecomms/machines/allinone.dm +++ b/code/game/machinery/telecomms/machines/allinone.dm @@ -12,7 +12,7 @@ idle_power_usage = 0 var/intercept = FALSE // If true, only works on the Syndicate frequency. -/obj/machinery/telecomms/allinone/indestructable +/obj/machinery/telecomms/allinone/indestructible resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF flags_1 = NODECONSTRUCT_1 diff --git a/code/game/objects/items/puzzle_pieces.dm b/code/game/objects/items/puzzle_pieces.dm index f44b2c45bef..19c7bd68f88 100644 --- a/code/game/objects/items/puzzle_pieces.dm +++ b/code/game/objects/items/puzzle_pieces.dm @@ -34,7 +34,7 @@ /obj/machinery/door/puzzle name = "locked door" - desc = "This door only opens under certain conditions. It looks virtually indestructable." + desc = "This door only opens under certain conditions. It looks virtually indestructible." icon = 'icons/obj/doors/puzzledoor/default.dmi' icon_state = "door_closed" explosion_block = 3 @@ -75,7 +75,7 @@ return TRUE /obj/machinery/door/puzzle/keycard - desc = "This door only opens when a keycard is swiped. It looks virtually indestructable." + desc = "This door only opens when a keycard is swiped. It looks virtually indestructible." /obj/machinery/door/puzzle/keycard/attackby(obj/item/attacking_item, mob/user, params) . = ..() @@ -97,7 +97,7 @@ puzzle_id = "blue" /obj/machinery/door/puzzle/light - desc = "This door only opens when a linked mechanism is powered. It looks virtually indestructable." + desc = "This door only opens when a linked mechanism is powered. It looks virtually indestructible." /obj/machinery/door/puzzle/light/Initialize(mapload) . = ..() @@ -168,7 +168,7 @@ //Light puzzle /obj/structure/light_puzzle name = "light mechanism" - desc = "It's a mechanism that seems to power something when all the lights are lit up. It looks virtually indestructable." + desc = "It's a mechanism that seems to power something when all the lights are lit up. It looks virtually indestructible." icon = 'icons/obj/puzzle_small.dmi' icon_state = "light_puzzle" anchored = TRUE diff --git a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm index 07c7a377c0e..a1eaf114992 100644 --- a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm +++ b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm @@ -42,7 +42,7 @@ /obj/machinery/portable_atmospherics/ex_act(severity, target) if(resistance_flags & INDESTRUCTIBLE) - return FALSE //Indestructable cans shouldn't release air + return FALSE //Indestructible cans shouldn't release air if(severity == EXPLODE_DEVASTATE || target == src) //This explosion will destroy the can, release its air. @@ -62,7 +62,7 @@ /// On most cases only one will be exceeded, so the other one is scaled down. /obj/machinery/portable_atmospherics/proc/take_atmos_damage() var/taking_damage = FALSE - + var/temp_damage = 1 var/pressure_damage = 1 @@ -76,7 +76,7 @@ if(!taking_damage) return FALSE - + take_damage(clamp(temp_damage * pressure_damage, 5, 50), BURN, 0) return TRUE diff --git a/code/modules/awaymissions/mission_code/murderdome.dm b/code/modules/awaymissions/mission_code/murderdome.dm index 1b1ad132bb6..5f7787cfe8c 100644 --- a/code/modules/awaymissions/mission_code/murderdome.dm +++ b/code/modules/awaymissions/mission_code/murderdome.dm @@ -1,15 +1,15 @@ -/obj/structure/window/reinforced/fulltile/indestructable +/obj/structure/window/reinforced/fulltile/indestructible name = "robust window" flags_1 = PREVENT_CLICK_UNDER_1 | NODECONSTRUCT_1 resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF -/obj/structure/grille/indestructable +/obj/structure/grille/indestructible flags_1 = CONDUCT_1 | NODECONSTRUCT_1 resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF -/obj/effect/spawner/structure/window/reinforced/indestructable - spawn_list = list(/obj/structure/grille/indestructable, /obj/structure/window/reinforced/fulltile/indestructable) +/obj/effect/spawner/structure/window/reinforced/indestructible + spawn_list = list(/obj/structure/grille/indestructible, /obj/structure/window/reinforced/fulltile/indestructible) /obj/structure/barricade/security/murderdome name = "respawnable barrier"