Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

StS fixes and improvements #22

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

StS fixes and improvements #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f085a03
fixes round processing logic
silencer-pl Aug 27, 2024
4ad1a06
improves ping history and currently ping display outputs
silencer-pl Aug 27, 2024
a61cd48
Underlines sector and coordinate values in displays, fixes display is…
silencer-pl Aug 27, 2024
8ba5fdb
terminal fixes and updates
silencer-pl Aug 28, 2024
05ca758
probe changes/fixes
silencer-pl Sep 11, 2024
2352251
Weapons console and firing sequence updates
silencer-pl Sep 24, 2024
b223321
weapons bay changes
silencer-pl Sep 24, 2024
4bfffb9
reworks ammo dipensing and storage, related console
silencer-pl Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 12 additions & 14 deletions code/modules/admin/mission_control/mission_control.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@
.text{
padding: 5px;
}
.coord {
color: #eb8de0;
}
.sector {
color: #9be7e8;
}
</head>
</style>
<body>
Expand Down Expand Up @@ -242,24 +248,16 @@
for(var/obj/structure/shiptoship_master/sts_master_to_link in world)
sts_master = sts_master_to_link
break
var/new_map = tgui_alert(usr, "Do yo wish to destroy everything on the old map?", "REPLACE?", list("Yes","No"), timeout = 0)
if(new_map == null) new_map = "No"
switch(tgui_input_list(usr, "Select Template:","TEMPLATE select",list("Blank","Deploy the Amelia", "Deploy the Marie","Tester Targets","Escapees","Pursuers"),timeout = 0))
switch(tgui_input_list(usr, "Select Template:","TEMPLATE select",list("Clear Board","Tester Set","Escapees","Pursuers"),timeout = 0))
if(null)
return
if("Blank")
if("Clear Board")
sts_master.clear_map()
if("Deploy the Amelia")
if(new_map == "Yes") sts_master.clear_map()
if("Tester Set")
sts_master.add_entity(entity_type = 0, x = 3, y = 2, name = "UAS Amelia", type = "OV-PST Rapid Pursuit Interceptor", vector_x = 0, vector_y = 0, ship_status = "Operational", ship_faction = "UACM", ship_damage = 5, ship_shield = 2, ship_speed = 5, salvos = 2)
return
if("Deploy the Marie")
if(new_map == "Yes") sts_master.clear_map()
sts_master.add_entity(entity_type = 0, x = 4, y = 73, name = "UAS Amelia", type = "OV-PST Rapid Pursuit Interceptor", vector_x = 0, vector_y = 0, ship_status = "Operational", ship_faction = "UACM", ship_damage = 5, ship_shield = 2, ship_speed = 5, salvos = 2)
return
if("Tester Targets")
sts_master.add_entity(entity_type = 0, x = 7, y = 5, name = "Weapons Test Drone Alpha", type = "OV-PST Prototype Testing Drone", vector_x = 0, vector_y = 0, ship_status = "Operational", ship_faction = "UACM", ship_damage = 1, ship_shield = 0, ship_speed = 2, salvos = 0)
sts_master.add_entity(entity_type = 0, x = 2, y = 72, name = "Weapons Test Drone Beta", type = "OV-PST Prototype Testing Drone", vector_x = 0, vector_y = 0, ship_status = "Operational", ship_faction = "UACM", ship_damage = 1, ship_shield = 0, ship_speed = 2, salvos = 0)
sts_master.add_entity(entity_type = 0, x = 11, y = 5, name = "UAS Marie", type = "OV-PST Rapid Pursuit Interceptor", vector_x = 0, vector_y = 0, ship_status = "Operational", ship_faction = "UACM", ship_damage = 5, ship_shield = 2, ship_speed = 5, salvos = 2)
sts_master.add_entity(entity_type = 0, x = 21, y = 21, name = "Weapons Test Drone Alpha", type = "OV-PST Prototype Testing Drone", vector_x = 2, vector_y = 2, ship_status = "Operational", ship_faction = "UACM", ship_damage = 1, ship_shield = 0, ship_speed = 2, salvos = 0)
sts_master.add_entity(entity_type = 0, x = 91, y = 90, name = "Weapons Test Drone Beta", type = "OV-PST Prototype Testing Drone", vector_x = -2, vector_y = -2, ship_status = "Operational", ship_faction = "UACM", ship_damage = 1, ship_shield = 0, ship_speed = 2, salvos = 0)
if("Escapees")
sts_master.add_entity(entity_type = 0, x = 52, y = 98, name = "TPS Workers Glory", type = "Chelyabinsk Class Heavy Transport", vector_x = 0, vector_y = -3, ship_status = "Operational", ship_faction = "UPP", ship_damage = 10, ship_shield = 0, ship_speed = 3, salvos = 0)
if("Pursuers")
Expand Down
6 changes: 4 additions & 2 deletions code/modules/admin/verbs/playsound.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@
var/style = tgui_input_list(src, "Who do you want to play this to?", "Select Listeners", list("Globally", "Xenos", "Marines", "Ghosts", "All In View Range", "Single Mob"))
var/sound_type = tgui_input_list(src, "What kind of sound is this?", "Select Sound Type", sound_type_list)
sound_type = sound_type_list[sound_type]
var/display_title = tgui_input_list(src, "Display Title?", "Title Display", list("Yes", "No"))
var/display_title
display_title = tgui_input_list(src, "Display Title?", "Title Display", list("Yes", "No"))

