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

Added another mode for smoothing (smooth with all subtypes).

Browse Source
This commit is contained in:
xxalpha
2015-09-23 00:55:10 +01:00
parent fc073def62
commit 36ae116a48
13 changed files with 54 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/false_walls.dm
+4 -4
View File
@@ -19,7 +19,7 @@
/obj/structure/falsewall/reinforced, // WHY DO WE SMOOTH WITH FALSE R-WALLS WHEN WE DON'T SMOOTH WITH REAL R-WALLS.
/turf/simulated/wall/rust,
/turf/simulated/wall/r_wall/rust)
smooth = 1
smooth = SMOOTH_TRUE
can_be_unanchored = 0
/obj/structure/falsewall/attack_hand(mob/user)
@@ -49,15 +49,15 @@
/obj/structure/falsewall/proc/do_the_flick()
if(density)
smooth = 0
clear_overlays(src)
smooth = SMOOTH_FALSE
clear_smooth_overlays()
icon_state = "fwall_opening"
else
icon_state = "fwall_closing"
/obj/structure/falsewall/update_icon()//Calling icon_update will refresh the smoothwalls if it's closed, otherwise it will make sure the icon is correct if it's open
if(density)
smooth = 1
smooth = SMOOTH_TRUE
smooth_icon(src)
icon_state = ""
else
code/game/objects/structures/lattice.dm
+4 -11
View File
@@ -8,18 +8,10 @@
layer = 2.3 //under pipes
var/obj/item/stack/rods/stored
canSmoothWith = list(/obj/structure/lattice,
/obj/structure/lattice/catwalk,
/turf/simulated/floor/plating,
/turf/simulated/floor/plating/airless,
/turf/simulated/floor,
/turf/simulated/wall,
/turf/simulated/wall/r_wall,
/turf/simulated/floor/plasteel,
/turf/simulated/floor/plasteel/airless,
/obj/structure/falsewall,
/obj/structure/falsewall/reinforced,
/turf/simulated/wall/rust,
/turf/simulated/wall/r_wall/rust)
smooth = 1
/obj/structure/falsewall)
smooth = SMOOTH_MORE
// flags = CONDUCT
/obj/structure/lattice/New()
@@ -75,6 +67,7 @@
desc = "A catwalk for easier EVA manuevering and cable placement."
icon = 'icons/obj/smooth_structures/catwalk.dmi'
icon_state = "catwalk"
smooth = SMOOTH_TRUE
canSmoothWith = null
/obj/structure/lattice/catwalk/Move()
code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
+1 -1
View File
@@ -6,7 +6,7 @@
icon = 'icons/obj/smooth_structures/alien/nest.dmi'
icon_state = "nest"
var/health = 100
smooth = 1
smooth = SMOOTH_TRUE
can_be_unanchored = 0
canSmoothWith = null
var/image/nest_overlay
code/game/objects/structures/tables_racks.dm
+1 -1
View File
@@ -28,7 +28,7 @@
var/buildstackamount = 1
var/framestackamount = 2
var/mob/tableclimber
smooth = 1
smooth = SMOOTH_TRUE
canSmoothWith = list(/obj/structure/table, /obj/structure/table/reinforced)
/obj/structure/table/New()
code/game/objects/structures/window.dm
+4 -4
View File
@@ -441,7 +441,7 @@
dir = 5
maxhealth = 50
fulltile = 1
smooth = 1
smooth = SMOOTH_TRUE
canSmoothWith = list(/obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile)
/obj/structure/window/reinforced/fulltile
@@ -450,7 +450,7 @@
dir = 5
maxhealth = 100
fulltile = 1
smooth = 1
smooth = SMOOTH_TRUE
canSmoothWith = list(/obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile)
/obj/structure/window/reinforced/tinted/fulltile
@@ -458,7 +458,7 @@
icon_state = "tinted_window"
dir = 5
fulltile = 1
smooth = 1
smooth = SMOOTH_TRUE
canSmoothWith = list(/obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile)
/obj/structure/window/shuttle
@@ -471,6 +471,6 @@
wtype = "shuttle"
fulltile = 1
reinf = 1
smooth = 1
smooth = SMOOTH_TRUE
canSmoothWith = null
explosion_block = 1