[IDB IGNORE] [MDB IGNORE] Makes the icons/mob folder sane (#69302)

About The Pull Request

Reorganizes the entire icons/mob folder.

Added the following new subfolders:

    nonhuman-player (this was initially just called "antag", but then I realized guardians aren't technically antags)
    simplemob
    silicon
    effects (for bloodstains, fire, etc)
    simplemob/held-pets (for exactly that -- I wasn't sure if this should go in inhands instead)
    species/monkey

Moves the following stuff:

    All human parts moved into species, with moth, lizard, monkey, etc parts moved to corresponding subfolders. Previously, there were some moth parts in mob/species/moth, and others just loose in mob. Other species were similar.
    icemoon, lavaland, and jungle folders made into subfolders of simplemob
    All AI and silicon stuff, as well as Beepsky et al. into the silicon folder, simplemobs into the simplemob folder, aliens into the nonhuman-player folder, etc.
    Split up animal_parts.dmi into two bodyparts.dmi which were put in their respective folders (species/alien and species/monkey)

Code changes:

    Filepath changes to account for all of this
    Adds a check when performing surgery on monkeys and xenos, because we can no longer assume their limbs are in the same file
    Turns some hardcoded statues and showcases that were built into maps into objects instead

Things I'd like to do in the future but cant be assed right now:

    Remove primarily-antag sprites from simplemob/mob.dmi (Revenant, Morph, etc.) and put them in the nonhuman-player folder
    Split up mutant_bodyparts.dmi into different files for Tizirans, Felinids, monkeys, etc and put them in their own folders. Those may have once been meant primarily for mutated humans but that's now how they're being used right now.
This commit is contained in:
skylord-a52
2022-09-03 11:52:54 -07:00
committed by GitHub
parent 401035259c
commit be0e6efdf6
293 changed files with 462 additions and 461 deletions
+1 -1
View File
@@ -4,7 +4,7 @@
density = TRUE
anchored = FALSE
name = "\improper AI core"
icon = 'icons/mob/ai.dmi'
icon = 'icons/mob/silicon/ai.dmi'
icon_state = "0"
desc = "The framework for an artificial intelligence core."
max_integrity = 500
+1 -1
View File
@@ -8,7 +8,7 @@
/obj/structure/alien
icon = 'icons/mob/alien.dmi'
icon = 'icons/mob/nonhuman-player/alien.dmi'
max_integrity = 100
/obj/structure/alien/run_atom_armor(damage_amount, damage_type, damage_flag = 0, attack_dir)
@@ -14,7 +14,7 @@
buildstacktype = null
flags_1 = NODECONSTRUCT_1
bolts = FALSE
var/static/mutable_appearance/nest_overlay = mutable_appearance('icons/mob/alien.dmi', "nestoverlay", LYING_MOB_LAYER)
var/static/mutable_appearance/nest_overlay = mutable_appearance('icons/mob/nonhuman-player/alien.dmi', "nestoverlay", LYING_MOB_LAYER)
/obj/structure/bed/nest/user_unbuckle_mob(mob/living/buckled_mob, mob/living/user)
if(has_buckled_mobs())
+1 -1
View File
@@ -1,7 +1,7 @@
/obj/structure/hivebot_beacon
name = "beacon"
desc = "Some odd beacon thing."
icon = 'icons/mob/hivebot.dmi'
icon = 'icons/mob/simple/hivebot.dmi'
icon_state = "def_radar-off"
anchored = TRUE
density = TRUE
@@ -12,7 +12,7 @@ GLOBAL_LIST_INIT(ore_probability, list(
/obj/structure/spawner/ice_moon
name = "cave entrance"
desc = "A hole in the ground, filled with monsters ready to defend it."
icon = 'icons/mob/nest.dmi'
icon = 'icons/mob/simple/lavaland/nest.dmi'
icon_state = "hole"
faction = list("mining")
max_mobs = 3
@@ -108,7 +108,7 @@ GLOBAL_LIST_INIT(ore_probability, list(
name = "collapsing demonic portal"
desc = "It's slowly fading!"
layer = TABLE_LAYER
icon = 'icons/mob/nest.dmi'
icon = 'icons/mob/simple/lavaland/nest.dmi'
icon_state = "nether"
anchored = TRUE
density = TRUE
@@ -3,7 +3,7 @@
name = "necropolis tendril"
desc = "A vile tendril of corruption, originating deep underground. Terrible monsters are pouring out of it."
icon = 'icons/mob/nest.dmi'
icon = 'icons/mob/simple/lavaland/nest.dmi'
icon_state = "tendril"
faction = list("mining")
@@ -75,7 +75,7 @@ GLOBAL_LIST_INIT(tendrils, list())
name = "collapsing necropolis tendril"
desc = "Get your loot and get clear!"
layer = TABLE_LAYER
icon = 'icons/mob/nest.dmi'
icon = 'icons/mob/simple/lavaland/nest.dmi'
icon_state = "tendril"
anchored = TRUE
density = TRUE
+18 -1
View File
@@ -52,7 +52,7 @@
/obj/structure/showcase/cyborg/old
name = "Cyborg Statue"
desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze."
icon = 'icons/mob/robots.dmi'
icon = 'icons/mob/silicon/robots.dmi'
icon_state = "robot_old"
density = FALSE
@@ -102,7 +102,24 @@
icon = 'icons/obj/machines/telecomms.dmi'
icon_state = "processor"
/obj/structure/showcase/wizard
name = "wizard of yendor showcase"
desc = "A historical figure of great importance to the wizard federation. He spent his long life learning magic, stealing artifacts, and harassing idiots with swords. May he rest forever, Rodney."
icon = 'icons/mob/simple/mob.dmi'
icon_state = "nim"
/obj/structure/showcase/machinery/rng
name = "byond random number generator"
desc = "A strange machine supposedly from another world. The Wizard Federation has been meddling with it for years."
icon = 'icons/obj/machines/telecomms.dmi'
icon_state = "processor"
/obj/structure/showcase/katana
name = "seppuku katana"
density = 0
desc = "Welp, only one way to recover your honour."
icon = 'icons/obj/weapons/items_and_weapons.dmi'
icon_state = "katana"
//Deconstructing
//Showcases can be any sprite, so it makes sense that they can't be constructed.
+3 -3
View File
@@ -1,6 +1,6 @@
/obj/structure/spawner
name = "monster nest"
icon = 'icons/mob/animal.dmi'
icon = 'icons/mob/simple/animal.dmi'
icon_state = "hole"
max_integrity = 100
@@ -37,7 +37,7 @@
name = "bone pit"
desc = "A pit full of bones, and some still seem to be moving..."
icon_state = "hole"
icon = 'icons/mob/nest.dmi'
icon = 'icons/mob/simple/lavaland/nest.dmi'
max_integrity = 150
max_mobs = 15
spawn_time = 150
@@ -63,7 +63,7 @@
icon_state = "hole"
max_integrity = 200
max_mobs = 3
icon = 'icons/mob/nest.dmi'
icon = 'icons/mob/simple/lavaland/nest.dmi'
spawn_text = "crawls out of"
mob_types = list(/mob/living/simple_animal/hostile/asteroid/goldgrub, /mob/living/simple_animal/hostile/asteroid/goliath, /mob/living/simple_animal/hostile/asteroid/hivelord, /mob/living/simple_animal/hostile/asteroid/basilisk, /mob/living/simple_animal/hostile/asteroid/fugu)
faction = list("mining")