Fixes
This commit is contained in:
@@ -524,6 +524,7 @@
|
||||
fermiIsReacting = FALSE
|
||||
reactedVol = 0
|
||||
targetVol = 0
|
||||
holder.pH_check()
|
||||
C.FermiFinish(src, my_atom, multiplier)
|
||||
handle_reactions()
|
||||
update_total()
|
||||
@@ -549,6 +550,7 @@
|
||||
fermiIsReacting = FALSE
|
||||
reactedVol = 0
|
||||
targetVol = 0
|
||||
holder.pH_check()
|
||||
C.FermiFinish(src, my_atom, multiplier)
|
||||
handle_reactions()
|
||||
update_total()
|
||||
@@ -564,6 +566,7 @@
|
||||
fermiIsReacting = FALSE
|
||||
reactedVol = 0
|
||||
targetVol = 0
|
||||
holder.pH_check()
|
||||
C.FermiFinish(src, my_atom, multiplier)
|
||||
handle_reactions()
|
||||
update_total()
|
||||
|
||||
@@ -178,6 +178,7 @@
|
||||
/obj/item/reagent_containers/glass/beaker/plastic/Initialize()
|
||||
beaker_weakness_bitflag &= ~PH_WEAK
|
||||
beaker_weakness_bitflag |= TEMP_WEAK
|
||||
. = ..()
|
||||
|
||||
/obj/item/reagent_containers/glass/beaker/plastic/update_icon()
|
||||
icon_state = "beakerlarge" // hack to lets us reuse the large beaker reagent fill states
|
||||
@@ -195,6 +196,7 @@
|
||||
|
||||
/obj/item/reagent_containers/glass/beaker/meta/Initialize()
|
||||
beaker_weakness_bitflag &= ~PH_WEAK
|
||||
. = ..()
|
||||
|
||||
/obj/item/reagent_containers/glass/beaker/noreact
|
||||
name = "cryostasis beaker"
|
||||
@@ -279,6 +281,7 @@
|
||||
|
||||
/obj/item/reagent_containers/glass/bucket/Initialize()
|
||||
beaker_weakness_bitflag |= TEMP_WEAK
|
||||
. = ..()
|
||||
|
||||
/obj/item/reagent_containers/glass/bucket/attackby(obj/O, mob/user, params)
|
||||
if(istype(O, /obj/item/mop))
|
||||
|
||||
@@ -620,7 +620,15 @@
|
||||
var/next_command = 0
|
||||
var/cooldown_mod = 1
|
||||
var/base_multiplier = 1
|
||||
//spans = list("say","yell")
|
||||
|
||||
/datum/action/item_action/organ_action/velvet/Trigger()
|
||||
. = ..()
|
||||
var/command = input(owner, "Speak with the Voice of God", "Command")
|
||||
if(QDELETED(src) || QDELETED(owner))
|
||||
return
|
||||
if(!command)
|
||||
return
|
||||
owner.say(".x[command]")
|
||||
|
||||
/obj/item/organ/vocal_cords/velvet/handle_speech(message) //actually say the message
|
||||
owner.say(message, spans = spans, sanitize = FALSE)
|
||||
|
||||
Reference in New Issue
Block a user