Test fixes (#87)

Co-authored-by: Pebblesthe2nd <[email protected]> Co-authored-by: biotear <[email protected]> Co-authored-by: spackorp <[email protected]> Co-authored-by: BrotherHangyul <[email protected]> Co-authored-by: Jeff Watchson <[email protected]> Co-authored-by: tichys <[email protected]> Co-authored-by: projectkepler-RU <[email protected]>
Foundation-19 · Apr 19, 2024 · 7d43aa1 · 7d43aa1
1 parent 84bf9a4
commit 7d43aa1
Show file tree

Hide file tree

Showing 156 changed files with 5,985 additions and 1,656 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,7 +8,6 @@
 /cfg/**/*
 
 # Ignore compiled linux libs in the root folder, e.g. librust_g.so
-/*.so
 
 #Ignore compiled files and other files generated during compilation.
 *.mdme

diff --git a/_maps/map_files/Fortress Nash/FortNash1.dmm b/_maps/map_files/Fortress Nash/FortNash1.dmm
@@ -38978,7 +38978,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/structure/furnace,
+/obj/structure/blacksmith/furnace,
 /turf/open/floor/plasteel,
 /area/f13/building)
 "jbE" = (

diff --git a/_maps/map_files/Pahrump-AB/Pahrump-AB-Lower.dmm b/_maps/map_files/Pahrump-AB/Pahrump-AB-Lower.dmm
@@ -2032,8 +2032,8 @@
 "bHh" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet/crate,
-/obj/item/ingot/silver,
-/obj/item/ingot/silver,
+/obj/item/blacksmith/ingot/silver,
+/obj/item/blacksmith/ingot/silver,
 /obj/item/coin/silver,
 /obj/item/coin/silver,
 /obj/item/coin/silver,
@@ -11627,12 +11627,12 @@
 /area/f13/caves)
 "hqo" = (
 /obj/structure/rack,
-/obj/item/ingot/iron,
-/obj/item/ingot/iron,
-/obj/item/ingot/titanium,
-/obj/item/ingot/titanium,
-/obj/item/ingot/adamantine,
-/obj/item/ingot/adamantine,
+/obj/item/blacksmith/ingot/iron,
+/obj/item/blacksmith/ingot/iron,
+/obj/item/blacksmith/ingot/titanium,
+/obj/item/blacksmith/ingot/titanium,
+/obj/item/blacksmith/ingot/adamantine,
+/obj/item/blacksmith/ingot/adamantine,
 /turf/open/floor/plating/tunnel{
 	icon_state = "tunnelchess"
 	},
@@ -24731,10 +24731,10 @@
 /area/f13/caves)
 "tfm" = (
 /obj/structure/table,
-/obj/item/ingot/uranium,
-/obj/item/ingot/uranium,
-/obj/item/ingot/uranium,
-/obj/item/ingot/uranium,
+/obj/item/blacksmith/ingot/uranium,
+/obj/item/blacksmith/ingot/uranium,
+/obj/item/blacksmith/ingot/uranium,
+/obj/item/blacksmith/ingot/uranium,
 /turf/open/floor/plating/rust,
 /area/f13/radiation)
 "tfn" = (

diff --git a/_maps/map_files/Pahrump-AB/Pahrump-AB.dmm b/_maps/map_files/Pahrump-AB/Pahrump-AB.dmm
@@ -43220,7 +43220,7 @@
 /area/f13/wasteland)
 "mFn" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/furnace,
+/obj/structure/blacksmith/furnace,
 /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{
 	color = "#e4e4e4"
 	},
@@ -60632,7 +60632,7 @@
 /area/f13/wasteland)
 "uIx" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/anvil/obtainable/legion,
+/obj/structure/blacksmith/anvil/obtainable/legion,
 /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{
 	color = "#e4e4e4"
 	},

diff --git a/_maps/map_files/Pahrump-Old/Pahrump-Sunset-Lower.dmm b/_maps/map_files/Pahrump-Old/Pahrump-Sunset-Lower.dmm
@@ -34981,7 +34981,7 @@
 /turf/open/floor/plating/tunnel,
 /area/f13/caves)
 "vdZ" = (
-/obj/structure/furnace,
+/obj/structure/blacksmith/furnace,
 /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
 /area/f13/building)
 "vep" = (

diff --git a/_maps/map_files/Pahrump-Old/Pahrump-Sunset.dmm b/_maps/map_files/Pahrump-Old/Pahrump-Sunset.dmm
@@ -2329,7 +2329,7 @@
 /turf/open/floor/plasteel/f13/vault_floor/white,
 /area/f13/village)
 "aVn" = (
-/obj/structure/furnace,
+/obj/structure/blacksmith/furnace,
 /turf/open/indestructible/ground/outside/dirt,
 /area/f13/wasteland)
 "aVq" = (
@@ -13038,7 +13038,7 @@
 /turf/open/floor/f13/wood,
 /area/f13/building)
 "fxC" = (
-/obj/structure/furnace,
+/obj/structure/blacksmith/furnace,
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/caves)
 "fxD" = (
@@ -23515,7 +23515,7 @@
 /obj/machinery/light/small{
 	dir = 4
 	},
-/obj/structure/furnace,
+/obj/structure/blacksmith/furnace,
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/caves)
 "jKT" = (

diff --git a/_maps/map_files/Pahrump-Sunset - Backup/MapGuide.dmm b/_maps/map_files/Pahrump-Sunset - Backup/MapGuide.dmm
@@ -1,6 +1,6 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "aa" = (
-/obj/structure/furnace,
+/obj/structure/blacksmith/furnace,
 /obj/effect/turf_decal/weather/dirt{
 	dir = 1
 	},

diff --git a/_maps/map_files/Pahrump-Sunset - Backup/Pahrump-Sunset.dmm b/_maps/map_files/Pahrump-Sunset - Backup/Pahrump-Sunset.dmm
@@ -11054,7 +11054,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/structure/furnace,
+/obj/structure/blacksmith/furnace,
 /turf/open/floor/plasteel,
 /area/f13/building)
 "aMG" = (

diff --git a/_maps/map_files/Pahrump-Sunset - Backup/RockSprings.dmm b/_maps/map_files/Pahrump-Sunset - Backup/RockSprings.dmm
@@ -13500,7 +13500,7 @@
 	},
 /area/f13/wasteland)
 "gxZ" = (
-/obj/structure/furnace,
+/obj/structure/blacksmith/furnace,
 /turf/open/floor/plasteel/cult,
 /area/f13/building/tribal)
 "gyv" = (
@@ -25240,7 +25240,7 @@
 	},
 /area/f13/building/tribal)
 "mdu" = (
-/obj/structure/furnace,
+/obj/structure/blacksmith/furnace,
 /turf/open/indestructible/ground/outside/sidewalk,
 /area/f13/building)
 "mdO" = (

diff --git a/_maps/map_files/Temp Map Storage/Pahrump-Sunset - Outdated.dmm b/_maps/map_files/Temp Map Storage/Pahrump-Sunset - Outdated.dmm
@@ -2407,7 +2407,7 @@
 /turf/open/floor/plasteel/f13/vault_floor/white,
 /area/f13/village)
 "aVn" = (
-/obj/structure/furnace,
+/obj/structure/blacksmith/furnace,
 /turf/open/indestructible/ground/outside/dirt,
 /area/f13/wasteland)
 "aVq" = (
@@ -23889,7 +23889,7 @@
 /obj/machinery/light/small{
 	dir = 4
 	},
-/obj/structure/furnace,
+/obj/structure/blacksmith/furnace,
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/caves)
 "jKT" = (

diff --git a/_maps/map_files/Temp Map Storage/Pahrump-Sunset-Lower - Outdated.dmm b/_maps/map_files/Temp Map Storage/Pahrump-Sunset-Lower - Outdated.dmm
@@ -35056,7 +35056,7 @@
 /turf/open/floor/plating/tunnel,
 /area/f13/caves)
 "vdZ" = (
-/obj/structure/furnace,
+/obj/structure/blacksmith/furnace,
 /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
 /area/f13/building)
 "vep" = (

diff --git a/code/__DEFINES/melee.dm b/code/__DEFINES/melee.dm
@@ -60,3 +60,53 @@
 #define WEAPON_BLUNT_TWOHAND_MULT 1
 /// Blunt wound addition
 #define WEAPON_BLUNT_WOUND_ADD 100 // limb wrecker
+// MORE MELEE DEFINES
+
+/// Weapon baseplate values
+#define WEAPON_FORCE_SMALL_TOOL 12
+#define WEAPON_FORCE_BIG_TOOL 20
+#define WEAPON_FORCE_KNIFE 27
+#define WEAPON_FORCE_BIG_KNIFE 30
+#define WEAPON_FORCE_SWORD 35
+#define WEAPON_FORCE_SPEAR 24
+#define WEAPON_FORCE_SPEAR_WIELDED 32
+#define WEAPON_FORCE_FIST_WEAPON 29
+#define WEAPON_FORCE_CLUB 30
+#define WEAPON_FORCE_CLUB_WIELDED 39
+#define WEAPON_FORCE_BRUTAL 45
+#define WEAPON_FORCE_MASSIVE 55
+
+/// Thrown forces
+#define THROWING_PATHETIC 4
+#define THROWING_POOR 10
+#define THROWING_DECENT 20
+#define THROWING_EFFECTIVE 25
+#define THROWING_GOOD 30
+#define THROWING_SUPREME 40
+
+/// Melee attack speed
+#define MELEE_SPEED_FASTEST 6
+#define MELEE_SPEED_FAST 7
+#define MELEE_SPEED_NORMAL 8
+#define MELEE_SPEED_SLOW 9
+#define MELEE_SPEED_SLOWER 10
+#define MELEE_SPEED_SLOWEST 14
+
+/// Melee armor piercing
+#define PIERCING_MINOR 0.1
+#define PIERCING_MODERATE 0.2
+#define PIERCING_MAJOR 0.3
+
+/// Melee wound bonuses
+#define WOUNDING_MALUS_SHALLOW -10
+#define WOUNDING_BONUS_TINY 4
+#define WOUNDING_BONUS_SMALL 8
+#define WOUNDING_BONUS_MODEST 12
+#define WOUNDING_BONUS_BIG 20
+#define WOUNDING_BONUS_HUGE 30
+
+/// Throwing distances
+#define THROWRANGE_BAD 3
+#define THROWRANGE_AVERAGE 5
+#define THROWRANGE_GOOD 6
+#define THROWRANGE_JAVELIN 7
diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm
@@ -15,10 +15,11 @@
 #define DISABLE_DEATHRATTLE		(1<<12)
 #define DISABLE_ARRIVALRATTLE	(1<<13)
 #define COMBOHUD_LIGHTING		(1<<14)
+#define MUSIC_RADIO				(1<<15)
 // Gap in prefs between tg and fortune13 prefs.
 #define SPLIT_ADMIN_TABS (1<<23)
 
-#define TOGGLES_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|MEMBER_PUBLIC|INTENT_STYLE|MIDROUND_ANTAG|SOUND_INSTRUMENTS|SOUND_SHIP_AMBIENCE|SOUND_PRAYERS|SOUND_ANNOUNCEMENTS)
+#define TOGGLES_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|MUSIC_RADIO|SOUND_AMBIENCE|SOUND_LOBBY|MEMBER_PUBLIC|INTENT_STYLE|MIDROUND_ANTAG|SOUND_INSTRUMENTS|SOUND_SHIP_AMBIENCE|SOUND_PRAYERS|SOUND_ANNOUNCEMENTS)
 
 //Chat toggles
 #define CHAT_OOC			(1<<0)

diff --git a/code/_globalvars/lists/loadout_categories.dm b/code/_globalvars/lists/loadout_categories.dm
@@ -1,5 +1,5 @@
 GLOBAL_LIST_INIT(loadout_categories, list(
-	LOADOUT_CATEGORY_BACKPACK = list(LOADOUT_SUBCATEGORY_BACKPACK_GENERAL,/* LOADOUT_SUBCATEGORY_BACKPACK_TOYS,*/ LOADOUT_SUBCATEGORY_BACKPACK_BACKPACKS, LOADOUT_SUBCATEGORY_BACKPACK_RATIONS/*, LOADOUT_SUBCATEGORY_BACKPACK_VAULTGUNS*/),
+	//LOADOUT_CATEGORY_BACKPACK = list(LOADOUT_SUBCATEGORY_BACKPACK_GENERAL,/* LOADOUT_SUBCATEGORY_BACKPACK_TOYS,*/ LOADOUT_SUBCATEGORY_BACKPACK_BACKPACKS, LOADOUT_SUBCATEGORY_BACKPACK_RATIONS/*, LOADOUT_SUBCATEGORY_BACKPACK_VAULTGUNS*/),
 	LOADOUT_CATEGORY_NECK = list(LOADOUT_SUBCATEGORY_NECK_GENERAL,/* LOADOUT_SUBCATEGORY_NECK_TIE,*/ LOADOUT_SUBCATEGORY_NECK_SCARVES),
 	LOADOUT_CATEGORY_MASK = list(LOADOUT_SUBCATEGORY_MASK_GENERAL, LOADOUT_SUBCATEGORY_MASK_BANDANA/*, LOADOUT_SUBCATEGORY_MASK_MISCELLANEOUS*/),
 	LOADOUT_CATEGORY_HANDS = LOADOUT_SUBCATEGORIES_NONE,

