Port of several PRs from NOVA (Skyrat-SS13#25926)

* Fixes confetti shotgun shells (Skyrat-SS13#174)

* initial

* fix confetti shell

* donkpocket sprites and more

* this is for a different PR

* forgot these

* ..()

* reviews

* // instead of /// for overrides

---------

Co-Authored-By: Bloop <[email protected]>

* New Quirk: Appendicitis Survivor (Skyrat-SS13#77)

## About The Pull Request
Title.

## How This Contributes To The Nova Sector Roleplay Experience
Spontaneous appendicitis is.. an event!

This adds the Appendicitis Survivor quirk from my server,
[TaleStation](https://github.com/TaleStation/TaleStation).

Its a positive (-2) quirk, while low impact, some people may appreciate.
Its also another low cost quirk, so people could pick it up if so
desired.

## Proof of Testing

<details>
<summary>Screenshots/Videos</summary>


![image](https://github.com/GalacticStation/GalaxiaStation/assets/70232195/1f807368-f811-4d1d-b2c5-34f8508e6fcb)

  
</details>

## Changelog

:cl: Jolly
add: New quirk for those who hate their appendix: Appendicitis Survivor!
A positive (-2) quirk.
/:cl:

* Improves the names, descriptions, and extended descriptions of nearly all my firearms (Skyrat-SS13#90)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

Three steps

1. Guns no longer list their company in their name, this made some gun
names too long to refer to or just look weird.
2. Every gun now tells you what it fires in its examine if it didn't
before.
3. Every gun's examine text now hints that you can double examine for
more info on the weapon.

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

Makes a lot of information about these weapons more convenient or more
apparent than they were before, and removes some unneeded information
(like we didnt really have to have the guys that made the gun displayed
straight in the name, you can see the company that makes them in the
examine text already).

<!-- Please add a short description of why you think these changes would
benefit the game and the roleplay atmosphere of the server. If you can't
justify it in words, it might not be worth adding. -->

<!-- Include any screenshots/videos/debugging steps of the code
functioning successfully, between the </summary> and </details> code
blocks. -->
<!-- To our mappers and spriters: Posting screenshots of content INSIDE
EDITORS (aseprite, PDN, SDMM, ect) is NOT valid proof of testing. Please
make sure that you COMPILE the game and provide PROOF you tested your
edits. -->

<details>
<summary>Screenshots/Videos</summary>

![image](https://github.com/GalacticStation/GalaxiaStation/assets/82386923/cd4976fe-c641-4464-82ee-935aff63f159)

![image](https://github.com/GalacticStation/GalaxiaStation/assets/82386923/b1dc1edc-72fd-4235-a47d-84c36cae0679)

</details>

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
qol: The names and descriptions of every paxilmaniac weapon have been
improved to be shorter (names) and mention at least what bullet the
weapon fires (description)
qol: Every weapon with an extended description has a hint in its normal
examine telling you that you can look further to get more info on the
weapon
code: Two instances of now-deleted weapons paths (which i found out
about through someone getting one in a christmas tree) existing due to
manufacturer examines of all things have been cleaned up, players wont
notice this one i think
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

* Re-adding Cat Scream (Normalized) (Skyrat-SS13#123)

* Re-adding Cat Scream (Normalized)

* Update modular_nova/modules/emotes/code/scream_datums.dm

Renamed the file from cat.ogg to cat_scream.ogg

Co-authored-by: GoldenAlpharex <[email protected]>

* Renamed cat.ogg to cat_scream.ogg

* removed cat.ogg and replaced with cat_scream.ogg

* Removes old scream sounds, renames it properly

---------

Co-authored-by: GoldenAlpharex <[email protected]>
Co-authored-by: GoldenAlpharex <[email protected]>

* [MODULAR] Fixes clockcult slab ui, some runtimes (Skyrat-SS13#122)

Fixes slab ui, some runtimes

* [MODULAR] Fixes colonial cloaks not being able to hold any suit storage items (Skyrat-SS13#129)

* Fixes imperial police cloak not being able to hold any suit storage items

* Moves this to the NRI police cloak

* Moves this to the NRI police cloak

* Update clothing.dm

* Update modular_nova/modules/novaya_ert/code/police_outfit.dm

---------

Co-authored-by: GoldenAlpharex <[email protected]>

* Resprited Vox Clothing (Nova Station Edition) (Skyrat-SS13#97)

* Resprited Vox Clothing

* Update screenshot_humanoids__datum_species_vox_primalis.png

---------

Co-authored-by: Bloop <[email protected]>

* Chitter emote is the TG chitter sound unless you're a moth (Skyrat-SS13#111)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

Changes the *chitter emote to play the standard TG chitter sfx, unless
you're a moth, then it plays the moth chitter.

TG chitter is cute.

<!-- Include any screenshots/videos/debugging steps of the code
functioning successfully, between the </summary> and </details> code
blocks. -->
<!-- To our mappers and spriters: Posting screenshots of content INSIDE
EDITORS (aseprite, PDN, SDMM, ect) is NOT valid proof of testing. Please
make sure that you COMPILE the game and provide PROOF you tested your
edits. -->

<details>
<summary>Screenshots/Videos</summary>

https://github.com/NovaSector/NovaSector/assets/77534246/eae4fc45-d104-4588-8537-394da9304151

</details>

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
add: Chitter emote has a different sound effect, unless you're a moth
/:cl:

* Adds fancy masquerade masks (Skyrat-SS13#180)

* Adds masquerade masks, making them available in the AutoDrobe

Thanks to Crumpaloo for the sprites!

* Early mirror of tgstation/tgstation#80663

They're not properly usable otherwise

* Updates the sprites so they've got transparent eyes

* Adds the masks to the loadout

* Fixes variation flags and muzzled GAGS config, makes it act as internals

* Adjust some of the sprites a bit more, making snouted ones have smaller eyeholes, and vox ones looking more like masquerade masks

* Updates the sprites for the Vox Primalis!

---------

* Update greyscale_configs.dm

* Fixes Niftsoft Settings Panel (Skyrat-SS13#208)

Fixes Niftsoft Settings

* 0

---------

Co-authored-by: Bloop <[email protected]>
Co-authored-by: Kyogon <[email protected]>
Co-authored-by: GoldenAlpharex <[email protected]>
Co-authored-by: GoldenAlpharex <[email protected]>
Co-authored-by: HalcyonicWolf <[email protected]>
Co-authored-by: SomeRandomOwl <[email protected]>

modular_skyrat/master_files/code/datums/traits/good.dm

@@ -128,3 +128,42 @@
 	lose_text = span_danger("Somehow, you've completely cleaned yourself of glitter..")
 	medical_record_text = "Patient seems to be looking fabulous."
 	icon = FA_ICON_HAND_SPARKLES
+
+/datum/quirk/no_appendix
+	name = "Appendicitis Survivor"
+	desc = "You had a run in with appendicitis in the past and no longer have an appendix."
+	icon = FA_ICON_NOTES_MEDICAL
+	value = 2
+	gain_text = span_notice("You no longer have an appendix.")
+	lose_text = span_danger("Your appendix has magically.. regrown?")
+	medical_record_text = "Patient had appendicitis in the past and has had their appendix surgically removed."
+	/// The mob's original appendix
+	var/obj/item/organ/internal/appendix/old_appendix
+
+/datum/quirk/no_appendix/post_add()
+	var/mob/living/carbon/carbon_quirk_holder = quirk_holder
+	old_appendix = carbon_quirk_holder.get_organ_slot(ORGAN_SLOT_APPENDIX)
+
+	if(isnull(old_appendix))
+		return
+
+	old_appendix.Remove(carbon_quirk_holder, special = TRUE)
+	old_appendix.moveToNullspace()
+
+	STOP_PROCESSING(SSobj, old_appendix)
+
+/datum/quirk/no_appendix/remove()
+	var/mob/living/carbon/carbon_quirk_holder = quirk_holder
+
+	if(isnull(old_appendix))
+		return
+
+	var/obj/item/organ/internal/appendix/current_appendix = carbon_quirk_holder.get_organ_slot(ORGAN_SLOT_APPENDIX)
+
+	// if we have not gained an appendix already, put the old one back
+	if(isnull(current_appendix))
+		old_appendix.Insert(carbon_quirk_holder, special = TRUE)
+	else
+		qdel(old_appendix)
+
+	old_appendix = null

modular_skyrat/modules/GAGS/greyscale_configs.dm

@@ -295,6 +295,32 @@
 	name = "Colourable Sterile Mask (Worn) (Teshari)"
 	icon_file = 'modular_skyrat/modules/GAGS/icons/masks_teshari.dmi'
 
+// MASQUERADE MASKS
+/datum/greyscale_config/masquerade_mask
+	name = "Masquerade Mask"
+	icon_file = 'modular_skyrat/modules/GAGS/icons/mask/masquerade_mask.dmi'
+	json_config = 'modular_skyrat/modules/GAGS/json_configs/masquerade_mask/masquerade_mask.json'
+
+/datum/greyscale_config/masquerade_mask/worn
+	name = "Masquerade Mask (Worn)"
+	icon_file = 'modular_skyrat/modules/GAGS/icons/mask/masquerade_mask_worn.dmi'
+
+/datum/greyscale_config/masquerade_mask/worn/snouted
+	name = "Masquerade Mask (Worn) (Snouted)"
+	icon_file = 'modular_skyrat/modules/GAGS/icons/mask/masquerade_mask_worn_snouted.dmi'
+
+/datum/greyscale_config/masquerade_mask/worn/teshari
+	name = "Masquerade Mask (Worn) (Teshari)"
+	icon_file = 'modular_skyrat/modules/GAGS/icons/mask/masquerade_mask_worn_teshari.dmi'
+
+/datum/greyscale_config/masquerade_mask/worn/better_vox
+	name = "Masquerade Mask (Worn) (Vox Primalis)"
+	icon_file = 'modular_skyrat/modules/GAGS/icons/mask/masquerade_mask_worn_better_vox.dmi'
+
+/datum/greyscale_config/masquerade_mask/worn/vox
+	name = "Masquerade Mask (Worn) (Vox)"
+	icon_file = 'modular_skyrat/modules/GAGS/icons/mask/masquerade_mask_worn_vox.dmi'
+
 /*
 *	NECK
 */

modular_skyrat/modules/GAGS/json_configs/masquerade_mask/masquerade_mask.json

@@ -0,0 +1,58 @@
+{
+	"maskerade": [
+		{
+			"type": "icon_state",
+			"icon_state": "mask",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	],
+	"maskerade_two_colors": [
+		{
+			"type": "icon_state",
+			"icon_state": "mask_left",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "mask_right",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		}
+	],
+	"maskerade_feather": [
+		{
+			"type": "icon_state",
+			"icon_state": "mask",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "mask_feather",
+			"blend_mode": "overlay",
+			"color_ids": [ 3 ]
+		}
+	],
+	"maskerade_two_colors_feather": [
+		{
+			"type": "icon_state",
+			"icon_state": "mask_left",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "mask_right",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "mask_feather",
+			"blend_mode": "overlay",
+			"color_ids": [ 3 ]
+		}
+	]
+}

modular_skyrat/modules/clock_cult/code/items/clockwork_slab.dm

@@ -81,10 +81,10 @@ GLOBAL_LIST_INIT(clockwork_slabs, list())
 	. = ..()
 	//Clear quickbinds
 	for(var/datum/action/innate/clockcult/quick_bind/script as anything in quick_bound_scriptures)
-		script.Remove(user)
+		script?.Remove(user)
 
 	if(active_scripture)
-		active_scripture.end_invocation()
+		active_scripture?.end_invocation()
 
 	if(buffer)
 		buffer = null
@@ -97,7 +97,7 @@ GLOBAL_LIST_INIT(clockwork_slabs, list())
 
 	//Grant quickbound spells
 	for(var/datum/action/innate/clockcult/quick_bind/script as anything in quick_bound_scriptures)
-		script.Grant(user)
+		script?.Grant(user)
 
 	user.update_action_buttons()
 

modular_skyrat/modules/company_imports/code/armament_datums/vitezstvi_ammo.dm

@@ -157,7 +157,7 @@
 	item_type = /obj/item/ammo_box/advanced/s12gauge/antitide
 
 /datum/armament_entry/company_import/vitezstvi/shot_shells/confetti
-	item_type = /obj/item/ammo_box/advanced/s12gauge/honk
+	item_type = /obj/item/ammo_box/advanced/s12gauge/honkshot
 
 // Boxes of kiboko launcher ammo
 

modular_skyrat/modules/customization/modules/clothing/masks/masquerade_mask.dm

@@ -0,0 +1,33 @@
+
+/obj/item/clothing/mask/masquerade
+	name = "masquerade mask"
+	desc = "You'll never guess who's under that mask, it's the perfect disguise!"
+	icon_state = "maskerade"
+	icon = 'modular_skyrat/modules/GAGS/icons/mask/masquerade_mask.dmi'
+	worn_icon = 'modular_skyrat/modules/GAGS/icons/mask/masquerade_mask_worn.dmi'
+	flags_1 = IS_PLAYER_COLORABLE_1
+	clothing_flags = MASKINTERNALS
+	alternate_worn_layer = ABOVE_BODY_FRONT_HEAD_LAYER
+	supports_variations_flags = CLOTHING_SNOUTED_VARIATION | CLOTHING_SNOUTED_VOX_VARIATION | CLOTHING_SNOUTED_BETTER_VOX_VARIATION
+	greyscale_colors = "#ececec#333333#9b1e1e"
+	greyscale_config = /datum/greyscale_config/masquerade_mask
+	greyscale_config_worn = /datum/greyscale_config/masquerade_mask/worn
+	greyscale_config_worn_muzzled = /datum/greyscale_config/masquerade_mask/worn/snouted
+	greyscale_config_worn_better_vox = /datum/greyscale_config/masquerade_mask/worn/better_vox
+	greyscale_config_worn_vox = /datum/greyscale_config/masquerade_mask/worn/vox
+	greyscale_config_worn_teshari = /datum/greyscale_config/masquerade_mask/worn/teshari
+
+/obj/item/clothing/mask/masquerade/feathered
+	name = "feathered masquerade mask"
+	desc = "You'll never guess who's under that mask, it's the perfect disguise! This one even has a feather, to make it fancier!"
+	icon_state = "maskerade_feather"
+
+/obj/item/clothing/mask/masquerade/two_colors
+	name = "split masquerade mask"
+	desc = "You'll never guess who's under that mask, it's the perfect disguise! There's even two colors, to add to the confusion!"
+	icon_state = "maskerade_two_colors"
+
+/obj/item/clothing/mask/masquerade/two_colors/feathered
+	name = "feathered split masquerade mask"
+	desc = "You'll never guess who's under that mask, it's the perfect disguise! There's even two colors AND a feather, making it the most fancy masquerade mask yet!"
+	icon_state = "maskerade_two_colors_feather"

modular_skyrat/modules/emotes/code/emotes.dm

@@ -193,7 +193,12 @@
 	emote_type = EMOTE_AUDIBLE
 	mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
 	vary = TRUE
-	sound = 'modular_skyrat/modules/emotes/sound/emotes/mothchitter.ogg'
+
+/datum/emote/living/chitter/get_sound(mob/living/user)
+	if(ismoth(user))
+		return 'modular_skyrat/modules/emotes/sound/emotes/mothchitter.ogg'
+	else
+		return'sound/creatures/chitter.ogg'
 
 /datum/emote/living/sigh/get_sound(mob/living/user)
 	if(iscarbon(user))

modular_skyrat/modules/emotes/code/scream_datums.dm

@@ -58,6 +58,11 @@ GLOBAL_LIST_EMPTY(scream_types)
 	male_screamsounds = list('modular_skyrat/modules/emotes/sound/voice/scream_lizard.ogg')
 	female_screamsounds = null
 
+/datum/scream_type/cat
+	name = "Cat Scream"
+	male_screamsounds = list('modular_skyrat/modules/emotes/sound/voice/scream_cat.ogg')
+	female_screamsounds = null
+
 /datum/scream_type/moth
 	name = "Moth Scream"
 	male_screamsounds = list('modular_skyrat/modules/emotes/sound/voice/scream_moth.ogg')

modular_skyrat/modules/food_replicator/code/clothing.dm

@@ -37,6 +37,7 @@
 	worn_icon = 'modular_skyrat/modules/food_replicator/icons/clothing_worn.dmi'
 	worn_icon_digi = 'modular_skyrat/modules/food_replicator/icons/clothing_digi.dmi'
 	icon_state = "cloak_colonial"
+	allowed = /obj/item/clothing/suit/jacket/leather::allowed // these are special and can be worn in the suit slot, so we need this var to be defined
 
 /obj/item/clothing/neck/cloak/colonial/mob_can_equip(mob/living/equipper, slot, disable_warning, bypass_equip_delay_self, ignore_equipped, indirect_action)
 	if(is_species(equipper, /datum/species/teshari))

modular_skyrat/modules/loadouts/loadout_items/loadout_datum_masks.dm

@@ -87,6 +87,26 @@ GLOBAL_LIST_INIT(loadout_masks, generate_loadout_items(/datum/loadout_item/mask)
 
 // Ain't a damn thing
 
+/*
+*	MASQUERADE MASKS
+*/
+
+/datum/loadout_item/mask/masquerade
+	name = "Masquerade Mask"
+	item_path = /obj/item/clothing/mask/masquerade
+
+/datum/loadout_item/mask/masquerade/two_colors
+	name = "Split Masquerade Mask"
+	item_path = /obj/item/clothing/mask/masquerade/two_colors
+
+/datum/loadout_item/mask/masquerade/feathered
+	name = "Feathered Masquerade Mask"
+	item_path = /obj/item/clothing/mask/masquerade/feathered
+
+/datum/loadout_item/mask/masquerade/two_colors/feathered
+	name = "Feathered Split Masquerade Mask"
+	item_path = /obj/item/clothing/mask/masquerade/two_colors/feathered
+
 /*
 *	FAMILIES
 */

modular_skyrat/modules/manufacturer_examine/code/gun_company_additions.dm

@@ -37,9 +37,6 @@
 /obj/item/gun/ballistic/automatic/pistol/give_manufacturer_examine()
 	AddElement(/datum/element/manufacturer_examine, COMPANY_SCARBOROUGH)
 
-/obj/item/gun/ballistic/automatic/pistol/m45a5/give_manufacturer_examine()
-	AddElement(/datum/element/manufacturer_examine, COMPANY_NANOTRASEN)
-
 /obj/item/gun/ballistic/revolver/c38/detective/give_manufacturer_examine()
 	AddElement(/datum/element/manufacturer_examine, COMPANY_NANOTRASEN)
 
@@ -55,15 +52,9 @@
 /obj/item/gun/ballistic/automatic/pistol/clandestine/give_manufacturer_examine()
 	AddElement(/datum/element/manufacturer_examine, COMPANY_SCARBOROUGH)
 
-/obj/item/gun/ballistic/automatic/pistol/pdh/pulse/give_manufacturer_examine()
-	return
-
 /obj/item/gun/ballistic/automatic/l6_saw/toy/give_manufacturer_examine()
 	AddElement(/datum/element/manufacturer_examine, COMPANY_DONK)
 
-/obj/item/gun/ballistic/automatic/cmg/give_manufacturer_examine()
-	AddElement(/datum/element/manufacturer_examine, COMPANY_NANOTRASEN)
-
 /obj/item/gun/ballistic/revolver/mateba/give_manufacturer_examine()
 	return
 

modular_skyrat/modules/modular_vending/code/autodrobe.dm

@@ -30,6 +30,10 @@
 				/obj/item/clothing/under/costume/skyrat/yukata = 5,
 				/obj/item/clothing/under/costume/skyrat/kimono = 5,
 				/obj/item/clothing/head/beret/badge = 5,
+				/obj/item/clothing/mask/masquerade = 5,
+				/obj/item/clothing/mask/masquerade/two_colors = 5,
+				/obj/item/clothing/mask/masquerade/feathered = 5,
+				/obj/item/clothing/mask/masquerade/two_colors/feathered = 5,
 			),
 		),
 		list(

modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/grenade_launcher.dm

@@ -1,7 +1,7 @@
 // Low caliber grenade launcher (fun & games)
 
 /obj/item/gun/ballistic/automatic/sol_grenade_launcher
-	name = "\improper Carwo 'Kiboko' Grenade Launcher"
+	name = "\improper Kiboko Grenade Launcher"
 	desc = "A unique grenade launcher firing .980 grenades. A laser sight system allows its user to specify a range for the grenades it fires to detonate at."
 
 	icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/carwo_defense_systems/guns48x.dmi'
@@ -43,6 +43,10 @@
 /obj/item/gun/ballistic/automatic/sol_grenade_launcher/give_manufacturer_examine()
 	AddElement(/datum/element/manufacturer_examine, COMPANY_CARWO)
 
+/obj/item/gun/ballistic/automatic/sol_grenade_launcher/examine(mob/user)
+	. = ..()
+	. += span_notice("You can <b>examine closer</b> to learn a little more about this weapon.")
+
 /obj/item/gun/ballistic/automatic/sol_grenade_launcher/examine_more(mob/user)
 	. = ..()
 

modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/rifle.dm

@@ -2,7 +2,7 @@
 
 /obj/item/gun/ballistic/automatic/sol_rifle
 	name = "\improper Carwo-Cawil Battle Rifle"
-	desc = "A heavy battle rifle commonly seen in the hands of SolFed military types. Accepts any standard SolFed rifle magazine."
+	desc = "A heavy battle rifle firing .40 Sol. Commonly seen in the hands of SolFed military types. Accepts any standard SolFed rifle magazine."
 
 	icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/carwo_defense_systems/guns48x.dmi'
 	icon_state = "infanterie"
@@ -54,6 +54,10 @@
 /obj/item/gun/ballistic/automatic/sol_rifle/give_manufacturer_examine()
 	AddElement(/datum/element/manufacturer_examine, COMPANY_CARWO)
 
+/obj/item/gun/ballistic/automatic/sol_rifle/examine(mob/user)
+	. = ..()
+	. += span_notice("You can <b>examine closer</b> to learn a little more about this weapon.")
+
 /obj/item/gun/ballistic/automatic/sol_rifle/examine_more(mob/user)
 	. = ..()
 

modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/shotgun.dm

@@ -1,7 +1,7 @@
 // SolFed shotgun (this was gonna be in a proprietary shotgun shell type outside of 12ga at some point, wild right?)
 
 /obj/item/gun/ballistic/shotgun/riot/sol
-	name = "\improper Carwo 'Renoster' Shotgun"
+	name = "\improper Renoster Shotgun"
 	desc = "A twelve gauge shotgun with a six shell capacity underneath. Made for and used by SolFed's various military branches."
 
 	icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/carwo_defense_systems/guns48x.dmi'
@@ -32,6 +32,10 @@
 /obj/item/gun/ballistic/shotgun/riot/sol/give_manufacturer_examine()
 	AddElement(/datum/element/manufacturer_examine, COMPANY_CARWO)
 
+/obj/item/gun/ballistic/shotgun/riot/sol/examine(mob/user)
+	. = ..()
+	. += span_notice("You can <b>examine closer</b> to learn a little more about this weapon.")
+
 /obj/item/gun/ballistic/shotgun/riot/sol/examine_more(mob/user)
 	. = ..()
 

modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/submachinegun.dm

@@ -1,8 +1,8 @@
 // Base Sol SMG
 
 /obj/item/gun/ballistic/automatic/sol_smg
-	name = "\improper Carwo 'Sindano' Submachinegun"
-	desc = "A small submachinegun commonly seen in the hands of PMCs and other unsavory corpos. Accepts any standard Sol pistol magazine."
+	name = "\improper Sindano Submachine Gun"
+	desc = "A small submachine gun firing .35 Sol. Commonly seen in the hands of PMCs and other unsavory corpos. Accepts any standard Sol pistol magazine."
 
 	icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/carwo_defense_systems/guns32x.dmi'
 	icon_state = "sindano"
@@ -37,6 +37,10 @@
 /obj/item/gun/ballistic/automatic/sol_smg/give_manufacturer_examine()
 	AddElement(/datum/element/manufacturer_examine, COMPANY_CARWO)
 
+/obj/item/gun/ballistic/automatic/sol_smg/examine(mob/user)
+	. = ..()
+	. += span_notice("You can <b>examine closer</b> to learn a little more about this weapon.")
+
 /obj/item/gun/ballistic/automatic/sol_smg/examine_more(mob/user)
 	. = ..()