cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-17 19:14:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Roxy
2025-10-23 17:38:23 -04:00
parent e9ee4dea19 2a5fae5d2a
commit e28e9fbdba
453 changed files with 20635 additions and 15897 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/wiremod/core/marker.dm
+2 -2
View File
@@ -56,7 +56,7 @@
carbon_target = target
visible_items = carbon_target.get_visible_items()
else
visible_items = target.get_equipped_items()
visible_items = target.get_equipped_items(INCLUDE_HELD)
visible_items -= src // the multitool cannot mark itself.
@@ -89,7 +89,7 @@
return
var/atom/movable/chosen = locate(picked_ref)
if(chosen == target || (chosen in (carbon_target ? carbon_target.get_visible_items() : target.get_equipped_items())))
if(chosen == target || (chosen in (carbon_target ? carbon_target.get_visible_items() : target.get_equipped_items(INCLUDE_HELD))))
mark_target(chosen)
else
balloon_alert(user, "cannot mark entity")