Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-sync

This commit is contained in:
xPokee
2025-10-03 07:05:54 -04:00
517 changed files with 24339 additions and 21253 deletions
-13
View File
@@ -482,19 +482,6 @@
else if (siemens_coefficient <= 0.5)
.["partially insulated"] = "It is made from a poor insulator that will dampen (but not fully block) electric shocks passing through it."
if(resistance_flags & INDESTRUCTIBLE)
.["indestructible"] = "It is extremely robust! It'll probably withstand anything that could happen to it!"
return
if(resistance_flags & LAVA_PROOF)
.["lavaproof"] = "It is made of an extremely heat-resistant material, it'd probably be able to withstand lava!"
if(resistance_flags & (ACID_PROOF | UNACIDABLE))
.["acidproof"] = "It looks pretty robust! It'd probably be able to withstand acid!"
if(resistance_flags & FREEZE_PROOF)
.["freezeproof"] = "It is made of cold-resistant materials."
if(resistance_flags & FIRE_PROOF)
.["fireproof"] = "It is made of fire-retardant materials."
/obj/item/examine_descriptor(mob/user)
return "item"