diff --git a/_maps/_basemap.dm b/_maps/_basemap.dm index abf5600c84a9..2abd196024d5 100644 --- a/_maps/_basemap.dm +++ b/_maps/_basemap.dm @@ -27,8 +27,6 @@ // MASSMETA EDIT BEGIN - Compiling our modular maps too! #include "map_files\PubbyStation\PubbyStation.dmm" #include "map_files\KiloStation\KiloStation.dmm" - #include "map_files\ProtoBoxStation\ProtoBoxStation.dmm" - #include "map_files\protosstation\protos.dmm" #include "map_files\bearcat\bearcat.dmm" // MASSMETA EDIT END diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 8783cb4b5cdf..e711d74ce02b 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -50314,7 +50314,6 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, -/obj/machinery/bluespace_vendor/directional/west, /obj/machinery/vending/mod_modules, /turf/open/floor/iron, /area/station/hallway/primary/starboard) diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index fb53f25cb06e..21e735b0d5d1 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -8981,18 +8981,17 @@ /area/station/hallway/primary/central/fore) "aHp" = ( /obj/machinery/door/airlock{ - name = "Unit 1"; - id = "Toilet1" + id_tag = "Toilet1"; + name = "Unit 1" }, /turf/open/floor/iron/freezer, /area/station/commons/toilet/restrooms) "aHq" = ( /obj/machinery/door/airlock{ - name = "Unit 2" - }, -/turf/open/floor/iron/freezer{ - id = "Toilet2" + name = "Unit 2"; + id_tag = "Toilet2" }, +/turf/open/floor/iron/freezer, /area/station/commons/toilet/restrooms) "aHr" = ( /obj/item/soap/nanotrasen, diff --git a/modular_meta/features/antagonists/bloodsuckers/code/structures/bloodsucker_recipes.dm b/modular_meta/features/antagonists/bloodsuckers/code/structures/bloodsucker_recipes.dm index f383f1d81562..83303980881e 100644 --- a/modular_meta/features/antagonists/bloodsuckers/code/structures/bloodsucker_recipes.dm +++ b/modular_meta/features/antagonists/bloodsuckers/code/structures/bloodsucker_recipes.dm @@ -122,7 +122,6 @@ reqs = list(/obj/item/stack/sheet/mineral/wood = 3) time = 8 SECONDS category = CAT_WEAPON_MELEE - crafting_flags = NONE /datum/crafting_recipe/hardened_stake name = "Hardened Stake" @@ -134,7 +133,7 @@ ) time = 6 SECONDS category = CAT_WEAPON_MELEE - crafting_flags = NONE + crafting_flags = CRAFT_SKIP_MATERIALS_PARITY /datum/crafting_recipe/silver_stake name = "Silver Stake" @@ -146,4 +145,3 @@ ) time = 8 SECONDS category = CAT_WEAPON_MELEE - crafting_flags = CRAFT_CHECK_DENSITY diff --git a/modular_meta/features/antagonists/sinful_demon/code/sins/sloth.dm b/modular_meta/features/antagonists/sinful_demon/code/sins/sloth.dm index 7cc5ed362b80..2c9ed9990ba6 100644 --- a/modular_meta/features/antagonists/sinful_demon/code/sins/sloth.dm +++ b/modular_meta/features/antagonists/sinful_demon/code/sins/sloth.dm @@ -59,7 +59,7 @@ jaunt_duration = 1 SECONDS /datum/action/cooldown/spell/timestop/sloth - name = "Stop Time" + name = "Sloth Stop Time" desc = "This spell stops time for everyone INCLUDE you." button_icon_state = "time" background_icon_state = "bg_demon" diff --git a/modular_meta/features/more_cell_interactions/code/manual_cell_recharger.dm b/modular_meta/features/more_cell_interactions/code/manual_cell_recharger.dm index 8342048fc716..300baedb9c42 100644 --- a/modular_meta/features/more_cell_interactions/code/manual_cell_recharger.dm +++ b/modular_meta/features/more_cell_interactions/code/manual_cell_recharger.dm @@ -2,9 +2,9 @@ name = "manual battery charger" desc = "Charges cell by converting mechanical energy into electrical energy. Just activate it in-hand and the cell will be charged by the your force." icon = 'modular_meta/features/more_cell_interactions/icons/manual_cell_recharger.dmi' - worn_icon = null //blame sanecmen + worn_icon = 'modular_meta/features/more_cell_interactions/icons/worn_manual_cell_recharger.dmi' icon_state = "handheldcharger_black_empty" - worn_icon_state = null + worn_icon_state = "handheldcharger_black_empty" obj_flags = CONDUCTS_ELECTRICITY item_flags = NOBLUDGEON slot_flags = ITEM_SLOT_BELT @@ -57,6 +57,7 @@ incell = I user.transferItemToLoc(I, src) icon_state = "handheldcharger_black" + worn_icon_state = "handheldcharger_black" update_icon() to_chat(user, span_notice("You insert [incell] in [src].")) // Господи как же я кончал шуссу в рот охххххххх бля else @@ -82,6 +83,7 @@ user.put_in_hands(incell) incell = null icon_state= "handheldcharger_black_empty" + worn_icon_state = "handheldcharger_black_empty" update_icon() incell.update_icon() return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN diff --git a/modular_meta/features/more_cell_interactions/icons/worn_manual_cell_recharger.dmi b/modular_meta/features/more_cell_interactions/icons/worn_manual_cell_recharger.dmi new file mode 100644 index 000000000000..efa8752d0b04 Binary files /dev/null and b/modular_meta/features/more_cell_interactions/icons/worn_manual_cell_recharger.dmi differ