Cyborg Damage, Movement, and Power Overhaul (#25252)

* Adding defines * More signals for external power * Gets the reboot working * renaming a proc * config stuff * Working on cyborg movement * Update code/modules/mob/living/silicon/robot/robot_damage.dm Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> * Update code/modules/mob/living/silicon/robot/robot_damage.dm Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> * Update code/modules/mob/living/silicon/robot/robot_damage.dm Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> * IOSYS where'd you come from * begon return 0 * VTEC caps slowdown * Adjusting EMPs * Funny arm is GONE * Oh yeah regenerating stamina might be a good thing * Forgot you could uninstall vtec * icon machine broke * Cell-less borgs can enter chargers to stay powered * oh that was almost bad * Fixes some logic * its a surprise tool that will help us later * Adjusting some numbers * Adds a sound to go along with the text alarm * dead things can still charge * Another logic error * Xenos too * sorry linter * fixes CL * Slightly more slowdown on stam damage * neurotoxin won't stun * SOUNDS! * 3 flashes to stun instead of 4 * Slightly longer stun * SPEEDING UP BORGS JUST FOR THE TM SINCE CONFIG DONT WORK * Keep borgs stunned forever * Power loss is more dangerous * Adds a stamina hud to borgs * Cyborgs now heal up properly * Removes an outdated comment * Replacing parts works better now * EMPs disable components for a brief time * More missed rebalances * When you forget to remove debug messages * WHAT * Cult magic works + borgs can be silenced * 2 flashes to stun, flashes confuse now * Update code/game/objects/items/devices/flash.dm Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> * Abductors can stun borgs * Watcher/cyro rays deal stam to brog * Fixes a rounding error when healing borgs back to full HP * Fixed span Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> * Fixed whitespace Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> * Guard clausify * Indents a message * Update code/modules/mob/living/silicon/robot/robot_damage.dm Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com> Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> * Update code/modules/mob/living/silicon/robot/component.dm Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com> Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> * Update code/modules/mob/living/silicon/robot/robot_damage.dm Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com> Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> * that's not what stat does * No more hardcoded speed, don't TM this branch --------- Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2026-07-17 01:53:35 +01:00 · 2024-07-09 13:44:50 -04:00
parent cd88b3de88
commit ec88636e6c
35 changed files with 279 additions and 136 deletions
@@ -28,8 +28,8 @@
 /obj/item/flash/proc/clown_check(mob/user)
 	if(user && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))
 		flash_carbon(user, user, 30 SECONDS, 0)
-		return 0
-	return 1
+		return FALSE
+	return TRUE

 /obj/item/flash/attackby(obj/item/I, mob/user, params)
 	if(can_overcharge)
@@ -66,7 +66,7 @@
 /obj/item/flash/proc/flash_recharge(mob/user)
 	if(prob(times_used * 2))	//if you use it 5 times in a minute it has a 10% chance to break!
 		burn_out()
-		return 0
+		return FALSE

 	var/deciseconds_passed = world.time - last_used
 	for(var/seconds = deciseconds_passed/10, seconds>=10, seconds-=10) //get 1 charge every 10 seconds
@@ -122,20 +122,19 @@

 /obj/item/flash/attack(mob/living/M, mob/user)
 	if(!try_use_flash(user))
-		return 0
+		return FALSE
 	if(iscarbon(M))
 		flash_carbon(M, user, 10 SECONDS, 1)
 		if(overcharged)
 			M.adjust_fire_stacks(6)
 			M.IgniteMob()
 			burn_out()
-		return 1
+		return TRUE
 	else if(issilicon(M))
 		add_attack_logs(user, M, "Flashed with [src]")
-		if(M.flash_eyes(affect_silicon = 1))
-			M.Weaken(rand(8 SECONDS, 12 SECONDS))
+		if(M.flash_eyes(intensity = 1.25, affect_silicon = TRUE)) // 40 * 1.25 = 50 stamina damage
 			user.visible_message("<span class='disarm'>[user] overloads [M]'s sensors with [src]!</span>", "<span class='danger'>You overload [M]'s sensors with [src]!</span>")
-		return 1
+		return TRUE
 	user.visible_message("<span class='disarm'>[user] fails to blind [M] with [src]!</span>", "<span class='warning'>You fail to blind [M] with [src]!</span>")

 /obj/item/flash/afterattack(atom/target, mob/living/user, proximity, params)
