Merge pull request Civ13#2719 from savethetreez/skibidibranch

Small bugfixes
Bierkraan · Apr 12, 2024 · cb9ad7e · cb9ad7e
2 parents 89fa61b + 883f19c
commit cb9ad7e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/code/_helpers/debugger.dm b/code/_helpers/debugger.dm
@@ -11,12 +11,12 @@
 /world/New()
 	var/debug_server = world.GetConfig("env", "AUXTOOLS_DEBUG_DLL")
 	if (debug_server)
-		call(debug_server, "auxtools_init")()
+		call_ext(debug_server, "auxtools_init")()
 		enable_debugging()
 	. = ..()
 
 /world/Del()
 	var/debug_server = world.GetConfig("env", "AUXTOOLS_DEBUG_DLL")
 	if (debug_server)
-		call(debug_server, "auxtools_shutdown")()
+		call_ext(debug_server, "auxtools_shutdown")()
 	. = ..()
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
@@ -426,8 +426,7 @@
 	if (istype(target_mob, /mob/living/simple_animal/hostile/human) && target_mob.stat != DEAD && prob(33))
 		var/list/screamlist = list('sound/voice/screams/scream1.ogg','sound/voice/screams/scream2.ogg','sound/voice/screams/scream3.ogg','sound/voice/screams/scream4.ogg','sound/voice/screams/scream5.ogg','sound/voice/screams/scream6.ogg',)
 		playsound(loc, pick(screamlist), 100, extrarange = 50)
-	..()
-
+
 	//admin logs
 	if (!no_attack_log)
 		if (istype(firer, /mob))

diff --git a/maps/1969/grozny.dmm b/maps/1969/grozny.dmm
@@ -748,7 +748,7 @@
 "aoB" = (/obj/structure/vehicleparts/frame/bmd2/lb,/obj/structure/vehicleparts/movement/tracks/bmd2new/right_back,/obj/item/weapon/key/russian,/turf/floor/dirt,/area/caribbean/no_mans_land/temperate{ambience = list("sound/ambience/battle1.ogg")})
 "aoC" = (/obj/structure/barricade,/obj/structure/window/barrier/sandbag,/turf/floor/plating/road,/area/caribbean/no_mans_land/temperate/two{ambience = list("sound/ambience/battle1.ogg")})
 "aoD" = (/obj/covers/brick_wall/incomplete,/obj/structure/window/barrier/railing/brick{desc = "A bunch of bricks, can be used as a cover"; dir = 1},/obj/item/weapon/clay/advclaybricks/fired,/turf/floor/dirt,/area/caribbean/roofed/temperate)
-"aoE" = (/obj/structure/vehicleparts/frame/bmd2/rc,/obj/item/ammo_magazine/a30mm_he,/obj/item/ammo_magazine/a30mm_he,/obj/item/ammo_magazine/a30mm_ap,/obj/item/ammo_magazine/a30mm_ap,/obj/structure/lamp/lamp_small/tank/red{dir = 8},/obj/item/ammo_casing/rocket/atgm/he,/obj/item/ammo_casing/rocket/atgm/he,/obj/item/ammo_casing/rocket/atgm/he,/obj/item/ammo_casing/rocket/atgm/apcr,/obj/item/ammo_casing/rocket/atgm/apcr,/turf/floor/dirt,/area/caribbean/no_mans_land/temperate{ambience = list("sound/ambience/battle1.ogg")})
+"aoE" = (/obj/structure/vehicleparts/frame/bmd2/rc,/obj/item/ammo_magazine/a30mm_he,/obj/item/ammo_magazine/a30mm_he,/obj/item/ammo_magazine/a30mm_ap,/obj/item/ammo_magazine/a30mm_ap,/obj/structure/lamp/lamp_small/tank/red{dir = 8},/obj/item/ammo_casing/rocket/atgm/he,/obj/item/ammo_casing/rocket/atgm/he,/obj/item/ammo_casing/rocket/atgm/he,/obj/item/ammo_casing/rocket/atgm,/obj/item/ammo_casing/rocket/atgm,/turf/floor/dirt,/area/caribbean/no_mans_land/temperate{ambience = list("sound/ambience/battle1.ogg")})
 "aoF" = (/obj/structure/window/barrier/sandbag,/turf/floor/plating/cobblestone/vertical,/area/caribbean/japanese/land{name = "Bridge"; ambience = list("sound/ambience/battle1.ogg")})
 "aoG" = (/obj/structure/window/barrier/sandbag,/turf/floor/plating/road,/area/caribbean/japanese/land{name = "Bridge"; ambience = list("sound/ambience/battle1.ogg")})
 "aoH" = (/obj/structure/window/barrier/sandbag,/obj/structure/window/barrier/sandbag{icon_state = "sandbag"; dir = 4},/turf/floor/plating/cobblestone/vertical,/area/caribbean/japanese/land{name = "Bridge"; ambience = list("sound/ambience/battle1.ogg")})

