Merge branch 'yogstation13:master' into tank-cr

Author: warface1234455

code/game/objects/structures/tables_racks.dm

@@ -210,7 +210,7 @@
 			I.pixel_x = clamp(text2num(click_params["icon-x"]) - 16, -(world.icon_size/2), world.icon_size/2)
 			I.pixel_y = clamp(text2num(click_params["icon-y"]) - 16, -(world.icon_size/2), world.icon_size/2)
 			return 1
-	else if(!user.combat_mode) // can't drop the item but not in combat mode, try deconstructing instead
+	else if(!user.combat_mode && !(I.item_flags & ABSTRACT)) // can't drop the item but not in combat mode, try deconstructing instead
 		return attackby_secondary(I, user, params)
 	else
 		return ..()

code/modules/events/anomaly/anomaly.dm

@@ -16,7 +16,7 @@
 	announce_when = ANOMALY_ANNOUNCE_HARMFUL_TIME
 	var/area/impact_area
 	var/datum/anomaly_placer/placer = new()
-	var/obj/effect/anomaly/anomaly_path = /obj/effect/anomaly/flux
+	var/obj/effect/anomaly/anomaly_path = /obj/effect/anomaly/flux/explosion
 	///The admin-chosen spawn location.
 	var/turf/spawn_location
 

code/modules/mob/living/emote.dm

@@ -173,6 +173,25 @@
 	emote_type = EMOTE_AUDIBLE
 	stat_allowed = UNCONSCIOUS
 
+/datum/emote/living/gasp/get_sound(mob/living/user)
+	if(!ishuman(user))
+		return
+	var/mob/living/carbon/human/human_user = user
+	if(ishumanbasic(human_user) || iscatperson(human_user) && !HAS_MIND_TRAIT(human_user, TRAIT_MIMING))
+		if(human_user.gender == FEMALE)
+			return pick('sound/voice/human/gasp_female1.ogg', 'sound/voice/human/gasp_female2.ogg', 'sound/voice/human/gasp_female3.ogg')
+		else
+			return pick('sound/voice/human/gasp_male1.ogg', 'sound/voice/human/gasp_male2.ogg')
+
+/datum/emote/living/gasp/gasp_shock
+	key = "gaspshock"
+	key_third_person = "gaspsshock"
+	message = "gasps in shock!"
+	message_mime = "gasps in silent shock!"
+	cooldown = 2 SECONDS
+	emote_type = EMOTE_VISIBLE | EMOTE_AUDIBLE
+	stat_allowed = SOFT_CRIT
+
 /datum/emote/living/giggle
 	key = "giggle"
 	key_third_person = "giggles"
@@ -474,25 +493,6 @@
 	message = "yawns."
 	emote_type = EMOTE_AUDIBLE
 
-/datum/emote/living/gasp_shock
-	key = "gaspshock"
-	key_third_person = "gaspsshock"
-	message = "gasps in shock!"
-	message_mime = "gasps in silent shock!"
-	cooldown = 2 SECONDS
-	emote_type = EMOTE_VISIBLE | EMOTE_AUDIBLE
-	stat_allowed = SOFT_CRIT
-
-/datum/emote/living/gasp_shock/get_sound(mob/living/user)
-	if(!ishuman(user))
-		return
-	var/mob/living/carbon/human/human_user = user
-	if(ishumanbasic(human_user) || iscatperson(human_user) && !HAS_MIND_TRAIT(human_user, TRAIT_MIMING))
-		if(human_user.gender == FEMALE)
-			return pick('sound/voice/human/gasp_female1.ogg', 'sound/voice/human/gasp_female2.ogg', 'sound/voice/human/gasp_female3.ogg')
-		else
-			return pick('sound/voice/human/gasp_male1.ogg', 'sound/voice/human/gasp_male2.ogg')
-
 /datum/emote/living/custom
 	key = "me"
 	key_third_person = "custom"

html/changelog.html

@@ -57,6 +57,19 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">10 December 2024</h2>
+			<h3 class="author">warface1234455 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fix unable to slap table normally</li>
+			</ul>
+
+			<h2 class="date">09 December 2024</h2>
+			<h3 class="author">warface1234455 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Allows normal gasp emote to have sound too</li>
+				<li class="bugfix">FIX FLUX ROUND EVENT NOT EXPLODING</li>
+			</ul>
+
 			<h2 class="date">08 December 2024</h2>
 			<h3 class="author">Oblisk234 updated:</h3>
 			<ul class="changes bgimages16">
@@ -774,38 +787,6 @@ <h3 class="author">glaenjoyer, ToasterBiome updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="tweak">You can no longer RCD space transit tiles if it's not part of a shuttle</li>
 			</ul>
-
-			<h2 class="date">10 September 2024</h2>
-			<h3 class="author">Cowbot92 & dcxgame updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Adds a new station side pet</li>
-				<li class="imageadd">Adds a new station side pet sprites</li>
-				<li class="mapping">Adds a new station side pet to all active maps</li>
-			</ul>
-			<h3 class="author">MrMelbert, ToasterBiome updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">People start slurring at drunk level 16 now instead of 51</li>
-				<li class="rscadd">people slur at different drunk levels now</li>
-			</ul>
-			<h3 class="author">SapphicOverload updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="experiment">Added overheat mechanics to exosuits</li>
-				<li class="bugfix">Fixed charge and integrity not updating properly on diagnostic HUD</li>
-				<li class="bugfix">Probably other stuff that I forgot about</li>
-				<li class="imageadd">Added HUD icons for overheating</li>
-				<li class="imageadd">Added sprites for new mech equipment</li>
-			</ul>
-			<h3 class="author">cowbot92 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Added new traitor mech item: The IA-C01G AORTA</li>
-				<li class="rscadd">Adds new station side activity: Backrooms exploration</li>
-				<li class="rscadd">Adds new relics to the backrooms</li>
-				<li class="rscadd">Adds new monsters to the backrooms</li>
-				<li class="wip">This is work in progress</li>
-				<li class="imageadd">new sprites may be added</li>
-				<li class="mapping">Adds a new area to enter the backrooms on station</li>
-				<li class="experiment">This is experimental</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>

html/changelogs/.all_changelog.yml

@@ -45775,3 +45775,10 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Fixed containers not picking up and emptying items properly
   ToasterBiome:
   - bugfix: Ghost "Enable PDA notifications" setting will now function correctly
+2024-12-09:
+  warface1234455:
+  - rscadd: Allows normal gasp emote to have sound too
+  - bugfix: FIX FLUX ROUND EVENT NOT EXPLODING
+2024-12-10:
+  warface1234455:
+  - bugfix: Fix unable to slap table normally