cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 12:29:46 +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/game/objects/structures/full_window_frame.dm
+2 -2
View File
@@ -9,7 +9,7 @@
anchored = TRUE
density = TRUE
climbable = TRUE
smooth = SMOOTH_MORE
smoothing_flags = SMOOTH_MORE
breakable = TRUE
can_be_unanchored = TRUE
canSmoothWith = list(
@@ -153,7 +153,7 @@
/obj/structure/window_frame/shuttle
icon = 'icons/obj/smooth/window/full_window_frame_color.dmi'
color = null
smooth = SMOOTH_MORE
smoothing_flags = SMOOTH_MORE
canSmoothWith = list(
/turf/simulated/wall/shuttle,
/turf/simulated/wall/shuttle/cardinal,
code/game/objects/structures/grille.dm
+3 -3
View File
@@ -19,7 +19,7 @@
name = "over-frame grille"
icon = 'icons/obj/smooth/window/grille_over.dmi'
layer = BELOW_OBJ_LAYER
smooth = SMOOTH_MORE
smoothing_flags = SMOOTH_MORE
canSmoothWith = list(
/turf/simulated/wall,
/turf/simulated/wall/r_wall,
@@ -158,7 +158,7 @@
playsound(loc, 'sound/items/Screwdriver.ogg', 100, 1)
anchored = !anchored
user.visible_message("<span class='notice'>[user] [anchored ? "fastens" : "unfastens"] the grille.</span>", \
"<span class='notice'>You have [anchored ? "fastened the grille to" : "unfastened the grill from"] the floor.</span>")
"<span class='notice'>You have [anchored ? "fastened the grille to" : "unfastened the grill from"] the floor.</span>")
return
else if(istype(W,/obj/item/stack/rods) && destroyed == 1)
if(!shock(user, 90))
@@ -169,7 +169,7 @@
icon_state = "grille"
ROD.use(1)
user.visible_message("<span class='notice'>[user] repairs the grille.</span>", \
"<span class='notice'>You have repaired the grille.</span>")
"<span class='notice'>You have repaired the grille.</span>")
return
//window placing begin //TODO CONVERT PROPERLY TO MATERIAL DATUM
code/game/objects/structures/lattice.dm
+8 -8
View File
@@ -10,7 +10,7 @@
w_class = ITEMSIZE_NORMAL
layer = UNDER_PIPE_LAYER //under pipes
obj_flags = OBJ_FLAG_MOVES_UNSUPPORTED
smooth = SMOOTH_MORE
smoothing_flags = SMOOTH_MORE
canSmoothWith = list(
/obj/structure/lattice,
/turf/simulated/wall,
@@ -74,7 +74,7 @@
desc = "A catwalk for easier EVA maneuvering."
icon = 'icons/obj/smooth/catwalk.dmi'
icon_state = "catwalk"
smooth = SMOOTH_TRUE
smoothing_flags = SMOOTH_TRUE
canSmoothWith = list(
/obj/structure/lattice/catwalk,
/obj/structure/lattice/catwalk/indoor
@@ -105,8 +105,8 @@
if(C.use_tool(src, user, 5, volume = 50))
anchored = !anchored
to_chat(user, SPAN_NOTICE("You [anchored ? "" : "un"]anchor [src]."))
queue_smooth(src)
queue_smooth_neighbors(src)
SSicon_smooth.add_to_queue(src)
SSicon_smooth.add_to_queue_neighbors(src)
else
..()
@@ -122,7 +122,7 @@
icon = 'icons/obj/grate.dmi'
icon_state = "grate"
return_amount = 1
smooth = null
smoothing_flags = null
color = COLOR_TILED
var/base_icon_state = "grate"
var/damaged = FALSE
@@ -192,7 +192,7 @@
icon = 'icons/obj/structure/over_turf.dmi'
icon_state = "city_grate"
return_amount = 1
smooth = null
smoothing_flags = null
/obj/structure/lattice/catwalk/indoor/tatami
name = "tatami spread"
@@ -200,7 +200,7 @@
icon = 'icons/obj/structure/over_turf.dmi'
icon_state = "tatami"
return_amount = null
smooth = null
smoothing_flags = null
footstep_sound = /singleton/sound_category/carpet_footstep
/obj/structure/lattice/catwalk/indoor/planks
@@ -209,7 +209,7 @@
icon = 'icons/obj/structure/urban/wood.dmi'
icon_state = "plank"
return_amount = null
smooth = null
smoothing_flags = null
footstep_sound = /singleton/sound_category/wood_footstep
/obj/structure/lattice/catwalk/indoor/planks/opaque
code/game/objects/structures/urban.dm
+1 -1
View File
@@ -496,7 +496,7 @@
icon_state = "frame_half"
//basestate = "frame_half"
color = COLOR_GUNMETAL
smooth = null
smoothing_flags = null
/obj/structure/window_frame/urban/full
name = "window frame"
code/game/objects/structures/window.dm
+10 -10
View File
@@ -57,7 +57,7 @@
to_chat(user, SPAN_NOTICE("There is a thick layer of silicate covering it."))
/obj/structure/window/proc/update_nearby_icons()
queue_smooth_neighbors(src)
SSicon_smooth.add_to_queue_neighbors(src)
/obj/structure/window/update_icon()
if(!full)
@@ -65,7 +65,7 @@
layer = ABOVE_MOB_LAYER
else
layer = WINDOW_PANE_LAYER
queue_smooth(src)
SSicon_smooth.add_to_queue(src)
/obj/structure/window/proc/take_damage(var/damage = 0, var/sound_effect = 1, message = TRUE)
var/initialhealth = health
@@ -544,7 +544,7 @@
reinf = TRUE
basestate = "w"
dir = 5
smooth = SMOOTH_TRUE
smoothing_flags = SMOOTH_TRUE
can_be_unanchored = TRUE
layer = 2.99
@@ -563,7 +563,7 @@
icon = 'icons/obj/smooth/skrell_window_purple.dmi'
health = 500
maxhealth = 500
smooth = SMOOTH_MORE | SMOOTH_DIAGONAL
smoothing_flags = SMOOTH_MORE | SMOOTH_DIAGONAL
canSmoothWith = list(
/turf/simulated/wall/shuttle/skrell,
/obj/structure/window/shuttle/skrell
@@ -577,7 +577,7 @@
health = 500
maxhealth = 500
alpha = 255
smooth = SMOOTH_MORE
smoothing_flags = SMOOTH_MORE
canSmoothWith = list(
/obj/structure/window/shuttle/scc_space_ship,
/turf/simulated/wall/shuttle/scc_space_ship
@@ -591,7 +591,7 @@
/obj/structure/window/shuttle/scc_space_ship/cardinal
smooth = SMOOTH_MORE
smoothing_flags = SMOOTH_MORE
/obj/structure/window/shuttle/scc_space_ship/cardinal_smooth(adjacencies, var/list/dir_mods)
dir_mods = handle_blending(adjacencies, dir_mods)
@@ -623,7 +623,7 @@
full = TRUE
layer = 2.99
base_frame = /obj/structure/window_frame
smooth = SMOOTH_MORE
smoothing_flags = SMOOTH_MORE
canSmoothWith = list(
/turf/simulated/wall,
/turf/simulated/wall/r_wall,
@@ -775,17 +775,17 @@
glasstype = /obj/item/stack/material/glass/reinforced
layer = 2.99
base_frame = /obj/structure/window_frame
smooth = SMOOTH_MORE
smoothing_flags = SMOOTH_MORE
/obj/structure/window/full/cardinal_smooth(adjacencies, var/list/dir_mods)
dir_mods = handle_blending(adjacencies, dir_mods)
return ..(adjacencies, dir_mods)
/obj/structure/window_frame/proc/update_nearby_icons()
queue_smooth_neighbors(src)
SSicon_smooth.add_to_queue_neighbors(src)
/obj/structure/window_frame/update_icon()
queue_smooth(src)
SSicon_smooth.add_to_queue(src)
// Indestructible Reinforced Window
/obj/structure/window/full/reinforced/indestructible/attack_hand()