cyberpresidentvanellope/Citadel-Station-13-RP
1
0
Fork 0
mirror of https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git synced 2025-12-10 09:52:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes.

Browse Source
This commit is contained in:
Captain277
2021-01-11 19:11:25 -08:00
parent 08b04351e4
commit 16074377e2
10 changed files with 107 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/controllers/communications.dm
View File

@@ -109,6 +109,7 @@ var/const/AI_FREQ = 1343
var/const/DTH_FREQ = 1341
var/const/SYND_FREQ = 1213
var/const/RAID_FREQ = 1277
var/const/TRADE_FREQ = 1278
var/const/ENT_FREQ = 1461 //entertainment frequency. This is not a diona exclusive frequency.
// department channels
@@ -136,6 +137,7 @@ var/list/radiochannels = list(
"Special Ops" = DTH_FREQ,
"Mercenary" = SYND_FREQ,
"Raider" = RAID_FREQ,
"Trader" = TRADE_FREQ,
"Supply" = SUP_FREQ,
"Service" = SRV_FREQ,
"Explorer" = EXP_FREQ,
@@ -149,7 +151,7 @@ var/list/radiochannels = list(
var/list/CENT_FREQS = list(ERT_FREQ, DTH_FREQ)
// Antag channels, i.e. Syndicate
var/list/ANTAG_FREQS = list(SYND_FREQ, RAID_FREQ)
var/list/ANTAG_FREQS = list(SYND_FREQ, RAID_FREQ, TRADE_FREQ)
//Department channels, arranged lexically
var/list/DEPT_FREQS = list(AI_FREQ, COMM_FREQ, ENG_FREQ, ENT_FREQ, MED_FREQ, SEC_FREQ, SCI_FREQ, SRV_FREQ, SUP_FREQ)

1
code/game/antagonist/outsider/trader.dm
View File

@@ -47,6 +47,7 @@ var/datum/antagonist/trader/traders
player.equip_to_slot_or_del(new /obj/item/clothing/gloves/brown(src), slot_gloves)
player.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(src), slot_glasses)
player.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(src), slot_back)
player.equip_to_slot_or_del(new /obj/item/radio/headset/trader(src), slot_l_ear)
create_radio(PUB_FREQ, player) //Assume they tune their headsets into the station's public radio as they approach

8
code/game/machinery/cryopod.dm
View File

@@ -714,3 +714,11 @@
//Despawning occurs when process() is called with an occupant without a client.
add_fingerprint(M)
//Disabled intercom cryo for ghost roles.
/obj/machinery/cryopod/outsider
name = "cryogenic freezer"
desc = "A man-sized pod for entering suspended animation."
obj/item/radio/intercom/announce = 0

4
code/game/machinery/telecomms/broadcaster.dm
View File

@@ -390,6 +390,8 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
blackbox.msg_syndicate += blackbox_msg
if(RAID_FREQ)
blackbox.msg_raider += blackbox_msg
if(TRADE_FREQ)
blackbox.msg_raider += blackbox_msg
if(SUP_FREQ)
blackbox.msg_cargo += blackbox_msg
if(SRV_FREQ)
@@ -574,6 +576,8 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
blackbox.msg_syndicate += blackbox_msg
if(RAID_FREQ)
blackbox.msg_raider += blackbox_msg
if(TRADE_FREQ)
blackbox.msg_raider += blackbox_msg
if(SUP_FREQ)
blackbox.msg_cargo += blackbox_msg
if(SRV_FREQ)

8
code/game/objects/items/devices/radio/encryptionkey.dm
View File

