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.

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

dropship skill modification #419

Merged
merged 28 commits into from
Sep 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
de6c369
fuck that shit
Jun 2, 2024
2b6c465
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
Jun 2, 2024
8ea6f23
emails
Jun 2, 2024
1e582ef
should hopefully accidently unfuck this
Jun 2, 2024
38aee5f
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
KoishiVibe Jun 3, 2024
b69183d
FUCK.
Jun 6, 2024
d5078fe
unfucks that.
Jun 6, 2024
edf2ede
try to fix the problem
Jun 6, 2024
a361ab2
i dont know why hpefully fixed????
Jun 6, 2024
0f713b9
hopefully fixed wait no this needs to mathc
Jun 6, 2024
115e852
done
KoishiVibe Jun 13, 2024
f0b4d03
fucking fix you piece of shit
Jun 20, 2024
017baf3
undoes a fuckup with the master
Jun 22, 2024
3be565c
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
Jun 22, 2024
9698a01
fixes issue
Jun 22, 2024
c040c59
how tf did this get changed
KoishiVibe Jun 25, 2024
d681f97
flask draftoid
KoishiVibe Aug 13, 2024
71341c8
mre obliteration
KoishiVibe Aug 13, 2024
fe00da5
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
KoishiVibe Aug 14, 2024
6cd3f94
decommits stuff
Aug 15, 2024
fc4270d
fucking fix you pice of shit
Aug 15, 2024
df9e105
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
KoishiVibe Aug 20, 2024
ab2a3a0
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
KoishiVibe Aug 25, 2024
d4766cc
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
Aug 27, 2024
5e31559
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
KoishiVibe Aug 28, 2024
9fcdf55
allows for most things to be done. optimization is still only by pilo…
KoishiVibe Aug 28, 2024
a1ab339
and thats it
KoishiVibe Aug 28, 2024
a578aaf
removes the lore and just makes it a statistical change
KoishiVibe Aug 29, 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
12 changes: 6 additions & 6 deletions code/game/machinery/computer/dropship_weapons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -694,10 +694,10 @@
if(CEILING_GLASS)
is_outside = TRUE
if(!is_outside && !cavebreaker) //cavebreaker doesn't care
to_chat(weapon_operator, SPAN_WARNING("INVALID TARGET: target must be visible from high altitude."))
to_chat(weapon_operator, SPAN_WARNING("WARNING: Target obstructed by terrain features."))
return FALSE
if (protected_by_pylon(TURF_PROTECTION_CAS, TU))
to_chat(weapon_operator, SPAN_WARNING("INVALID TARGET: biological-pattern interference with signal."))
to_chat(weapon_operator, SPAN_WARNING("WARNING: Signal garbled, launch aborted."))
return FALSE
if(!DEW.ammo_equipped.can_fire_at(TU, weapon_operator))
return FALSE
Expand Down Expand Up @@ -807,10 +807,10 @@
if (!istype(dropship))
return FALSE
if (!dropship.in_flyby || dropship.mode != SHUTTLE_CALL)
to_chat(user, SPAN_WARNING("Has to be in Fly By mode"))
to_chat(user, SPAN_WARNING("You must be making a flyby!"))
return FALSE
if (dropship.timer && dropship.timeLeft(1) < firemission_envelope.flyoff_period)
to_chat(user, SPAN_WARNING("Not enough time to complete the Fire Mission"))
to_chat(user, SPAN_WARNING("Not enough time on station to complete the firemission."))
return FALSE
var/datum/cas_signal/recorded_loc = firemission_envelope.recorded_loc
var/obj/source = recorded_loc.signal_loc
Expand Down Expand Up @@ -846,7 +846,7 @@
return
if(firemission_envelope.recorded_loc.obstructed_signal())
if(firemission_envelope.user_is_guided(user))
to_chat(user, SPAN_WARNING("Signal Obstructed. You have to go in blind."))
to_chat(user, SPAN_WARNING("Signal obstructed. You have to go in blind."))
return
var/sx = 0
var/sy = 0
Expand All @@ -872,7 +872,7 @@
var/area/laser_area = get_area(shootloc)
if(!istype(laser_area) || CEILING_IS_PROTECTED(laser_area.ceiling, CEILING_PROTECTION_TIER_1))
if(firemission_envelope.user_is_guided(user))
to_chat(user, SPAN_WARNING("Vision Obstructed. You have to go in blind."))
to_chat(user, SPAN_WARNING("Vision obstructed. You have to go in blind."))
firemission_envelope.change_current_loc()
else
firemission_envelope.change_current_loc(shootloc)
Expand Down
12 changes: 6 additions & 6 deletions code/modules/shuttle/computers/dropship_computer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,8 @@
hijack.fire()
GLOB.alt_ctrl_disabled = TRUE

