M56C Pamphlet (co smartgun) (#8163)

# About the pull request Removes the SG training CO gets by default, making it a part of the SG kit as a pamhplet. Was requested so they dont CO's dont take night vision from dead sgs to powergame wtih their rifles, since their base armor also counts as a mag harness like the m56c # Explain why it's good for the game Requested by the senator # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog :cl: balance: Removed CO's sg training by default add: Added a smartgunner pamphlet for CO's that can only be used by the CO that they can use to use their sg and sg gear /:cl: --------- Co-authored-by: InsaneRed <[email protected]> Co-authored-by: harryob <[email protected]>
cmss13-devs · Jan 23, 2025 · 9419f9f · 9419f9f
1 parent 4d94940
commit 9419f9f
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/code/datums/skills/uscm.dm b/code/datums/skills/uscm.dm
@@ -269,7 +269,6 @@ COMMAND STAFF
 		SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
 		SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
 		SKILL_CQC = SKILL_CQC_SKILLED,
-		SKILL_SPEC_WEAPONS = SKILL_SPEC_SMARTGUN,
 		SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
 		SKILL_JTAC = SKILL_JTAC_MASTER,

diff --git a/code/game/objects/items/pamphlets.dm b/code/game/objects/items/pamphlets.dm
@@ -107,6 +107,19 @@
 	user.update_minimap_icon()
 	GLOB.data_core.manifest_modify(user.real_name, WEAKREF(user), "Spotter")
 
+/obj/item/pamphlet/skill/cosmartgun
+	name = "Cavalier instructional pamphlet"
+	desc = "A pamphlet used to quickly impart vital knowledge. This one has the image of a smartgun on it."
+	icon_state = "pamphlet_loader"
+	bypass_pamphlet_limit = TRUE
+	trait = /datum/character_trait/skills/cosmartgun
+
+/obj/item/pamphlet/skill/cosmartgun/can_use(mob/living/carbon/human/user)
+	if(user.job != JOB_CO)
+		to_chat(user, SPAN_WARNING("Only the Commanding Officer can use this."))
+		return
+	return ..()
+
 /obj/item/pamphlet/skill/loader
 	name = "Loader instructional pamphlet"
 	desc = "A pamphlet used to quickly impart vital knowledge. This one has the image of a rocket on it."

diff --git a/code/modules/character_traits/skills.dm b/code/modules/character_traits/skills.dm
@@ -85,6 +85,14 @@
 	trait_desc = "Boosts the JTAC skill by 1. Crewmember received additional training in using JTAC equipment."
 	skill = SKILL_JTAC
 
+/datum/character_trait/skills/cosmartgun
+	trait_name = "Smartgun Training"
+	trait_desc = "Gives the CO information on his smartgun"
+	skill = SKILL_SPEC_WEAPONS
+	skill_cap =  SKILL_SPEC_SMARTGUN
+	skill_increment = 7
+
+
 /datum/character_trait/skills/spotter
 	trait_name = "Spotter Training"
 	trait_desc = "Boosts the JTAC skill by 1. Crewmember received additional training in using JTAC equipment and Ghillie outfits."

diff --git a/code/modules/cm_marines/equipment/weapons.dm b/code/modules/cm_marines/equipment/weapons.dm
@@ -34,7 +34,7 @@
 	icon = 'icons/obj/items/storage/kits.dmi'
 	icon_state = "kit_case"
 	w_class = SIZE_HUGE
-	storage_slots = 5
+	storage_slots = 6
 	slowdown = 1
 	can_hold = list() //Nada. Once you take the stuff out it doesn't fit back in.
 	foldable = null
@@ -44,6 +44,7 @@
 	new /obj/item/clothing/glasses/night/m56_goggles(src)
 	new /obj/item/weapon/gun/smartgun/co(src)
 	new /obj/item/smartgun_battery(src)
+	new /obj/item/pamphlet/skill/cosmartgun(src)
 	new /obj/item/clothing/suit/storage/marine/smartgunner(src)
 	new /obj/item/storage/belt/marine/smartgunner(src)
 	update_icon()