Merge pull request #11568 from Ghommie/Ghommie-cit634

Two runtimes, one fix.
This commit is contained in:
Putnam3145
2020-03-23 00:03:23 -07:00
committed by GitHub
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -194,7 +194,7 @@
w_class = initial(w_class)
name = initial(name)
hitsound = initial(hitsound)
embedding = embedding.setRating(embed_chance = EMBED_CHANCE)
embedding = null
throwforce = initial(throwforce)
playsound(user, 'sound/weapons/saberoff.ogg', 5, 1)
to_chat(user, "<span class='warning'>[src] can now be concealed.</span>")
@@ -204,7 +204,7 @@
w_class = WEIGHT_CLASS_NORMAL
name = "energy dagger"
hitsound = 'sound/weapons/blade1.ogg'
embedding = list("embed_chance" = 100, "embedded_fall_chance" = 0)//rule of cool
embedding = getEmbeddingBehavior(embed_chance = 100, embedded_fall_chance = 0) //rule of cool
throwforce = 35
playsound(user, 'sound/weapons/saberon.ogg', 5, 1)
to_chat(user, "<span class='warning'>[src] is now active.</span>")
+1 -1
View File
@@ -173,7 +173,7 @@
if(istype(W, /obj/item/mop) && filled)
W.reagents.add_reagent("water", 5)
to_chat(user, "<span class='notice'>You wet [W] in [src].</span>")
playsound(loc, 'sound/effects/slosh.ogg', 25, TRUE)
playsound(src, 'sound/effects/slosh.ogg', 25, TRUE)
else
return ..()