From 374b02dc9991bc33210f9f3f33effc55d66e67ea Mon Sep 17 00:00:00 2001
From: ThePooba <81843097+ThePooba@users.noreply.github.com>
Date: Fri, 20 Sep 2024 08:23:50 -0600
Subject: [PATCH] Warden time, secbot, and a heretic nerf (#3439)

* bla

* no id die

* blllplplplpllp

* Update warden.dm
---
 .../heretic/status_effects/mark_effects.dm          | 12 +++++++-----
 code/modules/mob/living/simple_animal/bot/secbot.dm | 13 +++++++++++++
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/code/modules/antagonists/heretic/status_effects/mark_effects.dm b/code/modules/antagonists/heretic/status_effects/mark_effects.dm
index 1771d7079e8d..b810dc8e7dd5 100644
--- a/code/modules/antagonists/heretic/status_effects/mark_effects.dm
+++ b/code/modules/antagonists/heretic/status_effects/mark_effects.dm
@@ -107,15 +107,16 @@
 			ORGAN_SLOT_HEART,
 		)
 
-		// Roughly 75% of their organs will take a bit of damage
+		// Roughly 25% of their organs will take a bit of damage
 		for(var/organ_slot in organs_to_damage)
-			if(prob(75))
+			if(prob(25)) //monkestation edit begin : Changes rust to not be busted as shit
 				carbon_owner.adjustOrganLoss(organ_slot, 20)
 
-		// And roughly 75% of their items will take a smack, too
+		// And roughly 50% of their items will take a smack, too
 		for(var/obj/item/thing in carbon_owner.get_all_gear())
-			if(!QDELETED(thing) && prob(75))
-				thing.take_damage(100)
+			if(!QDELETED(thing) && prob(50))
+				if(!istype(thing, /obj/item/card/id))
+					thing.take_damage(50) //monkestation edit end
 
 	return ..()
 
@@ -235,6 +236,7 @@
 	return ..()
 
 /datum/status_effect/eldritch/cosmic/on_effect()
+	owner.adjust_confusion(7 SECONDS) //monkestation edit
 	new teleport_effect(get_turf(owner))
 	new /obj/effect/forcefield/cosmic_field(get_turf(owner))
 	do_teleport(
diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm
index 0990edfcc8f9..6b51db93bdf6 100644
--- a/code/modules/mob/living/simple_animal/bot/secbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/secbot.dm
@@ -98,6 +98,19 @@
 	bot_mode_flags = BOT_MODE_ON
 	bot_cover_flags = BOT_COVER_LOCKED | BOT_COVER_EMAGGED
 
+//monkestation edit begin
+/mob/living/simple_animal/bot/secbot/beepsky/big
+	name = "Officer Bigsky"
+	desc = "It's Commander Beep O'sky's massive, just-as aggressive cousin, Bigsky."
+	health = 150
+	bot_mode_flags = BOT_MODE_ON | BOT_MODE_AUTOPATROL | BOT_MODE_REMOTE_ENABLED
+	commissioned = FALSE
+
+/mob/living/simple_animal/bot/secbot/beepsky/jr/Initialize(mapload)
+	. = ..()
+	update_transform(1.2)
+//monkestation edit end
+
 /mob/living/simple_animal/bot/secbot/beepsky/explode()
 	var/atom/Tsec = drop_location()
 	new /obj/item/stock_parts/cell/potato(Tsec)