car pileup fix + minor map fixes

cmss13-devs · Jun 17, 2024 · 275b157 · 275b157
1 parent 5010760
commit 275b157
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 47 deletions.
diff --git a/code/game/objects/structures/hybrisa_props.dm b/code/game/objects/structures/hybrisa_props.dm
@@ -368,9 +368,9 @@
 /obj/structure/prop/hybrisa/vehicles/car_pileup
 	name = "burned out vehicle pileup"
 	desc = "Burned-out vehicles block your path, their charred frames and shattered glass hinting at recent chaos. The acrid smell of smoke lingers."
-	icon = 'icons/obj/structures/props/car_pileup.dmi'
+	icon = 'icons/obj/structures/props/hybrisa_vehicles/car_pileup.dmi'
 	icon_state = "car_pileup"
-	bound_height = 128
+	bound_height = 96
 	bound_width = 128
 	unslashable = TRUE
 	unacidable = TRUE

diff --git a/icons/obj/structures/props/car_pileup.dmi b/icons/obj/structures/props/car_pileup.dmi
diff --git a/icons/obj/structures/props/hybrisa_vehicles/car_pileup.dmi b/icons/obj/structures/props/hybrisa_vehicles/car_pileup.dmi
diff --git a/maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm b/maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm
@@ -35348,9 +35348,6 @@
 	pixel_y = 6;
 	layer = 4
 	},
-/obj/structure/sign/banners/twe_flag{
-	pixel_y = 26
-	},
 /turf/open/floor/hybrisa/carpet/carpetpatternbrown,
 /area/lv759/indoors/apartment/northapartments)
 "fdg" = (
@@ -44412,8 +44409,7 @@
 /area/lv759/indoors/hospital/operation)
 "gtq" = (
 /obj/item/stack/cable_coil/cut{
-	icon_state = "coil1";
-	color = "#550d0d"
+	icon_state = "coil1"
 	},
 /turf/closed/shuttle/dropship2/WY/StarGlider{
 	icon_state = "33";
@@ -47075,14 +47071,6 @@
 /obj/effect/hybrisa/decal/dirt,
 /turf/open/hybrisa/street/asphalt,
 /area/lv759/outdoors/landing_zone_2)
-"gMw" = (
-/obj/effect/hybrisa/decal/road/road_edge{
-	icon_state = "road_edge_decal3"
-	},
-/obj/effect/hybrisa/decal/road/lines3,
-/obj/item/shard,
-/turf/open/hybrisa/street/asphalt,
-/area/lv759/outdoors/colony_streets/east_central_street)
 "gMC" = (
 /obj/structure/prop/hybrisa/lattice_prop/lattice_5{
 	pixel_y = 16;
@@ -63528,6 +63516,17 @@
 	},
 /turf/open/floor/prison,
 /area/lv759/indoors/garage_workshop_storage)
+"jep" = (
+/obj/effect/hybrisa/decal/road/road_edge{
+	icon_state = "road_edge_decal4"
+	},
+/obj/effect/hybrisa/decal/road/lines2,
+/obj/effect/hybrisa/decal/doubleroad/lines3{
+	pixel_y = -4
+	},
+/obj/item/shard,
+/turf/open/hybrisa/street/asphalt,
+/area/lv759/outdoors/colony_streets/east_central_street)
 "jeu" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "N";
@@ -67179,6 +67178,12 @@
 	},
 /turf/open/floor/corsat,
 /area/lv759/indoors/hospital/virology)
