Skip to content

Commit

Permalink
Fix Airlock Note Overlays, Note Removal Hints, Poster Removal Examine…
Browse files Browse the repository at this point in the history
… Hint (#372)
  • Loading branch information
RimiNosha authored Nov 18, 2023
1 parent 9b0eeab commit 16d538a
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 6 deletions.
13 changes: 7 additions & 6 deletions code/game/machinery/doors/airlock.dm
Original file line number Diff line number Diff line change
Expand Up @@ -552,6 +552,7 @@
else
. += "There's a [note.name] pinned to the front..."
. += note.examine(user)
. += span_info("You could [span_bold("cut")] this down.")
if(seal)
. += "It's been braced with \a [seal]."
if(welded)
Expand Down Expand Up @@ -633,8 +634,12 @@

context[SCREENTIP_CONTEXT_LMB] = "Repair"
return CONTEXTUAL_SCREENTIP_SET
if (TOOL_WIRECUTTER)
if(panel_open)
return

return .
context[SCREENTIP_CONTEXT_LMB] = "Take down note"
return CONTEXTUAL_SCREENTIP_SET

/obj/machinery/door/airlock/attack_ai(mob/user)
if(!canAIControl(user))
Expand Down Expand Up @@ -1452,11 +1457,7 @@
if(!note)
return
else if(istype(note, /obj/item/paper))
var/obj/item/paper/pinned_paper = note
if(pinned_paper.get_total_length() && pinned_paper.show_written_words)
return "note_words_[frame_state]"
else
return "note_[frame_state]"
return "note_[frame_state]"

else if(istype(note, /obj/item/photo))
return "photo_[frame_state]"
Expand Down
8 changes: 8 additions & 0 deletions code/game/objects/effects/contraband.dm
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,14 @@
return CONTEXTUAL_SCREENTIP_SET
return .

/obj/structure/sign/poster/examine(mob/user)
. = ..()
if(ruined)
. += span_info("You could [span_bold("cut")] down the remnants.")
return

. += span_info("You could [span_bold("cut")] this down.")

/obj/structure/sign/poster/proc/randomise(base_type)
var/list/poster_types = subtypesof(base_type)
var/list/approved_types = list()
Expand Down
Binary file modified icons/obj/doors/airlocks/station/note_overlays.dmi
Binary file not shown.

0 comments on commit 16d538a

Please sign in to comment.