switch(style)
if("Globally")
Expand Down Expand Up @@ -178,6 +179,7 @@
music_extra_data["title"] = tgui_input_text(usr, "Enter song Title. Leave blank for unknown.", "Title input", timeout = 0)
music_extra_data["artist"] = tgui_input_text(usr, "Enter song Artist. Leave blank for unknown.", "Artist input", timeout = 0)
music_extra_data["album"] = tgui_input_text(usr, "Enter song Album. Leave blank for unknown.","Album input", timeout = 0)
var/display_blurb_indicator = tgui_alert(usr, "Show title blurb?", "Blurb", list("No","Yes"), timeout = 0)
if(music_extra_data["title"] == null) music_extra_data["title"] = web_sound_url
if(music_extra_data["artist"] == null) music_extra_data["artist"] = "Unknown Artist"
if(music_extra_data["album"] == null) music_extra_data["album"] = "Unknown Album"
Expand All @@ -186,7 +188,7 @@
for(var/mob/mob as anything in targets)
var/client/client = mob?.client
if((client?.prefs?.toggles_sound & SOUND_MIDI) && (client?.prefs?.toggles_sound & SOUND_ADMIN_ATMOSPHERIC))
if(tgui_alert(usr, "Show title blurb?", "Blurb", list("No","Yes"), timeout = 0) == "Yes") show_blurb_song(title = music_extra_data["title"], additional = "[music_extra_data["artist"]] - [music_extra_data["album"]]")
if(display_blurb_indicator == "Yes") show_blurb_song(title = music_extra_data["title"], additional = "[music_extra_data["artist"]] - [music_extra_data["album"]]")
client?.tgui_panel?.play_music(web_sound_url, music_extra_data)
else
client?.tgui_panel?.stop_music()
14 changes: 7 additions & 7 deletions code/modules/shiptoship/ship/probe_control.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/obj/item/ship_probe
name = "EYE-7 probe"
desc = "A see-through tube containing electronic systems tied to an antenna that seems to gently glow."
name = "EYE-7 cartrige"
desc = "A see-through tube containing three bundles of slightly glowing electronics wrapped around small antennas."
desc_lore = "EYE-7 probes are designed to interface with the OV-PST's unique battlefield overview system and provide a direct, grid-based feed of an area of operations to all ships linked to the PST's so called Mission Control system. The probes effectively provide a focusing point for the stations' unique artificial intelligence that allows it to feed precise, position-based information which gives unprecedented battlefield orientation capabilities compared to currently used technology."
icon = 'icons/sectorpatrol/ship/probe.dmi'
icon_state = "probe"
Expand All @@ -23,7 +23,7 @@
/obj/structure/ship_elements/probe_launcher/proc/LaunchContent()
emoteas("Launches its contets with a loud swoosh!")
playsound(src, 'sound/effects/bamf.ogg', 25)
probe_loaded = 0
probe_loaded -= 1

