Merge branch 'shiptest-ss13:master' into master

MemeSnorfer · Feb 6, 2024 · dccc823 · dccc823
2 parents 05b681e + 84c6786
commit dccc823
Show file tree

Hide file tree

Showing 390 changed files with 15,341 additions and 4,900 deletions.
diff --git a/_maps/RandomRuins/BeachRuins/beach_colony.dmm b/_maps/RandomRuins/BeachRuins/beach_colony.dmm
@@ -383,7 +383,7 @@
 	},
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "NG" = (
-/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag{
+/obj/item/gun/ballistic/automatic/pistol/candor/no_mag{
 	pixel_x = 13
 	},
 /obj/item/toy/plush/carpplushie{

diff --git a/_maps/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm b/_maps/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm
@@ -3374,7 +3374,7 @@
 /obj/structure/cable/orange{
 	icon_state = "2-10"
 	},
-/obj/item/gun/ballistic/shotgun/lethal,
+/obj/item/gun/ballistic/shotgun/brimstone,
 /obj/structure/spacevine,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/beach/starwalker)

diff --git a/_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm b/_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm
@@ -297,7 +297,7 @@
 "mD" = (
 /obj/structure/table/wood,
 /obj/machinery/light/small/directional/north,
-/obj/item/gun/ballistic/shotgun/winchester,
+/obj/item/gun/ballistic/shotgun/flamingarrow,
 /turf/open/floor/wood,
 /area/ruin/beach)
 "mE" = (

diff --git a/_maps/RandomRuins/IceRuins/icemoon_hydroponics_lab.dmm b/_maps/RandomRuins/IceRuins/icemoon_hydroponics_lab.dmm
@@ -870,7 +870,7 @@
 /turf/open/floor/plasteel/tech,
 /area/ruin/powered/hydroponicslab)
 "oo" = (
-/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag{
+/obj/item/gun/ballistic/automatic/pistol/candor/no_mag{
 	pixel_x = 2;
 	pixel_y = -3
 	},
@@ -1794,7 +1794,7 @@
 /area/ruin/powered/hydroponicslab)
 "Mz" = (
 /obj/effect/decal/cleanable/blood,
-/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag,
+/obj/item/gun/ballistic/automatic/pistol/candor/no_mag,
 /obj/effect/turf_decal/techfloor{
 	dir = 4
 	},

diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm
@@ -6,7 +6,7 @@
 /turf/open/floor/plating/snowed/smoothed/icemoon,
 /area/ruin)
 "ac" = (
-/obj/effect/mob_spawn/human/engineer/rig,
+/obj/effect/mob_spawn/human/engineer,
 /turf/open/floor/plating/snowed/smoothed/icemoon,
 /area/overmap_encounter/planetoid/ice/explored)
 "ad" = (
@@ -1199,7 +1199,7 @@
 /turf/open/floor/plating/ice/icemoon,
 /area/overmap_encounter/planetoid/ice/explored)
 "cU" = (
-/obj/effect/mob_spawn/human/engineer/rig,
+/obj/effect/mob_spawn/human/engineer,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},

diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_drakelair.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_drakelair.dmm
@@ -127,7 +127,8 @@
 "iT" = (
 /obj/structure/stone_tile/slab,
 /mob/living/simple_animal/hostile/megafauna/dragon/icemoon{
-	loot = list(/obj/structure/closet/crate/necropolis/dragon,/obj/item/keycard/gatedrop/drakelair)
+	loot = list(/obj/structure/closet/crate/necropolis/dragon,/obj/item/keycard/gatedrop/drakelair);
+	crusher_loot = list(/obj/structure/closet/crate/necropolis/dragon/crusher,/obj/item/keycard/gatedrop/drakelair)
 	},
 /turf/open/indestructible/boss,
 /area/ruin)

diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_hermit.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_hermit.dmm
@@ -56,7 +56,7 @@
 /turf/open/floor/wood,
 /area/ruin/powered)
 "sC" = (
-/obj/item/gun/ballistic/rifle/boltaction,
+/obj/item/gun/ballistic/rifle/illestren,
 /obj/structure/table/wood,
 /obj/item/flashlight/lantern,
 /turf/open/floor/wood,

diff --git a/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm b/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm
@@ -1564,7 +1564,7 @@
 /obj/effect/mob_spawn/human/corpse/assistant{
 	oxy_damage = 200;
 	name = "Dungeon Master";
-	outfit = /datum/outfit/job/curator/dungeonmaster;
+	outfit = /datum/outfit/job/curator;
 	backpack_contents = null
 	},
 /obj/effect/decal/cleanable/blood,

diff --git a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
@@ -1379,7 +1379,7 @@
 /obj/item/gun/ballistic/shotgun/automatic/combat{
 	pixel_y = 5
 	},
-/obj/item/gun/ballistic/revolver/nagant{
+/obj/item/gun/ballistic/revolver/ashhand{
 	pixel_y = -1
 	},
 /turf/open/floor/plasteel/tech,
@@ -1760,13 +1760,12 @@
 	pixel_x = -3;
 	pixel_y = -5
 	},
-/obj/item/ammo_box/n762_clip,
-/obj/item/ammo_box/n762,
+/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/n762,
-/obj/item/ammo_box/n762_clip,
+/obj/item/ammo_box/magazine/illestren_a850r,
+/obj/item/ammo_box/magazine/illestren_a850r,
 /turf/open/floor/plasteel/tech,
 /area/ruin/jungle/cavecrew/security)
 "vr" = (
@@ -3119,7 +3118,7 @@
 /obj/structure/table/reinforced{
 	color = "#c1b6a5"
 	},
-/obj/machinery/fax/frontiersmen,
+/obj/machinery/fax/ruin,
 /turf/open/floor/plasteel/tech,
 /area/ruin/jungle/cavecrew/bridge)
 "Ls" = (

diff --git a/_maps/RandomRuins/JungleRuins/jungle_demon.dmm b/_maps/RandomRuins/JungleRuins/jungle_demon.dmm
@@ -515,7 +515,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/suit_storage_unit/inherit,
 /obj/item/tank/internals/oxygen/red,
-/obj/item/clothing/suit/space/hardsuit/syndi,
+/obj/item/clothing/suit/space/hardsuit/syndi/ramzi,
 /obj/item/clothing/mask/gas/syndicate,
 /turf/open/floor/plasteel/dark,
 /area/ruin/powered)

diff --git a/_maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm b/_maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm
@@ -745,7 +745,7 @@
 /obj/effect/mob_spawn/human/corpse/assistant{
 	outfit = /datum/outfit/job/chemist
 	},
-/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag{
+/obj/item/gun/ballistic/automatic/pistol/candor/no_mag{
 	pixel_y = -13
 	},
 /turf/open/floor/plating/dirt/jungle/wasteland/lit,

diff --git a/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm b/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm
@@ -6481,7 +6481,7 @@
 /turf/open/water/jungle,
 /area/overmap_encounter/planetoid/cave/explored)
 "Pe" = (
-/obj/effect/mob_spawn/human/miner/old,
+/obj/effect/mob_spawn/human/miner,
 /obj/effect/decal/cleanable/vomit/old{
 	pixel_x = 13;
 	pixel_y = 6

diff --git a/_maps/RandomRuins/JungleRuins/jungle_pirate.dmm b/_maps/RandomRuins/JungleRuins/jungle_pirate.dmm
@@ -265,7 +265,7 @@
 /turf/open/floor/wood,
 /area/ruin/unpowered)
 "LD" = (
-/obj/item/ammo_box/n762,
+/obj/item/ammo_box/c45_speedloader,
 /obj/structure/table/wood/poker,
 /turf/open/floor/wood,
 /area/ruin/unpowered)
@@ -313,9 +313,9 @@
 /area/ruin/unpowered)
 "Sk" = (
 /obj/structure/safe,
-/obj/item/gun/ballistic/shotgun/lethal,
-/obj/item/gun/ballistic/shotgun/lethal,
-/obj/item/gun/ballistic/shotgun/lethal,
+/obj/item/gun/ballistic/shotgun/brimstone,
+/obj/item/gun/ballistic/shotgun/brimstone,
+/obj/item/gun/ballistic/shotgun/brimstone,
 /obj/item/gun/grenadelauncher,
 /turf/open/floor/wood,
 /area/ruin/unpowered)

diff --git a/_maps/RandomRuins/JungleRuins/jungle_syndicate.dmm b/_maps/RandomRuins/JungleRuins/jungle_syndicate.dmm
@@ -1330,7 +1330,7 @@
 "OW" = (
 /obj/structure/table/reinforced,
 /obj/item/trash/syndi_cakes,
-/obj/machinery/fax,
+/obj/machinery/fax/ruin,
 /turf/open/floor/plating,
 /area/ruin/jungle/syndifort/jerry)
 "Ph" = (

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_fuckedupandevilclub.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_fuckedupandevilclub.dmm
@@ -562,7 +562,7 @@
 /obj/structure/table/reinforced,
 /obj/item/ammo_casing/shotgun/incendiary,
 /obj/item/ammo_casing/shotgun/dragonsbreath,
-/obj/item/gun/ballistic/shotgun/lethal,
+/obj/item/gun/ballistic/shotgun/brimstone,
 /turf/open/floor/plasteel/cult,
 /area/ruin/unpowered)
 "OF" = (

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm
@@ -78,7 +78,7 @@
 /turf/open/floor/pod/dark,
 /area/ruin/powered)
 "q" = (
-/obj/effect/mob_spawn/human/miner/explorer{
+/obj/effect/mob_spawn/human/miner{
 	brute_damage = 150;
 	oxy_damage = 50
 	},

diff --git a/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm b/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm
@@ -2130,7 +2130,7 @@
 	pixel_x = 5;
 	pixel_y = -9
 	},
-/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag,
+/obj/item/gun/ballistic/automatic/pistol/candor/no_mag,
 /obj/machinery/door/firedoor,
 /turf/open/floor/plasteel,
 /area/ruin/powered)

diff --git a/_maps/RandomRuins/RockRuins/rockplanet_house.dmm b/_maps/RandomRuins/RockRuins/rockplanet_house.dmm
@@ -11,7 +11,7 @@
 /area/ruin/unpowered)
 "h" = (
 /obj/structure/table/wood,
-/obj/item/gun/ballistic/automatic/pistol/m1911,
+/obj/item/gun/ballistic/automatic/pistol/candor,
 /obj/item/ammo_box/magazine/m45,
 /obj/effect/gibspawner/human/bodypartless,
 /obj/item/ammo_box/magazine/m45,

diff --git a/_maps/RandomRuins/RockRuins/rockplanet_miningexpedition.dmm b/_maps/RandomRuins/RockRuins/rockplanet_miningexpedition.dmm
@@ -41,6 +41,12 @@
 /obj/structure/sign/poster/contraband/tools,
 /turf/closed/wall/r_wall/rust,
 /area/ruin/unpowered)
+"js" = (
+/obj/item/chair,
+/obj/effect/decal/cleanable/blood,
+/obj/item/gun/ballistic/automatic/pistol/candor,
+/turf/open/floor/plasteel/grimy,
+/area/ruin/unpowered)
 "lg" = (
 /obj/structure/table,
 /obj/machinery/microwave,
@@ -162,6 +168,12 @@
 /obj/machinery/vending/mining_equipment,
 /turf/open/floor/plasteel/mono,
 /area/ruin/unpowered)
+"Cy" = (
+/obj/effect/decal/cleanable/blood,
+/obj/effect/mob_spawn/human/miner,
+/obj/item/pickaxe,
+/turf/open/floor/plating/asteroid/rockplanet/lit,
+/area/overmap_encounter/planetoid/rockplanet/explored)
 "CL" = (
 /obj/structure/sign/poster/random,
 /turf/closed/wall/r_wall/rust,
@@ -262,12 +274,6 @@
 	},
 /turf/open/floor/plasteel/rockvault,
 /area/ruin/unpowered)
