cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 15:08:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Mining fixes as it was annoying as fuck. Also a random object with nothing in it removed.

Browse Source 
Conflicts:
	code/modules/mining/mine_turfs.dm
This commit is contained in:
SkyMarshal
2014-01-09 20:56:38 -05:00
committed by ZomgPonies
parent d101e5c111
commit e2bbbb7e39
19 changed files with 608 additions and 1498 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/asteroid.dm
+1 -1
View File
@@ -131,7 +131,7 @@ proc/make_mining_asteroid_secret(var/size = 5)
valid = 0
continue
if(locate(/turf/unsimulated/floor/plating/airless/asteroid) in surroundings)
if(locate(/turf/simulated/floor/plating/airless/asteroid) in surroundings)
valid = 0
continue
code/game/mecha/equipment/tools/tools.dm
+10 -10
View File
@@ -91,10 +91,10 @@
if(T == chassis.loc && src == chassis.selected)
if(istype(target, /turf/simulated/wall/r_wall))
occupant_message("<font color='red'>[target] is too durable to drill through.</font>")
else if(istype(target, /turf/unsimulated/mineral))
for(var/turf/unsimulated/mineral/M in range(chassis,1))
else if(istype(target, /turf/simulated/mineral))
for(var/turf/simulated/mineral/M in range(chassis,1))
if(get_dir(chassis,M)&chassis.dir)
M.gets_drilled()
M.GetDrilled()
log_message("Drilled through [target]")
if(locate(/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp) in chassis.equipment)
var/obj/structure/ore_box/ore_box = locate(/obj/structure/ore_box) in chassis:cargo
@@ -102,8 +102,8 @@
for(var/obj/item/weapon/ore/ore in range(chassis,1))
if(get_dir(chassis,ore)&chassis.dir)
ore.Move(ore_box)
else if(istype(target, /turf/unsimulated/floor/plating/airless/asteroid))
for(var/turf/unsimulated/floor/plating/airless/asteroid/M in range(chassis,1))
else if(istype(target, /turf/simulated/floor/plating/airless/asteroid))
for(var/turf/simulated/floor/plating/airless/asteroid/M in range(chassis,1))
if(get_dir(chassis,M)&chassis.dir)
M.gets_dug()
log_message("Drilled through [target]")
@@ -159,10 +159,10 @@
if(do_after_cooldown(target))//To slow down how fast mechs can drill through the station
log_message("Drilled through [target]")
target.ex_act(3)
else if(istype(target, /turf/unsimulated/mineral))
for(var/turf/unsimulated/mineral/M in range(chassis,1))
else if(istype(target, /turf/simulated/mineral))
for(var/turf/simulated/mineral/M in range(chassis,1))
if(get_dir(chassis,M)&chassis.dir)
M.gets_drilled()
M.GetDrilled()
log_message("Drilled through [target]")
if(locate(/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp) in chassis.equipment)
var/obj/structure/ore_box/ore_box = locate(/obj/structure/ore_box) in chassis:cargo
@@ -170,8 +170,8 @@
for(var/obj/item/weapon/ore/ore in range(chassis,1))
if(get_dir(chassis,ore)&chassis.dir)
ore.Move(ore_box)
else if(istype(target,/turf/unsimulated/floor/plating/airless/asteroid))
for(var/turf/unsimulated/floor/plating/airless/asteroid/M in range(target,1))
else if(istype(target,/turf/simulated/floor/plating/airless/asteroid))
for(var/turf/simulated/floor/plating/airless/asteroid/M in range(target,1))
M.gets_dug()
log_message("Drilled through [target]")
if(locate(/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp) in chassis.equipment)
code/game/objects/effects/glowshroom.dm
+1 -1
View File
@@ -69,7 +69,7 @@
if(prob(spreadIntoAdjacentChance))
spreadsIntoAdjacent = 1
for(var/turf/unsimulated/floor/plating/airless/asteroid/earth in view(3,src))
for(var/turf/simulated/floor/plating/airless/asteroid/earth in view(3,src))
if(spreadsIntoAdjacent || !locate(/obj/effect/glowshroom) in view(1,earth))
possibleLocs += earth
code/game/turfs/simulated/floor.dm
+1 -1
View File
@@ -276,7 +276,7 @@ turf/simulated/floor/proc/update_icon()
/turf/simulated/floor/proc/burn_tile()
if(istype(src,/turf/simulated/floor/engine)) return
if(istype(src,/turf/unsimulated/floor/plating/airless/asteroid)) return//Asteroid tiles don't burn
if(istype(src,/turf/simulated/floor/plating/airless/asteroid)) return//Asteroid tiles don't burn
if(broken || burnt) return
if(is_plasteel_floor())
src.icon_state = "damaged[pick(1,2,3,4,5)]"