Removes illegal tech from legally bought suppressors' deconstructor v…

…alue (#582) * Removes suppressor from illegal tech * Removes suppressor from illegal tech * Makes a subtype of suppressor that are considered legal Syndicate ones are now their own type. * Update tgstation.dme * Update armament_utility.dm Co-authored-by: Bloop <[email protected]>
Fluffy-Frontier · Nov 12, 2023 · 0668731 · 0668731
1 parent 498256a
commit 0668731
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 27 deletions.
diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
@@ -723,7 +723,7 @@ GLOBAL_LIST_INIT(gun_saw_types, typecacheof(list(
 
 /obj/item/suppressor
 	name = "suppressor"
-	desc = "A small-arms suppressor for maximum espionage." //SKYRAT EDIT - ORIGINAL: desc = "A syndicate small-arms suppressor for maximum espionage."
+	desc = "A syndicate small-arms suppressor for maximum espionage."
 	icon = 'icons/obj/weapons/guns/ballistic.dmi'
 	icon_state = "suppressor"
 	w_class = WEIGHT_CLASS_TINY
diff --git a/modular_skyrat/master_files/code/modules/projectiles/guns/ballistic/suppressor.dm b/modular_skyrat/master_files/code/modules/projectiles/guns/ballistic/suppressor.dm
@@ -0,0 +1,2 @@
+/obj/item/suppressor/standard
+	desc = "A small-arms suppressor for maximum espionage."
diff --git a/modular_skyrat/master_files/code/modules/research/techweb/all_nodes.dm b/modular_skyrat/master_files/code/modules/research/techweb/all_nodes.dm
@@ -27,28 +27,27 @@
 
 //Base Nodes
 /datum/techweb_node/base/New()
-	. = ..()
 	design_ids += list(
 		"polarizer",
 		"vox_gas_filter",
 	)
+	return ..()
 
 /datum/techweb_node/cyborg/New()
-	. = ..()
 	design_ids += list(
 		"affection_module",
 	)
+	return ..()
 
 /datum/techweb_node/basic_tools/New()
-	. = ..()
 	design_ids += list(
 		"bowl",
 		"drinking_glass",
 		"shot_glass",
 	)
+	return ..()
 
 /datum/techweb_node/basic_medical/New()
-	. = ..()
 	design_ids += list(
 		"hospital_gown",
 		"synth_eyes",
@@ -59,11 +58,11 @@
 		"synth_ears",
 		"synth_heart",
 	)
+	return ..()
 
 /////////////////////////Biotech/////////////////////////
 
 /datum/techweb_node/adv_biotech/New()
-	. = ..()
 	design_ids += list(
 		"monkey_helmet",
 		"brute2medicell",
@@ -75,33 +74,33 @@
 		"bodymedicell",
 		"clotmedicell",
 	)
+	return ..()
 
 /datum/techweb_node/biotech/New()
-	. = ..()
 	design_ids += list(
 		"anesthetic_machine",
 		"smartdartgun",
 	)
+	return ..()
 
 /////////////////////////EMP tech/////////////////////////
 
 /datum/techweb_node/emp_basic/New()
-	. = ..()
 	design_ids += list(
 		"gownmedicell",
 		"bedmedicell",
 	)
+	return ..()
 
 ////////////////////////Computer tech////////////////////////
 
 /datum/techweb_node/comptech/New()
-	. = ..()
 	design_ids += list(
 		"time_clock_frame",
 	)
+	return ..()
 
 /datum/techweb_node/integrated_hud/New()
-	. = ..()
 	design_ids += list(
 		"health_hud_prescription",
 		"security_hud_prescription",
@@ -127,20 +126,21 @@
 		"nifsoft_hud_diagnostic",
 		"nifsoft_hud_cargo",
 	)
+	return ..()
 
 ////////////////////////Medical////////////////////////
 
 /datum/techweb_node/genetics/New()
-	. = ..()
 	design_ids += list(
 		"self_actualization_device",
 	)
+	return ..()
 
 /datum/techweb_node/cyber_organs/New()
-	. = ..()
 	design_ids += list(
 		"cybernetic_tongue",
 	)
+	return ..()
 
 // Modularly removes x-ray and thermals from here, it's in adv_vision instead
 /datum/techweb_node/combat_cyber_implants/New()
@@ -155,102 +155,103 @@
 ////////////////////////Tools////////////////////////
 
 /datum/techweb_node/botany/New()
-	. = ..()
 	design_ids += list(
 		"salvemedicell",
 	)
+	return ..()
 
 /datum/techweb_node/sec_basic/New()
 	. = ..()
 	design_ids += list(
 		"nifsoft_remover",
 	)
+	return ..()
 
 /////////////////////////weaponry tech/////////////////////////
 
 /datum/techweb_node/weaponry/New()
-	. = ..()
 	design_ids += list(
 		"ammoworkbench_disk_lethal",
 	)
+	return ..()
 
 /datum/techweb_node/adv_weaponry/New()
-	. = ..()
 	design_ids += list(
 		"ammo_workbench",
 	)
+	return ..()
 
 /datum/techweb_node/electric_weapons/New()
-	. = ..()
 	design_ids += list(
 		"medigun_speed",
 	)
+	return ..()
 
 ////////////////////////Alien technology////////////////////////
 
 /datum/techweb_node/alien_bio/New()
-	. = ..()
 	design_ids += list(
 		"brute3medicell",
 		"burn3medicell",
 		"oxy3medicell",
 		"toxin3medicell",
 	)
+	return ..()
 
 /////////////////////////engineering tech/////////////////////////
 
 /datum/techweb_node/adv_engi/New()
-	. = ..()
 	design_ids += list(
 		"engine_goggles_prescription",
 		"mesons_prescription",
 		"multi_cell_charger",
 		"tray_goggles_prescription",
 		"plumbing_eng",
 	)
+	return ..()
 
 /////////////////////////robotics tech/////////////////////////
 
 /datum/techweb_node/robotics/New()
-	. = ..()
 	design_ids += list(
 		"borg_upgrade_snacks",
 		"mini_soulcatcher",
 	)
+	return ..()
 
 /datum/techweb_node/neural_programming/New()
-	. = ..()
 	design_ids += list(
 		"soulcatcher_device",
 		"rsd_interface",
 	)
+	return ..()
 
 /datum/techweb_node/cyborg_upg_util/New()
-	. = ..()
 	design_ids += list(
 		"borg_upgrade_clamp",
 		"borg_upgrade_brush",
 	)
+	return ..()
 
 /datum/techweb_node/cyborg_upg_engiminer/New()
-	. = ..()
 	design_ids += list(
 		"advanced_materials",
 		"inducer_module",
 	)
+	return ..()
 
 /datum/techweb_node/cyborg_upg_med/New()
-	. = ..()
 	design_ids += list(
 		"borg_upgrade_surgicaltools",
 	)
 
 	design_ids -= list(
 		"borg_upgrade_pinpointer",
 	)
+	return ..()
 
 /datum/techweb_node/basic_mining/New()
-	. = ..()
 	design_ids += list(
 		"borg_upgrade_welding",
 	)
+	return ..()
diff --git a/modular_skyrat/modules/black_mesa/code/armaments/armament_utility.dm b/modular_skyrat/modules/black_mesa/code/armaments/armament_utility.dm
@@ -57,7 +57,7 @@
 	cost = 1
 
 /datum/armament_entry/hecu/utility/suppressor
-	item_type = /obj/item/suppressor
+	item_type = /obj/item/suppressor/standard
 	max_purchase = 4
 	cost = 2
 

diff --git a/modular_skyrat/modules/company_imports/code/armament_datums/vitezstvi_ammo.dm b/modular_skyrat/modules/company_imports/code/armament_datums/vitezstvi_ammo.dm
@@ -25,7 +25,7 @@
 	subcategory = "Weapon Accessories"
 
 /datum/armament_entry/company_import/vitezstvi/accessory/suppressor
-	item_type = /obj/item/suppressor
+	item_type = /obj/item/suppressor/standard
 	cost = PAYCHECK_COMMAND
 
 /datum/armament_entry/company_import/vitezstvi/accessory/small_case

diff --git a/modular_skyrat/modules/novaya_ert/code/outfit.dm b/modular_skyrat/modules/novaya_ert/code/outfit.dm
@@ -113,7 +113,7 @@
 	backpack_contents = list(/obj/item/storage/box/nri_survival_pack,
 							/obj/item/ammo_box/n762,
 							/obj/item/ammo_box/n762,
-							/obj/item/suppressor,
+							/obj/item/suppressor/standard,
 							/obj/item/knife/combat,
 							/obj/item/beamout_tool)
 	l_pocket = null

diff --git a/tgstation.dme b/tgstation.dme
@@ -6322,6 +6322,7 @@
 #include "modular_skyrat\master_files\code\modules\projectiles\guns\ballistic.dm"
 #include "modular_skyrat\master_files\code\modules\projectiles\guns\energy.dm"
 #include "modular_skyrat\master_files\code\modules\projectiles\guns\ballistic\revolver.dm"
+#include "modular_skyrat\master_files\code\modules\projectiles\guns\ballistic\suppressor.dm"
 #include "modular_skyrat\master_files\code\modules\projectiles\guns\ballistic\bows\_bow.dm"
 #include "modular_skyrat\master_files\code\modules\projectiles\guns\ballistic\bows\bow_quivers.dm"
 #include "modular_skyrat\master_files\code\modules\projectiles\guns\ballistic\bows\bow_types.dm"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		/obj/item/suppressor/standard
		desc = "A small-arms suppressor for maximum espionage."