mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-18 03:26:31 +01:00
Arturlang
1c0ac21cb4
## About The Pull Request
Fixes the issue of usr pointing to admins by making Trigger pass down
clicker, as usr is fucky and can be passed down by other unrelated
procs. Fun.
Added the clicker arg to all usages of Trigger as well
Also changes isobserver check in antagonist ui_act code that prevents
observers from clicking UI's instead to check if the ui.user is
owner.current
## Why It's Good For The Game
Fixes admins giving heretic to people opening the heretic UI for the
admin instead
(cherry picked from commit 0bc42d6940)
73 lines
2.2 KiB
Plaintext
73 lines
2.2 KiB
Plaintext
/datum/action/setup_shop
|
|
name = "Setup shop"
|
|
desc = "Summons a wacky sales sign, and a comfy sitting spot to conduct your business from."
|
|
button_icon = 'icons/mob/actions/actions_trader.dmi'
|
|
button_icon_state = "setup_shop"
|
|
/// The shop spot
|
|
var/datum/weakref/shop_spot_ref
|
|
/// The server this console is connected to.
|
|
var/datum/weakref/sign_ref
|
|
/// The type of the chair we sit on
|
|
var/shop_spot_type
|
|
/// The type of our advertising sign
|
|
var/sign_type
|
|
/// The sound we make when we summon our shop gear
|
|
var/shop_sound
|
|
/// Lines we say when we open our shop
|
|
var/opening_lines
|
|
|
|
/datum/action/setup_shop/IsAvailable(feedback = FALSE)
|
|
. = ..()
|
|
if (!.)
|
|
return FALSE
|
|
if(shop_spot_ref?.resolve())
|
|
if(feedback)
|
|
owner.balloon_alert(owner, "already set up!")
|
|
return FALSE
|
|
return TRUE
|
|
|
|
/datum/action/setup_shop/New(Target, shop_spot_type = /obj/structure/chair/plastic, sign_type = /obj/structure/trader_sign, sell_sound = 'sound/effects/cashregister.ogg', opening_lines = list("Welcome to my shop, friend!"))
|
|
. = ..()
|
|
|
|
src.shop_spot_type = shop_spot_type
|
|
src.sign_type = sign_type
|
|
src.shop_sound = sell_sound
|
|
src.opening_lines = opening_lines
|
|
|
|
/datum/action/setup_shop/Trigger(mob/clicker, trigger_flags)
|
|
. = ..()
|
|
if(!.)
|
|
return
|
|
|
|
owner.say(pick(opening_lines))
|
|
var/obj/shop_spot = new shop_spot_type(owner.loc)
|
|
shop_spot.dir = owner.dir
|
|
shop_spot_ref = WEAKREF(shop_spot)
|
|
owner.ai_controller?.set_blackboard_key(BB_SHOP_SPOT, shop_spot)
|
|
|
|
playsound(owner, shop_sound, 50, TRUE)
|
|
|
|
var/turf/sign_turf
|
|
|
|
sign_turf = try_find_valid_spot(owner.loc, turn(shop_spot.dir, -90))
|
|
if(isnull(sign_turf)) //No space to my left, lets try right
|
|
sign_turf = try_find_valid_spot(owner.loc, turn(shop_spot.dir, 90))
|
|
|
|
if(isnull(sign_turf))
|
|
return
|
|
|
|
var/obj/sign = sign_ref?.resolve()
|
|
if(QDELETED(sign))
|
|
var/obj/new_sign = new sign_type(sign_turf)
|
|
sign_ref = WEAKREF(sign)
|
|
do_sparks(3, FALSE, new_sign)
|
|
else
|
|
do_teleport(sign,sign_turf)
|
|
|
|
///Look for a spot we can place our sign on
|
|
/datum/action/setup_shop/proc/try_find_valid_spot(origin_turf, direction_to_check)
|
|
var/turf/sign_turf = get_step(origin_turf, direction_to_check)
|
|
if(sign_turf && !isgroundlessturf(sign_turf) && !isclosedturf(sign_turf) && !sign_turf.is_blocked_turf())
|
|
return sign_turf
|
|
return null
|