Merge pull request #3519 from YourPalHolidays/alpha

Minor Update
HaloSpaceStation · Dec 23, 2023 · adc3c30 · adc3c30
2 parents 5139f5d + cfec10e
commit adc3c30
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/code/modules/halo/covenant/species/unggoy/grunt_gear.dmi b/code/modules/halo/covenant/species/unggoy/grunt_gear.dmi
diff --git a/code/modules/halo/covenant/structures_machines/light.dmi b/code/modules/halo/covenant/structures_machines/light.dmi
diff --git a/code/modules/halo/covenant/structures_machines/lights.dm b/code/modules/halo/covenant/structures_machines/lights.dm
@@ -11,7 +11,7 @@
 
 /obj/machinery/light/covenant/south
 	dir = 2
-	pixel_y = -24
+	pixel_y = -16
 
 /obj/machinery/light/covenant/east
 	dir = 4

diff --git a/code/modules/halo/covenant/structures_machines/newscaster.dm b/code/modules/halo/covenant/structures_machines/newscaster.dm
@@ -1,4 +1,4 @@
 
 /obj/machinery/newscaster/covenant
 	icon = 'code/modules/halo/covenant/structures_machines/newscaster.dmi'
-	icon_state = "newscaster_covenant"
+	icon_state = "newscaster_normal"
diff --git a/code/modules/halo/covenant/structures_machines/newscaster.dmi b/code/modules/halo/covenant/structures_machines/newscaster.dmi
diff --git a/maps/CRS_Unyielding_Transgression/CRS_Unyielding_Transgression.dmm b/maps/CRS_Unyielding_Transgression/CRS_Unyielding_Transgression.dmm
@@ -306,7 +306,7 @@
 "fT" = (/obj/machinery/autolathe/ammo_fabricator/kig_yar,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/portengine)
 "fU" = (/obj/machinery/door/airlock/multi_tile/covenant{covenant_secure = 1},/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/starboardarmory)
 "fV" = (/obj/machinery/camera/autoname/invis/crs_transgression{icon_state = "camera"; dir = 8},/obj/structure/invasion_scanner,/obj/structure/window/reinforced/projresist/covenant{dir = 8},/obj/structure/window/reinforced/projresist/covenant{tag = "icon-window (EAST)"; icon_state = "window"; dir = 4},/obj/structure/window/reinforced/projresist/covenant,/obj/machinery/light/covenant/east,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/plasmaprojector)
-"fW" = (/obj/item/weapon/paper_bin,/obj/structure/table/glass/purple,/obj/item/weapon/pen,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/bridge)
+"fW" = (/obj/item/weapon/paper_bin,/obj/structure/table/glass/purple,/obj/item/weapon/pen,/obj/machinery/light/covenant/north,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/bridge)
 "fX" = (/obj/machinery/light/covenant/east,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/porthangar)
 "fY" = (/obj/effect/landmark/dropship_land_point/covenant{name = "SDV Vindicative Infraction Port Dropship Bay"},/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/porthangar)
 "fZ" = (/obj/structure/bed/chair/covenant_stool,/obj/effect/landmark/start{name = "Lesser Prophet"},/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/vipquarters)
@@ -666,7 +666,7 @@
 "mP" = (/obj/effect/floor_decal/carpet/blue{icon_state = "bcarpet_edges"; dir = 8},/obj/effect/floor_decal/carpet/blue{icon_state = "bcarpet_edges"; dir = 4},/obj/effect/floor_decal/carpet/blue{icon_state = "bcarpet_edges"; dir = 5},/obj/effect/floor_decal/carpet/blue{icon_state = "bcarpet_edges"; dir = 9},/turf/simulated/floor/shuttle/black,/area/covenant_light_cruiser/Rearhallway)
 "mQ" = (/obj/structure/bed/covenant{name = "Kig'Yar bed"},/obj/effect/landmark/start{name = "Kig-Yar Minor"},/obj/effect/landmark/start{name = "Kig-Yar Major"},/obj/effect/landmark/start{name = "T-Vaoan Minor"},/obj/effect/landmark/start{name = "T-Vaoan Major"},/obj/effect/landmark/start{name = "Kig-Yar"},/obj/effect/landmark/start{name = "Kig-Yar Shipmistress"},/obj/effect/landmark/start{name = "T-Vaoan Murmillo"},/obj/effect/landmark/start{name = "T-Vaoan Commando"},/obj/effect/landmark/start{name = "T-Vaoan Champion"},/obj/machinery/light/covenant/south,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/kigyarport)
 "mR" = (/obj/machinery/light/invis,/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/centralengine)
