From 5a202235b87302217709b5f36fcfecf087ad4672 Mon Sep 17 00:00:00 2001 From: John Doe Date: Fri, 24 Nov 2023 21:09:15 -0800 Subject: [PATCH] upstream pull changes --- code/datums/tutorial/ss13/intents.dm | 2 +- code/game/machinery/vending/cm_vending.dm | 4 ++-- code/modules/mob/living/carbon/human/human_dummy.dm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/datums/tutorial/ss13/intents.dm b/code/datums/tutorial/ss13/intents.dm index d47a07031ef9..1951eb562787 100644 --- a/code/datums/tutorial/ss13/intents.dm +++ b/code/datums/tutorial/ss13/intents.dm @@ -51,7 +51,7 @@ UnregisterSignal(tutorial_mob, COMSIG_LIVING_ATTACKHAND_HUMAN) TUTORIAL_ATOM_FROM_TRACKING(/mob/living/carbon/human/dummy/tutorial, tutorial_dummy) tutorial_dummy.status_flags = DEFAULT_MOB_STATUS_FLAGS - tutorial_dummy.frozen = FALSE + REMOVE_TRAIT(tutorial_dummy, TRAIT_IMMOBILIZED, TRAIT_SOURCE_TUTORIAL) tutorial_dummy.anchored = FALSE message_to_player("The second intent is disarm, selectable with 2. Disarm is used to shove people, which can make them drop items or fall to the ground. Shove the Test Dummy until it falls over.") diff --git a/code/game/machinery/vending/cm_vending.dm b/code/game/machinery/vending/cm_vending.dm index d34eeb8a0d4e..cdf9b904fd7c 100644 --- a/code/game/machinery/vending/cm_vending.dm +++ b/code/game/machinery/vending/cm_vending.dm @@ -1178,10 +1178,10 @@ GLOBAL_LIST_INIT(cm_vending_gear_corresponding_types_list, list( if(islist(prod_type)) for(var/each_type in prod_type) vendor_successful_vend_one(each_type, user, target_turf, itemspec[4] == MARINE_CAN_BUY_UNIFORM) - SEND_SIGNAL(vendor, COMSIG_VENDOR_SUCCESSFUL_VEND, vendor, itemspec, user) + SEND_SIGNAL(src, COMSIG_VENDOR_SUCCESSFUL_VEND, src, itemspec, user) else vendor_successful_vend_one(prod_type, user, target_turf, itemspec[4] == MARINE_CAN_BUY_UNIFORM) - SEND_SIGNAL(vendor, COMSIG_VENDOR_SUCCESSFUL_VEND, vendor, itemspec, user) + SEND_SIGNAL(src, COMSIG_VENDOR_SUCCESSFUL_VEND, src, itemspec, user) if(vend_flags & VEND_LIMITED_INVENTORY) itemspec[2]-- diff --git a/code/modules/mob/living/carbon/human/human_dummy.dm b/code/modules/mob/living/carbon/human/human_dummy.dm index 9eda925f15cd..1f90c618fd38 100644 --- a/code/modules/mob/living/carbon/human/human_dummy.dm +++ b/code/modules/mob/living/carbon/human/human_dummy.dm @@ -80,5 +80,5 @@ GLOBAL_LIST_EMPTY(dummy_mob_list) /mob/living/carbon/human/dummy/tutorial/Initialize(mapload) . = ..() status_flags = GODMODE - frozen = TRUE + ADD_TRAIT(src, TRAIT_IMMOBILIZED, TRAIT_SOURCE_TUTORIAL) anchored = TRUE