cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 20:43: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 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/overmap/contacts/tracker.dm
+2 -2
View File
@@ -18,6 +18,6 @@
/obj/item/ship_tracker/proc/on_update_icon()
icon_state = enabled ? "enabled" : "disabled"
/obj/item/ship_tracker/examine(var/mob/user)
/obj/item/ship_tracker/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
. = ..()
to_chat(user, "It appears to be [enabled ? "enabled" : "disabled"]")
. += "It appears to be [enabled ? "enabled" : "disabled"]"
code/modules/overmap/exoplanets/decor/objs/pit.dm
+2 -2
View File
@@ -163,9 +163,9 @@
/obj/structure/gravemarker/cross
icon_state = "cross"
/obj/structure/gravemarker/examine(mob/user)
/obj/structure/gravemarker/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
. = ..()
to_chat(user, "It says: '[message]'")
. += "It says: '[message]'."
/obj/structure/gravemarker/random/Initialize()
generate()
code/modules/overmap/ship_weaponry/_ship_ammunition.dm
+3 -3
View File
@@ -53,13 +53,13 @@
return
return ..()
/obj/item/ship_ammunition/examine(mob/user, distance, is_adjacent)
/obj/item/ship_ammunition/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
. = ..()
if(written_message)
if(distance > 3)
to_chat(user, "It has something written on it, but you'd need to get closer to tell what the writing says.")
. += "It has something written on it, but you'd need to get closer to tell what the writing says."
else
to_chat(user, "It has a message written on the casing: <span class='notice'><i>[written_message]</i></span>")
. += "It has a message written on the casing: <span class='notice'><i>[written_message]</i></span>."
/obj/item/ship_ammunition/do_additional_pickup_checks(var/mob/user)
if(ammunition_flags & SHIP_AMMO_FLAG_VERY_HEAVY)
code/modules/overmap/ship_weaponry/_ship_gun.dm
+2 -2
View File
@@ -88,9 +88,9 @@
else //At roundstart, weapons start with 0 damage, so it'd be 0 / 1000 * 100 -> 0
return "It looks to be in tip top shape and not damaged at all."
/obj/machinery/ship_weapon/examine(mob/user)
/obj/machinery/ship_weapon/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
. = ..()
to_chat(user, get_damage_description())
. += get_damage_description()
/obj/machinery/ship_weapon/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/device/multitool))
code/modules/overmap/ships/computers/sensors.dm
+5 -5
View File
@@ -468,16 +468,16 @@
if(heat_percentage > 85)
add_overlay("sensors-effect-hot")
/obj/machinery/shipsensors/examine(mob/user)
/obj/machinery/shipsensors/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
. = ..()
if(health <= 0)
to_chat(user, "\The [src] is wrecked.")
. += "\The [src] is wrecked."
else if(health < max_health * 0.25)
to_chat(user, "<span class='danger'>\The [src] looks like it's about to break!</span>")
. += "<span class='danger'>\The [src] looks like it's about to break!</span>"
else if(health < max_health * 0.5)
to_chat(user, "<span class='danger'>\The [src] looks seriously damaged!</span>")
. += "<span class='danger'>\The [src] looks seriously damaged!</span>"
else if(health < max_health * 0.75)
to_chat(user, "\The [src] shows signs of damage!")
. += "\The [src] shows signs of damage!"
/obj/machinery/shipsensors/bullet_act(var/obj/item/projectile/Proj)
take_damage(Proj.get_structure_damage())