sounds and some improvements

SquadIsNotBroken · Jul 19, 2019 · 2dfc381 · 2dfc381
1 parent fc4e844
commit 2dfc381
Show file tree

Hide file tree

Showing 74 changed files with 11 additions and 6 deletions.
diff --git a/_maps/texas.dm → _maps/oregon.dm b/_maps/texas.dm → _maps/oregon.dm
diff --git a/code/modules/fallout/misc/jobs/job/slaver.dm b/code/modules/fallout/misc/jobs/job/slaver.dm
@@ -75,8 +75,8 @@
 	department_flag = WASTELAND
 	faction = "raider"
 	status = "slaver"
-	total_positions = -1
-	spawn_positions = -1 //does not matter for late join
+	total_positions = 10
+	spawn_positions = 4 //does not matter for late join
 	supervisors = "the Gang Leader"
 	selection_color = "#ece19d"
 	access = list()

diff --git a/code/modules/fallout/projectiles/ammunition/magazines.dm b/code/modules/fallout/projectiles/ammunition/magazines.dm
@@ -153,7 +153,7 @@
 
 /obj/item/ammo_box/magazine/F13/fnfal //ß ÊÎÑÒÛËÜÍÛÉ ÏÈÄÎÐÀÑ ÛÛÛ//
 	name = "rifle magazine (7.62mm)"
-	icon_state = "5.56m"
+	icon_state = "flmag"
 	ammo_type = /obj/item/ammo_casing/F13/a556
 	caliber = "a556"
 	max_ammo = 20

diff --git a/code/modules/fallout/projectiles/guns/ballistic.dm b/code/modules/fallout/projectiles/guns/ballistic.dm
@@ -286,7 +286,10 @@
 	item_state = "morita"
 	mag_type = /obj/item/ammo_box/magazine/F13/sst_stanag
 	origin_tech = "combat=4;materials=2;prewar=4"
-	fire_sound = 'sound/f13weapons/marksman_rifle.ogg'
+	fire_sound = 'sound/f13weapons/gunshot/m16.ogg'
+	mag_load_sound = 'sound/f13weapons/gunporn/m16_magin.ogg'
+	mag_unload_sound = 'sound/f13weapons/gunporn/m16_magout.ogg'
+	chamber_sound = 'sound/f13weapons/gunporn/m16_chargeback.ogg'
 	burst_size = 2
 	price = 3000
 	scopetype = /obj/screen/fullscreen/scope/medium

diff --git a/code/modules/fallout/vehicles/buggy.dm b/code/modules/fallout/vehicles/buggy.dm
@@ -79,9 +79,11 @@
 	names = list("Interceptor")
 
 /obj/vehicle/fuel/motorcycle/buggy/tank
-	name = "CVR(T)"
+	names = list("Êîðîáî÷êà 2", "CVR-T", "U.N.I.T CVR", "Igniter", "Heat", "Est Probitie", "Pollywog")
 	icon = 'icons/fallout/vehicles/CVR.dmi'
+	icon_state = "CVR(T)-WFLV_207"
 	desc = "FUCKING TANK!"
+	layer = 5
 	fuel = 1000
 	max_fuel = 1000
 	self_weight = 2000
diff --git a/fallout13.dme b/fallout13.dme
@@ -14,7 +14,7 @@
 
 // BEGIN_INCLUDE
 #include "_maps\__MAP_DEFINES.dm"
-#include "_maps\texas.dm"
+#include "_maps\oregon.dm"
 #include "_maps\map_files\TexasWasteland\texas_wasteland.dmm"
 #include "_maps\map_files\TexasWasteland\z2.dmm"
 #include "_maps\RandomZLevels\centcomAway.dmm"