-"mS" = (/obj/machinery/camera/autoname/invis/crs_transgression,/obj/structure/steps_decorative_covenant{icon_state = "steps"; dir = 8},/obj/machinery/light/covenant/north,/turf/simulated/floor/shuttle/black,/area/covenant_light_cruiser/Rearhallway)
+"mS" = (/obj/machinery/camera/autoname/invis/crs_transgression,/obj/machinery/light/covenant/north,/turf/simulated/floor/decor{icon_state = "rampbottom"; dir = 4},/area/covenant_light_cruiser/Rearhallway)
 "mT" = (/obj/machinery/camera/autoname/invis/crs_transgression{icon_state = "camera"; dir = 4},/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/unggoyquarters)
 "mU" = (/obj/structure/faction_banner/covenant{pixel_y = 16},/turf/simulated/wall/covenant,/area/covenant_light_cruiser/bridge)
 "mV" = (/obj/machinery/camera/autoname/invis/crs_transgression,/obj/machinery/light/covenant/west,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/Rearhallway)
@@ -821,13 +821,13 @@
 "pO" = (/obj/structure/ai_routing_node/cov,/obj/machinery/light/covenant/east,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/lekgolo)
 "pP" = (/obj/machinery/camera/autoname/invis/crs_transgression{icon_state = "camera"; dir = 8},/obj/structure/invasion_scanner,/obj/structure/window/reinforced/projresist/covenant{dir = 8},/obj/structure/window/reinforced/projresist/covenant{dir = 1},/obj/structure/window/reinforced/projresist/covenant{tag = "icon-window (EAST)"; icon_state = "window"; dir = 4},/obj/machinery/light/covenant/east,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/plasmaprojector)
 "pQ" = (/obj/structure/flora/pottedplant/flower,/obj/machinery/light/covenant/east,/turf/simulated/floor/shuttle/black,/area/covenant_light_cruiser/Rearhallway)
-"pR" = (/obj/structure/steps_decorative_covenant{icon_state = "steps"; dir = 8},/turf/simulated/floor/shuttle/black,/area/covenant_light_cruiser/Rearhallway)
+"pR" = (/turf/simulated/floor/decor{icon_state = "rampbottom"; dir = 4},/area/covenant_light_cruiser/Rearhallway)
 "pS" = (/obj/effect/floor_decal/carpet/blue{icon_state = "bcarpet_edges"; dir = 4},/obj/effect/floor_decal/carpet/blue{icon_state = "bcarpet_edges"; dir = 8},/obj/effect/floor_decal/carpet/blue{icon_state = "bcarpet_edges"; dir = 10},/obj/effect/floor_decal/carpet/blue{icon_state = "bcarpet_edges"; dir = 6},/turf/simulated/floor/carpet/blue,/area/covenant_light_cruiser/Rearhallway)
 "pT" = (/obj/structure/faction_banner/covenant{pixel_y = -32},/turf/simulated/floor/shuttle/black,/area/covenant_light_cruiser/Rearhallway)
 "pU" = (/obj/machinery/camera/autoname/invis/crs_transgression{icon_state = "camera"; dir = 1},/obj/machinery/light/covenant/south,/turf/simulated/floor/shuttle/black,/area/covenant_light_cruiser/Rearhallway)
 "pV" = (/obj/machinery/light/covenant/north,/obj/machinery/vending/armory/covenant/sangheili/food,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/sangheiliquarters)
 "pW" = (/obj/structure/flora/pottedplant/crystal,/obj/structure/table/glass/purple,/turf/simulated/floor/shuttle/black,/area/covenant_light_cruiser/Rearhallway)
-"pX" = (/obj/machinery/camera/autoname/invis/crs_transgression,/obj/structure/steps_decorative_covenant{icon_state = "steps"; dir = 8},/obj/machinery/light/covenant/south,/turf/simulated/floor/shuttle/black,/area/covenant_light_cruiser/Rearhallway)
+"pX" = (/obj/machinery/camera/autoname/invis/crs_transgression,/obj/machinery/light/covenant/south,/turf/simulated/floor/decor{icon_state = "rampbottom"; dir = 4},/area/covenant_light_cruiser/Rearhallway)
 "pY" = (/obj/structure/window/reinforced/projresist/covenant,/obj/structure/window/reinforced/projresist/covenant{tag = "icon-window (EAST)"; icon_state = "window"; dir = 4},/obj/structure/table/glass/purple,/obj/item/weapon/flame/candle,/obj/effect/floor_decal/spline/plain{icon_state = "spline_plain"; dir = 6},/turf/simulated/floor/shuttle/purple,/area/covenant_light_cruiser/Rearhallway)
 "pZ" = (/obj/machinery/light/covenant/west,/turf/simulated/floor/shuttle/black,/area/covenant_light_cruiser/Rearhallway)
 "qa" = (/obj/structure/table/glass/purple,/obj/item/weapon/flame/candle,/obj/machinery/newscaster/covenant{pixel_x = 32; pixel_y = 0},/turf/simulated/floor/shuttle/black,/area/covenant_light_cruiser/Rearhallway)
