Mass Changes: Part 3b

CeladonSS13 · Oct 7, 2024 · 1f4e1ac · 1f4e1ac
1 parent 14b3da7
commit 1f4e1ac
Show file tree

Hide file tree

Showing 203 changed files with 855 additions and 242 deletions.
diff --git a/burgerstation.dme b/burgerstation.dme
@@ -1707,12 +1707,12 @@
 #include "code\_core\obj\item\material\ingot.dm"
 #include "code\_core\obj\item\material\ore.dm"
 #include "code\_core\obj\item\material\pellets.dm"
+#include "code\_core\obj\item\material\plank.dm"
 #include "code\_core\obj\item\material\rod.dm"
 #include "code\_core\obj\item\material\shard.dm"
 #include "code\_core\obj\item\material\sheet.dm"
 #include "code\_core\obj\item\material\sheet_types.dm"
 #include "code\_core\obj\item\material\trash_cube.dm"
-#include "code\_core\obj\item\material\wood.dm"
 #include "code\_core\obj\item\organs\_organs.dm"
 #include "code\_core\obj\item\organs\antennae.dm"
 #include "code\_core\obj\item\organs\arms.dm"

diff --git a/code/__defines/soul.dm b/code/__defines/soul.dm
@@ -3,4 +3,4 @@
 #define SOUL_SIZE_UNCOMMON 2500
 #define SOUL_SIZE_RARE 5000
 #define SOUL_SIZE_MYSTIC 10000
-#define SOUL_SIZE_GODLY 30000
+#define SOUL_SIZE_GODLY 20000
diff --git a/code/_core/client/verbs/debug.dm b/code/_core/client/verbs/debug.dm
@@ -35,7 +35,9 @@ var/global/static/list/debug_verbs = list(
 	/client/verb/debug_lighting,
 	/client/verb/complete_all_objectives,
 	/client/verb/get_far_viewers,
-	/client/verb/get_active_ais_not_in_player_range
+	/client/verb/get_active_ais_not_in_player_range,
+	/client/verb/check_value_of_loadouts,
+	/client/verb/check_unobtainable_items
 )
 
 
@@ -469,7 +471,7 @@ var/global/static/list/destroy_everything_whitelist = list(
 
 	for(var/k in subtypesof(/obj/item/weapon/ranged))
 		var/obj/item/weapon/ranged/R = k
-		if(initial(R.value) <= 0)
+		if(initial(R.value) < 0)
 			continue
 		R = new R(T)
 		INITIALIZE(R)
@@ -793,4 +795,62 @@ var/global/static/list/destroy_everything_whitelist = list(
 
 	final_text = "<h1>Found [bad_ais] AIs away from players.</h1>[final_text]"
 
-	src << browse("<head><style>[STYLESHEET]</style></head><body>[final_text ? final_text : "No Bad AIs found. Yay!"]</body>","window=garbage")
+	src << browse("<head><style>[STYLESHEET]</style></head><body>[final_text ? final_text : "No Bad AIs found. Yay!"]</body>","window=garbage")
+
+
+
+/client/verb/check_value_of_loadouts()
+
+	set name = "Check Value of Loadouts"
+	set category = "Debug"
+
+	var/list/mob_to_value = list()
+
+	for(var/k in subtypesof(/mob/living/advanced/))
+		var/mob/living/advanced/A = k
+		var/loadout/L = initial(A.loadout)
+		if(!L)
+			continue
+		L = SSloadouts.all_loadouts[L]
+		if(!L)
+			continue
+
+		var/total_value = 0
+		for(var/j in L.get_spawning_items())
+			if(ispath(j,/loot/))
+				var/loot/spawning_loot = LOOT(j)
+				total_value += spawning_loot.average_value
+			else
+				var/obj/item/I = j
+				var/value = SSbalance.stored_value[I]
+				if(value)
+					total_value += value
+				else
+
+
+		mob_to_value[A] = total_value
+
+
+	sort_tim(mob_to_value,/proc/cmp_numeric_dsc,associative=TRUE)
+
+	var/final_list = ""
+
+	for(var/k in mob_to_value)
+		var/v = mob_to_value[k]
+		final_list += "[k]: [v]cr<br>"
+
+	src << browse("<head><style>[STYLESHEET]</style></head><body>[final_list]</body>","window=loadoutvalue")
+
+
+/client/verb/check_unobtainable_items()
+
+	set name = "Check Unobtainable Items"
+	set category = "Debug"
+
+	var/final_list = ""
+
+	for(var/k in SSloot.unobtainable_items)
+		var/v = SSloot.unobtainable_items[k]
+		final_list += "[k]: [v]cr<br>"
+
+	src << browse("<head><style>[STYLESHEET]</style></head><body>[final_list]</body>","window=loadoutvalue")
diff --git a/code/_core/datum/loadout/assistant.dm b/code/_core/datum/loadout/assistant.dm
@@ -9,7 +9,7 @@
 		/obj/item/clothing/feet/shoes/colored/black,
 		/obj/item/clothing/feet/shoes/colored/black/left,
 		/obj/item/clothing/back/storage/satchel/loadout/new_player,
-		/obj/item/clothing/ears/headset,
+		/obj/item/clothing/ears/headset/nanotrasen,
 		/obj/item/weapon/melee/toolbox/blue
 	)
 

diff --git a/code/_core/datum/loadout/blood_fiend.dm b/code/_core/datum/loadout/blood_fiend.dm
@@ -20,17 +20,9 @@
 		/loot/rings/major,
 		/loot/rings/horseman,
 
+		/obj/item/storage/pouch/single/black,
 		/obj/item/storage/pouch/triple/black,
 
-		/obj/item/weapon/ranged/bullet/revolver/fiendish,
-		/obj/item/bullet_cartridge/pistol_45{amount=6},
-		/obj/item/bullet_cartridge/pistol_45{amount=6},
-		/obj/item/bullet_cartridge/pistol_45{amount=6},
-		/obj/item/bullet_cartridge/pistol_45{amount=6},
-		/obj/item/bullet_cartridge/pistol_45{amount=6},
-		/obj/item/bullet_cartridge/pistol_45{amount=6},
-		/obj/item/bullet_cartridge/pistol_45{amount=6},
-
 	)
 
 	var/list/possible_weapons = list(
@@ -39,9 +31,19 @@
 		/obj/item/weapon/melee/sword/cblade
 	)
 
