Merge branch 'shiptest-ss13:master' into abandoned_garden

shiptest-ss13 · Sep 13, 2024 · 128ee22 · 128ee22
2 parents 1fad015 + b4222cf
commit 128ee22
Show file tree

Hide file tree

Showing 292 changed files with 4,947 additions and 9,692 deletions.
diff --git a/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm b/_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm
@@ -193,7 +193,7 @@
 	pixel_x = 6;
 	pixel_y = -6
 	},
-/obj/item/gun/ballistic/automatic/pistol/syndicate/no_mag{
+/obj/item/gun/ballistic/automatic/pistol/ringneck/no_mag{
 	name = "bible gun";
 	pixel_x = -7;
 	pixel_y = -8;
@@ -3198,8 +3198,8 @@
 /obj/structure/closet/wardrobe/chaplain_black{
 	populate = 0
 	},
-/obj/item/ammo_box/magazine/m10mm,
-/obj/item/ammo_box/magazine/m10mm,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
 /obj/structure/spacevine{
 	name = "vines"
 	},

diff --git a/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm b/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm
@@ -5613,9 +5613,9 @@
 /obj/structure/closet,
 /obj/item/clothing/suit/armor/ngr/captain,
 /obj/item/clothing/under/syndicate/ngr/officer,
-/obj/item/gun/ballistic/automatic/pistol/syndicate,
-/obj/item/ammo_box/magazine/m10mm,
-/obj/item/ammo_box/magazine/m10mm,
+/obj/item/gun/ballistic/automatic/pistol/ringneck,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
 /turf/open/floor/wood{
 	icon_state = "wood-broken2"
 	},
@@ -5787,9 +5787,9 @@
 /area/overmap_encounter/planetoid/jungle/explored)
 "Nh" = (
 /obj/structure/filingcabinet,
-/obj/item/gun/ballistic/automatic/pistol/syndicate,
-/obj/item/ammo_box/magazine/m10mm,
-/obj/item/ammo_box/magazine/m10mm,
+/obj/item/gun/ballistic/automatic/pistol/ringneck,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/jungle/starport/tower)
 "Nj" = (

diff --git a/_maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm b/_maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm
@@ -3173,7 +3173,7 @@
 /obj/structure/closet/cabinet,
 /obj/item/hatchet/wooden,
 /obj/item/ammo_box/a357,
-/obj/item/gun/ballistic/revolver/syndicate,
+/obj/item/gun/ballistic/revolver/viper,
 /turf/open/floor/wood,
 /area/ship/bridge)
 "VM" = (

diff --git a/_maps/RandomRuins/JungleRuins/jungle_syndicate.dmm b/_maps/RandomRuins/JungleRuins/jungle_syndicate.dmm
@@ -1108,7 +1108,7 @@
 "Il" = (
 /obj/effect/decal/cleanable/cobweb,
 /obj/structure/rack,
-/obj/item/gun/ballistic/automatic/pistol/syndicate,
+/obj/item/gun/ballistic/automatic/pistol/ringneck,
 /turf/open/floor/plating,
 /area/ruin/jungle/syndifort)
 "Iv" = (
@@ -1220,8 +1220,8 @@
 /obj/structure/rack,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/light/small/directional/south,
-/obj/item/ammo_box/magazine/m10mm,
-/obj/item/ammo_box/magazine/m10mm,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
 /turf/open/floor/plating,
 /area/ruin/jungle/syndifort)
 "My" = (
@@ -1593,9 +1593,9 @@
 /area/ruin/jungle/syndifort)
 "WG" = (
 /obj/structure/closet/crate/secure/weapon,
-/obj/item/gun/ballistic/automatic/smg/c20r,
-/obj/item/ammo_box/magazine/smgm45,
-/obj/item/ammo_box/magazine/smgm45,
+/obj/item/gun/ballistic/automatic/smg/cobra,
+/obj/item/ammo_box/magazine/m45_cobra,
+/obj/item/ammo_box/magazine/m45_cobra,
 /turf/open/floor/plating,
 /area/ruin/jungle/syndifort/jerry)
 "WT" = (

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm b/_maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm
@@ -1115,10 +1115,10 @@
 /turf/open/floor/plating,
 /area/ruin/unpowered/listening_post)
 "te" = (
-/obj/item/gun/ballistic/automatic/smg/c20r{
+/obj/item/gun/ballistic/automatic/smg/cobra{
 	spawnwithmagazine = 0
 	},
-/obj/item/ammo_box/magazine/smgm45{
+/obj/item/ammo_box/magazine/m45_cobra{
 	start_empty = 1
 	},
 /obj/structure/guncloset,
@@ -2345,8 +2345,8 @@
 /area/ruin/unpowered/listening_post)
 "TM" = (
 /obj/structure/closet/cabinet,
-/obj/item/ammo_box/magazine/m10mm,
-/obj/item/gun/ballistic/automatic/pistol/syndicate,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
+/obj/item/gun/ballistic/automatic/pistol/ringneck,
 /obj/effect/turf_decal/siding/wood{
 	dir = 6
 	},

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm
@@ -4360,7 +4360,7 @@
 /area/ruin/lavaland/factory/adminstrative)
 "RC" = (
 /obj/effect/turf_decal/siding/white,
-/obj/item/ammo_box/magazine/m10mm{
+/obj/item/ammo_box/magazine/m10mm_ringneck{
 	start_empty = 1
 	},
 /obj/item/ammo_casing/c10mm{
@@ -5013,7 +5013,7 @@
 /obj/effect/mob_spawn/human/corpse/syndicatesoldier,
 /obj/effect/decal/cleanable/blood/old,
 /obj/effect/turf_decal/siding/white,
-/obj/item/ammo_box/magazine/m10mm{
+/obj/item/ammo_box/magazine/m10mm_ringneck{
 	start_empty = 1
 	},
 /turf/open/floor/concrete/pavement/lava,

diff --git a/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm b/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm
@@ -587,12 +587,12 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/item/ammo_box/magazine/pistolm9mm{
+/obj/item/ammo_box/magazine/m9mm_rattlesnake{
 	pixel_y = 6;
 	pixel_x = 12;
 	layer = 3.1
 	},
-/obj/item/ammo_box/magazine/pistolm9mm{
+/obj/item/ammo_box/magazine/m9mm_rattlesnake{
 	pixel_y = 6;
 	pixel_x = 6;
 	start_empty = 1;

diff --git a/_maps/RandomRuins/RockRuins/rockplanet_harmfactory.dmm b/_maps/RandomRuins/RockRuins/rockplanet_harmfactory.dmm
@@ -250,21 +250,6 @@
 	},
 /turf/open/floor/plating,
 /area/ruin/powered)
-"ga" = (
-/obj/structure/table/wood/reinforced,
-/obj/item/gun/ballistic/automatic/smg/c20r/toy/riot{
-	pixel_x = 5;
-	pixel_y = 7
-	},
-/obj/item/ammo_box/foambox/riot{
-	pixel_x = -3;
-	pixel_y = -3
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel/grimy,
-/area/ruin/powered)
 "gp" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/cable{
@@ -1871,6 +1856,21 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plating/rust,
 /area/ruin/powered)
+"RC" = (
+/obj/structure/table/wood/reinforced,
+/obj/item/gun/ballistic/automatic/toy{
+	pixel_x = 5;
+	pixel_y = 7
+	},
+/obj/item/ammo_box/foambox/riot{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/grimy,
+/area/ruin/powered)
 "RM" = (
 /obj/effect/spawner/structure/window/hollow/reinforced,
 /turf/open/floor/plating,
@@ -2968,7 +2968,7 @@ RU
 bO
 cv
 oc
-ga
+RC
 Tl
 ko
 kU
@@ -3367,7 +3367,7 @@ of
 IA
 ro
 ro
-hJ
+bf
 Ew
 LT
 hi
@@ -3446,7 +3446,7 @@ je
 kC
 nq
 qm
-hJ
+bf
 tw
 tC
 vK

diff --git a/_maps/RandomRuins/RockRuins/rockplanet_shippingdock.dmm b/_maps/RandomRuins/RockRuins/rockplanet_shippingdock.dmm
@@ -2000,9 +2000,9 @@
 /obj/structure/closet/crate/secure/gear{
 	req_one_access_txt = "53"
 	},
-/obj/item/ammo_box/magazine/tec9,
-/obj/item/ammo_box/magazine/tec9,
-/obj/item/gun/ballistic/automatic/pistol/tec9,
+/obj/item/ammo_box/magazine/m9mm_rattlesnake,
+/obj/item/ammo_box/magazine/m9mm_rattlesnake,
+/obj/item/storage/pistolcase/ringneck,
 /turf/open/floor/plasteel/mono/dark,
 /area/ruin/rockplanet/shippingdocksecure)
 "rK" = (

diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_camp_saloon.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_camp_saloon.dmm
@@ -243,7 +243,7 @@
 	},
 /obj/effect/turf_decal/siding/wood,
 /obj/structure/chair/stool/bar,
-/mob/living/simple_animal/hostile/human/hermit/survivor,
+/mob/living/simple_animal/hostile/human/hermit/ranged/gunslinger,
 /turf/open/floor/wood,
 /area/ruin/whitesands/saloon)
 "gC" = (
@@ -445,7 +445,6 @@
 "lI" = (
 /obj/structure/table/wood/poker,
 /obj/effect/spawner/lootdrop/gambling,
-/obj/item/spacecash/bundle/loadsamoney,
 /turf/open/floor/carpet,
 /area/ruin/whitesands/saloon)
 "lV" = (
@@ -890,6 +889,9 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
+/mob/living/simple_animal/hostile/human/hermit/survivor{
+	dir = 4
+	},
 /turf/open/floor/wood{
 	icon_state = "wood-broken5"
 	},
@@ -1029,7 +1031,8 @@
 	icon_state = "pulse_carbine";
 	name = "pulse rifle";
 	desc = "A supposedly heavy-duty, multifaceted energy rifle. The barrel looks off and the casing seems to be made of plastic";
-	item_state = "pulse"
+	item_state = "pulse";
+	icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/48x32.dmi'
 	},
 /turf/open/floor/wood,
 /area/ruin/whitesands/saloon)
@@ -1114,7 +1117,7 @@
 /obj/structure/chair/stool/bar{
 	dir = 8
 	},
-/mob/living/simple_animal/hostile/human/hermit/survivor{
+/mob/living/simple_animal/hostile/human/hermit/ranged/gunslinger{
 	dir = 8
 	},
 /turf/open/floor/wood,
@@ -1497,7 +1500,7 @@
 /area/ruin/whitesands/saloon)
 "Ua" = (
 /obj/structure/chair/stool/bar,
-/mob/living/simple_animal/hostile/human/hermit/survivor{
+/mob/living/simple_animal/hostile/human/hermit/ranged/gunslinger{
 	dir = 8
 	},
 /turf/open/floor/wood{
@@ -1672,6 +1675,7 @@
 	pixel_y = 6;
 	pixel_x = 3
 	},
+/obj/item/spacecash/bundle/loadsamoney,
 /turf/open/floor/carpet,
 /area/ruin/whitesands/saloon)
 "ZG" = (

diff --git a/_maps/RandomRuins/SpaceRuins/corporate_mining.dmm b/_maps/RandomRuins/SpaceRuins/corporate_mining.dmm
@@ -601,8 +601,8 @@
 /area/ruin/space/has_grav/corporatemine/crewquarters)
 "nN" = (
 /obj/structure/closet/cabinet,
-/obj/item/gun/ballistic/automatic/pistol/syndicate,
-/obj/item/ammo_box/magazine/m10mm,
+/obj/item/gun/ballistic/automatic/pistol/ringneck,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
 /obj/item/clothing/under/syndicate/donk,
 /obj/item/clothing/suit/hazardvest/donk/qm,
 /obj/item/reagent_containers/food/snacks/donkpocket,
@@ -2035,10 +2035,6 @@
 /obj/effect/decal/cleanable/blood/drip,
 /turf/open/floor/plating/asteroid/airless,
 /area/ruin/space)
-"TO" = (
-/obj/structure/spawner/burrow/asteroid,
-/turf/open/floor/plating/asteroid/airless,
-/area/ruin/space)
 "TR" = (
 /obj/effect/decal/cleanable/blood/tracks{
 	dir = 8
@@ -2803,7 +2799,7 @@ Al
 Al
 Al
 VM
-TO
+Iv
 Al
 Al
 Al

diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_lab.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_lab.dmm
@@ -754,7 +754,7 @@
 	dir = 8
 	},
 /obj/item/paper,
-/obj/item/ammo_box/magazine/m10mm,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/dark,
 /area/ruin/powered)

diff --git a/_maps/configs/independent_beluga.json b/_maps/configs/independent_beluga.json
@@ -1,8 +1,12 @@
 {
 	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
 	"map_name": "Beluga-class Transport",
+	"faction": "/datum/faction/independent",
 	"prefix": "SV",
-	"namelists": ["CRUISE", "NATURAL"],
+	"namelists": [
+		"CRUISE",
+		"NATURAL"
+	],
 	"map_short_name": "Beluga-class",
 	"map_path": "_maps/shuttles/independent/independent_beluga.dmm",
 	"description": "The Beluga-Class is a transport vessel for those with especially rich blood. Featuring a modest kitchen, hired Inteq security, and luxurious decoration, the Beluga is a first choice pick for many wealthy spacers trying to get from point A to B. The independent ship features several rooms for its guests and a well furnished meeting room for any corporate occassion.",

diff --git a/_maps/configs/independent_box.json b/_maps/configs/independent_box.json
@@ -12,6 +12,7 @@
 		"SPACE",
 		"NATURAL"
 	],
+	"faction": "/datum/faction/independent",
 	"prefix": "IMV",
 	"job_slots": {
 		"Chief Medical Officer": {

diff --git a/_maps/configs/independent_bubble.json b/_maps/configs/independent_bubble.json
@@ -12,6 +12,7 @@
 		"GENERAL",
 		"SPACE"
 	],
+	"faction": "/datum/faction/independent",
 	"prefix": "ISV",
 	"limit": 1,
 	"job_slots": {

diff --git a/_maps/configs/independent_dwayne.json b/_maps/configs/independent_dwayne.json
@@ -1,6 +1,7 @@
 {
 	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
 	"map_name": "Mark.II Dwayne-class Long Range Mining Transport",
+	"faction": "/datum/faction/independent",
 	"prefix": "SV",
 	"namelists": [
 		"GENERAL",

diff --git a/_maps/configs/independent_junker.json b/_maps/configs/independent_junker.json
@@ -1,6 +1,7 @@
 {
 	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
 	"map_name": "Junker-class Salvaged Ship",
+	"faction": "/datum/faction/independent",
 	"prefix": "SV",
 	"namelists": [
 		"GENERAL",

diff --git a/_maps/configs/independent_kilo.json b/_maps/configs/independent_kilo.json
@@ -5,6 +5,7 @@
 	"tags": [
 		"Mining"
 	],
+	"faction": "/datum/faction/independent",
 	"prefix": "SV",
 	"namelists": [
 		"GENERAL",

diff --git a/_maps/configs/independent_lagoon.json b/_maps/configs/independent_lagoon.json
@@ -1,6 +1,7 @@
 {
 	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
 	"map_name": "Lagoon-class Cruise Ship",
+	"faction": "/datum/faction/independent",
 	"prefix": "SV",
 	"description": "An unusual sight in the relatively impoverished Frontier, the Lagoon-class is a large pleasure vessel dedicated to transporting its passengers to any number of exotic locales. Lagoons found on the Frontier tend to contain crews and passengers of a particularly daring – or foolhardy – character, willing to pay out the nose for a tour of some of the most dangerous regions in known space. Accordingly, Lagoons in these regions typically include a small but respectably equipped security contingent to protect (and, when necessary, rein in) the passengers, and come with a surprisingly powerful thermo-electric generator to move the ship’s prodigious bulk across vast expanses of space.",
 	"tags": [