Merge branch 'master' of https://github.com/Kush1Push1/mymaster

code/__BLUEMOONCODE/_DEFINES/traits.dm

@@ -5,10 +5,12 @@
 #define TRAIT_BLUEMOON_HIGH_PAIN_THRESHOLD	"high_pain_threshold"
 #define TRAIT_BLUEMOON_FEAR_OF_SURGEONS		"fear_of_surgeons"
 #define TRAIT_BLUEMOON_SHRIEK				"shriek"
+#define TRAIT_BLUEMOON_SHOWER_NEED			"shower_need"
 
 // Отдельные наименования для квирков, чтобы не повторять их в настройках
 #define BLUEMOON_TRAIT_NAME_SHRIEK			"Крикун"
 
+#define BLUEMOON_TRAIT_NAME_SHOWER_NEED		"Потребность в душе"
 
 // Трейты для рас
 #define CAN_BE_OPERATED_WITHOUT_PAIN		"can_be_operated_without_pain"

code/__DEFINES/jobs.dm

@@ -69,8 +69,8 @@
 
 #define JOB_DISPLAY_ORDER_CAPTAIN 1
 #define JOB_DISPLAY_ORDER_BLUESHIELD 2 // BLUEMOON CHANGES
-#define JOB_DISPLAY_ORDER_NTR 3
-#define JOB_DISPLAY_ORDER_BO 4
+#define JOB_DISPLAY_ORDER_BO 3
+#define JOB_DISPLAY_ORDER_NTR 4
 #define JOB_DISPLAY_ORDER_LAWYER 5
 #define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 6
 #define JOB_DISPLAY_ORDER_WARDEN 7

code/__SPLURTCODE/DEFINES/traits.dm

@@ -14,13 +14,6 @@
 #define TRAIT_GFLUID_DETECT				"genital_fluid_detect"
 #define TRAIT_ASHRESISTANCE				"ash_resistance"
 
-#define TRAIT_CHASTENED_ANUS 			"chastened_anus"
-#define TRAIT_IMPOTENT_ANUS		 		"impotent_anus"
-#define TRAIT_EDGINGONLY_ANUS			"edgingonly_anus"
-#define TRAIT_DISAPPOINTING_ANUS 		"disappointing_anus"
-#define TRAIT_OVERSTIM_ANUS 			"overstim_anus"
-#define TRAIT_HYPERSENS_ANUS 			"hypersens_anus"
-
 // Hyperstation traits
 #define TRAIT_PHARMA            		"hepatic_pharmacokinesis"
 #define TRAIT_CHOKE_SLUT				"choke_slut"
@@ -53,3 +46,12 @@
 #define TRAIT_MESSY						"messy"
 #define TRAIT_RESTORATIVE_METABOLISM	"restorative_metabolism"
 #define TRAIT_LEWD_JOB					"lewd_job"
+#define TRAIT_KISS_SLUT			"kiss_slut"
+
+// Chastity traits
+#define TRAIT_CHASTENED_ANUS "chastened_anus"
+#define TRAIT_IMPOTENT_ANUS "impotent_anus"
+#define TRAIT_EDGINGONLY_ANUS "edgingonly_anus"
+#define TRAIT_DISAPPOINTING_ANUS "disappointing_anus"
+#define TRAIT_OVERSTIM_ANUS "overstim_anus"
+#define TRAIT_HYPERSENS_ANUS "hypersens_anus"

code/_rendering/atom_huds/data_huds.dm

@@ -166,6 +166,9 @@
 	else
 		GLOB.suit_sensors_list -= src
 
+/mob/living/carbon/human/dummy/update_sensor_list()
+	return
+
 //called when a living mob changes health
 /mob/living/proc/med_hud_set_health()
 	var/image/holder = hud_list[HEALTH_HUD]

code/game/objects/items/cards_ids.dm

@@ -188,6 +188,7 @@
 	resistance_flags = FIRE_PROOF | ACID_PROOF
 	var/id_type_name = "Identification Card"
 	var/mining_points = 0 //For redeeming at mining equipment vendors
+	var/mining_points_total = 0 //Для отслеживания рабты шахтёров
 	var/list/access = list()
 	var/registered_name = null // The name registered_name on the card
 	var/assignment = null
@@ -364,7 +365,7 @@
 /obj/item/card/id/examine(mob/user)
 	. = ..()
 	if(mining_points)
