Merge pull request #3515 from YourPalHolidays/alpha

Forerunner Door & Unggoy Mask & CRS Light Fix
HaloSpaceStation · Dec 21, 2023 · 844b068 · 844b068
2 parents 8059070 + 152c1fd
commit 844b068
Show file tree

Hide file tree

Showing 15 changed files with 114 additions and 96 deletions.
diff --git a/code/modules/halo/Forerunner/airlocks/door32.dmi b/code/modules/halo/Forerunner/airlocks/door32.dmi
diff --git a/code/modules/halo/Forerunner/airlocks/doors.dm b/code/modules/halo/Forerunner/airlocks/doors.dm
@@ -0,0 +1,6 @@
+
+/obj/machinery/door/airlock/forerunner
+	icon = 'code/modules/halo/Forerunner/airlocks/door32.dmi'
+	welded_file = null
+	lights_file = null
+	fill_file = null
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/lights.dm b/code/modules/halo/covenant/structures_machines/lights.dm
@@ -11,7 +11,7 @@
 
 /obj/machinery/light/covenant/south
 	dir = 2
-	pixel_y = -16
+	pixel_y = -24
 
 /obj/machinery/light/covenant/east
 	dir = 4

diff --git a/code/modules/halo/sounds/jukebox_music/covenant_dance.ogg b/code/modules/halo/sounds/jukebox_music/covenant_dance.ogg
diff --git a/code/modules/halo/sounds/jukebox_music/dream_again.ogg b/code/modules/halo/sounds/jukebox_music/dream_again.ogg
diff --git a/code/modules/halo/sounds/jukebox_music/prophet_of_regret_sermon.ogg b/code/modules/halo/sounds/jukebox_music/prophet_of_regret_sermon.ogg
diff --git a/code/modules/halo/sounds/jukebox_music/prophet_of_regret_speech.ogg b/code/modules/halo/sounds/jukebox_music/prophet_of_regret_speech.ogg
diff --git a/code/modules/halo/sounds/jukebox_music/remembrance.ogg b/code/modules/halo/sounds/jukebox_music/remembrance.ogg
diff --git a/code/modules/halo/sounds/jukebox_music/sad_strings.ogg b/code/modules/halo/sounds/jukebox_music/sad_strings.ogg
diff --git a/code/modules/halo/sounds/jukebox_music/sad_vox_drums.ogg b/code/modules/halo/sounds/jukebox_music/sad_vox_drums.ogg
diff --git a/code/modules/halo/sounds/jukebox_music/sleep_again.ogg b/code/modules/halo/sounds/jukebox_music/sleep_again.ogg
diff --git a/code/modules/halo/sounds/jukebox_music/triumph.ogg b/code/modules/halo/sounds/jukebox_music/triumph.ogg
diff --git a/code/modules/halo/sounds/jukebox_music/trying_winds.ogg b/code/modules/halo/sounds/jukebox_music/trying_winds.ogg
diff --git a/maps/CRS_Unyielding_Transgression/CRS_Unyielding_Transgression.dmm b/maps/CRS_Unyielding_Transgression/CRS_Unyielding_Transgression.dmm