cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-19 03:49:10 +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/mining/drilling/drill.dm
+7 -7
View File
@@ -176,20 +176,20 @@
system_error("Resource field depleted.")
update_icon()
/obj/machinery/mining/drill/examine(mob/user, distance, is_adjacent)
/obj/machinery/mining/drill/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
. = ..()
if(need_player_check)
to_chat(user, SPAN_WARNING("The drill error light is flashing. The cell panel is [panel_open ? "open" : "closed"]."))
. += SPAN_WARNING("The drill error light is flashing. The cell panel is [panel_open ? "open" : "closed"].")
else
to_chat(user, "The drill is [active ? "active" : "inactive"] and the cell panel is [panel_open ? "open" : "closed"].")
. += "The drill is [active ? "active" : "inactive"] and the cell panel is [panel_open ? "open" : "closed"]."
if(panel_open)
to_chat(user, "The power cell is [cell ? "installed" : "missing"].")
to_chat(user, "The cell charge meter reads [cell ? round(cell.percent(),1) : 0]%.")
. += "The power cell is [cell ? "installed" : "missing"]."
. += "The cell charge meter reads [cell ? round(cell.percent(),1) : 0]%."
if(is_adjacent)
if(attached_satchel)
to_chat(user, FONT_SMALL(SPAN_NOTICE("It has a [attached_satchel] attached to it.")))
. += FONT_SMALL(SPAN_NOTICE("It has a [attached_satchel] attached to it."))
if(current_error)
to_chat(user, FONT_SMALL(SPAN_WARNING("The error display reads \"[current_error]\".")))
. += FONT_SMALL(SPAN_WARNING("The error display reads \"[current_error]\"."))
return
/obj/machinery/mining/drill/proc/activate_light(var/lights = DRILL_LIGHT_IDLE)
code/modules/mining/mine_items.dm
+7 -7
View File
@@ -850,12 +850,12 @@
emagged = TRUE
update_icon()
/obj/item/lazarus_injector/examine(mob/user)
/obj/item/lazarus_injector/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
. = ..()
if(!loaded)
to_chat(user, SPAN_INFO("\The [src] is empty."))
. += SPAN_INFO("\The [src] is empty.")
if(malfunctioning || emagged)
to_chat(user, SPAN_INFO("The display on \the [src] seems to be flickering."))
. += SPAN_INFO("The display on \the [src] seems to be flickering.")
/**********************Point Transfer Card**********************/
@@ -876,9 +876,9 @@
to_chat(user, SPAN_INFO("There's no points left on \the [src]."))
..()
/obj/item/card/mining_point_card/examine(mob/user)
/obj/item/card/mining_point_card/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
. = ..()
to_chat(user, SPAN_NOTICE("There's [points] point\s on the card."))
. += SPAN_NOTICE("There's [points] point\s on the card.")
/**********************"Fultons"**********************/
@@ -896,9 +896,9 @@ var/list/total_extraction_beacons = list()
var/uses_left = 3
origin_tech = list(TECH_BLUESPACE = 3, TECH_PHORON = 4, TECH_ENGINEERING = 4)
/obj/item/extraction_pack/examine(mob/user)
/obj/item/extraction_pack/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
. = ..()
to_chat(user, SPAN_NOTICE("It has [uses_left] uses remaining."))
. += SPAN_NOTICE("It has [uses_left] uses remaining.")
/obj/item/extraction_pack/attack_self(mob/user)
var/list/possible_beacons = list()
code/modules/mining/mine_turfs.dm
+9 -9
View File
@@ -94,27 +94,27 @@ var/list/mineral_can_smooth_with = list(
return INITIALIZE_HINT_NORMAL
/turf/simulated/mineral/examine(mob/user)
/turf/simulated/mineral/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
. = ..()
if(mineral)
switch(mined_ore)
if(0)
to_chat(user, SPAN_INFO("It is ripe with [mineral.display_name]."))
. += SPAN_INFO("It is ripe with [mineral.display_name].")
if(1)
to_chat(user, SPAN_INFO("Its [mineral.display_name] looks a little depleted."))
. += SPAN_INFO("Its [mineral.display_name] looks a little depleted.")
if(2)
to_chat(user, SPAN_INFO("Its [mineral.display_name] looks very depleted!"))
. += SPAN_INFO("Its [mineral.display_name] looks very depleted!")
else
to_chat(user, SPAN_INFO("It is devoid of any valuable minerals."))
. += SPAN_INFO("It is devoid of any valuable minerals.")
switch(emitter_blasts_taken)
if(0)
to_chat(user, SPAN_INFO("It is in pristine condition."))
. += SPAN_INFO("It is in pristine condition.")
if(1)
to_chat(user, SPAN_INFO("It appears a little damaged."))
. += SPAN_INFO("It appears a little damaged.")
if(2)
to_chat(user, SPAN_INFO("It is crumbling!"))
. += SPAN_INFO("It is crumbling!")
if(3)
to_chat(user, SPAN_INFO("It looks ready to collapse at any moment!"))
. += SPAN_INFO("It looks ready to collapse at any moment!")
/turf/simulated/mineral/ex_act(severity)
switch(severity)
code/modules/mining/minebot.dm
+3 -3
View File
@@ -46,10 +46,10 @@
update_icon()
density = FALSE
/mob/living/silicon/robot/drone/mining/examine(mob/user)
/mob/living/silicon/robot/drone/mining/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
. = ..()
if(health_upgrade)
to_chat(user, SPAN_NOTICE("\The [src] appears to have a reinforced chassis."))
. += SPAN_NOTICE("\The [src] appears to have a reinforced chassis.")
if(ranged_upgrade || drill_upgrade)
var/output_text = "\The [src]'s lights indicates it has"
if(ranged_upgrade && drill_upgrade)
@@ -58,7 +58,7 @@
output_text += " a stationbound class KA mounted to it."
else if(drill_upgrade)
output_text += " a jackhammer drill mounted to it."
to_chat(user, SPAN_NOTICE(output_text))
. += SPAN_NOTICE(output_text)
/mob/living/silicon/robot/drone/mining/request_player()
if(too_many_active_drones())
code/modules/mining/ore_detector.dm
+2 -2
View File
@@ -24,10 +24,10 @@
var/list/ore_names
/obj/item/ore_detector/examine(mob/user, distance)
/obj/item/ore_detector/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
. = ..()
if(distance <= 1)
to_chat(user, FONT_SMALL(SPAN_NOTICE("Alt-click to set the ore you wish to search for.")))
. += FONT_SMALL(SPAN_NOTICE("Alt-click to set the ore you wish to search for."))
/obj/item/ore_detector/Destroy()
deactivate()
code/modules/mining/ore_satchel.dm
+2 -2
View File
@@ -11,10 +11,10 @@
var/linked_beacon = FALSE // can't hold an actual beacon beclause storage code a shit
var/linked_beacon_uses = 3 // to hold the amount of uses the beacon had, storage code a shit.
/obj/item/storage/bag/ore/examine(mob/user, distance, is_adjacent)
/obj/item/storage/bag/ore/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
. = ..()
if(is_adjacent && linked_beacon)
to_chat(user, FONT_SMALL(SPAN_NOTICE("It has a <b>warp extraction pack</b> inside.")))
. += FONT_SMALL(SPAN_NOTICE("It has a <b>warp extraction pack</b> inside."))
/obj/item/storage/bag/ore/drone
// this used to be 400. The inventory system FUCKING DIED at this.
code/modules/mining/satchel_ore_boxdm.dm
+6 -7
View File
@@ -71,10 +71,10 @@
else
stored_ore[O.name] = 1
/obj/structure/ore_box/examine(mob/user, distance, is_adjacent)
/obj/structure/ore_box/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
. = ..()
// Borgs can now check contents too.
if((!istype(user, /mob/living/carbon/human)) && (!istype(user, /mob/living/silicon/robot)))
if(!ishuman(user) && !isrobot(user))
return
if(!is_adjacent) //Can only check the contents of ore boxes if you can physically reach them.
return
@@ -82,20 +82,19 @@
add_fingerprint(user)
if(warp_core)
to_chat(user, FONT_SMALL(SPAN_NOTICE("It has a <b>warp extraction beacon signaller</b> attached to it.")))
. += FONT_SMALL(SPAN_NOTICE("It has a <b>warp extraction beacon signaller</b> attached to it."))
if(!length(contents))
to_chat(user, SPAN_NOTICE("It is empty."))
. += SPAN_NOTICE("It is empty.")
return
if(world.time > last_update + 10)
update_ore_count()
last_update = world.time
to_chat(user, SPAN_NOTICE("It holds:"))
. += SPAN_NOTICE("It holds:")
for(var/ore in stored_ore)
to_chat(user, SPAN_NOTICE("- [stored_ore[ore]] [ore]"))
return
. += SPAN_NOTICE("- [stored_ore[ore]] [ore]")
/obj/structure/ore_box/verb/empty_box()
set name = "Empty Ore Box"