Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-sync

2026-08-23 05:00:55 +01:00 · 2025-09-17 11:45:44 -04:00
parent fed58f9219 24e929d6d0
commit 9b282a850e
385 changed files with 18711 additions and 14018 deletions
@@ -7,6 +7,7 @@
 	name = "assembly"
 	desc = "A shell assembly that can be completed by screwdrivering it."
 	icon = 'icons/obj/science/circuits.dmi'
+	abstract_type = /obj/item/shell
 	var/shell_to_spawn
 	var/screw_delay = 3 SECONDS