mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-30 02:52:30 +00:00
412115c9b9
## About The Pull Request Closes #91131. The author currently has other priorities, and as I need it for something else I am finishing it myself with the author's blessing. Recently, we turned `transferItemToLoc(...)` into a proc intended to be for transfers to non-turfs, with it now playing an animation to reflect that. However, this had the effect of leaving us with `dropItemToGround(...)` for mob>turf transfers, which isn't _ideal_. It sends an 'item dropped' signal, it randomizes offsets, and using it to transfer to a non-`drop_location()` loc was implemented as an afterthought. So in this pr we create a new proc, `transfer_item_to_turf(...)`, that separates off the actual transferring, setting offsets, and animating into its own proc. Then `dropItemToGround(...)`, tables, racks, easels, closets, hoops, beds, conveyor belts, pin the tail corgi posters, some other stuff, and the `floor_placeable` element call such each with their own preferred arguments. While we could leave setting offsets out of it, because setting the offsets after calling the animation works just fine, having them be set before the animation felt like a more intuitive flow. ...While I would love to refactor the easel's incredibly questionable `attackby(...)`, that is outside of the scope of this pr. ## Why It's Good For The Game Fixes #91082. Less jank 👍 ## Changelog 🆑 fix: Placing an item on a table/turf via the alt-click menu actually centers it, again. fix: Certain items, like canvases or syringe guns, are no longer weirdly offset when placed on tables. fix: Placing items on racks, closets, crates, hoops, beds, conveyor belts, and pin the tail corgi posters is animated again, instead of instantly teleporting followed by the pickup animation. fix: Placing a canvas on an easels no longer applies a random offset as if dropped. fix: Tucking in someone else actually animates the bedsheet from you to them, instead of from them to them. qol: Placing a canvas on an easel is animated. /🆑
51 lines
2.0 KiB
Plaintext
51 lines
2.0 KiB
Plaintext
/obj/item/tail_pin
|
|
icon = 'icons/obj/poster.dmi'
|
|
icon_state = "tailpin"
|
|
name = "tail pin"
|
|
desc = "Officially branded 'pin the tail on the corgi' style party implement. Not intended to be used on people."
|
|
force = 0
|
|
w_class = WEIGHT_CLASS_SMALL
|
|
throwforce = 0
|
|
throw_speed = 1
|
|
custom_materials = list(/datum/material/iron= HALF_SHEET_MATERIAL_AMOUNT)
|
|
hitsound = 'sound/items/weapons/bladeslice.ogg'
|
|
attack_verb_continuous = list("pokes", "jabs", "pins the tail on")
|
|
attack_verb_simple = list("poke", "jab")
|
|
sharpness = SHARP_POINTY
|
|
max_integrity = 200
|
|
layer = CORGI_ASS_PIN_LAYER
|
|
embed_type = /datum/embedding/corgi_pin
|
|
|
|
/datum/embedding/corgi_pin
|
|
pain_chance = 0
|
|
jostle_pain_mult = 0
|
|
ignore_throwspeed_threshold = TRUE
|
|
|
|
/obj/item/poster/tail_board
|
|
name = "party game poster"
|
|
poster_type = /obj/structure/sign/poster/party_game
|
|
icon_state = "rolled_poster"
|
|
|
|
/obj/structure/sign/poster/party_game
|
|
name = "pin the tail on the corgi"
|
|
desc = "The rules are simple, pin the tail on the corgi, while blindfolded. Are you a bad enough dude to hit the target?"
|
|
icon_state = "pinningposter"
|
|
poster_item_name = "party game poster"
|
|
poster_item_desc = "Place it on a wall to start playing pin the tail on the corgi."
|
|
|
|
MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/party_game, 32)
|
|
|
|
/obj/structure/sign/poster/party_game/attackby(obj/item/attacking_item, mob/user, list/modifiers, list/attack_modifiers)
|
|
. = ..()
|
|
if(!istype(attacking_item, /obj/item/tail_pin))//We're using the same trick that tables use for placing objects x and y onto the click location.
|
|
return
|
|
|
|
var/x_offset = 0
|
|
var/y_offset = 0
|
|
if(LAZYACCESS(modifiers, ICON_X) && LAZYACCESS(modifiers, ICON_Y))
|
|
x_offset = clamp(text2num(LAZYACCESS(modifiers, ICON_X)) - 16, -(ICON_SIZE_X/2), ICON_SIZE_X/2)
|
|
y_offset = clamp(text2num(LAZYACCESS(modifiers, ICON_Y)) - 16, -(ICON_SIZE_Y/2), ICON_SIZE_Y/2)
|
|
if(!user.transfer_item_to_turf(attacking_item, drop_location(), x_offset, y_offset, silent = FALSE))
|
|
return
|
|
return TRUE
|