Skip to content

Commit

Permalink
Corrects some Etheral names to Elzuosa (#2873)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

renames some ethereal stuff to be correct
changes a few player facing names but mostly back end
fixes #2695 

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game

reflect proper species name
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
spellcheck: renames some species stuff
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
FalloutFalcon authored Apr 19, 2024
1 parent 012f282 commit 41f3569
Show file tree
Hide file tree
Showing 31 changed files with 142 additions and 141 deletions.
2 changes: 1 addition & 1 deletion code/__DEFINES/is_helpers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 isethereal(A) (is_species(A, /datum/species/ethereal))
#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))
Expand Down
24 changes: 12 additions & 12 deletions code/__DEFINES/mobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,15 @@
#define SPECIES_ANDROID "android"
#define SPECIES_CORPORATE "corporate"
#define SPECIES_DULLAHAN "dullahan"
#define SPECIES_ETHEREAL "ethereal"
#define SPECIES_ELZUOSE "elzuose"
#define SPECIES_FLYPERSON "fly"
#define SPECIES_HUMAN "human"
#define SPECIES_IPC "ipc"
#define SPECIES_JELLYPERSON "jelly"
#define SPECIES_SLIMEPERSON "slime_person"
#define SPECIES_LUMINESCENT "luminescent"
#define SPECIES_STARGAZER "stargazer"
#define SPECIES_LIZARD "lizard"
#define SPECIES_SARATHI "sarathi"
#define SPECIES_ASHWALKER "ashwalker"
#define SPECIES_KOBOLD "kobold"
#define SPECIES_MONKEY "monkey"
Expand Down Expand Up @@ -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_ETHEREAL (1<<2)
#define FLAG_ELZUOSE (1<<2)
#define FLAG_PLASMAMAN (1<<3)
#define FLAG_MOTH (1<<4)
#define FLAG_LIZARD (1<<5)
Expand Down Expand Up @@ -244,14 +244,14 @@

//Charge levels for Ethereals
//WS Begin -- Ethereal Charge Scaling
#define ETHEREAL_CHARGE_SCALING_MULTIPLIER 20
#define ETHEREAL_CHARGE_NONE (0 * ETHEREAL_CHARGE_SCALING_MULTIPLIER)
#define ETHEREAL_CHARGE_LOWPOWER (20 * ETHEREAL_CHARGE_SCALING_MULTIPLIER)
#define ETHEREAL_CHARGE_NORMAL (50 * ETHEREAL_CHARGE_SCALING_MULTIPLIER)
#define ETHEREAL_CHARGE_ALMOSTFULL (75 * ETHEREAL_CHARGE_SCALING_MULTIPLIER)
#define ETHEREAL_CHARGE_FULL (100 * ETHEREAL_CHARGE_SCALING_MULTIPLIER)
#define ETHEREAL_CHARGE_OVERLOAD (125 * ETHEREAL_CHARGE_SCALING_MULTIPLIER)
#define ETHEREAL_CHARGE_DANGEROUS (150 * ETHEREAL_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
Expand Down Expand Up @@ -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 ETHEREAL_CHARGE_FACTOR (0.05 * ETHEREAL_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

Expand Down
4 changes: 2 additions & 2 deletions code/datums/blood_type.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
16 changes: 8 additions & 8 deletions code/datums/components/mood.dm
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@

/datum/component/mood/proc/HandleNutrition()
var/mob/living/L = parent
if(isethereal(L))
if(iselzuose(L))
HandleCharge(L)
if(HAS_TRAIT(L, TRAIT_NOHUNGER))
return FALSE //no mood events for nutrition
Expand All @@ -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/ethereal/E = H.dna.species
var/datum/species/elzuose/E = H.dna.species
switch(E.get_charge(H))
if(ETHEREAL_CHARGE_NONE to ETHEREAL_CHARGE_LOWPOWER)
if(ELZUOSE_CHARGE_NONE to ELZUOSE_CHARGE_LOWPOWER)
add_event(null, "charge", /datum/mood_event/decharged)
if(ETHEREAL_CHARGE_LOWPOWER to ETHEREAL_CHARGE_NORMAL)
if(ELZUOSE_CHARGE_LOWPOWER to ELZUOSE_CHARGE_NORMAL)
add_event(null, "charge", /datum/mood_event/lowpower)
if(ETHEREAL_CHARGE_NORMAL to ETHEREAL_CHARGE_ALMOSTFULL)
if(ELZUOSE_CHARGE_NORMAL to ELZUOSE_CHARGE_ALMOSTFULL)
clear_event(null, "charge")
if(ETHEREAL_CHARGE_ALMOSTFULL to ETHEREAL_CHARGE_FULL)
if(ELZUOSE_CHARGE_ALMOSTFULL to ELZUOSE_CHARGE_FULL)
add_event(null, "charge", /datum/mood_event/charged)
if(ETHEREAL_CHARGE_FULL to ETHEREAL_CHARGE_OVERLOAD)
if(ELZUOSE_CHARGE_FULL to ELZUOSE_CHARGE_OVERLOAD)
add_event(null, "charge", /datum/mood_event/overcharged)
if(ETHEREAL_CHARGE_OVERLOAD to ETHEREAL_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)
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/limbgrower.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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_LIZARD,SPECIES_MOTH,SPECIES_PLASMAMAN,SPECIES_ETHEREAL,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,
Expand Down
9 changes: 5 additions & 4 deletions code/game/machinery/scan_gate.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#define SCANGATE_WANTED "Wanted"
#define SCANGATE_SPECIES "Species"

//god why cant this use the normal species defines
#define SCANGATE_HUMAN "human"
#define SCANGATE_LIZARD "lizard"
#define SCANGATE_FLY "fly"
Expand All @@ -17,7 +18,7 @@
#define SCANGATE_SPIDER "rachnid"
#define SCANGATE_IPC "ipc"
#define SCANGATE_SQUID "squid"
#define SCANGATE_ETHEREAL "ethereal"
#define SCANGATE_ELZUOSE "elzuose"
#define SCANGATE_KEPORI "kepori"

/obj/machinery/scanner_gate
Expand Down Expand Up @@ -146,8 +147,8 @@
scan_species = /datum/species/spider
if(SCANGATE_IPC)
scan_species = /datum/species/ipc
if(SCANGATE_ETHEREAL)
scan_species = /datum/species/ethereal
if(SCANGATE_ELZUOSE)
scan_species = /datum/species/elzuose
if(SCANGATE_KEPORI)
scan_species = /datum/species/kepori
if(is_species(H, scan_species))
Expand Down Expand Up @@ -247,5 +248,5 @@
#undef SCANGATE_SPIDER
#undef SCANGATE_IPC
#undef SCANGATE_SQUID
#undef SCANGATE_ETHEREAL
#undef SCANGATE_ELZUOSE
#undef SCANGATE_KEPORI
2 changes: 1 addition & 1 deletion code/game/objects/items/grenades/discogrenade.dm
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
return
if(target.stat != CONSCIOUS) //Only conscious people can dance
return
if(!target || isethereal(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))
Expand Down
2 changes: 1 addition & 1 deletion code/modules/admin/topic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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(isethereal(H))
else if(iselzuose(H))
cookiealt = /obj/item/reagent_containers/food/snacks/energybar
// WS - More fun with cookies - Start
else if(islizard(H))
Expand Down
2 changes: 1 addition & 1 deletion code/modules/autowiki/pages/ships.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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/ethereal, /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()

Expand Down
6 changes: 3 additions & 3 deletions code/modules/client/preferences.dm
Original file line number Diff line number Diff line change
Expand Up @@ -425,9 +425,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "<span style='border: 1px solid #161616; background-color: #[features["mcolor"]];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=mutant_color;task=input'>Change</a><BR>"
dat += "<span style='border: 1px solid #161616; background-color: #[features["mcolor2"]];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=mutant_color_2;task=input'>Change</a><BR>"

if(istype(pref_species, /datum/species/ethereal)) //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 += "<h3>Ethereal Color</h3>"
dat += "<h3>Elzuosa Color</h3>"

dat += "<span style='border: 1px solid #161616; background-color: #[features["ethcolor"]];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=color_ethereal;task=input'>Change</a><BR>"

Expand Down Expand Up @@ -1821,7 +1821,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
to_chat(user, "<span class='danger'>Invalid color. Your color is not bright enough.</span>")

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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/food_and_drinks/food/snacks_vend.dm
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
/obj/item/reagent_containers/food/snacks/energybar
name = "High-power energy bars"
icon_state = "energybar"
desc = "An energy bar with a lot of punch, you probably shouldn't eat this if you're not an Ethereal."
desc = "An energy bar with a lot of punch, you probably shouldn't eat this if you're not an Elzuosa."
trash = /obj/item/trash/energybar
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/liquidelectricity = 3)
filling_color = "#97ee63"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/human/human.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1298,7 +1298,7 @@
race = /datum/species/dullahan

/mob/living/carbon/human/species/ethereal
race = /datum/species/ethereal
race = /datum/species/elzuose

/mob/living/carbon/human/species/fly
race = /datum/species/fly
Expand Down
6 changes: 3 additions & 3 deletions code/modules/mob/living/carbon/human/species.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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(isethereal(H))
var/datum/species/ethereal/E = H.dna.species
if(E.get_charge(H) <= ETHEREAL_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)
Expand Down
6 changes: 3 additions & 3 deletions code/modules/mob/living/carbon/human/species_types/IPC.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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) && !isethereal(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
Expand All @@ -155,7 +155,7 @@
to_chat(user, "<span class='warning'>There is not enough charge to draw from that APC.</span>")
return

if(isethereal(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)
Expand Down Expand Up @@ -207,7 +207,7 @@
if(A.crystal_charge == 0)
to_chat(H, "<span class='warning'>[A] is completely drained!</span>")
break
siphon_amt = A.crystal_charge <= (2 * ETHEREAL_CHARGE_SCALING_MULTIPLIER) ? A.crystal_charge : (2 * ETHEREAL_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)
Expand Down
Loading

0 comments on commit 41f3569

Please sign in to comment.