Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit ad4f9fb

Browse files
committed
Merge branch 'master' into pr/22301
2 parents 4f8c5f6 + e889966 commit ad4f9fb

File tree

8 files changed

+40
-41
lines changed

8 files changed

+40
-41
lines changed

code/__HELPERS/mobs.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ GLOBAL_LIST_EMPTY(species_list)
450450
if(prefs.toggles & DISABLE_ARRIVALRATTLE)
451451
continue
452452
if(DEADCHAT_PDA)
453-
if(prefs.chat_toggles & CHAT_GHOSTPDA)
453+
if(!(prefs.chat_toggles & CHAT_GHOSTPDA))
454454
continue
455455

456456
if(isobserver(M))

code/game/machinery/telecomms/ntnet_relay.dm

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,13 @@
7070
. = dos_failure
7171
dos_failure = new_value
7272

73-
/obj/machinery/ntnet_relay/update_icon_state()
74-
icon_state = "bus[is_operational() ? null : "_off"]"
75-
return ..()
73+
/obj/machinery/ntnet_relay/update_overlays()
74+
. = ..()
75+
if(!is_operational())
76+
return
77+
var/mutable_appearance/on_overlay
78+
on_overlay = mutable_appearance(icon, "[initial(icon_state)]_on")
79+
. += on_overlay
7680

7781
/obj/machinery/ntnet_relay/process(seconds_per_tick)
7882
if(is_operational())

code/modules/mob/living/say.dm

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,10 @@ GLOBAL_LIST_INIT(special_radio_keys, list(
385385

386386
/mob/living/proc/radio(message, list/message_mods = list(), list/spans, language)
387387
var/obj/item/implant/radio/imp = locate() in src
388+
var/obj/item/radio/radio = get_item_by_slot(ITEM_SLOT_EARS)
388389
if(imp && imp.radio.on)
390+
if(radio?.use_command)
391+
spans |= SPAN_COMMAND
389392
if(message_mods[MODE_HEADSET])
390393
imp.radio.talk_into(src, message, null, spans, language, message_mods)
391394
return ITALICS | REDUCE_RANGE

code/modules/power/energyharvester.dm

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,7 @@ obj/item/energy_harvester/Initialize(mapload)
108108
* Uses REALTIMEOFDAY since that's what SSEconomy runs off. If using regular tick time, a lag spike will slow down the rate of power absorption and thus the money output.
109109
*/
110110
/obj/item/energy_harvester/process()
111-
if(!anchored || !manual_switch ||!PN)
112-
disconnect_from_network()
111+
if(!anchored || !manual_switch || !PN)
113112
return PROCESS_KILL
114113
if(PN.netexcess <= 0)
115114
return

html/changelog.html

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,24 @@
5757
-->
5858
<div class="commit sansserif">
5959

60+
<h2 class="date">24 December 2024</h2>
61+
<h3 class="author">warface1234455 updated:</h3>
62+
<ul class="changes bgimages16">
63+
<li class="bugfix">fix antenna mutator breaking loud voice</li>
64+
<li class="bugfix">fix NTNET quantum relay sprite being invisible when disabled</li>
65+
</ul>
66+
67+
<h2 class="date">23 December 2024</h2>
68+
<h3 class="author">Identification updated:</h3>
69+
<ul class="changes bgimages16">
70+
<li class="imagedel">Deletes DIO AI and DIO Secborg donator skins.</li>
71+
</ul>
72+
<h3 class="author">warface1234455 updated:</h3>
73+
<ul class="changes bgimages16">
74+
<li class="bugfix">FIX ghost pda notifcations pref again (biomu moment)</li>
75+
<li class="bugfix">Fix energy harvester not taking power in</li>
76+
</ul>
77+
6078
<h2 class="date">22 December 2024</h2>
6179
<h3 class="author">Oblisk234 updated:</h3>
6280
<ul class="changes bgimages16">
@@ -712,30 +730,6 @@ <h3 class="author">ynot01 updated:</h3>
712730
<li class="bugfix">Fixed stripping TGUI windows duplicating</li>
713731
<li class="bugfix">Fixed being unable to enable internals on someone with a space helmet and no mask</li>
714732
</ul>
715-
716-
<h2 class="date">25 September 2024</h2>
717-
<h3 class="author">Moltijoe updated:</h3>
718-
<ul class="changes bgimages16">
719-
<li class="rscadd">Can now mute speech sounds via a preference</li>
720-
<li class="rscadd">Can now control the volume of speech sounds via a preference</li>
721-
<li class="rscadd">Can now select the voice a character has</li>
722-
</ul>
723-
724-
<h2 class="date">24 September 2024</h2>
725-
<h3 class="author">N3D6 updated:</h3>
726-
<ul class="changes bgimages16">
727-
<li class="mapping">fixes a decal in meta sec</li>
728-
</ul>
729-
<h3 class="author">SapphicOverload updated:</h3>
730-
<ul class="changes bgimages16">
731-
<li class="bugfix">Fixed item offer alerts getting stuck on your screen</li>
732-
</ul>
733-
734-
<h2 class="date">23 September 2024</h2>
735-
<h3 class="author">AMyriad updated:</h3>
736-
<ul class="changes bgimages16">
737-
<li class="bugfix">Fixed unused synthetic storage units being obtainable</li>
738-
</ul>
739733
</div>
740734

741735
<b>GoonStation 13 Development Team</b>

html/changelogs/.all_changelog.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45818,3 +45818,13 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
4581845818
is set.
4581945819
warface1234455:
4582045820
- rscadd: Allows foam to spread through density objects
45821+
2024-12-23:
45822+
Identification:
45823+
- imagedel: Deletes DIO AI and DIO Secborg donator skins.
45824+
warface1234455:
45825+
- bugfix: FIX ghost pda notifcations pref again (biomu moment)
45826+
- bugfix: Fix energy harvester not taking power in
45827+
2024-12-24:
45828+
warface1234455:
45829+
- bugfix: fix antenna mutator breaking loud voice
45830+
- bugfix: fix NTNET quantum relay sprite being invisible when disabled

yogstation/code/modules/donor/borg_ai_skin_datums.dm

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,6 @@
7373
name = "Bipedal GlaDos"
7474
icon_state = "glados"
7575

76-
/datum/borg_skin/dio // originally made for atrealdonaldtrump, left
77-
name = "DIO L.I.T.E"
78-
icon_state = "diosecborg"
79-
owner = null
80-
module_locked = "Security"
81-
8276
/datum/borg_skin/brainjar
8377
name = "Cryojar"
8478
icon_state = "brainjar"
@@ -288,11 +282,6 @@
288282
icon_state = "sneaker_database"
289283
owner = "kmc2000"
290284

291-
/datum/ai_skin/dio // originally made for atrealdonaldtrump, left
292-
name = "D.I.O"
293-
icon_state = "dioAI"
294-
owner = null
295-
296285
/datum/ai_skin/englandismycity
297286
name = "Nick Crompton"
298287
icon_state = "nickcrompton"
-10.9 KB
Binary file not shown.

0 commit comments

Comments
 (0)