Merge remote-tracking branch 'upstream/master'

MemeSnorfer · Feb 23, 2024 · 644d2e9 · 644d2e9
2 parents 9d6991f + ca75c02
commit 644d2e9
Show file tree

Hide file tree

Showing 88 changed files with 802 additions and 347 deletions.
diff --git a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
@@ -1761,9 +1761,9 @@
 	pixel_y = -5
 	},
 /obj/item/ammo_casing/a4570,
-/obj/item/ammo_box/magazine/aks74u,
-/obj/item/ammo_box/magazine/aks74u,
-/obj/item/ammo_box/magazine/aks74u,
+/obj/item/ammo_box/magazine/skm_545_39,
+/obj/item/ammo_box/magazine/skm_545_39,
+/obj/item/ammo_box/magazine/skm_545_39,
 /obj/item/ammo_box/magazine/illestren_a850r,
 /obj/item/ammo_box/magazine/illestren_a850r,
 /turf/open/floor/plasteel/tech,
@@ -1839,7 +1839,7 @@
 /obj/structure/railing/corner{
 	dir = 8
 	},
-/mob/living/simple_animal/hostile/frontier/ranged/trooper/ak47/neutured,
+/mob/living/simple_animal/hostile/frontier/ranged/trooper/skm/neutured,
 /turf/open/floor/plasteel/stairs{
 	dir = 1
 	},
@@ -2281,7 +2281,7 @@
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet/crate/secure/gear,
-/obj/item/gun/ballistic/automatic/smg/aks74u{
+/obj/item/gun/ballistic/automatic/smg/skm_carbine{
 	pixel_y = -6
 	},
 /obj/item/gun/ballistic/automatic/zip_pistol,

diff --git a/_maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm b/_maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm
@@ -155,7 +155,7 @@
 /obj/effect/decal/cleanable/blood/tracks,
 /obj/effect/decal/cleanable/blood/splatter,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/item/gun/ballistic/automatic/smg/aks74u,
+/obj/item/gun/ballistic/automatic/smg/skm_carbine,
 /obj/item/ammo_casing{
 	dir = 10;
 	pixel_x = -7;
@@ -958,7 +958,7 @@
 	pixel_y = 11
 	},
 /obj/effect/gibspawner/human,
-/obj/item/ammo_box/magazine/aks74u,
+/obj/item/ammo_box/magazine/skm_545_39,
 /turf/open/floor/plasteel/tech,
 /area/ship/science)
 "oJ" = (

diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm
@@ -995,8 +995,8 @@
 /area/overmap_encounter/planetoid/sand/explored)
 "KJ" = (
 /obj/structure/table,
-/obj/item/gun/ballistic/automatic/smg/aks74u,
-/obj/item/ammo_box/magazine/aks74u,
+/obj/item/gun/ballistic/automatic/smg/skm_carbine,
+/obj/item/ammo_box/magazine/skm_545_39,
 /turf/open/floor/concrete,
 /area/ruin)
 "Ld" = (

diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
@@ -2207,9 +2207,6 @@
 /obj/structure/table/wood/fancy,
 /turf/open/floor/wood,
 /area/wizard_station)
-"axw" = (
-/turf/open/floor/engine/cult,
-/area/wizard_station)
 "axx" = (
 /obj/machinery/vending/snack,
 /turf/open/floor/engine/cult,
@@ -12592,10 +12589,10 @@
 	dir = 8
 	},
 /obj/structure/rack,
