Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Xmas barricade decorator not working #5270

Merged
merged 3 commits into from
Dec 22, 2023
Merged

Fix Xmas barricade decorator not working #5270

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b16ebcd
fix barricade xmas wiring
fira Dec 21, 2023
294fe80
Update code/game/objects/structures/barricade/barricade.dm
fira Dec 21, 2023
174a7af
Update code/game/objects/structures/barricade/barricade.dm
fira Dec 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions code/game/objects/structures/barricade/barricade.dm
View file
Open in desktop
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")
fira marked this conversation as resolved.
Show resolved Hide resolved
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")
fira marked this conversation as resolved.
Show resolved Hide resolved

..()

Expand Down
2 changes: 1 addition & 1 deletion code/modules/decorators/christmas.dm
View file
Open in desktop
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
Loading