Multibugfix #5

code/datums/mind/antag.dm

@@ -25,6 +25,9 @@
 		antag_team.add_member(src)
 	INVOKE_ASYNC(A, TYPE_PROC_REF(/datum/antagonist, on_gain))
 	log_game("[key_name(src)] has gained antag datum [A.name]([A.type]).")
+	var/client/picked_client = get_player_client(src)
+	picked_client.picking = FALSE
+
 	return A
 
 /datum/mind/proc/remove_antag_datum(datum_type)

code/modules/antagonists/nukeop/equipment/nuclear_authentication_disk.dm

@@ -40,6 +40,7 @@
 	var/datum/round_event_control/operative/loneop = locate(/datum/round_event_control/operative) in SSevents.control
 	if(istype(loneop) && loneop.occurrences < loneop.max_occurrences && prob(loneop.weight))
 		loneop.weight = max(loneop.weight - 1, 0)
+		loneop.checks_antag_cap = (loneop.weight < 3)
 		if(loneop.weight % 5 == 0 && SSticker.totalPlayers > 1)
 			message_admins("[src] is secured (currently in [ADMIN_VERBOSEJMP(new_turf)]). The weight of Lone Operative is now [loneop.weight].")
 		log_game("[src] being secured has reduced the weight of the Lone Operative event to [loneop.weight].")
@@ -57,13 +58,15 @@
 	if(last_move < world.time - 500 SECONDS && prob((world.time - 500 SECONDS - last_move)*0.0001))
 		var/datum/round_event_control/operative/loneop = locate(/datum/round_event_control/operative) in SSevents.control
 		if(istype(loneop) && loneop.occurrences < loneop.max_occurrences)
+			loneop.checks_antag_cap = (loneop.weight < 3)
 			loneop.weight += 1
 			if(loneop.weight % 5 == 0 && SSticker.totalPlayers > 1)
 				if(disk_comfort_level >= 2)
 					visible_message(span_notice("[src] sleeps soundly. Sleep tight, disky."))
 				message_admins("[src] is unsecured in [ADMIN_VERBOSEJMP(new_turf)]. The weight of Lone Operative is now [loneop.weight].")
 			log_game("[src] was left unsecured in [loc_name(new_turf)]. Weight of the Lone Operative event increased to [loneop.weight].")
 
+
 /obj/item/disk/nuclear/examine(mob/user)
 	. = ..()
 	if(!fake)

code/modules/mob/living/basic/drone/_drone.dm

@@ -100,7 +100,8 @@
 	"<span class='notice'>     - Interacting with non-living beings (dragging bodies, looting bodies, etc.)</span>\n"+\
 	"<span class='warning'>These rules are at admin discretion and will be heavily enforced.</span>\n"+\
 	"<span class='warning'><u>If you do not have the regular drone laws, follow your laws to the best of your ability.</u></span>\n"+\
-	"<span class='notice'>Prefix your message with :b to speak in Drone Chat.</span>\n"
+	"<span class='notice'>Prefix your message with :b to speak in Drone Chat.</span>\n"+\
+	"<span class='notice'>Drone Rules and info can be found at our wiki <a href='https://wiki.monkestation.com/en/jobs/non-human/drone'>HERE</a></span>\n"
 	/// blacklisted drone areas, direct
 	var/list/drone_area_blacklist_flat = list(/area/station/engineering/atmos, /area/station/engineering/atmospherics_engine)
 	/// blacklisted drone areas, recursive/includes descendants

code/modules/shuttle/special.dm

@@ -151,17 +151,41 @@
 // Bar staff, GODMODE mobs(as long as they stay in the shuttle) that just want to make sure people have drinks
 // and a good time.
 
+/obj/item/storage/backpack/duffelbag/bardrone/PopulateContents()
+	new /obj/item/reagent_containers/cup/glass/shaker(src)
+	new /obj/item/storage/box/drinkingglasses(src)
+	new /obj/item/reagent_containers/cup/rag(src)
+	new /obj/item/storage/fancy/cigarettes/cigars/havana(src)
+
+
 /mob/living/basic/drone/snowflake/bardrone
 	name = "Bardrone"