marine_announcement("Unscheduled dropship departure detected from operational area. Hijack likely. Shutting down autopilot.", "Dropship Alert", 'sound/AI/hijack.ogg', logging = ARES_LOG_SECURITY)
log_ares_flight("Unknown", "Unscheduled dropship departure detected from operational area. Hijack likely. Shutting down autopilot.")
marine_announcement("Unknown fault in remote flight control. Resolving as possible hijack. Marking dropship as possibly hostile and disconnecting from sensor matrix.", "Dropship Alert", 'sound/misc/notice2.ogg', logging = ARES_LOG_SECURITY)
log_ares_flight("Unknown", "Unknown fault in remote flight control. Resolving as possible hijack. Marking dropship as possibly hostile and disconnecting from sensor matrix.")

var/mob/living/carbon/xenomorph/xeno = user
var/hivenumber = XENO_HIVE_NORMAL
Expand Down Expand Up @@ -306,7 +306,7 @@
.["target_destination"] = shuttle.in_flyby? "Flyby" : shuttle.destination.name

.["door_status"] = is_remote ? list() : shuttle.get_door_data()
.["has_flyby_skill"] = skillcheck(user, SKILL_PILOT, SKILL_PILOT_EXPERT)
.["has_flyby_skill"] = skillcheck(user, SKILL_PILOT, SKILL_PILOT_TRAINED)

// Launch Alarm Variables
.["playing_launch_announcement_alarm"] = shuttle.playing_launch_announcement_alarm
Expand Down Expand Up @@ -363,7 +363,7 @@

var/dock_id = params["target"]
if(dock_id == DROPSHIP_FLYBY_ID)
if(!skillcheck(user, SKILL_PILOT, SKILL_PILOT_EXPERT))
if(!skillcheck(user, SKILL_PILOT, SKILL_PILOT_TRAINED))
to_chat(user, SPAN_WARNING("You don't have the skill to perform a flyby."))
return FALSE
update_equipment(is_optimised, TRUE)
Expand Down Expand Up @@ -465,7 +465,7 @@
shuttle.setTimer(DROPSHIP_WARMUP_TIME)
if("play_launch_announcement_alarm")
if (shuttle.mode != SHUTTLE_IDLE && shuttle.mode != SHUTTLE_RECHARGING)
to_chat(usr, SPAN_WARNING("The Launch Announcement Alarm is designed to tell people that you're going to take off soon."))
to_chat(usr, SPAN_WARNING("The launch warning alarm is only for alerting people to a takeoff."))
return
shuttle.alarm_sound_loop.start()
shuttle.playing_launch_announcement_alarm = TRUE
Expand Down Expand Up @@ -503,7 +503,7 @@

/obj/structure/machinery/computer/shuttle/dropship/flight/toc
name = "dropship control screen"
desc = "A screen on the TOC computer for controlling the dropship linked to it."
desc = "A screen on the TOC computer for controlling the dropship linked to it. Has an abbreviated version of the flight controls and data."
icon = 'icons/obj/structures/machinery/computer.dmi'
icon_state = "toc_shuttle"
shuttleId = DROPSHIP_MIDWAY
Expand Down
Loading