Skip to content

Commit

Permalink
Adjusting for feedback from PR.
Browse files Browse the repository at this point in the history
  • Loading branch information
MistakeNot4892 committed Feb 6, 2025
1 parent 2ace246 commit 6cbd4e4
Show file tree
Hide file tree
Showing 9 changed files with 35 additions and 26 deletions.
3 changes: 2 additions & 1 deletion code/_onclick/hud/screen/screen_intent.dm
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
/obj/screen/intent_button/examined_by(mob/user, distance, infix, suffix)
SHOULD_CALL_PARENT(FALSE)
if(desc)
return list(desc)
to_chat(user, desc)
return TRUE

/obj/screen/intent_button/on_update_icon()
. = ..()
Expand Down
6 changes: 4 additions & 2 deletions code/_onclick/hud/screen/screen_maneuver.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@
SHOULD_CALL_PARENT(FALSE)
var/mob/living/user_living = user
if(istype(user_living) && user_living.prepared_maneuver)
return list(SPAN_NOTICE("You are prepared to [user_living.prepared_maneuver.name]."))
return list(SPAN_NOTICE("You are not prepared to perform a maneuver."))
to_chat(user, SPAN_NOTICE("You are prepared to [user_living.prepared_maneuver.name]."))
else
to_chat(user, SPAN_NOTICE("You are not prepared to perform a maneuver."))
return TRUE

/obj/screen/maneuver/on_update_icon()
var/mob/living/owner = owner_ref?.resolve()
Expand Down
24 changes: 12 additions & 12 deletions code/game/machinery/doors/firedoor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -127,27 +127,27 @@

. += "<b>Sensor readings:</b>"
for(var/index = 1; index <= tile_info.len; index++)
var/list/o = list("&nbsp;&nbsp;")
var/list/direction_strings = list("&nbsp;&nbsp;")
switch(index)
if(1)
o += "NORTH: "
direction_strings += "NORTH: "
if(2)
o += "SOUTH: "
direction_strings += "SOUTH: "
if(3)
o += "EAST: "
direction_strings += "EAST: "
if(4)
o += "WEST: "
direction_strings += "WEST: "
if(tile_info[index] == null)
o += "<span class='warning'>DATA UNAVAILABLE</span>"
to_chat(user, o)
direction_strings += "<span class='warning'>DATA UNAVAILABLE</span>"
. += JOINTEXT(direction_strings)
continue
var/celsius = convert_k2c(tile_info[index][1])
var/pressure = tile_info[index][2]
o += "<span class='[(dir_alerts[index] & (FIREDOOR_ALERT_HOT|FIREDOOR_ALERT_COLD)) ? "warning" : "color:blue"]'>"
o += "[celsius]&deg;C</span> "
o += "<span style='color:blue'>"
o += "[pressure]kPa</span></li>"
. += JOINTEXT(o)
direction_strings += "<span class='[(dir_alerts[index] & (FIREDOOR_ALERT_HOT|FIREDOOR_ALERT_COLD)) ? "warning" : "color:blue"]'>"
direction_strings += "[celsius]&deg;C</span> "
direction_strings += "<span style='color:blue'>"
direction_strings += "[pressure]kPa</span></li>"
. += JOINTEXT(direction_strings)
if(islist(users_to_open) && users_to_open.len)
var/users_to_open_string = users_to_open[1]
if(users_to_open.len >= 2)
Expand Down
3 changes: 2 additions & 1 deletion code/game/objects/items/cryobag.dm
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@
if(Adjacent(user)) //The bag's rather thick and opaque from a distance.
to_chat(user, SPAN_INFO("You peer into \the [src]."))
for(var/mob/living/patient in contents)
. += patient.examined_by(user, distance, infix, suffix)
patient.examined_by(user, distance, infix, suffix)
return TRUE

/obj/item/usedcryobag
name = "used stasis bag"
Expand Down
8 changes: 5 additions & 3 deletions code/game/objects/items/rescuebag.dm
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,9 @@
. += "The pressure meter on [src] shows '[atmo.return_pressure()] kPa'."

/obj/structure/closet/body_bag/rescue/examined_by(mob/user, distance, infix, suffix)
. = ..()
if(Adjacent(user)) //The bag's rather thick and opaque from a distance.
. += SPAN_INFO("You peer into \the [src].")
for(var/mob/living/L in contents)
L.examined_by(user, distance, infix, suffix)
to_chat(user, SPAN_INFO("You peer into \the [src]."))
for(var/mob/living/patient in contents)
patient.examined_by(user, distance, infix, suffix)
return TRUE
2 changes: 1 addition & 1 deletion code/game/objects/items/weapons/tape.dm
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@
return stuck? stuck.attackby(W, user) : ..()

/obj/item/duct_tape/examined_by(mob/user, distance, infix, suffix)
return stuck ? stuck.examined_by(arglist(args)) : ..()
return stuck ? stuck.examined_by(user, distance, infix, suffix) : ..()

/obj/item/duct_tape/proc/attach(var/obj/item/W)
stuck = W
Expand Down
2 changes: 1 addition & 1 deletion code/modules/detectivework/tools/evidencebag.dm
Original file line number Diff line number Diff line change
Expand Up @@ -95,4 +95,4 @@
/obj/item/evidencebag/examined_by(mob/user, distance, infix, suffix)
. = ..()
if (stored_item)
user.examine_verb(stored_item)
user.examined_by(user, distance, infix, suffix)
6 changes: 3 additions & 3 deletions code/modules/multiz/zmimic/mimic_movable.dm
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@

/atom/movable/openspace/mimic/examined_by(mob/user, distance, infix, suffix)
SHOULD_CALL_PARENT(FALSE)
. = associated_atom.examined_by(user, distance, infix, suffix) // just pass all the args to the copied atom
return associated_atom.examined_by(user, distance, infix, suffix)

/atom/movable/openspace/mimic/forceMove(turf/dest)
var/atom/old_loc = loc
Expand Down Expand Up @@ -207,7 +207,7 @@

/atom/movable/openspace/turf_proxy/examined_by(mob/user, distance, infix, suffix)
SHOULD_CALL_PARENT(FALSE)
. = loc.examined_by(user, distance, infix, suffix)
return loc.examined_by(user, distance, infix, suffix)


// -- TURF MIMIC --
Expand Down Expand Up @@ -236,4 +236,4 @@

/atom/movable/openspace/turf_mimic/examined_by(mob/user, distance, infix, suffix)
SHOULD_CALL_PARENT(FALSE)
. = delegate.examined_by(user, distance, infix, suffix)
return delegate.examined_by(user, distance, infix, suffix)
7 changes: 5 additions & 2 deletions code/modules/paperwork/paper_sticky.dm
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,13 @@
return .
return ..()

/obj/item/sticky_pad/examined_by(mob/user, distance, infix, suffix)
/obj/item/sticky_pad/get_examine_strings(mob/user, distance, infix, suffix)
. = ..()
. += SPAN_NOTICE("It has [papers] sticky note\s left.")
. += SPAN_NOTICE("You can click it on grab intent to pick it up.")

/obj/item/sticky_pad/get_examine_hints(mob/user, distance, infix, suffix)
. = ..()
LAZYADD(., SPAN_NOTICE("You can click it on grab intent to pick it up."))

/obj/item/sticky_pad/dragged_onto(mob/user)
user.put_in_hands(top)
Expand Down

0 comments on commit 6cbd4e4

Please sign in to comment.