cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-08-21 20:16:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Mob_holder and examine microopt"

Browse Source
This commit is contained in:
Dahlular
2020-10-04 10:59:45 -06:00
committed by GitHub
parent 345c735a2d
commit 811db42beb
2 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/atoms.dm
+11 -10
View File
@@ -289,31 +289,32 @@
add_overlay(new_overlays)
/atom/proc/examine(mob/user)
. = list("[get_examine_string(user, TRUE)].")
to_chat(user, get_examine_string(user, TRUE))
if(desc)
. += desc
to_chat(user, desc)
if(reagents)
if(reagents.reagents_holder_flags & TRANSPARENT)
. += "It contains:"
if(length(reagents.reagent_list))
to_chat(user, "It contains:")
if(reagents.reagent_list.len)
if(user.can_see_reagents()) //Show each individual reagent
for(var/datum/reagent/R in reagents.reagent_list)
. += "[R.volume] units of [R.name]"
to_chat(user, "[R.volume] units of [R.name]")
else //Otherwise, just show the total volume
var/total_volume = 0
for(var/datum/reagent/R in reagents.reagent_list)
total_volume += R.volume
. += "[total_volume] units of various reagents"
to_chat(user, "[total_volume] units of various reagents")
else
. += "Nothing."
to_chat(user, "Nothing.")
else if(reagents.reagents_holder_flags & AMOUNT_VISIBLE)
if(reagents.total_volume)
. += "<span class='notice'>It has [reagents.total_volume] unit\s left.</span>"
to_chat(user, "<span class='notice'>It has [reagents.total_volume] unit\s left.</span>")
else
. += "<span class='danger'>It's empty.</span>"
to_chat(user, "<span class='danger'>It's empty.</span>")
SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, user, .)
SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, user)
/atom/proc/relaymove(mob/user)
if(buckle_message_cooldown <= world.time)