Merge pull request #11628 from Markolie/turfs

Lavaland fixes

_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

_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{

_maps/map_files/generic/Lavaland.dmm

@@ -112,8 +112,8 @@
 "au" = (
 /obj/structure/rack,
 /obj/item/storage/bag/ore,
-/obj/item/pickaxe,
-/obj/item/flashlight,
+/obj/item/pickaxe/safety,
+/obj/item/flashlight/lantern,
 /obj/item/clothing/glasses/meson,
 /obj/item/mining_scanner,
 /turf/simulated/floor/plasteel,
@@ -121,8 +121,8 @@
 "av" = (
 /obj/structure/rack,
 /obj/item/storage/bag/ore,
-/obj/item/flashlight,
-/obj/item/pickaxe,
+/obj/item/flashlight/lantern,
+/obj/item/pickaxe/safety,
 /obj/item/clothing/glasses/meson,
 /obj/item/mining_scanner,
 /turf/simulated/floor/plasteel,
@@ -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" = (

_maps/map_files/generic/z5.dmm

@@ -1612,21 +1612,11 @@
 /obj/item/clothing/glasses/meson,
 /obj/item/flashlight,
 /obj/item/storage/bag/ore,
-/obj/item/shovel{
-	attack_verb = list("ineffectively hit");
-	desc = "A large tool for digging and moving dirt. Was modified with extra safety, making it ineffective as a weapon.";
-	force = 1;
-	name = "safety shovel";
-	pixel_x = -5;
-	throwforce = 1
+/obj/item/shovel/safety{
+	pixel_x = -5
 	},
-/obj/item/pickaxe{
-	attack_verb = list("ineffectively hit");
-	desc = "A pickaxe designed to be only effective at digging rock and ore, very ineffective as a weapon.";
-	force = 1;
-	name = "safety pickaxe";
-	pixel_x = 5;
-	throwforce = 1
+/obj/item/pickaxe/safety{
+	pixel_x = 5
 	},
 /obj/item/radio/intercom/locked/prison{
 	pixel_y = 25
@@ -1642,21 +1632,11 @@
 /obj/item/clothing/glasses/meson,
 /obj/item/flashlight,
 /obj/item/storage/bag/ore,
-/obj/item/shovel{
-	attack_verb = list("ineffectively hit");
-	desc = "A large tool for digging and moving dirt. Was modified with extra safety, making it ineffective as a weapon.";
-	force = 1;
-	name = "safety shovel";
-	pixel_x = -5;
-	throwforce = 1
+/obj/item/shovel/safety{
+	pixel_x = -5
 	},
-/obj/item/pickaxe{
-	attack_verb = list("ineffectively hit");
-	desc = "A pickaxe designed to be only effective at digging rock and ore, very ineffective as a weapon.";
-	force = 1;
-	name = "safety pickaxe";
-	pixel_x = 5;
-	throwforce = 1
+/obj/item/pickaxe/safety{
+	pixel_x = 5
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "floorgrime"
@@ -1669,21 +1649,11 @@
 /obj/item/clothing/glasses/meson,
 /obj/item/flashlight,
 /obj/item/storage/bag/ore,
-/obj/item/shovel{
-	attack_verb = list("ineffectively hit");
-	desc = "A large tool for digging and moving dirt. Was modified with extra safety, making it ineffective as a weapon.";
-	force = 1;
-	name = "safety shovel";
-	pixel_x = -5;
-	throwforce = 1
+/obj/item/shovel/safety{
+	pixel_x = -5
 	},
-/obj/item/pickaxe{
-	attack_verb = list("ineffectively hit");
-	desc = "A pickaxe designed to be only effective at digging rock and ore, very ineffective as a weapon.";
-	force = 1;
-	name = "safety pickaxe";
-	pixel_x = 5;
-	throwforce = 1
+/obj/item/pickaxe/safety{
+	pixel_x = 5
 	},
 /obj/machinery/status_display{
 	density = 0;
@@ -1702,21 +1672,11 @@
 /obj/item/clothing/glasses/meson,
 /obj/item/flashlight,
 /obj/item/storage/bag/ore,
-/obj/item/shovel{
-	attack_verb = list("ineffectively hit");
-	desc = "A large tool for digging and moving dirt. Was modified with extra safety, making it ineffective as a weapon.";
-	force = 1;
-	name = "safety shovel";
-	pixel_x = -5;
-	throwforce = 1
+/obj/item/shovel/safety{
+	pixel_x = -5
 	},
-/obj/item/pickaxe{
-	attack_verb = list("ineffectively hit");
-	desc = "A pickaxe designed to be only effective at digging rock and ore, very ineffective as a weapon.";
-	force = 1;
-	name = "safety pickaxe";
-	pixel_x = 5;
-	throwforce = 1
+/obj/item/pickaxe/safety{
+	pixel_x = 5
 	},
 /obj/machinery/camera{
 	c_tag = "Labor Camp Storage";

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)
 

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"

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()
 	..()

code/modules/mining/mine_items.dm

@@ -93,8 +93,8 @@
 	icon_state = "pickaxe"
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
-	force = 15.0
-	throwforce = 10.0
+	force = 15
+	throwforce = 10
 	item_state = "pickaxe"
 	w_class = WEIGHT_CLASS_BULKY
 	materials = list(MAT_METAL=2000) //one sheet, but where can you make them?
@@ -114,6 +114,13 @@
 	name = "emergency disembarkation tool"
 	desc = "For extracting yourself from rough landings."
 
+/obj/item/pickaxe/safety
+	name = "safety pickaxe"
+	desc = "A pickaxe designed to be only effective at digging rock and ore, very ineffective as a weapon."
+	force = 1
+	throwforce = 1
+	attack_verb = list("ineffectively hit")
+
 /obj/item/pickaxe/silver
 	name = "silver-plated pickaxe"
 	icon_state = "spickaxe"
@@ -193,8 +200,8 @@
 	icon_state = "shovel"
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
-	force = 8.0
-	throwforce = 4.0
+	force = 8
+	throwforce = 4
 	item_state = "shovel"
 	w_class = WEIGHT_CLASS_NORMAL
 	materials = list(MAT_METAL=50)
@@ -208,11 +215,17 @@
 	desc = "A small tool for digging and moving dirt."
 	icon_state = "spade"
 	item_state = "spade"
-	force = 5.0
-	throwforce = 7.0
+	force = 5
+	throwforce = 7
 	w_class = WEIGHT_CLASS_SMALL
 	toolspeed = 2
 
+/obj/item/shovel/safety
+	name = "safety shovel"
+	desc = "A large tool for digging and moving dirt. Was modified with extra safety, making it ineffective as a weapon."
+	force = 1
+	throwforce = 1
+	attack_verb = list("ineffectively hit")
 
 /**********************Mining car (Crate like thing, not the rail car)**************************/