Misc bug fixes and corrections (#5041)

* lots of small and a few big things

* Moves the SCAF armor back in and a extra void

swaps basilisk grip for to not be rubber
adds in a medical kit to the bathroom

* harder spawns and a bit more good loot

* complie fix

* mecha fab correct

* small item desc fix

* 5 more of the rng ones + more swords and shields

* Update code/game/machinery/bioprinter_nt.dm

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

* Update bioprinter_nt.dm

* no more i-lathen for guildies

* lowers more prices for missed items

also fixes the 0.75/speed nulling

* some more missed

* Apply suggestions from code review

* mech fab fixes

* organ_fab fix

* more map fixes/tweaks

* Update _Nadezhda_Colony_New.dmm

* Update _Nadezhda_Colony_New.dmm

* Undoes all map changes

* undoes the biomatter

* missed biomatter edits to remove

* Update code/modules/projectiles/guns/energy/laser/carpediem.dm

---------

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

code/__DEFINES/research.dm

@@ -18,9 +18,7 @@
 #define PROTOLATHE		(1<<1)	//New stuff. Uses glass/metal/chemicals
 #define AUTOLATHE		(1<<2)
 #define BIOPRINTER		(1<<3)
-
 #define MECHFAB			(1<<4)
-
 #define ORGAN_GROWER	(1<<6)
 
 

code/datums/autolathe/autolathe_datums.dm

@@ -22,7 +22,9 @@
 	// An MPC file containing this design. You can use it directly, but only if it doesn't interact with the rest of MPC system. If it does, use copies.
 	var/datum/computer_file/binary/design/file
 
-
+	//Used for determing if the printer can accually print the design Mech fabs/Organ Printers ect ect
+	var/required_printer_code = FALSE
+	var/code_dex = FALSE
 
 //These procs are used in subtypes for assigning names and descriptions dynamically
 /datum/design/proc/AssembleDesignInfo(atom/temp_atom)

code/datums/autolathe/organ.dm

@@ -3,6 +3,9 @@
 	build_type = ORGAN_GROWER
 	starts_unlocked = TRUE
 
+	required_printer_code = TRUE
+	code_dex = "ORGAN_GROWER"
+
 /datum/design/organ/heart
 	materials = list(MATERIAL_BIOMATTER = 30)
 	build_path = /obj/item/organ/internal/vital/heart

code/datums/craft/recipes/guild.dm

@@ -765,7 +765,26 @@
 		list(QUALITY_SCREW_DRIVING, 40, "time" = 90),
 		list(QUALITY_WELDING, 40, "time" = 90)
 	)
-
+/*
+Thee would be able to smith tho
+tis my failing
+My deeplest sorrow for this keepsake of the rnd's hoard
+- Trilby, a SI main (somehow)
+/datum/craft_recipe/guild/autolathe_industrial
+	name = "Circuit: Industrial Autolathe"
+	result = /obj/item/circuitboard/autolathe_industrial
+	icon_state = "electronic"
+	steps = list(
+		list(/obj/item/computer_hardware/processor_unit, 2, "time" = 30),
+		list(CRAFT_MATERIAL, 1, MATERIAL_GOLD),
+		list(CRAFT_MATERIAL, 1, MATERIAL_SILVER),
+		list(/obj/item/circuitboard/autolathe, 1, "time" = 30),
+		list(/obj/item/stack/cable_coil, 5, "time" = 20),
+		list(CRAFT_MATERIAL, 2, MATERIAL_GLASS),
+		list(QUALITY_SCREW_DRIVING, 40, "time" = 40),
+		list(QUALITY_WELDING, 40, "time" = 20)
+	)
+*/
 /datum/craft_recipe/guild/matter_nanoforge
 	name = "Circuit: Matter Nano-Forge"
 	result = /obj/item/circuitboard/matter_nanoforge

code/game/machinery/autolathe/artist_bench.dm

@@ -5,6 +5,7 @@
 #define ERR_NOLICENSE "no license"
 #define ERR_PAUSED "paused"
 #define ERR_NOINSIGHT "no insight"
+#define ERR_WRONG_BUILDTYPE "cant read"
 
 /obj/machinery/autolathe/artist_bench
 	name = "artist's bench"
@@ -368,4 +369,4 @@
 #undef ERR_NOLICENSE
 #undef ERR_PAUSED
 #undef ERR_NOINSIGHT
-
+#undef ERR_WRONG_BUILDTYPE