-	desc = "A barkeeping drone, a robot built to tend bars."
+	desc = "A barkeeping drone, a robot built to tend and maintain bars."
+	default_storage = /obj/item/storage/backpack/duffelbag/bardrone
 	hacked = TRUE
 	shy = FALSE
 	laws = "1. Serve drinks.\n\
 		2. Talk to patrons.\n\
-		3. Don't get messed up in their affairs."
+		3. Maintain the integrity of the bar.\n\
+		4. Do NOT involve yourself in the affairs of others outside of the above laws\n\
+		5. If given permission by relevant owners, you may improve the bar you have chosen to operate at."
+
 	unique_name = FALSE // disables the (123) number suffix
 	initial_language_holder = /datum/language_holder/universal
 	default_storage = null
+	flavortext = \
+	"\n<big><span class='warning'>LAW EXPLANATION FOR BAR DRONES</span></big>\n"+\
+	"<span class='notice'>As a bar drone your goal is to provide a fun interactive experience for other players visiting the bar*. </span>\n"+\
+	"<span class='notice'>BARDRONE GUIDELINES</span>\n"+\
+	"<span class='notice'>     -Do not harm sapient creatures </span>\n"+\
+	"<span class='notice'>     -Do not interact with non-concious people, including dead, passed out, or SSD. Call medical instead.</span>\n"+\
+	"<span class='notice'>     -Do not get into altercations with other players, remove yourself from the situation. </span>\n"+\
+	"<span class='notice'>     -Do not protect the bar from agressors. </span>\n"+\
+	"<span class='notice'>     -You may decide what bar you wish to operate at as long as the users/owners of that bar also agree.</span>\n"+\
+	"<span class='notice'>     -You may create your own bar with permission from a relevant head of staff. Do not monopolize station resources. </span>\n"+\
+	"<span class='warning'>These rules are at admin discretion and will be heavily enforced. If you have questions about these rules AHELP it.</span>\n"+\
+	"<span class='warning'><u></u></span>\n"+\
+	"<span class='notice'>Prefix your message with :b to speak in Drone Chat.</span>\n"
 
 /mob/living/basic/drone/snowflake/bardrone/Initialize(mapload)
 	. = ..()

monkestation/code/modules/slimecore/crossbreeding/regenerative/colors.dm

@@ -25,20 +25,12 @@
 /datum/status_effect/regenerative_extract/adamantine
 	extra_traits = list(TRAIT_FEARLESS, TRAIT_HARDLY_WOUNDED)
 
-// rainbow extracts are similar to old regen extract effects, albeit it won't replace your organs, and won't heal limbs (unless you're an oozeling)
-#define RAINBOW_HEAL_FLAGS ~(HEAL_ADMIN | HEAL_RESTRAINTS | HEAL_LIMBS | HEAL_REFRESH_ORGANS)
-
+// rainbow extracts are similar to old regen extract effects, albeit it won't replace your organs, and won't heal limbs
 /datum/status_effect/regenerative_extract/rainbow
-	alert_type = null
-	diminishing_multiplier = 0 // you can't use other extracts at all during this time
-	tick_interval = -1
-
-/datum/status_effect/regenerative_extract/rainbow/on_apply()
-	var/heal_flags = RAINBOW_HEAL_FLAGS
-	if(isoozeling(owner)) // have some mercy on oozelings
-		heal_flags |= HEAL_LIMBS
-	owner.revive(heal_flags)
-	return FALSE // return false so we immediately clear the effect and start the cooldown
-
+	duration = 30 SECONDS
+	base_healing_amt = 15
+	diminishing_multiplier = 1
+	diminish_time = 1.5 MINUTES
+	extra_traits = list(TRAIT_NOCRITOVERLAY, TRAIT_NOSOFTCRIT, TRAIT_NOHARDCRIT)
+	pain_amount = 80 //wow having my wounds closed up in seconds really fucking HURTS
 
-#undef RAINBOW_HEAL_FLAGS

monkestation/code/modules/slimecore/crossbreeding/regenerative/effect.dm

@@ -14,13 +14,15 @@
 	/// The multiplier that the cooldown applied after the effect ends will use.
 	var/diminishing_multiplier = 0.75
 	/// How long the subsequent cooldown effect will last.
-	var/diminish_time = 45 SECONDS
+	var/diminish_time = 90 SECONDS
 	/// The maximum nutrition level this regenerative extract can heal up to.
 	var/nutrition_heal_cap = NUTRITION_LEVEL_FED - 50
 	/// Base traits given to the owner.
 	var/static/list/given_traits = list(TRAIT_ANALGESIA, TRAIT_NOCRITDAMAGE)
 	/// Extra traits given to the owner, added to the base traits.
 	var/list/extra_traits
