Fix many various issues

code/_helpers/text.dm

@@ -436,6 +436,11 @@
 	t = replacetext(t, "\[fleetlogo\]", "<img src = fleetlogo.png>")
 	t = replacetext(t, "\[sfplogo\]", "<img src = sfplogo.png>")
 	t = replacetext(t, "\[falogo\]", "<img src = falogo.png>")
+	t = replacetext(t, "\[ofbluelogo\]", "<img src = ofbluelogo.png>") // Sierra
+	t = replacetext(t, "\[ofntlogo\]", "<img src = ofntlogo.png>")     // Sierra
+	t = replacetext(t, "\[foundlogo\]", "<img src = foundlogo.png>")   // Sierra
+	t = replacetext(t, "\[ccalogo\]", "<img src = ccalogo.png>")       // Sierra
+	t = replacetext(t, "\[sierralogo\]", "<img src = sierralogo.png>") // Sierra
 	t = replacetext(t, "\[editorbr\]", "")
 	return t
 
@@ -493,6 +498,11 @@
 	t = replacetext(t, "<img src = xynlogo.png>", "\[xynlogo\]")
 	t = replacetext(t, "<img src = sfplogo.png>", "\[sfplogo\]")
 	t = replacetext(t, "<img src = falogo.png>", "\[falogo\]")
+	t = replacetext(t, "<img src = ofbluelogo.png>", "\[ofbluelogo\]" ) // Sierra
+	t = replacetext(t, "<img src = ofntlogo.png>", "\[ofntlogo\]" )     // Sierra
+	t = replacetext(t, "<img src = foundlogo.png>", "\[foundlogo\]" )   // Sierra
+	t = replacetext(t, "<img src = ccalogo.png>", "\[ccalogo\]" )       // Sierra
+	t = replacetext(t, "<img src = sierralogo.png>", "\[sierralogo\]" ) // Sierra
 	t = replacetext(t, "<span class=\"paper_field\"></span>", "\[field\]")
 	t = replacetext(t, "<span class=\"redacted\">R E D A C T E D</span>", "\[redacted\]")
 	t = strip_html_properly(t)

code/modules/client/client_procs.dm

@@ -400,7 +400,12 @@
 		'html/images/eclogo.png',
 		'html/images/FleetLogo.png',
 		'html/images/sfplogo.png',
-		'html/images/falogo.png'
+		'html/images/falogo.png',
+		'html/images/ofbluelogo.png', //Sierra
+		'html/images/ofntlogo.png',   //Sierra
+		'html/images/foundlogo.png',  //Sierra
+		'html/images/ccalogo.png',    //Sierra
+		'html/images/sierralogo.png' //Sierra
 		)
 	addtimer(new Callback(src, .proc/after_send_resources), 1 SECOND)
 

maps/sierra/items/ammo.dm

@@ -0,0 +1,31 @@
+/*************************
+sierra specific ammo types
+**************************/
+
+/*
+Manstopper Rounds - Shotgun
+*/
+
+/obj/item/storage/box/ammo/manstoppershells
+	name = "box of manstopper shells"
+	startswith = list(/obj/item/ammo_magazine/shotholder/manstopper = 2)
+
+/obj/item/ammo_magazine/shotholder/manstopper
+	name = "manstopper shell holder"
+	ammo_type = /obj/item/ammo_casing/shotgun/manstopper
+	marking_color = COLOR_SURGERY_BLUE
+
+/obj/item/ammo_casing/shotgun/manstopper
+	name = "shotgun shell"
+	desc = "A manstopper shell."
+	icon = 'maps/sierra/icons/obj/ammo.dmi'
+	icon_state = "mnshell"
+	spent_icon = "mnshell-spent"
+	projectile_type = /obj/item/projectile/bullet/shotgun/manstopper
+	matter = list(MATERIAL_STEEL = 360)
+
+/obj/item/projectile/bullet/shotgun/manstopper
+	name = "manstopper"
+	damage = 50
+	agony = 30
+	armor_penetration = 0

