diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm index 36fc398d942c..204e24daeab6 100644 --- a/code/__DEFINES/DNA.dm +++ b/code/__DEFINES/DNA.dm @@ -5,7 +5,6 @@ //Defines copying names of mutations in all cases, make sure to change this if you change mutation's type #define HULK /datum/mutation/human/hulk #define XRAY /datum/mutation/human/thermal/x_ray -#define SPACEMUT /datum/mutation/human/space_adaptation #define TK /datum/mutation/human/telekinesis #define NERVOUS /datum/mutation/human/nervousness #define EPILEPSY /datum/mutation/human/epilepsy diff --git a/code/datums/mutations/space_adaptation.dm b/code/datums/mutations/space_adaptation.dm deleted file mode 100644 index a77694c6f797..000000000000 --- a/code/datums/mutations/space_adaptation.dm +++ /dev/null @@ -1,30 +0,0 @@ -//Cold Resistance gives your entire body an orange halo, and makes you immune to the effects of vacuum and cold. -/datum/mutation/human/space_adaptation - name = "Space Adaptation" - desc = "A strange mutation that renders the host immune to the vacuum of space. Will still need an oxygen supply." - quality = POSITIVE - difficulty = 16 - text_gain_indication = "Your body feels warm!" - time_coeff = 5 - instability = 30 - -/datum/mutation/human/space_adaptation/New(class_ = MUT_OTHER, timer, datum/mutation/human/copymut) - ..() - if(!(type in visual_indicators)) - visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "fire", -MUTATIONS_LAYER)) - -/datum/mutation/human/space_adaptation/get_visual_indicator() - return visual_indicators[type][1] - -/datum/mutation/human/space_adaptation/on_acquiring(mob/living/carbon/human/owner) - if(..()) - return - ADD_TRAIT(owner, TRAIT_RESISTCOLD, "space_adaptation") - ADD_TRAIT(owner, TRAIT_RESISTLOWPRESSURE, "space_adaptation") - -/datum/mutation/human/space_adaptation/on_losing(mob/living/carbon/human/owner) - if(..()) - return - REMOVE_TRAIT(owner, TRAIT_RESISTCOLD, "space_adaptation") - REMOVE_TRAIT(owner, TRAIT_RESISTLOWPRESSURE, "space_adaptation") - diff --git a/code/game/objects/items/dna_injector.dm b/code/game/objects/items/dna_injector.dm index b63285b24f0e..34563d5e649c 100644 --- a/code/game/objects/items/dna_injector.dm +++ b/code/game/objects/items/dna_injector.dm @@ -176,16 +176,6 @@ desc = "Fixes that speaking impairment." remove_mutations = list(NERVOUS) -/obj/item/dnainjector/antifire - name = "\improper DNA injector (Anti-Fire)" - desc = "Cures fire." - remove_mutations = list(SPACEMUT) - -/obj/item/dnainjector/firemut - name = "\improper DNA injector (Fire)" - desc = "Gives you fire." - add_mutations = list(SPACEMUT) - /obj/item/dnainjector/blindmut name = "\improper DNA injector (Blind)" desc = "Makes you not see anything." diff --git a/code/game/objects/structures/icemoon/cave_entrance.dm b/code/game/objects/structures/icemoon/cave_entrance.dm index 5cbc09727246..9fc83f9ddc88 100644 --- a/code/game/objects/structures/icemoon/cave_entrance.dm +++ b/code/game/objects/structures/icemoon/cave_entrance.dm @@ -1043,7 +1043,6 @@ GLOBAL_LIST_INIT(ore_probability, list( new /obj/item/dnainjector/hulkmut(loc) new /mob/living/simple_animal/hostile/gorilla(loc) if(prob(35)) - new /obj/item/dnainjector/firemut(loc) new /mob/living/simple_animal/hostile/gorilla(loc) if(prob(35)) new /obj/item/dnainjector/gigantism(loc) diff --git a/icons/effects/genetics.dmi b/icons/effects/genetics.dmi index 373a9de623b7..fff43639c43d 100644 Binary files a/icons/effects/genetics.dmi and b/icons/effects/genetics.dmi differ diff --git a/shiptest.dme b/shiptest.dme index 5f5d321ead40..c5c292a008da 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -712,7 +712,6 @@ #include "code\datums\mutations\hulk.dm" #include "code\datums\mutations\radioactive.dm" #include "code\datums\mutations\sight.dm" -#include "code\datums\mutations\space_adaptation.dm" #include "code\datums\mutations\speech.dm" #include "code\datums\mutations\telekinesis.dm" #include "code\datums\mutations\touch.dm"