diff --git a/icons/fallout/objects/bottlecaps.dmi b/icons/fallout/objects/bottlecaps.dmi
diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi
diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi
diff --git a/sound/weapons/gunporn/ak74_cock.ogg b/sound/weapons/gunporn/ak74_cock.ogg
diff --git a/sound/weapons/gunporn/ak74_magin.ogg b/sound/weapons/gunporn/ak74_magin.ogg
diff --git a/sound/weapons/gunporn/ak74_magout.ogg b/sound/weapons/gunporn/ak74_magout.ogg
diff --git a/sound/weapons/gunporn/m14_charge.ogg b/sound/weapons/gunporn/m14_charge.ogg
diff --git a/sound/weapons/gunporn/m14_magin.ogg b/sound/weapons/gunporn/m14_magin.ogg
diff --git a/sound/weapons/gunporn/m14_magout.ogg b/sound/weapons/gunporn/m14_magout.ogg
diff --git a/sound/weapons/gunporn/m16_chargeback.ogg b/sound/weapons/gunporn/m16_chargeback.ogg
diff --git a/sound/weapons/gunporn/m16_magin.ogg b/sound/weapons/gunporn/m16_magin.ogg
diff --git a/sound/weapons/gunporn/m16_magout.ogg b/sound/weapons/gunporn/m16_magout.ogg
diff --git a/sound/weapons/gunporn/m249_boxinsert.ogg b/sound/weapons/gunporn/m249_boxinsert.ogg
diff --git a/sound/weapons/gunporn/m249_boxremove.ogg b/sound/weapons/gunporn/m249_boxremove.ogg
diff --git a/sound/weapons/gunporn/m249_charge.ogg b/sound/weapons/gunporn/m249_charge.ogg
diff --git a/sound/weapons/gunporn/m249_close.ogg b/sound/weapons/gunporn/m249_close.ogg
diff --git a/sound/weapons/gunporn/m249_open.ogg b/sound/weapons/gunporn/m249_open.ogg
diff --git a/sound/weapons/gunporn/mosin_boltback.ogg b/sound/weapons/gunporn/mosin_boltback.ogg
diff --git a/sound/weapons/gunporn/mosin_boltforward.ogg b/sound/weapons/gunporn/mosin_boltforward.ogg
diff --git a/sound/weapons/gunporn/mosin_cock.ogg b/sound/weapons/gunporn/mosin_cock.ogg
diff --git a/sound/weapons/gunporn/mosin_magin.ogg b/sound/weapons/gunporn/mosin_magin.ogg
diff --git a/sound/weapons/gunporn/pistol_magin.ogg b/sound/weapons/gunporn/pistol_magin.ogg
diff --git a/sound/weapons/gunporn/pistol_magout.ogg b/sound/weapons/gunporn/pistol_magout.ogg
diff --git a/sound/weapons/gunporn/pistol_sliderelease.ogg b/sound/weapons/gunporn/pistol_sliderelease.ogg
diff --git a/sound/weapons/gunporn/rocketfold.ogg b/sound/weapons/gunporn/rocketfold.ogg
diff --git a/sound/weapons/gunporn/svd_boltback.ogg b/sound/weapons/gunporn/svd_boltback.ogg
diff --git a/sound/weapons/gunporn/svd_magin.ogg b/sound/weapons/gunporn/svd_magin.ogg
diff --git a/sound/weapons/gunporn/svd_magout.ogg b/sound/weapons/gunporn/svd_magout.ogg
diff --git a/sound/weapons/gunshot/50calm2.ogg b/sound/weapons/gunshot/50calm2.ogg
diff --git a/sound/weapons/gunshot/ak74-1.ogg b/sound/weapons/gunshot/ak74-1.ogg
diff --git a/sound/weapons/gunshot/ak74-2.ogg b/sound/weapons/gunshot/ak74-2.ogg
diff --git a/sound/weapons/gunshot/aks74u.ogg b/sound/weapons/gunshot/aks74u.ogg
diff --git a/sound/weapons/gunshot/aps.ogg b/sound/weapons/gunshot/aps.ogg
diff --git a/sound/weapons/gunshot/car15.ogg b/sound/weapons/gunshot/car15.ogg
diff --git a/sound/weapons/gunshot/g3.ogg b/sound/weapons/gunshot/g3.ogg
diff --git a/sound/weapons/gunshot/grenadelaunch.ogg b/sound/weapons/gunshot/grenadelaunch.ogg
diff --git a/sound/weapons/gunshot/gunshot.ogg b/sound/weapons/gunshot/gunshot.ogg
diff --git a/sound/weapons/gunshot/gunshot2.ogg b/sound/weapons/gunshot/gunshot2.ogg
diff --git a/sound/weapons/gunshot/gunshot3.ogg b/sound/weapons/gunshot/gunshot3.ogg
diff --git a/sound/weapons/gunshot/gunshot_pistol.ogg b/sound/weapons/gunshot/gunshot_pistol.ogg
diff --git a/sound/weapons/gunshot/gunshot_smg.ogg b/sound/weapons/gunshot/gunshot_smg.ogg
diff --git a/sound/weapons/gunshot/gunshot_strong.ogg b/sound/weapons/gunshot/gunshot_strong.ogg
diff --git a/sound/weapons/gunshot/m14.ogg b/sound/weapons/gunshot/m14.ogg
diff --git a/sound/weapons/gunshot/m16.ogg b/sound/weapons/gunshot/m16.ogg
diff --git a/sound/weapons/gunshot/m1911-1.ogg b/sound/weapons/gunshot/m1911-1.ogg
diff --git a/sound/weapons/gunshot/m1911.ogg b/sound/weapons/gunshot/m1911.ogg
diff --git a/sound/weapons/gunshot/m21.ogg b/sound/weapons/gunshot/m21.ogg
diff --git a/sound/weapons/gunshot/m60.ogg b/sound/weapons/gunshot/m60.ogg
diff --git a/sound/weapons/gunshot/m79.ogg b/sound/weapons/gunshot/m79.ogg
diff --git a/sound/weapons/gunshot/m9-1.ogg b/sound/weapons/gunshot/m9-1.ogg
diff --git a/sound/weapons/gunshot/m9.ogg b/sound/weapons/gunshot/m9.ogg
diff --git a/sound/weapons/gunshot/makarov.ogg b/sound/weapons/gunshot/makarov.ogg
diff --git a/sound/weapons/gunshot/mg3.ogg b/sound/weapons/gunshot/mg3.ogg
diff --git a/sound/weapons/gunshot/minigun.ogg b/sound/weapons/gunshot/minigun.ogg
diff --git a/sound/weapons/gunshot/mk19-old1.ogg b/sound/weapons/gunshot/mk19-old1.ogg
diff --git a/sound/weapons/gunshot/mk19.ogg b/sound/weapons/gunshot/mk19.ogg
diff --git a/sound/weapons/gunshot/mosin.ogg b/sound/weapons/gunshot/mosin.ogg
diff --git a/sound/weapons/gunshot/pkm.ogg b/sound/weapons/gunshot/pkm.ogg
diff --git a/sound/weapons/gunshot/pm.ogg b/sound/weapons/gunshot/pm.ogg
diff --git a/sound/weapons/gunshot/rocketfire1.ogg b/sound/weapons/gunshot/rocketfire1.ogg
diff --git a/sound/weapons/gunshot/rpg7.ogg b/sound/weapons/gunshot/rpg7.ogg
diff --git a/sound/weapons/gunshot/rpk47.ogg b/sound/weapons/gunshot/rpk47.ogg
diff --git a/sound/weapons/gunshot/rpk74.ogg b/sound/weapons/gunshot/rpk74.ogg
diff --git a/sound/weapons/gunshot/shotgun.ogg b/sound/weapons/gunshot/shotgun.ogg
diff --git a/sound/weapons/gunshot/sniper.ogg b/sound/weapons/gunshot/sniper.ogg
diff --git a/sound/weapons/gunshot/svd.ogg b/sound/weapons/gunshot/svd.ogg
diff --git a/sound/weapons/gunshot/vz58.ogg b/sound/weapons/gunshot/vz58.ogg
diff --git a/sound/weapons/gunshot/waltherp1.ogg b/sound/weapons/gunshot/waltherp1.ogg