Merge branch 'master' of github.com:tgstation/tgstation into upstream-2026-06-23

This commit is contained in:
Roxy
2026-06-23 15:51:55 -04:00
1007 changed files with 40287 additions and 33507 deletions
+2 -1
View File
@@ -16,7 +16,8 @@
var/locked = FALSE
/obj/structure/money_bot/atom_deconstruct(disassembled = TRUE)
new /obj/item/holochip(drop_location(), stored_money)
if(stored_money)
new /obj/item/holochip(drop_location(), stored_money)
/obj/structure/money_bot/proc/add_money(to_add)
stored_money += to_add