Skip to content

Commit

Permalink
fix barricade xmas wiring
Browse files Browse the repository at this point in the history
  • Loading branch information
fira committed Dec 21, 2023
1 parent 94ff96a commit b16ebcd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions code/game/objects/structures/barricade/barricade.dm
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
var/force_level_absorption = 5 //How much force an item needs to even damage it at all.
var/barricade_hitsound
var/barricade_type = "barricade" //"metal", "plasteel", etc.
var/wire_icon = 'icons/obj/structures/barricades.dmi' //! Icon file used for the wiring
var/can_change_dmg_state = TRUE
var/damage_state = BARRICADE_DMG_NONE
var/closed = FALSE
Expand Down Expand Up @@ -102,9 +103,9 @@

if(is_wired)
if(!closed)
overlays += image('icons/obj/structures/barricades.dmi', icon_state = "[src.barricade_type]_wire")
overlays += image(wire_icon, icon_state = "[src.barricade_type]_wire")
else
overlays += image('icons/obj/structures/barricades.dmi', icon_state = "[src.barricade_type]_closed_wire")
overlays += image(wire_icon, icon_state = "[src.barricade_type]_closed_wire")

..()

Expand Down
2 changes: 1 addition & 1 deletion code/modules/decorators/christmas.dm
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
/datum/decorator/christmas/barricade/decorate(obj/structure/barricade/barricade)
if(!istype(barricade))
return
barricade.icon = 'icons/obj/structures/barricades_christmas.dmi'
barricade.wire_icon = 'icons/obj/structures/barricades_christmas.dmi'
barricade.update_icon()


Expand Down

0 comments on commit b16ebcd

Please sign in to comment.