diff --git a/code/datums/components/antags/changeling/powers/armor.dm b/code/datums/components/antags/changeling/powers/armor.dm index 0173d4540a..a445d2e4b2 100644 --- a/code/datums/components/antags/changeling/powers/armor.dm +++ b/code/datums/components/antags/changeling/powers/armor.dm @@ -58,7 +58,7 @@ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) body_parts_covered = HEAD|FACE|EYES canremove = FALSE - item_flags = THICKMATERIAL | AIRTIGHT | ALLOW_SURVIVALFOOD | DROPDEL | NOSTRIP + item_flags = THICKMATERIAL | AIRTIGHT | FLEXIBLEMATERIAL | DROPDEL | NOSTRIP /obj/item/clothing/shoes/magboots/changeling desc = "A suction cupped mass of flesh, shaped like a foot." diff --git a/code/game/objects/items/devices/body_snatcher_vr.dm b/code/game/objects/items/devices/body_snatcher_vr.dm index 7b8f781f3d..8a79c70f69 100644 --- a/code/game/objects/items/devices/body_snatcher_vr.dm +++ b/code/game/objects/items/devices/body_snatcher_vr.dm @@ -17,7 +17,7 @@ user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) if(ishuman(M) || issilicon(M)) //Allows body swapping with humans, synths, and pAI's/borgs since they all have a mind. if(user == M) - to_chat(user,span_warning(" A message pops up on the LED display, informing you that you that the mind transfer to yourself was successful... Wait, did that even do anything?")) + to_chat(user,span_warning("A message pops up on the LED display, informing you that the mind transfer to yourself was successful... Wait, did that even do anything?")) return if(!M.mind) //Do they have a mind? diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm index 8a7b1c2322..4d051bd861 100644 --- a/code/game/objects/items/toys/toys.dm +++ b/code/game/objects/items/toys/toys.dm @@ -815,7 +815,7 @@ //This should be used if a plushie can be made to say custom messages. Not currently required at the moment, but here just in case it'd added in the future. var/prevent_impersonation = FALSE - var/special_handling = TRUE + var/special_handling = FALSE ///The sound we make when squeezed var/squeeze_sound = 'sound/items/drop/plushie.ogg' diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index 2309601d2e..de0ae49d54 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -120,6 +120,9 @@ species_restricted = list(SPECIES_VOX) actions_types = list(/datum/action/item_action/toggle_magclaws) +/obj/item/clothing/shoes/magboots/vox/set_slowdown() + return //voxboots suffer no slowdown penalties! + //In case they somehow come off while enabled. /obj/item/clothing/shoes/magboots/vox/dropped(mob/user) ..(user) diff --git a/code/modules/reagents/reagents/other.dm b/code/modules/reagents/reagents/other.dm index 1a5750981a..43218ae0fc 100644 --- a/code/modules/reagents/reagents/other.dm +++ b/code/modules/reagents/reagents/other.dm @@ -416,18 +416,38 @@ if(prob(2)) //Get an ACTUAL chaplain for your stuff if(M.has_modifier_of_type(/datum/modifier/redspace_corruption)) M.remove_modifiers_of_type(/datum/modifier/redspace_corruption) - to_chat(M, "You feel calmer.") + to_chat(M, span_notice("You feel calmer.")) if(M.HasDisease(/datum/disease/fleshy_spread)) for(var/datum/disease/fleshy_spread/disease in M.GetViruses()) disease.cure() break - to_chat(M, "Your fever subsides..") - if(volume < max_dose * 0.1 && !failed_message) + to_chat(M, span_notice("Your fever subsides..")) + if(volume <= max_dose * 0.5 && !failed_message) if(M.has_modifier_of_type(/datum/modifier/redspace_corruption) || M.HasDisease(/datum/disease/fleshy_spread)) to_chat(M, span_notice("The power of the holy water courses through you, but seems to have failed to cure your ailments. Perhaps a larger dose is needed?")) failed_message = TRUE +/datum/reagent/water/holywater/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) + ..() + if(ishuman(M)) // Any location + if(M.mind && cult.is_antagonist(M.mind) && prob(5)) + cult.remove_antagonist(M.mind) + if(prob(1)) //injecting holy water makes it weaker because that's sinful + if(M.has_modifier_of_type(/datum/modifier/redspace_corruption)) + M.remove_modifiers_of_type(/datum/modifier/redspace_corruption) + to_chat(M, span_notice("You feel calmer.")) + + if(M.HasDisease(/datum/disease/fleshy_spread)) + for(var/datum/disease/fleshy_spread/disease in M.GetViruses()) + disease.cure() + break + to_chat(M, span_notice("Your fever subsides..")) + if(volume <= max_dose * 0.25 && !failed_message) + if(M.has_modifier_of_type(/datum/modifier/redspace_corruption) || M.HasDisease(/datum/disease/fleshy_spread)) + to_chat(M, span_notice("The power of the holy water courses through you, but seems to have failed to cure your ailments. Perhaps a larger dose is needed?")) + failed_message = TRUE + return /datum/reagent/water/holywater/touch_turf(var/turf/T) ..()