Merge branch 'master' into morewefixes

code/modules/gear_presets/survivors/survivors.dm

@@ -378,12 +378,13 @@ Everything bellow is a parent used as a base for one or multiple maps.
 	skills = /datum/skills/civilian/survivor/trucker
 	idtype = /obj/item/card/id/data
 	flags = EQUIPMENT_PRESET_START_OF_ROUND
-	access = list(ACCESS_CIVILIAN_PUBLIC,ACCESS_CIVILIAN_LOGISTICS)
+	access = list(ACCESS_CIVILIAN_PUBLIC,ACCESS_CIVILIAN_LOGISTICS,ACCESS_WY_FLIGHT)
 
-/datum/equipment_preset/survivor/engineer/load_gear(mob/living/carbon/human/new_human)
+/datum/equipment_preset/survivor/flight_control_operator/load_gear(mob/living/carbon/human/new_human)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/lawyer/bluesuit(new_human), WEAR_BODY)
 	if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
 		add_ice_colony_survivor_equipment(new_human)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/windbreaker/windbreaker_brown(new_human), WEAR_JACKET)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/device/binoculars(new_human), WEAR_IN_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/headset(new_human), WEAR_HEAD)

code/modules/shuttle/computers/dropship_computer.dm

@@ -211,21 +211,31 @@
 
 
 /obj/structure/machinery/computer/shuttle/dropship/flight/attack_alien(mob/living/carbon/xenomorph/xeno)
-	if(!is_ground_level(z))
-		to_chat(xeno, SPAN_NOTICE("Lights flash from the terminal but we can't comprehend their meaning."))
-		playsound(loc, 'sound/machines/terminal_error.ogg', KEYBOARD_SOUND_VOLUME, 1)
-		return
+	var/obj/docking_port/mobile/marine_dropship/dropship = SSshuttle.getShuttle(shuttleId)
 
+	// If the attacking xeno isn't the queen.
 	if(xeno.hive_pos != XENO_QUEEN)
-		to_chat(xeno, SPAN_NOTICE("Lights flash from the terminal but we can't comprehend their meaning."))
-		playsound(loc, 'sound/machines/terminal_error.ogg', KEYBOARD_SOUND_VOLUME, 1)
-		return
+		// If the 'about to launch' alarm is playing, a xeno can whack the computer to stop it.
+		if(dropship.playing_launch_announcement_alarm)
+			stop_playing_launch_announcement_alarm()
+			xeno.animation_attack_on(src)
+			to_chat(xeno, SPAN_XENONOTICE("We slash at [src], silencing its squawking!"))
+			playsound(loc, 'sound/machines/terminal_shutdown.ogg', 20)
+		else
+			to_chat(xeno, SPAN_NOTICE("Lights flash from the terminal but we can't comprehend their meaning."))
+			playsound(loc, 'sound/machines/terminal_error.ogg', KEYBOARD_SOUND_VOLUME, TRUE)
+		return XENO_NONCOMBAT_ACTION
+
+	if(!is_ground_level(z))
+		// "you" rather than "we" for this one since non-queen castes will have returned above.
+		to_chat(xeno, SPAN_NOTICE("Lights flash from the terminal but you can't comprehend their meaning."))
+		playsound(loc, 'sound/machines/terminal_error.ogg', KEYBOARD_SOUND_VOLUME, TRUE)
+		return XENO_NONCOMBAT_ACTION
 
 	if(is_remote)
 		groundside_alien_action(xeno)
 		return
 
-	var/obj/docking_port/mobile/marine_dropship/dropship = SSshuttle.getShuttle(shuttleId)
 	if(dropship.is_hijacked)
 		return
 
@@ -239,6 +249,7 @@
 			addtimer(CALLBACK(GLOB.almayer_orbital_cannon, TYPE_PROC_REF(/obj/structure/orbital_cannon, enable)), 10 MINUTES, TIMER_UNIQUE)
 		if(!GLOB.resin_lz_allowed)
 			set_lz_resin_allowed(TRUE)
+		stop_playing_launch_announcement_alarm()
 
 		to_chat(xeno, SPAN_XENONOTICE("You override the doors."))
 		xeno_message(SPAN_XENOANNOUNCE("The doors of the metal bird have been overridden! Rejoice!"), 3, xeno.hivenumber)
@@ -287,9 +298,6 @@
 	hijack.fire()
 	GLOB.alt_ctrl_disabled = TRUE
 
-	dropship.alarm_sound_loop.stop()
-	dropship.playing_launch_announcement_alarm = FALSE
-
 	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.")
 

html/changelogs/AutoChangeLog-pr-5210.yml

@@ -0,0 +1,4 @@
+author: "SabreML"
+delete-after: True
+changes:
+  - rscadd: "Allowed Xenomorphs to turn off the dropship's launch alarm by hitting the nav computer."

html/changelogs/AutoChangeLog-pr-5257.yml

@@ -0,0 +1,6 @@
+author: "BadAtThisGame302"
+delete-after: True
+changes:
+  - rscadd: "Added a windbreaker to the Flight Control Operator surv."
+  - rscadd: "Added W-Y Flight Control access to the Flight Control Operator surv."
+  - bugfix: "fixed the Flight Control Operator path."

html/changelogs/archive/2023-12.yml

@@ -431,3 +431,12 @@
   - rscadd: Ghosts can now toggle hearing listening devices or not. This is dependant
       on hearing radios and will not function to allow hearing devices without also
       hearing radios.
+2023-12-23:
+  BadAtThisGame302:
+  - balance: rebalanced goon skillset to include construction 1
+  - spellcheck: fixed Liason area typos to Liaison
+  - spellcheck: fixed the ICC Liason to ICC Liaison typo
+  fira:
+  - bugfix: Fixed X-mas barricade wiring not applying properly.
+  private-tristan:
+  - balance: xenos can now acid all window frames.