-		. += "There's [mining_points] mining equipment redemption point\s loaded onto this card."
+		. += "There's [mining_points] mining equipment redemption point\s loaded onto this card and [mining_points_total] were earned in total."
 	if(!bank_support || (bank_support == ID_LOCKED_BANK_ACCOUNT && !registered_account))
 		. += "<span class='info'>This ID has no banking support whatsover, must be an older model...</span>"
 	else if(registered_account)

code/modules/flufftext/Dreaming.dm

@@ -1,4 +1,4 @@
-/mob/living/carbon/proc/dream()
+/mob/living/carbon/proc/dream(var/dreaming_in_shower = FALSE) // BLUEMOON EDIT - добавлено dreaming_in_shower, чтобы во время мытья в душе персонаж находился "в размышлениях"
 	set waitfor = FALSE
 	var/list/dream_fragments = list()
 	var/list/custom_dream_nouns = list()
@@ -7,7 +7,12 @@
 	for(var/obj/item/bedsheet/sheet in loc)
 		custom_dream_nouns += sheet.dream_messages
 
-	dream_fragments += "Вижу..."
+	// BLUEMOON ADD START
+	if(dreaming_in_shower)
+		dream_fragments += "Вспоминаю..." // BLUEMOON EDIT
+	else
+	// BLUEMOON ADD END
+		dream_fragments += "Вижу..." // BLUEMOON EDIT
 
 	//NIGHTMARE
 	var/datum/component/mood/mood = src.GetComponent(/datum/component/mood)
@@ -48,12 +53,12 @@
 			fragment += "[pick(GLOB.adverbs)] "
 		fragment += pick(GLOB.ing_verbs)
 	else
-		fragment += "will "
+		fragment += "будет ... " // BLUEMOON EDIT
 		fragment += pick(GLOB.verbs)
 	dream_fragments += fragment
 
 	if(prob(25))
-		dream_sequence(dream_fragments)
+		dream_sequence(dream_fragments, dreaming_in_shower) // BLUEMOON EDIT - добавлено dreaming_in_shower, чтобы во время мытья в душе персонаж находился "в размышлениях"
 		return
 
 	//Object
@@ -68,16 +73,17 @@
 	dream_fragments += fragment
 
 	dreaming = TRUE
-	dream_sequence(dream_fragments)
+	dream_sequence(dream_fragments, dreaming_in_shower) // BLUEMOON EDIT - добавлено dreaming_in_shower, чтобы во время мытья в душе персонаж находился "в размышлениях"
 
-/mob/living/carbon/proc/dream_sequence(list/dream_fragments)
-	if(stat != UNCONSCIOUS || InCritical())
-		dreaming = FALSE
-		return
+/mob/living/carbon/proc/dream_sequence(list/dream_fragments, var/dreaming_in_shower = FALSE) // BLUEMOON EDIT - добавлено dreaming_in_shower, чтобы во время мытья в душе персонаж находился "в размышлениях"
+	if(!dreaming_in_shower) // BLUEMOON ADD
+		if(stat != UNCONSCIOUS || InCritical())
+			dreaming = FALSE
+			return
 	var/next_message = dream_fragments[1]
 	dream_fragments.Cut(1,2)
 	to_chat(src, "<span class='notice'><i>... [next_message] ...</i></span>")
 	if(LAZYLEN(dream_fragments))
-		addtimer(CALLBACK(src, .proc/dream_sequence, dream_fragments), rand(10,30))
+		addtimer(CALLBACK(src, .proc/dream_sequence, dream_fragments, dreaming_in_shower), rand(10,30)) // BLUEMOON EDIT - добавлено dreaming_in_shower, чтобы во время мытья в душе персонаж находился "в размышлениях"
 	else
 		dreaming = FALSE

code/modules/jobs/access.dm

@@ -366,7 +366,7 @@
 			return "Code Scotch"
 
 /proc/get_all_jobs()
-	return list("Assistant","Bridge Officer", "Captain", "Blueshield", "Head of Personnel", "Bridge Officer", "Bartender", "Cook", "Entertainer", "Botanist", "Quartermaster", "Cargo Technician",
+	return list("Assistant","Bridge Officer", "Captain", "Blueshield", "Head of Personnel", "Bartender", "Cook", "Entertainer", "Botanist", "Quartermaster", "Cargo Technician",
 				"Shaft Miner", "Clown", "Mime", "Janitor", "Curator", "Internal Affairs Agent", "Chaplain", "Chief Engineer", "Station Engineer",
 				"Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist", "Psychologist", "Paramedic",
 				"Research Director", "Scientist", "Roboticist", "Expeditor", "Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "Peacekeeper", "Prisoner", "NanoTrasen Representative", "Bouncer") //BlueMoon edit

code/modules/jobs/job_types/command/bridgeofficer.dm

@@ -26,15 +26,15 @@
 						ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_VAULT,
 						ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH,
 						ACCESS_MEDICAL, ACCESS_RESEARCH, ACCESS_CARGO, ACCESS_ENGINE,
-						ACCESS_BRIDGE_OFFICER)
+						ACCESS_BRIDGE_OFFICER, ACCESS_MAILSORTING)
 	minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_COURT, ACCESS_WEAPONS,
 						ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_HEADS,
 						ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE,
 						ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_LAWYER,
 						ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_VAULT,
 						ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH,
 						ACCESS_MEDICAL, ACCESS_RESEARCH, ACCESS_CARGO, ACCESS_ENGINE,