+	var/list/thegun = list(
+		/obj/item/weapon/ranged/bullet/revolver/fiendish,
+		/obj/item/bullet_cartridge/pistol_45{amount=6},
+		/obj/item/bullet_cartridge/pistol_45{amount=6},
+		/obj/item/bullet_cartridge/pistol_45{amount=6},
+	)
+
 /loadout/blood_fiend/get_spawning_items()
 
 	. = ..()
 
 	if(length(possible_weapons))
-		. += pickweight(possible_weapons)
+		. += pickweight(possible_weapons)
+
+	if(length(thegun))
+		. += thegun
diff --git a/code/_core/datum/loadout/gopro.dm b/code/_core/datum/loadout/gopro.dm
@@ -4,12 +4,13 @@
 		/obj/item/clothing/overwear/coat/vest/poly/pockets_only,
 
 		/obj/item/storage/pouch/triple/black,
-		/obj/item/storage/pouch/triple/black,
+		/obj/item/storage/pouch/single/black,
 
 		/obj/item/clothing/belt/storage/colored/black,
 
-		/obj/item/weapon/melee/slaughterclaws,
 		/obj/item/weapon/ranged/bullet/revolver/big_game,
+		/obj/item/weapon/melee/slaughterclaws,
+
 		/obj/item/bullet_cartridge/revolver_300{amount=5},
 		/obj/item/bullet_cartridge/revolver_300{amount=5},
 		/obj/item/bullet_cartridge/revolver_300{amount=5},

