cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 19:47:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Pops up a little bubble when you're requesting a high-five, along with some other emotes (#20472)

Browse Source 
* High five!

* Add in-hand use

* use in hand too

* closing remarks

* better looking

* Fixes daps

* grab my hand fat man

* hand shake

* Implement missed messages

* i can spell

* Update code/modules/mob/living/carbon/human/human_emote.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Review concerns

* Add some auto-doc, minor changes

* more cleverly handles pointing

* Update code/modules/point/point.dm

Path clarity

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
This commit is contained in:
Luc
2023-03-15 20:37:54 +01:00
committed by GitHub
co-authored by Henri215 Farie82
parent 9838d84023
commit eafe04f41f
6 changed files with 159 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/point/point.dm
+44 -11
View File
@@ -12,7 +12,7 @@
return
if((pointed_atom in src) || (pointed_atom.loc in src))
create_point_bubble(pointed_atom)
create_point_bubble_from_atom(pointed_atom)
return
var/turf/tile = get_turf(pointed_atom)
@@ -24,9 +24,16 @@
animate(visual, pixel_x = (tile.x - our_tile.x) * world.icon_size + pointed_atom.pixel_x, pixel_y = (tile.y - our_tile.y) * world.icon_size + pointed_atom.pixel_y, time = 1.7, easing = EASE_OUT)
/atom/movable/proc/create_point_bubble(atom/pointed_atom)
/// Create a bubble pointing at a particular icon and icon state.
/// See args for create_point_bubble_from_atom.
/atom/movable/proc/create_point_bubble(mutable_appearance/pointed_atom_appearance, include_arrow = TRUE)
var/obj/effect/thought_bubble_effect = new
pointed_atom_appearance.layer = POINT_LAYER
pointed_atom_appearance.blend_mode = BLEND_INSET_OVERLAY
pointed_atom_appearance.pixel_x = 0
pointed_atom_appearance.pixel_y = 0
var/mutable_appearance/thought_bubble = mutable_appearance(
'icons/effects/effects.dmi',
thought_bubble_image,
@@ -34,17 +41,8 @@
appearance_flags = KEEP_APART,
)
var/mutable_appearance/pointed_atom_appearance = new(pointed_atom.appearance)
pointed_atom_appearance.blend_mode = BLEND_INSET_OVERLAY
pointed_atom_appearance.layer = POINT_LAYER
pointed_atom_appearance.pixel_x = 0
pointed_atom_appearance.pixel_y = 0
thought_bubble.overlays += pointed_atom_appearance
var/hover_outline_index = pointed_atom.get_filter("hover_outline")
if (!isnull(hover_outline_index))
pointed_atom_appearance.filters.Cut(hover_outline_index, hover_outline_index + 1)
thought_bubble.pixel_x = 16
thought_bubble.pixel_y = 32
thought_bubble.alpha = 200
@@ -66,6 +64,41 @@
QDEL_IN(thought_bubble_effect, 2 SECONDS)
/**
* Create a point bubble towards a given item.
*
* Arguments:
* * pointed_atom - Atom to show in the bubble.
* * include_arrow - If true, show an arrow pointing downwards.
*/
/atom/movable/proc/create_point_bubble_from_atom(atom/pointed_atom, include_arrow = TRUE)
var/mutable_appearance/pointed_atom_appearance = new(pointed_atom.appearance)
var/hover_outline_index = pointed_atom.get_filter("hover_outline")
if (!isnull(hover_outline_index))
pointed_atom_appearance.filters.Cut(hover_outline_index, hover_outline_index + 1)
create_point_bubble(pointed_atom_appearance, include_arrow)
/**
* Create a point bubble towards a given item, from an icon/icon state.
*
* Arguments:
* * icon - Icon source for the bubble's icon.
* * icon_state - Icon state for the bubble's icon.
* * include_arrow - If true, show an arrow pointing downwards.
*/
/atom/movable/proc/create_point_bubble_from_icons(icon, icon_state, include_arrow = TRUE)
var/mutable_appearance/pointed_atom_appearance = mutable_appearance(
icon,
icon_state,
)
create_point_bubble(pointed_atom_appearance, include_arrow)
/// See above, this uses an uninstantiated path.
/atom/movable/proc/create_point_bubble_from_path(atom/pointed_atom_path, include_arrow = TRUE)
create_point_bubble_from_icons(initial(pointed_atom_path.icon), initial(pointed_atom_path.icon_state), include_arrow)
/obj/effect/temp_visual/point
name = "arrow"
desc = "It's an arrow hanging in mid-air. There may be a wizard about."