From 531e2287d389fe75f2d5236412f2ef71dea324cf Mon Sep 17 00:00:00 2001 From: Matt Atlas Date: Sun, 3 Aug 2025 18:12:42 +0200 Subject: [PATCH] Ports CM wall leaning. (#21076) All credit to the original coders, I only did minimal work to make it work with Aurora code. Something nice to steal would be the density rework, but that's for the future. https://github.com/user-attachments/assets/582edb20-5d86-4465-99bf-e4cec73c104a --------- Co-authored-by: Matt Atlas --- .../signals/signals_mob/signals_mob_main.dm | 3 + code/__HELPERS/visual_filters.dm | 15 ++++ code/game/turfs/simulated/walls.dm | 80 ++++++++++++++++++ code/modules/mob/living/living.dm | 1 + html/changelogs/mattatlas-cmwallleaning.yml | 58 +++++++++++++ icons/effects/effects.dmi | Bin 349219 -> 349244 bytes 6 files changed, 157 insertions(+) create mode 100644 html/changelogs/mattatlas-cmwallleaning.yml diff --git a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm index 5ce5b33947f..33098fd66ec 100644 --- a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm +++ b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm @@ -39,3 +39,6 @@ /// For loss of limbs. #define COMSIG_LIMB_LOSS "lost_limb" + +/// From /mob/living/verb/execute_resist(). Resisting. +#define COMSIG_MOB_RESISTED "mob_resist" diff --git a/code/__HELPERS/visual_filters.dm b/code/__HELPERS/visual_filters.dm index d9465d0cdb1..15d06fc099a 100644 --- a/code/__HELPERS/visual_filters.dm +++ b/code/__HELPERS/visual_filters.dm @@ -60,3 +60,18 @@ for (var/atom/movable/AM as anything in get_above_oo()) monkeypatched_params[1] = AM.filters[index] animate(arglist(monkeypatched_params)) + +//Helpers to generate lists for filter helpers +//This is the only practical way of writing these that actually produces sane lists +/proc/alpha_mask_filter(x, y, icon/icon, render_source, flags) + . = list("type" = "alpha") + if(!isnull(x)) + .["x"] = x + if(!isnull(y)) + .["y"] = y + if(!isnull(icon)) + .["icon"] = icon + if(!isnull(render_source)) + .["render_source"] = render_source + if(!isnull(flags)) + .["flags"] = flags diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index 4bc5aec85f3..b2a51ac78b9 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -44,6 +44,9 @@ var/tmp/image/fake_wall_image var/tmp/cached_adjacency + /// A lazylist of humans leaning on this wall. + var/list/hiding_humans + smoothing_flags = SMOOTH_MORE | SMOOTH_NO_CLEAR_ICON | SMOOTH_UNDERLAYS pathing_pass_method = TURF_PATHING_PASS_NO //Literally a wall, until we implement bots that can wallwarp, we might aswell save the processing @@ -116,6 +119,7 @@ /turf/simulated/wall/Destroy() STOP_PROCESSING(SSprocessing, src) dismantle_wall(null, null, TRUE, TRUE) + LAZYNULL(hiding_humans) return ..() /turf/simulated/wall/process() @@ -309,3 +313,79 @@ /turf/simulated/wall/is_wall() return TRUE + +/turf/simulated/wall/mouse_drop_receive(atom/dropped, mob/user, params) + if(!ismob(dropped)) + return + + var/mob/living/carbon/human/current_mob = dropped + + // wall leaning by androbetel + if(!ishuman(current_mob)) + return + + if(current_mob != user) + return + + var/mob/living/carbon/hiding_human = current_mob + var/can_lean = TRUE + + if(istype(user.l_hand, /obj/item/grab) || istype(user.r_hand, /obj/item/grab)) + to_chat(user, SPAN_WARNING("You can't lean while grabbing someone!")) + can_lean = FALSE + if(current_mob.incapacitated()) + to_chat(user, SPAN_WARNING("You can't lean while incapacitated!")) + can_lean = FALSE + if(current_mob.resting) + to_chat(user, SPAN_WARNING("You can't lean while resting!")) + can_lean = FALSE + if(current_mob.buckled_to) + to_chat(user, SPAN_WARNING("You can't lean while buckled!")) + can_lean = FALSE + + var/direction = get_dir(src, current_mob) + var/shift_pixel_x = 0 + var/shift_pixel_y = 0 + + if(!can_lean) + return + switch(direction) + if(NORTH) + shift_pixel_y = -10 + if(SOUTH) + shift_pixel_y = 16 + if(WEST) + shift_pixel_x = 10 + if(EAST) + shift_pixel_x = -10 + else + return + + for(var/mob/living/carbon/human/hiding in hiding_humans) + if(hiding_humans[hiding] == direction) + return + + LAZYADD(hiding_humans, current_mob) + hiding_humans[current_mob] = direction + hiding_human.Moved() //just to be safe + hiding_human.set_dir(direction) + animate(hiding_human, pixel_x = shift_pixel_x, pixel_y = shift_pixel_y, time = 1) + if(direction == NORTH) + hiding_human.add_filter("cutout", 1, alpha_mask_filter(icon = icon('icons/effects/effects.dmi', "cutout"))) + hiding_human.density = FALSE + RegisterSignals(hiding_human, list(COMSIG_MOVABLE_MOVED, COMSIG_MOB_RESISTED), PROC_REF(unhide_human), hiding_human) + ..() + +/turf/simulated/wall/proc/unhide_human(mob/living/carbon/human/to_unhide) + SIGNAL_HANDLER + if(!to_unhide) + return + + to_unhide.density = FALSE + to_unhide.pixel_x = initial(to_unhide.pixel_x) + to_unhide.pixel_y = initial(to_unhide.pixel_y) + to_unhide.layer = initial(to_unhide.layer) + LAZYREMOVE(hiding_humans, to_unhide) + UnregisterSignal(to_unhide, list(COMSIG_MOVABLE_MOVED, COMSIG_MOB_RESISTED)) + to_chat(to_unhide, SPAN_NOTICE("You stop leaning on the wall.")) + to_unhide.remove_filter("cutout") diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index d13e43e7f9b..65cd4fbb778 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -678,6 +678,7 @@ default behaviour is: /mob/living/proc/execute_resist() if(!incapacitated(INCAPACITATION_KNOCKOUT) && canClick()) + SEND_SIGNAL(src, COMSIG_MOB_RESISTED) resist_grab() if(!weakened) process_resist() diff --git a/html/changelogs/mattatlas-cmwallleaning.yml b/html/changelogs/mattatlas-cmwallleaning.yml new file mode 100644 index 00000000000..13ad17010d4 --- /dev/null +++ b/html/changelogs/mattatlas-cmwallleaning.yml @@ -0,0 +1,58 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: MattAtlas + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Ported wall leaning from CM. Click-drag your sprite to a wall to lean on it." diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi index ffad22cb10307c63ddfbf4930419b3268f2e74b1..78350a08b64569be12866b295ff96d7e59abc064 100644 GIT binary patch delta 2354 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 delta 2329 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 Mnpz|78N1{D0dS=yzW@LL