maps/sierra/items/items.dm

@@ -18,6 +18,49 @@ sierra specific items
 	desc = "A rugged backpack worn over one shoulder."
 	icon_state = "courierbagsci"
 
+/obj/item/storage/firstaid/security
+	name = "Tactical first-aid kit"
+	desc = "It's a small emergency medical kit. Dark and lightweight."
+	use_sound = 'sound/effects/storage/pillbottle.ogg'
+	icon = 'maps/sierra/icons/obj/medical.dmi'
+	icon_state = "fak-sec"
+	matter = list(MATERIAL_PLASTIC = 600)
+	storage_slots = 7
+	w_class = ITEM_SIZE_SMALL
+	max_w_class = ITEM_SIZE_SMALL
+	startswith = list(
+		/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline,
+		/obj/item/reagent_containers/hypospray/autoinjector/antirad,
+		/obj/item/reagent_containers/hypospray/autoinjector/detox,
+		/obj/item/reagent_containers/hypospray/autoinjector/dexalin,
+		/obj/item/reagent_containers/hypospray/autoinjector/kelotane,
+		/obj/item/reagent_containers/hypospray/autoinjector/pain,
+		/obj/item/stack/medical/bruise_pack
+	)
+	can_hold = list(
+		/obj/item/reagent_containers/hypospray/autoinjector,
+		/obj/item/stack/medical/bruise_pack
+	)
+
+/obj/item/reagent_containers/hypospray/autoinjector/dexalin
+	name ="autoinjector (dexalin plus)"
+	starts_with = list(/datum/reagent/dexalin = 5)
+
+/obj/item/reagent_containers/hypospray/autoinjector/kelotane
+	name = "autoinjector (antiburn)"
+	starts_with = list(/datum/reagent/kelotane = 5)
+
+/obj/item/reagent_containers/hypospray/autoinjector/kelotane
+	name = "autoinjector (antiburn)"
+	starts_with = list(/datum/reagent/kelotane = 5)
+
+// Containers
+
+/obj/item/storage/backpack/dufflebag/syndie_kit/plastique
+	startswith = list(
+		/obj/item/plastique = 6
+		)
+
 /***********
 Unique items
 ***********/

maps/sierra/items/rigs.dm

@@ -323,6 +323,7 @@
 	name = "heavy exploration HCM"
 	suit_type = "heavy exploration hardsuit"
 	desc = "Expeditionary Corps' Exoplanet Exploration Armored Unit, A-Unit for short. Built for more hostile (and hungry) environments, it features additional armor and powered exoskeleton."
+	icon = 'maps/sierra/icons/obj/uniques.dmi'
 	icon_state = "command_exp_rig"
 	armor = list(
 		melee = ARMOR_MELEE_MAJOR,

maps/sierra/sierra.dm

@@ -48,6 +48,7 @@
 	#include "game/lockdown.dm"
 
 	// --- ITEMS --- //
+	#include "items/ammo.dm"
 	#include "items/cards_ids.dm"
 	#include "items/documents.dm"
 	#include "items/encryption_keys.dm"

maps/sierra/structures/closets/armory.dm

@@ -14,20 +14,24 @@
 
 /obj/structure/closet/secure_closet/guncabinet/sierra_armory/shotgun/WillContain()
 	return list(/obj/item/gun/projectile/shotgun/pump/combat = 2,
-				/obj/item/clothing/accessory/storage/bandolier = 2)
+				/obj/item/clothing/accessory/storage/bandolier = 2,
+				/obj/item/storage/box/ammo/beanbags = 2,
+				/obj/item/storage/box/ammo/practiceshells = 2,
+				/obj/item/storage/box/ammo/manstoppershells = 2)
 
 /obj/structure/closet/secure_closet/guncabinet/sierra_armory/laser
 	name = "laser guncabinet"
 
 /obj/structure/closet/secure_closet/guncabinet/sierra_armory/laser/WillContain()
