Seasonal Galore: The Squeakquel (#12818)

* Update persistence.dm * I'M_A_FOOL_I_KNOW_NOTHING * space_vs_TAB_surpremacy * did_something_wrong_so_redid_entire_thing_IT_JUST_WORKS fucked up somewhere somehow along the way with linters I could not find for the life of me so here goes * Update code/controllers/subsystem/persistence.dm Co-authored-by: XSlayer300 <[email protected]> * Update code/controllers/subsystem/persistence.dm Co-authored-by: XSlayer300 <[email protected]> * Update code/controllers/subsystem/persistence.dm Co-authored-by: XSlayer300 <[email protected]> --------- Co-authored-by: XSlayer300 <[email protected]>
tgstation · May 7, 2023 · 0a2a42f · 0a2a42f
1 parent e619588
commit 0a2a42f
Showing 1 changed file with 35 additions and 10 deletions.
diff --git a/code/controllers/subsystem/persistence.dm b/code/controllers/subsystem/persistence.dm
@@ -30,8 +30,10 @@ SUBSYSTEM_DEF(persistence)
 		/datum/season_datum/weapons/guns/rifle_seasonal_one,
 		/datum/season_datum/weapons/guns/pistol_seasonal_two,
 		/datum/season_datum/weapons/guns/rifle_seasonal_two,
+		/datum/season_datum/weapons/guns/rifle_seasonal_three,
 		/datum/season_datum/weapons/guns/copsandrobbers_seasonal,
 		/datum/season_datum/weapons/guns/shotgun_seasonal,
+		/datum/season_datum/weapons/guns/lever_seasonal,
 		)
 	)
 	///The saved list of custom outfits names
@@ -190,22 +192,18 @@ SUBSYSTEM_DEF(persistence)
 	var/list/item_list = list()
 
 /datum/season_datum/weapons/guns/rifle_seasonal_one
-	name = "AK47, M16 and Storm Weapons"
-	description = "Old Earth guns. Antique and obsolete, but no less deadly"
+	name = "Old Earth"
+	description = "Ancient Earth guns. Antique and obsolete, but no less deadly"
 	item_list = list(
-		/obj/item/weapon/gun/rifle/mpi_km= -1,
-		/obj/item/ammo_magazine/rifle/mpi_km/plum = -1,
-		/obj/item/ammo_magazine/packet/pwarsaw = -1,
-		/obj/item/weapon/gun/rifle/m16 = -1,
-		/obj/item/ammo_magazine/rifle/m16 = -1,
-		/obj/item/ammo_magazine/packet/pnato = -1,
 		/obj/item/weapon/gun/rifle/mkh = -1,
 		/obj/item/ammo_magazine/rifle/mkh = -1,
 		/obj/item/weapon/gun/smg/ppsh = -1,
 		/obj/item/ammo_magazine/smg/ppsh = -1,
 		/obj/item/ammo_magazine/smg/ppsh/extended = -1,
 		/obj/item/weapon/gun/rifle/garand = -1,
 		/obj/item/ammo_magazine/rifle/garand = -1,
+		/obj/item/weapon/gun/pistol/m1911 = -1,
+		/obj/item/ammo_magazine/pistol/m1911 = -1,
 		)
 
 /datum/season_datum/weapons/guns/rifle_seasonal_two
@@ -223,6 +221,20 @@ SUBSYSTEM_DEF(persistence)
 		/obj/item/ammo_magazine/rifle/alf_machinecarbine = -1,
 		)
 
+/datum/season_datum/weapons/guns/rifle_seasonal_three
+	name = "Cold War"
+	description = "Hot guns from the Cold War"
+	item_list = list(
+		/obj/item/weapon/gun/rifle/mpi_km= -1,
+		/obj/item/ammo_magazine/rifle/mpi_km/plum = -1,
+		/obj/item/ammo_magazine/packet/pwarsaw = -1,
+		/obj/item/weapon/gun/rifle/m16 = -1,
+		/obj/item/ammo_magazine/rifle/m16 = -1,
+		/obj/item/ammo_magazine/packet/pnato = -1,
+		/obj/item/weapon/gun/rifle/sniper/svd = -1,
+		/obj/item/ammo_magazine/sniper/svd = -1,
+		)
+
 /datum/season_datum/weapons/guns/pistol_seasonal_one
 	name = "High Noon"
 	description = "Revolvers? They are yours my friend. Bouncy, single-action, or with buckshot"
@@ -253,8 +265,8 @@ SUBSYSTEM_DEF(persistence)
 		)
 
 /datum/season_datum/weapons/guns/copsandrobbers_seasonal
-	name = "SWAT and terrorists"
-	description = "Three classic SMGs, and no one's favorite burst revolver."
+	name = "SWAT and Terrorists"
+	description = "Four classic SMGs, and no one's favorite burst revolver."
 	item_list = list(
 		/obj/item/weapon/gun/smg/uzi = -1,
 		/obj/item/ammo_magazine/smg/uzi = -1,
@@ -263,6 +275,8 @@ SUBSYSTEM_DEF(persistence)
 		/obj/item/storage/holster/m25 = -1,
 		/obj/item/weapon/gun/smg/mp7 = -1,
 		/obj/item/ammo_magazine/smg/mp7 = -1,
+		/obj/item/weapon/gun/smg/skorpion = -1,
+		/obj/item/ammo_magazine/smg/skorpion = -1,
 		/obj/item/weapon/gun/revolver/cmb = -1,
 		/obj/item/ammo_magazine/revolver/cmb = -1,
 		)
@@ -275,3 +289,14 @@ SUBSYSTEM_DEF(persistence)
 		/obj/item/weapon/gun/shotgun/pump = -1,
 		/obj/item/weapon/gun/shotgun/pump/cmb = -1,
 		)
+
+/datum/season_datum/weapons/guns/lever_seasonal
+	name = "Lever Actions"
+	description = "Try and win the modern west with these"
+	item_list = list(
+		/obj/item/weapon/gun/shotgun/pump/lever = -1,
+		/obj/item/weapon/gun/shotgun/pump/lever/mbx900 = -1,
+		/obj/item/ammo_magazine/shotgun/mbx900 = -1,
+		/obj/item/ammo_magazine/shotgun/mbx900/buckshot = -1,
+		/obj/item/ammo_magazine/shotgun/mbx900/tracking = -1,
+		)