[MIRROR] Spider web graphics (#2297)

* Spider web graphics * Update icon_smoothing.dm --------- Co-authored-by: NovaBot <[email protected]> Co-authored-by: Jacquerel <[email protected]> Co-authored-by: Bloop <[email protected]>
Fluffy-Frontier · Mar 7, 2024 · d4d0bf8 · d4d0bf8
1 parent f2a3316
commit d4d0bf8
Show file tree

Hide file tree

Showing 30 changed files with 221 additions and 107 deletions.
diff --git a/_maps/RandomRuins/SpaceRuins/garbagetruck4.dmm b/_maps/RandomRuins/SpaceRuins/garbagetruck4.dmm
@@ -78,7 +78,7 @@
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/garbagetruck/toystore)
 "hH" = (
-/obj/structure/spider/solid,
+/obj/structure/spider/stickyweb/sealed/tough,
 /obj/item/book/manual/wiki/cytology,
 /obj/effect/decal/cleanable/plastic,
 /turf/open/floor/plating,
@@ -122,7 +122,7 @@
 /area/ruin/space/has_grav/garbagetruck/toystore)
 "lm" = (
 /obj/structure/spider/stickyweb,
-/obj/structure/spider/sticky,
+/obj/structure/spider/stickyweb/very_sticky,
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/garbagetruck/toystore)
 "mf" = (
@@ -182,7 +182,7 @@
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/garbagetruck/toystore)
 "qX" = (
-/obj/structure/spider/sticky,
+/obj/structure/spider/stickyweb/very_sticky,
 /obj/item/food/badrecipe/moldy,
 /obj/structure/spider/stickyweb,
 /obj/item/food/spidereggs{
@@ -255,7 +255,7 @@
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/garbagetruck/toystore)
 "ts" = (
-/obj/structure/spider/solid,
+/obj/structure/spider/stickyweb/sealed/tough,
 /obj/structure/spider/stickyweb,
 /obj/structure/closet/crate/trashcart/filled,
 /turf/open/floor/plating,
@@ -841,7 +841,7 @@
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/garbagetruck/toystore)
 "XI" = (
-/obj/structure/spider/solid,
+/obj/structure/spider/stickyweb/sealed/tough,
 /obj/item/food/badrecipe/moldy/bacteria,
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/garbagetruck/toystore)

diff --git a/_maps/map_files/Deathmatch/mech_madness.dmm b/_maps/map_files/Deathmatch/mech_madness.dmm
@@ -664,7 +664,7 @@
 /area/deathmatch)
 "ot" = (
 /obj/structure/mop_bucket/janitorialcart{
-	dir = 4	
+	dir = 4
 	},
 /turf/open/floor/engine,
 /area/deathmatch)

diff --git a/_maps/map_files/Deathmatch/starwars.dmm b/_maps/map_files/Deathmatch/starwars.dmm
@@ -1142,9 +1142,6 @@
 	},
 /turf/open/indestructible/large,
 /area/deathmatch)
-"US" = (
-/turf/closed/indestructible/reinforced,
-/area/deathmatch)
 "Ve" = (
 /obj/effect/turf_decal/tile/red/full,
 /obj/structure/barricade/security/murderdome,
@@ -1320,7 +1317,7 @@ tV
 tV
 IC
 IC
-US
+KX
 Vz
 sZ
 sZ

diff --git a/code/__DEFINES/icon_smoothing.dm b/code/__DEFINES/icon_smoothing.dm
@@ -205,12 +205,18 @@ DEFINE_BITFIELD(smoothing_junction, list(
 
 #define SMOOTH_GROUP_CLEANABLE_DIRT S_OBJ(68) ///obj/effect/decal/cleanable/dirt
 
-#define SMOOTH_GROUP_GAS_TANK S_OBJ(72)
+#define SMOOTH_GROUP_GAS_TANK S_OBJ(69)
 
+#define SMOOTH_GROUP_SPIDER_WEB S_OBJ(70) // /obj/structure/spider/stickyweb
+#define SMOOTH_GROUP_SPIDER_WEB_WALL S_OBJ(71) // /obj/structure/spider/stickyweb/sealed
+#define SMOOTH_GROUP_SPIDER_WEB_ROOF S_OBJ(72) // /obj/structure/spider/passage
+#define SMOOTH_GROUP_SPIDER_WEB_WALL_TOUGH S_OBJ(73) // /obj/structure/spider/stickyweb/sealed/thick
+#define SMOOTH_GROUP_SPIDER_WEB_WALL_MIRROR S_OBJ(74) // /obj/structure/spider/stickyweb/sealed/reflector
 //NOVA EDIT ADDITION
-#define SMOOTH_GROUP_SHUTTERS S_OBJ(73)
 
-#define SMOOTH_GROUP_WATER S_OBJ(74) ///obj/effect/abstract/liquid_turf
+#define SMOOTH_GROUP_SHUTTERS S_OBJ(75)
+
+#define SMOOTH_GROUP_WATER S_OBJ(76) ///obj/effect/abstract/liquid_turf
 //NOVA EDIT END
 
 /// Performs the work to set smoothing_groups and canSmoothWith.

diff --git a/code/game/objects/effects/decals/cleanable/misc.dm b/code/game/objects/effects/decals/cleanable/misc.dm
@@ -129,6 +129,7 @@
 	desc = "Somebody should remove that."
 	gender = NEUTER
 	layer = WALL_OBJ_LAYER
+	icon = 'icons/effects/web.dmi'
 	icon_state = "cobweb1"
 	resistance_flags = FLAMMABLE
 	beauty = -100