Merge branch 'master' into doublespace-tip

cmss13-devs · Jan 20, 2024 · f1952b8 · f1952b8
2 parents 9c624ec + a3037ec
commit f1952b8
Show file tree

Hide file tree

Showing 12 changed files with 51 additions and 11 deletions.
diff --git a/code/game/machinery/vending/vendor_types/engineering.dm b/code/game/machinery/vending/vendor_types/engineering.dm
@@ -90,6 +90,11 @@
 		list("Research Data Terminal", 2, /obj/item/circuitboard/computer/research_terminal, VENDOR_ITEM_REGULAR),
 		list("P.A.C.M.A.N Generator", 1, /obj/item/circuitboard/machine/pacman, VENDOR_ITEM_REGULAR),
 		list("Auxiliar Power Storage Unit", 2, /obj/item/circuitboard/machine/ghettosmes, VENDOR_ITEM_REGULAR),
+		list("Air Alarm Electronics", 2, /obj/item/circuitboard/airalarm, VENDOR_ITEM_REGULAR),
+		list("Security Camera Monitor", 2, /obj/item/circuitboard/computer/cameras, VENDOR_ITEM_REGULAR),
+		list("Station Alerts", 2, /obj/item/circuitboard/computer/stationalert, VENDOR_ITEM_REGULAR),
+		list("Arcade", 2, /obj/item/circuitboard/computer/arcade, VENDOR_ITEM_REGULAR),
+		list("Atmospheric Monitor", 2, /obj/item/circuitboard/computer/air_management, VENDOR_ITEM_REGULAR),
 	)
 
 /obj/structure/machinery/cm_vending/sorted/tech/tool_storage/antag

diff --git a/code/game/objects/items/devices/whistle.dm b/code/game/objects/items/devices/whistle.dm
@@ -8,7 +8,8 @@
 	actions_types = list(/datum/action/item_action)
 
 	var/volume = 60
-	var/spamcheck = 0
+	var/spam_cooldown_time = 10 SECONDS
+	COOLDOWN_DECLARE(spam_cooldown)
 
 /obj/item/device/whistle/attack_self(mob/user)
 	..()
@@ -28,14 +29,14 @@
 		..()
 
 /obj/item/device/whistle/proc/whistle_playsound(mob/user)
-	if (spamcheck)
+	if(!COOLDOWN_FINISHED(src, spam_cooldown))
+		to_chat(user, SPAN_DANGER("You are out of breath after using [src]! Wait [COOLDOWN_SECONDSLEFT(src, spam_cooldown)] second\s."))
 		return
 
 	user.visible_message(SPAN_WARNING("[user] blows into [src]!"))
 	playsound(get_turf(src), 'sound/items/whistle.ogg', volume, 1, vary = 0)
 
-	spamcheck = 1
-	addtimer(VARSET_CALLBACK(src, spamcheck, FALSE), 3 SECONDS)
+	COOLDOWN_START(src, spam_cooldown, spam_cooldown_time)
 
 /obj/item/device/whistle/MouseDrop(obj/over_object)
 	if(ishuman(usr))

diff --git a/code/modules/dropships/attach_points/attach_point.dm b/code/modules/dropships/attach_points/attach_point.dm
@@ -7,7 +7,7 @@
 	unacidable = TRUE
 	anchored = TRUE
 	layer = ABOVE_TURF_LAYER
-	plane = FLOOR_PLANE
+	plane = GAME_PLANE
 	/// The currently installed equipment, if any
 	var/obj/structure/dropship_equipment/installed_equipment
 	/// What kind of equipment this base accepts

diff --git a/code/modules/dropships/attach_points/templates.dm b/code/modules/dropships/attach_points/templates.dm
@@ -87,9 +87,15 @@
 /obj/effect/attach_point/crew_weapon/dropship1
 	ship_tag = DROPSHIP_ALAMO
 
+/obj/effect/attach_point/crew_weapon/dropship1/floor
+	plane = FLOOR_PLANE
+
 /obj/effect/attach_point/crew_weapon/dropship2
 	ship_tag = DROPSHIP_NORMANDY
 
+/obj/effect/attach_point/crew_weapon/dropship2/floor
+	plane = FLOOR_PLANE
+
 /obj/effect/attach_point/electronics
 	name = "electronic system attach point"
 	base_category = DROPSHIP_ELECTRONICS

diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm b/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm
@@ -220,7 +220,13 @@
 	return
 
 /mob/living/carbon/xenomorph/facehugger/emote(act, m_type, message, intentional, force_silence)
