cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-20 20:37:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds examine boxes. (#18370)

Browse Source 
* Adds examine boxes.

* lint

* what kind of dreams did you dream?

* unlimited

* midgardsormr

* sdsd

* fixes

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
This commit is contained in:
Matt Atlas
2024-02-11 22:58:20 +01:00
committed by GitHub
parent d57c5e7c43
commit 4423d03f2f
296 changed files with 1317 additions and 1257 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/assembly/assembly.dm
+3 -3
View File
@@ -108,13 +108,13 @@
return
/obj/item/device/assembly/examine(mob/user, distance, is_adjacent)
/obj/item/device/assembly/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
. = ..()
if(distance <= 1 || loc == user)
if(secured)
to_chat(user, "\The [src] is ready!")
. += "\The [src] is ready!"
else
to_chat(user, "\The [src] can be attached!")
. += "\The [src] can be attached!"
/obj/item/device/assembly/attack_self(mob/user)
code/modules/assembly/holder.dm
+3 -3
View File
@@ -76,13 +76,13 @@
if(master)
master.update_icon()
/obj/item/device/assembly_holder/examine(mob/user, distance, is_adjacent)
/obj/item/device/assembly_holder/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
. = ..()
if(distance <= 1 || src.loc == user)
if (src.secured)
to_chat(user, SPAN_NOTICE("\The [src] is ready!"))
. += SPAN_NOTICE("\The [src] is ready!")
else
to_chat(user, SPAN_NOTICE("\The [src] can be attached!"))
. += SPAN_NOTICE("\The [src] can be attached!")
/obj/item/device/assembly_holder/HasProximity(atom/movable/AM as mob|obj)
if(a_left)
code/modules/assembly/infrared.dm
+2 -3
View File
@@ -58,11 +58,10 @@
to_chat(user, SPAN_NOTICE("You rotate \the [src] to face [direction_text]."))
QDEL_NULL(first)
/obj/item/device/assembly/infra/examine(mob/user)
/obj/item/device/assembly/infra/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
. = ..()
var/direction_text = dir2text(dir)
to_chat(user, SPAN_NOTICE("It is facing [direction_text]."))
. += SPAN_NOTICE("It is facing [direction_text].")
/obj/item/device/assembly/infra/process()
code/modules/assembly/mousetrap.dm
+2 -2
View File
@@ -13,10 +13,10 @@
matter = list(DEFAULT_WALL_MATERIAL = 100)
var/armed = FALSE
/obj/item/device/assembly/mousetrap/examine(mob/user)
/obj/item/device/assembly/mousetrap/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
. = ..()
if(armed)
to_chat(user, "It looks like it's armed.")
. += "It looks like it's armed."
/obj/item/device/assembly/mousetrap/update_icon()
icon_state = armed ? "mousetraparmed" : "mousetrap"