diff --git a/code/__DEFINES/mob.dm b/code/__DEFINES/mob.dm new file mode 100644 index 00000000000..414b471db32 --- /dev/null +++ b/code/__DEFINES/mob.dm @@ -0,0 +1,3 @@ +//Values for the m_intent variable +#define M_INTENT_RUN "run" +#define M_INTENT_WALK "walk" diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 158946ced27..e31c55334e7 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -270,15 +270,15 @@ var/mob/living/carbon/C = usr if(C.legcuffed) to_chat(C, "You are legcuffed! You cannot run until you get [C.legcuffed] removed!") - C.m_intent = "walk" //Just incase + C.m_intent = M_INTENT_WALK //Just incase C.hud_used.move_intent.icon_state = "walking" return 1 switch(usr.m_intent) - if("run") - usr.m_intent = "walk" + if(M_INTENT_RUN) + usr.m_intent = M_INTENT_WALK usr.hud_used.move_intent.icon_state = "walking" - if("walk") - usr.m_intent = "run" + if(M_INTENT_WALK) + usr.m_intent = M_INTENT_RUN usr.hud_used.move_intent.icon_state = "running" if(istype(usr,/mob/living/carbon/alien/humanoid)) usr.update_icons() diff --git a/html/changelogs/unid-casuals.yml b/html/changelogs/unid-casuals.yml new file mode 100644 index 00000000000..9c0a03ded99 --- /dev/null +++ b/html/changelogs/unid-casuals.yml @@ -0,0 +1,6 @@ +author: Unid + +delete-after: True + +changes: +- tweak: "The Hive: moving on 'walk' intent will prevent you from stepping into the supermatter lake, unless you're blind." diff --git a/maps/RandomZLevels/hive.dm b/maps/RandomZLevels/hive.dm index 391b6f97139..a47ca97453e 100644 --- a/maps/RandomZLevels/hive.dm +++ b/maps/RandomZLevels/hive.dm @@ -167,7 +167,8 @@ play_sound = 'sound/ambience/spookymaint2.ogg' /obj/effect/narration/hive/lake - msg = "The first thing you see as you enter this room is the massive supermatter lake on its bottom. It constantly sizzles and sparks as dust specks collide with it. If you're going to walk on these catwalks hanging from the ceiling, you better be careful - a single misstep, and you'll be pulled down into the lake faster than you'd be able to react." + msg = {"The first thing you see as you enter this room is the massive supermatter lake on its bottom. It constantly sizzles and sparks as dust specks collide with it. If you're going to walk on these catwalks hanging from the ceiling, you better be careful - a single misstep, and you'll be pulled down into the lake faster than you'd be able to do anything.
+ Switch to "walk" intent to move carefully.
"} /obj/effect/narration/hive/cloning_hallway msg = "You notice that the surface of the floors and walls around you becomes more and more porous, and more... alive. You must be approaching the cloning chamber." @@ -391,6 +392,18 @@ light_range = 3 light_power = 1 +/turf/unsimulated/wall/supermatter/no_spread/lake/Bumped(atom/AM) + if(isliving(AM)) + var/mob/living/L = AM + //Being on walk intent prevents you from instant death + + //Exceptions: you're blind, you're getting thrown, or you're incapacitated (stunned) + if(!L.incapacitated() && !L.throwing && !L.is_blind() && (L.m_intent == M_INTENT_WALK)) + to_chat(L, "You avoid stepping into \the [src].") + return + + return ..() + /turf/unsimulated/wall/supermatter/no_spread/lake/Consume(atom/A) var/datum/map_element/away_mission/hive/hive if(istype(map_element, /datum/map_element/away_mission/hive)) diff --git a/vgstation13.dme b/vgstation13.dme index 3bb731446be..ed9fe6fd300 100644 --- a/vgstation13.dme +++ b/vgstation13.dme @@ -41,6 +41,7 @@ #include "code\__DEFINES\component_signals.dm" #include "code\__DEFINES\disease2.dm" #include "code\__DEFINES\hydro.dm" +#include "code\__DEFINES\mob.dm" #include "code\__DEFINES\pai_software.dm" #include "code\__DEFINES\spell_flags.dm" #include "code\__DEFINES\turfs.dm"