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

This commit is contained in:
SandPoot
2024-03-08 19:10:22 -03:00
810 changed files with 140372 additions and 5523 deletions
+1 -1
View File
@@ -30,7 +30,7 @@
var/activate_cooldown = 3 SECONDS
/obj/item/assembly/get_part_rating()
return 1
return TRUE
/obj/item/assembly/proc/on_attach()
+1 -1
View File
@@ -61,7 +61,7 @@
/obj/item/assembly/health/proc/toggle_scan()
if(!secured)
return 0
return FALSE
scanning = !scanning
if(scanning)
START_PROCESSING(SSobj, src)