diff --git a/maps/1969/magistral.dmm b/maps/1969/magistral.dmm
@@ -19,7 +19,7 @@
 "as" = (/obj/structure/vehicleparts/movement/tracks/right/reversed,/obj/item/weapon/reagent_containers/glass/barrel/fueltank/tank/highcap/fueleddiesel,/obj/structure/vehicleparts/frame/t72/lb,/turf/floor/plating/road,/area/caribbean/nomads/desert)
 "at" = (/obj/effect/autoassembler,/obj/structure/vehicleparts/frame/t72/right/door{doorcode = 4975},/turf/floor/plating/road,/area/caribbean/nomads/desert)
 "au" = (/obj/item/stack/material/barbwire/ten,/turf/floor/plating/concrete,/area/caribbean/roofed/desert)
-"av" = (/obj/structure/vehicleparts/frame/bmd2/rc,/obj/item/ammo_magazine/a30mm_he,/obj/item/ammo_magazine/a30mm_he,/obj/item/ammo_magazine/a30mm_ap,/obj/item/ammo_magazine/a30mm_ap,/obj/structure/lamp/lamp_small/tank/red{dir = 8},/obj/item/ammo_casing/rocket/atgm/he,/obj/item/ammo_casing/rocket/atgm/he,/obj/item/ammo_casing/rocket/atgm/he,/obj/item/ammo_casing/rocket/atgm/apcr,/obj/item/ammo_casing/rocket/atgm/apcr,/turf/floor/plating/road,/area/caribbean/nomads/desert)
+"av" = (/obj/structure/vehicleparts/frame/bmd2/rc,/obj/item/ammo_magazine/a30mm_he,/obj/item/ammo_magazine/a30mm_he,/obj/item/ammo_magazine/a30mm_ap,/obj/item/ammo_magazine/a30mm_ap,/obj/structure/lamp/lamp_small/tank/red{dir = 8},/obj/item/ammo_casing/rocket/atgm/he,/obj/item/ammo_casing/rocket/atgm/he,/obj/item/ammo_casing/rocket/atgm/he,/obj/item/ammo_casing/rocket/atgm,/obj/item/ammo_casing/rocket/atgm,/turf/floor/plating/road,/area/caribbean/nomads/desert)
 "aw" = (/obj/structure/bed/chair/commander/nvg{anchored = 1},/obj/structure/vehicleparts/frame/t72/right,/turf/floor/plating/road,/area/caribbean/nomads/desert)
 "ax" = (/obj/structure/shellrack/full100,/turf/floor/beach/sand/desert,/area/caribbean/nomads/desert)
 "ay" = (/obj/structure/vehicleparts/frame/t72/left,/turf/floor/plating/road,/area/caribbean/nomads/desert)

diff --git a/maps/milsim/vadso_city.dmm b/maps/milsim/vadso_city.dmm
@@ -361,7 +361,7 @@
 "CZ" = (/obj/effect/floor_decal/steeldecal/steel_decals5{dir = 8},/obj/effect/floor_decal/corner_steel_grid{dir = 4},/turf/floor/plating/road,/area/caribbean/sea/sea)
 "Dc" = (/obj/structure/table/modern/table/flipped{dir = 1},/turf/floor/wood,/area/caribbean/no_mans_land/capturable/four)
 "Dj" = (/turf/floor/plating/road/yellowline{dir = 4; icon_state = "road_yellowline"},/area/caribbean/supply/british)
-"Dl" = (/obj/structure/window/barrier/sandbag{dir = 1; icon_state = "sandbag"; pixel_y = 0; layer = 2.99},/obj/structure/closet/crate/ww2,/obj/item/ammo_casing/rocket/atgm/apcr,/obj/item/ammo_casing/rocket/atgm/apcr,/obj/item/ammo_casing/rocket/atgm/apcr,/obj/item/ammo_casing/rocket/atgm/apcr,/obj/item/ammo_casing/rocket/atgm/apcr,/obj/item/ammo_casing/rocket/atgm/apcr,/obj/item/ammo_casing/rocket/atgm/apcr,/obj/item/ammo_casing/rocket/atgm/apcr,/obj/structure/lamp/lamp_small/alwayson{dir = 1},/turf/floor/plating/road,/area/caribbean/british/land/inside)
+"Dl" = (/obj/structure/window/barrier/sandbag{dir = 1; icon_state = "sandbag"; pixel_y = 0; layer = 2.99},/obj/structure/closet/crate/ww2,/obj/item/ammo_casing/rocket/atgm,/obj/item/ammo_casing/rocket/atgm,/obj/item/ammo_casing/rocket/atgm,/obj/item/ammo_casing/rocket/atgm,/obj/item/ammo_casing/rocket/atgm,/obj/item/ammo_casing/rocket/atgm,/obj/item/ammo_casing/rocket/atgm,/obj/item/ammo_casing/rocket/atgm,/obj/structure/lamp/lamp_small/alwayson{dir = 1},/turf/floor/plating/road,/area/caribbean/british/land/inside)
 "Dn" = (/obj/structure/shelf/palette,/obj/structure/largecrate{anchored = 1; opacity = 1},/turf/floor/plating/steel,/area/caribbean/no_mans_land/capturable/three)
 "Dp" = (/turf/floor/beach/sand,/area/caribbean)
 "Dx" = (/obj/structure/lamp/lamp_big/alwayson{dir = 1; icon_state = "tube"},/turf/floor/plating/steel,/area/caribbean/russian/land/inside)