@@ -940,7 +940,7 @@ aaaaaaaaaaaaWHWHWHWHWHWHWHmNhJhJhJhJhJeZhJmOWHfwdLhkWHqmbJdubJbJdubJdubJbJdubJdO
 aaaaaaaaaaWHWHWHWHWHWHWHcWhJhJhJhJhJhJhJhJhJWHWHWHeeWHqmbJcscUcUcsbJcsgDgDcsbJfycscscscscscsfiaEfBbYbYbYaEehbYbYgFexflgzeOexdqdqejejejejejejejtZejejtZejejejejmUcToppYoqpnpnpnpnpnpnpnpNkKdqdqdqdSjqjIjJkbdSftftgpgpfegpftftftnAfffMepeXepepepepepepepepepepepepepepepepepepepeHeGaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaWHWHWHWHpmfNhJhJeZhJfNhJhJhJhJhJhJfvfRfvfvdibJbJdOcUcUdwbJdOgDgDdwbJcscscscscscscscsaEfBbYbYbYaEfAbYbYiGexgzeOeOexdqdqejejejejejgeejfDejejfDejeRejejejpZmPpRoqeQcTeQcTeQcTeQpQdtmVdqdqdSezdUdUiNdSftgphKfLgnkZgpfsftnAgmepephipupupupzpBpCephieYfOepeYepepepepepepeYfneGaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaWHWHWHpraGaGaGeBeBaGaGgohJpphJhJhJfafPfvfvdibJbJfyhPcUcsbJcsgDgDfibJgNcDcscscscsfhhdaEgcbYgbgfaEhOgdfFomexeNeOpOexghdqejejejejejfDfGfGgigjfGgifDfWeyejpWodpXpSeQcTeQpTeQpUeQqadtdqdqdqdSdUkAkAkAdSgpgBfLfzjKfLpPgpgpgsgqgrgrgsgsgsgsgsgsgsgsgsnzgsgsnAepepepepepepnBfKeGaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaBXBXBXBXgGpwkJkJkJkJpwgOgPosfNfNmOdidifUfvdibJbJbJbJbJbJbJbJbJbJbJfQbJbJfScscscsbJbJaEaEaEaEaEaEaEaEaEaEexgwgxexexdQgvejejejgtfDfGfGfGfGfGfGfGfGgjhHejejejejejejejejejejejejejejdQdqdqdSdSdSdSdSgQhsfLfLfLhmgEgRgSgpgHgrgrgrgIgJnzgsgKhphrixgsgsgsgsnAhfepfOepeFhinAnAnAaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaBXBXBXBXgGpwkJkJkJkJpwgOgPosfNfNmOdidifUfvdibJbJbJbJbJbJbJbJbJbJbJfQbJbJfScscscsbJbJaEaEaEaEaEaEaEaEaEaEexgwgxexexdQgvejejejgtfDfGfGfGfGfGfGfGfGfGhHejejejejejejejejejejejejejejdQdqdqdSdSdSdSdSgQhsfLfLfLhmgEgRgSgpgHgrgrgrgIgJnzgsgKhphrixgsgsgsgsnAhfepfOepeFhinAnAnAaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaBXBXBXBXgGeAeAeAeAeAeAiUhJotfNhJhJgVgXgVgVgXgYgXgVgVgXgVgVgZgVhagXgVgWgXgVgVgVgVgXgWgVgXgVgVgXhagVgXgVgVgXgVgVdqdqdqdqejejeyejhcfGfGbdhhirhehehgfGfGfGfGfGipfGfGfGfGfGfGgjfGfGfGdqdqdqdpdqdrdqdqfLfLfLfLfLfLfLgnfLfLgrhohqhqhQiygsiAhththyhyowgLgMgsnAnAnAnYnAnAnAnAnAnAaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaBXBXBXBXgGeAeAeAeAeAeAkofNotgThJhJgVgVgVgVgVgVgVgVgVgVgVgVgVgVgVgVgVgVgVgViThAgVgVgVgVgVgVgVgVgVgVgVgVgVgVgVgVdqdqdTekejejhBfDfGfGeSbshDfGfGhEBahGfGfGfGfGfGfGfGfGfGfGfGfGfGfGfGdqdTdqdqdqdqdqdqfLpagEgEhugEgEhwgEgEhSivhShTiwhUhVhWhXTZoSjtphhziBgsnAnAnAnZnAnAnAnAiQaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaBXBXBXBXgGpxeAeAeAeApxemhJotfNhJhJhNihgVgVihgVihgVhlihgVgVihgVgVihhlgVihgVgVgVgVihgVijihgVgVikgVgVhRgViiihgVgVnldqdqdqejejeyejhcfGfGbtioklininhgfGfGkpfGfGiefGfGfGfGfGfGjufGfGkpdqdqdqdqdqdqeidqkvfLfLfLfLfLfLfLfLitgriOnFnFnGiRgsjxizizpipipjiChvgsnAnAnAnYnAnAnAnAnAnAaaaaaaaaaaaaaaaaaaaaaaaaaa