cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 15:17:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

No more original moth wings being set to none (#55672)

Browse Source 
Moths that drink a potion of flight have their moth wings set to none, which their handle fire would store as their original, and that would be applied from reconstructive surgery.

Now potions of flight store an original, and handle fire checks to see if something was stored before, so it doesn't overwrite that.
This commit is contained in:
ArcaneDefence
2020-12-24 01:00:36 -08:00
committed by GitHub
parent da6cfc7334
commit 306f2f0da6
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/lavaland/necropolis_chests.dm
+4
View File
@@ -609,7 +609,11 @@
return
if(exposed_carbon.dna.species.has_innate_wings)
to_chat(exposed_carbon, "<span class='userdanger'>A terrible pain travels down your back as your wings change shape!</span>")
if(!exposed_carbon.dna.features["original_moth_wings"]) //Stores their wings for later possible reconstruction
exposed_carbon.dna.features["original_moth_wings"] = exposed_carbon.dna.features["moth_wings"]
exposed_carbon.dna.features["moth_wings"] = "None"
if(!exposed_carbon.dna.features["original_moth_antennae"]) //Stores their antennae type as well
exposed_carbon.dna.features["original_moth_antennae"] = exposed_carbon.dna.features["moth_antennae"]
exposed_carbon.dna.features["moth_antennae"] = "Regal"
else
to_chat(exposed_carbon, "<span class='userdanger'>A terrible pain travels down your back as wings burst out!</span>")
code/modules/mob/living/carbon/human/species_types/mothmen.dm
+4 -2
View File
@@ -43,9 +43,11 @@
return
if(H.dna.features["moth_wings"] != "Burnt Off" && H.bodytemperature >= 800 && H.fire_stacks > 0) //do not go into the extremely hot light. you will not survive
to_chat(H, "<span class='danger'>Your precious wings burn to a crisp!</span>")
H.dna.features["original_moth_wings"] = H.dna.features["moth_wings"] //Fire apparently destroys DNA, so let's preserve that elsewhere
if(!H.dna.features["original_moth_wings"]) //Fire apparently destroys DNA, so let's preserve that elsewhere, checks if an original was already stored to prevent bugs
H.dna.features["original_moth_wings"] = H.dna.features["moth_wings"]
H.dna.features["moth_wings"] = "Burnt Off"
H.dna.features["original_moth_antennae"] = H.dna.features["moth_antennae"]
if(!H.dna.features["original_moth_antennae"]) //Stores antennae type for if they get restored later
H.dna.features["original_moth_antennae"] = H.dna.features["moth_antennae"]
H.dna.features["moth_antennae"] = "Burnt Off"
if(flying_species) //This is all exclusive to if the person has the effects of a potion of flight
if(H.movement_type & FLYING)