Konyang tweaks

Adjusts some stuff for the synthlore team.
alsoandanswer · Feb 17, 2024 · 9481a08 · 9481a08
1 parent ebaf2a5
commit 9481a08
Show file tree

Hide file tree

Showing 19 changed files with 249 additions and 248 deletions.
diff --git a/code/game/objects/structures/light_pole.dm b/code/game/objects/structures/light_pole.dm
@@ -61,6 +61,15 @@
 	light_range = 8
 	light_power = 1.9
 
+/obj/structure/utility_pole/street/konyang
+	icon_state = "streetlight_konyang"
+
+/obj/structure/utility_pole/street/konyang/on
+	light_wedge = LIGHT_OMNI
+	light_color = "#e8ffeb"
+	light_range = 8
+	light_power = 1.9
+
 /obj/structure/utility_pole/street/corner
 	name = "\improper street lamp"
 	desc = "A tall light source. What more is there to say?"
@@ -83,25 +92,25 @@
 	light_range = 8
 	light_power = 1.9
 
-/obj/structure/utility_pole/street/classic
+/obj/structure/utility_pole/street/konyang/classic
 	name = "\improper stone lamp"
 	desc = "A stone lamp commonly found in Konyang."
 	icon_state = "classic_lamp"
 
-/obj/effect/overlay/street_light/classic
+/obj/effect/overlay/street_light/konyang/classic
 	icon_state = "classic_lamp_light"
 	density = TRUE
 
-/obj/structure/utility_pole/street/classic/on
+/obj/structure/utility_pole/street/konyang/classic/on
 	light_wedge = LIGHT_OMNI
 	light_color = LIGHT_COLOR_TUNGSTEN
 	light_range = 8
 	light_power = 1.9
 
-/obj/structure/utility_pole/street/classic/on/Initialize(mapload)
+/obj/structure/utility_pole/street/konyang/classic/on/Initialize(mapload)
 	. = ..()
 	cut_overlays()
-	overlays += /obj/effect/overlay/street_light/classic
+	overlays += /obj/effect/overlay/street_light/konyang/classic
 	return
 
 /obj/effect/overlay/street_light/crosswalk
@@ -115,18 +124,15 @@
 	light_range = 3.1
 	light_power = 2.6
 
+/obj/structure/utility_pole/street/crosswalk/konyang
+	icon_state = "crosswalk_konyang"
+
 /obj/structure/utility_pole/street/crosswalk/Initialize(mapload)
 	. = ..()
 	cut_overlays()
 	overlays += /obj/effect/overlay/street_light/crosswalk
 	return
 
-/obj/effect/overlay/street_light/traffic
-	icon_state = "traffic_lights"
-
-/obj/effect/overlay/street_light/traffic/inverted
-	icon_state = "traffic_lights_inverse"
-
 /obj/structure/utility_pole/street/traffic
 	name = "traffic indicator"
 	desc = "A very tall crosswalk indicator which can be used to better run red lights."
@@ -135,17 +141,8 @@
 	light_range = 3.1
 	light_power = 2.6
 
-/obj/structure/utility_pole/street/traffic/base/Initialize(mapload)
-	. = ..()
-	cut_overlays()
-	overlays += /obj/effect/overlay/street_light/traffic
-	return
-
-/obj/structure/utility_pole/street/traffic/inverted/Initialize(mapload)
-	. = ..()
-	cut_overlays()
-	overlays += /obj/effect/overlay/street_light/traffic/inverted
-	return
+/obj/structure/utility_pole/street/traffic/konyang
+	icon_state = "trafficlight_konyang"
 
 /obj/structure/utility_pole/power
 	name = "power pole"

diff --git a/code/game/objects/structures/urban.dm b/code/game/objects/structures/urban.dm
@@ -47,6 +47,10 @@
 	desc = "A yield sign which tells you to slow down, rather politely. Let's hope you listen."
 	icon_state = "yield"
 
+/obj/structure/street_sign/yield_konyang
+	desc = "A yield sign. In Konyang!"
+	icon_state = "yield_konyang"
+
 /obj/structure/street_sign/warnings
 	name = "warning sign"
 	desc = "A sign. You think it's trying to warn you of something."

