mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-25 09:01:40 +00:00
a4328ae1f9
Fixes #86784
## About The Pull Request
Although some of the issues found were a direct result from #86692
(c698196766), there was still 40% of
length-related issues that wouldn't be covered anyways that are fixed in
this PR. I.E.:
* Name inputs without `MAX_NAME_LEN`
* Desc inputs without `MAX_DESC_LEN`
* Plaque inputs without `MAX_PLAQUE_LEN`
* Some people just screwed up the arguments so it would prefill
something like "40" in the `default` var because they didn't name their
vars.
To help me audit I added a lot of `max_length` named arguments to help
people understand it better. I think it might be kinder to have a
wrapper that handles adding `MAX_MESSAGE_LEN` in a lot of these cases
but I think there is some reason for a coder to be cognitive about input
texts? Let me know what you think. I didn't update anything
admin-related from what I can recall, let me know if anything needs to
be unlimited again.
## Why It's Good For The Game
The change to `INFINITY` notwithstanding, there were still an abundance
of issues that we needed to check up on. A lot of these are filtered on
down the line but it is clear that there needs to be something to catch
these issues. Maybe we could lint to make `max_length` a mandatory
argument? I don't know if that's necessary at all but I think that the
limit should be set by the invoker due to the wide arrangement of cases
that this proc could be used in.
This could all be a big nothingburger if the aforementioned PR is
reverted but a big chunk of cases fixed in this PR need to be fixed
regardless of that since people could put in 1024 character names for
stuff like guardians (or more now with the change). Consider this
"revert agnostic".
## Changelog
🆑
fix: A lot of instances where you could fill in 1024-character names
(normal limit is 42) have been patched out, along with too-long plaque
names, too-long descriptions, and more.
/🆑
120 lines
3.6 KiB
Plaintext
120 lines
3.6 KiB
Plaintext
/obj/item/reagent_containers/blood
|
|
name = "blood pack"
|
|
desc = "Contains blood used for transfusion. Must be attached to an IV drip."
|
|
icon = 'icons/obj/medical/bloodpack.dmi'
|
|
icon_state = "bloodpack"
|
|
volume = 200
|
|
var/blood_type = null
|
|
var/unique_blood = null
|
|
var/labelled = FALSE
|
|
fill_icon_thresholds = list(10, 20, 30, 40, 50, 60, 70, 80, 90, 100)
|
|
|
|
/obj/item/reagent_containers/blood/Initialize(mapload, vol)
|
|
. = ..()
|
|
if(blood_type != null)
|
|
reagents.add_reagent(unique_blood ? unique_blood : /datum/reagent/blood, 200, list("viruses"=null,"blood_DNA"=null,"blood_type"=blood_type,"resistances"=null,"trace_chem"=null))
|
|
update_appearance()
|
|
|
|
/// Handles updating the container when the reagents change.
|
|
/obj/item/reagent_containers/blood/on_reagent_change(datum/reagents/holder, ...)
|
|
var/datum/reagent/blood/new_reagent = holder.has_reagent(/datum/reagent/blood)
|
|
if(new_reagent && new_reagent.data && new_reagent.data["blood_type"])
|
|
blood_type = new_reagent.data["blood_type"]
|
|
else if(holder.has_reagent(/datum/reagent/consumable/liquidelectricity))
|
|
blood_type = "LE"
|
|
else if(holder.has_reagent(/datum/reagent/lube))
|
|
blood_type = "S"
|
|
else if(holder.has_reagent(/datum/reagent/water))
|
|
blood_type = "H2O"
|
|
else if(holder.has_reagent(/datum/reagent/toxin/slimejelly))
|
|
blood_type = "TOX"
|
|
else
|
|
blood_type = null
|
|
return ..()
|
|
|
|
/obj/item/reagent_containers/blood/update_name(updates)
|
|
. = ..()
|
|
if(labelled)
|
|
return
|
|
name = "blood pack[blood_type ? " - [blood_type]" : null]"
|
|
|
|
/obj/item/reagent_containers/blood/random
|
|
icon_state = "random_bloodpack"
|
|
|
|
/obj/item/reagent_containers/blood/random/Initialize(mapload, vol)
|
|
icon_state = "bloodpack"
|
|
blood_type = pick("A+", "A-", "B+", "B-", "O+", "O-", "L")
|
|
return ..()
|
|
|
|
/obj/item/reagent_containers/blood/a_plus
|
|
blood_type = "A+"
|
|
|
|
/obj/item/reagent_containers/blood/a_minus
|
|
blood_type = "A-"
|
|
|
|
/obj/item/reagent_containers/blood/b_plus
|
|
blood_type = "B+"
|
|
|
|
/obj/item/reagent_containers/blood/b_minus
|
|
blood_type = "B-"
|
|
|
|
/obj/item/reagent_containers/blood/o_plus
|
|
blood_type = "O+"
|
|
|
|
/obj/item/reagent_containers/blood/o_minus
|
|
blood_type = "O-"
|
|
|
|
/obj/item/reagent_containers/blood/lizard
|
|
blood_type = "L"
|
|
|
|
/obj/item/reagent_containers/blood/ethereal
|
|
blood_type = "LE"
|
|
unique_blood = /datum/reagent/consumable/liquidelectricity
|
|
|
|
/obj/item/reagent_containers/blood/snail
|
|
blood_type = "S"
|
|
unique_blood = /datum/reagent/lube
|
|
|
|
/obj/item/reagent_containers/blood/snail/examine()
|
|
. = ..()
|
|
. += span_notice("It's a bit slimy... The label indicates that this is meant for snails.")
|
|
|
|
/obj/item/reagent_containers/blood/podperson
|
|
blood_type = "H2O"
|
|
unique_blood = /datum/reagent/water
|
|
|
|
/obj/item/reagent_containers/blood/podperson/examine()
|
|
. = ..()
|
|
. += span_notice("This appears to be some very overpriced water.")
|
|
|
|
// for slimepeople
|
|
/obj/item/reagent_containers/blood/toxin
|
|
blood_type = "TOX"
|
|
unique_blood = /datum/reagent/toxin/slimejelly
|
|
|
|
/obj/item/reagent_containers/blood/toxin/examine()
|
|
. = ..()
|
|
. += span_notice("There is a toxin warning on the label. This is for slimepeople.")
|
|
|
|
/obj/item/reagent_containers/blood/universal
|
|
blood_type = "U"
|
|
|
|
/obj/item/reagent_containers/blood/attackby(obj/item/tool, mob/user, params)
|
|
if (IS_WRITING_UTENSIL(tool))
|
|
if(!user.can_write(tool))
|
|
return
|
|
var/custom_label = tgui_input_text(user, "What would you like to label the blood pack?", "Blood Pack", name, max_length = MAX_NAME_LEN)
|
|
if(!user.can_perform_action(src))
|
|
return
|
|
if(user.get_active_held_item() != tool)
|
|
return
|
|
if(custom_label)
|
|
labelled = TRUE
|
|
name = "blood pack - [custom_label]"
|
|
balloon_alert(user, "new label set")
|
|
else
|
|
labelled = FALSE
|
|
update_name()
|
|
else
|
|
return ..()
|