-						ACCESS_BRIDGE_OFFICER)
+						ACCESS_BRIDGE_OFFICER, ACCESS_MAILSORTING)
 	paycheck = PAYCHECK_COMMAND
 
 	paycheck = PAYCHECK_COMMAND

code/modules/jobs/job_types/juridical/lawyer.dm

@@ -15,8 +15,8 @@
 	outfit = /datum/outfit/job/lawyer
 	plasma_outfit = /datum/outfit/plasmaman/bar //yes, this is correct, there's no 'lawyer' plasmeme outfit
 
-	access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_WEAPONS, ACCESS_ENTER_GENPOP, ACCESS_LEAVE_GENPOP, ACCESS_FORENSICS_LOCKERS, ACCESS_MINERAL_STOREROOM, ACCESS_LAWYER, ACCESS_MEDICAL, ACCESS_RESEARCH, ACCESS_CARGO, ACCESS_ENGINE, ACCESS_HEADS)
-	minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_ENTER_GENPOP, ACCESS_LEAVE_GENPOP, ACCESS_MINERAL_STOREROOM, ACCESS_LAWYER, ACCESS_MEDICAL, ACCESS_RESEARCH, ACCESS_CARGO, ACCESS_ENGINE, ACCESS_HEADS)
+	access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_WEAPONS, ACCESS_ENTER_GENPOP, ACCESS_LEAVE_GENPOP, ACCESS_FORENSICS_LOCKERS, ACCESS_MINERAL_STOREROOM, ACCESS_MAILSORTING, ACCESS_LAWYER, ACCESS_MEDICAL, ACCESS_RESEARCH, ACCESS_CARGO, ACCESS_ENGINE, ACCESS_HEADS)
+	minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_ENTER_GENPOP, ACCESS_LEAVE_GENPOP, ACCESS_MINERAL_STOREROOM, ACCESS_MAILSORTING, ACCESS_LAWYER, ACCESS_MEDICAL, ACCESS_RESEARCH, ACCESS_CARGO, ACCESS_ENGINE, ACCESS_HEADS)
 
 	paycheck = PAYCHECK_HARD
 	paycheck_department = ACCOUNT_SEC

code/modules/jobs/job_types/juridical/magistrate.dm

@@ -10,7 +10,7 @@
 	spawn_positions = 1
 	minimal_player_age = 35
 	supervisors = "Представители Центрального Командования и Космический Закон"
-	selection_color = "#aac1ee"
+	selection_color = "#7e3d48"
 	considered_combat_role = FALSE
 	exp_requirements = 180
 	exp_type = EXP_TYPE_COMMAND

code/modules/mining/equipment/explorer_gear.dm

@@ -25,7 +25,7 @@
 	hoodtype = /obj/item/clothing/head/hooded/explorer/standard/improved
 	heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
-	armor = list(MELEE = 40, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 50, BIO = 100, RAD = 50, FIRE = 100, ACID = 50, WOUND = 15)
+	armor = list(MELEE = 50, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 50, BIO = 100, RAD = 50, FIRE = 100, ACID = 50, WOUND = 15)
 
 /obj/item/clothing/suit/hooded/explorer/standard/improved/upgrade_icon(datum/source, amount, maxamount)
 	return
@@ -62,7 +62,7 @@
 	heat_protection = HEAD
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
 	actions_types = list(/datum/action/item_action/toggle_helmet_light)
-	armor = list(MELEE = 40, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 50, BIO = 100, RAD = 50, FIRE = 100, ACID = 50, WOUND = 10)
+	armor = list(MELEE = 50, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 50, BIO = 100, RAD = 50, FIRE = 100, ACID = 50, WOUND = 10)
 
 /obj/item/clothing/head/hooded/explorer/standard/improved/upgrade_icon(datum/source, amount, maxamount)
 	return

code/modules/mining/machine_redemption.dm