code/game/machinery/autolathe/autolathe.dm

@@ -5,6 +5,7 @@
 #define ERR_NOLICENSE "no license"
 #define ERR_PAUSED "paused"
 #define ERR_NOINSIGHT "no insight"
+#define ERR_WRONG_BUILDTYPE "cant read"
 
 
 /obj/machinery/autolathe
@@ -21,6 +22,7 @@
 	circuit = /obj/item/circuitboard/autolathe
 
 	var/build_type = AUTOLATHE
+	var/code_dex = "AUTOLATHE" //Used in place of build_type
 
 	var/obj/item/computer_hardware/hard_drive/portable/disk
 
@@ -76,7 +78,8 @@
 		ERR_NOMATERIAL = "Not enough materials.",
 		ERR_NOREAGENT = "Not enough reagents.",
 		ERR_PAUSED = "**Construction Paused**",
-		ERR_NOINSIGHT = "Not enough insight."
+		ERR_NOINSIGHT = "Not enough insight.",
+		ERR_WRONG_BUILDTYPE = "Unable to read design."
 	)
 
 	var/tmp/datum/wires/autolathe/wires
@@ -796,6 +799,11 @@
 		if(!design_file.check_license())
 			return ERR_NOLICENSE
 
+
+		if(design_file.design.required_printer_code)
+			if(design_file.design.code_dex != code_dex)
+				return ERR_WRONG_BUILDTYPE
+
 		var/datum/design/design = design_file.design
 
 		for(var/rmat in design.materials)
@@ -1073,6 +1081,7 @@
 #undef ERR_NOLICENSE
 #undef ERR_PAUSED
 #undef ERR_NOINSIGHT
+#undef ERR_WRONG_BUILDTYPE
 
 
 // A version with some materials already loaded, to be used on map spawn

code/game/machinery/autolathe/mechfab.dm

@@ -11,7 +11,8 @@
 	have_disk = FALSE
 	have_reagents = FALSE
 	have_recycling = FALSE