diff --git a/code/modules/overmap/exoplanets/biomes/jungle.dm b/code/modules/overmap/exoplanets/biomes/jungle.dm
@@ -157,7 +157,7 @@
 	spawn_types = list(
 		LARGE_FLORA = list(
 			/obj/structure/utility_pole = 2,
-			/obj/structure/utility_pole/street = 1,
+			/obj/structure/utility_pole/street/konyang = 1,
 			/obj/structure/utility_pole/power/central = 1
 		),
 		SMALL_FLORA = list(

diff --git a/icons/obj/structure/64x64_misc.dmi b/icons/obj/structure/64x64_misc.dmi
diff --git a/icons/obj/structure/urban/street_signs.dmi b/icons/obj/structure/urban/street_signs.dmi
diff --git a/icons/obj/structure/urban/streetpoles.dmi b/icons/obj/structure/urban/streetpoles.dmi
diff --git a/maps/away/away_site/konyang/point_verdant/point_verdant-1.dmm b/maps/away/away_site/konyang/point_verdant/point_verdant-1.dmm
@@ -43,7 +43,7 @@
 /obj/effect/decal/curb{
 	dir = 8
 	},
-/obj/structure/utility_pole/street/on{
+/obj/structure/utility_pole/street/konyang/on{
 	dir = 8;
 	pixel_x = -18
 	},
@@ -81,7 +81,7 @@
 "ap" = (
 /obj/random/dirt_75,
 /obj/random/dirt_75,
-/obj/structure/utility_pole/street/on{
+/obj/structure/utility_pole/street/konyang/on{
 	dir = 1;
 	pixel_y = -8
 	},
@@ -568,7 +568,7 @@
 /area/point_verdant/interior/police)
 "bL" = (
 /obj/random/dirt_75,
-/obj/structure/utility_pole/street/on{
+/obj/structure/utility_pole/street/konyang/on{
 	dir = 1;
 	pixel_y = -8
 	},
@@ -596,7 +596,7 @@
 /turf/simulated/floor/lino/diamond,
 /area/point_verdant/interior/hotel)
 "bQ" = (
-/obj/structure/street_sign/yield{
+/obj/structure/street_sign/yield_konyang{
 	pixel_x = -16;
 	name = "cavern warning sign";
 	desc = "A warning sign which declares the area ahead as off-limits. It details it as a dangerous, unregulated cave."
@@ -605,7 +605,7 @@
 /turf/simulated/floor/exoplanet/konyang/no_edge,
 /area/point_verdant/outdoors)
 "bR" = (
-/obj/structure/utility_pole/street/on{
+/obj/structure/utility_pole/street/konyang/on{
 	dir = 8;
 	pixel_x = -18
 	},
@@ -1096,7 +1096,7 @@
 /obj/structure/road_barrier/bot_end{
 	layer = 9.1
 	},
-/obj/structure/utility_pole/street/crosswalk{
+/obj/structure/utility_pole/street/crosswalk/konyang{
 	pixel_x = 10
 	},
 /obj/random/dirt_75,
@@ -3180,7 +3180,7 @@
 /obj/effect/decal/curb{
 	dir = 1
 	},
-/obj/structure/utility_pole/street/on{
+/obj/structure/utility_pole/street/konyang/on{
 	dir = 1;
 	pixel_y = -8
 	},
@@ -4788,7 +4788,7 @@
 /turf/simulated/floor/foundation,
 /area/point_verdant/sewer)
 "oy" = (
-/obj/structure/utility_pole/street/classic/on,
+/obj/structure/utility_pole/street/konyang/classic/on,
 /turf/simulated/floor/sidewalk/paved,
 /area/point_verdant/outdoors)
 "oz" = (
@@ -4799,7 +4799,7 @@
 /obj/effect/decal/curb{
 	dir = 10
 	},
-/obj/structure/utility_pole/street/on{
+/obj/structure/utility_pole/street/konyang/on{
 	dir = 8;
 	pixel_x = -18
 	},
@@ -5243,7 +5243,7 @@
 /obj/effect/decal/curb{
 	dir = 1
 	},
-/obj/structure/utility_pole/street/on{
+/obj/structure/utility_pole/street/konyang/on{
 	dir = 1;
 	pixel_y = -8
 	},
@@ -5273,7 +5273,7 @@
 /obj/effect/decal/curb{
 	dir = 1
 	},
-/obj/structure/utility_pole/street/on{
+/obj/structure/utility_pole/street/konyang/on{
 	dir = 1;
 	pixel_y = -8
 	},
@@ -5544,7 +5544,7 @@
 /obj/structure/road_barrier{
 	layer = 9.1
 	},
-/obj/structure/utility_pole/street/on{
+/obj/structure/utility_pole/street/konyang/on{
 	dir = 1;
 	pixel_y = -8
 	},
@@ -6460,7 +6460,7 @@
 /obj/structure/dock_structure{
 	pixel_y = -16
 	},
-/obj/structure/utility_pole/street/on{
+/obj/structure/utility_pole/street/konyang/on{
 	dir = 8;
 	pixel_x = -18
 	},
@@ -6821,7 +6821,7 @@
 /obj/effect/decal/curb{
 	dir = 1
 	},
-/obj/structure/utility_pole/street/on{
+/obj/structure/utility_pole/street/konyang/on{
 	dir = 1;
 	pixel_y = -8
 	},
@@ -7685,7 +7685,7 @@
 /turf/simulated/floor/lino,
 /area/point_verdant/interior/decrepit)
 "xq" = (
-/obj/structure/utility_pole/street/on{
+/obj/structure/utility_pole/street/konyang/on{
 	dir = 4
 	},
 /turf/simulated/floor/concrete,
@@ -8887,7 +8887,7 @@
 /obj/effect/decal/curb{
 	dir = 8
 	},
-/obj/structure/utility_pole/street/on{
+/obj/structure/utility_pole/street/konyang/on{
 	dir = 8;
 	pixel_x = -18
 	},
@@ -9466,7 +9466,7 @@
 /obj/effect/decal/curb{
 	dir = 1
 	},
-/obj/structure/utility_pole/street/on{
+/obj/structure/utility_pole/street/konyang/on{
 	dir = 1;
 	pixel_y = -8
 	},
@@ -9544,7 +9544,7 @@
 /obj/effect/decal/curb{
 	dir = 1
 	},
-/obj/structure/utility_pole/street/on{
+/obj/structure/utility_pole/street/konyang/on{
 	dir = 1;
 	pixel_y = -8
 	},
@@ -10599,7 +10599,7 @@
 /turf/simulated/floor/sidewalk/flat,
 /area/point_verdant/interior/tunnels)
 "GB" = (
-/obj/structure/street_sign/yield{
+/obj/structure/street_sign/yield_konyang{
 	pixel_x = -16;
 	name = "cavern warning sign";
 	desc = "A warning sign which declares the area ahead as off-limits. It details it as a dangerous, unregulated cave."
@@ -11336,7 +11336,7 @@
 /obj/effect/decal/curb{
 	dir = 1
 	},
-/obj/structure/utility_pole/street/on{
+/obj/structure/utility_pole/street/konyang/on{
 	dir = 1;
 	pixel_y = -8;
 	layer = 4.6
@@ -12025,7 +12025,7 @@
 /turf/simulated/floor/tiled/white,
 /area/point_verdant/interior/police)
 "KG" = (
-/obj/structure/utility_pole/street/on{
+/obj/structure/utility_pole/street/konyang/on{
 	pixel_y = -3
 	},
 /obj/random/dirt_75,
@@ -13632,7 +13632,7 @@
 /turf/simulated/floor/asphalt,
 /area/point_verdant/sewer)
 "Po" = (
-/obj/structure/utility_pole/street/on{
+/obj/structure/utility_pole/street/konyang/on{
 	dir = 8;
 	pixel_x = -18
 	},
@@ -13705,7 +13705,7 @@
 /turf/simulated/floor/asphalt,
 /area/point_verdant/outdoors)
 "Pz" = (
-/obj/structure/utility_pole/street/on{
+/obj/structure/utility_pole/street/konyang/on{
 	dir = 1;
 	pixel_y = -8
 	},
@@ -14240,7 +14240,7 @@
 /area/point_verdant/interior)
 "QT" = (
 /obj/structure/dock_structure,
-/obj/structure/utility_pole/street/on{
+/obj/structure/utility_pole/street/konyang/on{
 	dir = 8;
 	pixel_x = -18
 	},
@@ -15158,7 +15158,7 @@
 /turf/simulated/floor/asphalt,
 /area/point_verdant/outdoors)
 "Tt" = (
-/obj/structure/utility_pole/street/classic/on,
+/obj/structure/utility_pole/street/konyang/classic/on,
 /turf/simulated/floor/concrete,
 /area/point_verdant/outdoors)
 "Tu" = (
@@ -15299,7 +15299,7 @@
 /obj/effect/decal/curb{
 	dir = 8
 	},
-/obj/structure/utility_pole/street/on{
+/obj/structure/utility_pole/street/konyang/on{
 	dir = 8;
 	pixel_x = -18
 	},
@@ -15514,7 +15514,7 @@
 /turf/simulated/floor/exoplanet/water/shallow/konyang/no_smooth,
 /area/point_verdant/outdoors)
 "Uz" = (
-/obj/structure/utility_pole/street/on{
+/obj/structure/utility_pole/street/konyang/on{
 	pixel_y = -3
 	},
 /turf/simulated/floor/concrete,
@@ -16277,7 +16277,7 @@
 /area/point_verdant/interior/offices/basement)
 "Ww" = (
 /obj/structure/dock_structure,
-/obj/structure/utility_pole/street/on{
+/obj/structure/utility_pole/street/konyang/on{
 	dir = 8;
 	pixel_x = -18
 	},
@@ -16389,7 +16389,7 @@
 /turf/simulated/floor/exoplanet/water/shallow/konyang,
 /area/point_verdant/outdoors)
 "WM" = (
-/obj/structure/utility_pole/street/on{
+/obj/structure/utility_pole/street/konyang/on{
 	dir = 8;
 	pixel_x = -18
 	},
@@ -16480,7 +16480,7 @@
 /turf/simulated/floor/wood,
 /area/point_verdant/interior/offices/kaf)
 "Xc" = (
-/obj/structure/utility_pole/street/classic/on,
+/obj/structure/utility_pole/street/konyang/classic/on,
 /obj/item/reagent_containers/food/drinks/bottle/sake{
 	pixel_x = -20;
 	pixel_y = -3