+"jFW" = (
+/obj/structure/sign/banners/twe_flag{
+	pixel_y = 60
+	},
+/turf/open/floor/hybrisa/carpet/carpetpatternbrown,
+/area/lv759/indoors/apartment/northapartments)
 "jGa" = (
 /obj/structure/barricade/handrail/hybrisa/handrail,
 /obj/effect/decal/hefa_cult_decals/d32{
@@ -76471,6 +76476,10 @@
 	name = "TWE coffee mug";
 	desc = "A red, white and blue coffee mug depicting the flag of the TWE. Patriotic and bold, and commonly seen among veterans as a novelty."
 	},
+/obj/structure/sign/catclock{
+	pixel_x = 6;
+	pixel_y = 32
+	},
 /turf/open/floor/hybrisa/carpet/carpetpatternbrown,
 /area/lv759/indoors/apartment/northapartments)
 "kVy" = (
@@ -79953,6 +79962,9 @@
 /obj/effect/hybrisa/decal/dirt,
 /obj/effect/hybrisa/decal/dirt,
 /obj/item/stack/sheet/metal,
+/obj/effect/decal/cleanable/generic{
+	color = "#5d524b"
+	},
 /turf/open/floor/strata{
 	dir = 1;
 	icon_state = "orange_edge"
@@ -88282,6 +88294,7 @@
 /obj/effect/hybrisa/decal/road/road_edge{
 	icon_state = "road_edge_decal4"
 	},
+/obj/item/shard,
 /turf/open/hybrisa/street/asphalt,
 /area/lv759/outdoors/colony_streets/east_central_street)
 "mEf" = (
@@ -104906,8 +104919,10 @@
 /obj/effect/hybrisa/decal/dirt,
 /obj/effect/hybrisa/decal/dirt,
 /obj/item/stack/cable_coil/cut{
-	icon_state = "coil1";
-	color = "#550d0d"
+	icon_state = "coil1"
+	},
+/obj/effect/decal/cleanable/generic{
+	color = "#5d524b"
 	},
 /turf/open/floor/corsat{
 	icon_state = "marked"
@@ -109258,13 +109273,6 @@
 	icon_state = "floor_plate"
 	},
 /area/lv759/outdoors/colony_streets/south_west_street)
-"pFZ" = (
-/obj/effect/hybrisa/decal/dirt,
-/obj/item/shard,
-/turf/open/floor/corsat{
-	icon_state = "marked"
-	},
-/area/lv759/outdoors/colony_streets/east_central_street)
 "pGi" = (
 /obj/structure/largecrate/random/case/double,
 /turf/open/engineership/engineer_floor1,
@@ -122551,8 +122559,7 @@
 /area/lv759/indoors/derelict_ship)
 "rzV" = (
 /obj/item/stack/cable_coil/cut{
-	icon_state = "coil2";
-	color = "#550d0d"
+	icon_state = "coil2"
 	},
 /turf/closed/shuttle/dropship2/WY/StarGlider{
 	icon_state = "27";
@@ -130626,6 +130633,7 @@
 /obj/effect/hybrisa/decal/road/corner{
 	dir = 4
 	},
+/obj/item/shard,
 /turf/open/hybrisa/street/asphalt,
 /area/lv759/outdoors/colony_streets/east_central_street)
 "sFL" = (
@@ -131086,6 +131094,15 @@
 	amount = 15
 	},
 /obj/structure/prop/hybrisa/airport/dropshipvent1left,
+/obj/item/stack/cable_coil/green{
+	icon_state = "coil1"
+	},
+/obj/item/stack/cable_coil/cut{
+	icon_state = "coil2"
+	},
+/obj/effect/decal/cleanable/generic{
+	color = "#5d524b"
+	},
 /turf/open/floor/plating,
 /area/lv759/indoors/spaceport/docking_bay_1)
 "sJF" = (
@@ -152979,17 +152996,6 @@
 	icon_state = "whitegreen"
 	},
 /area/lv759/indoors/hospital/east_hallway)
-"vPn" = (
-/obj/structure/sign/catclock{
-	pixel_x = 12
-	},
-/obj/structure/prop/hybrisa/lattice_prop/lattice_1{
-	pixel_y = 20;
-	pixel_x = -26;
-	layer = 6
-	},
-/turf/closed/wall/hybrisa/colony,
-/area/lv759/indoors/apartment/northapartments)
 "vPo" = (
 /obj/structure/closet/toolcloset,
 /obj/effect/hybrisa/decal/dirt,
@@ -158118,6 +158124,14 @@
 	},
 /turf/open/hybrisa/street/asphalt,
 /area/lv759/outdoors/colony_streets/central_streets)
+"wBA" = (
+/obj/effect/hybrisa/decal/dirt,
+/obj/item/shard,
+/turf/open/floor/prison{
+	dir = 1;
+	icon_state = "ramptop"
+	},
+/area/lv759/outdoors/colony_streets/east_central_street)
 "wBE" = (
 /obj/structure/machinery/conveyor{
 	id = "anomalybelt"
@@ -164082,12 +164096,14 @@
 	dir = 8
 	},
 /obj/item/stack/cable_coil/cut{
-	icon_state = "coil2";
-	color = "#550d0d"
+	icon_state = "coil2"
 	},
 /obj/item/stack/rods{
 	amount = 15
 	},
+/obj/effect/decal/cleanable/generic{
+	color = "#5d524b"
+	},
 /turf/open/floor/strata{
 	dir = 8;
 	icon_state = "orange_edge"
@@ -167836,6 +167852,14 @@
 	},
 /turf/closed/wall/hybrisa/colony,
 /area/lv759/indoors/apartment/eastbedroomsstorage)
+"xVv" = (
+/obj/item/stack/rods{
+	pixel_y = 14
+	},
+/obj/item/shard,
+/obj/effect/decal/cleanable/blood/oil,
+/turf/open/hybrisa/street/sidewalkcenter,
+/area/lv759/outdoors/colony_streets/east_central_street)
 "xVw" = (
 /obj/effect/decal/strata_decals/grime/grime4,
 /obj/effect/hybrisa/decal/dirt,
@@ -194796,7 +194820,7 @@ ldj
 eaG
 gzt
 owo
-vPn
+fRb
 kVx
 lwF
 cAU
@@ -195050,7 +195074,7 @@ kdy
 qQU
 ioZ
 fdd
-cAU
+jFW
 cAU
 oSN
 vCo
@@ -214219,7 +214243,7 @@ wbj
 dBl
 aMM
 mbO
-jlN
+wBA
 prY
 kht
 rtJ
@@ -214720,11 +214744,11 @@ qxa
 pow
 rQR
 lyx
-dBl
-wdb
+jEy
+jep
 vDa
-fuy
-gMw
+xVv
+uZY
 kht
 qNm
 faX
@@ -215224,7 +215248,7 @@ pow
 kvv
 hsv
 mHF
-pFZ
+nwk
 sFK
 mrq
 xUi