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.

Sign up for GitHub

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

fixes some medical stack items #313

Merged
merged 3 commits into from
Jan 1, 2025
Merged

fixes some medical stack items #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d048ed
well that was easy
Paxilmaniac Jan 1, 2025
c76e5a1
important commit
Paxilmaniac Jan 1, 2025
3a74084
thanks monkestation
Paxilmaniac Jan 1, 2025
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
6 changes: 3 additions & 3 deletions modular_doppler/deforest_medical_items/code/healing_stack_items.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
var/treatment_sound = 'sound/items/duct_tape/duct_tape_rip.ogg'

// This is only relevant for the types of wounds defined, we can't work if there are none
/obj/item/stack/medical/wound_recovery/try_heal/try_heal(mob/living/patient, mob/living/user, healed_zone, silent = FALSE, auto_change_zone = TRUE)
/obj/item/stack/medical/wound_recovery/try_heal(mob/living/patient, mob/living/user, healed_zone, silent = FALSE, auto_change_zone = TRUE)
if(patient.has_status_effect(/datum/status_effect/vulnerable_to_damage))
patient.balloon_alert(user, "still recovering from last use!")
return
Expand Down Expand Up @@ -84,8 +84,8 @@
use(1)

/datum/mood_event/rapid_wound_healing
description = "The wound is gone, but that pain was unbearable!\n"
mood_change = -3
description = "Ah, so this is what hellfire feels like. At least my wounds are healed..."
mood_change = -5
timeout = 5 MINUTES

// Helps recover bleeding
Expand Down
8 changes: 8 additions & 0 deletions modular_doppler/deforest_medical_items/code/storage_items.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,14 @@
)
generate_items_inside(items_inside, src)

/obj/item/storage/medkit/civil_defense/the_big_cheese

/obj/item/storage/medkit/civil_defense/the_big_cheese/PopulateContents()
var/static/items_inside = list(
/obj/item/food/cheese/firm_cheese_slice = 4,
)
generate_items_inside(items_inside, src)

/obj/item/storage/medkit/civil_defense/thunderdome
/// List of random medpens we can pick from
var/list/random_medpen_options = list(
Expand Down
2 changes: 1 addition & 1 deletion modular_doppler/deforest_medical_items/code/vulnerable_status_effect.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
var/bleed_modifier_addition = 1

/datum/status_effect/vulnerable_to_damage/on_apply()
to_chat(owner, span_userdanger("Your body suddenly feals weak and fragile!"))
to_chat(owner, span_userdanger("Your body suddenly feels weak and fragile!"))
var/mob/living/carbon/human/carbon_owner = owner
carbon_owner.physiology.damage_resistance -= damage_resistance_subtraction
carbon_owner.physiology.bleed_mod += bleed_modifier_addition
Expand Down
1 change: 1 addition & 0 deletions modular_doppler/epic_loot/code/random_spawners_real.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@
loot = list(
/obj/item/storage/medkit/civil_defense/stocked = 2,
/obj/item/storage/medkit/civil_defense/comfort/stocked = 2,
/obj/item/storage/medkit/civil_defense/the_big_cheese = 1,
/obj/item/storage/medkit/frontier/stocked = 2,
/obj/item/storage/medkit/combat_surgeon/stocked = 2,
/obj/item/storage/medkit/robotic_repair/stocked = 2,
Expand Down
Loading