diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index 9fe8444178f7..07612922f6a4 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/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 ..()
diff --git a/code/modules/events/anomaly/anomaly.dm b/code/modules/events/anomaly/anomaly.dm
index 922078eb096a..eba1ee5d770c 100644
--- a/code/modules/events/anomaly/anomaly.dm
+++ b/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
diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm
index 85ba39ad7c19..fd887392903e 100644
--- a/code/modules/mob/living/emote.dm
+++ b/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"
diff --git a/html/changelog.html b/html/changelog.html
index 0e5c8fedb41e..73179375eb82 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -57,6 +57,19 @@
-->
+
10 December 2024
+
warface1234455 updated:
+
+ - Fix unable to slap table normally
+
+
+
09 December 2024
+
warface1234455 updated:
+
+ - Allows normal gasp emote to have sound too
+ - FIX FLUX ROUND EVENT NOT EXPLODING
+
+
08 December 2024
Oblisk234 updated:
@@ -774,38 +787,6 @@ glaenjoyer, ToasterBiome updated:
- You can no longer RCD space transit tiles if it's not part of a shuttle
-
- 10 September 2024
- Cowbot92 & dcxgame updated:
-
- - Adds a new station side pet
- - Adds a new station side pet sprites
- - Adds a new station side pet to all active maps
-
- MrMelbert, ToasterBiome updated:
-
- - People start slurring at drunk level 16 now instead of 51
- - people slur at different drunk levels now
-
- SapphicOverload updated:
-
- - Added overheat mechanics to exosuits
- - Fixed charge and integrity not updating properly on diagnostic HUD
- - Probably other stuff that I forgot about
- - Added HUD icons for overheating
- - Added sprites for new mech equipment
-
- cowbot92 updated:
-
- - Added new traitor mech item: The IA-C01G AORTA
- - Adds new station side activity: Backrooms exploration
- - Adds new relics to the backrooms
- - Adds new monsters to the backrooms
- - This is work in progress
- - new sprites may be added
- - Adds a new area to enter the backrooms on station
- - This is experimental
-