Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Warden time, secbot, and a heretic nerf #3439

Merged
merged 4 commits into from
Sep 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions code/modules/antagonists/heretic/status_effects/mark_effects.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

20 organ damage is really low, I dont think this is needed


// 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 ..()

Expand Down Expand Up @@ -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(
Expand Down
13 changes: 13 additions & 0 deletions code/modules/mob/living/simple_animal/bot/secbot.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading