diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm
index db7096a9e99..e5d0ddd9933 100644
--- a/code/game/machinery/teleporter.dm
+++ b/code/game/machinery/teleporter.dm
@@ -252,6 +252,7 @@
return
*/
/obj/machinery/teleport/hub/Crossed(AM as mob|obj)
+ if(AM == src) return//DUH
if(istype(AM,/obj/item/projectile/beam))
var/obj/item/projectile/beam/B = AM
B.wait = 1
diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm
index 60adc259555..4f9b3f91526 100644
--- a/code/game/objects/effects/decals/cleanable.dm
+++ b/code/game/objects/effects/decals/cleanable.dm
@@ -108,7 +108,7 @@
return
if(perp.shoes)
var/obj/item/clothing/shoes/S = perp.shoes
- S.track_blood = Clamp(amount, 0, S.track_blood) //Adding blood to shoes
+ S.track_blood = max(amount,S.track_blood) //Adding blood to shoes
if(!blood_overlays[S.type]) //If there isn't a precreated blood overlay make one
S.generate_blood_overlay()
diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm
index a60e176d435..e8bc9b4ad64 100644
--- a/code/game/objects/explosion.dm
+++ b/code/game/objects/explosion.dm
@@ -65,9 +65,9 @@
if(dist <= round(max_range + world.view - 2, 1))
if(devastation_range > 0)
M.playsound_local(epicenter, get_sfx("explosion"), 100, 1, frequency, falloff = 5) // get_sfx() is so that everyone gets the same sound
+ shake_camera(M, 10, 2)
else
M.playsound_local(epicenter, get_sfx("explosion_small"), 100, 1, frequency, falloff = 5)
- shake_camera(M, 10, 2)
//You hear a far explosion if you're outside the blast radius. Small bombs shouldn't be heard all over the station.
@@ -76,10 +76,10 @@
far_volume += (dist <= far_dist * 0.5 ? 50 : 0) // add 50 volume if the mob is pretty close to the explosion
if(devastation_range > 0)
M.playsound_local(epicenter, 'sound/effects/explosionfar.ogg', far_volume, 1, frequency, falloff = 5)
+ M << "You feel something shake the structure..."
+ shake_camera(M, 4, 1)
else
M.playsound_local(epicenter, 'sound/effects/explosionsmallfar.ogg', far_volume, 1, frequency, falloff = 5)
- M << "You feel something shake the structure..."
- shake_camera(M, 4, 1)
var/close = trange(world.view+round(devastation_range,1), epicenter)
//To all distanced mobs play a different sound
diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm
index 03b83ceb51a..ddbf59af7de 100644
--- a/code/game/turfs/simulated.dm
+++ b/code/game/turfs/simulated.dm
@@ -89,6 +89,7 @@
if(M.CheckSlip() < 1) //No slipping
return ..()
if(M.m_intent == "run")
+ sleep(1)
M.stop_pulling()
step(M, M.dir)
M.visible_message("[M] slips on the wet floor!", \
@@ -99,6 +100,7 @@
if(2) //Lube
M.stop_pulling()
+ sleep(1)
step(M, M.dir)
spawn(1)
step(M, M.dir)
@@ -118,6 +120,7 @@
if(!M.CheckSlip() < 1) //No slipping
return ..()
if((M.m_intent == "run") && prob(30))
+ sleep(1)
M.stop_pulling()
step(M, M.dir)
M.visible_message("[M] slips on the icy floor!", \
diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm
index ec57dac1da0..ba130f5e627 100644
--- a/code/game/verbs/who.dm
+++ b/code/game/verbs/who.dm
@@ -30,7 +30,7 @@
else
entry += " - DEAD"
else if (isnewplayer(C.mob))
- entry += " - Lobby"
+ entry += " - Lobby"
else
entry += " - DEAD"
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index f842f8d27c4..06c2c0e795b 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -502,13 +502,17 @@ Thanks.
if(animation) T.turf_animation('icons/effects/64x64.dmi',"rejuvinate",-16,0,MOB_LAYER+1,'sound/effects/rejuvinate.ogg')
// shut down various types of badness
- setToxLoss(0)
- setOxyLoss(0)
- setCloneLoss(0)
- setBrainLoss(0)
- SetParalysis(0)
- SetStunned(0)
- SetWeakened(0)
+ toxloss = 0
+ oxyloss = 0
+ cloneloss = 0
+ bruteloss = 0
+ fireloss = 0
+ brainloss = 0
+ halloss = 0
+ paralysis = 0
+ stunned = 0
+ weakened = 0
+ jitteriness = 0
germ_level = 0
next_pain_time = 0
traumatic_shock = 0
diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm
index 8bd5aa14ad3..4d9ff9148c0 100644
--- a/code/modules/reagents/Chemistry-Recipes.dm
+++ b/code/modules/reagents/Chemistry-Recipes.dm
@@ -1289,6 +1289,7 @@ datum
/obj/item/weapon/reagent_containers/food/snacks/snackbar,
/obj/item/weapon/reagent_containers/food/snacks/grown,
)
+ blocked += typesof(/obj/item/weapon/reagent_containers/food/snacks/customizable) //silver-slime spawned customizable food is borked
var/list/borks = typesof(/obj/item/weapon/reagent_containers/food/snacks) - blocked
// BORK BORK BORK