Merge branch 'master' into gun-qol

_maps/RandomRuins/SandRuins/whitesands_surface_starfurycrash.dmm

@@ -34,9 +34,7 @@
 	},
 /area/overmap_encounter/planetoid/cave/explored)
 "dX" = (
-/obj/item/gun/ballistic/automatic/pistol{
-	spawnwithmagazine = 0
-	},
+/obj/item/gun/ballistic/automatic/pistol/no_mag,
 /turf/open/floor/plating/asteroid/whitesands,
 /area/overmap_encounter/planetoid/cave/explored)
 "eg" = (

_maps/RandomRuins/SpaceRuins/bigderelict1.dmm

@@ -522,9 +522,7 @@
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/derelictoutpost/powerstorage)
 "bI" = (
-/obj/item/gun/ballistic/automatic/pistol/candor{
-	spawnwithmagazine = 0
-	},
+/obj/item/gun/ballistic/automatic/pistol/candor/no_mag,
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/derelictoutpost/powerstorage)
 "bJ" = (
@@ -1333,9 +1331,7 @@
 	desc = "A thick gelatinous surface covers the floor.  Someone get the golashes.";
 	name = "gelatinous floor"
 	},
-/obj/item/gun/ballistic/automatic/pistol/candor{
-	spawnwithmagazine = 0
-	},
+/obj/item/gun/ballistic/automatic/pistol/candor/no_mag,
 /obj/item/ammo_box/magazine/m45,
 /turf/open/floor/plating/asteroid,
 /area/ruin/space/has_grav/derelictoutpost)