-	return list(/obj/item/gun/energy/laser/secure = 4)
+	return list(/obj/item/gun/energy/laser/secure = 6)
 
 /obj/structure/closet/secure_closet/guncabinet/sierra_armory/stun
 	name = "stun guncabinet"
 
 /obj/structure/closet/secure_closet/guncabinet/sierra_armory/stun/WillContain()
 	return list(/obj/item/gun/energy/stunrevolver/rifle = 2,
-				/obj/item/gun/energy/taser/carbine = 2)
+				/obj/item/gun/energy/taser/carbine = 2,
+				/obj/item/gun/energy/taser = 4)
 
 /obj/structure/closet/secure_closet/guncabinet/sierra_armory/ion
 	name = "ion guncabinet"
@@ -40,7 +44,7 @@
 	name = "energy guncabinet"
 
 /obj/structure/closet/secure_closet/guncabinet/sierra_armory/egun/WillContain()
-	return list(/obj/item/gun/energy/gun/secure = 4)
+	return list(/obj/item/gun/energy/gun/secure = 3)
 
 /obj/structure/closet/secure_closet/guncabinet/sierra_armory/launcher
 	name = "grenade launcher guncabinet"

maps/sierra/structures/closets/misc.dm

@@ -60,3 +60,64 @@
 /obj/structure/closet/crate/present
 	name = "present crate"
 	desc = "Wow, a present!"
+
+///Ninja equipment loadouts. Placed here because author overrided them using Torch files. Now we overriding this again for some QoL stuff.
+/obj/structure/closet/crate/ninja/sol
+	name = "sol equipment crate"
+	desc = "A tactical equipment crate."
+
+/obj/structure/closet/crate/ninja/sol/WillContain()
+	return list(
+		/obj/item/rig/light/ninja/sol,
+		/obj/item/gun/projectile/pistol/m22f,
+		/obj/item/ammo_magazine/pistol/double = 2,
+		/obj/item/clothing/under/scga/utility/urban,
+		/obj/item/clothing/shoes/swat,
+		/obj/item/clothing/accessory/scga_rank/e6
+	)
+
+/obj/structure/closet/crate/ninja/gcc
+	name = "gcc equipment crate"
+	desc = "A heavy equipment crate."
+
+/obj/structure/closet/crate/ninja/gcc/WillContain()
+	return list(
+		/obj/item/rig/light/ninja/gcc,
+		/obj/item/gun/projectile/pistol/optimus,
+		/obj/item/ammo_magazine/pistol/double = 2,
+		/obj/item/ammo_magazine/box/minigun = 2,
+		/obj/item/clothing/under/iccgn/utility,
+		/obj/item/clothing/shoes/iccgn/utility,
+		/obj/item/clothing/accessory/iccgn_rank/or6
+	)
+
+/obj/structure/closet/crate/ninja/corpo
+	name = "corporate equipment crate"
+	desc = "A patented equipment crate."
+
+/obj/structure/closet/crate/ninja/corpo/WillContain()
+	return list(
+		/obj/item/rig/light/ninja/corpo,
+		/obj/item/gun/energy/gun,
+		/obj/item/inducer,
+		/obj/item/clothing/under/rank/security/corp,
+		/obj/item/clothing/shoes/swat,
+		/obj/item/clothing/accessory/badge/holo
+	)
+
+/obj/structure/closet/crate/ninja/merc
+	name = "mercenary equipment crate"
+	desc = "A traitorous equipment crate."
+
+/obj/structure/closet/crate/ninja/merc/WillContain()
+	return list(
+		/obj/item/rig/merc/ninja,
+		/obj/item/gun/projectile/revolver/medium,
+		/obj/item/ammo_magazine/speedloader = 2,
+		/obj/item/clothing/under/syndicate/combat,
+		/obj/item/clothing/shoes/swat,
+		/obj/item/clothing/mask/gas/syndicate,
+		/obj/item/storage/backpack/dufflebag/syndie_kit/plastique,
+		/obj/item/storage/box/anti_photons,
+		/obj/item/card/emag
+	)

