Merge remote-tracking branch 'upstream/master' into gunstuff

shiptest-ss13 · Sep 25, 2023 · 3cc90df · 3cc90df
2 parents 01c79ff + 2e9559d
commit 3cc90df
Show file tree

Hide file tree

Showing 99 changed files with 1,165 additions and 925 deletions.
diff --git a/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm b/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm
@@ -393,7 +393,7 @@
 	pixel_x = 9;
 	pixel_y = -1
 	},
-/obj/item/gun/ballistic/automatic/assualt/p16/minutemen{
+/obj/item/gun/ballistic/automatic/assault/p16/minutemen{
 	pixel_y = 7;
 	pixel_x = -9
 	},

diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm
@@ -1703,7 +1703,7 @@
 "Md" = (
 /obj/structure/rack,
 /obj/item/ammo_box/magazine/smgm9mm/ap,
-/obj/item/ammo_box/magazine/smgm9mm/fire,
+/obj/item/ammo_box/magazine/smgm9mm/inc,
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/vault,
 /area/ruin/unpowered/corprejectvault)

diff --git a/_maps/deprecated/Ruins/forgottenship.dmm b/_maps/deprecated/Ruins/forgottenship.dmm
@@ -420,7 +420,7 @@
 /obj/structure/closet/crate/secure/gear{
 	req_one_access_txt = "150"
 	},
-/obj/item/clothing/suit/space/hardsuit/cybersun,
+,
 /turf/open/floor/pod/dark,
 /area/ruin/space/has_grav/powered/syndicate_forgotten_vault)
 "bB" = (

diff --git a/_maps/deprecated/Ships/minutemen_carina.dmm b/_maps/deprecated/Ships/minutemen_carina.dmm
@@ -2065,12 +2065,12 @@
 	pixel_x = -1;
 	pixel_y = 14
 	},
