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

Icon smoothing subsystem update (#17383)

Browse Source 
* sfasdf

* sfsaf

* sadfas

* sdfasdf
This commit is contained in:
Fluffy
2023-09-27 10:23:15 +00:00
committed by GitHub
parent 5623822d0d
commit 870f97c1c7
34 changed files with 370 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/maps/map_template.dm
+3 -3
View File
@@ -48,7 +48,7 @@
var/list/atoms_to_initialise = list()
var/shuttle_state = pre_init_shuttles()
//Since queue_smooth() manually wakes the subsystem, we have to use enable/disable.
//Since SSicon_smooth.add_to_queue() manually wakes the subsystem, we have to use enable/disable.
SSicon_smooth.disable()
for (var/mappath in mappaths)
var/datum/map_load_metadata/M = maploader.load_map(file(mappath), x, y, no_changeturf = no_changeturf)
@@ -162,7 +162,7 @@
var/list/atoms_to_initialise = list()
var/shuttle_state = pre_init_shuttles()
//Since queue_smooth() manually wakes the subsystem, we have to use enable/disable.
//Since SSicon_smooth.add_to_queue() manually wakes the subsystem, we have to use enable/disable.
SSicon_smooth.disable()
for (var/mappath in mappaths)
var/datum/map_load_metadata/M = maploader.load_map(file(mappath), T.x, T.y, T.z, cropMap=TRUE)
@@ -171,7 +171,7 @@
else
SSicon_smooth.enable()
return FALSE
//initialize things that are normally initialized after map load
init_atoms(atoms_to_initialise)
init_shuttles(shuttle_state)
code/modules/maps/reader.dm
+4 -4
View File
@@ -307,7 +307,7 @@ var/global/dmm_suite/preloader/_preloader = new
//since we've switched off autoinitialisation, record atoms to initialise later
var/list/atoms_to_initialise = list()
//turn off base new Initialization until the whole thing is loaded
SSatoms.map_loader_begin()
SSatoms.map_loader_begin(text_ref(src))
//The next part of the code assumes there's ALWAYS an /area AND a /turf on a given tile
var/turf/crds = locate(xcrd,ycrd,zcrd)
@@ -355,7 +355,7 @@ var/global/dmm_suite/preloader/_preloader = new
for(index in 1 to first_turf_index-1)
atoms_to_initialise += instance_atom(members[index],members_attributes[index],crds,no_changeturf)
//Restore initialization to the previous value
SSatoms.map_loader_stop()
SSatoms.map_loader_stop(text_ref(src))
var/datum/grid_load_metadata/M = new
M.atoms_to_initialise = atoms_to_initialise
@@ -381,9 +381,9 @@ var/global/dmm_suite/preloader/_preloader = new
//custom CHECK_TICK here because we don't want things created while we're sleeping to not initialize
if(TICK_CHECK)
SSatoms.map_loader_stop()
SSatoms.map_loader_stop(text_ref(src))
stoplag()
SSatoms.map_loader_begin()
SSatoms.map_loader_begin(text_ref(src))
/dmm_suite/proc/create_atom(path, crds)
// Doing this async is impossible, as we must return the ref.
code/modules/mining/mine_turf_types.dm
+4 -4
View File
@@ -5,7 +5,7 @@
icon = 'icons/turf/smooth/lava.dmi'
icon_state = "smooth"
gender = PLURAL
smooth = SMOOTH_TRUE | SMOOTH_BORDER
smoothing_flags = SMOOTH_TRUE | SMOOTH_BORDER
light_color = LIGHT_COLOR_LAVA
light_range = 2
canSmoothWith = list(
@@ -61,7 +61,7 @@
base_icon = 'icons/turf/basalt.dmi'
base_icon_state = "basalt"
light_color = LIGHT_COLOR_LAVA
smooth = SMOOTH_FALSE
smoothing_flags = SMOOTH_FALSE
canSmoothWith = null
openspace_override_type = /turf/simulated/open/chasm/airless
@@ -78,7 +78,7 @@
base_icon = 'icons/turf/basalt.dmi'
base_icon_state = "basalt"
light_color = LIGHT_COLOR_LAVA
smooth = SMOOTH_FALSE
smoothing_flags = SMOOTH_FALSE
canSmoothWith = null
openspace_override_type = /turf/simulated/open/chasm/airless
@@ -115,7 +115,7 @@
name = "ash"
icon_state = "ash"
desc = "A fine grey ash. Looks pretty tightly packed."
smooth = SMOOTH_MORE | SMOOTH_BORDER | SMOOTH_NO_CLEAR_ICON
smoothing_flags = SMOOTH_MORE | SMOOTH_BORDER | SMOOTH_NO_CLEAR_ICON
base_icon = 'icons/turf/smooth/ash.dmi'
base_icon_state = "ash"
footstep_sound = /singleton/sound_category/sand_footstep
code/modules/mining/mine_turfs.dm
+7 -7
View File
@@ -7,7 +7,7 @@
density = TRUE
gender = PLURAL
opacity = TRUE
smooth = SMOOTH_TRUE
smoothing_flags = SMOOTH_TRUE
color = "#6e632f"
/turf/unsimulated/mineral/konyang
@@ -30,7 +30,7 @@ var/list/mineral_can_smooth_with = list(
layer = ON_TURF_LAYER
// canSmoothWith is set in Initialize().
smooth = SMOOTH_MORE | SMOOTH_BORDER | SMOOTH_NO_CLEAR_ICON
smoothing_flags = SMOOTH_MORE | SMOOTH_BORDER | SMOOTH_NO_CLEAR_ICON
smoothing_hints = SMOOTHHINT_CUT_F | SMOOTHHINT_ONLY_MATCH_TURF | SMOOTHHINT_TARGETS_NOT_UNIQUE
initial_gas = null
@@ -82,7 +82,7 @@ var/list/mineral_can_smooth_with = list(
has_opaque_atom = TRUE
if(smooth)
if(smoothing_flags)
canSmoothWith = mineral_can_smooth_with
pixel_x = -4
pixel_y = -4
@@ -178,7 +178,7 @@ var/list/mineral_can_smooth_with = list(
/turf/unsimulated/mineral,
/turf/unsimulated/mineral/asteroid
)
smooth = SMOOTH_MORE | SMOOTH_BORDER | SMOOTH_NO_CLEAR_ICON
smoothing_flags = SMOOTH_MORE | SMOOTH_BORDER | SMOOTH_NO_CLEAR_ICON
smoothing_hints = SMOOTHHINT_CUT_F | SMOOTHHINT_ONLY_MATCH_TURF | SMOOTHHINT_TARGETS_NOT_UNIQUE
/turf/unsimulated/mineral/asteroid/Initialize(mapload)
@@ -202,7 +202,7 @@ var/list/mineral_can_smooth_with = list(
has_opaque_atom = TRUE
if(smooth)
if(smoothing_flags)
canSmoothWith = asteroid_can_smooth_with
pixel_x = -4
pixel_y = -4
@@ -626,7 +626,7 @@ var/list/mineral_can_smooth_with = list(
icon = 'icons/turf/map_placeholders.dmi'
icon_state = ""
desc = "An exposed developer texture. Someone wasn't paying attention."
smooth = SMOOTH_FALSE
smoothing_flags = SMOOTH_FALSE
smoothing_hints = SMOOTHHINT_CUT_F | SMOOTHHINT_ONLY_MATCH_TURF | SMOOTHHINT_TARGETS_NOT_UNIQUE
gender = PLURAL
base_icon = 'icons/turf/map_placeholders.dmi'
@@ -673,7 +673,7 @@ var/list/asteroid_floor_smooth = list(
if(mapload && permit_ao)
queue_ao()
if(smooth)
if(smoothing_flags)
canSmoothWith = asteroid_floor_smooth
pixel_x = -4
pixel_y = -4
code/modules/mob/living/carbon/human/npcs.dm
+3
View File
@@ -15,6 +15,9 @@
named = TRUE
gender = MALE
INVOKE_ASYNC(src, PROC_REF(EquipPunpunUniform))
/mob/living/carbon/human/monkey/punpun/proc/EquipPunpunUniform()
equip_to_slot(new /obj/item/clothing/under/punpun(src), slot_w_uniform)
/obj/item/clothing/under/nupnup
code/modules/multiz/turfs/open_space.dm
+1 -1
View File
@@ -146,7 +146,7 @@
/turf/simulated/open/chasm
icon = 'icons/turf/smooth/chasms_seethrough.dmi'
icon_state = "debug"
smooth = SMOOTH_TRUE | SMOOTH_BORDER | SMOOTH_NO_CLEAR_ICON
smoothing_flags = SMOOTH_TRUE | SMOOTH_BORDER | SMOOTH_NO_CLEAR_ICON
smoothing_hints = SMOOTHHINT_CUT_F | SMOOTHHINT_ONLY_MATCH_TURF | SMOOTHHINT_TARGETS_NOT_UNIQUE
z_flags = ZM_MIMIC_BELOW
name = "hole"
code/modules/overmap/exoplanets/decor/_turfs.dm
+3 -3
View File
@@ -129,7 +129,7 @@
icon_state = "snow0"
dirt_color = "#e3e7e8"
footstep_sound = /singleton/sound_category/snow_footstep
smooth = SMOOTH_MORE | SMOOTH_BORDER | SMOOTH_NO_CLEAR_ICON
smoothing_flags = SMOOTH_MORE | SMOOTH_BORDER | SMOOTH_NO_CLEAR_ICON
smoothing_hints = SMOOTHHINT_CUT_F | SMOOTHHINT_ONLY_MATCH_TURF | SMOOTHHINT_TARGETS_NOT_UNIQUE
canSmoothWith = list(
/turf/simulated/floor/exoplanet/snow,
@@ -142,8 +142,8 @@
pixel_x = -4
pixel_y = -4
icon_state = pick("snow[rand(1,2)]","snow0","snow0")
queue_smooth_neighbors(src)
queue_smooth(src)
SSicon_smooth.add_to_queue_neighbors(src)
SSicon_smooth.add_to_queue(src)
/turf/simulated/floor/exoplanet/snow/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
melt()
code/modules/overmap/exoplanets/decor/objs/clearing.dm
+1 -1
View File
@@ -6,7 +6,7 @@
blend_mode = BLEND_MULTIPLY
density = FALSE
anchored = TRUE
smooth = SMOOTH_MORE
smoothing_flags = SMOOTH_MORE
canSmoothWith = list(
/obj/structure/clearing,
/obj/structure/lattice/catwalk,
code/modules/overmap/exoplanets/decor/turfs/konyang.dm
+3 -3
View File
@@ -34,14 +34,14 @@
name = "wilting mossy grass"
icon = 'icons/turf/flooring/exoplanet/konyang/moss_transition_1.dmi'
icon_state = "unsmooth"
smooth = SMOOTH_MORE | SMOOTH_BORDER | SMOOTH_NO_CLEAR_ICON
smoothing_flags = SMOOTH_MORE | SMOOTH_BORDER | SMOOTH_NO_CLEAR_ICON
canSmoothWith = list(/turf/simulated/floor/exoplanet/konyang/wilting, /turf/simulated/floor/exoplanet/konyang/pink)
/turf/simulated/floor/exoplanet/konyang/pink//manually mapped. To be surrounded by wilting grass
name = "blossoming mossy grass"
icon = 'icons/turf/flooring/exoplanet/konyang/moss_transition_2.dmi'
icon_state = "unsmooth"
smooth = SMOOTH_TRUE
smoothing_flags = SMOOTH_TRUE
/turf/simulated/floor/exoplanet/dirt_konyang//a different path entirely so it will allow for edges to generate from grass
name = "compacted dirt"
@@ -57,6 +57,6 @@
icon = 'icons/turf/flooring/exoplanet/konyang/konyang_beach.dmi'
icon_state = "sand"
footstep_sound = /singleton/sound_category/asteroid_footstep
smooth = SMOOTH_FALSE
smoothing_flags = SMOOTH_FALSE
does_footprint = FALSE
has_edge_icon = FALSE
code/modules/overmap/exoplanets/decor/turfs/snow.dm
+3 -3
View File
@@ -5,7 +5,7 @@
dirt_color = "#e3e7e8"
layer = LOWER_ON_TURF_LAYER
footstep_sound = /singleton/sound_category/snow_footstep
smooth = SMOOTH_MORE | SMOOTH_BORDER | SMOOTH_NO_CLEAR_ICON
smoothing_flags = SMOOTH_MORE | SMOOTH_BORDER | SMOOTH_NO_CLEAR_ICON
smoothing_hints = SMOOTHHINT_CUT_F | SMOOTHHINT_ONLY_MATCH_TURF | SMOOTHHINT_TARGETS_NOT_UNIQUE
canSmoothWith = list(
/turf/simulated/floor/exoplanet/snow,
@@ -18,8 +18,8 @@
pixel_x = -4
pixel_y = -4
icon_state = pick("snow[rand(1,2)]","snow0","snow0")
queue_smooth_neighbors(src)
queue_smooth(src)
SSicon_smooth.add_to_queue_neighbors(src)
SSicon_smooth.add_to_queue(src)
/turf/simulated/floor/exoplanet/snow/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
melt()
code/modules/overmap/exoplanets/decor/turfs/water.dm
+4 -4
View File
@@ -13,7 +13,7 @@
icon_state = "unsmooth"
base_icon_state = "unsmooth"
icon = 'icons/turf/flooring/exoplanet/konyang/konyang_deep_water.dmi'
smooth = SMOOTH_TRUE
smoothing_flags = SMOOTH_TRUE
/turf/simulated/floor/exoplanet/water/shallow
name = "shallow water"
@@ -36,15 +36,15 @@
icon_state = "unsmooth"
base_icon_state = "unsmooth"
icon = 'icons/turf/flooring/exoplanet/konyang/konyang_smooth_water.dmi'
smooth = SMOOTH_MORE | SMOOTH_BORDER | SMOOTH_NO_CLEAR_ICON
smoothing_flags = SMOOTH_MORE | SMOOTH_BORDER | SMOOTH_NO_CLEAR_ICON
canSmoothWith = list(/turf/simulated/floor/exoplanet/water/shallow/konyang, /turf/simulated/floor/exoplanet/water/konyang, /turf/simulated/floor/exoplanet/water/shallow/konyang/beach)
/turf/simulated/floor/exoplanet/water/shallow/konyang/no_smooth
smooth = SMOOTH_FALSE
smoothing_flags = SMOOTH_FALSE
/turf/simulated/floor/exoplanet/water/shallow/konyang/beach
icon = 'icons/turf/flooring/exoplanet/konyang/konyang_beach.dmi'
smooth = SMOOTH_MORE | SMOOTH_BORDER | SMOOTH_NO_CLEAR_ICON
smoothing_flags = SMOOTH_MORE | SMOOTH_BORDER | SMOOTH_NO_CLEAR_ICON
canSmoothWith = list(/turf/simulated/floor/exoplanet/water/shallow/konyang, /turf/simulated/floor/exoplanet/water/konyang, /turf/simulated/floor/exoplanet/water/shallow/konyang/beach)
/turf/simulated/floor/exoplanet/water/shallow/sewage//What horror.