Merge branch 'master' into wheelchair-buff

shiptest-ss13 · Jun 30, 2024 · bae6488 · bae6488
2 parents 545c080 + c703a69
commit bae6488
Show file tree

Hide file tree

Showing 308 changed files with 9,882 additions and 4,166 deletions.
diff --git a/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm b/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm
@@ -1859,15 +1859,8 @@
 	pixel_y = -32;
 	pixel_x = 32
 	},
-/obj/item/reagent_containers/food/drinks/britcup{
-	desc = "A cup with a strange flag emblazoned on it.";
-	pixel_y = 4;
-	pixel_x = 9
-	},
-/obj/item/reagent_containers/food/drinks/britcup{
-	desc = "A cup with a strange flag emblazoned on it.";
-	pixel_y = -2
-	},
+/obj/item/reagent_containers/food/drinks/mug,
+/obj/item/reagent_containers/food/drinks/mug,
 /obj/item/reagent_containers/food/drinks/bottle/wine{
 	pixel_y = 10;
 	pixel_x = -9

diff --git a/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm b/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm
@@ -565,7 +565,7 @@
 /turf/open/floor/wood/walnut,
 /area/ruin/beach/treasure_cove)
 "sd" = (
-/obj/structure/guncase,
+/obj/structure/guncloset,
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4;
 	color = "#808080"

diff --git a/_maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm b/_maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm
@@ -1480,7 +1480,7 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{
+/obj/item/reagent_containers/food/drinks/soda_cans/pacfuel{
 	pixel_y = 12;
 	pixel_x = -7
 	},

diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
@@ -437,7 +437,6 @@
 /obj/item/clothing/under/rank/cargo/miner,
 /obj/item/clothing/suit/hooded/wintercoat/miner,
 /obj/item/clothing/shoes/winterboots,
-/obj/item/card/id/mining,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood,
 /area/ruin/powered)

diff --git a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
@@ -1364,7 +1364,7 @@
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ruin/jungle/cavecrew/cargo)
 "qz" = (
-/obj/structure/guncase,
+/obj/structure/guncloset,
 /obj/effect/turf_decal/industrial/hatch/yellow,
 /obj/effect/turf_decal/industrial/warning{
 	dir = 10

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm
@@ -1157,7 +1157,7 @@
 /obj/effect/turf_decal/corner/opaque/red/border{
 	dir = 5
 	},
-/obj/structure/guncase,
+/obj/structure/guncloset,
 /obj/item/gun/energy/e_gun,
 /turf/open/floor/plasteel/dark,
 /area/ruin/lavaland/factory/adminstrative)
@@ -2716,7 +2716,7 @@
 /obj/item/ammo_box/magazine/smgm9mm{
 	start_empty = 1
 	},
-/obj/item/gun/ballistic/automatic/smg/proto,
+/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto,
 /turf/open/floor/plasteel/dark,
 /area/ruin/lavaland/factory/dorms)
 "zC" = (

diff --git a/_maps/RandomRuins/RockRuins/rockplanet_shippingdock.dmm b/_maps/RandomRuins/RockRuins/rockplanet_shippingdock.dmm
@@ -2068,7 +2068,7 @@
 "sa" = (
 /obj/effect/turf_decal/rechargefloor,
 /obj/effect/turf_decal/industrial/warning/dust,
-/obj/effect/spawner/lootdrop/whiteship_cere_ripley,
+/obj/effect/spawner/lootdrop/ripley,
 /turf/open/floor/plasteel/mono/dark,
 /area/ruin/rockplanet/shippingdockwarehouse)
 "sc" = (

diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm
@@ -1156,10 +1156,7 @@
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ruin/whitesands/pubbycrash/engine_room)
 "Ak" = (
-/obj/item/reagent_containers/food/drinks/britcup{
-	pixel_x = 9;
-	pixel_y = -3
-	},
+/obj/item/reagent_containers/food/drinks/mug,
 /obj/item/trash/pistachios{
 	pixel_y = 5
 	},

diff --git a/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm b/_maps/RandomRuins/SpaceRuins/singularity_lab.dmm
@@ -3821,7 +3821,7 @@
 	pixel_x = 5;
 	pixel_y = -5
 	},
-/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{
+/obj/item/reagent_containers/food/drinks/soda_cans/tadrixx{
 	pixel_x = -4;
 	pixel_y = 2
 	},
@@ -4180,7 +4180,7 @@
 /area/ruin/space/has_grav/singularitylab/civvie)
 "qt" = (
 /obj/structure/table,
-/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind{
+/obj/item/reagent_containers/food/drinks/soda_cans/comet_trail{
 	pixel_x = -6
 	},
 /obj/item/radio/intercom/directional/east,
@@ -13228,7 +13228,7 @@
 	default_raw_text = "Whatever happens. Happens."
 	},
 /obj/item/pen,
-/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
+/obj/item/reagent_containers/food/drinks/soda_cans/lunapunch{
 	pixel_x = 10;
 	pixel_y = 4
 	},

diff --git a/_maps/RandomRuins/SpaceRuins/spacemall.dmm b/_maps/RandomRuins/SpaceRuins/spacemall.dmm
@@ -5554,11 +5554,11 @@
 /obj/item/reagent_containers/food/drinks/soda_cans/cola{
 	pixel_x = 5
 	},
-/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
+/obj/item/reagent_containers/food/drinks/soda_cans/lunapunch{
 	pixel_x = -5
 	},
-/obj/item/reagent_containers/food/drinks/soda_cans/starkist,
-/obj/item/reagent_containers/food/drinks/soda_cans/starkist{
+/obj/item/reagent_containers/food/drinks/soda_cans/lunapunch,
+/obj/item/reagent_containers/food/drinks/soda_cans/lunapunch{
 	pixel_x = 5
 	},
 /obj/item/storage/box/drinkingglasses,
@@ -9901,12 +9901,12 @@
 "Lx" = (
 /obj/structure/rack,
 /obj/effect/turf_decal/corner/opaque/blue/half,
-/obj/item/clothing/accessory/talisman,
-/obj/item/clothing/accessory/wolftalisman,
-/obj/item/clothing/accessory/talisman,
-/obj/item/clothing/accessory/talisman,
-/obj/item/clothing/accessory/wolftalisman,
-/obj/item/clothing/accessory/wolftalisman,
+/obj/item/clothing/accessory/bonearmlet,
+/obj/item/clothing/neck/fangnecklace,
+/obj/item/clothing/accessory/bonearmlet,
+/obj/item/clothing/accessory/bonearmlet,
+/obj/item/clothing/neck/fangnecklace,
+/obj/item/clothing/neck/fangnecklace,
 /obj/item/clothing/accessory/skilt,
 /obj/item/clothing/accessory/skilt,
 /obj/item/clothing/accessory/skilt,

diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_lab.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_lab.dmm
@@ -95,7 +95,7 @@
 /area/ruin/powered)
 "fq" = (
 /obj/structure/table,
-/obj/item/ammo_box/c45_speedloader,
+/obj/item/ammo_box/a44roum_speedloader,
 /turf/open/floor/plasteel/mono/white,
 /area/ruin/powered)
 "fJ" = (

diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_pandora.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_pandora.dmm
@@ -271,7 +271,7 @@
 /turf/open/floor/mineral/titanium/white,
 /area/ruin/wasteplanet)
 "kV" = (
-/obj/structure/guncase,
+/obj/structure/guncloset,
 /turf/open/floor/mineral/titanium/white,
 /area/ruin/wasteplanet)
 "kZ" = (
@@ -797,7 +797,7 @@
 /turf/open/floor/wood/waste,
 /area/ruin/wasteplanet)
 "Fn" = (
-/obj/item/gun/ballistic/automatic/smg/proto{
+/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto{
 	pixel_y = -18
 	},
 /obj/item/ammo_casing/spent{

diff --git a/_maps/configs/srm_elder.json b/_maps/configs/srm_elder.json
@@ -22,17 +22,30 @@
 			"officer": true,
 			"slots": 1
 		},
+		"Hunter Colligne": {
+			"outfit": "/datum/outfit/job/roumain/hop",
+			"officer": true,
+			"slots": 1
+		},
 		"Hunter Doctor": {
 			"outfit": "/datum/outfit/job/roumain/doctor",
 			"slots": 1
 		},
+		"Machinist": {
+			"outfit": "/datum/outfit/job/roumain/engineer",
+			"slots": 1
+		},
 		"Hunter": {
 			"outfit": "/datum/outfit/job/roumain/security",
 			"slots": 3
 		},
+		"Flamebearer": {
+			"outfit": "/datum/outfit/job/roumain/flamebearer",
+			"slots": 1
+		},
 		"Shadow": {
 			"outfit": "/datum/outfit/job/roumain/assistant",
-			"slots": 3
+			"slots": 2
 		}
 	},
 	"enabled": true

diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
@@ -4179,7 +4179,7 @@
 "aNr" = (
 /obj/structure/table/reinforced,
 /obj/machinery/door/firedoor,
-/obj/item/reagent_containers/food/drinks/britcup,
+/obj/item/reagent_containers/food/drinks/mug,
 /obj/structure/window/reinforced{
 	dir = 8
 	},
@@ -4527,7 +4527,7 @@
 /obj/item/reagent_containers/food/condiment/peppermill{
 	pixel_x = -8
 	},
-/obj/item/reagent_containers/food/drinks/britcup,
+/obj/item/reagent_containers/food/drinks/mug,
 /obj/effect/turf_decal/industrial/outline/yellow,
 /turf/open/floor/plasteel,
 /area/tdome/tdomeobserve)