@@ -25,6 +25,12 @@
origin_tech = list(TECH_ILLEGAL = 2)
syndie = 1
/obj/item/encryptionkey/trader
icon_state = "cypherkey"
channels = list("Common" = 1, "Trader" = 1)
origin_tech = list(TECH_ILLEGAL = 2)
syndie = 0
/obj/item/encryptionkey/binary
icon_state = "bin_cypherkey"
translate_binary = 1
@@ -132,7 +138,7 @@
channels = list("Response Team" = 1, "Science" = 1, "Command" = 1, "Medical" = 1, "Engineering" = 1, "Security" = 1, "Supply" = 1, "Service" = 1)
/obj/item/encryptionkey/omni //Literally only for the admin intercoms
channels = list("Mercenary" = 1, "Raider" = 1, "Response Team" = 1, "Science" = 1, "Command" = 1, "Medical" = 1, "Engineering" = 1, "Security" = 1, "Supply" = 1, "Service" = 1)
channels = list("Mercenary" = 1, "Raider" = 1, "Trader" = 1, "Response Team" = 1, "Science" = 1, "Command" = 1, "Medical" = 1, "Engineering" = 1, "Security" = 1, "Supply" = 1, "Service" = 1)
/obj/item/encryptionkey/heads/hop
name = "head of personnel's encryption key"

10
code/game/objects/items/devices/radio/headset.dm
View File

@@ -99,6 +99,16 @@
. = ..()
set_frequency(RAID_FREQ)
/obj/item/radio/headset/trader
name = "trade headset"
origin_tech = list(TECH_ILLEGAL = 2)
syndie = 0
ks1type = /obj/item/encryptionkey/trader
/obj/item/radio/headset/trader/Initialize()
. = ..()
set_frequency(TRADE_FREQ)
/obj/item/radio/headset/binary
origin_tech = list(TECH_ILLEGAL = 3)
ks1type = /obj/item/encryptionkey/binary

11
code/game/objects/items/devices/radio/intercom.dm
View File

@@ -103,6 +103,17 @@
. = ..()
internal_channels[num2text(RAID_FREQ)] = list(access_syndicate)
/obj/item/radio/intercom/trader
name = "commercial intercom"
desc = "Good luck finding a 'Skip Advertisements' button here."
frequency = TRADE_FREQ
subspace_transmission = 1
syndie = 0
/obj/item/radio/intercom/trader/Initialize()
. = ..()
internal_channels[num2text(TRADE_FREQ)] = list(access_trader)
/obj/item/radio/intercom/Destroy()
STOP_PROCESSING(SSobj, src)
return ..()

6
code/modules/economy/cash_register.dm
View File

@@ -537,3 +537,9 @@
/obj/machinery/cash_register/civilian
account_to_connect = "Civilian"
/obj/machinery/cash_register/trader
name = "Nebula Gas Cash Register"
account_to_connect = "Civilian"
machine_id = "Nebula Gas RETAIL UNIT"
req_access = list(160)

2
code/modules/mob/living/say.dm
View File

