From f7ea1f377d842352f19e06e00ac28bcf120f2cf7 Mon Sep 17 00:00:00 2001 From: SandPoot Date: Fri, 25 Feb 2022 17:09:31 -0300 Subject: [PATCH] oops, replace all is a hell of a drug --- code/datums/components/nanites.dm | 2 +- code/datums/diseases/advance/symptoms/deafness.dm | 2 +- code/datums/elements/earhealing.dm | 2 +- code/datums/status_effects/debuffs.dm | 4 ++-- code/game/objects/items/devices/scanners.dm | 2 +- .../antagonists/eldritch_cult/knowledge/rust_lore.dm | 2 +- code/modules/mob/living/carbon/carbon_defense.dm | 6 +++--- code/modules/mob/living/carbon/handle_corruption.dm | 2 +- code/modules/mob/living/carbon/human/species.dm | 2 +- code/modules/reagents/chemistry/reagents/other_reagents.dm | 2 +- code/modules/reagents/chemistry/reagents/toxin_reagents.dm | 2 +- code/modules/research/nanites/nanite_programs/protocols.dm | 2 +- code/modules/surgery/organs/ears.dm | 4 ++-- code/modules/surgery/organs/organ_internal.dm | 2 +- 14 files changed, 18 insertions(+), 18 deletions(-) diff --git a/code/datums/components/nanites.dm b/code/datums/components/nanites.dm index d16b5c692e..50ac5e5cc5 100644 --- a/code/datums/components/nanites.dm +++ b/code/datums/components/nanites.dm @@ -317,7 +317,7 @@ host_mob.Paralyze(120) if(iscarbon(host_mob)) var/mob/living/carbon/C = host_mob - var/obj/item/organ/ears/ears = C.getorganslot(ORGAN_ITEM_SLOT_EARS) + var/obj/item/organ/ears/ears = C.getorganslot(ORGAN_SLOT_EARS) if(ears) ears.adjustEarDamage(0, 30) //nanites coming out of your ears C.vomit(0, FALSE, TRUE, 2, FALSE, VOMIT_NANITE, FALSE, TRUE, 0) //nanites coming out of your mouth diff --git a/code/datums/diseases/advance/symptoms/deafness.dm b/code/datums/diseases/advance/symptoms/deafness.dm index b4ad65c86b..b6dd185b36 100644 --- a/code/datums/diseases/advance/symptoms/deafness.dm +++ b/code/datums/diseases/advance/symptoms/deafness.dm @@ -51,7 +51,7 @@ Bonus to_chat(M, "[pick("You hear a ringing in your ear.", "Your ears pop.")]") if(5) if(power > 2) - var/obj/item/organ/ears/ears = M.getorganslot(ORGAN_ITEM_SLOT_EARS) + var/obj/item/organ/ears/ears = M.getorganslot(ORGAN_SLOT_EARS) if(istype(ears) && ears.damage < ears.maxHealth) to_chat(M, "Your ears pop painfully and start bleeding!") ears.damage = max(ears.damage, ears.maxHealth) diff --git a/code/datums/elements/earhealing.dm b/code/datums/elements/earhealing.dm index 38afc5e307..2ceb261622 100644 --- a/code/datums/elements/earhealing.dm +++ b/code/datums/elements/earhealing.dm @@ -30,7 +30,7 @@ var/mob/living/carbon/user = user_by_item[i] if(HAS_TRAIT(user, TRAIT_DEAF)) continue - var/obj/item/organ/ears/ears = user.getorganslot(ORGAN_ITEM_SLOT_EARS) + var/obj/item/organ/ears/ears = user.getorganslot(ORGAN_SLOT_EARS) if(!ears) continue ears.deaf = max(ears.deaf - 0.25, (ears.damage < ears.maxHealth ? 0 : 1)) // Do not clear deafness if our ears are too damaged diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index e45f9cf3a9..dbec6c6ee2 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -578,7 +578,7 @@ if(60 to 69) H.adjustOrganLoss(ORGAN_SLOT_EYES,10) if(70 to 79) - H.adjustOrganLoss(ORGAN_ITEM_SLOT_EARS,10) + H.adjustOrganLoss(ORGAN_SLOT_EARS,10) if(80 to 89) H.adjustOrganLoss(ORGAN_SLOT_LUNGS,10) if(90 to 99) @@ -610,7 +610,7 @@ if(60 to 69) H.adjustOrganLoss(ORGAN_SLOT_EYES,5) if(70 to 79) - H.adjustOrganLoss(ORGAN_ITEM_SLOT_EARS,5) + H.adjustOrganLoss(ORGAN_SLOT_EARS,5) if(80 to 89) H.adjustOrganLoss(ORGAN_SLOT_LUNGS,5) if(90 to 99) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index c224f98fe7..0ca2e40b45 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -333,7 +333,7 @@ GENETICS SCANNER var/has_stomach = C.dna && !(NOSTOMACH in C.dna.species.species_traits) if(!M.getorganslot(ORGAN_SLOT_EYES)) msg += "\tSubject does not have eyes.\n" - if(!M.getorganslot(ORGAN_ITEM_SLOT_EARS)) + if(!M.getorganslot(ORGAN_SLOT_EARS)) msg += "\tSubject does not have ears.\n" if(!M.getorganslot(ORGAN_SLOT_BRAIN)) msg += "\tSubject's brain function is non-existent!\n" diff --git a/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm b/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm index 0eb52746fa..733b2725cb 100644 --- a/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm +++ b/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm @@ -39,7 +39,7 @@ var/datum/status_effect/eldritch/E = H.has_status_effect(/datum/status_effect/eldritch/rust) || H.has_status_effect(/datum/status_effect/eldritch/ash) || H.has_status_effect(/datum/status_effect/eldritch/flesh) || H.has_status_effect(/datum/status_effect/eldritch/void) if(E) E.on_effect() - H.adjustOrganLoss(pick(ORGAN_SLOT_BRAIN,ORGAN_ITEM_SLOT_EARS,ORGAN_SLOT_EYES,ORGAN_SLOT_LIVER,ORGAN_SLOT_LUNGS,ORGAN_SLOT_STOMACH,ORGAN_SLOT_HEART),25) + H.adjustOrganLoss(pick(ORGAN_SLOT_BRAIN,ORGAN_SLOT_EARS,ORGAN_SLOT_EYES,ORGAN_SLOT_LIVER,ORGAN_SLOT_LUNGS,ORGAN_SLOT_STOMACH,ORGAN_SLOT_HEART),25) /datum/eldritch_knowledge/spell/area_conversion name = "Aggressive Spread" diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index 8f954c0239..a12d6614fa 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -24,7 +24,7 @@ /mob/living/carbon/get_ear_protection() var/number = ..() - var/obj/item/organ/ears/E = getorganslot(ORGAN_ITEM_SLOT_EARS) + var/obj/item/organ/ears/E = getorganslot(ORGAN_SLOT_EARS) if(!E) number = INFINITY else @@ -417,7 +417,7 @@ SEND_SIGNAL(src, COMSIG_CARBON_SOUNDBANG, reflist) intensity = reflist[1] var/ear_safety = get_ear_protection() - var/obj/item/organ/ears/ears = getorganslot(ORGAN_ITEM_SLOT_EARS) + var/obj/item/organ/ears/ears = getorganslot(ORGAN_SLOT_EARS) var/effect_amount = intensity - ear_safety if(effect_amount > 0) if(stun_pwr) @@ -457,7 +457,7 @@ /mob/living/carbon/can_hear() . = FALSE - var/obj/item/organ/ears/ears = getorganslot(ORGAN_ITEM_SLOT_EARS) + var/obj/item/organ/ears/ears = getorganslot(ORGAN_SLOT_EARS) if(istype(ears) && !ears.deaf) . = TRUE diff --git a/code/modules/mob/living/carbon/handle_corruption.dm b/code/modules/mob/living/carbon/handle_corruption.dm index 06256f6f8e..b56752453b 100644 --- a/code/modules/mob/living/carbon/handle_corruption.dm +++ b/code/modules/mob/living/carbon/handle_corruption.dm @@ -102,7 +102,7 @@ if("jamcoolanthud") hud_used.coolant_display.jam(10) if("receporgandamage") - adjustOrganLoss(ORGAN_ITEM_SLOT_EARS, rand(10, 20)) + adjustOrganLoss(ORGAN_SLOT_EARS, rand(10, 20)) adjustOrganLoss(ORGAN_SLOT_EYES, rand(10, 20)) to_chat(src, "Power spike detected in auditory and visual systems!") if("longlimbdisable") diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 847664d957..ee98288c5d 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -337,7 +337,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) var/obj/item/organ/lungs/lungs = C.getorganslot(ORGAN_SLOT_LUNGS) var/obj/item/organ/appendix/appendix = C.getorganslot(ORGAN_SLOT_APPENDIX) var/obj/item/organ/eyes/eyes = C.getorganslot(ORGAN_SLOT_EYES) - var/obj/item/organ/ears/ears = C.getorganslot(ORGAN_ITEM_SLOT_EARS) + var/obj/item/organ/ears/ears = C.getorganslot(ORGAN_SLOT_EARS) var/obj/item/organ/tongue/tongue = C.getorganslot(ORGAN_SLOT_TONGUE) var/obj/item/organ/liver/liver = C.getorganslot(ORGAN_SLOT_LIVER) var/obj/item/organ/stomach/stomach = C.getorganslot(ORGAN_SLOT_STOMACH) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 5521bf80f4..ec628255fa 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -2670,7 +2670,7 @@ M.adjustOrganLoss(ORGAN_SLOT_LUNGS, -100) M.adjustOrganLoss(ORGAN_SLOT_HEART, -100) M.adjustOrganLoss(ORGAN_SLOT_LIVER, -100) - M.adjustOrganLoss(ORGAN_ITEM_SLOT_EARS, -100) + M.adjustOrganLoss(ORGAN_SLOT_EARS, -100) M.adjustOrganLoss(ORGAN_SLOT_STOMACH, -100) M.adjustOrganLoss(ORGAN_SLOT_TONGUE, -100) M.adjustOrganLoss(ORGAN_SLOT_EYES, -100) diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index a70c17ec25..af670c00dc 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -1073,7 +1073,7 @@ taste_description = "sugary sweetness" /datum/reagent/toxin/leadacetate/on_mob_life(mob/living/carbon/M) - M.adjustOrganLoss(ORGAN_ITEM_SLOT_EARS,1) + M.adjustOrganLoss(ORGAN_SLOT_EARS,1) M.adjustOrganLoss(ORGAN_SLOT_BRAIN,1) if(prob(1)) to_chat(M, "Ah, what was that? You thought you heard something...") diff --git a/code/modules/research/nanites/nanite_programs/protocols.dm b/code/modules/research/nanites/nanite_programs/protocols.dm index 56f083d31f..3716bc61ac 100644 --- a/code/modules/research/nanites/nanite_programs/protocols.dm +++ b/code/modules/research/nanites/nanite_programs/protocols.dm @@ -244,7 +244,7 @@ if(eyes) eyes.applyOrganDamage(0.75) if(prob(13)) - var/obj/item/organ/ears/ears = C.getorganslot(ORGAN_ITEM_SLOT_EARS) + var/obj/item/organ/ears/ears = C.getorganslot(ORGAN_SLOT_EARS) if(ears) ears.applyOrganDamage(0.75) current_stage++ diff --git a/code/modules/surgery/organs/ears.dm b/code/modules/surgery/organs/ears.dm index 71fa88233a..80b7599ec3 100644 --- a/code/modules/surgery/organs/ears.dm +++ b/code/modules/surgery/organs/ears.dm @@ -3,7 +3,7 @@ icon_state = "ears" desc = "There are three parts to the ear. Inner, middle and outer. Only one of these parts should be normally visible." zone = BODY_ZONE_HEAD - slot = ORGAN_ITEM_SLOT_EARS + slot = ORGAN_SLOT_EARS gender = PLURAL healing_factor = STANDARD_ORGAN_HEALING @@ -138,7 +138,7 @@ icon_state = "ears-c" desc = "A pair of microphones intended to be installed in an IPC head, that grant the ability to hear." zone = BODY_ZONE_HEAD - slot = ORGAN_ITEM_SLOT_EARS + slot = ORGAN_SLOT_EARS gender = PLURAL organ_flags = ORGAN_SYNTHETIC diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm index 60628e6db0..a3c6ea06c8 100644 --- a/code/modules/surgery/organs/organ_internal.dm +++ b/code/modules/surgery/organs/organ_internal.dm @@ -333,7 +333,7 @@ if(only_one) return TRUE - if(!getorganslot(ORGAN_ITEM_SLOT_EARS)) + if(!getorganslot(ORGAN_SLOT_EARS)) var/obj/item/organ/ears/ears if(dna && dna.species && dna.species.mutantears) ears = new dna.species.mutantears