-	max_efficiency = 0.5
+	max_efficiency = 0.2
+	code_dex = "MECHFAB"
 
 	special_actions = list(
 		list("action" = "sync", "name" = "Sync with R&D console", "icon" = "refresh")

code/game/machinery/bioprinter_nt.dm

@@ -4,6 +4,7 @@
 	icon_state = "bioprinter"
 	unsuitable_materials = list()
 	build_type = AUTOLATHE | BIOPRINTER
+	code_dex = "MECHFAB"
 	storage_capacity = 480
 	speed = 11
 	have_recycling = TRUE

code/game/objects/items/weapons/nt_melee.dm

@@ -470,4 +470,4 @@
 
 /obj/item/stack/thrown/nt/verutum/launchAt()
 	embed_mult = 600
-	..()
+	..()

code/game/objects/items/weapons/storage/hardcases.dm

@@ -320,6 +320,7 @@ obj/item/storage/hcases/attackby(obj/item/W, mob/user)
 		/obj/item/stock_parts,
 		/obj/item/device,
 		/obj/item/cell,
+		/obj/item/stack/nanopaste,
 		/obj/item/stack/cable_coil,
 		/obj/item/gun/projectile/boltgun/flare_gun,
 		/obj/item/ammo_casing/flare,
@@ -358,6 +359,7 @@ obj/item/storage/hcases/attackby(obj/item/W, mob/user)
 		/obj/item/reagent_containers/syringe,
 		/obj/item/storage/pill_bottle,
 		/obj/item/stack/medical,
+		/obj/item/stack/nanopaste,
 		/obj/item/clothing/mask/surgical,
 		/obj/item/clothing/head/surgery,
 		/obj/item/clothing/gloves/latex,
@@ -463,6 +465,7 @@ obj/item/storage/hcases/attackby(obj/item/W, mob/user)
 		/obj/item/clothing/head/welding,
 		/obj/item/weldpack,
 		/obj/item/material,
+		/obj/item/stack/nanopaste,
 		/obj/item/tool,
 		/obj/item/device,
 		/obj/item/stack/cable_coil,

code/game/objects/items/weapons/storage/pouches.dm

@@ -401,7 +401,7 @@ obj/item/storage/pouch/large_generic/advmedic/populate_contents()
 		)
 
 	cant_hold = list(/obj/item/storage/pouch,
-					 /obj/item/gun/projectile/automatic/sts/rifle/sawn/blackshield,
+					 /obj/item/gun/projectile/automatic/sts/rifle/blackshield/sawn,
 					 /obj/item/gun/projectile/automatic/sts/rifle/sawn,
 					 /obj/item/gun/projectile/revolver/sixshot,
 					 /obj/item/gun/energy/gun/nuclear,

code/modules/aberrants/organs/machinery/organ_fabricator.dm

@@ -20,6 +20,7 @@
 	have_recycling = FALSE
 	speed = 6
 
+	code_dex = "ORGAN_GROWER"
 	selectively_recycled_types = list(
 		/obj/item/organ,
 		/obj/item/modification/organ
@@ -106,7 +107,7 @@
 			var/choice = alert("If you deconstruct this machine, the biomatter inside will be destroyed. Are you sure you want to continue?", "Deconstruction Warning", "Deconstruct", "Leave it alone")
 			if(choice != "Deconstruct" || starting_loc != user.loc)
 				return
-	
+
 	..()
 
 /obj/machinery/autolathe/organ_fabricator/on_deconstruction(obj/item/I, mob/user)

code/modules/clothing/spacesuits/void/neotheology.dm

@@ -234,4 +234,4 @@
 		update_icon()
 		update_wear_icon()
 		usr.update_action_buttons()
-		return 1
+		return 1

code/modules/projectiles/guns/energy/laser/antebellum.dm

@@ -10,7 +10,7 @@
 	fire_sound = 'sound/weapons/energy/laser_rifle.ogg'
 	slot_flags = SLOT_BELT|SLOT_BACK
 	w_class = ITEM_SIZE_NORMAL
-	matter = list(MATERIAL_PLASTEEL = 10, MATERIAL_WOOD = 15, MATERIAL_GLASS = 5, MATERIAL_SILVER = 3, MATERIAL_GOLD = 1, MATERIAL_BIOMATTER = 30)
+	matter = list(MATERIAL_PLASTEEL = 15, MATERIAL_WOOD = 10, MATERIAL_GLASS = 3, MATERIAL_SILVER = 3, MATERIAL_GOLD = 1, MATERIAL_BIOMATTER = 15)
 	suitable_cell = /obj/item/cell/medium/neotheology
 	projectile_type = /obj/item/projectile/plasma/light
 	fire_delay = 15

code/modules/projectiles/guns/energy/laser/carpediem.dm

@@ -9,7 +9,7 @@
 	fire_sound = 'sound/weapons/energy/lasmusket_fire.ogg'
 	slot_flags = SLOT_BACK
 	w_class = ITEM_SIZE_BULKY
-	matter = list(MATERIAL_PLASTEEL = 15, MATERIAL_WOOD = 10, MATERIAL_GLASS = 3, MATERIAL_SILVER = 3, MATERIAL_GOLD = 1, MATERIAL_BIOMATTER = 15)
+	matter = list(MATERIAL_PLASTEEL = 40, MATERIAL_WOOD = 25, MATERIAL_GLASS = 15, MATERIAL_SILVER = 5, MATERIAL_GOLD = 5)
 	projectile_type = /obj/item/projectile/beam/musket
 	fire_delay = 35
 	charge_cost = 150 // 4 shots on a 600M

code/modules/projectiles/guns/energy/laser/concilium.dm

@@ -10,7 +10,7 @@
 	fire_sound = 'sound/weapons/energy/laser_rifle.ogg' // Big unwieldy gun, despite the shit lasers
 	slot_flags = null
 	w_class = ITEM_SIZE_HUGE
-	matter = list(MATERIAL_PLASTEEL = 40, MATERIAL_WOOD = 25, MATERIAL_GLASS = 15, MATERIAL_SILVER = 5, MATERIAL_GOLD = 5)
+	matter = list(MATERIAL_PLASTEEL = 30, MATERIAL_WOOD = 25, MATERIAL_GLASS = 10, MATERIAL_SILVER = 5, MATERIAL_GOLD = 5)
 	projectile_type = /obj/item/projectile/beam/drone
 	init_recoil = CARBINE_RECOIL(2)
 	fire_delay = 2

code/modules/projectiles/guns/oddity_items.dm

@@ -99,6 +99,8 @@
 	init_recoil = LMG_RECOIL(0.5)
 	serial_type = "BlueCross"
 	excelsior = FALSE
+	gun_parts = list(/obj/item/part/gun/frame/maxim = 1, /obj/item/part/gun/grip/black = 1, /obj/item/part/gun/mechanism/machinegun = 1, /obj/item/part/gun/barrel/lrifle = 1)
+
 
 /obj/item/gun/energy/lasersmg/inferno
 	name = "Disco Inferno \"Light Show\""
@@ -226,7 +228,7 @@
 /obj/item/gun/energy/xray/psychic_cannon
 	name = "\"Manta-RAY\" cannon"
 	desc = "An anomalous weapon created by an unknown person (or group?), their work marked by a blue cross, these weapons are known to vanish and reappear when left alone. \
-			An unusual gun sought after by the Soteria when it appears for both its utility and its research value. It's durasteel interior and unknown technological function allows \
+			An unusual gun sought after by the Soteria when it appears for both its utility and its research value. It's unknown technological function allows \
 			this weapon to use moderately high damage armor penetrating x-ray laser blasts. While a strict step up from a standard x-ray weapon in all ways, this weapon is more valued for \
 			its research points in the deconstrustive analyzer."
 	icon = 'icons/obj/guns/energy/psychiccannon.dmi'

code/modules/projectiles/guns/projectile/automatic/ak47.dm

@@ -127,7 +127,7 @@
 	saw_off = TRUE
 	sawn = /obj/item/gun/projectile/automatic/ak47/sa/sawn
 	serial_type = "SA"
-	gun_parts = list(/obj/item/part/gun/frame/ak47 = 1, /obj/item/part/gun/grip/serb = 1, /obj/item/part/gun/mechanism/autorifle = 1, /obj/item/part/gun/barrel/lrifle = 1)
+	gun_parts = list(/obj/item/part/gun/frame/ak47 = 1, /obj/item/part/gun/grip/wood = 1, /obj/item/part/gun/mechanism/autorifle = 1, /obj/item/part/gun/barrel/lrifle = 1)
 
 /obj/item/gun/projectile/automatic/ak47/sa/sawn
 	name = "sawn-off \"Kalashnikov\" rifle"
@@ -148,7 +148,7 @@
 	serial_type = "SA"
 	wield_delay = 0.8 SECOND
 	wield_delay_factor = 0.2 // 20 vig for insta wield
-	gun_parts = list(/obj/item/part/gun/frame/ak47 = 1, /obj/item/part/gun/grip/serb = 1, /obj/item/part/gun/mechanism/autorifle = 1, /obj/item/stack/material/plasteel = 2)
+	gun_parts = list(/obj/item/part/gun/grip/wood = 1, /obj/item/part/gun/mechanism/autorifle = 1, /obj/item/stack/material/plasteel = 2)
 
 /obj/item/gun/projectile/automatic/ak47/sa/tac
 	name = "Breacher \"Kalashnikov\" rifle"
@@ -160,6 +160,7 @@
 	item_state = "AK"
 	price_tag = 1250
 	init_recoil = RIFLE_RECOIL(0.8)
+	matter = list(MATERIAL_PLASTEEL = 25, MATERIAL_PLASTIC = 15)
 	saw_off = FALSE
 	serial_type = "SA"
 	gun_parts = list(/obj/item/part/gun/frame/ak47 = 1, /obj/item/part/gun/grip/rubber = 1, /obj/item/part/gun/mechanism/autorifle = 1, /obj/item/part/gun/barrel/lrifle = 1)
@@ -239,7 +240,7 @@
 	price_tag = 500
 	serial_type = "INDEX"
 	serial_shown = FALSE
-	gun_parts = list(/obj/item/part/gun/frame/kalash = 1, /obj/item/part/gun/grip/black = 1, /obj/item/part/gun/mechanism/autorifle/steel = 1, /obj/item/part/gun/barrel/lrifle/steel = 1)
+	gun_parts = list(/obj/item/part/gun/frame/kalash = 1, /obj/item/part/gun/grip/wood = 1, /obj/item/part/gun/mechanism/autorifle/steel = 1, /obj/item/part/gun/barrel/lrifle/steel = 1)
 
 /obj/item/gun/projectile/automatic/ak47/makeshift/update_icon()
 	..()
@@ -265,7 +266,7 @@
 	icon_state = "frame_kalash"
 	matter = list(MATERIAL_STEEL = 10)
 	resultvars = list(/obj/item/gun/projectile/automatic/ak47/makeshift)
-	gripvars = list(/obj/item/part/gun/grip/black)
+	gripvars = list(/obj/item/part/gun/grip/wood)
 	mechanismvar = /obj/item/part/gun/mechanism/autorifle/steel
 	barrelvars = list(/obj/item/part/gun/barrel/lrifle/steel, /obj/item/part/gun/barrel/srifle/steel)	//6.5mm or 7.62mm.
 	nra = FALSE		//This controls if the weapon checks for barrels or not. If you want a gun to have MULTIPLE calibers that it can be chambered in, put FALSE.

code/modules/projectiles/guns/projectile/automatic/lmg.dm

@@ -20,7 +20,7 @@
 	mag_well = MAG_WELL_LINKED_BOX
 	caliber = CAL_RIFLE
 	tac_reloads = FALSE
-	matter = list(MATERIAL_PLASTEEL = 40, MATERIAL_PLASTIC = 15, MATERIAL_WOOD = 5)
+	matter = list(MATERIAL_PLASTEEL = 40, MATERIAL_PLASTIC = 20)
 	price_tag = 2000
 	unload_sound 	= 'sound/weapons/guns/interact/lmg_magout.ogg'
 	reload_sound 	= 'sound/weapons/guns/interact/lmg_magin.ogg'
@@ -111,6 +111,7 @@
 	icon_state = "pk_closed"
 	item_state = "pk_closed"
 	damage_multiplier = 1.0 // This becomes x0.8 as forced full auto modes incurr 20% damage penalty.
+	matter = list(MATERIAL_PLASTEEL = 40, MATERIAL_PLASTIC = 15, MATERIAL_WOOD = 5)
 	init_firemodes = list(
 		BURST_5_ROUND,
 		BURST_8_ROUND,

code/modules/projectiles/guns/projectile/automatic/maxim.dm

@@ -17,7 +17,7 @@
 	load_method = SINGLE_CASING|MAGAZINE
 	mag_well = MAG_WELL_PAN
 	tac_reloads = FALSE
-	matter = list(MATERIAL_PLASTEEL = 42, MATERIAL_PLASTIC = 15, MATERIAL_WOOD = 5)
+	matter = list(MATERIAL_PLASTEEL = 42, MATERIAL_PLASTIC = 20)
 	price_tag = 2500
 	unload_sound 	= 'sound/weapons/guns/interact/lmg_magout.ogg'
 	reload_sound 	= 'sound/weapons/guns/interact/lmg_magin.ogg'

code/modules/projectiles/guns/projectile/automatic/nordwind.dm

@@ -104,7 +104,7 @@
 	w_class = ITEM_SIZE_NORMAL
 	slot_flags = SLOT_BACK|SLOT_BELT
 	matter = list(MATERIAL_PLASTEEL = 5, MATERIAL_STEEL = 6, MATERIAL_WOOD = 5)
-	gun_parts = list(/obj/item/part/gun/frame/strelki = 1, /obj/item/part/gun/grip/wood = 1, /obj/item/part/gun/mechanism/autorifle = 1, /obj/item/stack/material/plasteel = 2)
+	gun_parts = list(/obj/item/part/gun/grip/wood = 1, /obj/item/part/gun/mechanism/autorifle = 1, /obj/item/stack/material/plasteel = 2)
 	price_tag = 450
 	zoom_factors = list()
 	init_recoil = SMG_RECOIL(2.3)

code/modules/projectiles/guns/projectile/automatic/solmarine.dm

@@ -84,7 +84,7 @@
 	slot_flags = SLOT_BELT|SLOT_HOLSTER
 	w_class = ITEM_SIZE_SMALL
 	matter = list(MATERIAL_PLASTEEL = 6, MATERIAL_PLASTIC = 3)
-	gun_parts = list(/obj/item/part/gun/frame/solmarine = 1, /obj/item/part/gun/grip/serb = 1, /obj/item/part/gun/mechanism/autorifle = 1, /obj/item/stack/material/plasteel = 2)
+	gun_parts = list(/obj/item/part/gun/grip/serb = 1, /obj/item/part/gun/mechanism/autorifle = 1, /obj/item/stack/material/plasteel = 2)
 	can_dual = TRUE
 	init_recoil = CARBINE_RECOIL(1.2)
 	init_firemodes = list(
@@ -106,6 +106,7 @@
 	price_tag = 650
 	icon_state = "solmarine"
 	item_state = "solmarine"
+	gun_parts = list(/obj/item/part/gun/grip/serb = 1, /obj/item/part/gun/mechanism/autorifle = 1, /obj/item/stack/material/plasteel = 2)
 	shotgun_haver = FALSE
 	init_firemodes = list(
 		SEMI_AUTO_NODELAY,