diff --git a/code/_globalvars/lists/objects.dm b/code/_globalvars/lists/objects.dm
@@ -52,3 +52,4 @@ GLOBAL_LIST_EMPTY(trash_piles)						//list of all trash_piles
 GLOBAL_LIST_EMPTY(money_piles)
 
 GLOBAL_LIST_EMPTY(lamppost)							//list of all lampposts
+GLOBAL_LIST_EMPTY_TYPED(radio_list, /obj/item/radio) //For the radio station. See radio_station.dm
diff --git a/code/controllers/subsystem/jukeboxes.dm b/code/controllers/subsystem/jukeboxes.dm
@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(jukeboxes)
 	name = "Jukeboxes"
 	wait = 5
-	var/list/songs = list()
+	var/list/datum/track/songs = list()
 	var/list/activejukeboxes = list()
 	var/list/freejukeboxchannels = list()
 
@@ -115,3 +115,17 @@ SUBSYSTEM_DEF(jukeboxes)
 			M.playsound_local(currentturf, null, 100, channel = jukeinfo[2], S = song_played)
 			CHECK_TICK
 	return
+//BIG IRON EDIT start
+/datum/controller/subsystem/jukeboxes/proc/add_song(datum/track/NS) //proc usted to add a song, when a disk is added to a jukebox
+	if(SSjukeboxes.songs.len)
+		for(var/datum/track/CT in SSjukeboxes.songs)
+			if(NS.song_associated_id == CT.song_associated_id)
+				return FALSE
+	SSjukeboxes.songs += NS
+
+/datum/controller/subsystem/jukeboxes/proc/remove_song(datum/track/NS)  //proc usted to remove a song, when a disk is removed from a jukebox
+	for(var/datum/track/RT in SSjukeboxes.songs)
+		if(NS.song_associated_id == RT.song_associated_id)
+			SSjukeboxes.songs -= NS
+			return TRUE
+//BIG IRON EDIT -end
diff --git a/code/datums/components/crafting/recipes/recipes_forge.dm b/code/datums/components/crafting/recipes/recipes_forge.dm
@@ -13,14 +13,14 @@
 		/obj/item/wirecutters = 1,
 		/obj/item/stack/sheet/metal = 20,
 		)
