Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit

2024-03-08 19:10:22 -03:00
parent fcd036dab5 c4c3a8ace1
commit a65f323734
810 changed files with 140372 additions and 5523 deletions
@@ -31,6 +31,12 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list(
 /obj/item/stack/marker_beacon/thirty //and they're bought in stacks of 1, 10, or 30
 	amount = 30

+/obj/item/stack/marker_beacon/cyborg
+	is_cyborg = TRUE
+	custom_materials = null
+	source = /datum/robot_energy_storage/beacon
+	cost = 1
+
 /obj/item/stack/marker_beacon/Initialize(mapload)
 	. = ..()
 	update_icon()