Merge remote-tracking branch 'upstream/master'

code/game/objects/items/melee/sword.dm

@@ -132,6 +132,13 @@
 	icon_state = "suns-swordstick"
 	item_state = "suns-swordstick"
 
+/obj/item/melee/sword/sabre/pgf
+	name = "\improper boarding cutlass"
+	desc = "When beam and bullet puncture the hull, a trustworthy blade will carry you through the fight"
+	icon_state = "pgf-sabre"
+	block_chance = 30
+	force = 22
+
 /obj/item/melee/sword/sabre/suns/telescopic
 	name = "telescopic sabre"
 	desc = "A telescopic and retractable blade given to SUNS peacekeepers for easy concealment and carry. It's design makes it slightly less effective than normal sabres sadly, however it is still excelent at piercing armor."

code/game/objects/items/storage/belt.dm

@@ -751,6 +751,7 @@
 	item_state = "sheath"
 	base_icon_state = "sheath"
 	w_class = WEIGHT_CLASS_BULKY
+	var/sabre_type = /obj/item/melee/sword/sabre
 
 /obj/item/storage/belt/sabre/ComponentInitialize()
 	. = ..()
@@ -760,7 +761,7 @@
 	STR.use_sound = null //if youre wondering why this is null, its so you can look in your sheath to prepare to draw, without letting anyone know youre preparing to draw it
 	STR.max_w_class = WEIGHT_CLASS_BULKY
 	STR.set_holdable(list(
-		/obj/item/melee/sword/sabre
+		sabre_type
 		))
 
 /obj/item/storage/belt/sabre/examine(mob/user)
@@ -788,7 +789,7 @@
 	return ..()
 
 /obj/item/storage/belt/sabre/PopulateContents()
-	new /obj/item/melee/sword/sabre(src)
+	new sabre_type(src)
 	update_appearance()
 
 /obj/item/storage/belt/sabre/solgov
@@ -798,21 +799,7 @@
 	icon_state = "sheath-solgov"
 	item_state = "sheath-solgov"
 	w_class = WEIGHT_CLASS_BULKY
-
-/obj/item/storage/belt/sabre/solgov/ComponentInitialize()
-	AddComponent(component_type)
-	AddElement(/datum/element/update_icon_updates_onmob)
-	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
-	STR.max_items = 1
-	STR.use_sound = null
-	STR.max_w_class = WEIGHT_CLASS_BULKY
-	STR.set_holdable(list(
-		/obj/item/melee/sword/sabre/solgov
-		))
-
-/obj/item/storage/belt/sabre/solgov/PopulateContents()
-	new /obj/item/melee/sword/sabre/solgov(src)
-	update_appearance()
+	sabre_type = /obj/item/melee/sword/sabre/solgov
 
 /obj/item/storage/belt/sabre/suns
 	name = "SUNS sabre sheath"
@@ -827,22 +814,7 @@
 	icon_state = "suns-sheath"
 	item_state = "suns-sheath"
 	w_class = WEIGHT_CLASS_BULKY
-
-/obj/item/storage/belt/sabre/suns/ComponentInitialize()
-	AddComponent(component_type)
-	AddElement(/datum/element/update_icon_updates_onmob)
-	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
-	STR.max_items = 1
-	STR.use_sound = null
-	STR.max_w_class = WEIGHT_CLASS_BULKY
-	STR.set_holdable(list(
-		/obj/item/melee/sword/sabre/suns
-		))
-
-/obj/item/storage/belt/sabre/suns/PopulateContents()
-	new /obj/item/melee/sword/sabre/suns(src)
-	update_appearance()
-
+	sabre_type = /obj/item/melee/sword/sabre/suns
 
 /obj/item/storage/belt/sabre/suns/captain
 	name = "SUNS captain's sabre sheath"
@@ -852,21 +824,7 @@
 	icon_state = "suns-capsheath"
 	item_state = "suns-capsheath"
 	w_class = WEIGHT_CLASS_BULKY
-
-/obj/item/storage/belt/sabre/suns/captain/ComponentInitialize()
-	AddComponent(component_type)
-	AddElement(/datum/element/update_icon_updates_onmob)
-	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
-	STR.max_items = 1
-	STR.use_sound = null
-	STR.max_w_class = WEIGHT_CLASS_BULKY
-	STR.set_holdable(list(
-		/obj/item/melee/sword/sabre/suns/captain
-		))
-
-/obj/item/storage/belt/sabre/suns/captain/PopulateContents()
-	new /obj/item/melee/sword/sabre/suns/captain(src)
-	update_appearance()
+	sabre_type = /obj/item/melee/sword/sabre/suns/captain
 
 /obj/item/storage/belt/sabre/suns/cmo
 	name = "SUNS cane sheath"
@@ -882,21 +840,14 @@
 	icon_state = "suns-cane"
 	item_state = "suns-cane"
 	w_class = WEIGHT_CLASS_BULKY
-
-/obj/item/storage/belt/sabre/suns/cmo/ComponentInitialize()
-	AddComponent(component_type)
-	AddElement(/datum/element/update_icon_updates_onmob)
-	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
-	STR.max_items = 1
-	STR.use_sound = null
-	STR.max_w_class = WEIGHT_CLASS_BULKY
-	STR.set_holdable(list(
-		/obj/item/melee/sword/sabre/suns/cmo
-		))
-
-/obj/item/storage/belt/sabre/suns/cmo/PopulateContents()
-	new /obj/item/melee/sword/sabre/suns/cmo(src)
-	update_appearance()
+	sabre_type = /obj/item/melee/sword/sabre/suns/cmo
+
+/obj/item/storage/belt/sabre/pgf
+	name = "cutlass sheath"
+	desc = "A mass produced thermoplastic-leather sheath made to hold a boarding cutlass."
+	base_icon_state = "sheath-pgf"
+	icon_state = "sheath-pgf"
+	item_state = "sheath-pgf"
 
 /obj/item/storage/belt/security/webbing/inteq
 	name = "inteq webbing"

html/changelogs/archive/2024-10.yml

@@ -283,3 +283,12 @@
   FalloutFalcon:
   - balance: blind people can examine twice as fast
   - code_imp: makes defines for the two primary atoms requirement lists
+2024-10-21:
+  Apogee-dev:
+  - balance: Made Komodo aspawn
+2024-10-22:
+  Imaginos, Erika:
+  - rscadd: The Pan Gezenan Federation has sent out shipments of boarding cutlasses
+      to the Frontier. Expect cool doohickeys on your friendly neighborhood PGF Vessel
+  - imageadd: 'Imaginos: PGF sord sprites'
+  - code_imp: sabres now take up less space in code