-/obj/item/gun/ballistic/automatic/assault/ak47/inteq{
+/obj/item/gun/ballistic/automatic/assault/skm/inteq{
 	pixel_y = 3
 	},
-/obj/item/gun/ballistic/automatic/assault/ak47/inteq{
+/obj/item/gun/ballistic/automatic/assault/skm/inteq{
 	pixel_y = -1;
 	pixel_x = -5
 	},
@@ -14665,20 +14662,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/centcom/control)
-"sow" = (
-/obj/structure/table/wood,
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/centcom/control)
 "spy" = (
 /obj/effect/turf_decal/corner/opaque/red{
 	dir = 1
@@ -15212,10 +15195,10 @@
 	},
 /obj/effect/turf_decal/corner/opaque/yellow,
 /obj/structure/rack,
-/obj/item/gun/ballistic/automatic/smg/inteq{
+/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq{
 	pixel_x = 2
 	},
-/obj/item/gun/ballistic/automatic/smg/inteq{
+/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq{
 	pixel_x = -1;
 	pixel_y = -6
 	},
@@ -23555,7 +23538,7 @@ aqZ
 aqZ
 aqZ
 awN
-axw
+aqZ
 aqE
 aqZ
 aqZ
@@ -64657,7 +64640,7 @@ aiH
 mpw
 rzn
 ail
-sow
+gDP
 gTh
 agb
 aqg

diff --git a/_maps/shuttles/independent/independent_halftrack.dmm b/_maps/shuttles/independent/independent_halftrack.dmm
@@ -1502,12 +1502,12 @@
 /obj/structure/closet/secure_closet/security,
 /obj/item/gun/ballistic/automatic/pistol/deagle,
 /obj/item/gun/ballistic/automatic/pistol/deagle,
-/obj/item/gun/ballistic/automatic/assault/ak47,
-/obj/item/gun/ballistic/automatic/assault/ak47,
-/obj/item/ammo_box/magazine/ak47,
-/obj/item/ammo_box/magazine/ak47,
-/obj/item/ammo_box/magazine/ak47,
-/obj/item/ammo_box/magazine/ak47,
+/obj/item/gun/ballistic/automatic/assault/skm,
+/obj/item/gun/ballistic/automatic/assault/skm,
+/obj/item/ammo_box/magazine/skm_762_40,
+/obj/item/ammo_box/magazine/skm_762_40,
+/obj/item/ammo_box/magazine/skm_762_40,
+/obj/item/ammo_box/magazine/skm_762_40,
 /obj/item/ammo_box/magazine/m50,
 /obj/item/ammo_box/magazine/m50,
 /obj/item/ammo_box/magazine/m50,

diff --git a/_maps/shuttles/inteq/inteq_colossus.dmm b/_maps/shuttles/inteq/inteq_colossus.dmm
@@ -718,6 +718,39 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
+"hx" = (
+/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
+/obj/item/clothing/mask/gas/sechailer/inteq,
+/obj/item/clothing/gloves/tackler/combat/insulated,
+/obj/item/clothing/shoes/combat,
+/obj/item/storage/belt/security/webbing/inteq/alt,
+/obj/item/storage/backpack/messenger/inteq,
+/obj/item/clothing/under/syndicate/inteq/skirt,
+/obj/item/clothing/under/syndicate/inteq,
+/obj/structure/closet/secure_closet{
+	anchored = 1;
+	can_be_unanchored = 1;
+	icon_state = "warden";
+	name = "master at arms' locker";
+	req_access_txt = "3"
+	},
+/obj/effect/turf_decal/corner/opaque/brown{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/clothing/suit/armor/vest/bulletproof,
+/obj/item/megaphone/sec,
+/obj/effect/turf_decal/corner/opaque/brown{
+	dir = 4
+	},
+/obj/item/storage/belt/security/webbing/inteq,
+/obj/item/storage/belt/military/assault,
+/obj/item/reagent_containers/spray/pepper,
+/obj/item/clothing/head/warden/inteq,
+/obj/item/clothing/suit/armor/vest/security/warden/inteq,
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
 "hD" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/hallway/port)
@@ -810,41 +843,6 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
-"iS" = (
-/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
-/obj/item/clothing/mask/gas/sechailer/inteq,
-/obj/item/clothing/gloves/tackler/combat/insulated,
-/obj/item/clothing/shoes/combat,
-/obj/item/storage/belt/security/webbing/inteq/alt,
-/obj/item/storage/backpack/messenger/inteq,
-/obj/item/clothing/under/syndicate/inteq/skirt,
-/obj/item/clothing/under/syndicate/inteq,
-/obj/structure/closet/secure_closet{
-	anchored = 1;
-	can_be_unanchored = 1;
-	icon_state = "warden";
-	name = "master at arms' locker";
-	req_access_txt = "3"
-	},
-/obj/effect/turf_decal/corner/opaque/brown{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner/opaque/yellow,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/clothing/suit/armor/vest/bulletproof,
-/obj/item/clothing/head/warden/drill{
-	desc = "A special armored campaign hat with the IRMG insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection.";
-	name = "master at arms' campaign hat"
-	},
-/obj/item/megaphone/sec,
-/obj/effect/turf_decal/corner/opaque/brown{
-	dir = 4
-	},
-/obj/item/storage/belt/security/webbing/inteq,
-/obj/item/storage/belt/military/assault,
-/obj/item/reagent_containers/spray/pepper,
-/turf/open/floor/plasteel/dark,
-/area/ship/security)
 "iT" = (
 /obj/machinery/vending/snack/random,
 /obj/effect/turf_decal/trimline/opaque/yellow/line,
@@ -1442,27 +1440,7 @@
 /obj/item/radio/intercom/directional/west,
 /turf/open/floor/plating,
 /area/ship/engineering)
-"qR" = (
-/obj/effect/turf_decal/industrial/traffic{
-	dir = 4
-	},
-/obj/machinery/navbeacon/wayfinding{
-	codes_txt = "patrol;next_patrol=office";
-	location = "port"
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"qS" = (
-/obj/structure/dresser,
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable,
-/obj/machinery/airalarm/directional/south,
-/turf/open/floor/plasteel/grimy,
-/area/ship/crew)
-"qX" = (
+"qQ" = (
 /obj/structure/rack,
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 10;
@@ -1479,12 +1457,32 @@
 	pixel_x = 5;
 	pixel_y = 5
 	},
-/obj/item/gun/ballistic/automatic/smg/inteq{
+/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq{
 	pixel_y = -2
 	},
 /obj/machinery/airalarm/directional/west,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security/armory)
+"qR" = (
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 4
+	},
+/obj/machinery/navbeacon/wayfinding{
+	codes_txt = "patrol;next_patrol=office";
+	location = "port"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"qS" = (
+/obj/structure/dresser,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable,
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/plasteel/grimy,
+/area/ship/crew)
 "rb" = (
 /obj/machinery/power/shieldwallgen/atmos{
 	anchored = 1;
@@ -5084,7 +5082,7 @@ Kv
 EI
 Dq
 MQ
-qX
+qQ
 PV
 "}
 (23,1,1) = {"
@@ -5172,7 +5170,7 @@ eM
 pd
 gX
 WC
-iS
+hx
 XA
 "}
 (27,1,1) = {"

diff --git a/_maps/shuttles/inteq/inteq_hound.dmm b/_maps/shuttles/inteq/inteq_hound.dmm
@@ -580,13 +580,13 @@
 /obj/item/gun/ballistic/automatic/pistol/commander/inteq{
 	pixel_y = -5
 	},
-/obj/item/ammo_box/magazine/ak47{
+/obj/item/ammo_box/magazine/skm_762_40{
 	pixel_x = -7
 	},
-/obj/item/ammo_box/magazine/ak47{
+/obj/item/ammo_box/magazine/skm_762_40{
 	pixel_x = 7
 	},
-/obj/item/gun/ballistic/automatic/assault/ak47/inteq{
+/obj/item/gun/ballistic/automatic/assault/skm/inteq{
 	pixel_x = -5
 	},
 /obj/structure/closet/secure_closet/wall{
@@ -2384,7 +2384,7 @@
 	pixel_x = -11;
 	pixel_y = 5
 	},
-/obj/item/storage/toolbox/ammo/a762_39{
+/obj/item/ammo_box/a762_40/inteq{
 	pixel_x = 5;
 	pixel_y = 12
 	},

diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm
@@ -1920,16 +1920,14 @@
 /obj/effect/turf_decal/corner/opaque/yellow,
 /obj/effect/decal/cleanable/dirt,
 /obj/item/clothing/suit/armor/vest/bulletproof,
-/obj/item/clothing/head/warden/drill{
-	desc = "A special armored campaign hat with the IRMG insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection.";
-	name = "master at arms' campaign hat"
-	},
 /obj/item/megaphone/sec,
 /obj/structure/sign/poster/contraband/eoehoma{
 	pixel_y = -32
 	},
 /obj/item/storage/belt/security/webbing/inteq/alt,
 /obj/item/storage/belt/security/webbing/inteq,
+/obj/item/clothing/head/warden/inteq,
+/obj/item/clothing/suit/armor/vest/security/warden/inteq,
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "ms" = (

diff --git a/_maps/shuttles/inteq/inteq_vaquero.dmm b/_maps/shuttles/inteq/inteq_vaquero.dmm
@@ -1971,10 +1971,6 @@
 /obj/effect/turf_decal/corner/opaque/yellow,
 /obj/effect/decal/cleanable/dirt,
 /obj/item/clothing/suit/armor/vest/bulletproof,
-/obj/item/clothing/head/warden/drill{
-	desc = "A special armored campaign hat with the IRMG insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection.";
-	name = "master at arms' campaign hat"
-	},
 /obj/item/megaphone/sec,
 /obj/effect/turf_decal/corner/opaque/brown{
 	dir = 4
@@ -1986,6 +1982,8 @@
 	},
 /obj/machinery/power/apc/auto_name/directional/east,
 /obj/machinery/light/small/directional/south,
+/obj/item/clothing/head/warden/inteq,
+/obj/item/clothing/suit/armor/vest/security/warden/inteq,
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "Eh" = (

diff --git a/_maps/shuttles/subshuttles/frontiersmen_gut.dmm b/_maps/shuttles/subshuttles/frontiersmen_gut.dmm
@@ -203,7 +203,7 @@
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet/crate/secure/gear,
-/obj/item/gun/ballistic/automatic/smg/aks74u{
+/obj/item/gun/ballistic/automatic/smg/skm_carbine{
 	pixel_y = -6
 	},
 /obj/item/gun/ballistic/automatic/zip_pistol,

diff --git a/code/controllers/configuration/config_entry.dm b/code/controllers/configuration/config_entry.dm
@@ -130,6 +130,7 @@
 	str_val = trim(str_val)
 	if (str_val != "")
 		config_entry_value += str_val
+	return TRUE
 
 /datum/config_entry/number_list
 	abstract_type = /datum/config_entry/number_list