Merge branch 'master' into moretweaks

2026-08-28 23:59:53 +01:00 · 2025-05-01 22:21:20 +02:00
parent e2da029704 933d36b051
commit 3dfc65a86c
151 changed files with 23152 additions and 14508 deletions
@@ -7,6 +7,7 @@
 	cell_type = /obj/item/stock_parts/cell/emproof
 	item_flags = NONE
 	obj_flags = UNIQUE_RENAME
+	resistance_flags = FIRE_PROOF //GS13: Fireproof miner equipment
 	weapon_weight = WEAPON_LIGHT
 	recoil = 0.5
 	can_flashlight = 1