+	// Custom emote
+	if(act == "me")
+		return ..()
+
+	// Otherwise, ""roar""!
 	playsound(loc, "alien_roar_larva", 15)
+	return TRUE
 
 /mob/living/carbon/xenomorph/facehugger/get_status_tab_items()
 	. = ..()

diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm b/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm
@@ -157,7 +157,13 @@
 	return larva
 
 /mob/living/carbon/xenomorph/larva/emote(act, m_type, message, intentional, force_silence)
+	// Custom emote
+	if(act == "me")
+		return ..()
+
+	// Otherwise, ""roar""!
 	playsound(loc, "alien_roar_larva", 15)
+	return TRUE
 
 /mob/living/carbon/xenomorph/larva/is_xeno_grabbable()
 	return TRUE

diff --git a/html/changelogs/AutoChangeLog-pr-5441.yml b/html/changelogs/AutoChangeLog-pr-5441.yml
@@ -0,0 +1,4 @@
+author: "Huffie56"
+delete-after: True
+changes:
+  - rscadd: "Add some boards to the board vendor in engi on almayer(Air Alarm Electronics, Security Camera Monitor,\nStation Alerts, Arcade, Atmospheric Monitor)."
diff --git a/html/changelogs/AutoChangeLog-pr-5469.yml b/html/changelogs/AutoChangeLog-pr-5469.yml
@@ -0,0 +1,4 @@
+author: "ClairionCM"
+delete-after: True
+changes:
+  - qol: "made whistles less spammy"
diff --git a/html/changelogs/AutoChangeLog-pr-5495.yml b/html/changelogs/AutoChangeLog-pr-5495.yml
@@ -0,0 +1,4 @@
+author: "Vicacrov"
+delete-after: True
+changes:
+  - bugfix: "Fixes engine/weapon attach points layering below the dropship walls."
diff --git a/html/changelogs/AutoChangeLog-pr-5496.yml b/html/changelogs/AutoChangeLog-pr-5496.yml
@@ -0,0 +1,4 @@
+author: "SabreML"
+delete-after: True
+changes:
+  - rscadd: "Made larvae and facehuggers able to use custom emotes."
diff --git a/maps/shuttles/dropship_alamo.dmm b/maps/shuttles/dropship_alamo.dmm
@@ -416,7 +416,7 @@
 	},
 /area/shuttle/drop1/sulaco)
 "Kk" = (
-/obj/effect/attach_point/crew_weapon/dropship1{
+/obj/effect/attach_point/crew_weapon/dropship1/floor{
 	attach_id = 7
 	},
 /turf/open/shuttle/dropship{
@@ -450,7 +450,7 @@
 	},
 /area/shuttle/drop1/sulaco)
 "Nv" = (
-/obj/effect/attach_point/crew_weapon/dropship1{
+/obj/effect/attach_point/crew_weapon/dropship1/floor{
 	attach_id = 8
 	},
 /turf/open/shuttle/dropship{
@@ -507,7 +507,7 @@
 	},
 /area/shuttle/drop1/sulaco)
 "PV" = (
-/obj/effect/attach_point/crew_weapon/dropship1{
+/obj/effect/attach_point/crew_weapon/dropship1/floor{
 	attach_id = 9
 	},
 /turf/open/shuttle/dropship{

diff --git a/maps/shuttles/dropship_normandy.dmm b/maps/shuttles/dropship_normandy.dmm
@@ -96,7 +96,7 @@
 	},
 /area/shuttle/drop2/sulaco)
 "hn" = (
-/obj/effect/attach_point/crew_weapon/dropship2{
+/obj/effect/attach_point/crew_weapon/dropship2/floor{
 	attach_id = 8
 	},
 /turf/open/shuttle/dropship{
@@ -326,7 +326,7 @@
 	},
 /area/shuttle/drop2/sulaco)
 "Bg" = (
-/obj/effect/attach_point/crew_weapon/dropship2{
+/obj/effect/attach_point/crew_weapon/dropship2/floor{
 	attach_id = 7
 	},
 /turf/open/shuttle/dropship{
@@ -478,7 +478,7 @@
 /turf/template_noop,
 /area/shuttle/drop2/sulaco)
 "MA" = (
-/obj/effect/attach_point/crew_weapon/dropship2{
+/obj/effect/attach_point/crew_weapon/dropship2/floor{
 	attach_id = 9
 	},
 /turf/open/shuttle/dropship{