cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-25 05:51:56 +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 21:58:20 +00:00
committed by GitHub
co-authored by Matt Atlas
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/research/research.dm
+8 -8
View File
@@ -255,14 +255,14 @@ GLOBAL_LIST_EMPTY(designs_imprinter_categories)
pixel_x = rand(-5, 5)
pixel_y = rand(-5, 5)
/obj/item/disk/tech_disk/examine(mob/user, distance)
/obj/item/disk/tech_disk/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
. = ..()
if(distance <= 1)
if(stored)
to_chat(user, FONT_SMALL("It is storing the following tech:"))
to_chat(user, FONT_SMALL(" - [stored.name]: Level - [stored.level] | Progress - [stored.next_level_progress]/[stored.next_level_threshold]"))
. += FONT_SMALL("It is storing the following tech:")
. += FONT_SMALL(" - [stored.name]: Level - [stored.level] | Progress - [stored.next_level_progress]/[stored.next_level_threshold]")
else
to_chat(user, FONT_SMALL("It doesn't have any tech stored."))
. += FONT_SMALL("It doesn't have any tech stored.")
/obj/item/disk/design_disk
name = "component design disk"
@@ -279,11 +279,11 @@ GLOBAL_LIST_EMPTY(designs_imprinter_categories)
pixel_x = rand(-5, 5)
pixel_y = rand(-5, 5)
/obj/item/disk/design_disk/examine(mob/user, distance)
/obj/item/disk/design_disk/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
. = ..()
if(distance <= 1)
if(blueprint)
to_chat(user, FONT_SMALL("It is storing the following design:"))
to_chat(user, FONT_SMALL(" - [blueprint.name]"))
. += FONT_SMALL("It is storing the following design:")
. += FONT_SMALL(" - [blueprint.name]")
else
to_chat(user, FONT_SMALL("It doesn't have any blueprint stored."))
. += FONT_SMALL("It doesn't have any blueprint stored.")
code/modules/research/weaponsanalyzer.dm
+2 -5
View File
@@ -17,12 +17,9 @@
/obj/item/stock_parts/console_screen = 1
)
/obj/machinery/weapons_analyzer/examine(mob/user)
/obj/machinery/weapons_analyzer/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
. = ..()
var/name_of_thing = ""
if(item)
name_of_thing = item.name
to_chat(user, SPAN_NOTICE("It has [name_of_thing ? "[name_of_thing]" : "nothing"] attached."))
. += SPAN_NOTICE("It has [item ? "[item.name]" : "nothing"] attached.")
/obj/machinery/weapons_analyzer/attackby(var/obj/item/I, var/mob/user as mob)
if(!I || !user || !ishuman(user))
code/modules/research/xenoarchaeology/tools/suspension_generator.dm
+3 -3
View File
@@ -167,10 +167,10 @@
var/field_type = "chlorine"
var/victim_number //number of mobs it affected, needed for generator powerdraw calc
/obj/effect/suspension_field/examine(mob/user)
/obj/effect/suspension_field/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
. = ..()
to_chat(user, SPAN_NOTICE("You can see something floating inside it:"))
to_chat(user, SPAN_NOTICE(english_list(contents)))
. += SPAN_NOTICE("You can see something floating inside it:")
. += SPAN_NOTICE(english_list(contents))
/obj/effect/suspension_field/Initialize()
. = ..()
code/modules/research/xenoarchaeology/tools/tools_coresampler.dm
+2 -2
View File
@@ -23,10 +23,10 @@
w_class = ITEMSIZE_TINY
var/obj/item/sample
/obj/item/device/core_sampler/examine(mob/user, distance, is_adjacent)
/obj/item/device/core_sampler/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
. = ..()
if(distance <= 2)
to_chat(user, SPAN_NOTICE("This one is [sample ? "full" : "empty"]."))
. += SPAN_NOTICE("This one is [sample ? "full" : "empty"].")
/obj/item/device/core_sampler/proc/sample_item(var/item_to_sample, var/mob/user)
var/datum/geosample/geo_data