@@ -16,6 +16,7 @@ var/list/department_radio_keys = list(
":v" = "Service", ".v" = "Service",
":p" = "AI Private", ".p" = "AI Private",
":y" = "Explorer", ".y" = "Explorer",
":f" = "Trader", ".f" = "Trader",
":R" = "right ear", ".R" = "right ear",
":L" = "left ear", ".L" = "left ear",
@@ -33,6 +34,7 @@ var/list/department_radio_keys = list(
":V" = "Service", ".V" = "Service",
":P" = "AI Private", ".P" = "AI Private",
":Y" = "Explorer", ".Y" = "Explorer",
":F" = "Trader", ".F" = "Trader",
//kinda localization -- rastaf0
//same keys as above, but on russian keyboard layout. This file uses cp1251 as encoding.

64
maps/nsv_triumph/submaps/space/trade_port/tradeport.dmm
View File

@@ -407,9 +407,6 @@
/obj/structure/table/steel_reinforced,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/cash_register/civilian{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden,
/obj/machinery/door/blast/shutters{
dir = 2;
@@ -421,6 +418,10 @@
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/cash_register/trader{
dir = 1;
req_access = list(160)
},
/turf/simulated/floor/tiled/steel,
/area/triumph_away/tradeport)
"en" = (
@@ -781,7 +782,10 @@
/turf/simulated/floor/tiled/dark,
/area/triumph_away/tradeport/facility)
"hi" = (
/obj/machinery/suit_cycler/syndicate,
/obj/machinery/suit_cycler/syndicate{
locked = 0;
req_access = list(160)
},
/turf/simulated/floor/tiled/dark,
/area/triumph_away/tradeport/engineering)
"hj" = (
@@ -1453,6 +1457,15 @@
"mG" = (
/turf/simulated/floor/plating,
/area/triumph_away/tradeport/engineering)
"mK" = (
/obj/structure/bed/chair{
dir = 1
},
/obj/item/radio/intercom/trader{
pixel_y = -25
},
/turf/simulated/floor/wood,
/area/triumph_away/tradeport/commons)
"mL" = (
/turf/simulated/wall,
/area/triumph_away/tradeport/engineering)
@@ -1970,7 +1983,7 @@
/turf/simulated/floor/tiled/dark,
/area/shuttle/trade_ship/general)
"ro" = (
/obj/machinery/cryopod,
/obj/machinery/cryopod/outsider,
/turf/simulated/floor/tiled/techfloor,
/area/triumph_away/tradeport/commons)
"rp" = (
@@ -2030,6 +2043,12 @@
},
/turf/simulated/floor/tiled/old_tile/white,
/area/triumph_away/tradeport)
"rJ" = (
/obj/item/radio/intercom/trader{
pixel_y = -25
},
/turf/simulated/floor/wood,
/area/shuttle/trade_ship/general)
"rQ" = (
/obj/machinery/light{
dir = 1
@@ -2756,6 +2775,10 @@
/area/triumph_away/tradeport/engineering)
"xl" = (
/obj/machinery/camera,
/obj/item/radio/intercom/trader{
dir = 1;
pixel_y = 25
},
/turf/simulated/floor/tiled/old_tile/red,
/area/triumph_away/tradeport)
"xo" = (
@@ -3112,6 +3135,10 @@
pixel_y = -1
},
/obj/item/storage/secure/briefcase,
/obj/item/radio/intercom/trader{
dir = 1;
pixel_y = 25
},
/turf/simulated/floor/tiled/dark,
/area/shuttle/trade_ship/general)
"Aw" = (
@@ -4165,6 +4192,10 @@
/obj/structure/bed/chair{
dir = 8
},
/obj/item/radio/intercom/trader{
dir = 4;
pixel_x = 25
},
/turf/simulated/floor/carpet,
/area/shuttle/trade_ship/general)
"II" = (
@@ -4852,6 +4883,9 @@
/obj/structure/sign/poster{
pixel_y = -32
},
/obj/machinery/atm{
pixel_x = -32
},
/turf/simulated/floor/tiled/old_tile/red,
/area/triumph_away/tradeport)
"NX" = (
@@ -5098,6 +5132,12 @@
},
/turf/simulated/floor/tiled/old_cargo/red,
/area/shuttle/trade_ship/general)
"Qc" = (
/obj/item/radio/intercom/trader{
pixel_y = -25
},
/turf/simulated/floor/tiled/dark,
/area/shuttle/trade_ship/general)
"Qe" = (
/obj/machinery/atmospherics/pipe/simple/hidden,
/obj/structure/cable/yellow{
@@ -5355,6 +5395,10 @@
/obj/machinery/computer/ship/engines{
dir = 1
},
/obj/item/radio/intercom/trader{
dir = 8;
pixel_x = -25
},
/turf/simulated/floor/tiled/dark,
/area/shuttle/trade_ship/cockpit)
"SD" = (
@@ -5388,7 +5432,7 @@
/turf/simulated/floor/plating,
/area/triumph_away/tradeport/engineering)
"To" = (
/obj/machinery/cryopod{
/obj/machinery/cryopod/outsider{
dir = 4
},
/turf/simulated/floor/tiled/techfloor,
@@ -6036,7 +6080,7 @@
/obj/machinery/light{
dir = 1
},
/obj/machinery/cryopod{
/obj/machinery/cryopod/outsider{
dir = 4
},
/turf/simulated/floor/tiled/techfloor,
@@ -20062,7 +20106,7 @@ tm
Og
QD
QD
QD
rJ
tm
nG
fu
@@ -20483,7 +20527,7 @@ Rm
Za
wD
xB
Fy
Qc
tm
Fo
iS
@@ -20782,7 +20826,7 @@ VW
by
mP
vx
nK
mK
OK
CI
Uc