Merge branch 'Bubberstation:master' into master

modular_zubbers/code/game/objects/items/bulldog.dm

@@ -1,3 +1,3 @@
 /obj/item/gun/ballistic/shotgun/bulldog
-  burst_size: NULL
-  fire_delay: 1
+	burst_size = NULL
+	fire_delay = 1

modular_zubbers/code/modules/bow_adjustments/arrow.dm

@@ -0,0 +1,61 @@
+#define BOW_EMBED_STATS list( \
+		embed_chance = 100, \
+		fall_chance = 0, \
+		jostle_chance = 0, \
+		ignore_throwspeed_threshold = TRUE, \
+		pain_stam_pct = 0.5, \
+		pain_mult = 1, \
+		jostle_pain_mult = 1, \
+		rip_time = 1 SECONDS \
+	)
+
+/obj/projectile/bullet/arrow
+	damage = 20
+	weak_against_armour = TRUE
+	wound_bonus = CANT_WOUND
+	range = 16
+	embedding = BOW_EMBED_STATS
+	var/tribal_damage_bonus = 20 //If you're an icemoon dweller, or an ashwalker.
+	faction_bonus_force = 10 //Bonus force dealt against certain factions
+	nemesis_paths = list(
+		/mob/living/simple_animal/hostile/asteroid,
+		/mob/living/basic/mining,
+		/mob/living/basic/wumborian_fugu,
+	)
+
+/obj/projectile/bullet/arrow/prehit_pierce(mob/living/target, mob/living/carbon/human/user)
+
+	if(isnull(target))
+		return ..()
+
+	if(user?.mind?.special_role == ROLE_LAVALAND)
+		damage += tribal_damage_bonus
+		weak_against_armour = FALSE
+
+	return ..()
+
+/obj/projectile/bullet/arrow/holy
+	damage = 25 // Increase from 20
+	embedding = BOW_EMBED_STATS
+
+/obj/projectile/bullet/arrow/ash
+	damage = 20
+	armour_penetration = 20 // Buff from 0
+	faction_bonus_force = 20 // Nerf from 60
+	embedding = BOW_EMBED_STATS
+
+/obj/projectile/bullet/arrow/bone
+	damage = 25
+	armour_penetration = 30 // Buff from 20
+	wound_bonus = CANT_WOUND
+	faction_bonus_force = 30 // Nerf from 35
+	embedding = BOW_EMBED_STATS
+
+/obj/projectile/bullet/arrow/bronze
+	damage = 30
+	armour_penetration = 30
+	wound_bonus = CANT_WOUND
+	faction_bonus_force = 90
+	embedding = BOW_EMBED_STATS
+
+#undef BOW_EMBED_STATS

modular_zubbers/code/modules/client/examine_tgui.dm

@@ -6,11 +6,11 @@
 	var/character_ad = ""
 	var/emote_length = preferences?.read_preference(/datum/preference/choiced/emote_length)
 	var/approach = preferences?.read_preference(/datum/preference/choiced/approach_pref)
-	var/furries = preferences?.read_preference(/datum/preference/choiced/furry_pref)
-	var/scalies = preferences?.read_preference(/datum/preference/choiced/scalie_pref)
-	var/others = preferences?.read_preference(/datum/preference/choiced/other_pref)
-	var/demihumans = preferences?.read_preference(/datum/preference/choiced/demihuman_pref)
-	var/humans = preferences?.read_preference(/datum/preference/choiced/human_pref)
+	var/furries = preferences?.read_preference(/datum/preference/choiced/directory_character_prefs/furry_pref)
+	var/scalies = preferences?.read_preference(/datum/preference/choiced/directory_character_prefs/scalie_pref)
+	var/others = preferences?.read_preference(/datum/preference/choiced/directory_character_prefs/other_pref)
+	var/demihumans = preferences?.read_preference(/datum/preference/choiced/directory_character_prefs/demihuman_pref)
+	var/humans = preferences?.read_preference(/datum/preference/choiced/directory_character_prefs/human_pref)
 	var/show_nsfw_flavor_text = preferences?.read_preference(/datum/preference/choiced/show_nsfw_flavor_text)
 	if(issilicon(holder) && !(show_nsfw_flavor_text == "Never"))
 		flavor_text_nsfw = preferences?.read_preference(/datum/preference/text/flavor_text_nsfw/silicon)

modular_zubbers/code/modules/client/verbs/character_directory.dm

@@ -80,76 +80,45 @@ GLOBAL_DATUM(character_directory, /datum/character_directory)
 /datum/preference/choiced/approach_pref/create_default_value()
 	return "Unset"
 
-/datum/preference/choiced/furry_pref
-	savefile_key = "furry_pref"
-	category = PREFERENCE_CATEGORY_GAME_PREFERENCES
-	savefile_identifier = PREFERENCE_PLAYER
+/// Pref for all the things with the same "Yes", "No", "No ERP", "Check OOC", "Unset", "Maybe" setting
+/// Saves us on copypaste code
+/datum/preference/choiced/directory_character_prefs
+	savefile_key = "char_directory_char_prefs" // This is so unit checks don't scream
 
