cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 05:27:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

temp based cleaner logs, uses Join()

Browse Source
This commit is contained in:
SteelSlayer
2019-11-12 10:17:54 -06:00
parent 55bf2fe756
commit 468ebe87e0
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers.dm
-8
View File
@@ -72,11 +72,3 @@ obj/item/reagent_containers/proc/add_initial_reagents()
to_chat(user, "<span class='notice'>You fill [src] from [source].</span>")
return
..()
// Returns a string that contains a list of reagents seperated with commas
/obj/item/reagent_containers/proc/get_formatted_contents_string()
var/contents_string
for(var/R in reagents.reagent_list)
contents_string += "[R], "
contents_string = copytext(contents_string, 1, lentext(contents_string)-1)
return contents_string
code/modules/reagents/reagent_containers/spray.dm
+5 -3
View File
@@ -43,20 +43,22 @@
to_chat(user, "<span class='notice'>[src] is empty!</span>")
return
var/contents_log = get_formatted_contents_string()
var/contents_log = reagents.reagent_list.Join(", ")
spray(A)
playsound(loc, 'sound/effects/spray2.ogg', 50, 1, -6)
user.changeNext_move(CLICK_CD_RANGE*2)
user.newtonian_move(get_dir(A, user))
if(reagents.reagent_list.len == 1 && reagents.has_reagent("cleaner")) // Don't show logs for bottles spraying only space cleaner
return
if(reagents.reagent_list.len == 1 && reagents.has_reagent("cleaner")) // Only show space cleaner logs if it's burning people from being too hot or cold
if((reagents.chem_temp < 300) && (reagents.chem_temp > 280)) // 280 is the cold threshold for slimes, 300 the hot threshold for drask
return
var/attack_log_type = ATKLOG_MOST
if(reagents.has_reagent("sacid") || reagents.has_reagent("facid") || reagents.has_reagent("lube"))
attack_log_type = ATKLOG_FEW
msg_admin_attack("[key_name_admin(user)] used a spray bottle at [COORD(user)] - Contents: [contents_log] - Temperature: [reagents.chem_temp]K", attack_log_type)
log_game("[key_name(user)] used a spray bottle at [COORD(user)] - Contents: [contents_log] - Temperature: [reagents.chem_temp]K")
return