From 9e88a05e8f622f9b036e06421b7f0705e677f6a6 Mon Sep 17 00:00:00 2001 From: SandPoot Date: Sun, 5 May 2024 18:21:42 -0300 Subject: [PATCH 1/5] push --- code/modules/mob/living/simple_animal/bot/cleanbot.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm index 806fc60156..1282e78cee 100644 --- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm +++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm @@ -58,15 +58,15 @@ var/ascended = FALSE // if we have all the top titles, grant achievements to living mobs that gaze upon our cleanbot god -/mob/living/simple_animal/bot/cleanbot/proc/deputize(obj/item/W, mob/user) +/mob/living/simple_animal/bot/cleanbot/proc/deputize(obj/item/stab_tool, mob/user) if(in_range(src, user)) - to_chat(user, "You attach \the [W] to \the [src].") - user.transferItemToLoc(W, src) - weapon = W + to_chat(user, "You attach \the [stab_tool] to \the [src].") + user.transferItemToLoc(stab_tool, src) + weapon = stab_tool weapon_orig_force = weapon.force if(!emagged) weapon.force = weapon.force / 2 - add_overlay(image(icon=weapon.lefthand_file,icon_state=weapon.item_state)) + add_overlay(weapon.build_worn_icon(default_layer = layer + 1, default_icon_file = weapon.lefthand_file, isinhands = TRUE)) /mob/living/simple_animal/bot/cleanbot/proc/update_titles() var/working_title = "" From e706b328ca876f17e15b3a28e3d96c9da7498e84 Mon Sep 17 00:00:00 2001 From: SandPoot Date: Sun, 5 May 2024 20:02:50 -0300 Subject: [PATCH 2/5] push --- code/modules/clothing/head/misc_special.dm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index d9a6f70a0c..9a0cbcc805 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -149,15 +149,16 @@ beepsky_fashion = /datum/beepsky_fashion/cat /obj/item/clothing/head/kitty/equipped(mob/living/carbon/human/user, slot) - if(ishuman(user) && slot == ITEM_SLOT_HEAD) - update_icon(user) - user.update_inv_head() //Color might have been changed by update_icon. ..() + if(ishuman(user) && slot == ITEM_SLOT_HEAD) + update_icon() + user.update_inv_head() //Color might have been changed by update_icon. -/obj/item/clothing/head/kitty/update_icon(mob/living/carbon/human/user) +/obj/item/clothing/head/kitty/update_icon() . = ..() - if(ishuman(user)) - add_atom_colour("#[user.hair_color]", FIXED_COLOUR_PRIORITY) + if(ishuman(loc)) + var/mob/living/carbon/human/wearer = loc + add_atom_colour("#[wearer.hair_color]", FIXED_COLOUR_PRIORITY) /obj/item/clothing/head/kitty/genuine desc = "A pair of kitty ears. A tag on the inside says \"Hand made from real cats.\"" From 8a87fb1a4ed98324d9757d28f6c20f23fbd46ae4 Mon Sep 17 00:00:00 2001 From: SandPoot Date: Mon, 6 May 2024 17:06:38 -0300 Subject: [PATCH 3/5] push --- code/modules/mob/living/living.dm | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 37b9fe6095..511e3bd8a6 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -260,12 +260,18 @@ dir_to_target = dir var/push_anchored = FALSE - if((AM.move_resist * MOVE_FORCE_CRUSH_RATIO) <= force) - if(move_crush(AM, move_force, dir_to_target)) - push_anchored = TRUE - if((AM.move_resist * MOVE_FORCE_FORCEPUSH_RATIO) <= force) //trigger move_crush and/or force_push regardless of if we can push it normally - if(force_push(AM, move_force, dir_to_target, push_anchored)) - push_anchored = TRUE + + // Sandstorm change - stop breaking structures for no raisin!! + var/mob/living/simple_animal/hostile/angry_fella = src + if(client || (istype(angry_fella) && angry_fella.target)) + if((AM.move_resist * MOVE_FORCE_CRUSH_RATIO) <= force) + if(move_crush(AM, move_force, dir_to_target)) + push_anchored = TRUE + if((AM.move_resist * MOVE_FORCE_FORCEPUSH_RATIO) <= force) //trigger move_crush and/or force_push regardless of if we can push it normally + if(force_push(AM, move_force, dir_to_target, push_anchored)) + push_anchored = TRUE + // + if(ismob(AM)) var/mob/mob_to_push = AM var/atom/movable/mob_buckle = mob_to_push.buckled From 675cfe41a10c6329a51d95a7325f0cd4fe09d1e9 Mon Sep 17 00:00:00 2001 From: Sandstorm Bot <85452301+Sandstorm-Bot@users.noreply.github.com> Date: Mon, 6 May 2024 22:07:34 +0000 Subject: [PATCH 4/5] Automatic changelog generation for PR #373 [ci skip] --- html/changelogs/AutoChangeLog-pr-373.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-373.yml diff --git a/html/changelogs/AutoChangeLog-pr-373.yml b/html/changelogs/AutoChangeLog-pr-373.yml new file mode 100644 index 0000000000..77fea1a8c5 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-373.yml @@ -0,0 +1,5 @@ +author: SandPoot +delete-after: true +changes: + - tweak: Mobs that can push structures off the floor will no longer do so unless + it blocks path to a target. From 7abab8a85cb93e2bd483bb0d2c8d20eadc1e8b7f Mon Sep 17 00:00:00 2001 From: Sandstorm Bot <85452301+Sandstorm-Bot@users.noreply.github.com> Date: Mon, 6 May 2024 22:09:01 +0000 Subject: [PATCH 5/5] Automatic changelog compile [ci skip] --- .../{AutoChangeLog-pr-373.yml => archive/2024-05.yml} | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) rename html/changelogs/{AutoChangeLog-pr-373.yml => archive/2024-05.yml} (72%) diff --git a/html/changelogs/AutoChangeLog-pr-373.yml b/html/changelogs/archive/2024-05.yml similarity index 72% rename from html/changelogs/AutoChangeLog-pr-373.yml rename to html/changelogs/archive/2024-05.yml index 77fea1a8c5..7b3e73fdf5 100644 --- a/html/changelogs/AutoChangeLog-pr-373.yml +++ b/html/changelogs/archive/2024-05.yml @@ -1,5 +1,4 @@ -author: SandPoot -delete-after: true -changes: +2024-05-06: + SandPoot: - tweak: Mobs that can push structures off the floor will no longer do so unless it blocks path to a target.