From c147dcfe0e7822472a1a27dcd44a2c5f6a85d506 Mon Sep 17 00:00:00 2001 From: fallcon Date: Tue, 16 Apr 2024 11:55:29 -0500 Subject: [PATCH] singular not plurar --- code/__DEFINES/is_helpers.dm | 2 +- code/__DEFINES/mobs.dm | 22 +++--- code/datums/blood_type.dm | 4 +- code/datums/components/mood.dm | 16 ++--- code/game/machinery/limbgrower.dm | 2 +- code/game/machinery/scan_gate.dm | 8 +-- .../objects/items/grenades/discogrenade.dm | 2 +- code/modules/admin/topic.dm | 2 +- code/modules/autowiki/pages/ships.dm | 2 +- code/modules/client/preferences.dm | 4 +- code/modules/mob/living/carbon/human/human.dm | 2 +- .../mob/living/carbon/human/species.dm | 6 +- .../living/carbon/human/species_types/IPC.dm | 6 +- .../carbon/human/species_types/ethereal.dm | 68 +++++++++---------- .../human/species_types/shadowpeople.dm | 2 +- .../hostile/mining_mobs/hivelord.dm | 2 +- .../living/simple_animal/hostile/survivors.dm | 2 +- code/modules/power/apc.dm | 8 +-- code/modules/power/cell.dm | 10 +-- code/modules/power/lighting.dm | 6 +- .../chemistry/reagents/food_reagents.dm | 4 +- code/modules/religion/religion_sects.dm | 2 +- .../research/designs/limbgrower_designs.dm | 12 ++-- .../nanites/nanite_programs/sensor.dm | 2 +- .../species_parts/ethereal_bodyparts.dm | 12 ++-- code/modules/surgery/organs/stomach.dm | 10 +-- 26 files changed, 109 insertions(+), 109 deletions(-) diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index 48feac3e6928..31df9e34444c 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -73,7 +73,7 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list( #define isskeleton(A) (is_species(A, /datum/species/skeleton)) #define ismoth(A) (is_species(A, /datum/species/moth)) #define ishumanbasic(A) (is_species(A, /datum/species/human) && !is_species(A, /datum/species/human/krokodil_addict)) -#define iselzuosa(A) (is_species(A, /datum/species/elzuosa)) +#define iselzuose(A) (is_species(A, /datum/species/elzuose)) #define isvampire(A) (is_species(A,/datum/species/vampire)) #define isdullahan(A) (is_species(A, /datum/species/dullahan)) #define iskepori(A) (is_species(A, /datum/species/kepori)) diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index 4f8df3944b63..c1e3973fe726 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -76,7 +76,7 @@ #define SPECIES_ANDROID "android" #define SPECIES_CORPORATE "corporate" #define SPECIES_DULLAHAN "dullahan" -#define SPECIES_ELZUOSA "elzuosa" +#define SPECIES_ELZUOSE "elzuose" #define SPECIES_FLYPERSON "fly" #define SPECIES_HUMAN "human" #define SPECIES_IPC "ipc" @@ -117,7 +117,7 @@ //Species bitflags for sprite sheets. If this somehow ever gets above 23 we have larger problems. #define FLAG_HUMAN (1<<0) #define FLAG_IPC (1<<1) -#define FLAG_ELZUOSA (1<<2) +#define FLAG_ELZUOSE (1<<2) #define FLAG_PLASMAMAN (1<<3) #define FLAG_MOTH (1<<4) #define FLAG_LIZARD (1<<5) @@ -244,14 +244,14 @@ //Charge levels for Ethereals //WS Begin -- Ethereal Charge Scaling -#define ELZUOSA_CHARGE_SCALING_MULTIPLIER 20 -#define ELZUOSA_CHARGE_NONE (0 * ELZUOSA_CHARGE_SCALING_MULTIPLIER) -#define ELZUOSA_CHARGE_LOWPOWER (20 * ELZUOSA_CHARGE_SCALING_MULTIPLIER) -#define ELZUOSA_CHARGE_NORMAL (50 * ELZUOSA_CHARGE_SCALING_MULTIPLIER) -#define ELZUOSA_CHARGE_ALMOSTFULL (75 * ELZUOSA_CHARGE_SCALING_MULTIPLIER) -#define ELZUOSA_CHARGE_FULL (100 * ELZUOSA_CHARGE_SCALING_MULTIPLIER) -#define ELZUOSA_CHARGE_OVERLOAD (125 * ELZUOSA_CHARGE_SCALING_MULTIPLIER) -#define ELZUOSA_CHARGE_DANGEROUS (150 * ELZUOSA_CHARGE_SCALING_MULTIPLIER) +#define ELZUOSE_CHARGE_SCALING_MULTIPLIER 20 +#define ELZUOSE_CHARGE_NONE (0 * ELZUOSE_CHARGE_SCALING_MULTIPLIER) +#define ELZUOSE_CHARGE_LOWPOWER (20 * ELZUOSE_CHARGE_SCALING_MULTIPLIER) +#define ELZUOSE_CHARGE_NORMAL (50 * ELZUOSE_CHARGE_SCALING_MULTIPLIER) +#define ELZUOSE_CHARGE_ALMOSTFULL (75 * ELZUOSE_CHARGE_SCALING_MULTIPLIER) +#define ELZUOSE_CHARGE_FULL (100 * ELZUOSE_CHARGE_SCALING_MULTIPLIER) +#define ELZUOSE_CHARGE_OVERLOAD (125 * ELZUOSE_CHARGE_SCALING_MULTIPLIER) +#define ELZUOSE_CHARGE_DANGEROUS (150 * ELZUOSE_CHARGE_SCALING_MULTIPLIER) //WS End //Slime evolution threshold. Controls how fast slimes can split/grow @@ -345,7 +345,7 @@ #define DOOR_CRUSH_DAMAGE 15 //the amount of damage that airlocks deal when they crush you #define HUNGER_FACTOR 0.1 //factor at which mob nutrition decreases -#define ELZUOSA_CHARGE_FACTOR (0.05 * ELZUOSA_CHARGE_SCALING_MULTIPLIER) //factor at which ethereal's charge decreases +#define ELZUOSE_CHARGE_FACTOR (0.05 * ELZUOSE_CHARGE_SCALING_MULTIPLIER) //factor at which ethereal's charge decreases #define REAGENTS_METABOLISM 0.4 //How many units of reagent are consumed per tick, by default. #define REAGENTS_EFFECT_MULTIPLIER (REAGENTS_METABOLISM / 0.4) // By defining the effect multiplier this way, it'll exactly adjust all effects according to how they originally were with the 0.4 metabolism diff --git a/code/datums/blood_type.dm b/code/datums/blood_type.dm index 3fb4e4198566..847a7d0b55db 100644 --- a/code/datums/blood_type.dm +++ b/code/datums/blood_type.dm @@ -52,10 +52,10 @@ color = "#009696" compatible_types = list(/datum/blood_type/lizard) -/datum/blood_type/elzuosa +/datum/blood_type/elzuose name = "E" color = "#7fff7f" - compatible_types = list(/datum/blood_type/elzuosa) + compatible_types = list(/datum/blood_type/elzuose) /datum/blood_type/synthetic //Blood for synthetic/robotic species name = "Coolant" diff --git a/code/datums/components/mood.dm b/code/datums/components/mood.dm index fbe342ca707a..3434c741dba8 100644 --- a/code/datums/components/mood.dm +++ b/code/datums/components/mood.dm @@ -321,7 +321,7 @@ /datum/component/mood/proc/HandleNutrition() var/mob/living/L = parent - if(iselzuosa(L)) + if(iselzuose(L)) HandleCharge(L) if(HAS_TRAIT(L, TRAIT_NOHUNGER)) return FALSE //no mood events for nutrition @@ -338,19 +338,19 @@ add_event(null, "nutrition", /datum/mood_event/starving) /datum/component/mood/proc/HandleCharge(mob/living/carbon/human/H) - var/datum/species/elzuosa/E = H.dna.species + var/datum/species/elzuose/E = H.dna.species switch(E.get_charge(H)) - if(ELZUOSA_CHARGE_NONE to ELZUOSA_CHARGE_LOWPOWER) + if(ELZUOSE_CHARGE_NONE to ELZUOSE_CHARGE_LOWPOWER) add_event(null, "charge", /datum/mood_event/decharged) - if(ELZUOSA_CHARGE_LOWPOWER to ELZUOSA_CHARGE_NORMAL) + if(ELZUOSE_CHARGE_LOWPOWER to ELZUOSE_CHARGE_NORMAL) add_event(null, "charge", /datum/mood_event/lowpower) - if(ELZUOSA_CHARGE_NORMAL to ELZUOSA_CHARGE_ALMOSTFULL) + if(ELZUOSE_CHARGE_NORMAL to ELZUOSE_CHARGE_ALMOSTFULL) clear_event(null, "charge") - if(ELZUOSA_CHARGE_ALMOSTFULL to ELZUOSA_CHARGE_FULL) + if(ELZUOSE_CHARGE_ALMOSTFULL to ELZUOSE_CHARGE_FULL) add_event(null, "charge", /datum/mood_event/charged) - if(ELZUOSA_CHARGE_FULL to ELZUOSA_CHARGE_OVERLOAD) + if(ELZUOSE_CHARGE_FULL to ELZUOSE_CHARGE_OVERLOAD) add_event(null, "charge", /datum/mood_event/overcharged) - if(ELZUOSA_CHARGE_OVERLOAD to ELZUOSA_CHARGE_DANGEROUS) + if(ELZUOSE_CHARGE_OVERLOAD to ELZUOSE_CHARGE_DANGEROUS) add_event(null, "charge", /datum/mood_event/supercharged) /datum/component/mood/proc/check_area_mood(datum/source, area/A) diff --git a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm index 26d4f5a4eb5d..40f405ad4a16 100644 --- a/code/game/machinery/limbgrower.dm +++ b/code/game/machinery/limbgrower.dm @@ -24,7 +24,7 @@ /// Our internal techweb for limbgrower designs. var/datum/techweb/stored_research /// All the categories of organs we can print. - var/list/categories = list(SPECIES_HUMAN,SPECIES_SARATHI,SPECIES_MOTH,SPECIES_PLASMAMAN,SPECIES_ELZUOSA,SPECIES_RACHNID,SPECIES_KEPORI,SPECIES_VOX,"other") + var/list/categories = list(SPECIES_HUMAN,SPECIES_SARATHI,SPECIES_MOTH,SPECIES_PLASMAMAN,SPECIES_ELZUOSE,SPECIES_RACHNID,SPECIES_KEPORI,SPECIES_VOX,"other") //yogs grower a little different because we're going to allow meats to be converted to synthflesh because hugbox var/list/accepted_biomass = list( /obj/item/reagent_containers/food/snacks/meat/slab/monkey = 25, diff --git a/code/game/machinery/scan_gate.dm b/code/game/machinery/scan_gate.dm index 9ef1c93e4db5..1ffb03200183 100644 --- a/code/game/machinery/scan_gate.dm +++ b/code/game/machinery/scan_gate.dm @@ -18,7 +18,7 @@ #define SCANGATE_SPIDER "rachnid" #define SCANGATE_IPC "ipc" #define SCANGATE_SQUID "squid" -#define SCANGATE_ELZUOSA "elzuosa" +#define SCANGATE_ELZUOSE "elzuose" #define SCANGATE_KEPORI "kepori" /obj/machinery/scanner_gate @@ -147,8 +147,8 @@ scan_species = /datum/species/spider if(SCANGATE_IPC) scan_species = /datum/species/ipc - if(SCANGATE_ELZUOSA) - scan_species = /datum/species/elzuosa + if(SCANGATE_ELZUOSE) + scan_species = /datum/species/elzuose if(SCANGATE_KEPORI) scan_species = /datum/species/kepori if(is_species(H, scan_species)) @@ -248,5 +248,5 @@ #undef SCANGATE_SPIDER #undef SCANGATE_IPC #undef SCANGATE_SQUID -#undef SCANGATE_ELZUOSA +#undef SCANGATE_ELZUOSE #undef SCANGATE_KEPORI diff --git a/code/game/objects/items/grenades/discogrenade.dm b/code/game/objects/items/grenades/discogrenade.dm index 4a91f76240d5..84ce765d59d3 100644 --- a/code/game/objects/items/grenades/discogrenade.dm +++ b/code/game/objects/items/grenades/discogrenade.dm @@ -91,7 +91,7 @@ return if(target.stat != CONSCIOUS) //Only conscious people can dance return - if(!target || iselzuosa(target)) //Non humans and non etherals can't dance + if(!target || iselzuose(target)) //Non humans and non etherals can't dance return var/distance = max(0,get_dist(get_turf(src), target_turf)) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 03fe7cc33b06..0cf6b9490b31 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1239,7 +1239,7 @@ cookiealt = /obj/item/reagent_containers/food/condiment/milk else if(isplasmaman(H)) cookiealt = /obj/item/reagent_containers/food/condiment/milk - else if(iselzuosa(H)) + else if(iselzuose(H)) cookiealt = /obj/item/reagent_containers/food/snacks/energybar // WS - More fun with cookies - Start else if(islizard(H)) diff --git a/code/modules/autowiki/pages/ships.dm b/code/modules/autowiki/pages/ships.dm index 2f7fb437b185..c59a321942b6 100644 --- a/code/modules/autowiki/pages/ships.dm +++ b/code/modules/autowiki/pages/ships.dm @@ -75,7 +75,7 @@ /datum/autowiki/ship/proc/get_dummy_image(datum/job/to_equip) //Controlled randomisation - wiki_dummy.seeded_randomization("[to_equip.outfit]", list(/datum/species/elzuosa, /datum/species/human, /datum/species/ipc, /datum/species/lizard, /datum/species/moth, /datum/species/spider)) + wiki_dummy.seeded_randomization("[to_equip.outfit]", list(/datum/species/elzuose, /datum/species/human, /datum/species/ipc, /datum/species/lizard, /datum/species/moth, /datum/species/spider)) //Delete all the old stuff they had wiki_dummy.wipe_state() diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 09034b3be5c3..87e0928653a6 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -425,7 +425,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "    Change
" dat += "    Change
" - if(istype(pref_species, /datum/species/elzuosa)) //not the best thing to do tbf but I dont know whats better. + if(istype(pref_species, /datum/species/elzuose)) //not the best thing to do tbf but I dont know whats better. dat += "

Elzuosa Color

" @@ -1816,7 +1816,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) to_chat(user, "Invalid color. Your color is not bright enough.") if("color_ethereal") - var/new_etherealcolor = input(user, "Choose your elzuosa color:", "Character Preference","#"+features["ethcolor"]) as color|null + var/new_etherealcolor = input(user, "Choose your elzuose color:", "Character Preference","#"+features["ethcolor"]) as color|null if(new_etherealcolor) var/temp_hsv = RGBtoHSV(new_etherealcolor) if(ReadHSV(temp_hsv)[3] >= ReadHSV("#505050")[3]) // elzu colors should be bright diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index a9b4b0c72f15..a4b422ff119a 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1275,7 +1275,7 @@ race = /datum/species/dullahan /mob/living/carbon/human/species/ethereal - race = /datum/species/elzuosa + race = /datum/species/elzuose /mob/living/carbon/human/species/fly race = /datum/species/fly diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 0051c791f868..d9b4da586e79 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1359,9 +1359,9 @@ GLOBAL_LIST_EMPTY(roundstart_races) var/hungry = (500 - H.nutrition) / 5 //So overeat would be 100 and default level would be 80 if(hungry >= 70) H.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/hunger, multiplicative_slowdown = (hungry / 50)) - else if(iselzuosa(H)) - var/datum/species/elzuosa/E = H.dna.species - if(E.get_charge(H) <= ELZUOSA_CHARGE_NORMAL) + else if(iselzuose(H)) + var/datum/species/elzuose/E = H.dna.species + if(E.get_charge(H) <= ELZUOSE_CHARGE_NORMAL) H.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/hunger, multiplicative_slowdown = (1.5 * (1 - E.get_charge(H) / 100))) else H.remove_movespeed_modifier(/datum/movespeed_modifier/hunger) diff --git a/code/modules/mob/living/carbon/human/species_types/IPC.dm b/code/modules/mob/living/carbon/human/species_types/IPC.dm index bfc24b6bbaf1..fe2c312e7e60 100644 --- a/code/modules/mob/living/carbon/human/species_types/IPC.dm +++ b/code/modules/mob/living/carbon/human/species_types/IPC.dm @@ -133,7 +133,7 @@ icon_state = "wire1" /obj/item/apc_powercord/afterattack(atom/target, mob/user, proximity_flag, click_parameters) - if((!istype(target, /obj/machinery/power/apc) && !iselzuosa(target)) || !ishuman(user) || !proximity_flag) + if((!istype(target, /obj/machinery/power/apc) && !iselzuose(target)) || !ishuman(user) || !proximity_flag) return ..() user.changeNext_move(CLICK_CD_MELEE) var/mob/living/carbon/human/H = user @@ -155,7 +155,7 @@ to_chat(user, "There is not enough charge to draw from that APC.") return - if(iselzuosa(target)) + if(iselzuose(target)) var/mob/living/carbon/human/target_ethereal = target var/obj/item/organ/stomach/ethereal/eth_stomach = target_ethereal.getorganslot(ORGAN_SLOT_STOMACH) if(target_ethereal.nutrition > 0 && eth_stomach) @@ -207,7 +207,7 @@ if(A.crystal_charge == 0) to_chat(H, "[A] is completely drained!") break - siphon_amt = A.crystal_charge <= (2 * ELZUOSA_CHARGE_SCALING_MULTIPLIER) ? A.crystal_charge : (2 * ELZUOSA_CHARGE_SCALING_MULTIPLIER) + siphon_amt = A.crystal_charge <= (2 * ELZUOSE_CHARGE_SCALING_MULTIPLIER) ? A.crystal_charge : (2 * ELZUOSE_CHARGE_SCALING_MULTIPLIER) A.adjust_charge(-1 * siphon_amt) H.nutrition += (siphon_amt) if(H.nutrition > NUTRITION_LEVEL_WELL_FED) diff --git a/code/modules/mob/living/carbon/human/species_types/ethereal.dm b/code/modules/mob/living/carbon/human/species_types/ethereal.dm index 76d73e15fbaf..248e9f413795 100644 --- a/code/modules/mob/living/carbon/human/species_types/ethereal.dm +++ b/code/modules/mob/living/carbon/human/species_types/ethereal.dm @@ -1,8 +1,8 @@ -#define ELZUOSA_EMAG_COLORS list("#00ffff", "#ffc0cb", "#9400D3", "#4B0082", "#0000FF", "#00FF00", "#FFFF00", "#FF7F00", "#FF0000") +#define ELZUOSE_EMAG_COLORS list("#00ffff", "#ffc0cb", "#9400D3", "#4B0082", "#0000FF", "#00FF00", "#FFFF00", "#FF7F00", "#FF0000") -/datum/species/elzuosa +/datum/species/elzuose name = "\improper Elzuose" - id = SPECIES_ELZUOSA + id = SPECIES_ELZUOSE attack_verb = "burn" attack_sound = 'sound/weapons/etherealhit.ogg' miss_sound = 'sound/weapons/etherealmiss.ogg' @@ -47,12 +47,12 @@ var/drain_time = 0 //used to keep ethereals from spam draining power sources var/obj/effect/dummy/lighting_obj/ethereal_light -/datum/species/elzuosa/Destroy(force) +/datum/species/elzuose/Destroy(force) if(ethereal_light) QDEL_NULL(ethereal_light) return ..() -/datum/species/elzuosa/on_species_gain(mob/living/carbon/C, datum/species/old_species, pref_load) +/datum/species/elzuose/on_species_gain(mob/living/carbon/C, datum/species/old_species, pref_load) . = ..() if(!ishuman(C)) return @@ -66,16 +66,16 @@ //The following code is literally only to make admin-spawned ethereals not be black. C.dna.features["mcolor"] = C.dna.features["ethcolor"] //Ethcolor and Mut color are both dogshit and will be replaced for(var/obj/item/bodypart/BP as anything in C.bodyparts) - if(BP.limb_id == SPECIES_ELZUOSA) + if(BP.limb_id == SPECIES_ELZUOSE) BP.update_limb(is_creating = TRUE) -/datum/species/elzuosa/on_species_loss(mob/living/carbon/human/C, datum/species/new_species, pref_load) +/datum/species/elzuose/on_species_loss(mob/living/carbon/human/C, datum/species/new_species, pref_load) UnregisterSignal(C, COMSIG_ATOM_EMAG_ACT) UnregisterSignal(C, COMSIG_ATOM_EMP_ACT) QDEL_NULL(ethereal_light) return ..() -/datum/species/elzuosa/random_name(gender,unique,lastname) +/datum/species/elzuose/random_name(gender,unique,lastname) if(unique) return random_unique_lizard_name(gender) @@ -86,7 +86,7 @@ return randname -/datum/species/elzuosa/spec_updatehealth(mob/living/carbon/human/H) +/datum/species/elzuose/spec_updatehealth(mob/living/carbon/human/H) . = ..() if(!ethereal_light) return @@ -108,7 +108,7 @@ H.update_body() H.update_hair() -/datum/species/elzuosa/proc/health_adjusted_color(mob/living/carbon/human/H, default_color) +/datum/species/elzuose/proc/health_adjusted_color(mob/living/carbon/human/H, default_color) var/health_percent = max(H.health, 0) / 100 var/static/unhealthy_color_red_part = GETREDPART(unhealthy_color) @@ -126,7 +126,7 @@ ) return result -/datum/species/elzuosa/proc/set_ethereal_light(mob/living/carbon/human/H, current_color) +/datum/species/elzuose/proc/set_ethereal_light(mob/living/carbon/human/H, current_color) if(!ethereal_light) return @@ -137,7 +137,7 @@ ethereal_light.set_light_range_power_color(light_range, light_power, current_color) -/datum/species/elzuosa/proc/on_emp_act(mob/living/carbon/human/H, severity) +/datum/species/elzuose/proc/on_emp_act(mob/living/carbon/human/H, severity) EMPeffect = TRUE spec_updatehealth(H) to_chat(H, "You feel the light of your body leave you.") @@ -147,7 +147,7 @@ if(EMP_HEAVY) addtimer(CALLBACK(src, PROC_REF(stop_emp), H), 20 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE) //We're out for 20 seconds -/datum/species/elzuosa/proc/on_emag_act(mob/living/carbon/human/H, mob/user) +/datum/species/elzuose/proc/on_emag_act(mob/living/carbon/human/H, mob/user) if(emag_effect) return emag_effect = TRUE @@ -157,54 +157,54 @@ handle_emag(H) addtimer(CALLBACK(src, PROC_REF(stop_emag), H), 30 SECONDS) //Disco mode for 30 seconds! This doesn't affect the ethereal at all besides either annoying some players, or making someone look badass. -/datum/species/elzuosa/spec_life(mob/living/carbon/human/H) +/datum/species/elzuose/spec_life(mob/living/carbon/human/H) .=..() handle_charge(H) -/datum/species/elzuosa/proc/stop_emp(mob/living/carbon/human/H) +/datum/species/elzuose/proc/stop_emp(mob/living/carbon/human/H) EMPeffect = FALSE spec_updatehealth(H) to_chat(H, "You feel more energized as your shine comes back.") -/datum/species/elzuosa/proc/handle_emag(mob/living/carbon/human/H) +/datum/species/elzuose/proc/handle_emag(mob/living/carbon/human/H) if(!emag_effect) return - current_color = pick(ELZUOSA_EMAG_COLORS) + current_color = pick(ELZUOSE_EMAG_COLORS) spec_updatehealth(H) addtimer(CALLBACK(src, PROC_REF(handle_emag), H), 5) //Call ourselves every 0.5 seconds to change color -/datum/species/elzuosa/proc/stop_emag(mob/living/carbon/human/H) +/datum/species/elzuose/proc/stop_emag(mob/living/carbon/human/H) emag_effect = FALSE spec_updatehealth(H) H.visible_message("[H] stops flickering and goes back to their normal state!") -/datum/species/elzuosa/proc/handle_charge(mob/living/carbon/human/H) +/datum/species/elzuose/proc/handle_charge(mob/living/carbon/human/H) brutemod = 1.25 switch(get_charge(H)) - if(ELZUOSA_CHARGE_NONE to ELZUOSA_CHARGE_LOWPOWER) - if(get_charge(H) == ELZUOSA_CHARGE_NONE) - H.throw_alert("ELZUOSA_CHARGE", /atom/movable/screen/alert/etherealcharge, 3) + if(ELZUOSE_CHARGE_NONE to ELZUOSE_CHARGE_LOWPOWER) + if(get_charge(H) == ELZUOSE_CHARGE_NONE) + H.throw_alert("ELZUOSE_CHARGE", /atom/movable/screen/alert/etherealcharge, 3) else - H.throw_alert("ELZUOSA_CHARGE", /atom/movable/screen/alert/etherealcharge, 2) + H.throw_alert("ELZUOSE_CHARGE", /atom/movable/screen/alert/etherealcharge, 2) if(H.health > 10.5) apply_damage(0.2, TOX, null, null, H) brutemod = 1.75 - if(ELZUOSA_CHARGE_LOWPOWER to ELZUOSA_CHARGE_NORMAL) - H.throw_alert("ELZUOSA_CHARGE", /atom/movable/screen/alert/etherealcharge, 1) + if(ELZUOSE_CHARGE_LOWPOWER to ELZUOSE_CHARGE_NORMAL) + H.throw_alert("ELZUOSE_CHARGE", /atom/movable/screen/alert/etherealcharge, 1) brutemod = 1.5 - if(ELZUOSA_CHARGE_FULL to ELZUOSA_CHARGE_OVERLOAD) + if(ELZUOSE_CHARGE_FULL to ELZUOSE_CHARGE_OVERLOAD) H.throw_alert("ethereal_overcharge", /atom/movable/screen/alert/ethereal_overcharge, 1) brutemod = 1.5 - if(ELZUOSA_CHARGE_OVERLOAD to ELZUOSA_CHARGE_DANGEROUS) + if(ELZUOSE_CHARGE_OVERLOAD to ELZUOSE_CHARGE_DANGEROUS) H.throw_alert("ethereal_overcharge", /atom/movable/screen/alert/ethereal_overcharge, 2) brutemod = 1.75 if(prob(10)) //10% each tick for ethereals to explosively release excess energy if it reaches dangerous levels discharge_process(H) else - H.clear_alert("ELZUOSA_CHARGE") + H.clear_alert("ELZUOSE_CHARGE") H.clear_alert("ethereal_overcharge") -/datum/species/elzuosa/proc/discharge_process(mob/living/carbon/human/H) +/datum/species/elzuose/proc/discharge_process(mob/living/carbon/human/H) to_chat(H, "You begin to lose control over your charge!") H.visible_message("[H] begins to spark violently!") var/static/mutable_appearance/overcharge //shameless copycode from lightning spell @@ -215,9 +215,9 @@ var/obj/item/organ/stomach/ethereal/stomach = H.getorganslot(ORGAN_SLOT_STOMACH) playsound(H, 'sound/magic/lightningshock.ogg', 100, TRUE, extrarange = 5) H.cut_overlay(overcharge) - tesla_zap(H, 2, (stomach.crystal_charge / ELZUOSA_CHARGE_SCALING_MULTIPLIER) * 50, ZAP_OBJ_DAMAGE | ZAP_ALLOW_DUPLICATES) + tesla_zap(H, 2, (stomach.crystal_charge / ELZUOSE_CHARGE_SCALING_MULTIPLIER) * 50, ZAP_OBJ_DAMAGE | ZAP_ALLOW_DUPLICATES) if(istype(stomach)) - stomach.adjust_charge(ELZUOSA_CHARGE_FULL - stomach.crystal_charge) + stomach.adjust_charge(ELZUOSE_CHARGE_FULL - stomach.crystal_charge) to_chat(H, "You violently discharge energy!") H.visible_message("[H] violently discharges energy!") if(prob(10)) //chance of developing heart disease to dissuade overcharging oneself @@ -228,13 +228,13 @@ H.Paralyze(100) return -/datum/species/elzuosa/proc/get_charge(mob/living/carbon/H) //this feels like it should be somewhere else. Eh? +/datum/species/elzuose/proc/get_charge(mob/living/carbon/H) //this feels like it should be somewhere else. Eh? var/obj/item/organ/stomach/ethereal/stomach = H.getorganslot(ORGAN_SLOT_STOMACH) if(istype(stomach)) return stomach.crystal_charge - return ELZUOSA_CHARGE_NONE + return ELZUOSE_CHARGE_NONE -/datum/species/elzuosa/spec_attacked_by(obj/item/I, mob/living/user, obj/item/bodypart/affecting, intent, mob/living/carbon/human/H) +/datum/species/elzuose/spec_attacked_by(obj/item/I, mob/living/user, obj/item/bodypart/affecting, intent, mob/living/carbon/human/H) if(istype(I, /obj/item/multitool)) if(user.a_intent == INTENT_HARM) . = ..() // multitool beatdown diff --git a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm index 0a412856ded4..b613b8a0094e 100644 --- a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm @@ -190,7 +190,7 @@ return if(isliving(AM)) var/mob/living/L = AM - if(iselzuosa(AM)) + if(iselzuose(AM)) AM.emp_act(EMP_LIGHT) else if(iscyborg(AM)) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 1fe8d7d2a85e..828f5766fec3 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -405,7 +405,7 @@ mob_species = pickweight(list( /datum/species/human = 31, /datum/species/lizard = 26, - /datum/species/elzuosa = 24, + /datum/species/elzuose = 24, /datum/species/spider = 7, /datum/species/ipc = 7, /datum/species/jelly = 4, diff --git a/code/modules/mob/living/simple_animal/hostile/survivors.dm b/code/modules/mob/living/simple_animal/hostile/survivors.dm index 93aa84d91126..d5759431d65a 100644 --- a/code/modules/mob/living/simple_animal/hostile/survivors.dm +++ b/code/modules/mob/living/simple_animal/hostile/survivors.dm @@ -95,7 +95,7 @@ mob_species = pickweight(list( /datum/species/human = 50, /datum/species/lizard = 25, - /datum/species/elzuosa = 10, + /datum/species/elzuose = 10, /datum/species/moth = 10, /datum/species/spider = 3, /datum/species/fly = 2 diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 621680561f44..3684d5ad8159 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -52,7 +52,7 @@ /// How long it takes an elzu to drain or charge APCs. Also used as a spam limiter. #define APC_DRAIN_TIME (7.5 SECONDS) /// How much power elzu gain/drain from APCs. -#define APC_POWER_GAIN (10 * ELZUOSA_CHARGE_SCALING_MULTIPLIER) +#define APC_POWER_GAIN (10 * ELZUOSE_CHARGE_SCALING_MULTIPLIER) // Wires & EMPs: /// The wire value used to reset the APCs wires after one's EMPed. @@ -834,10 +834,10 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/auto_name, 25) return //[REDACTED] Begin -- Ethereal Charge Scaling //Let the hubris remain but the name be forgotten - if(iselzuosa(user)) + if(iselzuose(user)) var/mob/living/carbon/human/H = user - var/datum/species/elzuosa/E = H.dna.species - var/charge_limit = ELZUOSA_CHARGE_DANGEROUS - APC_POWER_GAIN + var/datum/species/elzuose/E = H.dna.species + var/charge_limit = ELZUOSE_CHARGE_DANGEROUS - APC_POWER_GAIN if((H.a_intent == INTENT_HARM) && (E.drain_time < world.time)) if(cell.charge <= (cell.maxcharge / 20)) // ethereals can't drain APCs under half charge, this is so that they are forced to look to alternative power sources if the station is running low to_chat(H, "The APC's syphon safeties prevent you from draining power!") diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 590284eb0b07..1a2f87c70dd9 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -1,6 +1,6 @@ #define CELL_DRAIN_TIME 35 -#define CELL_POWER_GAIN (3 * ELZUOSA_CHARGE_SCALING_MULTIPLIER) -#define CELL_POWER_DRAIN (37.5 * ELZUOSA_CHARGE_SCALING_MULTIPLIER) +#define CELL_POWER_GAIN (3 * ELZUOSE_CHARGE_SCALING_MULTIPLIER) +#define CELL_POWER_DRAIN (37.5 * ELZUOSE_CHARGE_SCALING_MULTIPLIER) /obj/item/stock_parts/cell name = "power cell" @@ -150,10 +150,10 @@ //WS Begin -- Ethereal Charge Scaling /obj/item/stock_parts/cell/attack_self(mob/user) - if(iselzuosa(user)) + if(iselzuose(user)) var/mob/living/carbon/human/H = user - var/datum/species/elzuosa/E = H.dna.species - var/charge_limit = ELZUOSA_CHARGE_DANGEROUS - CELL_POWER_GAIN + var/datum/species/elzuose/E = H.dna.species + var/charge_limit = ELZUOSE_CHARGE_DANGEROUS - CELL_POWER_GAIN if(E.drain_time > world.time) return if(charge < CELL_POWER_DRAIN) diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 6933beeb8c10..5b0655ddd42d 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -13,7 +13,7 @@ #define BROKEN_SPARKS_MAX (9 MINUTES) #define LIGHT_DRAIN_TIME 25 //WS Edit -- Ethereal Charge Scaling -#define LIGHT_POWER_GAIN (1.75 * ELZUOSA_CHARGE_SCALING_MULTIPLIER) //WS Edit -- Ethereal Charge Scaling +#define LIGHT_POWER_GAIN (1.75 * ELZUOSE_CHARGE_SCALING_MULTIPLIER) //WS Edit -- Ethereal Charge Scaling /obj/item/wallframe/light_fixture name = "light fixture frame" @@ -690,9 +690,9 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light/small/built, 28) var/mob/living/carbon/human/H = user if(istype(H)) - var/datum/species/elzuosa/eth_species = H.dna?.species + var/datum/species/elzuose/eth_species = H.dna?.species if(istype(eth_species)) - var/datum/species/elzuosa/E = H.dna.species + var/datum/species/elzuose/E = H.dna.species if(E.drain_time > world.time) return to_chat(H, "You start channeling some power through the [fitting] into your body.") diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index e3985c40043b..e17af4bd9c86 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -712,7 +712,7 @@ taste_description = "pure electricity" /datum/reagent/consumable/liquidelectricity/on_mob_life(mob/living/carbon/M) - if(prob(25) && !iselzuosa(M)) + if(prob(25) && !iselzuose(M)) M.electrocute_act(rand(10,15), "Liquid Electricity in their body", 1) //lmao at the newbs who eat energy bars playsound(M, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) return ..() @@ -728,7 +728,7 @@ var/mob/living/carbon/C = M var/obj/item/organ/stomach/ethereal/stomach = C.getorganslot(ORGAN_SLOT_STOMACH) if(istype(stomach)) - stomach.adjust_charge(reac_volume * REM * ELZUOSA_CHARGE_SCALING_MULTIPLIER) //WS Edit -- Ethereal Charge Scaling + stomach.adjust_charge(reac_volume * REM * ELZUOSE_CHARGE_SCALING_MULTIPLIER) //WS Edit -- Ethereal Charge Scaling /datum/reagent/consumable/astrotame name = "Astrotame" diff --git a/code/modules/religion/religion_sects.dm b/code/modules/religion/religion_sects.dm index 28682b8a8b00..92327a2ed689 100644 --- a/code/modules/religion/religion_sects.dm +++ b/code/modules/religion/religion_sects.dm @@ -151,7 +151,7 @@ var/did_we_charge = FALSE var/obj/item/organ/stomach/ethereal/eth_stomach = H.getorganslot(ORGAN_SLOT_STOMACH) if(istype(eth_stomach)) - eth_stomach.adjust_charge(3 * ELZUOSA_CHARGE_SCALING_MULTIPLIER) //WS Edit -- Ethereal Charge Scaling + eth_stomach.adjust_charge(3 * ELZUOSE_CHARGE_SCALING_MULTIPLIER) //WS Edit -- Ethereal Charge Scaling did_we_charge = TRUE //if we're not targetting a robot part we stop early diff --git a/code/modules/research/designs/limbgrower_designs.dm b/code/modules/research/designs/limbgrower_designs.dm index d59c87827fb6..a57d31117c8d 100644 --- a/code/modules/research/designs/limbgrower_designs.dm +++ b/code/modules/research/designs/limbgrower_designs.dm @@ -8,7 +8,7 @@ build_type = LIMBGROWER reagents_list = list(/datum/reagent/medicine/synthflesh = 25) build_path = /obj/item/bodypart/l_arm - category = list("initial",SPECIES_HUMAN,SPECIES_SARATHI,SPECIES_MOTH,SPECIES_PLASMAMAN,SPECIES_ELZUOSA,SPECIES_RACHNID,SPECIES_VOX,SPECIES_KEPORI,SPECIES_ABDUCTOR,SPECIES_FLYPERSON,SPECIES_POD,SPECIES_SKELETON,SPECIES_SNAIL) + category = list("initial",SPECIES_HUMAN,SPECIES_SARATHI,SPECIES_MOTH,SPECIES_PLASMAMAN,SPECIES_ELZUOSE,SPECIES_RACHNID,SPECIES_VOX,SPECIES_KEPORI,SPECIES_ABDUCTOR,SPECIES_FLYPERSON,SPECIES_POD,SPECIES_SKELETON,SPECIES_SNAIL) /datum/design/rightarm name = "Right Arm" @@ -16,7 +16,7 @@ build_type = LIMBGROWER reagents_list = list(/datum/reagent/medicine/synthflesh = 25) build_path = /obj/item/bodypart/r_arm - category = list("initial",SPECIES_HUMAN,SPECIES_SARATHI,SPECIES_MOTH,SPECIES_PLASMAMAN,SPECIES_ELZUOSA,SPECIES_RACHNID,SPECIES_VOX,SPECIES_KEPORI,SPECIES_ABDUCTOR,SPECIES_FLYPERSON,SPECIES_POD,SPECIES_SKELETON,SPECIES_SNAIL) + category = list("initial",SPECIES_HUMAN,SPECIES_SARATHI,SPECIES_MOTH,SPECIES_PLASMAMAN,SPECIES_ELZUOSE,SPECIES_RACHNID,SPECIES_VOX,SPECIES_KEPORI,SPECIES_ABDUCTOR,SPECIES_FLYPERSON,SPECIES_POD,SPECIES_SKELETON,SPECIES_SNAIL) /datum/design/leftleg name = "Left Leg" @@ -24,7 +24,7 @@ build_type = LIMBGROWER reagents_list = list(/datum/reagent/medicine/synthflesh = 25) build_path = /obj/item/bodypart/leg/left - category = list("initial",SPECIES_HUMAN,SPECIES_SARATHI,SPECIES_MOTH,SPECIES_PLASMAMAN,SPECIES_ELZUOSA,SPECIES_RACHNID,SPECIES_VOX,SPECIES_KEPORI,SPECIES_ABDUCTOR,SPECIES_FLYPERSON,SPECIES_POD,SPECIES_SKELETON,SPECIES_SNAIL) + category = list("initial",SPECIES_HUMAN,SPECIES_SARATHI,SPECIES_MOTH,SPECIES_PLASMAMAN,SPECIES_ELZUOSE,SPECIES_RACHNID,SPECIES_VOX,SPECIES_KEPORI,SPECIES_ABDUCTOR,SPECIES_FLYPERSON,SPECIES_POD,SPECIES_SKELETON,SPECIES_SNAIL) /datum/design/rightleg name = "Right Leg" @@ -32,7 +32,7 @@ build_type = LIMBGROWER reagents_list = list(/datum/reagent/medicine/synthflesh = 25) build_path = /obj/item/bodypart/leg/right - category = list("initial",SPECIES_HUMAN,SPECIES_SARATHI,SPECIES_MOTH,SPECIES_PLASMAMAN,SPECIES_ELZUOSA,SPECIES_RACHNID,SPECIES_VOX,SPECIES_KEPORI,SPECIES_ABDUCTOR,SPECIES_FLYPERSON,SPECIES_POD,SPECIES_SKELETON,SPECIES_SNAIL) + category = list("initial",SPECIES_HUMAN,SPECIES_SARATHI,SPECIES_MOTH,SPECIES_PLASMAMAN,SPECIES_ELZUOSE,SPECIES_RACHNID,SPECIES_VOX,SPECIES_KEPORI,SPECIES_ABDUCTOR,SPECIES_FLYPERSON,SPECIES_POD,SPECIES_SKELETON,SPECIES_SNAIL) /datum/design/digitigrade/leftleg name = "Digitigrade Left Leg" @@ -220,7 +220,7 @@ build_type = LIMBGROWER reagents_list = list(/datum/reagent/medicine/synthflesh = 20, /datum/reagent/consumable/liquidelectricity = 20) build_path = /obj/item/organ/stomach/ethereal - category = list("initial",SPECIES_ELZUOSA) + category = list("initial",SPECIES_ELZUOSE) /datum/design/ethereal_tongue name = "Ethereal Tongue" @@ -228,7 +228,7 @@ build_type = LIMBGROWER reagents_list = list(/datum/reagent/medicine/synthflesh = 10, /datum/reagent/consumable/liquidelectricity = 10) build_path = /obj/item/organ/tongue/ethereal - category = list("initial",SPECIES_ELZUOSA) + category = list("initial",SPECIES_ELZUOSE) /datum/design/moth_eyes name = "Moth Eyes" diff --git a/code/modules/research/nanites/nanite_programs/sensor.dm b/code/modules/research/nanites/nanite_programs/sensor.dm index 5be22211aca1..47ad3c037a22 100644 --- a/code/modules/research/nanites/nanite_programs/sensor.dm +++ b/code/modules/research/nanites/nanite_programs/sensor.dm @@ -272,7 +272,7 @@ "Human" = /datum/species/human, "Sarathi" = /datum/species/lizard, "Moth" = /datum/species/moth, - "Elzuose" = /datum/species/elzuosa, + "Elzuose" = /datum/species/elzuose, "Pod" = /datum/species/pod, "Fly" = /datum/species/fly, "Jelly" = /datum/species/jelly, diff --git a/code/modules/surgery/bodyparts/species_parts/ethereal_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/ethereal_bodyparts.dm index a83709f78d1f..3f3e919dac16 100644 --- a/code/modules/surgery/bodyparts/species_parts/ethereal_bodyparts.dm +++ b/code/modules/surgery/bodyparts/species_parts/ethereal_bodyparts.dm @@ -1,37 +1,37 @@ /obj/item/bodypart/head/ethereal icon = 'icons/mob/species/ethereal/bodyparts.dmi' icon_state = "elzuosa_head" - limb_id = SPECIES_ELZUOSA + limb_id = SPECIES_ELZUOSE is_dimorphic = FALSE uses_mutcolor = TRUE /obj/item/bodypart/chest/ethereal icon = 'icons/mob/species/ethereal/bodyparts.dmi' icon_state = "elzuosa_chest" - limb_id = SPECIES_ELZUOSA + limb_id = SPECIES_ELZUOSE is_dimorphic = FALSE uses_mutcolor = TRUE /obj/item/bodypart/l_arm/ethereal icon = 'icons/mob/species/ethereal/bodyparts.dmi' icon_state = "elzuosa_l_arm" - limb_id = SPECIES_ELZUOSA + limb_id = SPECIES_ELZUOSE uses_mutcolor = TRUE /obj/item/bodypart/r_arm/ethereal icon = 'icons/mob/species/ethereal/bodyparts.dmi' icon_state = "elzuosa_r_arm" - limb_id = SPECIES_ELZUOSA + limb_id = SPECIES_ELZUOSE uses_mutcolor = TRUE /obj/item/bodypart/leg/left/ethereal icon = 'icons/mob/species/ethereal/bodyparts.dmi' icon_state = "elzuosa_l_leg" - limb_id = SPECIES_ELZUOSA + limb_id = SPECIES_ELZUOSE uses_mutcolor = TRUE /obj/item/bodypart/leg/right/ethereal icon = 'icons/mob/species/ethereal/bodyparts.dmi' icon_state = "elzuosa_r_leg" - limb_id = SPECIES_ELZUOSA + limb_id = SPECIES_ELZUOSE uses_mutcolor = TRUE diff --git a/code/modules/surgery/organs/stomach.dm b/code/modules/surgery/organs/stomach.dm index b650cdcdf800..fe57ac553834 100644 --- a/code/modules/surgery/organs/stomach.dm +++ b/code/modules/surgery/organs/stomach.dm @@ -101,11 +101,11 @@ name = "biological battery" icon_state = "stomach-p" //Welp. At least it's more unique in functionaliy. desc = "A crystal-like organ that stores the electric charge of elzuosas." - var/crystal_charge = ELZUOSA_CHARGE_FULL + var/crystal_charge = ELZUOSE_CHARGE_FULL /obj/item/organ/stomach/ethereal/on_life() ..() - adjust_charge(-ELZUOSA_CHARGE_FACTOR) + adjust_charge(-ELZUOSE_CHARGE_FACTOR) /obj/item/organ/stomach/ethereal/Insert(mob/living/carbon/organ_owner, special = 0) ..() @@ -121,10 +121,10 @@ /obj/item/organ/stomach/ethereal/proc/get_status_tab_item(mob/living/carbon/source, list/items) SIGNAL_HANDLER - items += "Crystal Charge: [round((crystal_charge / ELZUOSA_CHARGE_SCALING_MULTIPLIER), 0.1)]%" + items += "Crystal Charge: [round((crystal_charge / ELZUOSE_CHARGE_SCALING_MULTIPLIER), 0.1)]%" /obj/item/organ/stomach/ethereal/proc/charge(datum/source, amount, repairs) - adjust_charge((amount * ELZUOSA_CHARGE_SCALING_MULTIPLIER) / 70) //WS Edit -- Ethereal Charge Scaling + adjust_charge((amount * ELZUOSE_CHARGE_SCALING_MULTIPLIER) / 70) //WS Edit -- Ethereal Charge Scaling /obj/item/organ/stomach/ethereal/proc/on_electrocute(datum/source, shock_damage, siemens_coeff = 1, flags = NONE) if(flags & SHOCK_ILLUSION) @@ -133,7 +133,7 @@ to_chat(owner, "You absorb some of the shock into your body!") /obj/item/organ/stomach/ethereal/proc/adjust_charge(amount) - crystal_charge = clamp(crystal_charge + amount, ELZUOSA_CHARGE_NONE, ELZUOSA_CHARGE_DANGEROUS) + crystal_charge = clamp(crystal_charge + amount, ELZUOSE_CHARGE_NONE, ELZUOSE_CHARGE_DANGEROUS) /obj/item/organ/stomach/cybernetic name = "basic cybernetic stomach"