Skip to content

Commit

Permalink
[MIRROR] Fixes some atoms conduct electricity flag (#2502)
Browse files Browse the repository at this point in the history
* Fixes some atoms conduct electricity flag (#83230)

## About The Pull Request
Fixes: tgstation/tgstation#83229
I think this code was done this way by a little mistake, and a metal
sword should conduct electricity anyway (right?).

![Gif](https://c.tenor.com/4quSMOaGcKkAAAAd/tenor.gif)
## Why It's Good For The Game
its a fix
## Changelog
:cl: Rengan
fix: Officers sabre and grilles now conducts electricity as it should.
/:cl:

* Fixes some atoms conduct electricity flag

---------

Co-authored-by: RengaN02 <[email protected]>
Co-authored-by: NovaBot13 <[email protected]>
  • Loading branch information
3 people authored and StealsThePRs committed May 16, 2024
1 parent a0aa7b3 commit 7e8e21d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
3 changes: 1 addition & 2 deletions code/game/objects/items/melee/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@
inhand_icon_state = "sabre"
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
obj_flags = CONDUCTS_ELECTRICITY
obj_flags = UNIQUE_RENAME
obj_flags = CONDUCTS_ELECTRICITY | UNIQUE_RENAME
force = 15
throwforce = 10
demolition_mod = 0.75 //but not metal
Expand Down
3 changes: 1 addition & 2 deletions code/game/objects/structures/grille.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
density = TRUE
anchored = TRUE
pass_flags_self = PASSGRILLE | PASSWINDOW
obj_flags = CONDUCTS_ELECTRICITY
obj_flags = CAN_BE_HIT | IGNORE_DENSITY
obj_flags = CONDUCTS_ELECTRICITY | CAN_BE_HIT | IGNORE_DENSITY
pressure_resistance = 5*ONE_ATMOSPHERE
armor_type = /datum/armor/structure_grille
max_integrity = 50
Expand Down

0 comments on commit 7e8e21d

Please sign in to comment.