diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm index 0128135c6b0..74aa1875f96 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm @@ -179,6 +179,10 @@ /obj/effect/baseturf_helper, /turf/simulated/floor/plating, /area/ruin/powered) +"X" = ( +/obj/item/flashlight/lantern, +/turf/simulated/floor/plating/asteroid/basalt, +/area/ruin/powered) (1,1,1) = {" a @@ -383,7 +387,7 @@ b b f k -f +X b b b diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index 2358e040146..49f725e0e0f 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -682,6 +682,8 @@ /area/ruin/unpowered/syndicate_lava_base/engineering) "bf" = ( /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/igniter{ @@ -691,6 +693,8 @@ /area/ruin/unpowered/syndicate_lava_base/engineering) "bg" = ( /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/door/airlock/glass{ @@ -733,6 +737,8 @@ /area/ruin/unpowered/syndicate_lava_base/engineering) "bj" = ( /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/door/airlock/glass{ @@ -1046,6 +1052,9 @@ dir = 8; level = 2 }, +/obj/machinery/pipedispenser{ + pixel_y = 0 + }, /turf/simulated/floor/plasteel, /area/ruin/unpowered/syndicate_lava_base/engineering) "bM" = ( @@ -1090,8 +1099,8 @@ pixel_x = -6; pixel_y = -25; req_access_txt = "150"; - tag_exterior_door = "syndicate_incinerator_exterior"; - tag_interior_door = "syndicate_incinerator_interior" + tag_exterior_door = "syndicate_base_incinerator_exterior"; + tag_interior_door = "syndicate_base_incinerator_interior" }, /obj/machinery/atmospherics/pipe/simple/visible/yellow, /turf/simulated/floor/plasteel, @@ -1273,7 +1282,7 @@ "ch" = ( /obj/machinery/air_sensor{ frequency = 1442; - id_tag = "Syndicate_Construction_o2_sensor" + id_tag = "syndie_lavaland_o2_sensor" }, /turf/simulated/floor/engine{ name = "o2 floor"; @@ -5344,9 +5353,16 @@ dir = 1 }, /obj/structure/table, -/obj/item/storage/firstaid/fire, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, +/obj/item/storage/box/masks{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/storage/box/gloves{ + pixel_x = 5; + pixel_y = 5 + }, /turf/simulated/floor/plasteel/white/side{ dir = 5 }, @@ -5359,6 +5375,7 @@ dir = 1 }, /obj/structure/cable{ + d2 = 4; icon_state = "0-4" }, /obj/effect/decal/cleanable/dirt, @@ -5372,9 +5389,12 @@ dir = 1 }, /obj/structure/cable{ + d2 = 2; icon_state = "0-2" }, /obj/structure/cable{ + d1 = 2; + d2 = 8; icon_state = "2-8" }, /turf/simulated/floor/plating, @@ -5486,8 +5506,15 @@ /area/ruin/unpowered/syndicate_lava_base/medbay) "lK" = ( /obj/structure/table, -/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/regular{ + pixel_x = -4; + pixel_y = -4 + }, /obj/effect/decal/cleanable/dirt, +/obj/item/storage/firstaid/fire{ + pixel_x = 4; + pixel_y = 4 + }, /turf/simulated/floor/plasteel/white/side{ dir = 4 }, @@ -5518,6 +5545,8 @@ /area/ruin/unpowered/syndicate_lava_base/engineering) "lM" = ( /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -5716,14 +5745,13 @@ /obj/machinery/cell_charger, /obj/item/stock_parts/cell/high/plus, /obj/effect/decal/cleanable/dirt, -/obj/machinery/pipedispenser{ - pixel_y = 12 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/ruin/unpowered/syndicate_lava_base/engineering) "mh" = ( /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plasteel, @@ -5870,6 +5898,8 @@ /area/ruin/unpowered/syndicate_lava_base/engineering) "mG" = ( /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, @@ -5989,6 +6019,8 @@ /area/ruin/unpowered/syndicate_lava_base/engineering) "nd" = ( /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/effect/turf_decal/stripes/line, @@ -6309,8 +6341,10 @@ "nB" = ( /obj/structure/table/reinforced, /obj/item/surgicaldrill, -/obj/item/cautery, /obj/effect/decal/cleanable/dirt, +/obj/item/bonegel, +/obj/item/bonesetter, +/obj/item/FixOVein, /turf/simulated/floor/plasteel/white/side, /area/ruin/unpowered/syndicate_lava_base/medbay) "nC" = ( @@ -6318,6 +6352,7 @@ /obj/item/retractor, /obj/item/hemostat, /obj/effect/decal/cleanable/dirt, +/obj/item/cautery, /turf/simulated/floor/plasteel/white/side{ dir = 6 }, @@ -6582,6 +6617,8 @@ /area/ruin/unpowered/syndicate_lava_base/medbay) "oe" = ( /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/binary/dp_vent_pump/high_volume{ @@ -6746,6 +6783,7 @@ "oE" = ( /obj/structure/cable, /obj/structure/cable{ + d2 = 2; icon_state = "0-2" }, /obj/machinery/power/compressor{ diff --git a/_maps/map_files/generic/Lavaland.dmm b/_maps/map_files/generic/Lavaland.dmm index 6f8f4195dfb..69405d23205 100644 --- a/_maps/map_files/generic/Lavaland.dmm +++ b/_maps/map_files/generic/Lavaland.dmm @@ -1376,14 +1376,14 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 6 }, -/obj/machinery/meter, /turf/simulated/floor/plating, /area/mine/living_quarters) "dq" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 1 }, /turf/simulated/floor/plating, @@ -1581,7 +1581,7 @@ /turf/simulated/floor/plating, /area/mine/living_quarters) "dI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 5 }, /turf/simulated/floor/plating, @@ -1657,10 +1657,7 @@ name = "Mining Station Maintenance"; req_access_txt = "48" }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/visible/universal, /turf/simulated/floor/plating, /area/mine/living_quarters) "dT" = ( diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 6a33cdc5a1a..02808eda485 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -70,6 +70,11 @@ armor = list("melee" = 10, "bullet" = 5, "laser" = 5, "energy" = 5, "bomb" = 0, "bio" = 50, "rad" = 0) resistance_flags = FIRE_PROOF + sprite_sheets = list( + "Drask" = 'icons/mob/species/drask/mask.dmi', + "Grey" = 'icons/mob/species/grey/mask.dmi', + ) + /obj/item/clothing/mask/gas/explorer/attack_self(mob/user) adjustmask(user) diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index bf9d9a4569b..6bfd40ad0ad 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -224,6 +224,8 @@ item_state = "explorer" item_color = "explorer" + sprite_sheets = list() + /obj/item/clothing/under/barber desc = "It's a barber's uniform." name = "barber's uniform" diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm index 6857e286848..82ae53fa5a0 100644 --- a/code/modules/mining/equipment_locker.dm +++ b/code/modules/mining/equipment_locker.dm @@ -485,7 +485,7 @@ /datum/data/mining_equipment/New(name, path, equipment_cost) equipment_name = name equipment_path = path - equipment_cost = cost + cost = equipment_cost /obj/machinery/mineral/equipment_vendor/New() ..() diff --git a/icons/mob/species/drask/mask.dmi b/icons/mob/species/drask/mask.dmi index c1357c43144..dffedfb1c78 100644 Binary files a/icons/mob/species/drask/mask.dmi and b/icons/mob/species/drask/mask.dmi differ diff --git a/icons/mob/species/grey/mask.dmi b/icons/mob/species/grey/mask.dmi index 1225b1e68ad..112895a6009 100644 Binary files a/icons/mob/species/grey/mask.dmi and b/icons/mob/species/grey/mask.dmi differ