Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions code/game/objects/structures/bookcase.dm
Original file line number Diff line number Diff line change
Expand Up @@ -131,11 +131,11 @@
new /obj/item/book/manual/research_and_development(src)
update_icon()

/obj/structure/bookcase
icon_state = "woodbook-0"
/obj/structure/bookcase/wood
icon_state = "wood-0"

/obj/structure/bookcase/wood/update_icon()
if(length(contents) < 6)
icon_state = "woodbook-[length(contents)]"
icon_state = "wood-[length(contents)]"
else
icon_state = "woodbook-6"
icon_state = "wood-6"
Binary file modified icons/obj/structures/bookshelf.dmi
Binary file not shown.
9 changes: 8 additions & 1 deletion maps/Nightmare/maps/Sekhmet_Swamp/nightmare.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,12 @@
{
"type": "map_sprinkle",
"path": "sprinkles/"
}
},
{
"type": "map_insert",
"landmark": "clfswamp",
"chance": 1.0,
"path": "standalone/clfswamp.dmm",
"when": { "lvevent": "clfswamp" }
}
]
10 changes: 9 additions & 1 deletion maps/Nightmare/maps/Sekhmet_Swamp/scenario.json
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
[]
[
{
"type": "pick", "name": "event",
"choices": [
{ "weight": 9, "type": "def", "values": { "lvevent": "none" } },
{ "weight": 1, "type": "def", "values": { "lvevent": "clfswamp", "hostile_survivors": true } }
]
}
]
Loading
Loading