Убивайте всех, хеддев узнает своих

SierraBay · Nov 30, 2023 · 2936e96 · 2936e96
1 parent b105ea4
commit 2936e96
Show file tree

Hide file tree

Showing 44 changed files with 2 additions and 150 deletions.
diff --git a/mods/_maps/liberia/_map_liberia.dme b/mods/_maps/liberia/_map_liberia.dme
@@ -7,6 +7,7 @@
 #include "code/liberia_areas.dm"
 #include "code/liberia_jobs.dm"
 #include "code/liberia_shuttles.dm"
+#include "code/liberia_structures.dm"
 #include "code/liberia_navpoints.dm"
 
 #endif
diff --git a/packs/infinity/structures/mag_tables.dm → .../_maps/liberia/code/liberia_structures.dm b/packs/infinity/structures/mag_tables.dm → .../_maps/liberia/code/liberia_structures.dm
@@ -1,7 +1,7 @@
 /obj/structure/table/mag
 	name = "Magnetic Table"
 	desc = "It is simple magnetic table. Good for merchants."
-	icon = 'packs/infinity/icons/obj/mag_tables.dmi'
+	icon = 'mods/_maps/liberia/icons/mag_tables.dmi'
 	icon_state = "magnetic_table_disabled"
 	var/icon_state_open = "magnetic_table_disabled"
 	var/icon_state_closed = "magnetic_table_enabled"

diff --git a/packs/infinity/icons/obj/mag_tables.dmi → mods/_maps/liberia/icons/mag_tables.dmi b/packs/infinity/icons/obj/mag_tables.dmi → mods/_maps/liberia/icons/mag_tables.dmi
diff --git a/...n_races/cyberlimbs/resomi/resomi_main.dmi → mods/resomi/icons/resomi_main.dmi b/...n_races/cyberlimbs/resomi/resomi_main.dmi → mods/resomi/icons/resomi_main.dmi
diff --git a/mods/tajara/icons/posters.dmi b/mods/tajara/icons/posters.dmi
diff --git a/mods/tajara/icons/tajara_body/dyson.dmi b/mods/tajara/icons/tajara_body/dyson.dmi
diff --git a/packs/infinity/_pack.dm b/packs/infinity/_pack.dm
@@ -20,15 +20,12 @@
 #include "clothing\head\berets.dm"
 #include "clothing\head\head.dm"
 #include "clothing\head\helmet.dm"
-#include "clothing\accessories\accessory_hand.dm"
 #include "clothing\accessories\armor.dm"
 #include "clothing\accessories\badge.dm"
 #include "clothing\accessories\cloak.dm"
 #include "clothing\accessories\collar.dm"
-#include "clothing\accessories\locket_custom.dm"
 #include "clothing\accessories\other.dm"
 #include "clothing\accessories\pins.dm"
-#include "clothing\accessories\torch.dm"
 #include "clothing\gloves\gloves.dm"
 #include "clothing\suits\armor.dm"
 #include "clothing\suits\under_bluebrig.dm"
@@ -79,7 +76,6 @@
 #include "structures\chairs.dm"
 #include "structures\curtains.dm"
 #include "structures\holoplants.dm"
-#include "structures\mag_tables.dm"
 #include "structures\l3closets.dm"
 #include "structures\ladder_mobile.dm"
 #include "structures\signs.dm"

