Deletes the depreciated android species (#22312)

* get rid of them

* sprites
This commit is contained in:
Molti
2024-07-28 22:50:06 -05:00
committed by GitHub
parent fbce559c2a
commit 4d7505e15a
12 changed files with 4 additions and 69 deletions

View File

@@ -92,7 +92,6 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
#define isipc(A) (is_species(A, /datum/species/ipc))
#define isinsurgent(A) (is_species(A, /datum/species/ipc/self/insurgent))
#define issnail(A) (is_species(A, /datum/species/snail))
#define isandroid(A) (is_species(A, /datum/species/android))
#define isshadowperson(A) (is_species(A, /datum/species/shadow))
#define is_synth(A) (is_species(A,/datum/species/wy_synth))
#define isdummy(A) (istype(A, /mob/living/carbon/human/dummy))

View File

@@ -87,7 +87,6 @@
// Defines for Species IDs. Used to refer to the name of a species, for things like bodypart names or species preferences.
#define SPECIES_ABDUCTOR "abductor"
#define SPECIES_ANDROID "android"
#define SPECIES_DULLAHAN "dullahan"
#define SPECIES_ETHEREAL "ethereal"
#define SPECIES_FELINE "felinid"

View File

@@ -161,7 +161,7 @@ SUBSYSTEM_DEF(traumas)
phobia_species = list("lizards" = typecacheof(list(/datum/species/lizard)),
"skeletons" = typecacheof(list(/datum/species/skeleton, /datum/species/plasmaman)),
"conspiracies" = typecacheof(list(/datum/species/abductor, /datum/species/lizard)),
"robots" = typecacheof(list(/datum/species/android)),
"robots" = typecacheof(list(/datum/species/ipc, /datum/species/preternis)),
"the supernatural" = typecacheof(list(/datum/species/golem/clockwork, /datum/species/golem/runic)),
"aliens" = typecacheof(list(/datum/species/abductor, /datum/species/jelly, /datum/species/pod,
/datum/species/shadow, /datum/species/polysmorph)),

View File

@@ -25,7 +25,7 @@
H.Paralyze(15) //zombies can't resist the doot
C.adjust_jitter(35 SECONDS)
C.adjust_stutter(20 SECONDS)
if((!istype(H.dna.species, /datum/species/skeleton)) && (!istype(H.dna.species, /datum/species/golem)) && (!istype(H.dna.species, /datum/species/android)) && (!istype(H.dna.species, /datum/species/jelly)))
if((!istype(H.dna.species, /datum/species/skeleton)) && (!istype(H.dna.species, /datum/species/golem)) && (!istype(H.dna.species, /datum/species/jelly)))
C.adjustStaminaLoss(25) //boneless humanoids don't lose the will to live
to_chat(C, "<font color='red' size='4'><B>DOOT</B></font>")
spectral_change(H)
@@ -35,7 +35,7 @@
C.adjust_stutter(20 SECONDS)
/datum/component/spooky/proc/spectral_change(mob/living/carbon/human/H, mob/user)
if((H.getStaminaLoss() > 95) && (!istype(H.dna.species, /datum/species/skeleton)) && (!istype(H.dna.species, /datum/species/golem)) && (!istype(H.dna.species, /datum/species/android)) && (!istype(H.dna.species, /datum/species/jelly)))
if((H.getStaminaLoss() > 95) && (!istype(H.dna.species, /datum/species/skeleton)) && (!istype(H.dna.species, /datum/species/golem)) && (!istype(H.dna.species, /datum/species/jelly)))
H.Paralyze(2 SECONDS)
H.set_species(/datum/species/skeleton)
H.visible_message(span_warning("[H] has given up on life as a mortal."))

View File

@@ -229,8 +229,6 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
species = "Snail"
if (isabductor(tracked_mob))
species = "Alien"
if (isandroid(tracked_mob))
species = "Android"
for(var/obj/item/bodypart/part in tracked_mob.bodyparts)
if(part.bodypart_disabled == TRUE) //check if has disabled limbs

View File

@@ -1081,9 +1081,6 @@
/mob/living/carbon/human/species/abductor
race = /datum/species/abductor
/mob/living/carbon/human/species/android
race = /datum/species/android
/mob/living/carbon/human/species/dullahan
race = /datum/species/dullahan

View File

@@ -1,46 +0,0 @@
/datum/species/android
name = "Android"
id = SPECIES_ANDROID
say_mod = "states"
bubble_icon = BUBBLE_ROBOT
possible_genders = list(PLURAL, NEUTER)
species_traits = list(NOBLOOD, NOZOMBIE, NOHUSK, NO_DNA_COPY, NOTRANSSTING)
inherent_traits = list(TRAIT_RESISTHEAT,TRAIT_COLDBLOODED,TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_RADIMMUNE,TRAIT_NOCLONE,TRAIT_TOXIMMUNE,TRAIT_GENELESS,TRAIT_NOFIRE,TRAIT_PIERCEIMMUNE,TRAIT_NOHUNGER,TRAIT_LIMBATTACHMENT,TRAIT_MEDICALIGNORE)
inherent_biotypes = MOB_ROBOTIC|MOB_HUMANOID
meat = /obj/item/stack/sheet/plasteel{amount = 5}
skinned_type = /obj/item/stack/sheet/metal{amount = 10}
damage_overlay_type = "synth"
mutantbrain = /obj/item/organ/brain/positron
mutanteyes = /obj/item/organ/eyes/robotic
mutanttongue = /obj/item/organ/tongue/robot
mutantliver = /obj/item/organ/liver/cybernetic/upgraded/ipc
mutantstomach = /obj/item/organ/stomach/cell //Is there even anything an android would use a stomach for?
mutantears = /obj/item/organ/ears/robot
species_language_holder = /datum/language_holder/synthetic
limbs_id = "synth"
toxmod = 0
clonemod = 0
species_gibs = "robotic"
attack_sound = 'sound/items/trayhit1.ogg'
screamsound = 'goon/sound/robot_scream.ogg'
allow_numbers_in_name = TRUE
deathsound = 'sound/voice/borg_deathsound.ogg'
wings_icon = "Robotic"
changesource_flags = MIRROR_BADMIN | MIRROR_MAGIC | WABBAJACK | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
/datum/species/android/on_species_gain(mob/living/carbon/C)
. = ..()
for(var/X in C.bodyparts)
var/obj/item/bodypart/O = X
O.change_bodypart_status(BODYPART_ROBOTIC, FALSE, TRUE)
/datum/species/android/on_species_loss(mob/living/carbon/C)
. = ..()
for(var/X in C.bodyparts)
var/obj/item/bodypart/O = X
O.change_bodypart_status(BODYPART_ORGANIC,FALSE, TRUE)
/datum/species/android/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H)
. = ..()
if(H.reagents.has_reagent(/datum/reagent/oil))
H.adjustFireLoss(-2*REAGENTS_EFFECT_MULTIPLIER,FALSE,FALSE, BODYPART_ANY)

View File

@@ -709,13 +709,6 @@
race = /datum/species/abductor
mutationtext = span_danger("The pain subsides. You feel... alien.")
/datum/reagent/mutationtoxin/android
name = "Android Mutation Toxin"
description = "A robotic toxin."
color = "#5EFF3B" //RGB: 94, 255, 59
race = /datum/species/android
mutationtext = span_danger("The pain subsides. You feel... artificial.")
//BLACKLISTED RACES
/datum/reagent/mutationtoxin/skeleton

View File

@@ -98,7 +98,7 @@
break
if(!human2borg)
return FALSE
human2borg.set_species(/datum/species/android)
human2borg.set_species(/datum/species/ipc/self/insurgent)
human2borg.visible_message(span_notice("[human2borg] has been converted by the rite of [name]!"))
return TRUE

View File

@@ -32,10 +32,6 @@ const speciesmap = {
"icon": "robot",
"color": "#edee1b",
},
"Android": {
"icon": "cog",
"color": "#06b4cf",
},
"Felinid": {
"icon": "paw",
"color": "#f52ab4",

View File

@@ -2951,7 +2951,6 @@
#include "code\modules\mob\living\carbon\human\status_procs.dm"
#include "code\modules\mob\living\carbon\human\update_icons.dm"
#include "code\modules\mob\living\carbon\human\species_types\abductors.dm"
#include "code\modules\mob\living\carbon\human\species_types\android.dm"
#include "code\modules\mob\living\carbon\human\species_types\dullahan.dm"
#include "code\modules\mob\living\carbon\human\species_types\eggpeople.dm"
#include "code\modules\mob\living\carbon\human\species_types\ethereal.dm"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 111 KiB

After

Width:  |  Height:  |  Size: 108 KiB