-	time = 400
+	time = 30 SECONDS
 	category = CAT_CRAFTING
 	subcategory = CAT_FORGING
 
 /datum/crafting_recipe/tableanvil
 	name = "Table Anvil"
-	result = /obj/structure/anvil/obtainable/table
-	time = 300
+	result = /obj/structure/blacksmith/anvil/obtainable/table
+	time = 20 SECONDS
 	reqs = list(
 		/obj/item/stack/sheet/metal = 8,
 		/obj/item/stack/rods = 8,
@@ -31,8 +31,8 @@
 
 /datum/crafting_recipe/anvil
 	name = "Anvil"
-	result = /obj/structure/anvil/obtainable/basic
-	time = 450
+	result = /obj/structure/blacksmith/anvil/obtainable
+	time = 30 SECONDS
 	reqs = list(
 		/obj/item/stack/sheet/metal = 50,
 		/obj/item/stack/sheet/mineral/titanium = 15,
@@ -43,17 +43,17 @@
 
 /datum/crafting_recipe/sandvil
 	name = "Sandstone Anvil"
-	result = /obj/structure/anvil/obtainable/sandstone
-	time = 300
+	result = /obj/structure/blacksmith/anvil/obtainable/sandstone
+	time = 25 SECONDS
 	reqs = list(/obj/item/stack/sheet/mineral/sandstone = 16)
 	tools = list(TOOL_CROWBAR)
 	category = CAT_CRAFTING
 	subcategory = CAT_FORGING
 
 /datum/crafting_recipe/furnace
 	name = "Furnace"
-	result = /obj/structure/furnace
-	time = 300
+	result = /obj/structure/blacksmith/furnace/sandstone
+	time = 20 SECONDS
 	reqs = list(
 		/obj/item/stack/sheet/mineral/sandstone = 20,
 		/obj/item/stack/sheet/metal = 6,
@@ -85,19 +85,6 @@
 	category = CAT_CRAFTING
 	subcategory = CAT_FORGING
 
-/datum/crafting_recipe/bone_ingot
-	name = "Processable bone"
-	result = /obj/item/ingot/bone
-	time = 100
-	reqs = list(
-		/obj/item/stack/sheet/bone = 2,
-		/obj/item/crafting/wonderglue = 1,
-		/obj/item/stack/rods = 2
-		)
-	tools = list(TOOL_WORKBENCH)
-	category = CAT_CRAFTING
-	subcategory = CAT_FORGING
-
 //KNIVES//
 
 /datum/crafting_recipe/melee/forged/cleaver

diff --git a/code/datums/materials/basemats.dm b/code/datums/materials/basemats.dm
@@ -215,7 +215,7 @@ Unless you know what you're doing, only use the first three numbers. They're in
 	name = "pre-war steel"
 	desc = "A powerful material made out of magic, I mean science!"
 	color = "#6d7e8e"
-	strength_modifier = 1.3
+	strength_modifier = 1.2
 	categories = list(MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE)
 	sheet_type = /obj/item/stack/sheet/mineral/adamantine
 	value_per_unit = 0.25
@@ -310,7 +310,7 @@ Unless you know what you're doing, only use the first three numbers. They're in
 	name = "bronze"
 	desc = "Clock Cult? Never heard of it."
 	color = "#92661A"
-	strength_modifier = 1.15
+	strength_modifier = 1
 	categories = list(MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE)
 	sheet_type = /obj/item/stack/sheet/bronze
 	value_per_unit = 0.025