diff --git a/code/game/machinery/computer/arcade_games/recruiter.dm b/code/game/machinery/computer/arcade_games/recruiter.dm index 6a83d3817ae..4000e067527 100644 --- a/code/game/machinery/computer/arcade_games/recruiter.dm +++ b/code/game/machinery/computer/arcade_games/recruiter.dm @@ -86,7 +86,7 @@ /datum/species/diona, /datum/species/machine, /datum/species/slime, /datum/species/moth, /datum/species/vox) /// Species that are NOT hirable in the eyes of NT - var/list/incorrect_species = list(/datum/species/abductor, /datum/species/monkey, /datum/species/nucleation, + var/list/incorrect_species = list(/datum/species/abductor, /datum/species/monkey, /datum/species/shadow, /datum/species/skeleton, /datum/species/golem) /// Is he a good candidate for hiring? diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm index 52fcc5dc666..815821757ad 100644 --- a/code/modules/mob/living/carbon/brain/MMI.dm +++ b/code/modules/mob/living/carbon/brain/MMI.dm @@ -30,9 +30,6 @@ var/master_uid = null /obj/item/mmi/attackby(obj/item/O as obj, mob/user as mob, params) - if(istype(O, /obj/item/organ/internal/brain/crystal)) - to_chat(user, " This brain is too malformed to be able to use with [src].") - return if(istype(O, /obj/item/organ/internal/brain/golem)) to_chat(user, "You can't find a way to plug [O] into [src].") return diff --git a/code/modules/mob/living/carbon/human/human_mob.dm b/code/modules/mob/living/carbon/human/human_mob.dm index 2fa31f219de..0a39c0392fb 100644 --- a/code/modules/mob/living/carbon/human/human_mob.dm +++ b/code/modules/mob/living/carbon/human/human_mob.dm @@ -155,9 +155,6 @@ /mob/living/carbon/human/golem/Initialize(mapload) . = ..(mapload, /datum/species/golem) -/mob/living/carbon/human/nucleation/Initialize(mapload) - . = ..(mapload, /datum/species/nucleation) - /mob/living/carbon/human/drask/Initialize(mapload) . = ..(mapload, /datum/species/drask) diff --git a/code/modules/mob/living/carbon/human/species/nucleation.dm b/code/modules/mob/living/carbon/human/species/nucleation.dm deleted file mode 100644 index a2d3a9fbf9c..00000000000 --- a/code/modules/mob/living/carbon/human/species/nucleation.dm +++ /dev/null @@ -1,42 +0,0 @@ -/datum/species/nucleation - name = "Nucleation" - name_plural = "Nucleations" - icobase = 'icons/mob/human_races/r_nucleation.dmi' - blacklisted = TRUE - blurb = "A sub-race of unfortunates who have been exposed to too much supermatter radiation. As a result, \ - supermatter crystal clusters have begun to grow across their bodies. Research to find a cure for this ailment \ - has been slow, and so this is a common fate for veteran engineers. The supermatter crystals produce oxygen, \ - negating the need for the individual to breathe. Their massive change in biology, however, renders most medicines \ - obselete. Ionizing radiation seems to cause resonance in some of their crystals, which seems to encourage regeneration \ - and produces a calming effect on the individual. Nucleations are highly stigmatized, and are treated much in the same \ - way as lepers were back on Earth." - language = "Sol Common" - burn_mod = 4 // holy shite, poor guys wont survive half a second cooking smores - brute_mod = 2 // damn, double wham, double dam - species_traits = list(LIPS, NO_BLOOD, NO_CLONESCAN) - inherent_traits = list(TRAIT_NOBREATH, TRAIT_RADIMMUNE, TRAIT_NOPAIN) - bodyflags = SHAVED - dies_at_threshold = TRUE - dietflags = DIET_OMNI //still human at their core, so they maintain their eating habits and diet - - //Default styles for created mobs. - default_hair = "Nucleation Crystals" - - reagent_tag = PROCESS_ORG - has_organ = list( - "heart" = /obj/item/organ/internal/heart, - "brain" = /obj/item/organ/internal/brain/crystal, - "eyes" = /obj/item/organ/internal/eyes/luminescent_crystal, //Standard darksight of 2. - "strange crystal" = /obj/item/organ/internal/nucleation/strange_crystal - ) - -/datum/species/nucleation/on_species_gain(mob/living/carbon/human/H) - ..() - H.light_color = "#1C1C00" - H.set_light(2) - -/datum/species/nucleation/handle_death(gibbed, mob/living/carbon/human/H) - var/turf/T = get_turf(H) - H.visible_message("[H]'s body explodes, leaving behind a pile of microscopic crystals!") - explosion(T, 0, 0, 2, 2) // Create a small explosion burst upon death - qdel(H) diff --git a/code/modules/mob/new_player/sprite_accessories/nucleation/nucleation_face.dm b/code/modules/mob/new_player/sprite_accessories/nucleation/nucleation_face.dm deleted file mode 100644 index 3218a15357a..00000000000 --- a/code/modules/mob/new_player/sprite_accessories/nucleation/nucleation_face.dm +++ /dev/null @@ -1,32 +0,0 @@ -/datum/sprite_accessory/hair/nucleation - icon = 'icons/mob/sprite_accessories/nucleation/nucleation_face.dmi' - species_allowed = list("Nucleation") - glasses_over = 1 - -/datum/sprite_accessory/hair/nucleation/nuc_crystals - name = "Nucleation Crystals" - icon_state = "crystal" - -/datum/sprite_accessory/hair/nucleation/nuc_betaburns - name = "Nucleation Beta Burns" - icon_state = "betaburns" - -/datum/sprite_accessory/hair/nucleation/nuc_fallout - name = "Nucleation Fallout" - icon_state = "fallout" - -/datum/sprite_accessory/hair/nucleation/nuc_frission - name = "Nucleation Frission" - icon_state = "frission" - -/datum/sprite_accessory/hair/nucleation/nuc_radical - name = "Nucleation Free Radical" - icon_state = "radical" - -/datum/sprite_accessory/hair/nucleation/nuc_gammaray - name = "Nucleation Gamma Ray" - icon_state = "gammaray" - -/datum/sprite_accessory/hair/nucleation/nuc_neutron - name = "Nucleation Neutron Bomb" - icon_state = "neutron" diff --git a/code/modules/surgery/organs/subtypes/nucleation_organs.dm b/code/modules/surgery/organs/subtypes/nucleation_organs.dm deleted file mode 100644 index bac821f7f6c..00000000000 --- a/code/modules/surgery/organs/subtypes/nucleation_organs.dm +++ /dev/null @@ -1,34 +0,0 @@ -//NUCLEATION ORGAN -/obj/item/organ/internal/nucleation - name = "nucleation organ" - icon = 'icons/obj/surgery.dmi' - desc = "A crystalized human organ. /red It has a strangely iridescent glow." - -/obj/item/organ/internal/nucleation/resonant_crystal - name = "resonant crystal" - icon_state = "resonant-crystal" - organ_tag = "resonant crystal" - parent_organ = "head" - slot = "res_crystal" - -/obj/item/organ/internal/nucleation/strange_crystal - name = "strange crystal" - icon_state = "strange-crystal" - organ_tag = "strange crystal" - parent_organ = "chest" - slot = "heart" - -/obj/item/organ/internal/eyes/luminescent_crystal - name = "luminescent eyes" - icon_state = "crystal-eyes" - organ_tag = "luminescent eyes" - light_color = "#1C1C00" - -/obj/item/organ/internal/eyes/luminescent_crystal/New() - set_light(2) - ..() - -/obj/item/organ/internal/brain/crystal - name = "crystallized brain" - icon_state = "crystal-brain" - organ_tag = "crystallized brain" diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi index addbe6546c4..72f65a6b0f5 100644 Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ diff --git a/paradise.dme b/paradise.dme index 28009db6d49..db7b12a23ca 100644 --- a/paradise.dme +++ b/paradise.dme @@ -2086,7 +2086,6 @@ #include "code\modules\mob\living\carbon\human\species\machine.dm" #include "code\modules\mob\living\carbon\human\species\monkey.dm" #include "code\modules\mob\living\carbon\human\species\moth.dm" -#include "code\modules\mob\living\carbon\human\species\nucleation.dm" #include "code\modules\mob\living\carbon\human\species\plasmaman.dm" #include "code\modules\mob\living\carbon\human\species\shadow.dm" #include "code\modules\mob\living\carbon\human\species\skeleton_species.dm" @@ -2300,7 +2299,6 @@ #include "code\modules\mob\new_player\sprite_accessories\moth\moth_body_markings.dm" #include "code\modules\mob\new_player\sprite_accessories\moth\moth_head_accessories.dm" #include "code\modules\mob\new_player\sprite_accessories\moth\moth_head_markings.dm" -#include "code\modules\mob\new_player\sprite_accessories\nucleation\nucleation_face.dm" #include "code\modules\mob\new_player\sprite_accessories\shared\shared_tail_markings.dm" #include "code\modules\mob\new_player\sprite_accessories\skrell\skrell_face.dm" #include "code\modules\mob\new_player\sprite_accessories\tajaran\tajaran_body_markings.dm" @@ -2687,7 +2685,6 @@ #include "code\modules\surgery\organs\subtypes\kidan_organs.dm" #include "code\modules\surgery\organs\subtypes\machine_organs.dm" #include "code\modules\surgery\organs\subtypes\moth_organs.dm" -#include "code\modules\surgery\organs\subtypes\nucleation_organs.dm" #include "code\modules\surgery\organs\subtypes\plasmaman_organs.dm" #include "code\modules\surgery\organs\subtypes\skrell_organs.dm" #include "code\modules\surgery\organs\subtypes\slime_organs.dm" diff --git a/strings/syndicate_wanted_messages.json b/strings/syndicate_wanted_messages.json index d31ed01c658..f51151d9d3f 100644 --- a/strings/syndicate_wanted_messages.json +++ b/strings/syndicate_wanted_messages.json @@ -58,7 +58,6 @@ "a Human": 10, "a Kidan": 10, "a Monkey": 10, - "a Nucleation": 10, "a Plasmaman": 10, "a Shadow": 10, "a Skeleton": 10, @@ -68,7 +67,6 @@ "a Tajaran": 10, "a Vox": 10, "a Vulpkanin": 10, - "a Wryn": 10, "an IPC": 10, "an Unathi": 10, "[REDACTED]": 10,