Skip to content

Commit

Permalink
new comms, fixed map
Browse files Browse the repository at this point in the history
  • Loading branch information
@AmoryBlaine
AmoryBlaine committed Aug 23, 2024
1 parent bc460f6 commit edaac65
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 30 deletions.
4 changes: 3 additions & 1 deletion code/controllers/subsystem/communications.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ var/const/UPP_CMD_FREQ = 1252
var/const/UPP_ENGI_FREQ = 1253
var/const/UPP_MED_FREQ = 1254
var/const/UPP_CCT_FREQ = 1255
var/const/UPP_GRD_FREQ = 1256
var/const/UPP_KDO_FREQ = 1259

//CLF Channels (1270-1289)
Expand Down Expand Up @@ -180,6 +181,7 @@ var/list/radiochannels = list(
RADIO_CHANNEL_WY_WO = WY_WO_FREQ,

RADIO_CHANNEL_UPP_GEN = UPP_FREQ,
RADIO_CHANNEL_UPP_GRD = UPP_GRD_FREQ,
RADIO_CHANNEL_UPP_CMD = UPP_CMD_FREQ,
RADIO_CHANNEL_UPP_ENGI = UPP_ENGI_FREQ,
RADIO_CHANNEL_UPP_MED = UPP_MED_FREQ,
Expand All @@ -197,7 +199,7 @@ var/list/radiochannels = list(
#define ERT_FREQS list(VAI_FREQ, DUT_FREQ, YAUT_FREQ, CMB_FREQ, RMC_FREQ)

// UPP Frequencies
#define UPP_FREQS list(UPP_FREQ, UPP_CMD_FREQ, UPP_ENGI_FREQ, UPP_MED_FREQ, UPP_CCT_FREQ, UPP_KDO_FREQ)
#define UPP_FREQS list(UPP_FREQ, UPP_GRD_FREQ, UPP_CMD_FREQ, UPP_ENGI_FREQ, UPP_MED_FREQ, UPP_CCT_FREQ, UPP_KDO_FREQ)

// CLF Frequencies
#define CLF_FREQS list(CLF_FREQ, CLF_CMD_FREQ, CLF_ENGI_FREQ, CLF_MED_FREQ, CLF_CCT_FREQ)
Expand Down
6 changes: 5 additions & 1 deletion code/game/objects/items/devices/radio/encryptionkey.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,10 +300,14 @@
//---------------------------------------------------
//UPP Keys
/obj/item/device/encryptionkey/upp
name = "\improper UPP Radio Encryption Key"
name = "\improper UPP Naval Infantry Radio Encryption Key"
icon_state = "upp_key"
channels = list(RADIO_CHANNEL_UPP_GEN = TRUE)

/obj/item/device/encryptionkey/upp/territorial
name = "\improper UPP Territorial Guard Radio Encryption Key"
channels = list(RADIO_CHANNEL_UPP_GRD = TRUE)

/obj/item/device/encryptionkey/upp/engi
name = "\improper UPP Engineering Radio Encryption Key"
channels = list(RADIO_CHANNEL_UPP_GEN = TRUE, RADIO_CHANNEL_UPP_ENGI = TRUE, RADIO_CHANNEL_UPP_CCT = TRUE)
Expand Down
13 changes: 8 additions & 5 deletions code/game/objects/items/devices/radio/headset.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -922,18 +922,21 @@
maximum_keys = 3
initial_keys = list(/obj/item/device/encryptionkey/colony, /obj/item/device/encryptionkey/pmc/command, /obj/item/device/encryptionkey/commando)



//UPP Headsets
/obj/item/device/radio/headset/distress/UPP
name = "UPP headset"
desc = "A special headset used by UPP military. To access the colony channel, use :o."
name = "UPP Naval Infantry headset"
desc = "A special headset used by UPP military."
frequency = UPP_FREQ
initial_keys = list(/obj/item/device/encryptionkey/colony)
has_hud = TRUE
hud_type = MOB_HUD_FACTION_UPP
minimap_type = MINIMAP_FLAG_UPP

/obj/item/device/radio/headset/distress/UPP/territorial
name = "UPP Territorial Guard headset"
desc = "A special headset used by the UPP's Territorial Guard. Lacks access to Naval Infantry channels. Also provides local colony comms. To access the colony channel use :o."
frequency = UPP_GRD_FREQ
initial_keys = list(/obj/item/device/encryptionkey/colony)

/obj/item/device/radio/headset/distress/UPP/cct
name = "UPP-CCT headset"
desc = "A special headset used by UPP military. Channels are as follows: :o - colony, #j - combat controller, #n engineering."
Expand Down
39 changes: 26 additions & 13 deletions code/modules/gear_presets/upp.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,22 +83,34 @@
new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/flare, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/flare, WEAR_IN_BACK)
//face
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/territorial, WEAR_L_EAR)