@@ -155,7 +154,7 @@

 /obj/item/flash/attack_self(mob/living/carbon/user, flag = 0, emp = 0)
 	if(!try_use_flash(user))
-		return 0
+		return FALSE
 	user.visible_message("<span class='disarm'>[user]'s [name] emits a blinding light!</span>", "<span class='danger'>Your [name] emits a blinding light!</span>")
 	for(var/mob/living/carbon/M in oviewers(3, null))
 		flash_carbon(M, user, 6 SECONDS, 0)
@@ -168,7 +167,7 @@

 /obj/item/flash/emp_act(severity)
 	if(!try_use_flash())
-		return 0
+		return FALSE
 	for(var/mob/living/carbon/M in viewers(3, null))
 		flash_carbon(M, null, 20 SECONDS, 0)
 	burn_out()
@@ -117,8 +117,7 @@
 		var/mob/living/silicon/S = target
 		//20% chance to actually hit the sensors
 		if(prob(effectchance * diode.rating))
-			S.flash_eyes(affect_silicon = 1)
-			S.Weaken(rand(10 SECONDS, 20 SECONDS))
+			S.flash_eyes(affect_silicon = TRUE)
 			to_chat(S, "<span class='warning'>Your sensors were overloaded by a laser!</span>")
 			outmsg = "<span class='notice'>You overload [S] by shining [src] at [S.p_their()] sensors.</span>"

@@ -380,7 +380,8 @@
 		if(!M.client)
 			continue
 		if(issilicon(M))
-			M.Weaken(10 SECONDS)
+			var/mob/living/silicon/robot/R = M
+			R.flash_eyes(3, affect_silicon = TRUE) //Enough stamina damage to instantly force a reboot
 		else
 			M.Confused(45 SECONDS)
 		M.adjustBrainLoss(10)
@@ -5,6 +5,10 @@
 	icon = 'icons/mob/robot_items.dmi'
 	var/powerneeded // Percentage of power remaining required to run item

+/*
+The old, instant-stun borg arm.
+Keeping it in for adminabuse but the malf one is /obj/item/melee/baton/borg_stun_arm
+*/
 /obj/item/borg/stun
 	name = "electrically-charged arm"
 	icon_state = "elecarm"
@@ -136,8 +140,3 @@
 #undef CYBORG_HUG
 #undef CYBORG_SHOCK
 #undef CYBORG_CRUSH
-
-/obj/item/borg/overdrive
-	name = "Overdrive"
-	icon = 'icons/obj/decals.dmi'
-	icon_state = "shock"
@@ -296,7 +296,6 @@

 			var/datum/robot_component/cell_component = O.components["power cell"]
 			cell_component.install(chest.cell)
-			chest.cell.forceMove(O)
 			chest.cell = null

 			M.forceMove(O) //Should fix cybros run time erroring when blown up. It got deleted before, along with the frame.
@@ -253,7 +253,7 @@

 /obj/item/borg/upgrade/vtec
 	name = "robotic VTEC Module"
-	desc = "Used to activate a cyborg's VTEC systems, increasing their speed."
+	desc = "Used to activate a cyborg's VTEC systems, allowing them to retain more speed when damaged. Alternatively speeds up slow vehicles."
 	icon_state = "cyborg_upgrade2"
 	require_module = TRUE
 	origin_tech = "engineering=4;materials=5;programming=4"
@@ -264,7 +264,7 @@
 		to_chat(usr, "<span class='notice'>There's no room for another VTEC unit!</span>")
 		return

-	R.speed -= 1 // Gotta go fast.
+	R.slowdown_cap = 3.5
 	return TRUE

 /***********************/
@@ -316,3 +316,8 @@
 /obj/item/melee/baton/cattleprod/baton_stun(mob/living/L, mob/user, skip_cooldown = FALSE, ignore_shield_check = FALSE)
 	if(sparkler.activate())
 		return ..()
+
+/obj/item/melee/baton/loaded/borg_stun_arm
+	name = "electrically-charged arm"
+	desc = "A piece of scrap metal wired directly to your power cell."
+	hitcost = 100