cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 14:39:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Renames smooth var to smoothing_flags (#52427)

Browse Source 
* smooth_flags

* SMOOTH_FALSE

* smooth_flags
This commit is contained in:
Rohesie
2020-07-29 04:20:34 -04:00
committed by SkyratBot
parent 69c2e250eb
commit e7941a25ce
36 changed files with 122 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/aliens.dm
+2 -2
View File
@@ -59,7 +59,7 @@
anchored = TRUE
canSmoothWith = list(/obj/structure/alien/resin)
max_integrity = 200
smooth = SMOOTH_TRUE
smoothing_flags = SMOOTH_TRUE
var/resintype = null
CanAtmosPass = ATMOS_PASS_DENSITY
@@ -114,7 +114,7 @@
icon_state = "weeds"
max_integrity = 15
canSmoothWith = list(/obj/structure/alien/weeds, /turf/closed/wall)
smooth = SMOOTH_MORE
smoothing_flags = SMOOTH_MORE
var/last_expand = 0 //last world.time this weed expanded
var/growth_cooldown_low = 150
var/growth_cooldown_high = 200
code/game/objects/structures/beds_chairs/alien_nest.dm
+1 -1
View File
@@ -6,7 +6,7 @@
icon = 'icons/obj/smooth_structures/alien/nest.dmi'
icon_state = "nest"
max_integrity = 120
smooth = SMOOTH_TRUE
smoothing_flags = SMOOTH_TRUE
can_be_unanchored = FALSE
canSmoothWith = null
buildstacktype = null
code/game/objects/structures/false_walls.dm
+5 -5
View File
@@ -19,7 +19,7 @@
/obj/structure/falsewall/reinforced,
/turf/closed/wall/rust,
/turf/closed/wall/r_wall/rust)
smooth = SMOOTH_TRUE
smoothing_flags = SMOOTH_TRUE
can_be_unanchored = FALSE
CanAtmosPass = ATMOS_PASS_DENSITY
flags_1 = RAD_PROTECT_CONTENTS_1 | RAD_NO_CONTAMINATE_1
@@ -63,14 +63,14 @@
if(opening)
if(density)
icon_state = "fwall_opening"
smooth = SMOOTH_FALSE
smoothing_flags = NONE
clear_smooth_overlays()
else
icon_state = "fwall_closing"
else
if(density)
icon_state = initial(icon_state)
smooth = SMOOTH_TRUE
smoothing_flags = SMOOTH_TRUE
QUEUE_SMOOTH(src)
else
icon_state = "fwall_open"
@@ -300,7 +300,7 @@
icon_state = "shuttle"
mineral = /obj/item/stack/sheet/mineral/titanium
walltype = /turf/closed/wall/mineral/titanium
smooth = SMOOTH_MORE
smoothing_flags = SMOOTH_MORE
canSmoothWith = list(/turf/closed/wall/mineral/titanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/shuttle, /obj/structure/shuttle/engine/heater)
/obj/structure/falsewall/plastitanium
@@ -310,5 +310,5 @@
icon_state = "shuttle"
mineral = /obj/item/stack/sheet/mineral/plastitanium
walltype = /turf/closed/wall/mineral/plastitanium
smooth = SMOOTH_MORE
smoothing_flags = SMOOTH_MORE
canSmoothWith = list(/turf/closed/wall/mineral/plastitanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/shuttle, /obj/structure/shuttle/engine/heater)
code/game/objects/structures/fluff.dm
+1 -1
View File
@@ -253,7 +253,7 @@
desc = "A large bushy hedge."
icon = 'icons/obj/smooth_structures/hedge.dmi'
icon_state = "hedge"
smooth = SMOOTH_TRUE
smoothing_flags = SMOOTH_TRUE
canSmoothWith = list(/obj/structure/fluff/hedge, /obj/structure/fluff/hedge/opaque)
density = TRUE
anchored = TRUE
code/game/objects/structures/grille.dm
+1 -1
View File
@@ -31,7 +31,7 @@
var/ratio = obj_integrity / max_integrity
ratio = CEILING(ratio*4, 1) * 25
if(smooth)
if(smoothing_flags)
QUEUE_SMOOTH(src)
if(ratio > 50)
code/game/objects/structures/lattice.dm
+3 -3
View File
@@ -15,7 +15,7 @@
/turf/open/floor,
/turf/closed/wall,
/obj/structure/falsewall)
smooth = SMOOTH_MORE
smoothing_flags = SMOOTH_MORE
// flags = CONDUCT_1
obj_flags = CAN_BE_HIT | BLOCK_Z_OUT_DOWN
@@ -76,7 +76,7 @@
icon = 'icons/obj/smooth_structures/catwalk.dmi'
icon_state = "catwalk"
number_of_mats = 2
smooth = SMOOTH_TRUE
smoothing_flags = SMOOTH_TRUE
canSmoothWith = null
obj_flags = CAN_BE_HIT | BLOCK_Z_OUT_DOWN | BLOCK_Z_IN_UP
@@ -102,7 +102,7 @@
icon_state = "catwalk"
number_of_mats = 1
color = "#5286b9ff"
smooth = SMOOTH_TRUE
smoothing_flags = SMOOTH_TRUE
canSmoothWith = null
obj_flags = CAN_BE_HIT | BLOCK_Z_OUT_DOWN | BLOCK_Z_IN_UP
resistance_flags = FIRE_PROOF | LAVA_PROOF
code/game/objects/structures/tables_racks.dm
+4 -4
View File
@@ -32,7 +32,7 @@
custom_materials = list(/datum/material/iron = 2000)
max_integrity = 100
integrity_failure = 0.33
smooth = SMOOTH_TRUE
smoothing_flags = SMOOTH_TRUE
canSmoothWith = list(/obj/structure/table, /obj/structure/table/reinforced, /obj/structure/table/greyscale)
/obj/structure/table/examine(mob/user)
@@ -43,7 +43,7 @@
return "<span class='notice'>The top is <b>screwed</b> on, but the main <b>bolts</b> are also visible.</span>"
/obj/structure/table/update_icon()
if(smooth)
if(smoothing_flags)
QUEUE_SMOOTH(src)
QUEUE_SMOOTH_NEIGHBORS(src)
@@ -251,7 +251,7 @@
name = "Rolling table"
desc = "An NT brand \"Rolly poly\" rolling table. It can and will move."
anchored = FALSE
smooth = SMOOTH_FALSE
smoothing_flags = NONE
canSmoothWith = list()
icon = 'icons/obj/smooth_structures/rollingtable.dmi'
icon_state = "rollingtable"
@@ -521,7 +521,7 @@
icon = 'icons/obj/surgery.dmi'
icon_state = "optable"
buildstack = /obj/item/stack/sheet/mineral/silver
smooth = SMOOTH_FALSE
smoothing_flags = NONE
can_buckle = 1
buckle_lying = -1
buckle_requires_restraints = 1
code/game/objects/structures/window.dm
+11 -11
View File
@@ -304,7 +304,7 @@
//This proc is used to update the icons of nearby windows.
/obj/structure/window/proc/update_nearby_icons()
update_icon()
if(smooth)
if(smoothing_flags)
QUEUE_SMOOTH_NEIGHBORS(src)
//merges adjacent full-tile windows into one
@@ -317,7 +317,7 @@
var/ratio = obj_integrity / max_integrity
ratio = CEILING(ratio*4, 1) * 25
if(smooth)
if(smoothing_flags)
QUEUE_SMOOTH(src)
cut_overlay(crack_overlay)
@@ -590,7 +590,7 @@
max_integrity = 50
fulltile = TRUE
flags_1 = PREVENT_CLICK_UNDER_1
smooth = SMOOTH_TRUE
smoothing_flags = SMOOTH_TRUE
canSmoothWith = list(/obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile, /obj/structure/window/plasma/fulltile, /obj/structure/window/plasma/reinforced/fulltile)
glass_amount = 2
@@ -604,7 +604,7 @@
max_integrity = 300
fulltile = TRUE
flags_1 = PREVENT_CLICK_UNDER_1
smooth = SMOOTH_TRUE
smoothing_flags = SMOOTH_TRUE
canSmoothWith = list(/obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile, /obj/structure/window/plasma/fulltile, /obj/structure/window/plasma/reinforced/fulltile)
glass_amount = 2
@@ -619,7 +619,7 @@
max_integrity = 1000
fulltile = TRUE
flags_1 = PREVENT_CLICK_UNDER_1
smooth = SMOOTH_TRUE
smoothing_flags = SMOOTH_TRUE
glass_amount = 2
/obj/structure/window/plasma/reinforced/fulltile/unanchored
@@ -633,7 +633,7 @@
max_integrity = 150
fulltile = TRUE
flags_1 = PREVENT_CLICK_UNDER_1
smooth = SMOOTH_TRUE
smoothing_flags = SMOOTH_TRUE
state = RWINDOW_SECURE
canSmoothWith = list(/obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile, /obj/structure/window/plasma/fulltile, /obj/structure/window/plasma/reinforced/fulltile)
glass_amount = 2
@@ -648,7 +648,7 @@
dir = FULLTILE_WINDOW_DIR
fulltile = TRUE
flags_1 = PREVENT_CLICK_UNDER_1
smooth = SMOOTH_TRUE
smoothing_flags = SMOOTH_TRUE
canSmoothWith = list(/obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile, /obj/structure/window/plasma/fulltile, /obj/structure/window/plasma/reinforced/fulltile)
glass_amount = 2
@@ -672,7 +672,7 @@
reinf = TRUE
heat_resistance = 1600
armor = list("melee" = 90, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 100)
smooth = SMOOTH_TRUE
smoothing_flags = SMOOTH_TRUE
canSmoothWith = null
explosion_block = 3
glass_type = /obj/item/stack/sheet/titaniumglass
@@ -700,7 +700,7 @@
flags_1 = PREVENT_CLICK_UNDER_1
heat_resistance = 1600
armor = list("melee" = 95, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 100)
smooth = SMOOTH_TRUE
smoothing_flags = SMOOTH_TRUE
canSmoothWith = null
explosion_block = 3
damage_deflection = 11 //The same as normal reinforced windows.3
@@ -722,7 +722,7 @@
max_integrity = 15
fulltile = TRUE
flags_1 = PREVENT_CLICK_UNDER_1
smooth = SMOOTH_TRUE
smoothing_flags = SMOOTH_TRUE
canSmoothWith = list(/obj/structure/window/paperframe, /obj/structure/mineral_door/paperframe)
glass_amount = 2
glass_type = /obj/item/stack/sheet/paperframes
@@ -808,7 +808,7 @@
/obj/structure/window/bronze/fulltile
icon_state = "clockwork_window"
smooth = SMOOTH_TRUE
smoothing_flags = SMOOTH_TRUE
canSmoothWith = null
fulltile = TRUE
flags_1 = PREVENT_CLICK_UNDER_1