Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-2025-11-12

This commit is contained in:
Roxy
2025-11-12 16:44:13 -05:00
379 changed files with 37535 additions and 33147 deletions
+13 -1
View File
@@ -1239,9 +1239,13 @@
if("operative")
outline_color = COLOR_THEME_OPERATIVE
if("clockwork")
outline_color = COLOR_THEME_CLOCKWORK //if you want free gbp go fix the fact that clockwork's tooltip css is glass'
outline_color = COLOR_THEME_CLOCKWORK
if("glass")
outline_color = COLOR_THEME_GLASS
if("trasen-knox")
outline_color = COLOR_THEME_TRASENKNOX
if("detective")
outline_color = COLOR_THEME_DETECTIVE
else //this should never happen, hopefully
outline_color = COLOR_WHITE
if(color)
@@ -2257,3 +2261,11 @@
target_limb = victim.get_bodypart(target_limb) || victim.bodyparts[1]
return get_embed()?.embed_into(victim, target_limb)
/// Checks if user can insert a valid container into the chemistry machine.
/obj/item/proc/can_insert_container(mob/living/user, obj/machinery/chem_machine)
return is_chem_container() && chem_machine.can_interact(user) && user.can_perform_action(chem_machine, ALLOW_SILICON_REACH | FORBID_TELEKINESIS_REACH)
/// Checks if this container is valid for use with chemistry machinery.
/obj/item/proc/is_chem_container()
return FALSE