//head
var/maybehat = prob(95) ? pick(/obj/item/clothing/head/uppcap,/obj/item/clothing/head/uppcap/boonie) : null
if(maybehat)
new_human.equip_to_slot_or_del(new maybehat, WEAR_HEAD)
//jacket
var/maybejacket = prob(100) ? pick(/obj/item/clothing/suit/storage/marine/faction/UPP/jacket, /obj/item/clothing/suit/storage/marine/veteran/lamp) : null
if(maybejacket)
new_human.equip_to_slot_or_del(new maybejacket, WEAR_JACKET)
var/random_hat= rand(1,3)
switch(random_hat)
if(1)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap, WEAR_HEAD)
if(2 to 3)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/boonie, WEAR_HEAD)

var/random_jacket= rand(1,3)
switch(random_jacket)
if(1)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/jacket, WEAR_JACKET)
if(2 to 3)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/lamp, WEAR_JACKET)



new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP, WEAR_BODY)

var/maybewebbing = prob(100) ? pick(/obj/item/clothing/accessory/storage/webbing, /obj/item/clothing/accessory/storage/droppouch) : null
if(maybewebbing)
new_human.equip_to_slot_or_del(new maybewebbing, WEAR_ACCESSORY)
var/random_storage = rand(1,2)
switch(random_storage)
if(1)
new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/webbing, WEAR_ACCESSORY)
if(2)
new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/droppouch, WEAR_ACCESSORY)

new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_L_STORE)
Expand Down Expand Up @@ -476,9 +488,10 @@

/datum/equipment_preset/upp/synth/load_name(mob/living/carbon/human/new_human, randomise)
new_human.gender = pick(50;MALE,50;FEMALE)
/* var/datum/preferences/A = new()

/* var/datum/preferences/A = new()
A.randomize_appearance(new_human)
var/random_name
var/random_name
if(prob(10))
random_name = "[capitalize(randomly_generate_chinese_word(2))]"
else if(new_human.gender == MALE)
Expand Down
21 changes: 11 additions & 10 deletions maps/map_files/chapaev/chapaev.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -583,6 +583,7 @@
/obj/structure/surface/table/reinforced/almayer_B,
/obj/structure/machinery/computer/emails{
dir = 8;
email_type = /datum/fluff_email/almayer/lasergun1
},
/obj/item/device/flashlight/lamp/on{
pixel_y = 21;
Expand Down Expand Up @@ -1362,7 +1363,7 @@
/area/golden_arrow/canteen)
"le" = (
/obj/structure/largecrate/random/case{
stuff = list(/obj/item/ammo_magazine/shotgun/buckshot/heavy,/obj/item/ammo_magazine/shotgun/slug/heavy);
stuff = list(/obj/item/ammo_magazine/shotgun/buckshot/heavy,/obj/item/ammo_magazine/shotgun/heavy/slug);
parts_type = /obj/item/stack/sheet/metal;
pixel_x = 1
},
Expand Down Expand Up @@ -3107,6 +3108,12 @@
"yH" = (
/turf/closed/wall/strata_outpost/reinforced,
/area/golden_arrow/hangar)
"yL" = (
/obj/item/clothing/head/helmet/marine/veteran/bear{
anchored = 1
},
/turf/closed/wall/strata_outpost/reinforced/hull,
/area/golden_arrow/platoon_sergeant)
"yS" = (
/obj/structure/largecrate/random/case{
stuff = list(/obj/item/stack/sandbags/large_stack);
Expand Down Expand Up @@ -3603,11 +3610,11 @@
/area/golden_arrow/supply)
"Cy" = (
/obj/structure/largecrate/random/case{
stuff = list(/obj/item/ammo_magazine/shotgun/buckshot/heavy,/obj/item/ammo_magazine/shotgun/slug/heavy);
stuff = list(/obj/item/ammo_magazine/shotgun/buckshot/heavy,/obj/item/ammo_magazine/shotgun/heavy/slug);
parts_type = /obj/item/stack/sheet/metal
},
/obj/structure/largecrate/random/case{
stuff = list(/obj/item/ammo_magazine/shotgun/buckshot/heavy,/obj/item/ammo_magazine/shotgun/slug/heavy);
stuff = list(/obj/item/ammo_magazine/shotgun/buckshot/heavy,/obj/item/ammo_magazine/shotgun/heavy/slug);
parts_type = /obj/item/stack/sheet/metal;
pixel_y = 11
},
Expand Down Expand Up @@ -4138,12 +4145,6 @@
icon_state = "multi_tiles"
},
/area/golden_arrow/engineering)
"GN" = (
/obj/item/clothing/head/helmet/marine/veteran/bear{
anchored = 1
},
/turf/closed/wall/strata_outpost/reinforced/hull,
/area/golden_arrow/platoon_sergeant)
"GQ" = (
/obj/structure/machinery/recharge_station{
pixel_y = 13
Expand Down Expand Up @@ -12937,7 +12938,7 @@ mV
mV
hE
hE
GN
yL
hE
hE
hE
Expand Down

0 comments on commit edaac65

Please sign in to comment.