From 15ec60f86fca23b637e3d53efcd1f81537718ebd Mon Sep 17 00:00:00 2001 From: BlackMajor Date: Thu, 21 Apr 2022 01:54:56 +1200 Subject: [PATCH] Integration Tests, my beloved --- code/game/objects/structures/loot_piles_ch.dm | 4 ++-- code/modules/clothing/head/misc_ch.dm | 10 +++++----- code/modules/clothing/suits/hooded_ch.dm | 2 +- code/modules/mob/living/silicon/robot/robot_vr.dm | 4 ++-- .../living/simple_mob/subtypes/animal/hyena/hyena.dm | 4 ++-- .../simple_mob/subtypes/animal/passive/raccoon_ch.dm | 2 +- .../simple_mob/subtypes/animal/space/goose_ch.dm | 2 +- .../simple_mob/subtypes/animal/space/mouse_army_ch.dm | 4 ++-- .../living/simple_mob/subtypes/humanoid/cultist_ch.dm | 2 +- .../simple_mob/subtypes/humanoid/mercs/mercs_ch.dm | 3 +-- .../living/simple_mob/subtypes/humanoid/pirates_ch.dm | 5 ++--- .../living/simple_mob/subtypes/humanoid/posessed_ch.dm | 2 +- .../simple_mob/subtypes/mechanical/cyber_horror_ch.dm | 4 ++-- .../subtypes/occult/constructs/_construct_ch.dm | 2 +- .../mob/living/simple_mob/subtypes/vore/chungus.dm | 2 +- .../mob/living/simple_mob/subtypes/vore/deathclaw.dm | 2 +- .../simple_mob/subtypes/vore/demon/demonAI_ch.dm | 2 +- .../living/simple_mob/subtypes/vore/demon/demon_ch.dm | 2 +- .../mob/living/simple_mob/subtypes/vore/goia_ch.dm | 2 +- .../simple_mob/subtypes/vore/leopardmander_ch.dm | 2 +- .../mob/living/simple_mob/subtypes/vore/lizardman.dm | 2 +- .../mob/living/simple_mob/subtypes/vore/mimic.dm | 2 +- .../mob/living/simple_mob/subtypes/vore/mimic_ch.dm | 6 +++--- .../simple_mob/subtypes/vore/plants_ch/pitcher.dm | 2 +- .../mob/living/simple_mob/subtypes/vore/slug_ch.dm | 2 +- code/modules/vore/eating/living_vr.dm | 2 +- code/modules/vore/eating/vorepanel_ch.dm | 6 +++--- .../human/species/station/protean/protean_blob.dm | 2 +- .../human/species/station/protean/protean_rig.dm | 2 +- 29 files changed, 43 insertions(+), 45 deletions(-) diff --git a/code/game/objects/structures/loot_piles_ch.dm b/code/game/objects/structures/loot_piles_ch.dm index 4958901695..57529b9a25 100644 --- a/code/game/objects/structures/loot_piles_ch.dm +++ b/code/game/objects/structures/loot_piles_ch.dm @@ -2,7 +2,7 @@ /obj/structure/loot_pile/mecha/mouse_tank name = "\improper Whisker wreckage" desc = "The ruins of a small tank. Perhaps some child's toy?" - icon = 'icons/mob/animal_ch.dmi' + icon = 'modular_chomp/icons/mob/animal_ch.dmi' icon_state = "whisker-broken" density = TRUE anchored = FALSE // In case a dead mecha-mob dies in a bad spot. @@ -104,5 +104,5 @@ ) /obj/structure/loot_pile/mecha/ripley/pirate - icon = 'icons/mob/animal_ch.dmi' + icon = 'modular_chomp/icons/mob/animal_ch.dmi' icon_state = "pirate-broken" \ No newline at end of file diff --git a/code/modules/clothing/head/misc_ch.dm b/code/modules/clothing/head/misc_ch.dm index 92011dd8f5..680e58adfc 100644 --- a/code/modules/clothing/head/misc_ch.dm +++ b/code/modules/clothing/head/misc_ch.dm @@ -19,12 +19,12 @@ icon_state = "wahcap" item_state_slots = list(slot_r_hand_str = "wahcap", slot_l_hand_str = "wahcap") icon = 'icons/obj/clothing/hats_ch.dmi' - icon_override = 'icons/mob/head_ch.dmi' + icon_override = 'modular_chomp/icons/mob/head_ch.dmi' /obj/item/clothing/head/crown //Generic crown doesnt exist, no sprites icon = 'icons/obj/clothing/hats_ch.dmi' - icon_override = 'icons/mob/head_ch.dmi' + icon_override = 'modular_chomp/icons/mob/head_ch.dmi' icon_state = "crown" item_state = "crown" name = "crown" @@ -35,7 +35,7 @@ name = "Crown of the golden goose king" desc = "It's the crown given to the goose king from the golden goose casino, what an honor!" icon = 'icons/obj/clothing/hats_ch.dmi' - icon_override = 'icons/mob/head_ch.dmi' + icon_override = 'modular_chomp/icons/mob/head_ch.dmi' icon_state = "goose_king" item_state = "goose_king" @@ -48,7 +48,7 @@ name = "Crown of the golden goose queen" desc = "It's the crown given to the goose queen from the golden goose casino, what an honor!" icon = 'icons/obj/clothing/hats_ch.dmi' - icon_override = 'icons/mob/head_ch.dmi' + icon_override = 'modular_chomp/icons/mob/head_ch.dmi' icon_state = "goose_queen" item_state = "goose_queen" @@ -60,7 +60,7 @@ name = "Bear pelt" desc = "A luxurious bear pelt, good to keep warm in winter. Or to sleep through winter." icon = 'icons/obj/clothing/hats_ch.dmi' - icon_override = 'icons/mob/head_ch.dmi' + icon_override = 'modular_chomp/icons/mob/head_ch.dmi' icon_state = "bearpelt_brown" item_state = "bearpelt_brown" diff --git a/code/modules/clothing/suits/hooded_ch.dm b/code/modules/clothing/suits/hooded_ch.dm index cf16c5529e..6e20ed575a 100644 --- a/code/modules/clothing/suits/hooded_ch.dm +++ b/code/modules/clothing/suits/hooded_ch.dm @@ -3,7 +3,7 @@ /obj/item/clothing/suit/storage/hooded/wintercoat/security/santa name = "Santa's coat" icon = 'icons/inventory/uniform/item_ch.dmi' - icon_override = 'icons/mob/suit_ch.dmi' + icon_override = 'modular_chomp/icons/mob/suit_ch.dmi' icon_state = "santacoat" item_state_slots = list(slot_r_hand_str = "coatsecurity", slot_l_hand_str = "coatsecurity") hoodtype = /obj/item/clothing/head/hood/winter/security/santa diff --git a/code/modules/mob/living/silicon/robot/robot_vr.dm b/code/modules/mob/living/silicon/robot/robot_vr.dm index ec0cef71b8..4419da3936 100644 --- a/code/modules/mob/living/silicon/robot/robot_vr.dm +++ b/code/modules/mob/living/silicon/robot/robot_vr.dm @@ -157,8 +157,8 @@ if(wideborg == TRUE) if(icontype == "Drake") // Why, Why can't we have normal nice things icon = 'icons/mob/drakeborg/drakeborg_vr.dmi' - else if(icontype == "Secborg model V-3" || icontype == "Mediborg model V-3") //CH edit - icon = 'icons/mob/widerobot_ch.dmi' + else if(icontype == "Secborg model V-3" || icontype == "Mediborg model V-3") //CH edit + icon = 'modular_chomp/icons/mob/widerobot_ch.dmi' else icon = wideborg_dept return diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/hyena/hyena.dm b/code/modules/mob/living/simple_mob/subtypes/animal/hyena/hyena.dm index 4d6b6d0e1d..5e390a0a88 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/hyena/hyena.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/hyena/hyena.dm @@ -18,13 +18,13 @@ They're also cool, and Rykka/Nyria wrote this uwu value = CATALOGUER_REWARD_MEDIUM // Start Defining the mob here -/mob/living/simple_mob/animal/hyena +/mob/living/simple_mob/animal/hyena name = "Hyena" desc = "Yeen! Its fur is a dusty yellow-brown color with black spots, and it has rounded ears... and SHARP TEETH! You inexplicably want to pet it, though." tt_desc = "Crocuta crocuta" catalogue_data = list(/datum/category_item/catalogue/fauna/hyena) - icon = 'icons/mob/animals48x32_ch.dmi' + icon = 'modular_chomp/icons/mob/animals48x32_ch.dmi' icon_state = "yeen" icon_living = "yeen" icon_dead = "yeen_dead" diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/raccoon_ch.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/raccoon_ch.dm index 21a9576f34..5636095e83 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/raccoon_ch.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/raccoon_ch.dm @@ -3,7 +3,7 @@ name = "raccoon" desc = "A raccoon, also known as a trash panda." tt_desc = "E purgamentum raccoonus" - icon = 'icons/mob/animal_ch.dmi' + icon = 'modular_chomp/icons/mob/animal_ch.dmi' icon_state = "raccoon" item_state = "raccoon" icon_living = "raccoon" diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/goose_ch.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/goose_ch.dm index 2d9933ff74..ad45498057 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/goose_ch.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/goose_ch.dm @@ -9,7 +9,7 @@ icon_state = "golden_goose" icon_living = "golden_goose" icon_dead = "golden_goose_dead" - icon = 'icons/mob/animal_ch.dmi' + icon = 'modular_chomp/icons/mob/animal_ch.dmi' faction = "neutral" //Mess with this and the goose will eat anyones face, will eat other factions faces, appropiate considering its a hellbird - Jack diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/mouse_army_ch.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/mouse_army_ch.dm index 2c1d36351b..6303a5ddf3 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/mouse_army_ch.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/mouse_army_ch.dm @@ -3,7 +3,7 @@ real_name = "mouse" desc = "It's a small militarized rodent." tt_desc = "E Mus musculus" - icon = 'icons/mob/animal_ch.dmi' + icon = 'modular_chomp/icons/mob/animal_ch.dmi' icon_state = "mouse_gray" item_state = "mouse_gray" icon_living = "mouse_gray" @@ -358,7 +358,7 @@ name = "\improper Whisker Tank" desc = "A shockingly functional, miniaturized tank. Its inventor is unknown, but widely reviled." catalogue_data = list(/datum/category_item/catalogue/technology/mouse_tank) - icon = 'icons/mob/animal_ch.dmi' + icon = 'modular_chomp/icons/mob/animal_ch.dmi' icon_state = "whisker" wreckage = /obj/structure/loot_pile/mecha/mouse_tank faction = "mouse_army" diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/cultist_ch.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/cultist_ch.dm index 8ae1887a57..0eb8932564 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/cultist_ch.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/cultist_ch.dm @@ -36,7 +36,7 @@ name = "Cultist" desc = "An awfully frail and ghastly looking individual" tt_desc = "NULL" - icon = 'icons/mob/animal_ch.dmi' + icon = 'modular_chomp/icons/mob/animal_ch.dmi' icon_state = "initiate" faction = "cult" mob_class = MOB_CLASS_DEMONIC diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_ch.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_ch.dm index b140575599..d8f15d908c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_ch.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_ch.dm @@ -66,7 +66,7 @@ value = CATALOGUER_REWARD_EASY /mob/living/simple_mob/humanoid/merc - icon = 'icons/mob/animal_ch.dmi' + icon = 'modular_chomp/icons/mob/animal_ch.dmi' catalogue_data = list(/datum/category_item/catalogue/fauna/mercenary/human) /mob/living/simple_mob/humanoid/merc/ranged @@ -293,7 +293,6 @@ /mob/living/simple_mob/humanoid/merc/voxpirate //Don't use this one. name = "vox mannequin" desc = "You shouldn't be seeing this one." - icon = 'icons/mob/animal_ch.dmi' icon_state = "voxpirate" icon_living = "voxpirate" icon_dead = "voxpirate_dead" diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates_ch.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates_ch.dm index de07561e1e..65236cc0eb 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates_ch.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates_ch.dm @@ -19,7 +19,7 @@ name = "Pirate" desc = "Does what he wants cause a pirate is free." tt_desc = "E Homo sapiens" - icon = 'icons/mob/animal_ch.dmi' + icon = 'modular_chomp/icons/mob/animal_ch.dmi' icon_state = "piratemelee" icon_living = "piratemelee" icon_dead = "piratemelee_dead" @@ -68,7 +68,6 @@ name = "Pirate Brush Cutter" desc = "Does what he wants cause a pirate is free. This one has got a machete." tt_desc = "E Homo sapiens" - icon = 'icons/mob/animal_ch.dmi' icon_state = "piratemelee-machete" icon_living = "piratemelee-machete" icon_dead = "piratemelee_dead" @@ -465,7 +464,7 @@ name = "Hull Ripper" desc = "A Ripley modified by pirates. Sports additional riveted armor plating and a jury rigged machine gun in addition to its hull piercing drill." catalogue_data = list(/datum/category_item/catalogue/technology/ripley) - icon = 'icons/mob/animal_ch.dmi' + icon = 'modular_chomp/icons/mob/animal_ch.dmi' icon_state = "pirate" faction = "pirate" wreckage = /obj/structure/loot_pile/mecha/ripley/pirate diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/posessed_ch.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/posessed_ch.dm index 4bea8bb2f1..0f183f17d6 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/posessed_ch.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/posessed_ch.dm @@ -5,7 +5,7 @@ /mob/living/simple_mob/humanoid/possessed name = "old EVA RIG suit" desc = "A light hardsuit for repairs and maintenance to the outside of habitats and vessels. Seems to be worn down and damaged. But it seems to still be moving. Is someone in it?" - icon = 'icons/mob/animal_ch.dmi' + icon = 'modular_chomp/icons/mob/animal_ch.dmi' icon_state = "eva-rig" faction = "Possessed" diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/cyber_horror_ch.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/cyber_horror_ch.dm index 78d6943f81..6dcc192684 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/cyber_horror_ch.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/cyber_horror_ch.dm @@ -2,7 +2,7 @@ /mob/living/simple_mob/mechanical/cyber_horror name = "Cyber horror" desc = "What was once a man, twisted and warped by machine." - icon = 'icons/mob/animal_ch.dmi' + icon = 'modular_chomp/icons/mob/animal_ch.dmi' icon_state = "cyber_horror" icon_dead = "cyber_horror_dead" icon_gib = "cyber_horror_dead" @@ -335,7 +335,7 @@ //These are the projectiles mobs use /obj/item/projectile/beam/drone damage = 3 - + /obj/item/projectile/arc/blue_energy name = "energy missle" icon_state = "force_missile" diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/_construct_ch.dm b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/_construct_ch.dm index badf5687c7..f1ead9f587 100644 --- a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/_construct_ch.dm +++ b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/_construct_ch.dm @@ -3,7 +3,7 @@ //////////////////////////// /mob/living/simple_mob/construct - icon = 'icons/mob/animal_ch.dmi' + icon = 'modular_chomp/icons/mob/animal_ch.dmi' ai_holder_type = /datum/ai_holder/simple_mob/melee /mob/living/simple_mob/construct/artificer diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/chungus.dm b/code/modules/mob/living/simple_mob/subtypes/vore/chungus.dm index 25870129ed..418fdac80d 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/chungus.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/chungus.dm @@ -13,7 +13,7 @@ icon_dead = "chungus-dead" icon_rest = "chungus_rest" faction = "mouse" - icon = 'icons/mob/vore64x32_ch.dmi' + icon = 'modular_chomp/icons/mob/vore64x32_ch.dmi' maxHealth = 200 health = 200 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/deathclaw.dm b/code/modules/mob/living/simple_mob/subtypes/vore/deathclaw.dm index 2ed5f51d87..26056324a1 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/deathclaw.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/deathclaw.dm @@ -27,7 +27,7 @@ icon_dead = "deathclaw-dead" icon_living = "deathclaw" icon_state = "deathclaw" - icon = 'icons/mob/vore64x64_ch.dmi' //CHOMPEdit changed filepath + icon = 'modular_chomp/icons/mob/vore64x64_ch.dmi' //CHOMPEdit changed filepath vis_height = 64 attacktext = list("mauled") diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/demon/demonAI_ch.dm b/code/modules/mob/living/simple_mob/subtypes/vore/demon/demonAI_ch.dm index af94bf5e12..ddd5898dc7 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/demon/demonAI_ch.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/demon/demonAI_ch.dm @@ -6,7 +6,7 @@ icon_living = "boxfox" icon_dead = "dead" icon_rest = "boxfox_rest" - icon = 'icons/mob/demon_ch.dmi' + icon = 'modular_chomp/icons/mob/demon_ch.dmi' vis_height = 47 ai_holder_type = /datum/ai_holder/simple_mob/melee/hit_and_run var/cloaked_alpha = 60 // Lower = Harder to see. diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/demon/demon_ch.dm b/code/modules/mob/living/simple_mob/subtypes/vore/demon/demon_ch.dm index 55d3cf16a3..b57d7e23a2 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/demon/demon_ch.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/demon/demon_ch.dm @@ -6,7 +6,7 @@ icon_living = "boxfox" icon_dead = "dead" icon_rest = "boxfox_rest" - icon = 'icons/mob/demon_ch.dmi' + icon = 'modular_chomp/icons/mob/demon_ch.dmi' vis_height = 47 faction = "demon" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/goia_ch.dm b/code/modules/mob/living/simple_mob/subtypes/vore/goia_ch.dm index b42aef8b00..94ec99eeee 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/goia_ch.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/goia_ch.dm @@ -2,7 +2,7 @@ name = "zorgoia" desc = "It's a a reptilian mammal hybrid, known for its voracious nature and love for fruits. By more popular terms its refered to as the furry slinky!" tt_desc = "Zorgoyuh slinkus" - icon = 'icons/mob/vore64x32_ch.dmi' + icon = 'modular_chomp/icons/mob/vore64x32_ch.dmi' icon_state = "zorgoia" icon_living = "zorgoia" icon_dead = "zorgoia-dead" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander_ch.dm b/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander_ch.dm index 7194b2a952..4f7e9e6bed 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander_ch.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander_ch.dm @@ -3,7 +3,7 @@ desc = "A huge salamander-like drake. They are best known for their rarity, their voracity, their very potent paralyzing venom, and their healing stomach. This one is white." catalogue_data = list(/datum/category_item/catalogue/fauna/leopardmander) tt_desc = "S Draconis uncia" - icon = 'icons/mob/vore128x64_ch.dmi' + icon = 'modular_chomp/icons/mob/vore128x64_ch.dmi' icon_dead = "leopardmander-dead" icon_living = "leopardmander" icon_state = "leopardmander" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/lizardman.dm b/code/modules/mob/living/simple_mob/subtypes/vore/lizardman.dm index 8f7489284e..c2ee309206 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/lizardman.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/lizardman.dm @@ -3,7 +3,7 @@ desc = "That is one buff, angry lizard." tt_desc = "E Anolis cuvieri muscular" - icon = 'icons/mob/vore32x64_ch.dmi' + icon = 'modular_chomp/icons/mob/vore32x64_ch.dmi' icon_state = "lizardman" icon_living = "lizardman" icon_dead = "lizardman-dead" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm b/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm index 93961a52b3..302493b86e 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm @@ -77,7 +77,7 @@ icon_state = "crate" icon_living = "crate" - icon = 'icons/mob/animal_ch.dmi' //CHOMPEdit + icon = 'modular_chomp/icons/mob/animal_ch.dmi' //CHOMPEdit faction = "mimic" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/mimic_ch.dm b/code/modules/mob/living/simple_mob/subtypes/vore/mimic_ch.dm index 0a9528881f..4fcc9afc06 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/mimic_ch.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/mimic_ch.dm @@ -1,7 +1,7 @@ /obj/structure/closet/crate/mimic/airlock name = "Dusty Airlock" desc = "It opens and closes. Though it appears it has been a while since it opened." - icon = 'icons/mob/animal_ch.dmi' + icon = 'modular_chomp/icons/mob/animal_ch.dmi' icon_state = "amimic" mimic_chance = 30 anchored = 1 //You will not be able to push back the airlock mimic @@ -94,7 +94,7 @@ /obj/structure/closet/crate/mimic/closet name = "old closet" desc = "It's a basic storage unit. It seems awfully rickety." - icon = 'icons/mob/animal_ch.dmi' + icon = 'modular_chomp/icons/mob/animal_ch.dmi' icon_state = "cmimic" mimic_chance = 30 mimic_active = TRUE @@ -193,7 +193,7 @@ desc = "The boards here look rather loose." density = 0 anchored = 1 - icon = 'icons/mob/animal_ch.dmi' + icon = 'modular_chomp/icons/mob/animal_ch.dmi' icon_state = "wmimic" var/mimic_chance = 30 var/mimic_active = TRUE diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/plants_ch/pitcher.dm b/code/modules/mob/living/simple_mob/subtypes/vore/plants_ch/pitcher.dm index b93ebbe0b7..ab2309f837 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/plants_ch/pitcher.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/plants_ch/pitcher.dm @@ -21,7 +21,7 @@ GLOBAL_LIST_INIT(pitcher_plant_lure_messages, list( icon_state = "pitcher_plant" icon_living = "pitcher_plant" icon_dead = "pitcher_plant_dead" - icon = 'icons/mob/vore_ch.dmi' + icon = 'modular_chomp/icons/mob/vore_ch.dmi' anchored = 1 //Rooted plant. Only killing it will let you move it. maxHealth = 200 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/slug_ch.dm b/code/modules/mob/living/simple_mob/subtypes/vore/slug_ch.dm index b6293fdeef..d43ea7f622 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/slug_ch.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/slug_ch.dm @@ -5,7 +5,7 @@ desc = "A giant, cold-tolerant slug. It seems excessively passive." catalogue_data = list(/datum/category_item/catalogue/fauna/slug) tt_desc = "S Arion hortensis" - icon = 'icons/mob/vore_ch.dmi' + icon = 'modular_chomp/icons/mob/vore_ch.dmi' icon_dead = "slug-dead" icon_living = "slug" icon_state = "slug" diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index ce28a419f5..906e72ae2f 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -998,7 +998,7 @@ // Full screen belly overlays! /obj/screen/fullscreen/belly - icon = 'icons/mob/screen_full_vore_ch.dmi' //CHOMPedit + icon = 'modular_chomp/icons/mob/screen_full_vore_ch.dmi' //CHOMPedit icon_state = "" /mob/living/proc/vorebelly_printout() //Spew the vorepanel belly messages into chat window for copypasting. diff --git a/code/modules/vore/eating/vorepanel_ch.dm b/code/modules/vore/eating/vorepanel_ch.dm index cececd70f1..8be7a153fb 100644 --- a/code/modules/vore/eating/vorepanel_ch.dm +++ b/code/modules/vore/eating/vorepanel_ch.dm @@ -1,12 +1,12 @@ -//CHOMP - liquid bellies //These variables have been moved to belly_obj_ch.dm, keeping comments here for reference +//CHOMP - liquid bellies //These variables have been moved to belly_obj_ch.dm, keeping comments here for reference /* /datum/vore_look var/show_liquids = FALSE var/show_fullness_messages = FALSE -*/ +*/ /obj/screen/belly_fullscreen_preview - icon = 'icons/mob/screen_full_vore_ch.dmi' + icon = 'modular_chomp/icons/mob/screen_full_vore_ch.dmi' icon_state = "" appearance_flags = 0 diff --git a/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm b/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm index bdcb48acb9..75bc85f2b8 100644 --- a/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm +++ b/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm @@ -3,7 +3,7 @@ name = "protean blob" desc = "Some sort of big viscous pool of jelly." tt_desc = "Animated nanogoop" - icon = 'icons/mob/species/protean/protean.dmi' + icon = 'modular_chomp/icons/mob/species/protean/protean.dmi' icon_state = "to_puddle" icon_living = "puddle2" icon_rest = "rest" diff --git a/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_rig.dm b/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_rig.dm index 3e0fa1e6db..2f22809db1 100644 --- a/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_rig.dm +++ b/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_rig.dm @@ -5,7 +5,7 @@ name = "nanosuit control cluster" suit_type = "nanomachine" icon = 'icons/obj/rig_modules_ch.dmi' - default_mob_icon = 'icons/mob/rig_back_ch.dmi' + default_mob_icon = 'modular_chomp/icons/mob/rig_back_ch.dmi' icon_state = "nanomachine_rig" armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 100) siemens_coefficient= 1