maps/sierra/structures/closets/security.dm

@@ -22,7 +22,9 @@
 		/obj/item/device/flash,
 		/obj/item/device/megaphone,
 		/obj/item/melee/baton/loaded,
-		/obj/item/gun/energy/gun/secure,
+		/obj/item/gun/projectile/pistol/sec,
+		/obj/item/ammo_magazine/pistol/rubber,
+		/obj/item/ammo_magazine/pistol,
 		/obj/item/melee/telebaton,
 		/obj/item/device/taperecorder,
 		/obj/item/reagent_containers/spray/pepper,
@@ -35,7 +37,7 @@
 		/obj/item/crowbar/prybar,
 		/obj/item/device/radio/off,
 		/obj/item/clothing/mask/gas/half,
-		/obj/item/storage/firstaid/combat
+		/obj/item/storage/firstaid/security
 	)
 
 /obj/structure/closet/secure_closet/warden/sierra
@@ -59,7 +61,9 @@
 		/obj/item/storage/belt/holster/security,
 		/obj/item/reagent_containers/spray/pepper,
 		/obj/item/melee/baton/loaded,
-		/obj/item/gun/energy/gun/secure,
+		/obj/item/gun/projectile/pistol/sec,
+		/obj/item/ammo_magazine/pistol/rubber,
+		/obj/item/ammo_magazine/pistol,
 		/obj/item/clothing/accessory/storage/black_vest,
 		/obj/item/gun/energy/taser,
 		/obj/item/handcuffs,
@@ -73,7 +77,7 @@
 		/obj/item/crowbar/prybar,
 		/obj/item/device/radio/off,
 		/obj/item/clothing/mask/gas/half,
-		/obj/item/storage/firstaid/regular
+		/obj/item/storage/firstaid/security
 	)
 
 /obj/structure/closet/secure_closet/cabinet/forensics
@@ -92,7 +96,8 @@
 		/obj/item/device/radio/headset/headset_sec,
 		/obj/item/device/radio/headset/headset_sec/alt,
 		/obj/item/clothing/suit/armor/pcarrier/medium/nt,
-		/obj/item/gun/energy/gun/small/secure,
+		/obj/item/gun/projectile/pistol/sec,
+		/obj/item/ammo_magazine/pistol/rubber,
 		/obj/item/device/flash,
 		/obj/item/melee/baton/loaded,
 		/obj/item/reagent_containers/spray/pepper,
@@ -107,7 +112,7 @@
 		/obj/item/crowbar/prybar,
 		/obj/item/device/radio/off,
 		/obj/item/clothing/mask/gas/half,
-		/obj/item/storage/firstaid/regular
+		/obj/item/storage/firstaid/security
 	)
 
 /obj/structure/closet/secure_closet/security/sierra
@@ -130,15 +135,17 @@
 		/obj/item/taperoll/police,
 		/obj/item/device/hailer,
 		/obj/item/clothing/accessory/storage/black_vest,
-		/obj/item/gun/energy/gun/secure,
+		/obj/item/gun/projectile/pistol/sec,
+		/obj/item/ammo_magazine/pistol/rubber,
+		/obj/item/ammo_magazine/pistol,
 		/obj/item/device/megaphone,
 		/obj/item/clothing/gloves/thick,
 		/obj/item/device/holowarrant,
 		/obj/item/device/flashlight/maglight,
 		/obj/item/crowbar/prybar,
 		/obj/item/device/radio/off,
 		/obj/item/clothing/mask/gas/half,
-		/obj/item/storage/firstaid/regular
+		/obj/item/storage/firstaid/security
 	)
 
 /obj/structure/closet/secure_closet/security/sierra/cadet