diff --git a/code/modules/mob/living/carbon/alien/update_icons.dm b/code/modules/mob/living/carbon/alien/alien_update_icons.dm similarity index 100% rename from code/modules/mob/living/carbon/alien/update_icons.dm rename to code/modules/mob/living/carbon/alien/alien_update_icons.dm diff --git a/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm similarity index 100% rename from code/modules/mob/living/carbon/alien/humanoid/update_icons.dm rename to code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm diff --git a/code/modules/mob/living/carbon/alien/larva/update_icons.dm b/code/modules/mob/living/carbon/alien/larva/larva_update_icons.dm similarity index 100% rename from code/modules/mob/living/carbon/alien/larva/update_icons.dm rename to code/modules/mob/living/carbon/alien/larva/larva_update_icons.dm diff --git a/code/modules/mob/living/carbon/update_icons.dm b/code/modules/mob/living/carbon/carbon_update_icons.dm similarity index 100% rename from code/modules/mob/living/carbon/update_icons.dm rename to code/modules/mob/living/carbon/carbon_update_icons.dm diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/human_update_icons.dm similarity index 100% rename from code/modules/mob/living/carbon/human/update_icons.dm rename to code/modules/mob/living/carbon/human/human_update_icons.dm diff --git a/code/modules/mob/living/carbon/monkey/update_icons.dm b/code/modules/mob/living/carbon/monkey/monkey_update_icons.dm similarity index 100% rename from code/modules/mob/living/carbon/monkey/update_icons.dm rename to code/modules/mob/living/carbon/monkey/monkey_update_icons.dm diff --git a/code/modules/mob/living/update_icons.dm b/code/modules/mob/living/living_update_icons.dm similarity index 100% rename from code/modules/mob/living/update_icons.dm rename to code/modules/mob/living/living_update_icons.dm diff --git a/code/modules/mob/living/silicon/pai/update_icon.dm b/code/modules/mob/living/silicon/pai/pai_update_icon.dm similarity index 100% rename from code/modules/mob/living/silicon/pai/update_icon.dm rename to code/modules/mob/living/silicon/pai/pai_update_icon.dm diff --git a/code/modules/mob/living/silicon/robot/update_icons.dm b/code/modules/mob/living/silicon/robot/robot_update_icons.dm similarity index 100% rename from code/modules/mob/living/silicon/robot/update_icons.dm rename to code/modules/mob/living/silicon/robot/robot_update_icons.dm diff --git a/code/modules/mob/update_icons.dm b/code/modules/mob/mob_update_icons.dm similarity index 100% rename from code/modules/mob/update_icons.dm rename to code/modules/mob/mob_update_icons.dm diff --git a/html/changelogs/archive/2023-10.yml b/html/changelogs/archive/2023-10.yml index 18f2477f22..e8f06cd36d 100644 --- a/html/changelogs/archive/2023-10.yml +++ b/html/changelogs/archive/2023-10.yml @@ -28,3 +28,15 @@ - bugfix: Fixes the bug of assistants not receiving backpack donator items yip: - rscadd: yip +2023-10-12: + Kuki-kono: + - bugfix: Gladiator no longer stays invincible +2023-10-16: + AshTheDerg: + - rscadd: Added tailbags + MysteryMan21333: + - code_imp: Small changes to naming. + Zattarra: + - rscadd: Adds holo HUD sunglasses to the game, invisible versions of normal HUD + sunglasses. + - rscadd: Implements holo HUD sunglasses to the loadout screen. diff --git a/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/gladiator.dm b/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/gladiator.dm index 752072b66c..da10952629 100644 --- a/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/gladiator.dm +++ b/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/gladiator.dm @@ -239,27 +239,32 @@ They deal 35 brute (armor is considered). speenturfs.len = temp.len var/woop = FALSE var/start = 0 - for(var/i in 0 to speenrange) - speenturfs[1+i] = locate(x - i, y - speenrange, z) - start = i - for(var/i in 1 to (speenrange*2)) - var/turf/T = speenturfs[start] - speenturfs[start+i] = locate(T.x, T.y + i, T.z) - if(i == (speenrange*2)) - start = (start+i) - for(var/i in 1 to (speenrange*2)) - var/turf/T = speenturfs[start] - speenturfs[start+i] = locate(T.x + i, T.y, T.z) - if(i == (speenrange*2)) - start = (start+i) - for(var/i in 1 to (speenrange*2)) - var/turf/T = speenturfs[start] - speenturfs[start+i] = locate(T.x, T.y - i, T.z) - if(i == (speenrange*2)) - start = (start+i) - for(var/i in 1 to speenrange) - var/turf/T = speenturfs[start] - speenturfs[start+i] = locate(T.x - i, T.y, T.z) + if(speenturfs.len > (start+speenrange)) + for(var/i in 0 to speenrange) + speenturfs[1+i] = locate(x - i, y - speenrange, z) + start = i + if(speenturfs.len > (start+(speenrange*2))) + for(var/i in 1 to (speenrange*2)) + var/turf/T = speenturfs[start] + speenturfs[start+i] = locate(T.x, T.y + i, T.z) + if(i == (speenrange*2)) + start = (start+i) + if(speenturfs.len > (start+(speenrange*2))) + for(var/i in 1 to (speenrange*2)) + var/turf/T = speenturfs[start] + speenturfs[start+i] = locate(T.x + i, T.y, T.z) + if(i == (speenrange*2)) + start = (start+i) + if(speenturfs.len > (start+(speenrange*2))) + for(var/i in 1 to (speenrange*2)) + var/turf/T = speenturfs[start] + speenturfs[start+i] = locate(T.x, T.y - i, T.z) + if(i == (speenrange*2)) + start = (start+i) + if(speenturfs.len > (start+speenrange)) + for(var/i in 1 to speenrange) + var/turf/T = speenturfs[start] + speenturfs[start+i] = locate(T.x - i, T.y, T.z) var/list/hit_things = list() for(var/turf/T in speenturfs) src.dir = get_dir(src, T) diff --git a/modular_splurt/code/game/objects/items/storage/tailbag.dm b/modular_splurt/code/game/objects/items/storage/tailbag.dm new file mode 100644 index 0000000000..0b9b4764f3 --- /dev/null +++ b/modular_splurt/code/game/objects/items/storage/tailbag.dm @@ -0,0 +1,136 @@ +/obj/item/storage/tailbag + name = "tailbag" + desc = "A bag for holding small items. It fastens around the base of the tail." + icon = 'modular_splurt/icons/obj/storage.dmi' + icon_state = "tailbag" + w_class = WEIGHT_CLASS_SMALL + resistance_flags = FLAMMABLE + slot_flags = ITEM_SLOT_ID + + var/obj/item/card/id/front_id = null + var/list/combined_access + +/obj/item/storage/tailbag/ComponentInitialize() + . = ..() + var/datum/component/storage/STR = GetComponent(/datum/component/storage) + STR.max_items = 6 + STR.cant_hold = typecacheof(list(/obj/item/screwdriver/power)) + STR.can_hold = typecacheof(list( + /obj/item/stack/spacecash, + /obj/item/holochip, + /obj/item/card, + /obj/item/clothing/mask/cigarette, + /obj/item/flashlight/pen, + /obj/item/seeds, + /obj/item/stack/medical, + /obj/item/toy/crayon, + /obj/item/coin, + /obj/item/dice, + /obj/item/disk, + /obj/item/implanter, + /obj/item/lighter, + /obj/item/lipstick, + /obj/item/match, + /obj/item/paper, + /obj/item/pen, + /obj/item/photo, + /obj/item/reagent_containers/dropper, + /obj/item/reagent_containers/syringe, + /obj/item/screwdriver, + /obj/item/multitool, + /obj/item/wrench, + /obj/item/wirecutters, + /obj/item/valentine, + /obj/item/stamp, + /obj/item/key, + /obj/item/cartridge, + /obj/item/camera_film, + /obj/item/stack/ore/bluespace_crystal, + /obj/item/reagent_containers/food/snacks/grown/poppy, + /obj/item/instrument/harmonica, + /obj/item/mining_voucher, + /obj/item/suit_voucher, + /obj/item/reagent_containers/pill, + /obj/item/gun/ballistic/derringer, + /obj/item/genital_equipment/condom, + /obj/item/restraints/handcuffs, + /obj/item/assembly/flash, + /obj/item/laser_pointer, + /obj/item/pda, + /obj/item/paicard)) + +/obj/item/storage/tailbag/Exited(atom/movable/AM) + . = ..() + refreshID() + +/obj/item/storage/tailbag/proc/refreshID() + LAZYCLEARLIST(combined_access) + if(!(front_id in src)) + front_id = null + for(var/obj/item/card/id/I in contents) + if(!front_id) + front_id = I + LAZYINITLIST(combined_access) + combined_access |= I.access + update_icon() + +/obj/item/storage/tailbag/Entered(atom/movable/AM) + . = ..() + refreshID() + +/obj/item/storage/tailbag/update_icon_state() + var/new_state = "tailbag" + if(front_id) + new_state = "tailbag_id" + if(new_state != icon_state) //avoid so many icon state changes. + icon_state = new_state + +/obj/item/storage/tailbag/GetID() + return front_id + +/obj/item/storage/tailbag/RemoveID() + if(!front_id) + return + . = front_id + front_id.forceMove(get_turf(src)) + +/obj/item/storage/tailbag/InsertID(obj/item/inserting_item) + var/obj/item/card/inserting_id = inserting_item.RemoveID() + if(!inserting_id) + return FALSE + attackby(inserting_id) + if(inserting_id in contents) + return TRUE + return FALSE + +/obj/item/storage/tailbag/GetAccess() + if(LAZYLEN(combined_access)) + return combined_access + else + return ..() + +/obj/item/storage/tailbag/xtralg + name = "XL Tailbag" + desc = "A larger tail bag for larger creatures" + icon = 'modular_splurt/icons/obj/storage.dmi' + icon_state = "tailbag_xl" + +/obj/item/storage/tailbag/xtralg/ComponentInitialize() + . = ..() + var/datum/component/storage/STR = GetComponent(/datum/component/storage) + STR.max_items = 8 + +/datum/crafting_recipe/tailbag + name = "Tailbag" + result = /obj/item/storage/tailbag + reqs = list(/obj/item/stack/sheet/leather = 2) + time = 30 + category = CAT_CLOTHING + +/datum/crafting_recipe/tailbag_xl + name = "XL Tailbag" + result = /obj/item/storage/tailbag/xtralg + reqs = list(/obj/item/storage/tailbag = 1, + /obj/item/stack/sheet/leather = 2) + time = 30 + category = CAT_CLOTHING diff --git a/modular_splurt/code/modules/antagonists/wendigo/mob/update_icons.dm b/modular_splurt/code/modules/antagonists/wendigo/mob/wendigo_update_icons.dm similarity index 100% rename from modular_splurt/code/modules/antagonists/wendigo/mob/update_icons.dm rename to modular_splurt/code/modules/antagonists/wendigo/mob/wendigo_update_icons.dm diff --git a/modular_splurt/code/modules/client/loadout/glasses.dm b/modular_splurt/code/modules/client/loadout/glasses.dm index 74c8a440b1..61979e2bc8 100644 --- a/modular_splurt/code/modules/client/loadout/glasses.dm +++ b/modular_splurt/code/modules/client/loadout/glasses.dm @@ -36,3 +36,23 @@ /datum/gear/glasses/aviators name = "Aviators" path = /obj/item/clothing/glasses/aviators + +/datum/gear/glasses/blueshield/holo + name = "Holo Blueshield HUD Glasses" + path = /obj/item/clothing/glasses/hud/blueshield/holo + restricted_roles = list("Blueshield") + +/datum/gear/glasses/blueshield/holo/prescription + name = "Prescription Holo Blueshield HUD Glasses" + path = /obj/item/clothing/glasses/hud/blueshield/holo/prescription + restricted_roles = list("Blueshield") + +/datum/gear/glasses/security/sunglasses/holo + name = "Holo Secuirity HUD Glasses" + path = /obj/item/clothing/glasses/hud/security/sunglasses/holo + restricted_roles = list("Security Officer", "Warden", "Head of Security") + +/datum/gear/glasses/security/sunglasses/holo/prescription + name = "Prescription Holo Secuirity HUD Glasses" + path = /obj/item/clothing/glasses/hud/security/sunglasses/holo/prescription + restricted_roles = list("Security Officer", "Warden", "Head of Security") diff --git a/modular_splurt/code/modules/client/loadout/hands.dm b/modular_splurt/code/modules/client/loadout/hands.dm index 07f6391c69..e5dcf4ae64 100644 --- a/modular_splurt/code/modules/client/loadout/hands.dm +++ b/modular_splurt/code/modules/client/loadout/hands.dm @@ -1,5 +1,11 @@ -/datum/gear/hands/paicard - name = "pAI device" - description = "A personal AI device for checking and downloading various personalities." - path = /obj/item/paicard - cost = 3 +/datum/gear/hands/paicard + name = "pAI device" + description = "A personal AI device for checking and downloading various personalities." + path = /obj/item/paicard + cost = 3 + +/datum/gear/hands/tailbag + name = "Tailbag" + description = "A bag for holding small personal items, which fastens around the base of the tail." + path = /obj/item/storage/tailbag + cost = 1 diff --git a/modular_splurt/code/modules/clothing/glasses/hud.dm b/modular_splurt/code/modules/clothing/glasses/hud.dm index e6df06cf4a..4ba68c4547 100644 --- a/modular_splurt/code/modules/clothing/glasses/hud.dm +++ b/modular_splurt/code/modules/clothing/glasses/hud.dm @@ -80,6 +80,46 @@ desc = "A HUD with multiple functions. Equipped with prescription lenses." vision_correction = 1 +/obj/item/clothing/glasses/hud/blueshield/holo + name = "holo blueshield HUD glasses" + desc = "A HUD with multiple functions. Nearly invisible when worn. Still protects from flashes." + actions_types = list(/datum/action/item_action/switch_hud) + icon_state = "holohudmed" + icon = 'modular_splurt/icons/obj/clothing/glasses.dmi' + item_state = "holo" + mob_overlay_icon = 'modular_splurt/icons/mobs/eyes.dmi' + flash_protect = 1 + +/obj/item/clothing/glasses/hud/blueshield/holo/attack_self(mob/user) + if(!ishuman(user)) + return + var/mob/living/carbon/human/wearer = user + if (wearer.glasses != src) + return + + if (hud_type) + var/datum/atom_hud/H = GLOB.huds[hud_type] + H.remove_hud_from(user) + + if (hud_type == DATA_HUD_MEDICAL_ADVANCED) + hud_type = null + icon_state = "holohud" + else if (hud_type == DATA_HUD_SECURITY_ADVANCED) + hud_type = DATA_HUD_MEDICAL_ADVANCED + icon_state = "holohudmed" + else + hud_type = DATA_HUD_SECURITY_ADVANCED + icon_state = "holohudsec" + + if (hud_type) + var/datum/atom_hud/H = GLOB.huds[hud_type] + H.add_hud_to(user) + +/obj/item/clothing/glasses/hud/blueshield/holo/prescription + name = "prescription holo blueshield HUD glasses" + desc = "A HUD with multiple functions. Nearly invisible when worn. Equipped with prescription lenses." + vision_correction = 1 + // Med HUDs /obj/item/clothing/glasses/hud/health/sunglasses/aviators @@ -108,6 +148,19 @@ desc = "aviators with a security HUD with prescription lenses." vision_correction = 1 +/obj/item/clothing/glasses/hud/security/sunglasses/holo + name = "holo security HUD glasses" + desc = "Sunglasses with a security HUD. Nearly invisible when worn." + icon_state = "holohudsec" + icon = 'modular_splurt/icons/obj/clothing/glasses.dmi' + item_state = "holo" + mob_overlay_icon = 'modular_splurt/icons/mobs/eyes.dmi' + +/obj/item/clothing/glasses/hud/security/sunglasses/holo/prescription + name = "prescription holo security HUD glasses" + desc = "Sunglasses with a security HUD. Nearly invisible when worn. Equipped with prescription lenses." + vision_correction = 1 + // Diag HUDs /obj/item/clothing/glasses/hud/diagnostic/sunglasses/aviators diff --git a/modular_splurt/code/modules/mob/living/carbon/human/update_icons.dm b/modular_splurt/code/modules/mob/living/carbon/human/human_update_icons.dm similarity index 100% rename from modular_splurt/code/modules/mob/living/carbon/human/update_icons.dm rename to modular_splurt/code/modules/mob/living/carbon/human/human_update_icons.dm diff --git a/modular_splurt/code/modules/mob/living/update_icons.dm b/modular_splurt/code/modules/mob/living/living_update_icons.dm similarity index 100% rename from modular_splurt/code/modules/mob/living/update_icons.dm rename to modular_splurt/code/modules/mob/living/living_update_icons.dm diff --git a/modular_splurt/icons/mobs/eyes.dmi b/modular_splurt/icons/mobs/eyes.dmi index 8b8e22abb9..ecb7098a4f 100644 Binary files a/modular_splurt/icons/mobs/eyes.dmi and b/modular_splurt/icons/mobs/eyes.dmi differ diff --git a/modular_splurt/icons/obj/clothing/glasses.dmi b/modular_splurt/icons/obj/clothing/glasses.dmi index 3c19a1f5f8..b74feabf85 100644 Binary files a/modular_splurt/icons/obj/clothing/glasses.dmi and b/modular_splurt/icons/obj/clothing/glasses.dmi differ diff --git a/modular_splurt/icons/obj/storage.dmi b/modular_splurt/icons/obj/storage.dmi index 6ff028b18c..49377b6b9e 100644 Binary files a/modular_splurt/icons/obj/storage.dmi and b/modular_splurt/icons/obj/storage.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 99f6cbb4a3..10881a1f03 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -2629,12 +2629,12 @@ #include "code\modules\mob\mob_lists.dm" #include "code\modules\mob\mob_movement.dm" #include "code\modules\mob\mob_transformation_simple.dm" +#include "code\modules\mob\mob_update_icons.dm" #include "code\modules\mob\say.dm" #include "code\modules\mob\say_vr.dm" #include "code\modules\mob\status_procs.dm" #include "code\modules\mob\transform_procs.dm" #include "code\modules\mob\typing_indicator.dm" -#include "code\modules\mob\update_icons.dm" #include "code\modules\mob\camera\camera.dm" #include "code\modules\mob\dead\dead.dm" #include "code\modules\mob\dead\new_player\login.dm" @@ -2689,6 +2689,7 @@ #include "code\modules\mob\living\living_movement.dm" #include "code\modules\mob\living\living_signals.dm" #include "code\modules\mob\living\living_sprint.dm" +#include "code\modules\mob\living\living_update_icons.dm" #include "code\modules\mob\living\login.dm" #include "code\modules\mob\living\logout.dm" #include "code\modules\mob\living\say.dm" @@ -2696,7 +2697,6 @@ #include "code\modules\mob\living\stamina_buffer.dm" #include "code\modules\mob\living\status_procs.dm" #include "code\modules\mob\living\taste.dm" -#include "code\modules\mob\living\update_icons.dm" #include "code\modules\mob\living\ventcrawling.dm" #include "code\modules\mob\living\brain\brain.dm" #include "code\modules\mob\living\brain\brain_item.dm" @@ -2715,6 +2715,7 @@ #include "code\modules\mob\living\carbon\carbon_movement.dm" #include "code\modules\mob\living\carbon\carbon_sprint.dm" #include "code\modules\mob\living\carbon\carbon_stripping.dm" +#include "code\modules\mob\living\carbon\carbon_update_icons.dm" #include "code\modules\mob\living\carbon\damage_procs.dm" #include "code\modules\mob\living\carbon\death.dm" #include "code\modules\mob\living\carbon\emote.dm" @@ -2724,9 +2725,9 @@ #include "code\modules\mob\living\carbon\life.dm" #include "code\modules\mob\living\carbon\say.dm" #include "code\modules\mob\living\carbon\status_procs.dm" -#include "code\modules\mob\living\carbon\update_icons.dm" #include "code\modules\mob\living\carbon\alien\alien.dm" #include "code\modules\mob\living\carbon\alien\alien_defense.dm" +#include "code\modules\mob\living\carbon\alien\alien_update_icons.dm" #include "code\modules\mob\living\carbon\alien\damage_procs.dm" #include "code\modules\mob\living\carbon\alien\death.dm" #include "code\modules\mob\living\carbon\alien\emote.dm" @@ -2737,14 +2738,13 @@ #include "code\modules\mob\living\carbon\alien\say.dm" #include "code\modules\mob\living\carbon\alien\screen.dm" #include "code\modules\mob\living\carbon\alien\status_procs.dm" -#include "code\modules\mob\living\carbon\alien\update_icons.dm" #include "code\modules\mob\living\carbon\alien\humanoid\alien_powers.dm" #include "code\modules\mob\living\carbon\alien\humanoid\death.dm" #include "code\modules\mob\living\carbon\alien\humanoid\humanoid.dm" #include "code\modules\mob\living\carbon\alien\humanoid\humanoid_defense.dm" +#include "code\modules\mob\living\carbon\alien\humanoid\humanoid_update_icons.dm" #include "code\modules\mob\living\carbon\alien\humanoid\life.dm" #include "code\modules\mob\living\carbon\alien\humanoid\queen.dm" -#include "code\modules\mob\living\carbon\alien\humanoid\update_icons.dm" #include "code\modules\mob\living\carbon\alien\humanoid\caste\drone.dm" #include "code\modules\mob\living\carbon\alien\humanoid\caste\hunter.dm" #include "code\modules\mob\living\carbon\alien\humanoid\caste\praetorian.dm" @@ -2753,9 +2753,9 @@ #include "code\modules\mob\living\carbon\alien\larva\inventory.dm" #include "code\modules\mob\living\carbon\alien\larva\larva.dm" #include "code\modules\mob\living\carbon\alien\larva\larva_defense.dm" +#include "code\modules\mob\living\carbon\alien\larva\larva_update_icons.dm" #include "code\modules\mob\living\carbon\alien\larva\life.dm" #include "code\modules\mob\living\carbon\alien\larva\powers.dm" -#include "code\modules\mob\living\carbon\alien\larva\update_icons.dm" #include "code\modules\mob\living\carbon\alien\special\alien_embryo.dm" #include "code\modules\mob\living\carbon\alien\special\facehugger.dm" #include "code\modules\mob\living\carbon\human\damage_procs.dm" @@ -2772,6 +2772,7 @@ #include "code\modules\mob\living\carbon\human\human_mobility.dm" #include "code\modules\mob\living\carbon\human\human_movement.dm" #include "code\modules\mob\living\carbon\human\human_stripping.dm" +#include "code\modules\mob\living\carbon\human\human_update_icons.dm" #include "code\modules\mob\living\carbon\human\inventory.dm" #include "code\modules\mob\living\carbon\human\life.dm" #include "code\modules\mob\living\carbon\human\login.dm" @@ -2780,7 +2781,6 @@ #include "code\modules\mob\living\carbon\human\species.dm" #include "code\modules\mob\living\carbon\human\status_procs.dm" #include "code\modules\mob\living\carbon\human\typing_indicator.dm" -#include "code\modules\mob\living\carbon\human\update_icons.dm" #include "code\modules\mob\living\carbon\human\innate_abilities\blobform.dm" #include "code\modules\mob\living\carbon\human\innate_abilities\coiling.dm" #include "code\modules\mob\living\carbon\human\innate_abilities\customization.dm" @@ -2816,8 +2816,8 @@ #include "code\modules\mob\living\carbon\monkey\life.dm" #include "code\modules\mob\living\carbon\monkey\monkey.dm" #include "code\modules\mob\living\carbon\monkey\monkey_defense.dm" +#include "code\modules\mob\living\carbon\monkey\monkey_update_icons.dm" #include "code\modules\mob\living\carbon\monkey\punpun.dm" -#include "code\modules\mob\living\carbon\monkey\update_icons.dm" #include "code\modules\mob\living\silicon\custom_holoform.dm" #include "code\modules\mob\living\silicon\damage_procs.dm" #include "code\modules\mob\living\silicon\death.dm" @@ -2849,10 +2849,10 @@ #include "code\modules\mob\living\silicon\pai\pai.dm" #include "code\modules\mob\living\silicon\pai\pai_defense.dm" #include "code\modules\mob\living\silicon\pai\pai_shell.dm" +#include "code\modules\mob\living\silicon\pai\pai_update_icon.dm" #include "code\modules\mob\living\silicon\pai\personality.dm" #include "code\modules\mob\living\silicon\pai\say.dm" #include "code\modules\mob\living\silicon\pai\software.dm" -#include "code\modules\mob\living\silicon\pai\update_icon.dm" #include "code\modules\mob\living\silicon\robot\death.dm" #include "code\modules\mob\living\silicon\robot\emote.dm" #include "code\modules\mob\living\silicon\robot\examine.dm" @@ -2867,8 +2867,8 @@ #include "code\modules\mob\living\silicon\robot\robot_modules.dm" #include "code\modules\mob\living\silicon\robot\robot_movement.dm" #include "code\modules\mob\living\silicon\robot\robot_sprint.dm" +#include "code\modules\mob\living\silicon\robot\robot_update_icons.dm" #include "code\modules\mob\living\silicon\robot\say.dm" -#include "code\modules\mob\living\silicon\robot\update_icons.dm" #include "code\modules\mob\living\simple_animal\animal_defense.dm" #include "code\modules\mob\living\simple_animal\astral.dm" #include "code\modules\mob\living\simple_animal\constructs.dm" @@ -4522,6 +4522,7 @@ #include "modular_splurt\code\game\objects\items\storage\boxes.dm" #include "modular_splurt\code\game\objects\items\storage\firstaid.dm" #include "modular_splurt\code\game\objects\items\storage\secure.dm" +#include "modular_splurt\code\game\objects\items\storage\tailbag.dm" #include "modular_splurt\code\game\objects\items\storage\wallets.dm" #include "modular_splurt\code\game\objects\items\weaponry\armyknife.dm" #include "modular_splurt\code\game\objects\items\weaponry\melee.dm" @@ -4598,8 +4599,8 @@ #include "modular_splurt\code\modules\antagonists\wendigo\mob\mob_defense.dm" #include "modular_splurt\code\modules\antagonists\wendigo\mob\mob_equip.dm" #include "modular_splurt\code\modules\antagonists\wendigo\mob\organs_bodyparts.dm" -#include "modular_splurt\code\modules\antagonists\wendigo\mob\update_icons.dm" #include "modular_splurt\code\modules\antagonists\wendigo\mob\wendigo_defense.dm" +#include "modular_splurt\code\modules\antagonists\wendigo\mob\wendigo_update_icons.dm" #include "modular_splurt\code\modules\arousal\arousal.dm" #include "modular_splurt\code\modules\arousal\genitals.dm" #include "modular_splurt\code\modules\arousal\genitals_sprite_accessories.dm" @@ -4812,11 +4813,11 @@ #include "modular_splurt\code\modules\mob\living\living_mobility.dm" #include "modular_splurt\code\modules\mob\living\living_movement.dm" #include "modular_splurt\code\modules\mob\living\living_signals.dm" +#include "modular_splurt\code\modules\mob\living\living_update_icons.dm" #include "modular_splurt\code\modules\mob\living\login.dm" #include "modular_splurt\code\modules\mob\living\logout.dm" #include "modular_splurt\code\modules\mob\living\navigation.dm" #include "modular_splurt\code\modules\mob\living\say.dm" -#include "modular_splurt\code\modules\mob\living\update_icons.dm" #include "modular_splurt\code\modules\mob\living\brain\brain_item.dm" #include "modular_splurt\code\modules\mob\living\carbon\carbon.dm" #include "modular_splurt\code\modules\mob\living\carbon\carbon_defense.dm" @@ -4824,10 +4825,10 @@ #include "modular_splurt\code\modules\mob\living\carbon\human\human.dm" #include "modular_splurt\code\modules\mob\living\carbon\human\human_defense.dm" #include "modular_splurt\code\modules\mob\living\carbon\human\human_defines.dm" +#include "modular_splurt\code\modules\mob\living\carbon\human\human_update_icons.dm" #include "modular_splurt\code\modules\mob\living\carbon\human\inventory.dm" #include "modular_splurt\code\modules\mob\living\carbon\human\physiology.dm" #include "modular_splurt\code\modules\mob\living\carbon\human\species.dm" -#include "modular_splurt\code\modules\mob\living\carbon\human\update_icons.dm" #include "modular_splurt\code\modules\mob\living\carbon\human\species_types\arachnid.dm" #include "modular_splurt\code\modules\mob\living\carbon\human\species_types\ashwalker.dm" #include "modular_splurt\code\modules\mob\living\carbon\human\species_types\ipc.dm"