Miner hotfix (#10957)

* miner * seclite
BeeStation · May 11, 2024 · f6c2630 · f6c2630
1 parent 93332e1
commit f6c2630
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/code/modules/mining/equipment/regenerative_core.dm b/code/modules/mining/equipment/regenerative_core.dm
@@ -26,6 +26,7 @@
 	desc = "All that remains of a hivelord. It can be used to heal completely, but it will rapidly decay into uselessness."
 	icon_state = "roro core 2"
 	item_flags = NOBLUDGEON
+	organ_flags = null
 	slot = "hivecore"
 	force = 0
 	actions_types = list(/datum/action/item_action/organ_action/use)

diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
@@ -207,7 +207,7 @@
 	var/temp_icon_to_use = initial(icon_state)
 	if(modifystate)
 		var/obj/item/ammo_casing/energy/shot = ammo_type[select]
-		temp_icon_to_use += "[shot.select_name]"
+		temp_icon_to_use += "[initial(shot.select_name)]"
 
 	temp_icon_to_use += "[ratio]"
 	if(!skip_inhand)

diff --git a/code/modules/projectiles/guns/energy/energy_gun.dm b/code/modules/projectiles/guns/energy/energy_gun.dm
@@ -32,6 +32,7 @@
 /obj/item/gun/energy/e_gun/mini/add_seclight_point()
 	// The mini energy gun's light comes attached but is unremovable.
 	AddComponent(/datum/component/seclite_attachable, \
+		starting_light = new /obj/item/flashlight/seclite(src), \
 		is_light_removable = FALSE, \
 		light_overlay_icon = 'icons/obj/guns/flashlights.dmi', \
 		light_overlay = "mini-light", \

diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
@@ -22,7 +22,7 @@
 
 	var/recharge_timerid
 
-/obj/item/gun/energy/recharge/kinetic_accelerator/add_seclight_point()
+/obj/item/gun/energy/kinetic_accelerator/add_seclight_point()
 	AddComponent(/datum/component/seclite_attachable, \
 		light_overlay_icon = 'icons/obj/guns/flashlights.dmi', \
 		light_overlay = "flight", \