cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 16:18:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Indestructable walls are now indestructible (#68433)

Browse Source 
They call them indestructable walls because they are in-able to be destructed.

Fixes remaining cases of "indestructable" being used in the codebase (or at least the ones I could find).
This commit is contained in:
Rhials
2022-07-17 02:09:14 -06:00
committed by GitHub
parent cf0f4d4558
commit 682d93b337
12 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/Mafia/mafia_ayylmao.dmm
+2 -2
View File
@@ -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" = (
_maps/map_files/Mafia/mafia_ball.dmm
+1 -1
View File
@@ -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" = (
_maps/map_files/Mafia/mafia_gothic.dmm
+1 -1
View File
@@ -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" = (
_maps/map_files/Mafia/mafia_lavaland.dmm
+1 -1
View File
@@ -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" = (
_maps/map_files/Mafia/mafia_snow.dmm
+1 -1
View File
@@ -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" = (
_maps/map_files/Mafia/mafia_spiderclan.dmm
+1 -1
View File
@@ -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" = (
_maps/map_files/Mafia/mafia_syndie.dmm
+1 -1
View File
@@ -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" = (
_maps/shuttles/emergency_medisim.dmm
+1 -1
View File
@@ -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" = (
code/game/machinery/telecomms/machines/allinone.dm
+1 -1
View File
@@ -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
code/game/objects/items/puzzle_pieces.dm
+4 -4
View File
@@ -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
code/modules/atmospherics/machinery/portable/portable_atmospherics.dm
+3 -3
View File
@@ -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
code/modules/awaymissions/mission_code/murderdome.dm
+4 -4
View File
@@ -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"