diff --git a/code/modules/vehicles/cargo_train.dm b/code/modules/vehicles/cargo_train.dm index 2e81b76f52f..dc12bd2807f 100644 --- a/code/modules/vehicles/cargo_train.dm +++ b/code/modules/vehicles/cargo_train.dm @@ -227,6 +227,9 @@ playsound(src, 'sound/machines/vehicles/button.ogg', 50, FALSE) /obj/vehicle/train/cargo/RunOver(var/mob/living/carbon/human/H) + if(HAS_TRAIT(H, TRAIT_LEANING)) + return + var/list/parts = list(BP_HEAD, BP_CHEST, BP_L_LEG, BP_R_LEG, BP_L_ARM, BP_R_ARM) H.apply_effects(5, 5) @@ -236,11 +239,16 @@ /obj/vehicle/train/cargo/trolley/RunOver(var/mob/living/carbon/human/H) ..() + if(HAS_TRAIT(H, TRAIT_LEANING)) + return attack_log += "\[[time_stamp()]\] ran over [H.name] ([H.ckey])" /obj/vehicle/train/cargo/engine/RunOver(var/mob/living/carbon/human/H) ..() + if(HAS_TRAIT(H, TRAIT_LEANING)) + return + if(is_train_head() && istype(load, /mob/living/carbon/human)) var/mob/living/carbon/human/D = load to_chat(D, SPAN_DANGER("You ran over [H]!")) diff --git a/html/changelogs/SafeDrivingLessons.yml b/html/changelogs/SafeDrivingLessons.yml new file mode 100644 index 00000000000..d5074318a7e --- /dev/null +++ b/html/changelogs/SafeDrivingLessons.yml @@ -0,0 +1,6 @@ +author: TheGreyWolf + +delete-after: True + +changes: + - bugfix: "The tug will no longer run over people who are leaning on walls."