-"Qo" = (
-/obj/effect/decal/cleanable/blood,
-/obj/effect/mob_spawn/human/miner/explorer,
-/obj/item/pickaxe,
-/turf/open/floor/plating/asteroid/rockplanet/lit,
-/area/overmap_encounter/planetoid/rockplanet/explored)
 "Qr" = (
 /obj/effect/turf_decal/rechargefloor,
 /obj/structure/mecha_wreckage/ripley,
@@ -293,12 +299,6 @@
 /obj/machinery/light/broken/directional/east,
 /turf/open/floor/plasteel/grimy,
 /area/ruin/unpowered)
-"TI" = (
-/obj/item/chair,
-/obj/effect/decal/cleanable/blood,
-/obj/item/gun/ballistic/automatic/pistol/m1911,
-/turf/open/floor/plasteel/grimy,
-/area/ruin/unpowered)
 "Uu" = (
 /obj/machinery/light/broken/directional/north,
 /obj/effect/decal/cleanable/oil,
@@ -448,7 +448,7 @@ tN
 (5,1,1) = {"
 yZ
 yZ
-Qo
+Cy
 yZ
 Vw
 YN
@@ -523,7 +523,7 @@ yZ
 tN
 yZ
 Vw
-TI
+js
 Wz
 Vw
 yZ

diff --git a/_maps/RandomRuins/RockRuins/rockplanet_nomadcrash.dmm b/_maps/RandomRuins/RockRuins/rockplanet_nomadcrash.dmm
@@ -1128,7 +1128,7 @@
 /obj/item/ammo_box/magazine/m45{
 	pixel_x = 7
 	},
-/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag,
+/obj/item/gun/ballistic/automatic/pistol/candor/no_mag,
 /turf/open/floor/plating/ashplanet/rocky,
 /area/ruin/rockplanet/nanotrasen)
 "HG" = (

diff --git a/_maps/RandomRuins/RockRuins/rockplanet_saloon.dmm b/_maps/RandomRuins/RockRuins/rockplanet_saloon.dmm
@@ -477,7 +477,7 @@
 	pixel_x = 4;
 	pixel_y = 6
 	},
-/obj/item/gun/ballistic/shotgun/riot{
+/obj/item/gun/ballistic/shotgun/hellfire{
 	pixel_x = -10;
 	pixel_y = 2
 	},

diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm
@@ -744,7 +744,7 @@
 /area/ruin)
 "Df" = (
 /obj/structure/table,
-/obj/item/gun/ballistic/rifle/boltaction/polymer,
+/obj/item/gun/ballistic/rifle/polymer,
 /turf/open/floor/concrete,
 /area/ruin)
 "Di" = (
@@ -882,7 +882,7 @@
 "Hn" = (
 /obj/structure/closet/secure_closet/hydroponics,
 /obj/item/circuitboard/machine/plantgenes,
-/obj/item/gun/ballistic/rifle/boltaction/polymer,
+/obj/item/gun/ballistic/rifle/polymer,
 /turf/open/floor/wood,
 /area/ruin)
 "HP" = (
@@ -923,7 +923,7 @@
 /area/overmap_encounter/planetoid/sand/explored)
 "Ig" = (
 /obj/structure/table,
-/obj/item/gun/ballistic/automatic/pistol/m1911,
+/obj/item/gun/ballistic/automatic/pistol/candor,
 /turf/open/floor/concrete,
 /area/ruin)
 "Io" = (

diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_camp_saloon.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_camp_saloon.dmm
@@ -1342,7 +1342,7 @@
 /area/ruin/whitesands/saloon)
 "Oc" = (
 /obj/structure/closet/cabinet,
-/obj/item/gun/ballistic/shotgun/riot,
+/obj/item/gun/ballistic/shotgun/hellfire,
 /obj/item/storage/box/rubbershot{
 	pixel_x = -5;
 	pixel_y = 5

diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_starfurycrash.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_starfurycrash.dmm
@@ -637,7 +637,7 @@
 /area/overmap_encounter/planetoid/cave/explored)
 "KT" = (
 /obj/structure/safe/floor,
-/obj/item/clothing/suit/space/hardsuit/syndi,
+/obj/item/clothing/suit/space/hardsuit/syndi/ramzi,
 /obj/item/documents/syndicate,
 /turf/open/floor/plating{
 	icon_state = "panelscorched";

diff --git a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
@@ -522,7 +522,7 @@
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/derelictoutpost/powerstorage)
 "bI" = (
-/obj/item/gun/ballistic/automatic/pistol/m1911{
+/obj/item/gun/ballistic/automatic/pistol/candor{
 	spawnwithmagazine = 0
 	},
 /turf/open/floor/plasteel,
@@ -1333,7 +1333,7 @@
 	desc = "A thick gelatinous surface covers the floor.  Someone get the golashes.";
 	name = "gelatinous floor"
 	},
-/obj/item/gun/ballistic/automatic/pistol/m1911{
+/obj/item/gun/ballistic/automatic/pistol/candor{
 	spawnwithmagazine = 0
 	},
 /obj/item/ammo_box/magazine/m45,
@@ -1493,7 +1493,7 @@
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/derelictoutpost)
 "dJ" = (
-/obj/item/gun/ballistic/automatic/pistol/m1911{
+/obj/item/gun/ballistic/automatic/pistol/candor{
 	spawnwithmagazine = 0
 	},
 /obj/structure/alien/weeds{