From 39d190bca197e0ad45777eb74f7b2a49a292559f Mon Sep 17 00:00:00 2001 From: Iajret Creature <122297233+Steals-The-PRs@users.noreply.github.com> Date: Wed, 29 Nov 2023 12:14:49 +0300 Subject: [PATCH] [MIRROR] Gives drones the ablity to using the crafting menu again [MDB IGNORE] (#877) * Gives drones the ablity to using the crafting menu again (#79960) --------- Co-authored-by: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Co-authored-by: WarlockD Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com> --- code/__DEFINES/hud.dm | 2 +- code/modules/mob/living/basic/drone/_drone.dm | 3 +++ modular_skyrat/modules/drone_adjustments/drone.dm | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/hud.dm b/code/__DEFINES/hud.dm index ba4f0f12ea4..5798fd29e82 100644 --- a/code/__DEFINES/hud.dm +++ b/code/__DEFINES/hud.dm @@ -123,7 +123,7 @@ //Drones #define ui_drone_drop "CENTER+1:18,SOUTH:5" -#define ui_drone_pull "CENTER+2:2,SOUTH:5" +#define ui_drone_pull "CENTER+1.5:2,SOUTH:5" #define ui_drone_storage "CENTER-2:14,SOUTH:5" #define ui_drone_head "CENTER-3:14,SOUTH:5" diff --git a/code/modules/mob/living/basic/drone/_drone.dm b/code/modules/mob/living/basic/drone/_drone.dm index b54ef5d260e..80cc7f2c940 100644 --- a/code/modules/mob/living/basic/drone/_drone.dm +++ b/code/modules/mob/living/basic/drone/_drone.dm @@ -174,6 +174,7 @@ AddElement(/datum/element/dextrous, hud_type = hud_type) AddComponent(/datum/component/basic_inhands, y_offset = getItemPixelShiftY()) AddComponent(/datum/component/simple_access, SSid_access.get_region_access_list(list(REGION_ALL_GLOBAL))) + AddComponent(/datum/component/personal_crafting) // Kind of hard to be a drone and not be able to make tiles if(default_storage) var/obj/item/storage = new default_storage(src) @@ -348,6 +349,7 @@ var/static/list/not_shy_of = typecacheof(list(/mob/living/basic/drone, /mob/living/simple_animal/bot)) if(shy) + REMOVE_TRAIT(src, TRAIT_CAN_STRIP, DRONE_SHY_TRAIT) // To shy to touch someone elses hat ADD_TRAIT(src, TRAIT_PACIFISM, DRONE_SHY_TRAIT) LoadComponent(/datum/component/shy, mob_whitelist=not_shy_of, shy_range=3, message="Your laws prevent this action near %TARGET.", keyless_shy=FALSE, clientless_shy=TRUE, dead_shy=FALSE, dead_shy_immediate=TRUE, machine_whitelist=shy_machine_whitelist) LoadComponent(/datum/component/shy_in_room, drone_bad_areas, "Touching anything in %ROOM could break your laws.") @@ -356,6 +358,7 @@ RegisterSignal(src, COMSIG_TRY_USE_MACHINE, PROC_REF(blacklist_on_try_use_machine)) RegisterSignal(src, COMSIG_TRY_WIRES_INTERACT, PROC_REF(blacklist_on_try_wires_interact)) else + ADD_TRAIT(src, TRAIT_CAN_STRIP, DRONE_SHY_TRAIT) // ...I wonder if I can ware pants like a hat REMOVE_TRAIT(src, TRAIT_PACIFISM, DRONE_SHY_TRAIT) qdel(GetComponent(/datum/component/shy)) qdel(GetComponent(/datum/component/shy_in_room)) diff --git a/modular_skyrat/modules/drone_adjustments/drone.dm b/modular_skyrat/modules/drone_adjustments/drone.dm index fc4f97d4343..a0d227a9e20 100644 --- a/modular_skyrat/modules/drone_adjustments/drone.dm +++ b/modular_skyrat/modules/drone_adjustments/drone.dm @@ -26,7 +26,6 @@ /mob/living/basic/drone/Initialize(mapload) . = ..() name = "[initial(name)] [rand(0,9)]-[rand(100,999)]" //So that we can identify drones from each other - AddComponent(/datum/component/personal_crafting) /obj/item/storage/backpack/drone_bag name = "drone backpack"