Merge branch 'master' into patch-2

code/datums/factions/uscm.dm

@@ -75,6 +75,9 @@
 			if(JOB_CO)
 				marine_rk = "co"
 				border_rk = "command"
+			if(JOB_USCM_OBSV)
+				marine_rk = "vo"
+				border_rk = "command"
 			if(JOB_SO)
 				marine_rk = "so"
 				border_rk = "command"

code/game/machinery/doors/airlock.dm

@@ -76,7 +76,7 @@ GLOBAL_LIST_INIT(airlock_wire_descriptions, list(
 
 /obj/structure/machinery/door/airlock/Destroy()
 	QDEL_NULL_LIST(attached_signallers)
-	QDEL_NULL(closeOther)
+	closeOther = null
 	QDEL_NULL(electronics)
 	return ..()
 

code/game/turfs/turf.dm

@@ -519,7 +519,7 @@
 	var/spread = floor(sqrt(size)*1.5)
 
 	var/list/turfs = list()
-	for(var/turf/open/floor/F in range(src,spread))
+	for(var/turf/open/floor/F in range(spread, src))
 		turfs += F
 
 	switch(A.ceiling)

code/game/world.dm

@@ -69,7 +69,10 @@ GLOBAL_LIST_INIT(reboot_sfx, file2list("config/reboot_sfx.txt"))
 	initiate_minimap_icons()
 
 	change_tick_lag(CONFIG_GET(number/ticklag))
-	GLOB.timezoneOffset = text2num(time2text(0,"hh")) * 36000
+
+	// As of byond 515.1637 time2text now treats 0 like it does negative numbers so the hour is wrong
+	// We could instead use world.timezone but IMO better to not assume lummox will keep time2text in parity with it
+	GLOB.timezoneOffset = text2num(time2text(10,"hh")) * 36000
 
 	Master.Initialize(10, FALSE, TRUE)
 

code/modules/admin/topic/topic_events.dm

@@ -191,7 +191,7 @@
 
 		var/turf/spawn_turf
 		if(range_to_spawn_on)
-			for(spawn_turf in range(initial_turf, range_to_spawn_on))
+			for(spawn_turf in range(range_to_spawn_on, initial_turf))
 				if(!spawn_turf || istype(spawn_turf, /turf/closed))
 					continue
 				turfs += spawn_turf
@@ -317,7 +317,7 @@
 
 		var/turf/spawn_turf
 		if(range_to_spawn_on)
-			for(spawn_turf in range(initial_turf, range_to_spawn_on))
+			for(spawn_turf in range(range_to_spawn_on, initial_turf))
 				if(!spawn_turf || istype(spawn_turf, /turf/closed))
 					continue
 				turfs += spawn_turf

code/modules/admin/verbs/pray.dm

@@ -25,7 +25,8 @@
 			to_chat(admin, SPAN_STAFF_IC(msg))
 			if(admin.prefs.toggles_sound & SOUND_ARES_MESSAGE)
 				admin << 'sound/machines/terminal_alert.ogg'
-		to_chat(usr, receipt)
+
+	to_chat(usr, receipt)
 
 /proc/high_command_announce(text , mob/Sender , iamessage)
 	var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN)

code/modules/cm_marines/dropship_ammo.dm

@@ -244,7 +244,7 @@
 /obj/structure/ship_ammo/laser_battery/detonate_on(turf/impact, obj/structure/dropship_equipment/weapon/fired_from)
 	set waitfor = 0
 	var/list/turf_list = list()
-	for(var/turf/T in range(impact, 3)) //This is its area of effect
+	for(var/turf/T in range(3, impact)) //This is its area of effect
 		turf_list += T
 	playsound(impact, 'sound/effects/pred_vision.ogg', 20, 1)
 	for(var/i=1 to 16) //This is how many tiles within that area of effect will be randomly ignited

code/modules/mob/living/carbon/carbon.dm

@@ -110,7 +110,7 @@
 			var/obj/O = A
 			if(O.unacidable)
 				O.forceMove(get_turf(loc))
-				O.throw_atom(pick(range(get_turf(loc), 1)), 1, SPEED_FAST)
+				O.throw_atom(pick(range(1, get_turf(loc))), 1, SPEED_FAST)
 
 	. = ..(cause)
 

code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm

@@ -708,7 +708,7 @@
 
 /datum/action/xeno_action/activable/place_construction/proc/spacecheck(mob/living/carbon/xenomorph/X, turf/T, datum/construction_template/xenomorph/tem)
 	if(tem.block_range)
-		for(var/turf/TA in range(T, tem.block_range))
+		for(var/turf/TA in range(tem.block_range, T))
 			if(!X.check_alien_construction(TA, FALSE, TRUE))
 				to_chat(X, SPAN_WARNING("We need more open space to build here."))
 				qdel(tem)

code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm

@@ -222,6 +222,20 @@
 	if(act == "me")
 		return ..()
 
+	switch(stat)
+		if(UNCONSCIOUS)
+			to_chat(src, SPAN_WARNING("You cannot emote while unconscious!"))
+			return FALSE
+		if(DEAD)
+			to_chat(src, SPAN_WARNING("You cannot emote while dead!"))
+			return FALSE
+	if(client)
+		if(client.prefs.muted & MUTE_IC)
+			to_chat(src, SPAN_DANGER("You cannot emote (muted)."))
+			return FALSE
+		if(!client.attempt_talking())
+			return FALSE
+
 	// Otherwise, ""roar""!
 	playsound(loc, "alien_roar_larva", 15)
 	return TRUE

code/modules/mob/living/carbon/xenomorph/castes/Larva.dm

@@ -160,6 +160,20 @@
 	if(act == "me")
 		return ..()
 
+	switch(stat)
+		if(UNCONSCIOUS)
+			to_chat(src, SPAN_WARNING("You cannot emote while unconscious!"))
+			return FALSE
+		if(DEAD)
+			to_chat(src, SPAN_WARNING("You cannot emote while dead!"))
+			return FALSE
+	if(client)
+		if(client.prefs.muted & MUTE_IC)
+			to_chat(src, SPAN_DANGER("You cannot emote (muted)."))
+			return FALSE
+		if(!client.attempt_talking())
+			return FALSE
+
 	// Otherwise, ""roar""!
 	playsound(loc, "alien_roar_larva", 15)
 	return TRUE

code/modules/organs/limbs.dm

@@ -1532,5 +1532,5 @@ treat_grafted var tells it to apply to grafted but unsalved wounds, for burn kit
 
 	owner.visible_message("[owner]'s [owner_helmet] goes flying off from the impact!", SPAN_USERDANGER("Your [owner_helmet] goes flying off from the impact!"))
 	owner.drop_inv_item_on_ground(owner_helmet)
-	INVOKE_ASYNC(owner_helmet, TYPE_PROC_REF(/atom/movable, throw_atom), pick(range(get_turf(loc), 1)), 1, SPEED_FAST)
+	INVOKE_ASYNC(owner_helmet, TYPE_PROC_REF(/atom/movable, throw_atom), pick(range(1, get_turf(loc))), 1, SPEED_FAST)
 	playsound(owner, 'sound/effects/helmet_noise.ogg', 100)

html/changelogs/AutoChangeLog-pr-6377.yml

@@ -0,0 +1,4 @@
+author: "realforest2001"
+delete-after: True
+changes:
+  - bugfix: "Fixed the USCM Observer icon not displaying. Forest dumb."

html/changelogs/archive/2024-06.yml

@@ -41,3 +41,28 @@
   vero5123:
   - bugfix: Fixes overwatch console coordinate comment UI crash
   - bugfix: Fixes chat UI crash after entering a custom font
+2024-06-07:
+  Blundir:
+  - rscadd: contraband ammo selection in black market
+  - rscadd: tons of new ammo boxes
+  GrrrKitten:
+  - rscadd: replaces the old ethnicity system with a new skintone system
+  - imageadd: Resprites humans, adds 9 new mix and match body options to replace the
+      old 3 options
+  - rscadd: resprites dogtags and adds an accessory dogtag that can be made visible
+      via attaching to suit/armor
+  - imageadd: Touches up a lot of the underwear sprites
+2024-06-08:
+  Drathek:
+  - bugfix: Fixed larva and hugger emotes performing no stat or muted or cooldown
+      checks
+  - bugfix: Fixed round time having the wrong timezone offset because of an engine
+      change to time2text
+  - bugfix: Fixed linked airlocks destroying their linked airlock incorrectly
+  Drulikar:
+  - bugfix: Fixed some usages of the proc range such as for delimbing
+  TheGamerdk:
+  - bugfix: Your prayers have been received by the gods will now only be said once
+      per prayer
+  coldironwarrior:
+  - rscdel: removes the nazi jacket sprite from suits.dmi