The Defib Nerf (Defibs are no longer a 10 second paralyze) (#47675)

* hardstuns? nostuns*

* WELCOME TO THE HAPPY HOTEL

* YOU'RE GOING TO LOVE IT HERE

* whoops i accidentally a status effect and a new item

* skog alert

* Update code/game/objects/items/defib.dm

Co-Authored-By: skoglol <33292112+kriskog@users.noreply.github.com>

* Update code/game/objects/items/defib.dm

Co-Authored-By: skoglol <33292112+kriskog@users.noreply.github.com>

code/__DEFINES/status_effects.dm

@@ -74,6 +74,8 @@
 
 #define STATUS_EFFECT_NECKSLICE /datum/status_effect/neck_slice //Creates the flavor messages for the neck-slice
 
+#define STATUS_EFFECT_CONVULSING /datum/status_effect/convulsing
+
 #define STATUS_EFFECT_NECROPOLIS_CURSE /datum/status_effect/necropolis_curse
 #define STATUS_EFFECT_HIVEMIND_CURSE /datum/status_effect/necropolis_curse/hivemind
 #define CURSE_BLINDING	1 //makes the edges of the target's screen obscured

code/datums/status_effects/debuffs.dm

@@ -523,6 +523,29 @@
 					owner.log_message("threw [I] due to a Muscle Spasm", LOG_ATTACK)
 					owner.throw_item(pick(targets))
 
+/datum/status_effect/convulsing
+	id = "convulsing"
+	duration = 	150
+	status_type = STATUS_EFFECT_REFRESH
+	alert_type = /obj/screen/alert/status_effect/convulsing
+
+/datum/status_effect/convulsing/on_creation(mob/living/zappy_boy)
+	. = ..()
+	to_chat(zappy_boy, "<span class='boldwarning'>You feel a shock moving through your body! Your hands start shaking!</span>")
+
+/datum/status_effect/convulsing/tick()
+	var/mob/living/carbon/H = owner
+	if(prob(40))
+		var/obj/item/I = H.get_active_held_item()
+		if(I && H.dropItemToGround(I))
+			H.visible_message("<span class='notice'>[H]'s hand convulses, and they drop their [I.name]!</span>","<span class='userdanger'>Your hand convulses violently, and you drop what you were holding!</span>")
+			H.jitteriness += 5
+
+/obj/screen/alert/status_effect/convulsing
+	name = "Shaky Hands"
+	desc = "You've been zapped with something and your hands can't stop shaking! You can't seem to hold on to anything."
+	icon_state = "convulsing"
+
 /datum/status_effect/dna_melt
 	id = "dna_melt"
 	duration = 600

code/game/objects/items/defib.dm

@@ -281,6 +281,13 @@
 		update_icon()
 		return
 
+/obj/item/defibrillator/compact/combat/loaded/nanotrasen
+	name = "elite nanotrasen defibrillator"
+	desc = "A belt-equipped state-of-the-art defibrillator. Can revive through spacesuits, has an experimental self-recharging battery, and can be utilized in combat via applying the paddles in a disarming or agressive manner."
+	icon_state = "defibnt" //needs defib inhand sprites
+	item_state = "defibnt"
+	paddle_type = /obj/item/twohanded/shockpaddles/syndicate/nanotrasen
+
 //paddles
 
 /obj/item/twohanded/shockpaddles
@@ -483,12 +490,14 @@
 	busy = TRUE
 	M.visible_message("<span class='danger'>[user] has touched [M] with [src]!</span>", \
 			"<span class='userdanger'>[user] has touched [M] with [src]!</span>")
-	M.adjustStaminaLoss(50)
-	M.Paralyze(100)
-	M.updatehealth() //forces health update before next life tick //isn't this done by adjustStaminaLoss anyway?
+	M.adjustStaminaLoss(60)
+	M.Knockdown(75)
+	M.Jitter(50)
+	M.apply_status_effect(STATUS_EFFECT_CONVULSING)
 	playsound(src,  'sound/machines/defib_zap.ogg', 50, TRUE, -1)
-	M.emote("gasp")
-	log_combat(user, M, "stunned", src)
+	if(HAS_TRAIT(M,MOB_ORGANIC))
+		M.emote("gasp")
+	log_combat(user, M, "zapped", src)
 	if(req_defib)
 		defib.deductcharge(revivecost)
 		cooldown = TRUE
@@ -508,7 +517,7 @@
 		"<span class='warning'>You overcharge the paddles and begin to place them onto [H]'s chest...</span>")
 	busy = TRUE
 	update_icon()
-	if(do_after(user, 30, target = H))
+	if(do_after(user, 15, target = H))
 		user.visible_message("<span class='notice'>[user] places [src] on [H]'s chest.</span>",
 			"<span class='warning'>You place [src] on [H]'s chest and begin to charge them.</span>")
 		var/turf/T = get_turf(defib)
@@ -517,7 +526,7 @@
 			T.audible_message("<span class='warning'>\The [defib] lets out an urgent beep and lets out a steadily rising hum...</span>")
 		else
 			user.audible_message("<span class='warning'>[src] let out an urgent beep.</span>")
-		if(do_after(user, 30, target = H)) //Takes longer due to overcharging
+		if(do_after(user, 15, target = H)) //Takes longer due to overcharging
 			if(!H)
 				busy = FALSE
 				update_icon()
@@ -678,13 +687,20 @@
 
 /obj/item/twohanded/shockpaddles/syndicate
 	name = "syndicate defibrillator paddles"
-	desc = "A pair of paddles used to revive deceased operatives. It possesses both the ability to penetrate armor and to deliver powerful or disabling shocks offensively."
+	desc = "A pair of paddles used to revive deceased operatives. They possess both the ability to penetrate armor and to deliver powerful or disabling shocks offensively."
 	combat = TRUE
 	icon = 'icons/obj/defib.dmi'
 	icon_state = "syndiepaddles0"
 	item_state = "syndiepaddles0"
 	base_icon_state = "syndiepaddles"
 
+/obj/item/twohanded/shockpaddles/syndicate/nanotrasen
+	name = "elite nanotrasen defibrillator paddles"
+	desc = "A pair of paddles used to revive deceased ERT members. They possess both the ability to penetrate armor and to deliver powerful or disabling shocks offensively."
+	icon_state = "ntpaddles0"
+	item_state = "ntpaddles0"
+	base_icon_state = "ntpaddles"
+
 /obj/item/twohanded/shockpaddles/syndicate/cyborg
 	req_defib = FALSE
 

code/game/objects/structures/crates_lockers/closets/secure/misc.dm

@@ -46,7 +46,7 @@
 	new /obj/item/storage/firstaid/fire(src)
 	new /obj/item/storage/firstaid/brute(src)
 	new /obj/item/storage/firstaid/regular(src)
-	new /obj/item/defibrillator/compact/combat/loaded(src)
+	new /obj/item/defibrillator/compact/combat/loaded/nanotrasen(src)
 	new /mob/living/simple_animal/bot/medbot(src)
 
 /obj/structure/closet/secure_closet/ertEngi

code/modules/mob/status_procs.dm

@@ -3,8 +3,6 @@
 //The effects include: stun, knockdown, unconscious, sleeping, resting, jitteriness, dizziness, ear damage,
 // eye damage, eye_blind, eye_blurry, druggy, TRAIT_BLIND trait, and TRAIT_NEARSIGHT trait.
 
-
-
 ///Set the jitter of a mob
 /mob/proc/Jitter(amount)
 	jitteriness = max(jitteriness,amount,0)