Revert "Various Additions"

This reverts commit 97c52cf.
HaloSpaceStation · Nov 4, 2024 · f4f9247 · f4f9247
1 parent 97c52cf
commit f4f9247
Show file tree

Hide file tree

Showing 18 changed files with 9 additions and 19 deletions.
diff --git a/code/modules/halo/covenant/species/jiralhanae/jiralhanae.dm b/code/modules/halo/covenant/species/jiralhanae/jiralhanae.dm
@@ -86,7 +86,6 @@ GLOBAL_LIST_INIT(first_names_jiralhanae, world.file2list('code/modules/halo/cove
 /datum/unarmed_attack/brute_punch
     attack_verb = list("clobbers", "smashes", "backhands", "punches", "slams")
     attack_noun = list("fist")
-    attack_sound = 'code/modules/halo/sounds/punch_sfx/brute_punch_1.ogg'
     eye_attack_text = "fingers"
     eye_attack_text_victim = "digits"
     damage = 25

diff --git a/code/modules/halo/covenant/structures_machines/closet.dm b/code/modules/halo/covenant/structures_machines/closet.dm
@@ -3,8 +3,6 @@
 	name = "storage crate"
 	desc = "It's a basic storage unit for the Covenant."
 	icon = 'code/modules/halo/covenant/structures_machines/crate_tall.dmi'
-	open_sound =  'code/modules/halo/sounds/object_sfx/covenant_crate_open.ogg'
-	close_sound = 'code/modules/halo/sounds/object_sfx/covenant_crate_close.ogg'
 
 /obj/structure/ore_box/covenant
 	icon = 'code/modules/halo/covenant/structures_machines/crate_tall.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/storage.dm b/code/modules/halo/covenant/structures_machines/storage.dm
@@ -4,6 +4,4 @@
 	icon = 'code/modules/halo/covenant/structures_machines/crate_short.dmi'
 	icon_state = "Covie Crate Closed"
 	icon_closed = "Covie Crate Closed"
-	icon_opened = "Covie Crate Open"
-	open_sound =  'code/modules/halo/sounds/object_sfx/covenant_crate_open.ogg'
-	close_sound = 'code/modules/halo/sounds/object_sfx/covenant_crate_close.ogg'
+	icon_opened = "Covie Crate Open"
diff --git a/code/modules/halo/sounds/brute_shot_melee.ogg b/code/modules/halo/sounds/brute_shot_melee.ogg
diff --git a/code/modules/halo/sounds/energy_sword_hit.ogg b/code/modules/halo/sounds/energy_sword_hit.ogg
diff --git a/code/modules/halo/sounds/mauler_melee.ogg b/code/modules/halo/sounds/mauler_melee.ogg
diff --git a/code/modules/halo/sounds/mauler_reload.ogg b/code/modules/halo/sounds/mauler_reload.ogg
diff --git a/code/modules/halo/sounds/object_sfx/covenant_crate_close.ogg b/code/modules/halo/sounds/object_sfx/covenant_crate_close.ogg
diff --git a/code/modules/halo/sounds/object_sfx/covenant_crate_open.ogg b/code/modules/halo/sounds/object_sfx/covenant_crate_open.ogg
diff --git a/code/modules/halo/sounds/punch_sfx/brute_punch_1.ogg b/code/modules/halo/sounds/punch_sfx/brute_punch_1.ogg
diff --git a/code/modules/halo/sounds/spiker_melee.ogg b/code/modules/halo/sounds/spiker_melee.ogg
diff --git a/code/modules/halo/sounds/spiker_reload.ogg b/code/modules/halo/sounds/spiker_reload.ogg
diff --git a/code/modules/halo/weapons/covenant/brute.dm b/code/modules/halo/weapons/covenant/brute.dm
@@ -71,8 +71,6 @@
 	load_method = MAGAZINE
 	handle_casings = CASELESS
 	fire_sound = 'code/modules/halo/sounds/Spikershotfire.ogg'
-	reload_sound = 'code/modules/halo/sounds/spiker_reload.ogg'
-	hitsound = 'code/modules/halo/sounds/spiker_melee.ogg'
 	burst = 3
 	edge = 1
 	sharp = 1
@@ -161,8 +159,6 @@
 	caliber = "mauler"
 	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
 	fire_sound = 'code/modules/halo/sounds/mauler_firing.ogg'
-	reload_sound = 'code/modules/halo/sounds/mauler_reload.ogg'
-	hitsound = 'code/modules/halo/sounds/mauler_melee.ogg'
 	edge = 1
 	sharp = 1
 	force = 35
@@ -269,7 +265,7 @@
 
 	if(get_dist(A,user) > 1)
 		return
-
+		
 	var/atom/throw_target = get_edge_target_turf(A, get_dir(user, A))
 	if(istype(A, /mob/living) && !islarge(A) || istype(A, /obj/item/))
 		var/atom/movable/AM = A
@@ -281,7 +277,7 @@
 		for(var/atom/movable/M in range(A,1))
 			if(M == user)
 				continue
-
+			
 			if(M == A)
 				continue
 
@@ -317,7 +313,6 @@
 	icon_state = "bruteshot"
 	item_state = "blank"
 	pump_sound = null
-	hitsound = 'code/modules/halo/sounds/brute_shot_melee.ogg'
 	fire_delay = 10
 	max_grenades = 6
 	one_hand_penalty = -1

diff --git a/code/modules/halo/weapons/covenant/melee.dm b/code/modules/halo/weapons/covenant/melee.dm
@@ -92,7 +92,7 @@
 		item_state_slots = list(
 		slot_l_hand_str = "[inhand_icon_state] l",
 		slot_r_hand_str = "[inhand_icon_state] r" )
-		hitsound = 'code/modules/halo/sounds/energy_sword_hit.ogg'
+		hitsound = 'code/modules/halo/sounds/Energyswordhit.ogg'
 		parry_slice_objects = 1
 
 /obj/item/weapon/melee/energy/elite_sword/activate(mob/living/user)

diff --git a/config/example/admins.txt b/config/example/admins.txt
@@ -5,4 +5,4 @@
 # Ranks can be anything defined in admin_ranks.txt           ~Carn   #
 ######################################################################
 
- farfromthetsar - Host
+# not_a_user - Admin
diff --git a/config/example/config.txt b/config/example/config.txt
@@ -136,10 +136,10 @@ ALLOW_ADMIN_OOCCOLOR
 # ALLOW_METADATA
 
 ## allow players to initiate a restart vote
-# ALLOW_VOTE_RESTART
+ALLOW_VOTE_RESTART
 
 ## allow players to initate a mode-change start
-# ALLOW_VOTE_MODE
+ALLOW_VOTE_MODE
 
 ## min delay (deciseconds) between voting sessions (default 10 minutes)
 VOTE_DELAY 6000
@@ -394,7 +394,7 @@ STARLIGHT 0
 
 ## Uncomment to enable map voting; you'll need to use the script at tools/server.sh or an equivalent for it to take effect
 ## You'll also likely need to enable WAIT_FOR_SIGUSR1 below
-MAP_SWITCHING
+# MAP_SWITCHING
 
 ## Uncomment to enable an automatic map vote and switch at end of round. MAP_SWITCHING must also be enabled.
 # AUTO_MAP_VOTE

diff --git a/maps/CRS_Unyielding_Transgression/CRS_Unyielding_Transgression.dmm b/maps/CRS_Unyielding_Transgression/CRS_Unyielding_Transgression.dmm
@@ -809,7 +809,7 @@
 "pC" = (/obj/structure/closet/crate/covenant{name = "Building Supplies"},/obj/item/stack/material/glass/phoronrglass/ten,/obj/item/stack/material/glass/phoronrglass/ten,/obj/item/stack/material/glass/phoronrglass/ten,/obj/item/stack/material/glass/phoronrglass/ten,/obj/item/stack/material/glass/phoronrglass/ten,/obj/item/stack/material/glass/phoronrglass/ten,/obj/item/stack/material/steel/fifty,/obj/item/stack/material/nanolaminate/fifty,/obj/item/stack/material/nanolaminate/fifty,/obj/item/stack/material/steel/fifty,/obj/item/stack/material/steel/fifty,/obj/item/stack/material/steel/fifty,/obj/item/stack/material/nanolaminate/fifty,/obj/item/stack/material/nanolaminate/fifty,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/centralengine)
 "pD" = (/obj/structure/closet/covenant{name = "Mining Equipment Storage Crate"},/obj/item/weapon/pickaxe/plasma_drill,/obj/item/weapon/pickaxe/plasma_drill,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/centralengine)
 "pE" = (/turf/unsimulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/centralengine)
-"pF" = (/obj/structure/closet/crate/covenant{name = "Light Tube Storage Crate"},/obj/item/weapon/storage/box/lights/tubes,/obj/item/weapon/storage/box/lights/tubes,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/centralengine)
+"pF" = (/obj/structure/closet/crate/covenant,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/centralengine)
 "pG" = (/obj/machinery/vending/armory/covenant/general/medical,/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/mainmedicalbay)
 "pH" = (/obj/machinery/light/invis,/obj/structure/ai_routing_node/cov,/obj/machinery/smartfridge/chemistry/covenant{density = 0; pixel_y = -32},/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/mainmedicalbay)
 "pI" = (/obj/structure/table/marble,/obj/machinery/newscaster/covenant{pixel_y = -32},/turf/simulated/floor/covenant{icon_state = "cov_floor"},/area/covenant_light_cruiser/vipquarters)