diff --git a/code/_core/datum/loadout/hos.dm b/code/_core/datum/loadout/hos.dm
@@ -1,6 +1,6 @@
 /loadout/hos
 	spawning_items = list(
-		/obj/item/clothing/ears/headset,
+		/obj/item/clothing/ears/headset/nanotrasen,
 
 		/obj/item/clothing/feet/shoes/black_boots,
 		/obj/item/clothing/feet/shoes/black_boots/left,

diff --git a/code/_core/datum/loadout/nanotasen/cargo_tech.dm b/code/_core/datum/loadout/nanotasen/cargo_tech.dm
@@ -12,10 +12,9 @@
 		/obj/item/clothing/neck/tie/red,
 		/obj/item/clothing/belt/storage/colored/brown,
 		/obj/item/storage/pouch/triple/brown,
-		/obj/item/storage/pouch/triple/brown,
-		/obj/item/weapon/melee/baton,
+		/obj/item/storage/pouch/single/brown,
 		/obj/item/weapon/ranged/bullet/magazine/rifle/ak47,
-		/obj/item/magazine/rifle_762_short,
+		/obj/item/weapon/melee/baton,
 		/obj/item/magazine/rifle_762_short,
 		/obj/item/magazine/rifle_762_short,
 		/obj/item/magazine/rifle_762_short,

diff --git a/code/_core/datum/loadout/nanotasen/head/cmo.dm b/code/_core/datum/loadout/nanotasen/head/cmo.dm
@@ -2,7 +2,7 @@
 
 	spawning_items = list(
 
-		/obj/item/clothing/ears/headset,
+		/obj/item/clothing/ears/headset/nanotrasen/medical,
 
 		/obj/item/clothing/shirt/normal/medical,
 		/obj/item/clothing/pants/normal/medical,

diff --git a/code/_core/datum/loadout/new_player.dm b/code/_core/datum/loadout/new_player.dm
@@ -9,7 +9,7 @@
 		/obj/item/clothing/feet/shoes/colored/black,
 		/obj/item/clothing/feet/shoes/colored/black/left,
 		/obj/item/clothing/back/storage/satchel/loadout/new_player,
-		/obj/item/clothing/ears/headset
+		/obj/item/clothing/ears/headset/nanotrasen
 	)
 
 /loadout/new_player/female
@@ -23,5 +23,5 @@
 		/obj/item/clothing/feet/shoes/colored/black,
 		/obj/item/clothing/feet/shoes/colored/black/left,
 		/obj/item/clothing/back/storage/satchel/loadout/new_player,
-		/obj/item/clothing/ears/headset
+		/obj/item/clothing/ears/headset/nanotrasen
 	)
diff --git a/code/_core/datum/loot/random.dm b/code/_core/datum/loot/random.dm
@@ -29,7 +29,7 @@
 	for(var/k in get_base_types())
 		var/obj/item/I = k
 		var/value = SSbalance.stored_value[k]
-		if(value <= 0)
+		if(!value || value <= 0)
 			continue
 		if(value < value_min)
 			continue

diff --git a/code/_core/obj/item/_item.dm b/code/_core/obj/item/_item.dm
@@ -158,7 +158,7 @@
 
 	density = TRUE
 
-	value = 0
+	value = -1
 
 	allow_path = TRUE
 
@@ -234,6 +234,12 @@
 /obj/item/Cross(atom/movable/O,atom/oldloc)
 	return TRUE
 
+/obj/item/New(var/desired_loc)
+	. = ..()
+	if(value <= -1)
+		log_error("Warning: [src.type] had a value of [value], but it was still able to be spawned!")
+		value = 0
+
 /obj/item/Finalize()
 
 	. = ..()
@@ -247,6 +253,10 @@
 	if(is_turf(loc))
 		layer = initial(layer) + clamp(value / 10000,0,0.999)
 
+	if(value <= -1)
+		log_error("Warning: [src.type] had a value of [value], but it was still able to be spawned!")
+		value = 0
+
 /obj/item/get_base_value()
 	. = initial(value) * amount
 	if(quality != -1)

diff --git a/code/_core/obj/item/ability_learner/_ability_learner.dm b/code/_core/obj/item/ability_learner/_ability_learner.dm
@@ -11,8 +11,6 @@
 
 	var/ability/stored_ability
 
-	value = 0
-
 /obj/item/ability_learner/Finalize()
 	. = ..()
 	if(!stored_ability)

diff --git a/code/_core/obj/item/attachment/attachment_sight.dm b/code/_core/obj/item/attachment/attachment_sight.dm
@@ -126,4 +126,5 @@
 	)
 
 /obj/item/attachment/sight/m4
-	icon_state = "m4sight"
+	icon_state = "m4sight"
+	value = 1
diff --git a/code/_core/obj/item/ball.dm b/code/_core/obj/item/ball.dm
@@ -97,6 +97,7 @@
 	desc = "Also known as a football."
 	desc_extended = "You kick this. I guess you can throw this too."
 	icon_state = "soccer"
+	value = 10
 
 /obj/item/ball/soccer/get_examine_list(var/mob/examiner)
 	. = ..()