@@ -257,6 +257,7 @@
 			if(points)
 				if(I)
 					I.mining_points += points
+					I.mining_points_total += points
 					if(usr.client)
 						usr.client.increment_progress("miner", points)
 					points = 0

code/modules/mob/living/living_defense.dm

@@ -125,15 +125,21 @@
 		return ..()
 
 	var/obj/item/thrown_item = AM
+	var/zone = ran_zone(BODY_ZONE_CHEST, 65)//Hits a random part of the body, geared towards the chest
 	if(thrown_item.thrownby == WEAKREF(src)) //No throwing stuff at yourself to trigger hit reactions
 		return ..()
 
-	if(mob_run_block(AM, thrown_item.throwforce, "\the [thrown_item.name]", ATTACK_TYPE_PROJECTILE, 0, throwingdatum.thrower, throwingdatum.thrower.zone_selected, list()))
-		hitpush = FALSE
-		skipcatch = TRUE
-		blocked = TRUE
+	if(throwingdatum)
+		if(mob_run_block(AM, thrown_item.throwforce, "\the [thrown_item.name]", ATTACK_TYPE_PROJECTILE, 0, throwingdatum.thrower, throwingdatum.thrower.zone_selected, list()))
+			hitpush = FALSE
+			skipcatch = TRUE
+			blocked = TRUE
+	else
+		if(mob_run_block(AM, thrown_item.throwforce, "\the [thrown_item.name]", ATTACK_TYPE_PROJECTILE, 0, throwingdatum.thrower, zone, list()))
+			hitpush = FALSE
+			skipcatch = TRUE
+			blocked = TRUE
 
-	var/zone = ran_zone(BODY_ZONE_CHEST, 65)//Hits a random part of the body, geared towards the chest
 	var/nosell_hit = SEND_SIGNAL(thrown_item, COMSIG_MOVABLE_IMPACT_ZONE, src, zone, blocked, throwingdatum) // TODO: find a better way to handle hitpush and skipcatch for humans
 	if(nosell_hit)
 		skipcatch = TRUE

code/modules/modular_computers/file_system/programs/card.dm

@@ -277,7 +277,7 @@
 		departments = list("CentCom" = get_all_centcom_jobs())
 	else if(isnull(departments))
 		departments = list(
-			CARDCON_DEPARTMENT_COMMAND = list("Captain"),//lol
+			CARDCON_DEPARTMENT_COMMAND = GLOB.command_positions,//lol
 			CARDCON_DEPARTMENT_ENGINEERING = GLOB.engineering_positions,
 			CARDCON_DEPARTMENT_LAW = GLOB.law_positions,
 			CARDCON_DEPARTMENT_MEDICAL = GLOB.medical_positions,

code/modules/reagents/chemistry/reagents/other_reagents.dm

@@ -2772,7 +2772,7 @@
 /datum/reagent/red_ichor
 	name = "Red Ichor"
 	can_synth = FALSE
-	description = "A unknown red liquid, linked to healing of most moral wounds."
+	description = "An unknown red liquid, linked to healing of most moral wounds."
 	color = "#c10000"
 	metabolization_rate = REAGENTS_METABOLISM * 2.5
 	chemical_flags = REAGENT_ALL_PROCESS
@@ -2790,7 +2790,7 @@
 /datum/reagent/green_ichor
 	name = "Green Ichor"
 	can_synth = FALSE
-	description = "A unknown green liquid, linked to healing of most internal wounds."
+	description = "An unknown green liquid, linked to healing of most internal wounds."
 	color = "#158c00"
 	metabolization_rate = REAGENTS_METABOLISM * 2.5
 	chemical_flags = REAGENT_ALL_PROCESS
@@ -2808,7 +2808,7 @@
 /datum/reagent/blue_ichor
 	name = "Blue Ichor"
 	can_synth = FALSE
-	description = "A unknown blue liquid, linked to healing the mind."
+	description = "An unknown blue liquid, linked to healing the mind."
 	color = "#0914e0"
 	metabolization_rate = REAGENTS_METABOLISM * 2.5
 	chemical_flags = REAGENT_ALL_PROCESS

html/changelogs/archive/2024-03.yml

@@ -46,3 +46,10 @@
 2024-03-20:
   Just-Sim:
   - code_imp: Made some chages following PR 1108
+2024-03-24:
+  ariaworld:
+  - rscadd: Added the Kiss Slut trait, which increases arousal when kissing others
+      or being kissed!
+  - bugfix: Fixed oral sex, in specific the "Go down on them verb". <3
+  miguelop1:
+  - rscadd: Added a new drink (donator was commie so he shares)