Skip to content

Commit

Permalink
deleting a var called "max_temperature" that as been created in Walls…
Browse files Browse the repository at this point in the history
….dm. (#5460)

# About the pull request
deleting a var called "max_temperature" that created in Walls.dm and
didn't do anything code wise.
put comment on some var to standard....

<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game
# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
del: deleting a var called "max_temperature" that created in Walls.dm
and didn't do anything code wise.
/:cl:

---------

Co-authored-by: Julien <[email protected]>
  • Loading branch information
Huffie56 and Julien committed Jan 18, 2024
1 parent d0c4f1c commit 04165ce
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 16 deletions.
1 change: 0 additions & 1 deletion code/game/turfs/walls/r_wall.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
density = TRUE

damage_cap = HEALTH_WALL_REINFORCED
max_temperature = 6000

walltype = WALL_REINFORCED

Expand Down
10 changes: 0 additions & 10 deletions code/game/turfs/walls/wall_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
damage = 0
damage_cap = HEALTH_WALL //Wall will break down to girders if damage reaches this point

max_temperature = 18000 //K, walls will take damage if they're next to a fire hotter than this

opacity = TRUE
density = TRUE

Expand Down Expand Up @@ -225,22 +223,19 @@
hull = 0 //Can't be deconstructed

damage_cap = HEALTH_WALL
max_temperature = 28000 //K, walls will take damage if they're next to a fire hotter than this
walltype = WALL_SULACO //Changes all the sprites and icons.

/turf/closed/wall/sulaco/hull
name = "outer hull"
desc = "A reinforced outer hull, probably to prevent breaches"
hull = 1
max_temperature = 50000 // Nearly impossible to melt
walltype = WALL_SULACO


/turf/closed/wall/sulaco/unmeltable
name = "outer hull"
desc = "A reinforced outer hull, probably to prevent breaches"
hull = 1
max_temperature = 50000 // Nearly impossible to melt
walltype = WALL_SULACO


Expand Down Expand Up @@ -550,7 +545,6 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen)
desc = "A thick and chunky metal wall covered in jagged ribs."
walltype = WALL_STRATA_OUTPOST_RIBBED
damage_cap = HEALTH_WALL_REINFORCED
max_temperature = 28000

/turf/closed/wall/strata_outpost
name = "bare outpost walls"
Expand All @@ -565,7 +559,6 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen)
desc = "A thick and chunky metal wall covered in jagged ribs."
walltype = WALL_STRATA_OUTPOST_RIBBED
damage_cap = HEALTH_WALL_REINFORCED
max_temperature = 28000

/turf/closed/wall/strata_outpost/reinforced/hull
hull = 1
Expand All @@ -586,7 +579,6 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen)
icon_state = "solaris_interior_r"
walltype = WALL_SOLARISR
damage_cap = HEALTH_WALL_REINFORCED
max_temperature = 28000

/turf/closed/wall/solaris/reinforced/hull
name = "heavy reinforced colony wall"
Expand Down Expand Up @@ -619,7 +611,6 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen)
desc = "Just like in the orange box! This one is reinforced"
walltype = WALL_DEVWALL_R
damage_cap = HEALTH_WALL_REINFORCED
max_temperature = 28000

/turf/closed/wall/dev/reinforced/hull
name = "greybox hull wall"
Expand Down Expand Up @@ -653,7 +644,6 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen)
desc = "Dusty worn down walls that were once built to last. This one is reinforced"
walltype = WALL_KUTJEVO_COLONYR
damage_cap = HEALTH_WALL_REINFORCED
max_temperature = 28000

/turf/closed/wall/kutjevo/colony/reinforced/hull
icon_state = "colonyh"
Expand Down
13 changes: 8 additions & 5 deletions code/game/turfs/walls/walls.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@
icon_state = "0"
opacity = TRUE
layer = WALL_LAYER
var/hull = 0 //1 = Can't be deconstructed by tools or thermite. Used for Sulaco walls
/// 1 = Can't be deconstructed by tools or thermite. Used for Sulaco walls
var/hull = 0
var/walltype = WALL_METAL
var/junctiontype //when walls smooth with one another, the type of junction each wall is.
/// when walls smooth with one another, the type of junction each wall is.
var/junctiontype
var/thermite = 0
var/melting = FALSE
var/claws_minimum = CLAW_TYPE_SHARP
Expand All @@ -21,7 +23,8 @@
)

var/damage = 0
var/damage_cap = HEALTH_WALL //Wall will break down to girders if damage reaches this point
/// Wall will break down to girders if damage reaches this point
var/damage_cap = HEALTH_WALL

var/damage_overlay
var/global/damage_overlays[8]
Expand All @@ -30,12 +33,12 @@
var/image/bullet_overlay = null
var/list/wall_connections = list("0", "0", "0", "0")
var/neighbors_list = 0
var/max_temperature = 1800 //K, walls will take damage if they're next to a fire hotter than this
var/repair_materials = list("wood"= 0.075, "metal" = 0.15, "plasteel" = 0.3) //Max health % recovered on a nailgun repair

var/d_state = 0 //Normal walls are now as difficult to remove as reinforced walls

var/obj/effect/acid_hole/acided_hole //the acid hole inside the wall
/// the acid hole inside the wall
var/obj/effect/acid_hole/acided_hole
var/acided_hole_dir = SOUTH

var/special_icon = 0
Expand Down

0 comments on commit 04165ce

Please sign in to comment.