Revert "Megaphone Say Signals (#12926)" (#13551)

This commit is contained in:
Matt Atlas
2022-04-18 11:03:59 +02:00
committed by GitHub
parent 0ea3625895
commit d1d8a55f3d
20 changed files with 117 additions and 154 deletions
+10 -10
View File
@@ -350,7 +350,8 @@
/obj/item/proc/pickup(mob/user)
pixel_x = 0
pixel_y = 0
addtimer(CALLBACK(src, .proc/handle_pickup_drop, user), 1) // invoke async does not work here
if(flags & HELDMAPTEXT)
addtimer(CALLBACK(src, .proc/check_maptext), 1) // invoke async does not work here
do_pickup_animation(user)
// called when this item is removed from a storage item, which is passed on as S. The loc variable is already set to the new destination before this is called.
@@ -523,7 +524,8 @@ var/list/global/slot_flags_enumeration = list(
// override for give shenanigans
/obj/item/proc/on_give(var/mob/giver, var/mob/receiver)
handle_pickup_drop(giver, FALSE)
if(flags & HELDMAPTEXT)
check_maptext()
//This proc is executed when someone clicks the on-screen UI button. To make the UI button show, set the 'icon_action_button' to the icon_state of the image of the button in screen1_action.dmi
//The default action is attack_self().
@@ -903,13 +905,15 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
else
maptext = ""
/obj/item/throw_at(atom/target, range, speed, thrower, do_throw_animation)
/obj/item/throw_at()
..()
handle_pickup_drop(thrower, FALSE)
if(flags & HELDMAPTEXT)
check_maptext()
/obj/item/dropped(var/mob/user)
..()
handle_pickup_drop(user, FALSE)
if(flags & HELDMAPTEXT)
check_maptext()
// used to check whether the item is capable of popping things like balloons, inflatable barriers, or cutting police tape.
/obj/item/proc/can_puncture()
@@ -952,13 +956,9 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
/obj/item/proc/get_head_examine_text(var/mob/user)
return "on [user.get_pronoun("his")] head"
/obj/item/proc/should_equip() // when you press E with an empty hand, will this item be pulled from suit storage / back slot and put into your hand
return FALSE
/obj/item/proc/can_swap_hands(var/mob/user)
return TRUE
/obj/item/proc/handle_pickup_drop(var/mob/M, var/picked_up = TRUE)
if(flags & HELDMAPTEXT)
check_maptext()