+	//Slime healing cause pain, oof ouch
+	var/pain_amount = 20
 
 /datum/status_effect/regenerative_extract/on_apply()
 	// So this seems weird, but this allows us to have multiple things affect the regen multiplier,
@@ -35,6 +37,7 @@
 /datum/status_effect/regenerative_extract/on_remove()
 	owner.remove_traits(islist(extra_traits) ? (given_traits + extra_traits) : given_traits, id)
 	owner.apply_status_effect(/datum/status_effect/slime_regen_cooldown, diminishing_multiplier, diminish_time)
+	owner.cause_pain(BODY_ZONE_CHEST, pain_amount, BRUTE)
 
 /datum/status_effect/regenerative_extract/tick(seconds_per_tick, times_fired)
 	var/heal_amt = base_healing_amt * seconds_per_tick * multiplier
@@ -58,11 +61,12 @@
 	owner.adjustCloneLoss(-heal_amt, updating_health = FALSE)
 
 /datum/status_effect/regenerative_extract/proc/heal_misc(heal_amt)
-	owner.adjust_disgust(-heal_amt)
+	var/blood_restore = (heal_amt * 0.25)
+	owner.adjust_disgust(-blood_restore)
 	if(owner.blood_volume < BLOOD_VOLUME_NORMAL)
-		owner.blood_volume = min(owner.blood_volume + heal_amt, BLOOD_VOLUME_NORMAL)
+		owner.blood_volume = min(owner.blood_volume + blood_restore, BLOOD_VOLUME_NORMAL)
 	if((owner.nutrition < nutrition_heal_cap) && !HAS_TRAIT(owner, TRAIT_NOHUNGER))
-		owner.nutrition = min(owner.nutrition + heal_amt, nutrition_heal_cap)
+		owner.nutrition = min(owner.nutrition + blood_restore, nutrition_heal_cap)
 
 /datum/status_effect/regenerative_extract/proc/heal_organs(heal_amt)
 	var/static/list/ignored_traumas
@@ -93,5 +97,5 @@
 
 /atom/movable/screen/alert/status_effect/regen_extract
 	name = "Slime Regeneration"
-	desc = "A milky slime covers your skin, soothing and regenerating your injuries!"
+	desc = "A milky slime covers your skin, regenerating your injuries!"
 	icon_state = "regenerative_core"

monkestation/code/modules/storytellers/converted_events/_base_event.dm

@@ -6,6 +6,9 @@
 	///required number of enemies in roles to exist
 	var/required_enemies = 0
 
+/client
+	var/picking = FALSE
+
 /datum/round_event_control/proc/return_failure_string(players_amt)
 	var/string
 	if(roundstart && (world.time-SSticker.round_start_time >= 2 MINUTES))
@@ -241,6 +244,7 @@
 	var/list/cliented_list = list()
 	for(var/mob/living/mob as anything in possible_candidates)
 		cliented_list += mob.client
+
 	if(length(cliented_list))
 		mass_adjust_antag_rep(cliented_list, 1)
 
@@ -269,6 +273,7 @@
 		else
 			var/picked_ckey = pick_n_take_weighted(weighted_candidates)
 			var/client/picked_client = GLOB.directory[picked_ckey]
+			picked_client.picking = TRUE
 			if(QDELETED(picked_client))
 				continue
 			var/mob/picked_mob = picked_client.mob

monkestation/code/modules/storytellers/gamemode_subsystem.dm

@@ -262,6 +262,8 @@ SUBSYSTEM_DEF(gamemode)
 	var/list/candidate_candidates = list() //lol
 
 	for(var/mob/player as anything in GLOB.player_list)
+		if(player.client.picking)
+			continue
 		if(ready_newplayers && isnewplayer(player))
 			var/mob/dead/new_player/new_player = player
 			if(new_player.ready == PLAYER_READY_TO_PLAY && new_player.mind && new_player.check_preferences())

tgui/packages/tgui/interfaces/AntagInfoChangeling.tsx

@@ -119,8 +119,12 @@ const HivemindSection = (props) => {
             you. Changelings grow in power greatly by absorbing their kind, and
             getting absorbed by another Changeling will leave you as a{' '}
             <span style={fallenstyle}>Fallen Changeling</span>. There is no
-            greater humiliation.
+            greater humiliation.{'\n'}
           </NoticeBox>
+          Additionally changeling rules can be found under{' '}
+          <a href="https://wiki.monkestation.com/#specific-stuff-for-antagonists">
+            Antagonist Guidance.
+          </a>
         </Stack.Item>
       </Stack>
     </Section>