Skip to content

Commit b5871ca

Browse files
DeltaDavsilicons
andauthored
The Delta Dav Fixing things added moment (#7246)
This PR aims to fix a few things on the strelka and at Nebula. Strelka related issues in engineering (named all sensor and Rcon Tag better) Sciences fixes and Xenobio fixes : Taser now in the lockers. Monkey cubes added. Renault back at the captain office Silo access for cargo and science. Gave a prepowered SMES to : The Bridge Engineeing (coms) Simplified the Decade Civ shuttle dock : Tiny fans added to be all players friendly Nebula : Tradeport got MORE spawn for travelers. Should fix the issues where they spawn on station. Few stray windows and turf removed. --------- Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
1 parent 84158d9 commit b5871ca

File tree

21 files changed

+1023
-510
lines changed

21 files changed

+1023
-510
lines changed

code/__DEFINES/radio.dm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#define FREQ_SECURITY 1359 // Security comms frequency, red
1919
#define FREQ_EXPLORER 1361
2020
#define FREQ_TALON 1363
21+
#define FREQ_SDF 1365
2122

2223
#define FREQ_ENTERTAINMENT 1461
2324
#define FREQ_SECURITY_INTERNAL 1475

code/controllers/communications.dm

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,8 @@ var/list/radiochannels = list(
115115
"AI Private" = FREQ_AI_PRIVATE,
116116
"Entertainment" = FREQ_ENTERTAINMENT,
117117
"Medical(I)" = FREQ_MEDICAL_INTERNAL,
118-
"Security(I)" = FREQ_SECURITY_INTERNAL
118+
"Security(I)" = FREQ_SECURITY_INTERNAL,
119+
"SDF" = FREQ_SDF
119120
)
120121

121122
// central command channels, i.e deathsquid & response teams
@@ -143,6 +144,7 @@ GLOBAL_LIST_INIT(freqtospan, list(
143144
"[FREQ_SYNDICATE]" = "syndradio",
144145
"[FREQ_RAIDER]" = "syndradio",
145146
"[FREQ_TRADER]" = "syndradio",
147+
"[FREQ_SDF]" = "sdfradio",
146148
"[FREQ_ERT]" = "centradio",
147149
"[FREQ_DEATH_SQUAD]" = "centradio"
148150
))

code/datums/outfits/ghostrole.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
name = "Hadii's Folly SDF"
107107
uniform = /obj/item/clothing/under/tajaran/hadiifolly/soldier
108108
shoes = /obj/item/clothing/shoes/boots/jackboots
109-
l_ear = /obj/item/radio/headset
109+
l_ear = /obj/item/radio/headset/sdf
110110
back = /obj/item/storage/backpack
111111
id_slot = SLOT_ID_WORN_ID
112112
id_type = /obj/item/card/id/external/id_sdf

code/game/objects/items/devices/radio/encryptionkey.dm

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,3 +194,6 @@
194194

195195
/obj/item/encryptionkey/talon
196196
channels = list("Talon" = 1)
197+
198+
/obj/item/encryptionkey/sdf
199+
channels = list("SDF" = 1)

code/game/objects/items/devices/radio/headset.dm

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -582,3 +582,10 @@
582582
adhoc_fallback = TRUE
583583
icon_state = "pilot_headset"
584584
ks2type = /obj/item/encryptionkey/talon
585+
586+
/obj/item/radio/headset/sdf
587+
name = "sdf headset"
588+
desc = "A headset for communication for the SDF."
589+
adhoc_fallback = TRUE
590+
icon_state = "pilot_headset"
591+
ks2type = /obj/item/encryptionkey/sdf

code/game/objects/items/devices/radio/radio.dm

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -921,3 +921,7 @@ GLOBAL_DATUM_INIT(virtual_announcer_ai, /mob/living/silicon/ai/announcer, new(nu
921921
/obj/item/bluespace_radio/commerce
922922
name = "commercial subspace radio"
923923
desc = "Immensely expensive, this communications device has the ability to send and recieve transmissions from anywhere. Only a few of these devices have been sold by either Ward Takahashi or Nanotrasen. This device is incredibly rare and mind-numbingly expensive. Do not lose it."
924+
925+
/obj/item/bluespace_radio/sdf
926+
name = "sdf subspace radio"
927+
desc = "Immensely expensive, this communications device has the ability to send and recieve transmissions from anywhere. Only a few of these devices have been sold by either Ward Takahashi or Nanotrasen. This device is incredibly rare and mind-numbingly expensive. Do not lose it."

code/modules/ghostroles/roles/sdf.dm

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,6 @@
5353
storage_type = "visitors"
5454
storage_name = "SDF Travel Oversight"
5555
allow_items = TRUE
56+
57+
/obj/machinery/telecomms/allinone/sdf
58+
freq_listening = list(FREQ_COMMON, FREQ_SDF)

code/modules/mob/living/say.dm

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ var/list/department_radio_keys = list(
1818
":y" = "Explorer", ".y" = "Explorer",
1919
":f" = "Trader", ".f" = "Trader",
2020
":g" = "Common", ".g" = "Common",
21+
":d" = "SDF", ".d" = "SDF",
2122

2223
":R" = "right ear", ".R" = "right ear",
2324
":L" = "left ear", ".L" = "left ear",
@@ -37,6 +38,7 @@ var/list/department_radio_keys = list(
3738
":Y" = "Explorer", ".Y" = "Explorer",
3839
":F" = "Trader", ".F" = "Trader",
3940
":G" = "Common", ".G" = "Common",
41+
":D" = "SDF", ".D" = "SDF",
4042

4143
//kinda localization -- rastaf0
4244
//same keys as above, but on russian keyboard layout. This file uses cp1251 as encoding.

interface/stylesheet.dm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ em {font-style: normal;font-weight: bold;}
8888
.greenteamradio {color: #00ff00;}
8989
.yellowteamradio {color: #d1ba22;}
9090
.gangradio {color: #ac2ea1;}
91+
.sdfradio {color: #ff9900;}
9192

9293
//* Miscellaneous *//
9394
.name {font-weight: bold;}

0 commit comments

Comments
 (0)