diff --git a/packs/infinity/clothing/accessories/accessory_hand.dm b/packs/infinity/clothing/accessories/accessory_hand.dm
diff --git a/packs/infinity/clothing/accessories/locket_custom.dm b/packs/infinity/clothing/accessories/locket_custom.dm
diff --git a/packs/infinity/clothing/accessories/torch.dm b/packs/infinity/clothing/accessories/torch.dm
diff --git a/packs/infinity/icons/customs/cyberlimbs/combat_limb.dmi b/packs/infinity/icons/customs/cyberlimbs/combat_limb.dmi
diff --git a/packs/infinity/icons/customs/cyberlimbs/morpheus_monitor.dmi b/packs/infinity/icons/customs/cyberlimbs/morpheus_monitor.dmi
diff --git a/packs/infinity/icons/customs/cyberlimbs/oldtackahashi.dmi b/packs/infinity/icons/customs/cyberlimbs/oldtackahashi.dmi
diff --git a/packs/infinity/icons/customs/elsas/mob/elsas_stuff.dmi b/packs/infinity/icons/customs/elsas/mob/elsas_stuff.dmi
diff --git a/packs/infinity/icons/customs/elsas/obj/elsas_stuff.dmi b/packs/infinity/icons/customs/elsas/obj/elsas_stuff.dmi
diff --git a/packs/infinity/icons/customs/ic_belt_custom.dmi b/packs/infinity/icons/customs/ic_belt_custom.dmi
diff --git a/packs/infinity/icons/customs/infinity_custom_guns.dmi b/packs/infinity/icons/customs/infinity_custom_guns.dmi
diff --git a/packs/infinity/icons/customs/infinity_custom_guns_slot_l_hand.dmi b/packs/infinity/icons/customs/infinity_custom_guns_slot_l_hand.dmi
diff --git a/packs/infinity/icons/customs/infinity_custom_guns_slot_r_hand.dmi b/packs/infinity/icons/customs/infinity_custom_guns_slot_r_hand.dmi
diff --git a/packs/infinity/icons/customs/infinity_custom_items_effects.dmi b/packs/infinity/icons/customs/infinity_custom_items_effects.dmi
diff --git a/packs/infinity/icons/customs/infinity_custom_items_inhands_lefthand.dmi b/packs/infinity/icons/customs/infinity_custom_items_inhands_lefthand.dmi
diff --git a/packs/infinity/icons/customs/infinity_custom_items_inhands_righthand.dmi b/packs/infinity/icons/customs/infinity_custom_items_inhands_righthand.dmi
diff --git a/packs/infinity/icons/customs/infinity_custom_items_mob.dmi b/packs/infinity/icons/customs/infinity_custom_items_mob.dmi
diff --git a/packs/infinity/icons/customs/infinity_custom_items_obj.dmi b/packs/infinity/icons/customs/infinity_custom_items_obj.dmi
diff --git a/packs/infinity/icons/customs/infinity_custom_synthetic.dmi b/packs/infinity/icons/customs/infinity_custom_synthetic.dmi
diff --git a/packs/infinity/icons/mecha/mech_construct.dmi b/packs/infinity/icons/mecha/mech_construct.dmi
diff --git a/packs/infinity/icons/mecha/mech_construction.dmi b/packs/infinity/icons/mecha/mech_construction.dmi
diff --git a/packs/infinity/icons/mecha/mecha.dmi b/packs/infinity/icons/mecha/mecha.dmi
diff --git a/packs/infinity/icons/mob/human_races/cyberlimbs/auronsol/auronsol.dmi b/packs/infinity/icons/mob/human_races/cyberlimbs/auronsol/auronsol.dmi
diff --git a/packs/infinity/icons/mob/human_races/cyberlimbs/bionic/bionic.dmi b/packs/infinity/icons/mob/human_races/cyberlimbs/bionic/bionic.dmi
diff --git a/packs/infinity/icons/mob/human_races/cyberlimbs/hephaestus/hephaestus_athena.dmi b/packs/infinity/icons/mob/human_races/cyberlimbs/hephaestus/hephaestus_athena.dmi
diff --git a/packs/infinity/icons/mob/human_races/cyberlimbs/morgan/morgan_main.dmi b/packs/infinity/icons/mob/human_races/cyberlimbs/morgan/morgan_main.dmi
diff --git a/packs/infinity/icons/mob/human_races/cyberlimbs/morpheus/morpheus_stahan.dmi b/packs/infinity/icons/mob/human_races/cyberlimbs/morpheus/morpheus_stahan.dmi
diff --git a/packs/infinity/icons/mob/human_races/cyberlimbs/morpheus/terminator_main.dmi b/packs/infinity/icons/mob/human_races/cyberlimbs/morpheus/terminator_main.dmi
diff --git a/packs/infinity/icons/mob/human_races/cyberlimbs/sally/sally.dmi b/packs/infinity/icons/mob/human_races/cyberlimbs/sally/sally.dmi
diff --git a/packs/infinity/icons/mob/human_races/cyberlimbs/wardtakahashi/wardtakahashi_special.dmi b/packs/infinity/icons/mob/human_races/cyberlimbs/wardtakahashi/wardtakahashi_special.dmi
diff --git a/packs/infinity/icons/mob/human_races/r_bionic.dmi b/packs/infinity/icons/mob/human_races/r_bionic.dmi
diff --git a/packs/infinity/icons/mob/human_races/r_terminator.dmi b/packs/infinity/icons/mob/human_races/r_terminator.dmi
diff --git a/packs/infinity/icons/mob/onmob/infinity_robots.dmi b/packs/infinity/icons/mob/onmob/infinity_robots.dmi
diff --git a/packs/infinity/icons/mob/statue.dmi b/packs/infinity/icons/mob/statue.dmi
diff --git a/packs/infinity/icons/obj/clothing/species/tajaran/obj_head_tajaran.dmi b/packs/infinity/icons/obj/clothing/species/tajaran/obj_head_tajaran.dmi
diff --git a/packs/infinity/icons/obj/clothing/species/tajaran/obj_suit_tajaran.dmi b/packs/infinity/icons/obj/clothing/species/tajaran/obj_suit_tajaran.dmi
diff --git a/packs/infinity/icons/obj/machines/security_scanner.dmi b/packs/infinity/icons/obj/machines/security_scanner.dmi
diff --git a/packs/infinity/icons/obj/posters.dmi b/packs/infinity/icons/obj/posters.dmi