cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-13 17:07:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Simulated to Unsimulated (#6410)

Browse Source
This commit is contained in:
Werner
2019-05-19 16:22:54 +02:00
committed by GitHub
parent 132825cdae
commit 6d8a94d408
55 changed files with 416 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/drilling/drill.dm
+4 -4
View File
@@ -79,8 +79,8 @@
return
//Drill through the flooring, if any.
if(istype(get_turf(src), /turf/simulated/floor/asteroid))
var/turf/simulated/floor/asteroid/T = get_turf(src)
if(istype(get_turf(src), /turf/unsimulated/floor/asteroid))
var/turf/unsimulated/floor/asteroid/T = get_turf(src)
if(!T.dug)
T.gets_dug()
else if(istype(get_turf(src), /turf/simulated/floor))
@@ -89,7 +89,7 @@
//Dig out the tasty ores.
if(resource_field.len)
var/turf/simulated/harvesting = pick(resource_field)
var/turf/harvesting = pick(resource_field)
while(resource_field.len && !harvesting.resources)
harvesting.has_resources = 0
@@ -295,7 +295,7 @@
var/tx = T.x - 2
var/ty = T.y - 2
var/turf/simulated/mine_turf
var/turf/mine_turf
for(var/iy = 0,iy < 5, iy++)
for(var/ix = 0, ix < 5, ix++)
mine_turf = locate(tx + ix, ty + iy, T.z)
code/modules/mining/drilling/scanner.dm
+1 -1
View File
@@ -20,7 +20,7 @@
"exotic matter" = 0
)
for(var/turf/simulated/T in range(2, get_turf(user)))
for(var/turf/T in range(2, get_turf(user)))
if(!T.has_resources)
continue
code/modules/mining/mine_items.dm
+2 -2
View File
@@ -411,7 +411,7 @@
var/obj/item/stack/flag/F = locate() in get_turf(src)
var/turf/T = get_turf(src)
if(!T || !istype(T, /turf/simulated/floor/asteroid))
if(!T || !istype(T, /turf/unsimulated/floor/asteroid))
to_chat(user, "The beacon won't stand up in this terrain.")
return
@@ -495,7 +495,7 @@
if(stored_matter <= 0)
return
if(!istype(A, /turf/simulated/floor))
if(!istype(A, /turf/simulated/floor) && !istype(A, /turf/unsimulated/floor))
return
if(locate(/obj/structure/track) in A)
code/modules/mining/mine_turf_types.dm
+6 -6
View File
@@ -49,7 +49,7 @@
..()
// Special asteroid variant that goes with lava better.
/turf/simulated/floor/asteroid/basalt
/turf/unsimulated/floor/asteroid/basalt
name = "basalt"
icon = 'icons/turf/basalt.dmi'
icon_state = "basalt"
@@ -65,14 +65,14 @@
footstep_sound = "concretestep"
/turf/simulated/floor/asteroid/basalt/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
/turf/unsimulated/floor/asteroid/basalt/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
underlay_appearance.icon = icon
underlay_appearance.icon_state = "basalt"
if (prob(20))
underlay_appearance.icon_state += "[rand(0,12)]"
return TRUE
/turf/simulated/floor/asteroid/basalt/Initialize(mapload)
/turf/unsimulated/floor/asteroid/basalt/Initialize(mapload)
if (prob(20))
var/variant = rand(0,12)
icon_state = "basalt[variant]"
@@ -85,7 +85,7 @@
light_range = 2
. = ..()
/turf/simulated/floor/asteroid/ash
/turf/unsimulated/floor/asteroid/ash
name = "ash"
icon_state = "ash"
desc = "A fine grey ash. Looks pretty tightly packed."
@@ -94,12 +94,12 @@
base_icon_state = "ash"
footstep_sound = "sandstep"
/turf/simulated/floor/asteroid/ash/Initialize()
/turf/unsimulated/floor/asteroid/ash/Initialize()
. = ..()
if (prob(20))
add_overlay("asteroid[rand(0, 9)]", TRUE)
/turf/simulated/floor/asteroid/ash/rocky
/turf/unsimulated/floor/asteroid/ash/rocky
name = "rocky ash"
icon_state = "rockyash"
base_icon_state = "rockyash"
code/modules/mining/mine_turfs.dm
+14 -15
View File
@@ -17,7 +17,7 @@ var/list/mineral_can_smooth_with = list(
// Some extra types for the surface to keep things pretty.
/turf/simulated/mineral/surface
mined_turf = /turf/simulated/floor/asteroid/ash
mined_turf = /turf/unsimulated/floor/asteroid/ash
/turf/simulated/mineral //wall piece
name = "rock"
@@ -38,7 +38,7 @@ var/list/mineral_can_smooth_with = list(
density = 1
blocks_air = 1
temperature = T0C
var/mined_turf = /turf/simulated/floor/asteroid/ash/rocky
var/mined_turf = /turf/unsimulated/floor/asteroid/ash/rocky
var/ore/mineral
var/mined_ore = 0
var/last_act = 0
@@ -528,7 +528,7 @@ var/list/mineral_can_smooth_with = list(
// Setting icon/icon_state initially will use these values when the turf is built on/replaced.
// This means you can put grass on the asteroid etc.
/turf/simulated/floor/asteroid
/turf/unsimulated/floor/asteroid
name = "coder's blight"
icon = 'icons/turf/map_placeholders.dmi'
icon_state = ""
@@ -539,7 +539,6 @@ var/list/mineral_can_smooth_with = list(
base_icon = 'icons/turf/map_placeholders.dmi'
base_icon_state = "ash"
initial_flooring = null
oxygen = 0
nitrogen = 0
temperature = TCMB
@@ -553,14 +552,14 @@ var/list/mineral_can_smooth_with = list(
// Same as the other, this is a global so we don't have a lot of pointless lists floating around.
// Basalt is explicitly omitted so ash will spill onto basalt turfs.
var/list/asteroid_floor_smooth = list(
/turf/simulated/floor/asteroid/ash,
/turf/unsimulated/floor/asteroid/ash,
/turf/simulated/mineral,
/turf/simulated/wall,
/turf/simulated/shuttle
)
// Copypaste parent for performance.
/turf/simulated/floor/asteroid/Initialize(mapload)
/turf/unsimulated/floor/asteroid/Initialize(mapload)
if(initialized)
crash_with("Warning: [src]([type]) initialized multiple times!")
initialized = TRUE
@@ -595,7 +594,7 @@ var/list/asteroid_floor_smooth = list(
return INITIALIZE_HINT_NORMAL
/turf/simulated/floor/asteroid/ex_act(severity)
/turf/unsimulated/floor/asteroid/ex_act(severity)
switch(severity)
if(3.0)
return
@@ -615,10 +614,10 @@ var/list/asteroid_floor_smooth = list(
gets_dug()
return
/turf/simulated/floor/asteroid/is_plating()
/turf/unsimulated/floor/asteroid/is_plating()
return 0
/turf/simulated/floor/asteroid/attackby(obj/item/weapon/W as obj, mob/user as mob)
/turf/unsimulated/floor/asteroid/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(!W || !user)
return 0
@@ -669,13 +668,13 @@ var/list/asteroid_floor_smooth = list(
playsound(user.loc, 'sound/effects/stonedoor_openclose.ogg', 50, 1)
digging = 1
if(!do_after(user, 60))
if (istype(src, /turf/simulated/floor/asteroid))
if (istype(src, /turf/unsimulated/floor/asteroid))
digging = 0
return
// Turfs are special. They don't delete. So we need to check if it's
// still the same turf as before the sleep.
if (!istype(src, /turf/simulated/floor/asteroid))
if (!istype(src, /turf/unsimulated/floor/asteroid))
return
playsound(user.loc, 'sound/effects/stonedoor_openclose.ogg', 50, 1)
@@ -718,13 +717,13 @@ var/list/asteroid_floor_smooth = list(
digging = 1
if(!do_after(user,40))
if (istype(src, /turf/simulated/floor/asteroid))
if (istype(src, /turf/unsimulated/floor/asteroid))
digging = 0
return
// Turfs are special. They don't delete. So we need to check if it's
// still the same turf as before the sleep.
if (!istype(src, /turf/simulated/floor/asteroid))
if (!istype(src, /turf/unsimulated/floor/asteroid))
return
to_chat(user, "<span class='notice'> You dug a hole.</span>")
@@ -749,7 +748,7 @@ var/list/asteroid_floor_smooth = list(
..(W,user)
return
/turf/simulated/floor/asteroid/proc/gets_dug(mob/user)
/turf/unsimulated/floor/asteroid/proc/gets_dug(mob/user)
add_overlay("asteroid_dug", TRUE)
@@ -814,7 +813,7 @@ var/list/asteroid_floor_smooth = list(
else
ChangeTurf(/turf/space)
/turf/simulated/floor/asteroid/Entered(atom/movable/M as mob|obj)
/turf/unsimulated/floor/asteroid/Entered(atom/movable/M as mob|obj)
..()
if(istype(M,/mob/living/silicon/robot))
var/mob/living/silicon/robot/R = M