-/datum/preference/choiced/furry_pref/init_possible_values()
+/datum/preference/choiced/directory_character_prefs/init_possible_values()
 	return list("Yes", "No", "No ERP", "Check OOC", "Unset", "Maybe")
 
-/datum/preference/choiced/furry_pref/apply_to_human(mob/living/carbon/human/target, value, datum/preferences/preferences)
+/datum/preference/choiced/directory_character_prefs/apply_to_human(mob/living/carbon/human/target, value, datum/preferences/preferences)
 	return FALSE
 
-/datum/preference/choiced/furry_pref/create_default_value()
+/datum/preference/choiced/directory_character_prefs/create_default_value()
 	return "Unset"
 
-/datum/preference/choiced/scalie_pref
-	savefile_key = "scalie_pref"
+/datum/preference/choiced/directory_character_prefs/furry_pref
+	savefile_key = "furry_pref"
 	category = PREFERENCE_CATEGORY_GAME_PREFERENCES
 	savefile_identifier = PREFERENCE_PLAYER
 
-/datum/preference/choiced/scalie_pref/init_possible_values()
-	return list("Yes", "No", "No ERP", "Check OOC", "Maybe", "Unset")
-
-/datum/preference/choiced/scalie_pref/apply_to_human(mob/living/carbon/human/target, value, datum/preferences/preferences)
-	return FALSE
-
-/datum/preference/choiced/scalie_pref/create_default_value()
-	return "Unset"
+/datum/preference/choiced/directory_character_prefs/scalie_pref
+	savefile_key = "scalie_pref"
+	category = PREFERENCE_CATEGORY_GAME_PREFERENCES
+	savefile_identifier = PREFERENCE_PLAYER
 
-/datum/preference/choiced/other_pref
+/datum/preference/choiced/directory_character_prefs/other_pref
 	savefile_key = "other_pref"
 	category = PREFERENCE_CATEGORY_GAME_PREFERENCES
 	savefile_identifier = PREFERENCE_PLAYER
 
-/datum/preference/choiced/other_pref/init_possible_values()
-	return list("Yes", "No", "No ERP", "Check OOC", "Maybe", "Unset")
-
-/datum/preference/choiced/other_pref/apply_to_human(mob/living/carbon/human/target, value, datum/preferences/preferences)
-	return FALSE
-
-/datum/preference/choiced/other_pref/create_default_value()
-	return "Unset"
-
-/datum/preference/choiced/demihuman_pref
+/datum/preference/choiced/directory_character_prefs/demihuman_pref
 	savefile_key = "demihuman_pref"
 	category = PREFERENCE_CATEGORY_GAME_PREFERENCES
 	savefile_identifier = PREFERENCE_PLAYER
 
-/datum/preference/choiced/demihuman_pref/init_possible_values()
-	return list("Yes", "No", "No ERP", "Check OOC", "Unset", "Maybe")
-
-/datum/preference/choiced/demihuman_pref/apply_to_human(mob/living/carbon/human/target, value, datum/preferences/preferences)
-	return FALSE
-
-/datum/preference/choiced/demihuman_pref/create_default_value()
-	return "Unset"
-
-/datum/preference/choiced/human_pref
+/datum/preference/choiced/directory_character_prefs/human_pref
 	savefile_key = "human_pref"
 	category = PREFERENCE_CATEGORY_GAME_PREFERENCES
 	savefile_identifier = PREFERENCE_PLAYER
 
-/datum/preference/choiced/human_pref/init_possible_values()
-	return list("Yes", "No", "No ERP", "Check OOC", "Unset", "Maybe")
-
-/datum/preference/choiced/human_pref/apply_to_human(mob/living/carbon/human/target, value, datum/preferences/preferences)
-	return FALSE
-
-/datum/preference/choiced/human_pref/create_default_value()
-	return "Unset"
-
 //CHARACTER DIRECTORY CODE START
 //Add a cooldown for the character directory to the client, primarily to stop server lag from refresh spam
 /client

modular_zubbers/code/modules/loadout/categories/under.dm

@@ -4,48 +4,48 @@
 	donator_only = TRUE
 	restricted_roles = list(JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_CORRECTIONS_OFFICER)
 
-/datum/loadout_item/under/miscellaneous/command/stripper //Sprites by SierraGenevese
+/datum/loadout_item/uniform/miscellaneous/command/stripper //Sprites by SierraGenevese
 	name = "Command Stripper Uniform"
 	item_path = /obj/item/clothing/under/rank/civilian/head_of_personnel/stripper
 	restricted_roles = list(JOB_CAPTAIN, JOB_HEAD_OF_PERSONNEL, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_CHIEF_ENGINEER, JOB_CHIEF_MEDICAL_OFFICER, JOB_QUARTERMASTER, JOB_NT_REP)
 