/obj/structure/ship_elements/probe_launcher/attackby(obj/item/W, mob/user)
if(repair_shutdown == 1)
Expand All @@ -33,14 +33,14 @@
to_chat(usr, SPAN_WARNING("You have no idea how to use these two together."))
return
if(istype(W, /obj/item/ship_probe))
if(probe_loaded == 1)
to_chat(usr, SPAN_WARNING("A probe is already loaded."))
if(probe_loaded > 1)
to_chat(usr, SPAN_WARNING("A cartrige is still loaded in the device."))
return
if(probe_loaded == 0)
usr.visible_message(SPAN_INFO("[usr] starts to reload the probe launcher."), SPAN_INFO("You start to reload the probe launcher"), SPAN_WARNING("You hear loud, mechanic clicking!"))
if(do_after(usr, 20, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))
usr.visible_message(SPAN_INFO("[usr] reloads the probe launcher."), SPAN_INFO("The probe slides into the tube and an audible click is heard."), SPAN_WARNING("The clicking stops after a beep."))
probe_loaded = 1
usr.visible_message(SPAN_INFO("[usr] reloads the probe launcher."), SPAN_INFO("The cartridge slides into the tube and an audible click is heard."), SPAN_WARNING("The clicking stops after a beep."))
probe_loaded = 3
qdel(W)
return
return
Expand Down
19 changes: 15 additions & 4 deletions code/modules/shiptoship/ship/ship_command_chair.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,12 @@
.text{
padding: 5px;
}
.coord {
color: #eb8de0;
}
.sector {
color: #9be7e8;
}
</head>
</style>
"}
Expand All @@ -121,17 +127,22 @@
var/round_history
if(linked_master_console.local_round_log_full.len == 0) round_history = "No Sonar history in buffer."
if(linked_master_console.local_round_log_full.len != 0) round_history = jointext(linked_master_console.local_round_log_full, "</p><p>")
var/displayed_ping_history
if(linked_master_console.ping_history.len == 0) displayed_ping_history = "No Ping history in buffer."
if(linked_master_console.ping_history.len != 0) displayed_ping_history = jointext(linked_master_console.ping_history, "</p><p>")
window_size="700x500"
dat +={"<p><b>Sonar Activity History Buffer:</b></p>
dat +={"<p><b>Sonar Activity History:</b></p>
<p>[round_history]</p>
<p><b>Probe Ping History:</b></p>
<p>[displayed_ping_history]</p>
"}
if("pings_and_tracking")
window_size="500x500"
var/activity_summary
var/list/pings_and_tracking = list()
pings_and_tracking.Add("<b>PINGS</b>")
if(linked_master_console.ping_history.len == 0) pings_and_tracking.Add("No ping history.")
if(linked_master_console.ping_history.len != 0) pings_and_tracking.Add(jointext(linked_master_console.ping_history, "</p><p>"))
if(linked_master_console.current_pings.len == 0) pings_and_tracking.Add("No ping history.")
if(linked_master_console.current_pings.len != 0) pings_and_tracking.Add(jointext(linked_master_console.current_pings, "</p><p>"))
pings_and_tracking.Add("<b>TRACKING</b>")
pings_and_tracking.Add(jointext(linked_master_console.GetTrackingList(), "</p><p>"))
var/pings_and_tracking_output = jointext(pings_and_tracking, "</p><p>")
Expand Down Expand Up @@ -277,7 +288,7 @@
. = ..()
if(usr == buckled_mob)
to_chat(usr, SPAN_INFO("Use the console with <b>HELP</b> or <b>DISARM</b> intent to open the <b>sonar activity</b> screen."))
to_chat(usr, SPAN_INFO("Use the console with <b>GRAB</b> or <b>HARM</b> intent to open the <b>sonar activity history buffer</b> screen."))
to_chat(usr, SPAN_INFO("Use the console with <b>GRAB</b> or <b>HARM</b> intent to open the <b>sonar and ping history buffer</b> screen."))

/obj/structure/ship_elements/command_monitor/front
name = "front command monitor"
Expand Down
Loading
Loading