Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-2025-11-12

This commit is contained in:
Roxy
2025-11-12 16:42:38 -05:00
379 changed files with 37535 additions and 33147 deletions
+9 -9
View File
@@ -63,7 +63,7 @@
desc = "Looking at the luscious field, you suddenly feel homesick."
icon_state = "grass0"
bullet_bounce_sound = null
tiled_dirt = FALSE
tiled_turf = FALSE
/turf/open/floor/holofloor/grass/Initialize(mapload)
. = ..()
@@ -76,7 +76,7 @@
icon = 'icons/turf/sand.dmi'
icon_state = "sand"
bullet_bounce_sound = null
tiled_dirt = FALSE
tiled_turf = FALSE
/turf/open/floor/holofloor/beach/coast
gender = NEUTER
@@ -103,7 +103,7 @@
name = "asteroid sand"
desc = "The sand crunches beneath your feet, though it feels soft to the touch."
icon_state = "asteroid"
tiled_dirt = FALSE
tiled_turf = FALSE
/turf/open/floor/holofloor/asteroid/Initialize(mapload)
icon_state = "asteroid[rand(0, 12)]"
@@ -114,7 +114,7 @@
name = "basalt"
desc = "You still feel hot, despite the cool walls of the holodeck."
icon_state = "basalt0"
tiled_dirt = FALSE
tiled_turf = FALSE
/turf/open/floor/holofloor/basalt/Initialize(mapload)
. = ..()
@@ -140,7 +140,7 @@
icon = 'icons/turf/space.dmi'
icon_state = "speedspace_ns_1"
bullet_bounce_sound = null
tiled_dirt = FALSE
tiled_turf = FALSE
/turf/open/floor/holofloor/hyperspace/Initialize(mapload)
icon_state = "speedspace_ns_[(x + 5*y + (y%2+1)*7)%15+1]"
@@ -161,7 +161,7 @@
smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_CARPET
canSmoothWith = SMOOTH_GROUP_CARPET
bullet_bounce_sound = null
tiled_dirt = FALSE
tiled_turf = FALSE
/turf/open/floor/holofloor/carpet/Initialize(mapload)
. = ..()
@@ -175,7 +175,7 @@
/turf/open/floor/holofloor/wood
icon_state = "wood"
desc = "Makes you feel at home."
tiled_dirt = FALSE
tiled_turf = FALSE
/turf/open/floor/holofloor/snow
gender = PLURAL
@@ -186,7 +186,7 @@
slowdown = 2
bullet_sizzle = TRUE
bullet_bounce_sound = null
tiled_dirt = FALSE
tiled_turf = FALSE
/turf/open/floor/holofloor/dark
icon_state = "darkfull"
@@ -195,7 +195,7 @@
/turf/open/floor/holofloor/stairs
name = "stairs"
icon_state = "stairs"
tiled_dirt = FALSE
tiled_turf = FALSE
/turf/open/floor/holofloor/stairs/left
icon_state = "stairs-l"