diff --git a/code/_core/obj/item/bank_storage.dm b/code/_core/obj/item/bank_storage.dm
@@ -22,6 +22,10 @@
 
 	queue_delete_immune = TRUE
 
+	value = 0
+
+	can_save = FALSE
+
 /obj/item/bank_storage/is_safe_to_delete(var/check_loc = TRUE)
 	return FALSE
 

diff --git a/code/_core/obj/item/bullet/pistol.dm b/code/_core/obj/item/bullet/pistol.dm
@@ -369,7 +369,7 @@
 
 	penetrations = 1
 
-/obj/item/bullet_cartridge/pistol_45holy/
+/obj/item/bullet_cartridge/pistol_45holy
 	name = "\improper Holy .45 pistol cartridge"
 	desc = "Joshua Graham style."
 	desc_extended = "For pistols and smgs that require holy .45 ammo."
@@ -380,6 +380,7 @@
 
 	bullet_diameter = 11.77
 	bullet_length = 24
+
 	bullet_color = COLOR_SILVER
 
 	projectile = /obj/projectile/bullet/firearm/smg

diff --git a/code/_core/obj/item/clothing/_clothing.dm b/code/_core/obj/item/clothing/_clothing.dm
@@ -31,7 +31,7 @@
 
 	can_wear = TRUE
 
-	value = 0
+
 
 	var/speed_bonus = 0
 

diff --git a/code/_core/obj/item/clothing/belt/bandolier.dm b/code/_core/obj/item/clothing/belt/bandolier.dm
@@ -8,7 +8,7 @@
 	dyeable = TRUE
 
 
-	value = 0
+	value = -1
 	size = SIZE_3
 
 	var/list/stored_shells = list()

diff --git a/code/_core/obj/item/clothing/ears/headsets.dm b/code/_core/obj/item/clothing/ears/headsets.dm
@@ -1,10 +1,12 @@
 /obj/item/clothing/ears/headset
-	name = "nanotrasen headset"
+	name = "generic headset"
 	desc = "; HELP MAINT!"
 	desc_extended = "A headset for communicating with your fellows."
 	icon = 'icons/obj/item/clothing/ears/headset.dmi'
 
-	var/obj/item/device/radio/stored_radio = /obj/item/device/radio/headset/nanotrasen
+	var/obj/item/device/radio/stored_radio = /obj/item/device/radio/headset
+
+	value = 1
 
 /obj/item/clothing/ears/headset/get_examine_list(var/mob/examiner)
 	. = ..()
@@ -50,6 +52,8 @@
 
 	contraband = TRUE
 
+	value = 1
+
 /obj/item/clothing/ears/headset/mercenary
 	name = "mercenary headset"
 	desc = "; Kept you waiting, huh?"
@@ -58,6 +62,9 @@
 
 	contraband = TRUE
 
+	value = 1
+
+
 /obj/item/clothing/ears/headset/revolutionary
 	name = "revolutionary headset"
 	desc = "; FOR THE REVOLUTION!"
@@ -66,12 +73,19 @@
 
 	contraband = TRUE
 
+	value = 1
+
+/obj/item/clothing/ears/headset/nanotrasen
+	stored_radio = /obj/item/device/radio/headset/nanotrasen
+	value = 1
+
 /obj/item/clothing/ears/headset/nanotrasen/medical
 	name = "nanotrasen medical headset"
 	desc = "; TURN ON SUIT SENSORS!"
 	icon = 'icons/obj/item/clothing/ears/medical_headset.dmi'
 	stored_radio = /obj/item/device/radio/headset/nanotrasen/medical
 
+
 /obj/item/clothing/ears/headset/nanotrasen/cat
 	name = "\improper cat ear headset"
 	icon = 'icons/obj/item/clothing/hats/cat.dmi'
@@ -91,3 +105,9 @@
 	worn_layer = LAYER_MOB_CLOTHING_HELMET + 0.01
 
 	rarity = RARITY_UNCOMMON
+
+	value = 1
+
+/obj/item/clothing/ears/headset/nanotrasen/cat/get_base_value()
+	. = ..()
+	. += 5000
Original file line number	Diff line number	Diff line change
Expand Up		@@ -31,7 +31,7 @@

		can_wear = TRUE

		value = 0


		var/speed_bonus = 0

Expand Down