cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 21:40:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fluff examine fix (#18814)

Browse Source 
Standard examination was in an examine box. This makes it so fluff
examines are also in a box.

Fixes #18438

---------

Co-authored-by: Cody Brittain <cbrittain10@live.com>
This commit is contained in:
Cody Brittain
2024-06-02 18:42:22 +00:00
committed by GitHub
co-authored by Cody Brittain
parent 5ae3436695
commit 91c081d044
41 changed files with 120 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items.dm
+1 -1
View File
@@ -338,7 +338,7 @@
I.forceMove(T)
/obj/item/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
/obj/item/get_examine_text(mob/user, distance, is_adjacent, infix, suffix, get_extended = FALSE)
var/size
switch(src.w_class)
if (ITEMSIZE_HUGE to INFINITY)
code/game/objects/items/devices/slide_projector.dm
+2 -2
View File
@@ -171,13 +171,13 @@
desc = "It's currently showing \the [I]."
update_icon()
/obj/effect/projection/examine(mob/user, distance, is_adjacent)
/obj/effect/projection/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended)
. = ..()
var/obj/item/slide = source.resolve()
if(!istype(slide))
qdel(src)
return
return slide.examine(user, max(distance, 1), FALSE)
return slide.examine(user, max(distance, 1), FALSE, show_extended = show_extended)
/obj/effect/projection/photo
alpha = 170
code/game/objects/items/holomenu.dm
+1 -1
View File
@@ -73,7 +73,7 @@
return TRUE
return ..()
/obj/item/holomenu/examine(mob/user, distance, is_adjacent)
/obj/item/holomenu/examine(mob/user, distance, is_adjacent, show_extended)
if(anchored && length(menu_text))
interact(user)
return TRUE
code/game/objects/items/lore_radio.dm
+1 -1
View File
@@ -17,7 +17,7 @@
toggle_receiving()
RegisterSignal(SSdcs, COMSIG_GLOB_LORE_RADIO_BROADCAST, PROC_REF(relay_lore_radio))
/obj/item/lore_radio/examine(var/mob/user)
/obj/item/lore_radio/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended)
. = ..()
to_chat(user, SPAN_NOTICE("\The [src] is turned [receiving ? "on" : "off"]."))
if(current_station)
code/game/objects/items/weapons/cards_ids.dm
+1 -1
View File
@@ -129,7 +129,7 @@ var/const/NO_EMAG_ACT = -50
. = ..()
GC_TEMPORARY_HARDDEL
/obj/item/card/id/examine(mob/user, distance)
/obj/item/card/id/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended)
. = ..()
if (distance <= 1)
show(user)
code/game/objects/items/weapons/implants/implants/circuit.dm
+2 -2
View File
@@ -38,10 +38,10 @@
IC.emp_act(severity)
/obj/item/implant/integrated_circuit/examine(mob/user, distance, is_adjacent)
/obj/item/implant/integrated_circuit/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended)
SHOULD_CALL_PARENT(FALSE)
return IC.examine(user, distance, is_adjacent)
return IC.examine(user, distance, is_adjacent, infix, suffix, show_extended)
/obj/item/implant/integrated_circuit/attackby(obj/item/attacking_item, mob/user)
if(attacking_item.iscrowbar() || istype(attacking_item, /obj/item/device/integrated_electronics) || istype(attacking_item, /obj/item/integrated_circuit) || attacking_item.isscrewdriver() || istype(attacking_item, /obj/item/cell/device) )
code/game/objects/items/weapons/storage/wallets.dm
+1 -1
View File
@@ -121,7 +121,7 @@
return ..()
/obj/item/storage/wallet/examine(mob/user, distance, is_adjacent)
/obj/item/storage/wallet/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended)
. = ..()
var/obj/item/card/id/id = GetID()
if(istype(id) && is_adjacent)
code/game/objects/items/weapons/tape.dm
+2 -2
View File
@@ -102,10 +102,10 @@
. = ..()
item_flags |= ITEM_FLAG_NO_BLUDGEON
/obj/item/ducttape/examine(mob/user)
/obj/item/ducttape/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended)
SHOULD_CALL_PARENT(FALSE)
return stuck.examine(user)
return stuck.examine(user, distance, is_adjacent, infix, suffix, show_extended)
/obj/item/ducttape/proc/attach(var/obj/item/W)
stuck = W
code/game/objects/objs.dm
+2 -2
View File
@@ -259,10 +259,10 @@
return
..()
/obj/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
/obj/get_examine_text(mob/user, distance, is_adjacent, infix, suffix, get_extended = FALSE)
. = ..()
if((obj_flags & OBJ_FLAG_ROTATABLE) || (obj_flags & OBJ_FLAG_ROTATABLE_ANCHORED))
. += SPAN_SUBTLE("Can be rotated with alt-click.")
. += SPAN_SUBTLE("Can be rotated with alt-click.")
if(contaminated)
. += SPAN_ALIEN("\The [src] has been contaminated!")
code/game/objects/structures/ECD.dm
+1 -1
View File
@@ -13,7 +13,7 @@
slowdown = 10
layer = ABOVE_HUMAN_LAYER
/obj/structure/ecd/examine(mob/living/user, distance)
/obj/structure/ecd/examine(mob/living/user, distance, is_adjacent, infix, suffix, show_extended)
. = ..()
switch(state)
if(ECD_LOOSE)
code/game/objects/structures/noticeboard.dm
+1 -1
View File
@@ -34,7 +34,7 @@
// Since Topic() never seems to interact with usr on more than a superficial
// level, it should be fine to let anyone mess with the board other than ghosts.
/obj/structure/noticeboard/examine(mob/user, distance, is_adjacent, infix, suffix)
/obj/structure/noticeboard/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended)
if(is_adjacent)
var/dat = "<B>Noticeboard</B><BR>"
for(var/obj/item/paper/P in src)
code/game/objects/structures/stool_bed_chair_nest/bed.dm
+1 -1
View File
@@ -698,7 +698,7 @@
beds++
AddOverlays(I)
/obj/structure/roller_rack/examine(mob/user)
/obj/structure/roller_rack/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended)
desc = "[initial(desc)] \nIt is holding [LAZYLEN(held)] beds."
. = ..()
code/game/objects/structures/therapy.dm
+1 -1
View File
@@ -22,7 +22,7 @@
playsound(src.loc, 'sound/weapons/blade_open.ogg', 50, 1)
closed = !closed
/obj/item/pocketwatch/examine(mob/user, distance, is_adjacent)
/obj/item/pocketwatch/examine(mob/user, distance, is_adjacent, show_extended)
. = ..()
if (distance <= 1)
checktime()