diff --git a/code/WorkInProgress/mining.dm b/code/WorkInProgress/mining.dm index 01f6555c243..82ad389f577 100644 --- a/code/WorkInProgress/mining.dm +++ b/code/WorkInProgress/mining.dm @@ -30,11 +30,6 @@ var/mineralName = "" var/mineralAmt = 0 -/turf/simulated/asteroid/New() - ..() - oxygen = 0.01 - nitrogen = 0.01 - /turf/simulated/mineral/urenium name = "Uranium deposit" icon_state = "rock_Uranium" @@ -73,12 +68,12 @@ /turf/simulated/mineral/ReplaceWithFloor() if(!icon_old) icon_old = icon_state - var/turf/simulated/floor/airless/W + var/turf/simulated/floor/airless/asteroid/W var/old_dir = dir - W = new /turf/simulated/floor/airless( locate(src.x, src.y, src.z) ) + W = new /turf/simulated/floor/airless/asteroid( locate(src.x, src.y, src.z) ) W.dir = old_dir - W.icon_state = "asteroid" + W.fullUpdateMineralOverlays() /* W.icon_old = old_icon @@ -89,6 +84,7 @@ W.levelupdate() return W + /turf/simulated/mineral/attackby(obj/item/weapon/W as obj, mob/user as mob) if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey") @@ -148,6 +144,8 @@ if (prob(50)) seedName = pick(list("1","2","3","4")) seedAmt = rand(1,4) + spawn(2) + updateMineralOverlays() /turf/simulated/floor/airless/asteroid/attackby(obj/item/weapon/W as obj, mob/user as mob) if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey") @@ -193,6 +191,48 @@ seedAmt = 0 return +/turf/simulated/floor/airless/asteroid/proc/updateMineralOverlays() + + src.overlays = null + + if(istype(get_step(src, NORTH), /turf/simulated/mineral)) + src.overlays += image('walls.dmi', "rock_side_n") + if(istype(get_step(src, SOUTH), /turf/simulated/mineral)) + src.overlays += image('walls.dmi', "rock_side_s", layer=6) + if(istype(get_step(src, EAST), /turf/simulated/mineral)) + src.overlays += image('walls.dmi', "rock_side_e", layer=6) + if(istype(get_step(src, WEST), /turf/simulated/mineral)) + src.overlays += image('walls.dmi', "rock_side_w", layer=6) + + +/turf/simulated/floor/airless/asteroid/proc/fullUpdateMineralOverlays() + var/turf/simulated/floor/airless/asteroid/A + if(istype(get_step(src, WEST), /turf/simulated/floor/airless/asteroid)) + A = get_step(src, WEST) + A.updateMineralOverlays() + if(istype(get_step(src, EAST), /turf/simulated/floor/airless/asteroid)) + A = get_step(src, EAST) + A.updateMineralOverlays() + if(istype(get_step(src, NORTH), /turf/simulated/floor/airless/asteroid)) + A = get_step(src, NORTH) + A.updateMineralOverlays() + if(istype(get_step(src, NORTHWEST), /turf/simulated/floor/airless/asteroid)) + A = get_step(src, NORTHWEST) + A.updateMineralOverlays() + if(istype(get_step(src, NORTHEAST), /turf/simulated/floor/airless/asteroid)) + A = get_step(src, NORTHEAST) + A.updateMineralOverlays() + if(istype(get_step(src, SOUTHWEST), /turf/simulated/floor/airless/asteroid)) + A = get_step(src, SOUTHWEST) + A.updateMineralOverlays() + if(istype(get_step(src, SOUTHEAST), /turf/simulated/floor/airless/asteroid)) + A = get_step(src, SOUTHEAST) + A.updateMineralOverlays() + if(istype(get_step(src, SOUTH), /turf/simulated/floor/airless/asteroid)) + A = get_step(src, SOUTH) + A.updateMineralOverlays() + src.updateMineralOverlays() + /**********************Mineral ores**************************/ /obj/item/weapon/ore diff --git a/icons/turf/walls.dmi b/icons/turf/walls.dmi index 22874861369..fd316f65163 100644 Binary files a/icons/turf/walls.dmi and b/icons/turf/walls.dmi differ