Merge branch 'master' into Arokha/matdefs

This commit is contained in:
Aronai Sieyes
2021-07-07 14:29:30 -04:00
committed by GitHub
283 changed files with 4118 additions and 1405 deletions
@@ -146,7 +146,7 @@
to_chat(user, "<span class='notice'>You press \the [src]'s chamber agitator button.</span>")
if(on)
visible_message("<span class='notice'>\The [src] rattles to life.</span>")
visible_message("<b>\The [src]</b> rattles to life.")
reagents.handle_reactions()
else
spawn(1 SECOND)
@@ -316,7 +316,7 @@
if(target_temp == round(current_temp, 1.0))
current_temp = target_temp // Hard set it so we don't need to worry about exact decimals any more, after we've been keeping track of it all this time
playsound(src, 'sound/machines/ping.ogg', 50, 0)
src.visible_message("<span class='notice'>\The [src] pings as it reaches the target temperature.</span>")
src.visible_message("<b>\The [src]</b> pings as it reaches the target temperature.")
else if(connected_port && avg_pressure > 1000)
current_temp = round((current_temp + avg_temp) / 2)
+2 -2
View File
@@ -347,7 +347,7 @@
var/obj/item/stack/medical/M = C.upgrade_stack(to_produce)
if(M && M.amount)
holder.my_atom.visible_message("<span class='notice'>\The [packname] bubbles.</span>")
holder.my_atom.visible_message("<b>\The [packname]</b> bubbles.")
remove_self(to_produce * 5)
/datum/reagent/cryoxadone
@@ -1256,7 +1256,7 @@
var/obj/item/stack/medical/M = C.upgrade_stack(to_produce)
if(M && M.amount)
holder.my_atom.visible_message("<span class='notice'>\The [packname] bubbles.</span>")
holder.my_atom.visible_message("<b>\The [packname]</b> bubbles.")
remove_self(to_produce)
/datum/reagent/sterilizine