diff --git a/code/datums/components/footstep.dm b/code/datums/components/footstep.dm index a8c46e54..a553fe72 100644 --- a/code/datums/components/footstep.dm +++ b/code/datums/components/footstep.dm @@ -32,10 +32,10 @@ return if(ishuman(C) && C.m_intent == MOVE_INTENT_WALK) v /= 2 - e -= 5 + e -= 4 steps++ - if(steps >= 3) + if(steps >= 2) steps = 0 else @@ -58,7 +58,7 @@ if(isclawfoot(LM)) if(isalienadult(LM)) //xenos are stealthy and get quieter footsteps v /= 3 - e -= 5 + e -= 4 playsound(T, pick(GLOB.clawfootstep[T.clawfootstep][1]), GLOB.clawfootstep[T.clawfootstep][2] * v, diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index 2c757c6e..1dbf6b69 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -317,6 +317,40 @@ else return + + else if(check_zone(M.zone_selected) == "mouth") + var/mob/living/carbon/human/H = src + var/datum/species/pref_species = H.dna.species + + M.visible_message("[M] gives [H] a boop on the nose.", \ + "You give [H] a boop on the nose!") + + if(H.dna.species.can_wag_tail(H)) + if("tail_human" in pref_species.default_features) + if(H.dna.features["tail_human"] == "None") + return + else + if(!H.dna.species.is_wagging_tail()) + H.emote("wag") + + if("tail_lizard" in pref_species.default_features) + if(H.dna.features["tail_lizard"] == "None") + return + else + if(!H.dna.species.is_wagging_tail()) + H.emote("wag") + + if("mam_tail" in pref_species.default_features) + if(H.dna.features["mam_tail"] == "None") + return + else + if(!H.dna.species.is_wagging_tail()) + H.emote("wag") + + else + return + + else M.visible_message("[M] hugs [src] to make [p_them()] feel better!", \ "You hug [src] to make [p_them()] feel better!") diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi index 6cce82b5..141a0d07 100644 Binary files a/icons/mob/eyes.dmi and b/icons/mob/eyes.dmi differ diff --git a/icons/mob/human_parts_greyscale.dmi b/icons/mob/human_parts_greyscale.dmi index 7f10d992..ce1bc69c 100644 Binary files a/icons/mob/human_parts_greyscale.dmi and b/icons/mob/human_parts_greyscale.dmi differ diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi index 019ae095..c88b7eb8 100644 Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index e6c2d111..6c917354 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/chairs.dmi b/icons/obj/chairs.dmi index 192c66ad..4bee50f5 100644 Binary files a/icons/obj/chairs.dmi and b/icons/obj/chairs.dmi differ diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi index 4ec45666..f34fe3be 100644 Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ diff --git a/icons/obj/doors/airlocks/station/command.dmi b/icons/obj/doors/airlocks/station/command.dmi index bc930c4f..a0dd5a3c 100644 Binary files a/icons/obj/doors/airlocks/station/command.dmi and b/icons/obj/doors/airlocks/station/command.dmi differ diff --git a/icons/obj/doors/airlocks/station/security.dmi b/icons/obj/doors/airlocks/station/security.dmi index 453fbb9d..d949ed5d 100644 Binary files a/icons/obj/doors/airlocks/station/security.dmi and b/icons/obj/doors/airlocks/station/security.dmi differ diff --git a/icons/turf/walls/reinforced_wall.dmi b/icons/turf/walls/reinforced_wall.dmi index 2f4821de..5fd9a851 100644 Binary files a/icons/turf/walls/reinforced_wall.dmi and b/icons/turf/walls/reinforced_wall.dmi differ diff --git a/icons/turf/walls/wall.dmi b/icons/turf/walls/wall.dmi index cccd8527..ca76f7a4 100644 Binary files a/icons/turf/walls/wall.dmi and b/icons/turf/walls/wall.dmi differ diff --git a/interface/menu.dm b/interface/menu.dm index 59371cd1..57e151bd 100644 --- a/interface/menu.dm +++ b/interface/menu.dm @@ -84,16 +84,50 @@ GLOBAL_LIST_EMPTY(menulist) set name = "Low-end FPS" set desc = "&20 fps" set category = "Preferences" + set hidden = 1 usr.client.prefs.clientfps = 20 usr.client.prefs.parent.fps = 20 + /datum/verbs/menu/Settings/FPS/verb/high() set name = "High-end FPS" - set desc = "&30 fps (High-end machines)" + set desc = "&25 fps" set category = "Preferences" + set hidden = 1 + usr.client.prefs.clientfps = 25 + usr.client.prefs.parent.fps = 25 + + +/datum/verbs/menu/Settings/FPS/verb/vhigh() + set name = "Higher-end FPS" + set desc = "&30 fps" + set category = "Preferences" + set hidden = 1 usr.client.prefs.clientfps = 30 usr.client.prefs.parent.fps = 30 + +/datum/verbs/menu/Settings/ChatOutput + checkbox = CHECKBOX_GROUP + default = /datum/verbs/menu/Settings/ChatOutput/verb/newchat + +/datum/verbs/menu/Settings/ChatOutput/verb/oldchat() + set name = "Old Chat" + set desc = "&Old Chat (Faster)" + set hidden = 1 + set category = "Preferences" + winset(src, "output", "is-visible=true;is-disabled=false") + winset(src, "browseroutput", "is-visible=false") + +/datum/verbs/menu/Settings/ChatOutput/verb/newchat() + set name = "Fancy Chat" + set desc = "&Fancy Chat (Slower)" + set hidden = 1 + set category = "Preferences" + winset(src, "output", "is-visible=false") + winset(src, "browseroutput", "is-disabled=false;is-visible=true") + + /datum/verbs/menu/Icon/Size checkbox = CHECKBOX_GROUP default = /datum/verbs/menu/Icon/Size/verb/iconstretchtofit diff --git a/modular_citadel/icons/mob/mask.dmi b/modular_citadel/icons/mob/mask.dmi index 788bfc04..93c02666 100644 Binary files a/modular_citadel/icons/mob/mask.dmi and b/modular_citadel/icons/mob/mask.dmi differ diff --git a/modular_citadel/icons/mob/muzzled_mask.dmi b/modular_citadel/icons/mob/muzzled_mask.dmi index 59c669ea..9e8ac12e 100644 Binary files a/modular_citadel/icons/mob/muzzled_mask.dmi and b/modular_citadel/icons/mob/muzzled_mask.dmi differ diff --git a/sound/effects/footstep/floor1.ogg b/sound/effects/footstep/floor1.ogg index 1e3e1558..a2133513 100644 Binary files a/sound/effects/footstep/floor1.ogg and b/sound/effects/footstep/floor1.ogg differ diff --git a/sound/effects/footstep/floor2.ogg b/sound/effects/footstep/floor2.ogg index cce5a25d..38d06a82 100644 Binary files a/sound/effects/footstep/floor2.ogg and b/sound/effects/footstep/floor2.ogg differ diff --git a/sound/effects/footstep/floor3.ogg b/sound/effects/footstep/floor3.ogg index 16ab67f7..81d2d953 100644 Binary files a/sound/effects/footstep/floor3.ogg and b/sound/effects/footstep/floor3.ogg differ diff --git a/sound/effects/footstep/floor4.ogg b/sound/effects/footstep/floor4.ogg index 9ef15430..9ceb18aa 100644 Binary files a/sound/effects/footstep/floor4.ogg and b/sound/effects/footstep/floor4.ogg differ diff --git a/sound/effects/footstep/floor5.ogg b/sound/effects/footstep/floor5.ogg index 0f6a6605..a2f354cd 100644 Binary files a/sound/effects/footstep/floor5.ogg and b/sound/effects/footstep/floor5.ogg differ diff --git a/sound/machines/AirlockClose.ogg b/sound/machines/AirlockClose.ogg index 061eda4a..81a1dc1f 100644 Binary files a/sound/machines/AirlockClose.ogg and b/sound/machines/AirlockClose.ogg differ diff --git a/sound/machines/BoltsDown.ogg b/sound/machines/BoltsDown.ogg index c7320a04..b5fe8e2c 100644 Binary files a/sound/machines/BoltsDown.ogg and b/sound/machines/BoltsDown.ogg differ diff --git a/sound/machines/BoltsUp.ogg b/sound/machines/BoltsUp.ogg index bc422e28..6acf99ea 100644 Binary files a/sound/machines/BoltsUp.ogg and b/sound/machines/BoltsUp.ogg differ diff --git a/sound/machines/airlock.ogg b/sound/machines/airlock.ogg index 6e6231e4..73618807 100644 Binary files a/sound/machines/airlock.ogg and b/sound/machines/airlock.ogg differ diff --git a/sound/machines/airlockforced.ogg b/sound/machines/airlockforced.ogg index 8f46a89f..9f2fc486 100644 Binary files a/sound/machines/airlockforced.ogg and b/sound/machines/airlockforced.ogg differ