Merge branch 'master' into upstream-merge-30056

code/modules/mob/living/silicon/robot/robot.dm

@@ -72,7 +72,7 @@
 
 	var/lamp_max = 10 //Maximum brightness of a borg lamp. Set as a var for easy adjusting.
 	var/lamp_intensity = 0 //Luminosity of the headlamp. 0 is off. Higher settings than the minimum require power.
-	var/lamp_recharging = 0 //Flag for if the lamp is on cooldown after being forcibly disabled.
+	var/lamp_cooldown = 0 //Flag for if the lamp is on cooldown after being forcibly disabled.
 
 	var/sight_mode = 0
 	hud_possible = list(ANTAG_HUD, DIAG_STAT_HUD, DIAG_HUD, DIAG_BATT_HUD, DIAG_TRACK_HUD)
@@ -742,7 +742,7 @@
 	set_autosay()
 
 /mob/living/silicon/robot/proc/control_headlamp()
-	if(stat || lamp_recharging || low_power_mode)
+	if(stat || lamp_cooldown > world.time || low_power_mode)
 		to_chat(src, "<span class='danger'>This function is currently offline.</span>")
 		return
 
@@ -757,8 +757,7 @@
 	if(lamp_intensity && (turn_off || stat || low_power_mode))
 		to_chat(src, "<span class='danger'>Your headlamp has been deactivated.</span>")
 		lamp_intensity = 0
-		lamp_recharging = TRUE
-		addtimer(CALLBACK(src, .proc/reset_headlamp), cooldown)
+		lamp_cooldown = world.time + cooldown
 	else
 		set_light(lamp_intensity)
 
@@ -767,9 +766,6 @@
 
 	update_icons()
 
-/mob/living/silicon/robot/proc/reset_headlamp()
-	lamp_recharging = FALSE
-
 /mob/living/silicon/robot/proc/deconstruct()
 	var/turf/T = get_turf(src)
 	if (robot_suit)

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -599,7 +599,7 @@
 		/obj/item/gun/ballistic/revolver/grenadelauncher/cyborg,
 		/obj/item/card/emag,
 		/obj/item/crowbar/cyborg,
-		/obj/item/pinpointer/syndicate/cyborg)
+		/obj/item/pinpointer/syndicate_cyborg)
 
 	ratvar_modules = list(
 		/obj/item/clockwork/slab/cyborg/security,
@@ -625,7 +625,7 @@
 		/obj/item/roller/robo,
 		/obj/item/card/emag,
 		/obj/item/crowbar/cyborg,
-		/obj/item/pinpointer/syndicate/cyborg,
+		/obj/item/pinpointer/syndicate_cyborg,
 		/obj/item/stack/medical/gauze/cyborg,
 		/obj/item/gun/medbeam)
 	ratvar_modules = list(

code/modules/mob/living/silicon/robot/robot_modules.dm.rej

@@ -0,0 +1,19 @@
+diff a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm	(rejected hunks)
+@@ -519,7 +519,7 @@
+ 		/obj/item/weapon/gun/ballistic/revolver/grenadelauncher/cyborg,
+ 		/obj/item/weapon/card/emag,
+ 		/obj/item/weapon/crowbar/cyborg,
+-		/obj/item/weapon/pinpointer/syndicate/cyborg)
++		/obj/item/weapon/pinpointer/syndicate_cyborg)
+ 
+ 	ratvar_modules = list(
+ 		/obj/item/clockwork/slab/cyborg/security,
+@@ -545,7 +545,7 @@
+ 		/obj/item/roller/robo,
+ 		/obj/item/weapon/card/emag,
+ 		/obj/item/weapon/crowbar/cyborg,
+-		/obj/item/weapon/pinpointer/syndicate/cyborg,
++		/obj/item/weapon/pinpointer/syndicate_cyborg,
+ 		/obj/item/stack/medical/gauze/cyborg,
+ 		/obj/item/weapon/gun/medbeam)
+ 	ratvar_modules = list(