Merge branch 'cmss13-devs:master' into Hybrisa

code/__DEFINES/mode.dm

@@ -77,6 +77,7 @@
 #define ROUNDSTATUS_FOG_DOWN 1
 #define ROUNDSTATUS_PODDOORS_OPEN 2
 
+#define LATEJOIN_MARINES_PER_LATEJOIN_LARVA_EARLY 4
 #define LATEJOIN_MARINES_PER_LATEJOIN_LARVA 2.5
 
 //=================================================

code/game/gamemodes/cm_initialize.dm

@@ -74,6 +74,7 @@ Additional game mode variables.
 	var/monkey_amount = 0 //How many monkeys do we spawn on this map ?
 	var/list/monkey_types = list() //What type of monkeys do we spawn
 	var/latejoin_tally = 0 //How many people latejoined Marines
+	var/latejoin_larva_drop_early = LATEJOIN_MARINES_PER_LATEJOIN_LARVA_EARLY
 	var/latejoin_larva_drop = LATEJOIN_MARINES_PER_LATEJOIN_LARVA //A larva will spawn in once the tally reaches this level. If set to 0, no latejoin larva drop
 	/// Amount of latejoin_tally already awarded as larvas
 	var/latejoin_larva_used = 0

code/modules/mob/dead/observer/observer.dm

@@ -655,7 +655,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	usr.forceMove(pick(L))
 	following = null
 
-/mob/dead/observer/proc/scan_health(mob/living/target in oview())
+/mob/dead/observer/proc/scan_health(mob/living/target in view(src.client))
 	set name = "Scan Health"
 
 	if(!istype(target))

code/modules/mob/holder.dm

@@ -34,6 +34,15 @@
 	for(var/mob/living/M in contents)
 		M.show_message(message,m_type)
 
+/obj/item/holder/get_examine_text(mob/user)
+	. = list()
+	. += "[icon2html(src, user)] That's \a [src]."
+	if(desc)
+		. += desc
+	if(desc_lore)
+		. += SPAN_NOTICE("This has an <a href='byond://?src=\ref[src];desc_lore=1'>extended lore description</a>.")
+
+
 //Mob procs and vars for scooping up
 /mob/living/var/holder_type
 
@@ -48,8 +57,10 @@
 		return
 
 	var/obj/item/holder/mob_holder = new holder_type(loc)
-	src.forceMove(mob_holder)
-	mob_holder.name = loc.name
+	forceMove(mob_holder)
+	mob_holder.name = name
+	mob_holder.desc = desc
+	mob_holder.gender = gender
 	mob_holder.attack_hand(grabber)
 
 	to_chat(grabber, "You scoop up [src].")

code/modules/mob/new_player/new_player.dm

@@ -267,8 +267,13 @@
 			sq.max_engineers = engi_slot_formula(GLOB.clients.len)
 			sq.max_medics = medic_slot_formula(GLOB.clients.len)
 
-	if(SSticker.mode.latejoin_larva_drop && SSticker.mode.latejoin_tally - SSticker.mode.latejoin_larva_used >= SSticker.mode.latejoin_larva_drop)
-		SSticker.mode.latejoin_larva_used += SSticker.mode.latejoin_larva_drop
+	var/latejoin_larva_drop = SSticker.mode.latejoin_larva_drop
+
+	if (ROUND_TIME < XENO_ROUNDSTART_PROGRESS_TIME_2)
+		latejoin_larva_drop = SSticker.mode.latejoin_larva_drop_early
+
+	if(latejoin_larva_drop && SSticker.mode.latejoin_tally - SSticker.mode.latejoin_larva_used >= latejoin_larva_drop)
+		SSticker.mode.latejoin_larva_used += latejoin_larva_drop
 		var/datum/hive_status/hive
 		for(var/hivenumber in GLOB.hive_datum)
 			hive = GLOB.hive_datum[hivenumber]

html/changelogs/AutoChangeLog-pr-6291.yml

@@ -0,0 +1,4 @@
+author: "Git-Nivrak"
+delete-after: True
+changes:
+  - balance: "Latejoin marines to larva ratio changed to 1:4 for the first 15 minutes, going back to 1:2.5 afterwards."

html/changelogs/AutoChangeLog-pr-6306.yml

@@ -0,0 +1,4 @@
+author: "Nomoresolvalou"
+delete-after: True
+changes:
+  - bugfix: "fixed cats not specifically defined in code displaying wrong info when held or stored in a container. This should also fix any other mob capable of being picked up that is not defined in code as well."

html/changelogs/AutoChangeLog-pr-6307.yml

@@ -0,0 +1,4 @@
+author: "Doubleumc"
+delete-after: True
+changes:
+  - qol: "ghost \"Scan Health\" works at any range"