-/obj/item/ammo_box/magazine/m45/rubbershot,
-/obj/item/ammo_box/magazine/m45/rubbershot,
-/obj/item/ammo_box/magazine/m45/rubbershot,
-/obj/item/ammo_box/magazine/m45/rubbershot,
-/obj/item/ammo_box/magazine/m45/rubbershot,
-/obj/item/ammo_box/magazine/m45/rubbershot,
+/obj/item/ammo_box/magazine/m45/rubber,
+/obj/item/ammo_box/magazine/m45/rubber,
+/obj/item/ammo_box/magazine/m45/rubber,
+/obj/item/ammo_box/magazine/m45/rubber,
+/obj/item/ammo_box/magazine/m45/rubber,
+/obj/item/ammo_box/magazine/m45/rubber,
 /obj/machinery/airalarm/directional/north,
 /obj/effect/turf_decal/corner/opaque/red{
 	dir = 1

diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
@@ -8951,7 +8951,7 @@
 "hra" = (
 /obj/structure/table/reinforced,
 /obj/item/storage/lockbox/loyalty,
-/obj/item/gun/ballistic/automatic/assualt/ar,
+/obj/item/gun/ballistic/automatic/assault/ar,
 /obj/machinery/light/directional/north,
 /obj/effect/turf_decal/industrial/warning,
 /turf/open/floor/plasteel,

diff --git a/_maps/shuttles/shiptest/independent_beluga.dmm b/_maps/shuttles/shiptest/independent_beluga.dmm
@@ -1169,7 +1169,7 @@
 	req_access_txt = "1"
 	},
 /obj/machinery/light/directional/north,
-/obj/item/ammo_box/magazine/co9mm/rubbershot{
+/obj/item/ammo_box/magazine/co9mm/rubber{
 	pixel_x = 9;
 	pixel_y = 4
 	},

diff --git a/_maps/shuttles/shiptest/independent_halftrack.dmm b/_maps/shuttles/shiptest/independent_halftrack.dmm
@@ -371,28 +371,28 @@
 /obj/item/gun/ballistic/automatic/smg/vector{
 	spawnwithmagazine = 0
 	},
-/obj/item/ammo_box/magazine/smgm9mm/rubbershot,
-/obj/item/ammo_box/magazine/smgm9mm/rubbershot,
+/obj/item/ammo_box/magazine/smgm9mm/rubber,
+/obj/item/ammo_box/magazine/smgm9mm/rubber,
 /obj/item/gun/ballistic/automatic/pistol/commander/no_mag,
 /obj/item/gun/ballistic/automatic/pistol/commander/no_mag,
 /obj/item/ammo_box/magazine/co9mm{
-	ammo_type = /obj/item/ammo_casing/c9mm/rubbershot;
+	ammo_type = /obj/item/ammo_casing/c9mm/rubber;
 	name = "Commander magazine (Rubbershot 9mm)"
 	},
 /obj/item/ammo_box/magazine/co9mm{
-	ammo_type = /obj/item/ammo_casing/c9mm/rubbershot;
+	ammo_type = /obj/item/ammo_casing/c9mm/rubber;
 	name = "Commander magazine (Rubbershot 9mm)"
 	},
 /obj/item/ammo_box/magazine/co9mm{
-	ammo_type = /obj/item/ammo_casing/c9mm/rubbershot;
+	ammo_type = /obj/item/ammo_casing/c9mm/rubber;
 	name = "Commander magazine (Rubbershot 9mm)"
 	},
 /obj/item/ammo_box/magazine/co9mm{
-	ammo_type = /obj/item/ammo_casing/c9mm/rubbershot;
+	ammo_type = /obj/item/ammo_casing/c9mm/rubber;
 	name = "Commander magazine (Rubbershot 9mm)"
 	},
 /obj/item/ammo_box/magazine/co9mm{
-	ammo_type = /obj/item/ammo_casing/c9mm/rubbershot;
+	ammo_type = /obj/item/ammo_casing/c9mm/rubber;
 	name = "Commander magazine (Rubbershot 9mm)"
 	},
 /obj/structure/closet/secure_closet/wall{
@@ -432,11 +432,11 @@
 /obj/item/ammo_box/magazine/co9mm,
 /obj/item/ammo_box/magazine/co9mm,
 /obj/item/ammo_box/magazine/co9mm,
-/obj/item/ammo_box/magazine/co9mm/rubbershot,
-/obj/item/ammo_box/magazine/co9mm/rubbershot,
-/obj/item/ammo_box/magazine/co9mm/rubbershot,
-/obj/item/ammo_box/magazine/co9mm/rubbershot,
-/obj/item/ammo_box/magazine/co9mm/rubbershot,
+/obj/item/ammo_box/magazine/co9mm/rubber,
+/obj/item/ammo_box/magazine/co9mm/rubber,
+/obj/item/ammo_box/magazine/co9mm/rubber,
+/obj/item/ammo_box/magazine/co9mm/rubber,
+/obj/item/ammo_box/magazine/co9mm/rubber,
 /obj/effect/turf_decal/box/red,
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
@@ -1022,20 +1022,20 @@
 /obj/item/gun/ballistic/automatic/smg/vector{
 	spawnwithmagazine = 0
 	},
-/obj/item/ammo_box/magazine/smgm9mm/rubbershot,
-/obj/item/ammo_box/magazine/smgm9mm/rubbershot,
+/obj/item/ammo_box/magazine/smgm9mm/rubber,
+/obj/item/ammo_box/magazine/smgm9mm/rubber,
 /obj/item/ammo_box/magazine/co9mm{
-	ammo_type = /obj/item/ammo_casing/c9mm/rubbershot;
+	ammo_type = /obj/item/ammo_casing/c9mm/rubber;
 	name = "Commander magazine (Rubbershot 9mm)"
 	},
 /obj/item/gun/ballistic/automatic/pistol/commander/no_mag,
 /obj/item/gun/ballistic/automatic/pistol/commander/no_mag,
 /obj/item/ammo_box/magazine/co9mm{
-	ammo_type = /obj/item/ammo_casing/c9mm/rubbershot;
+	ammo_type = /obj/item/ammo_casing/c9mm/rubber;
 	name = "Commander magazine (Rubbershot 9mm)"
 	},
 /obj/item/ammo_box/magazine/co9mm{
-	ammo_type = /obj/item/ammo_casing/c9mm/rubbershot;
+	ammo_type = /obj/item/ammo_casing/c9mm/rubber;
 	name = "Commander magazine (Rubbershot 9mm)"
 	},
 /obj/item/ammo_box/magazine/co9mm{
@@ -1051,7 +1051,7 @@
 	req_access_txt = "5"
 	},
 /obj/item/ammo_box/magazine/co9mm{
-	ammo_type = /obj/item/ammo_casing/c9mm/rubbershot;
+	ammo_type = /obj/item/ammo_casing/c9mm/rubber;
 	name = "Commander magazine (Rubbershot 9mm)"
 	},
 /obj/machinery/light/directional/north,
@@ -1502,8 +1502,8 @@
 /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/assualt/ak47,
-/obj/item/gun/ballistic/automatic/assualt/ak47,
+/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,

diff --git a/_maps/shuttles/shiptest/independent_litieguai.dmm b/_maps/shuttles/shiptest/independent_litieguai.dmm
@@ -2248,17 +2248,17 @@
 /area/ship/crew)
 "UX" = (
 /obj/item/ammo_box/magazine/co9mm{
-	ammo_type = /obj/item/ammo_casing/c9mm/rubbershot;
+	ammo_type = /obj/item/ammo_casing/c9mm/rubber;
 	name = "Commander magazine (Rubbershot 9mm)"
 	},
 /obj/item/gun/ballistic/automatic/pistol/commander/no_mag,
 /obj/item/gun/ballistic/automatic/pistol/commander/no_mag,
 /obj/item/ammo_box/magazine/co9mm{
-	ammo_type = /obj/item/ammo_casing/c9mm/rubbershot;
+	ammo_type = /obj/item/ammo_casing/c9mm/rubber;
 	name = "Commander magazine (Rubbershot 9mm)"
 	},
 /obj/item/ammo_box/magazine/co9mm{
-	ammo_type = /obj/item/ammo_casing/c9mm/rubbershot;
+	ammo_type = /obj/item/ammo_casing/c9mm/rubber;
 	name = "Commander magazine (Rubbershot 9mm)"
 	},
 /obj/item/ammo_box/magazine/co9mm{

diff --git a/_maps/shuttles/shiptest/independent_rigger.dmm b/_maps/shuttles/shiptest/independent_rigger.dmm
@@ -4144,8 +4144,8 @@
 	req_access_txt = "1"
 	},
 /obj/item/ammo_box/c38_box,
-/obj/item/ammo_box/magazine/m45/rubbershot,
-/obj/item/ammo_box/magazine/m45/rubbershot,
+/obj/item/ammo_box/magazine/m45/rubber,
+/obj/item/ammo_box/magazine/m45/rubber,
 /obj/item/ammo_box/magazine/m45,
 /turf/open/floor/plasteel/dark,
 /area/ship/security)

diff --git a/_maps/shuttles/shiptest/independent_tranquility.dmm b/_maps/shuttles/shiptest/independent_tranquility.dmm
@@ -5481,7 +5481,7 @@
 /area/ship/engineering/engine)
 "Rk" = (
 /obj/structure/table,
-/obj/item/ammo_box/magazine/m45/rubbershot{
+/obj/item/ammo_box/magazine/m45/rubber{
 	pixel_x = 7;
 	pixel_y = -2
 	},
@@ -5644,15 +5644,15 @@
 /area/ship/hallway/starboard)
 "Sg" = (
 /obj/structure/table,
-/obj/item/ammo_casing/c45/rubbershot{
+/obj/item/ammo_casing/c45/rubber{
 	pixel_x = 6;
 	pixel_y = 7
 	},
-/obj/item/ammo_casing/c45/rubbershot{
+/obj/item/ammo_casing/c45/rubber{
 	pixel_x = 4;
 	pixel_y = 5
 	},
-/obj/item/ammo_casing/c45/rubbershot{
+/obj/item/ammo_casing/c45/rubber{
 	pixel_x = 8;
 	pixel_y = 3
 	},