@@ -1493,9 +1489,7 @@
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/derelictoutpost)
 "dJ" = (
-/obj/item/gun/ballistic/automatic/pistol/candor{
-	spawnwithmagazine = 0
-	},
+/obj/item/gun/ballistic/automatic/pistol/candor/no_mag,
 /obj/structure/alien/weeds{
 	color = "#4BAE56";
 	desc = "A thick gelatinous surface covers the floor.  Someone get the golashes.";

_maps/RandomRuins/SpaceRuins/ntfacility.dmm

@@ -1619,9 +1619,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ruin/powered)
 "KJ" = (
-/obj/item/gun/ballistic/revolver/detective{
-	spawnwithmagazine = 0
-	},
+/obj/item/gun/ballistic/revolver/detective/no_mag,
 /obj/effect/decal/cleanable/blood,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt/dust,

_maps/shuttles/inteq/inteq_talos.dmm

@@ -3417,14 +3417,12 @@
 /obj/structure/sign/poster/retro/lasergun_new{
 	pixel_x = -32
 	},
-/obj/item/gun/ballistic/shotgun/bulldog/inteq{
+/obj/item/gun/ballistic/shotgun/bulldog/inteq/no_mag{
 	pixel_x = -8;
 	pixel_y = 8;
-	spawnwithmagazine = 0
 	},
-/obj/item/gun/ballistic/shotgun/bulldog/inteq{
+/obj/item/gun/ballistic/shotgun/bulldog/inteq/no_mag{
 	pixel_x = -12;
-	spawnwithmagazine = 0
 	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security/armory)

_maps/shuttles/inteq/inteq_vaquero.dmm

@@ -263,10 +263,9 @@
 /obj/item/ammo_box/magazine/co9mm{
 	pixel_x = -5
 	},
-/obj/item/gun/ballistic/shotgun/bulldog/inteq{
+/obj/item/gun/ballistic/shotgun/bulldog/inteq/no_mag{
 	pixel_x = -4;
 	pixel_y = 5;
-	spawnwithmagazine = 0
 	},
 /obj/item/gun/ballistic/automatic/pistol/commander/inteq,
 /obj/item/gun/ballistic/automatic/pistol/commander/inteq{

_maps/shuttles/syndicate/syndicate_twinkleshine.dmm

@@ -4672,8 +4672,7 @@
 	pixel_x = 6;
 	pixel_y = 1
 	},
-/obj/item/gun/ballistic/automatic/sniper_rifle/syndicate{
-	spawnwithmagazine = 0;
+/obj/item/gun/ballistic/automatic/sniper_rifle/syndicate/no_mag{
 	pixel_x = -3;
 	pixel_y = 6
 	},
@@ -5609,15 +5608,13 @@
 /area/ship/security)
 "Gm" = (
 /obj/structure/rack,
-/obj/item/gun/ballistic/automatic/ebr{
+/obj/item/gun/ballistic/automatic/ebr/no_mag{
 	pixel_x = -16;
 	pixel_y = 7;
-	spawnwithmagazine = 0
 	},
-/obj/item/gun/ballistic/automatic/ebr{
+/obj/item/gun/ballistic/automatic/ebr/no_mag{
 	pixel_x = -9;
 	pixel_y = 2;
-	spawnwithmagazine = 0
 	},
 /obj/item/ammo_box/magazine/ebr{
 	pixel_x = 10;
@@ -7502,15 +7499,13 @@
 /area/ship/hallway/aft)
 "Rv" = (
 /obj/structure/rack,
-/obj/item/gun/ballistic/shotgun/bulldog{
+/obj/item/gun/ballistic/shotgun/bulldog/no_mag{
 	pixel_x = -7;
 	pixel_y = 7;
-	spawnwithmagazine = 0
 	},
-/obj/item/gun/ballistic/shotgun/bulldog{
+/obj/item/gun/ballistic/shotgun/bulldog/no_mag{
 	pixel_y = -3;
 	pixel_x = 2;
-	spawnwithmagazine = 0
 	},
 /obj/machinery/light/directional/north,
 /obj/item/ammo_box/magazine/m12g{
@@ -8841,19 +8836,16 @@
 /area/ship/engineering/engine)
 "YO" = (
 /obj/structure/rack,
-/obj/item/gun/ballistic/automatic/smg/c20r{
+/obj/item/gun/ballistic/automatic/smg/c20r/no_mag{
 	pixel_x = 2;
 	pixel_y = 8;
-	spawnwithmagazine = 0
 	},
-/obj/item/gun/ballistic/automatic/smg/c20r{
+/obj/item/gun/ballistic/automatic/smg/c20r/no_mag{
 	pixel_y = 3;
-	spawnwithmagazine = 0
 	},
-/obj/item/gun/ballistic/automatic/smg/c20r{
+/obj/item/gun/ballistic/automatic/smg/c20r/no_mag{
 	pixel_y = -2;
 	pixel_x = 3;
-	spawnwithmagazine = 0
 	},
 /obj/item/ammo_box/magazine/smgm45,
 /obj/item/ammo_box/magazine/smgm45,

code/game/objects/items/manuals.dm

@@ -256,8 +256,8 @@
 			</style>
 			</head>
 			<body>
-			<h3>Trickwines for idiots</h3>
-			Okay, so you just joined the SRM and you want to make some brews! I'm tired of explaining all of this so I'm jotting it all down for you clowns.<br>
+			<h1>Trickwines for brewers</h1>
+			Okay, so you just joined the SRM and you want to make some brews! I'm tired of explaining all of this so I'm jotting it all down for the new hires.<br>
 			Trickwines almost all share the same effect. When you drink them, they provide a beneficial effect and when you toss them at someone it provides some sort of bad effect.
 			<h2> Breakaway flasks</h2>
 			Honestly, I love these things. I'm not a scientist so I cant exactly explain how it works but somehow when you fuse plasma into glass it makes it ultra sharp and makes it really good for cracking over fauna heads.<br>
@@ -273,22 +273,27 @@
 			Soon it will drops some apples and you can grind them for the bacteria.<br>
 			Once you have enough you can fabricate it the same way you would a normal barrel.<br>
 
+			<h2> Ratios </h2>
+			A common trend among Trickwines is the ratio of 3:1:1.<br>
+			3 parts being an ethonal, the other 2 parts are often made from flora or fauna.<br>
+
 			<h2> Ashwine </h2>
-			It's kind of our trademark, and it's one of the simplest trickwines to make. The Montagnes love using this stuff in ceremonies as well so it should get you some good boy points.<br>
+			It's kind of our trademark, and it's one of the simplest trickwines to make.<br>
+			These are the most common wines used in ceremonies so we often stock ships with the moonflowers needed to make them.<br>
 			It's made with a ratio of 3:1:1 absinthe, mushroom hallucinogen, and ash respectively.<br>
 			Mushroom hallucinogens come from mushroom caps and you can ferment absinthe from moonflowers.<br>
 			Its a mild hallucinogenic but seems to have powerful cleansing effects on the devoted SRM.<br>
 			It can also really fuck someone up, causing their vision to go shaky and blurry which makes it difficult for them to fight.<br>
 
 			<h2> Icewine </h2>
-			This one helps stopping foes in their tracks. It's also got a nice taste.
+			This one helps stopping foes in their tracks. One of my favorite flavor wise.
 			Its made with 3:1:1 saké, polar bear fur, frost oil(grind chilled peppers).<br>
 			You can get polar bear fur and frost oil from grinding up polar bear hides and chilled peppers.<br>
 			It's pretty good at sealing burns and lowering your temperature quickly.<br>
 			However, it completely encases foes in ice and drops their temperature substantially.<br>
 
 			<h2> Shockwine </h2>
-			Easily my favorite, this thing is great at scorching most fauna.<br>
+			Easily my favorite for its splashed effect, this thing is great at scorching most fauna.<br>
 			Its made with vodka, calcium, and lemon juice.<br>
 			If you did not know, vodka requires enzymes instead of the normal fermenting process.<br>
 			It's a nice upper. Great if you're trying to run away.<br>
@@ -301,15 +306,18 @@
 			Its made out of ground up fireblossems with some nice hard cider and a bit of welding fuel with of course a ratio of 3:1:1.<br>
 
 			<h2> Forcewine </h2>
-			I once had a duel with a wizard and and I was able to completly ignore a few of his spells! Its like they just fizzled out when they hit me.<br>
-			Would recomend for any esoteric senarios even though I have only been in a few of those.<br>
-			You can also use it to entrap Fauna inside of a forcefield like bubble, Gives you time to breath and laugh at them.<br>
-			3:1:1 Tequila, Space Montain Wind, and I know its strange but hollow water, Its that stuff you can extract from geysers<br>
+			Two intresting effects from the consumption of Forcewine.<br>
+			First it seems to give you an "anti magic" effect, I have read about of tales of how it fizzled out some sort of great curse that we could best trace back to a ancient cult.<br>
+			Second is it protects the mind from cohersion and mind control.<br>
+			From my research this seems to act like nanotrasen mindshield implants.<br>
+			Would recomend for any esoteric senarios. We wont see these alot but its always smart to prepare for the worst.<br>
+			You can also use it to entrap Fauna inside of a forcefield like bubble, Gives you time to breath and prepare an attack.<br>
+			3:1:1. Tequila, Space Montain Wind, and I know its one of the most difficult things to come by but hollow water, Its that stuff you can extract from geysers<br>
 
 			<h2> Prismwine </h2>
 			Gives you a nice shiny layer of armour, fire seems to have alot harder time sticking to me when i tested it.<br>
 			Throwing it seeems to do the reverse acting like a magnifying glass to burns and lasers<br>
-			Made 3:1:1 with good ol Gin, then add plasma and tinea luxor which is found from mushroom stems<br>
+			3:1:1. Good ol Gin, then add plasma and tinea luxor which is found from mushroom stems<br>
 
 			Some of these can be a bit situatinal but its always nice to have a few in your bag for emergecys.<br>
 			As a bonus, most of the other factions have no clue how to make these so you can sell them for a fair chunk of cash.<br>

code/modules/hydroponics/grown.dm

@@ -69,20 +69,19 @@
 /obj/item/reagent_containers/food/snacks/grown/attackby(obj/item/O, mob/user, params)
 	..()
 	if (istype(O, /obj/item/plant_analyzer))
-		var/msg = "<span class='info'>*---------*\n This is \a <span class='name'>[src]</span>.\n"
+		var/msg = "This is \a <span class='name'>[src]</span>.\n"
 		if(seed)
-			msg += seed.get_analyzer_text()
+			msg += "[seed.get_analyzer_text()]\n"
 		var/reag_txt = ""
 		if(seed)
 			for(var/reagent_id in seed.reagents_add)
 				var/datum/reagent/R  = GLOB.chemical_reagents_list[reagent_id]
 				var/amt = reagents.get_reagent_amount(reagent_id)
-				reag_txt += "\n<span class='info'>- [R.name]: [amt]</span>"
+				reag_txt += "<span class='info'>- [R.name]: [amt]</span>\n"
 
 		if(reag_txt)
 			msg += reag_txt
-			msg += "<br><span class='info'>*---------*</span>"
-		to_chat(user, msg)
+		to_chat(user, examine_block(msg))
 	else
 		if(seed)
 			for(var/datum/plant_gene/trait/T in seed.genes)

code/modules/hydroponics/growninedible.dm

@@ -35,11 +35,10 @@
 /obj/item/grown/attackby(obj/item/O, mob/user, params)
 	..()
 	if (istype(O, /obj/item/plant_analyzer))
-		var/msg = "<span class='info'>*---------*\n This is \a <span class='name'>[src]</span>\n"
+		var/msg = "This is \a <span class='name'>[src]</span>\n"
 		if(seed)
 			msg += seed.get_analyzer_text()
-		msg += "</span>"
-		to_chat(usr, msg)
+		to_chat(usr, examine_block(msg))
 		return
 
 /obj/item/grown/proc/add_juice()

code/modules/hydroponics/hydroponics.dm

@@ -1,3 +1,6 @@
+#define HYDRO_MAX_PEST 10
+#define HYDRO_MAX_WEED 10
+#define HYDRO_MAX_TOXIC 100
 /obj/machinery/hydroponics
 	name = "hydroponics tray"
 	icon = 'icons/obj/hydroponics/equipment.dmi'
@@ -255,7 +258,7 @@
 				adjustWeeds(1 / rating)
 
 		// Weeeeeeeeeeeeeeedddssss
-		if(weedlevel >= 10 && prob(50)) // At this point the plant is kind of fucked. Weeds can overtake the plant spot.
+		if(weedlevel >= HYDRO_MAX_WEED && prob(50)) // At this point the plant is kind of fucked. Weeds can overtake the plant spot.
 			if(myseed)
 				if(!myseed.get_gene(/datum/plant_gene/trait/plant_type/weed_hardy) && !myseed.get_gene(/datum/plant_gene/trait/plant_type/fungal_metabolism)) // If a normal plant
 					weedinvasion()
@@ -551,25 +554,26 @@
 
 	else if(istype(O, /obj/item/plant_analyzer))
 		var/obj/item/plant_analyzer/P_analyzer = O
+		var/msg = ""
 		if(myseed)
 			if(P_analyzer.scan_mode == PLANT_SCANMODE_STATS)
-				to_chat(user, examine_block("<B>[myseed.plantname]</B>"))
-				to_chat(user, examine_block("Plant Age: <span class='notice'>[age]</span>"))
+				msg += "<B>[myseed.plantname]</B>\n"
+				msg += "- Plant Age: [span_notice("[age]\n")]"
 				var/list/text_string = myseed.get_analyzer_text()
 				if(text_string)
-					to_chat(user, examine_block(text_string))
+					msg += "[text_string]\n"
 			if(myseed.reagents_add && P_analyzer.scan_mode == PLANT_SCANMODE_CHEMICALS)
-				to_chat(user, examine_block("<B>Plant Reagents</B>"))
+				msg += "<B>Plant Reagents</B>\n"
 				for(var/datum/plant_gene/reagent/Gene in myseed.genes)
-					to_chat(user, examine_block("<span class='notice'>- [Gene.get_name()] -</span>"))
+					msg += "[span_notice("- [Gene.get_name()] -")]\n"
 		else
-			to_chat(user, examine_block( "<B>No plant found.</B>"))
-		to_chat(user, examine_block("\nWeed level: <span class='notice'>[weedlevel] / 10</span>"))
-		to_chat(user, examine_block("\nPest level: <span class='notice'>[pestlevel] / 10</span>"))
-		to_chat(user, examine_block("\nToxicity level: <span class='notice'>[toxic] / 100</span>"))
-		to_chat(user, examine_block("\nWater level: <span class='notice'>[waterlevel] / [maxwater]</span>"))
-		to_chat(user, examine_block("\nNutrition level: <span class='notice'>[reagents.total_volume] / [maxnutri]</span>"))
-		to_chat(user, examine_block("<br/>"))
+			msg +=  "<B>No plant found.</B>\n"
+		msg += "Weed level: [span_notice("[weedlevel] / [HYDRO_MAX_WEED]")]\n"
+		msg += "Pest level: [span_notice("[pestlevel] / [HYDRO_MAX_PEST]")]\n"
+		msg += "Toxicity level: [span_notice("[toxic] / [HYDRO_MAX_TOXIC]")]\n"
+		msg += "Water level: [span_notice("[waterlevel] / [maxwater]")]\n"
+		msg += "Nutrition level: [span_notice("[reagents.total_volume] / [maxnutri]")]\n"
+		to_chat(user, examine_block(msg))
 		return
 
 	else if(istype(O, /obj/item/cultivator))
@@ -723,13 +727,13 @@
 		plant_health = clamp(plant_health + adjustamt, 0, myseed.endurance)
 
 /obj/machinery/hydroponics/proc/adjustToxic(adjustamt)
-	toxic = clamp(toxic + adjustamt, 0, 100)
+	toxic = clamp(toxic + adjustamt, 0, HYDRO_MAX_TOXIC)
 
 /obj/machinery/hydroponics/proc/adjustPests(adjustamt)
-	pestlevel = clamp(pestlevel + adjustamt, 0, 10)
+	pestlevel = clamp(pestlevel + adjustamt, 0, HYDRO_MAX_PEST)
 
 /obj/machinery/hydroponics/proc/adjustWeeds(adjustamt)
-	weedlevel = clamp(weedlevel + adjustamt, 0, 10)
+	weedlevel = clamp(weedlevel + adjustamt, 0, HYDRO_MAX_WEED)
 
 /obj/machinery/hydroponics/proc/spawnplant() // why would you put strange reagent in a hydro tray you monster I bet you also feed them blood
 	var/list/livingplants = list(/mob/living/simple_animal/hostile/tree, /mob/living/simple_animal/hostile/killertomato)