shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

oops, replace all is a hell of a drug

Browse Source
This commit is contained in:
SandPoot
2022-02-25 17:09:31 -03:00
parent de96a68bf5
commit f7ea1f377d
14 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/nanites.dm
+1 -1
View File
@@ -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
code/datums/diseases/advance/symptoms/deafness.dm
+1 -1
View File
@@ -51,7 +51,7 @@ Bonus
to_chat(M, "<span class='warning'>[pick("You hear a ringing in your ear.", "Your ears pop.")]</span>")
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, "<span class='userdanger'>Your ears pop painfully and start bleeding!</span>")
ears.damage = max(ears.damage, ears.maxHealth)
code/datums/elements/earhealing.dm
+1 -1
View File
@@ -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
code/datums/status_effects/debuffs.dm
+2 -2
View File
@@ -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)
code/game/objects/items/devices/scanners.dm
+1 -1
View File
@@ -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 += "\t<span class='alert'><b>Subject does not have eyes.</b></span>\n"
if(!M.getorganslot(ORGAN_ITEM_SLOT_EARS))
if(!M.getorganslot(ORGAN_SLOT_EARS))
msg += "\t<span class='alert'><b>Subject does not have ears.</b></span>\n"
if(!M.getorganslot(ORGAN_SLOT_BRAIN))
msg += "\t<span class='alert'><b>Subject's brain function is non-existent!</b></span>\n"
code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm
+1 -1
View File
@@ -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"
code/modules/mob/living/carbon/carbon_defense.dm
+3 -3
View File
@@ -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
code/modules/mob/living/carbon/handle_corruption.dm
+1 -1
View File
@@ -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, "<span class='warning'>Power spike detected in auditory and visual systems!</span>")
if("longlimbdisable")
code/modules/mob/living/carbon/human/species.dm
+1 -1
View File
@@ -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)
code/modules/reagents/chemistry/reagents/other_reagents.dm
+1 -1
View File
@@ -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)
code/modules/reagents/chemistry/reagents/toxin_reagents.dm
+1 -1
View File
@@ -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, "<span class='notice'>Ah, what was that? You thought you heard something...</span>")
code/modules/research/nanites/nanite_programs/protocols.dm
+1 -1
View File
@@ -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++
code/modules/surgery/organs/ears.dm
+2 -2
View File
@@ -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
code/modules/surgery/organs/organ_internal.dm
+1 -1
View File
@@ -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