Merge remote-tracking branch 'upstream/master'

Imaginos16 · Jul 7, 2024 · 74fa33a · 74fa33a
2 parents d695fae + 1a37118
commit 74fa33a
Show file tree

Hide file tree

Showing 176 changed files with 11,748 additions and 7,221 deletions.
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/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/no_mag{
+/obj/item/gun/ballistic/automatic/pistol/syndicate/no_mag{
 	name = "bible gun";
 	pixel_x = -7;
 	pixel_y = -8;

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

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/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,
+/obj/item/gun/ballistic/revolver/syndicate,
 /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,
+/obj/item/gun/ballistic/automatic/pistol/syndicate,
 /turf/open/floor/plating,
 /area/ruin/jungle/syndifort)
 "Iv" = (

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/SpaceRuins/corporate_mining.dmm b/_maps/RandomRuins/SpaceRuins/corporate_mining.dmm
@@ -601,7 +601,7 @@
 /area/ruin/space/has_grav/corporatemine/crewquarters)
 "nN" = (
 /obj/structure/closet/cabinet,
-/obj/item/gun/ballistic/automatic/pistol/suppressed,
+/obj/item/gun/ballistic/automatic/pistol/syndicate,
 /obj/item/ammo_box/magazine/m10mm,
 /obj/item/clothing/under/syndicate/donk,
 /obj/item/clothing/suit/hazardvest/donk/qm,

diff --git a/_maps/RandomRuins/SpaceRuins/spacemall.dmm b/_maps/RandomRuins/SpaceRuins/spacemall.dmm
@@ -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_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/syndicate_aegis.json b/_maps/configs/syndicate_aegis.json
diff --git a/_maps/configs/syndicate_panacea.json b/_maps/configs/syndicate_panacea.json
@@ -0,0 +1,64 @@
+{
+	"prefix": "SUNS",
+	"map_name": "Panacea-class Infirm Vessel",
+	"map_short_name": "Panacea-class",
+	"map_path": "_maps/shuttles/syndicate/syndicate_panacea.dmm",
+	"description": "Shortly after Solcon breached the Oort Cloud, SUNS joined into the Syndicate Coalition. Holding close ties to both the ACLF and GEC, students jumped at the opportunity to see the rest of the galaxy. The Panacea-class was the first of its kind out of Sol, moving typically planetside inpatient care to a space vessel and jumping system to system. The Panacea class is a moderately well supplied ship, allowing for emergency pharmaceutical compounding, mental and physical therapy, and general medical work, while doubling as a student run vessel.",
+	"tags": [
+		"Generalist",
+		"Medical",
+		"RP Focus"
+	],
+	"starting_funds": 1000,
+	"map_id": "syndicate_panacea",
+	"limit": 1,
+	"namelists": [
+		"SUNS",
+		"SPACE",
+		"GENERAL"
+	],
+	"job_slots": {
+		"Captain": {
+			"outfit": "/datum/outfit/job/syndicate/captain/suns",
+			"officer": true,
+			"slots": 1
+		},
+
+		"Academic": {
+			"outfit": "/datum/outfit/job/syndicate/head_of_personnel/suns",
+			"officer": true,
+			"slots": 1
+		},
+
+		"Peacekeeper": {
+			"outfit": "/datum/outfit/job/syndicate/security/suns",
+			"slots": 1
+		},
+
+		"Ship Doctor":{
+			"outfit": "/datum/outfit/job/syndicate/doctor/suns",
+			"slots": 2
+		},
+
+		"Mechanic": {
+			"outfit": "/datum/outfit/job/syndicate/engineer/suns",
+			"slots": 2
+		},
+
+		"Ship Psychologist": {
+			"outfit": "/datum/outfit/job/syndicate/psychologist/suns",
+			"slots": 1
+		},
+
+		"Student Mixologist": {
+			"outfit": "/datum/outfit/job/syndicate/bartender/suns",
+			"slots": 1
+		},
+
+		"Long Term Patient": {
+			"outfit": "/datum/outfit/job/syndicate/patient",
+			"slots": 5
+		}
+	},
+	"enabled": true
+}
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
@@ -1084,11 +1084,11 @@
 /area/centcom/control)
 "apm" = (
 /obj/structure/rack,
-/obj/item/gun/ballistic/automatic/gal/inteq{
+/obj/item/gun/ballistic/automatic/marksman/gal/inteq{
 	pixel_x = 1;
 	pixel_y = 4
 	},
-/obj/item/gun/ballistic/automatic/gal/inteq{
+/obj/item/gun/ballistic/automatic/marksman/gal/inteq{
 	pixel_x = -4;
 	pixel_y = -2
 	},

diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm
@@ -2089,7 +2089,7 @@
 /obj/effect/turf_decal/corner/opaque/yellow/three_quarters{
 	dir = 4
 	},
-/obj/structure/guncase/shotgun,
+/obj/structure/guncloset/shotgun,
 /obj/item/gun/ballistic/shotgun/flamingarrow,
 /obj/item/gun/ballistic/shotgun/flamingarrow,
 /obj/item/gun/ballistic/shotgun/flamingarrow,

diff --git a/_maps/shuttles/inteq/inteq_colossus.dmm b/_maps/shuttles/inteq/inteq_colossus.dmm
@@ -3429,7 +3429,7 @@
 /obj/item/ammo_box/magazine/gal{
 	pixel_x = 5
 	},
-/obj/item/gun/ballistic/automatic/gal/inteq{
+/obj/item/gun/ballistic/automatic/marksman/gal/inteq{
 	pixel_x = -8;
 	pixel_y = 3
 	},

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm
@@ -3374,13 +3374,13 @@
 "mt" = (
 /obj/structure/window/reinforced/spawner,
 /obj/structure/rack,
-/obj/item/gun/ballistic/automatic/smg/proto{
+/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto{
 	pixel_y = 3
 	},
-/obj/item/gun/ballistic/automatic/smg/proto{
+/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto{
 	pixel_y = -2
 	},
-/obj/item/gun/ballistic/automatic/smg/proto{
+/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto{
 	pixel_y = -7
 	},
 /turf/open/floor/plasteel/tech,
@@ -11533,7 +11533,7 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/aft)
 "Rs" = (
-/obj/structure/guncase,
+/obj/structure/guncloset,
 /obj/item/gun/ballistic/automatic/pistol/candor/no_mag,
 /obj/item/gun/ballistic/automatic/pistol/candor/no_mag,
 /turf/open/floor/plasteel/tech,

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm b/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm
@@ -184,15 +184,14 @@
 /obj/item/clothing/suit/armor/vest/security,
 /obj/item/clothing/mask/gas/sechailer,
 /obj/item/gps,
-/obj/item/gun/ballistic/automatic/pistol/commander,
 /obj/structure/railing{
 	dir = 4
 	},
 /obj/item/ammo_box/c9mm,
 /obj/item/ammo_box/c9mm,
 /obj/item/ammo_box/magazine/co9mm,
-/obj/item/ammo_box/magazine/co9mm,
 /obj/item/storage/belt/security/webbing,
+/obj/item/storage/pistolcase/commander,
 /turf/open/floor/wood,
 /area/ship/security)
 "bD" = (
@@ -3115,9 +3114,6 @@
 /area/ship/engineering)
 "Ha" = (
 /obj/structure/closet/secure_closet/lp/lieutenant,
-/obj/item/gun/energy/e_gun{
-	pixel_y = 1
-	},
 /obj/item/stock_parts/cell/gun,
 /obj/item/melee/classic_baton/telescopic,
 /obj/item/kitchen/knife/combat/survival,
@@ -3131,12 +3127,12 @@
 	pixel_x = 7;
 	pixel_y = -20
 	},
-/obj/item/gun/ballistic/automatic/pistol/commander,
 /obj/item/ammo_box/c9mm,
 /obj/item/ammo_box/c9mm,
 /obj/item/ammo_box/c9mm/rubbershot,
 /obj/item/ammo_box/magazine/co9mm,
-/obj/item/ammo_box/magazine/co9mm,
+/obj/item/storage/pistolcase/commander,
+/obj/item/storage/pistolcase/egun,
 /turf/open/floor/wood,
 /area/ship/crew/dorm)
 "Hd" = (

diff --git a/_maps/shuttles/pirate/pirate_tortuga.dmm b/_maps/shuttles/pirate/pirate_tortuga.dmm
@@ -640,7 +640,7 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 10
 	},
-/obj/structure/guncase{
+/obj/structure/guncloset{
 	anchored = 1
 	},
 /obj/item/gun/ballistic/automatic/assault/skm/pirate,
@@ -3140,7 +3140,7 @@
 /area/ship/maintenance/port)
 "Px" = (
 /obj/effect/turf_decal/techfloor,
-/obj/structure/guncase{
+/obj/structure/guncloset{
 	anchored = 1
 	},
 /obj/item/gun/ballistic/automatic/pistol/candor,

diff --git a/_maps/shuttles/roumain/srm_elder.dmm b/_maps/shuttles/roumain/srm_elder.dmm
@@ -1250,7 +1250,7 @@
 /turf/open/floor/grass/ship/jungle,
 /area/ship/hallway/central)
 "ox" = (
-/obj/structure/guncase,
+/obj/structure/guncloset,
 /obj/machinery/door/window/eastright{
 	dir = 8
 	},
@@ -2024,11 +2024,9 @@
 /obj/item/gps{
 	pixel_x = -7
 	},
-/obj/item/gun/ballistic/revolver/montagne,
 /obj/item/storage/backpack/satchel/leather,
-/obj/item/ammo_box/a44roum_speedloader,
-/obj/item/ammo_box/a44roum_speedloader,
 /obj/item/ammo_box/a44roum,
+/obj/item/storage/pistolcase/montagne,
 /obj/item/clothing/accessory/waistcoat/roumain,
 /turf/open/floor/wood/mahogany,
 /area/ship/bridge)