Files
Alexis 21b4095dfd [MDB IGNORE] [IDB IGNORE] Upstream Sync - 04/17/2026 (#5453)
Upstream 04/17/2026

fixes https://github.com/Bubberstation/Bubberstation/issues/5549

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: tgstation-ci[bot] <179393467+tgstation-ci[bot]@users.noreply.github.com>
Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Rhials <28870487+Rhials@users.noreply.github.com>
Co-authored-by: rageguy505 <54517726+rageguy505@users.noreply.github.com>
Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Aliceee2ch <160794176+Aliceee2ch@users.noreply.github.com>
Co-authored-by: Time-Green <7501474+Time-Green@users.noreply.github.com>
Co-authored-by: Tsar-Salat <62388554+Tsar-Salat@users.noreply.github.com>
Co-authored-by: SmArtKar <44720187+SmArtKar@users.noreply.github.com>
Co-authored-by: Maxipat <108554989+Maxipat112@users.noreply.github.com>
Co-authored-by: SyncIt21 <110812394+SyncIt21@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: SimplyLogan <47579821+loganuk@users.noreply.github.com>
Co-authored-by: loganuk <fakeemail123@aol.com>
Co-authored-by: Leland Kemble <70413276+lelandkemble@users.noreply.github.com>
Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
Co-authored-by: Roxy <75404941+TealSeer@users.noreply.github.com>
Co-authored-by: Lucy <lucy@absolucy.moe>
Co-authored-by: siliconOpossum <138069572+siliconOpossum@users.noreply.github.com>
Co-authored-by: Isratosh <Isratosh@hotmail.com>
Co-authored-by: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com>
Co-authored-by: Neocloudy <88008002+Neocloudy@users.noreply.github.com>
Co-authored-by: Alexander V. <volas@ya.ru>
Co-authored-by: ElGitificador <168473461+ElGitificador@users.noreply.github.com>
Co-authored-by: Twaticus <46540570+Twaticus@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Tim <timothymtorres@gmail.com>
Co-authored-by: Iamgoofball <iamgoofball@gmail.com>
Co-authored-by: Layzu666 <121319428+Layzu666@users.noreply.github.com>
Co-authored-by: Arturlang <24881678+Arturlang@users.noreply.github.com>
Co-authored-by: _0Steven <42909981+00-Steven@users.noreply.github.com>
Co-authored-by: mrmanlikesbt <99309552+mrmanlikesbt@users.noreply.github.com>
Co-authored-by: Ben10Omintrix <138636438+Ben10Omintrix@users.noreply.github.com>
Co-authored-by: John F. Kennedy <54908920+MacaroniCritter@users.noreply.github.com>
Co-authored-by: Cursor <102828457+theselfish@users.noreply.github.com>
Co-authored-by: Josh <josh.adam.powell@gmail.com>
Co-authored-by: Josh Powell <josh.powell@softwire.com>
Co-authored-by: Yobrocharlie <Charliemiller5617@gmail.com>
Co-authored-by: Hardly3D <66234359+Hardly3D@users.noreply.github.com>
Co-authored-by: shayoki <96078776+shayoki@users.noreply.github.com>
Co-authored-by: LT3 <83487515+lessthnthree@users.noreply.github.com>
2026-05-16 00:56:00 +02:00

232 lines
7.8 KiB
Plaintext

/**
* # Janicart
*/
/obj/vehicle/ridden/janicart
name = "janicart (pimpin' ride)"
desc = "A brave janitor cyborg gave its life to produce such an amazing combination of speed and utility."
icon_state = "pussywagon"
key_type = /obj/item/key/janitor
movedelay = 1
/// The attached garbage bag, if present
var/obj/item/storage/bag/trash/trash_bag
/// The installed upgrade, if present
var/obj/item/janicart_upgrade/installed_upgrade
/obj/vehicle/ridden/janicart/Initialize(mapload)
. = ..()
register_context()
update_appearance()
AddElement(/datum/element/ridable, /datum/component/riding/vehicle/janicart)
GLOB.janitor_devices += src
if (installed_upgrade)
installed_upgrade.install(src)
/obj/vehicle/ridden/janicart/Destroy()
GLOB.janitor_devices -= src
if (trash_bag)
QDEL_NULL(trash_bag)
if (installed_upgrade)
QDEL_NULL(installed_upgrade)
return ..()
/obj/vehicle/ridden/janicart/examine(mob/user)
. = ..()
if (installed_upgrade)
. += "It has been upgraded with [installed_upgrade], which can be removed with a screwdriver."
/obj/vehicle/ridden/janicart/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
. = ..()
if(.)
return
if(istype(tool, /obj/item/storage/bag/trash))
if(trash_bag)
to_chat(user, span_warning("[src] already has a trashbag hooked!"))
return ITEM_INTERACT_BLOCKING
if(!user.transferItemToLoc(tool, src))
return ITEM_INTERACT_BLOCKING
to_chat(user, span_notice("You hook the trashbag onto [src]."))
trash_bag = tool
RegisterSignal(trash_bag, COMSIG_QDELETING, PROC_REF(bag_deleted))
SEND_SIGNAL(src, COMSIG_VACUUM_BAG_ATTACH, tool)
update_appearance()
return ITEM_INTERACT_SUCCESS
if(istype(tool, /obj/item/janicart_upgrade))
if(installed_upgrade)
to_chat(user, span_warning("[src] already has an upgrade installed! Use a screwdriver to remove it."))
return ITEM_INTERACT_BLOCKING
var/obj/item/janicart_upgrade/new_upgrade = tool
new_upgrade.forceMove(src)
new_upgrade.install(src)
installed_upgrade = new_upgrade
to_chat(user, span_notice("You upgrade [src] with [new_upgrade]."))
update_appearance()
return ITEM_INTERACT_SUCCESS
if(trash_bag && (!is_key(tool) || is_key(inserted_key))) // don't put a key in the trash when we need it
trash_bag.atom_storage.attempt_insert(tool, user)
return ITEM_INTERACT_SUCCESS
return NONE
/obj/vehicle/ridden/janicart/screwdriver_act(mob/living/user, obj/item/tool)
if (!installed_upgrade)
return ITEM_INTERACT_BLOCKING
installed_upgrade.uninstall(src)
installed_upgrade.forceMove(get_turf(user))
user.put_in_hands(installed_upgrade)
to_chat(user, span_notice("You remove [installed_upgrade] from [src]"))
installed_upgrade = null
update_appearance()
return ITEM_INTERACT_SUCCESS
/obj/vehicle/ridden/janicart/update_overlays()
. = ..()
if(trash_bag)
if(istype(trash_bag, /obj/item/storage/bag/trash/bluespace))
. += "cart_bluespace_garbage"
else
. += "cart_garbage"
if(installed_upgrade)
var/mutable_appearance/overlay = new(SSgreyscale.GetColoredIconByType(installed_upgrade.overlay_greyscale_config, installed_upgrade.greyscale_colors))
overlay.icon_state = "janicart_upgrade"
. += overlay
/obj/vehicle/ridden/janicart/attack_hand(mob/user, list/modifiers)
// right click removes bag without unbuckling when possible
. = (LAZYACCESS(modifiers, RIGHT_CLICK) && try_remove_bag(user)) || ..()
if (!.)
try_remove_bag(user)
/obj/vehicle/ridden/janicart/add_context(atom/source, list/context, obj/item/held_item, mob/user)
. = ..()
if(!held_item)
if(occupant_amount() > 0)
context[SCREENTIP_CONTEXT_LMB] = "Dismount"
context[SCREENTIP_CONTEXT_RMB] = "Dismount"
if(trash_bag)
context[SCREENTIP_CONTEXT_RMB] = "Remove trash bag"
if(is_key(inserted_key) && occupants.Find(user))
context[SCREENTIP_CONTEXT_ALT_LMB] = "Remove key"
return CONTEXTUAL_SCREENTIP_SET
else if(trash_bag)
context[SCREENTIP_CONTEXT_LMB] = "Remove trash bag"
context[SCREENTIP_CONTEXT_RMB] = "Remove trash bag"
return CONTEXTUAL_SCREENTIP_SET
if(istype(held_item, /obj/item/storage/bag/trash) && !trash_bag)
context[SCREENTIP_CONTEXT_LMB] = "Add trash bag"
context[SCREENTIP_CONTEXT_RMB] = "Add trash bag"
return CONTEXTUAL_SCREENTIP_SET
if(istype(held_item, /obj/item/janicart_upgrade) && !installed_upgrade)
context[SCREENTIP_CONTEXT_LMB] = "Install upgrade"
return CONTEXTUAL_SCREENTIP_SET
if(istype(held_item, /obj/item/screwdriver) && installed_upgrade)
context[SCREENTIP_CONTEXT_LMB] = "Remove upgrade"
return CONTEXTUAL_SCREENTIP_SET
if(is_key(held_item) && !is_key(inserted_key))
context[SCREENTIP_CONTEXT_LMB] = "Insert key"
context[SCREENTIP_CONTEXT_RMB] = "Insert key"
return CONTEXTUAL_SCREENTIP_SET
else if (trash_bag)
context[SCREENTIP_CONTEXT_LMB] = "Insert into trash bag"
context[SCREENTIP_CONTEXT_RMB] = "Insert into trash bag"
return CONTEXTUAL_SCREENTIP_SET
/**
* Called if the attached bag is being qdeleted, ensures appearance is maintained properly
*/
/obj/vehicle/ridden/janicart/proc/bag_deleted(datum/source)
SIGNAL_HANDLER
INVOKE_ASYNC(src, PROC_REF(try_remove_bag))
/**
* Attempts to remove the attached trash bag, returns true if bag was removed
*
* Arguments:
* * remover - The (optional) mob attempting to remove the bag
*/
/obj/vehicle/ridden/janicart/proc/try_remove_bag(mob/remover = null)
if (!trash_bag)
return FALSE
if (remover)
trash_bag.forceMove(get_turf(remover))
remover.put_in_hands(trash_bag)
UnregisterSignal(trash_bag, COMSIG_QDELETING)
trash_bag = null
SEND_SIGNAL(src, COMSIG_VACUUM_BAG_DETACH)
update_appearance()
return TRUE
/obj/vehicle/ridden/janicart/upgraded
installed_upgrade = new /obj/item/janicart_upgrade/buffer
/obj/vehicle/ridden/janicart/upgraded/vacuum
installed_upgrade = new /obj/item/janicart_upgrade/vacuum
/**
* # Janicart Upgrade
*
* Functional upgrades that can be installed into a janicart.
*
*/
/obj/item/janicart_upgrade
name = "base upgrade"
desc = "An abstract upgrade for mobile janicarts."
icon = 'icons/obj/service/janicart_upgrade.dmi'
icon_state = "janicart_upgrade"
greyscale_config = /datum/greyscale_config/janicart_upgrade
/// The greyscale config for the on-cart installed upgrade overlay
var/overlay_greyscale_config = /datum/greyscale_config/janicart_upgrade/installed
/**
* Called when upgrade is installed into a janicart
*
* Arguments:
* * installee - The cart the upgrade is being installed into
*/
/obj/item/janicart_upgrade/proc/install(obj/vehicle/ridden/janicart/installee)
return FALSE
/**
* Called when upgrade is uninstalled from a janicart
*
* Arguments:
* * installee - The cart the upgrade is being removed from
*/
/obj/item/janicart_upgrade/proc/uninstall(obj/vehicle/ridden/janicart/installee)
return FALSE
/obj/item/janicart_upgrade/buffer
name = "floor buffer upgrade"
desc = "An upgrade for mobile janicarts which adds a floor buffer functionality."
icon = 'icons/map_icons/items/_item.dmi'
icon_state = "/obj/item/janicart_upgrade/buffer"
post_init_icon_state = "janicart_upgrade"
greyscale_colors = "#ffffff#6aa3ff#a2a2a2#d1d15f"
/obj/item/janicart_upgrade/buffer/install(obj/vehicle/ridden/janicart/installee)
installee.AddElement(/datum/element/cleaning)
/obj/item/janicart_upgrade/buffer/uninstall(obj/vehicle/ridden/janicart/installee)
installee.RemoveElement(/datum/element/cleaning)
/obj/item/janicart_upgrade/vacuum
name = "vacuum upgrade"
desc = "An upgrade for mobile janicarts which adds a vacuum functionality."
icon = 'icons/map_icons/items/_item.dmi'
icon_state = "/obj/item/janicart_upgrade/vacuum"
post_init_icon_state = "janicart_upgrade"
greyscale_colors = "#ffffff#ffea6a#a2a2a2#d1d15f"
/obj/item/janicart_upgrade/vacuum/install(obj/vehicle/ridden/janicart/installee)
installee.AddComponent(/datum/component/vacuum, installee.trash_bag)
/obj/item/janicart_upgrade/vacuum/uninstall(obj/vehicle/ridden/janicart/installee)
qdel(installee.GetComponent(/datum/component/vacuum))