Skip to content

Commit

Permalink
bla
Browse files Browse the repository at this point in the history
  • Loading branch information
ThePooba committed Sep 16, 2024
1 parent 0d32e10 commit 8ddce65
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 7 deletions.
11 changes: 6 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,15 @@
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))
thing.take_damage(50) //monkestation edit end

return ..()

Expand Down Expand Up @@ -235,6 +235,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
5 changes: 3 additions & 2 deletions code/modules/jobs/job_types/warden.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@
spawn_positions = 1
supervisors = SUPERVISOR_HOS
minimal_player_age = 7
exp_requirements = 300
exp_requirements = 600 //monkestation edit changed warden to require 10 hours as sec instead of 5 hours as crew
exp_required_type = EXP_TYPE_CREW
exp_required_type_department = EXP_TYPE_SECURITY
exp_granted_type = EXP_TYPE_CREW
config_tag = "WARDEN"

Expand Down Expand Up @@ -49,9 +50,9 @@
id_trim = /datum/id_trim/job/warden
uniform = /obj/item/clothing/under/rank/security/warden
suit = /obj/item/clothing/suit/armor/vest/warden/alt
suit_store = /obj/item/gun/energy/disabler
backpack_contents = list(
/obj/item/evidencebag = 1,
/obj/item/gun/energy/disabler = 1, //monkestation edit: moved disabler to bag
)
belt = /obj/item/modular_computer/pda/warden
ears = /obj/item/radio/headset/headset_sec/alt
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.4)
//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

0 comments on commit 8ddce65

Please sign in to comment.