-/datum/loadout_item/under/miscellaneous/nanotrasen_consultant/stripper //Sprites by SierraGenevese
+/datum/loadout_item/uniform/miscellaneous/nanotrasen_consultant/stripper //Sprites by SierraGenevese
 	name = "consultant stripper uniform"
 	item_path = /obj/item/clothing/under/rank/nanotrasen_consultant/stripper
 	restricted_roles = list(JOB_NT_REP)
 
-/datum/loadout_item/under/miscellaneous/medrscrubs
+/datum/loadout_item/uniform/miscellaneous/medrscrubs
 	name = "Security Medic's Scrubs"
 	item_path = /obj/item/clothing/under/rank/medical/scrubs/skyrat/red/sec
 	restricted_roles = list(JOB_SECURITY_MEDIC)
 
-/datum/loadout_item/under/miscellaneous/tactical_maid //Donor item for skyefree
+/datum/loadout_item/uniform/miscellaneous/tactical_maid //Donor item for skyefree
 	name = "Tactical Maid Costume"
 	item_path = /obj/item/clothing/under/misc/maid/tactical
 	donator_only = TRUE
 
-/datum/loadout_item/under/miscellaneous/bubber/clown/skirt/red
+/datum/loadout_item/uniform/miscellaneous/bubber/clown/skirt/red
 	name = "Clown Skirt"
 	item_path = /obj/item/clothing/under/rank/civilian/bubber/clown/skirt
 	restricted_roles = list(JOB_CLOWN)
 
-/datum/loadout_item/under/miscellaneous/bubber/clown/skirt/pink //Shouldn't do too much harm having these unlocked...Right?
+/datum/loadout_item/uniform/miscellaneous/bubber/clown/skirt/pink //Shouldn't do too much harm having these unlocked...Right?
 	name = "Pink Clown Skirt"
 	item_path = /obj/item/clothing/under/rank/civilian/bubber/clown/skirt/clussy
 
-/datum/loadout_item/under/miscellaneous/bubber/clown/jester/amazing
+/datum/loadout_item/uniform/miscellaneous/bubber/clown/jester/amazing
 	name = "Amazing Jester Uniform"
 	item_path = /obj/item/clothing/under/rank/civilian/bubber/clown/jester
 	restricted_roles = list(JOB_CLOWN)
 
-/datum/loadout_item/under/miscellaneous/dress_strapped
+/datum/loadout_item/uniform/miscellaneous/dress_strapped
 	name = "Formal Evening Gown"
 	item_path = /obj/item/clothing/under/dress/bubber/strapped
 
-/datum/loadout_item/under/miscellaneous/syndicate_skyrat_overalls_unarmoured
+/datum/loadout_item/uniform/miscellaneous/syndicate_skyrat_overalls_unarmoured
 	name = "Tacticool Utility Overalls"
 	item_path = /obj/item/clothing/under/syndicate/skyrat/overalls/unarmoured
 
-/datum/loadout_item/under/miscellaneous/syndicate_skyrat_overalls_unarmoured_skirt
+/datum/loadout_item/uniform/miscellaneous/syndicate_skyrat_overalls_unarmoured_skirt
 	name = "Tacticool Utility Skirt and Suspenders"
 	item_path = /obj/item/clothing/under/syndicate/skyrat/overalls/unarmoured/skirt

modular_zubbers/code/modules/loadout/categories/~donator/donator_personal.dm

@@ -44,18 +44,18 @@
 	item_path = /obj/item/clothing/under/rank/lace
 	ckeywhitelist = list("thedragmeme")
 
-/datum/loadout_item/under/miscellaneous/diver
+/datum/loadout_item/uniform/miscellaneous/diver
 	name = "Black Divers Uniform"
 	item_path = /obj/item/clothing/under/misc/diver
 	ckeywhitelist = list("sexmaster", "leafydasurvivor")
 
-/datum/loadout_item/under/miscellaneous/idmasnowfatigue
+/datum/loadout_item/uniform/miscellaneous/idmasnowfatigue
 	name = "IDMA Service Uniform"
 	item_path = /obj/item/clothing/under/rank/security/idma_fatigue
 	ckeywhitelist = list ("EspeciallyStrange", "Wolf751", "Waterpig", "Mishanok")
 	restricted_roles = list (JOB_BLUESHIELD, JOB_CAPTAIN, JOB_NT_REP, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER, JOB_HEAD_OF_PERSONNEL, JOB_QUARTERMASTER, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_SECURITY_MEDIC, JOB_DETECTIVE)
 
-/datum/loadout_item/under/miscellaneous/idmafatigue
+/datum/loadout_item/uniform/miscellaneous/idmafatigue
 	name = "IDMA Desert Service Uniform"
 	item_path = /obj/item/clothing/under/rank/security/idma_fatigue/alt
 	ckeywhitelist = list ("EspeciallyStrange", "Wolf751", "Waterpig", "Mishanok")